feat: restclient

Author: Angular2Guy

backend/build.gradle

@@ -40,6 +40,7 @@ dependencies {
 	implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:5.2.0'
 	implementation 'org.springframework.ai:spring-ai-pgvector-store-spring-boot-starter:0.8.1-SNAPSHOT'
 	implementation 'org.springframework.ai:spring-ai-transformers-spring-boot-starter:0.8.1-SNAPSHOT'
+	implementation 'org.apache.httpcomponents.client5:httpclient5'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testImplementation 'com.tngtech.archunit:archunit-junit5:1.1.0'

backend/src/main/java/ch/xxx/aidoclibchat/adapter/client/ImportRestClient.java

@@ -41,17 +41,18 @@
 public class ImportRestClient implements ImportClient {
 	private final CsvMapper csvMapper;
 	private final TableMapper tableMapper;
+	private final RestClient restClient;
 
-	public ImportRestClient(TableMapper tableMapper) {
+	public ImportRestClient(TableMapper tableMapper, RestClient restClient) {
 		this.tableMapper = tableMapper;
+		this.restClient = restClient;
 		this.csvMapper = new CsvMapper();
 		this.csvMapper.registerModule(new JavaTimeModule());
 	}
 
 	@Override
 	public List<Artist> importArtists() {
-		RestClient restClient = RestClient.create();
-		String result = restClient.get().uri(
+		String result = this.restClient.get().uri(
 				"https://raw.githubusercontent.com/Angular2Guy/AIDocumentLibraryChat/master/museumDataset/artist.csv")
 				.retrieve().body(String.class);
 		return this.mapString(result, ArtistDto.class).stream().map(myDto -> this.tableMapper.map(myDto)).toList();
@@ -70,44 +71,39 @@ private <T> List<T> mapString(String result, Class<T> myClass) {
 
 	@Override
 	public List<Museum> importMuseums() {
-		RestClient restClient = RestClient.create();
-		String result = restClient.get().uri(
+		String result = this.restClient.get().uri(
 				"https://raw.githubusercontent.com/Angular2Guy/AIDocumentLibraryChat/master/museumDataset/museum.csv")
 				.retrieve().body(String.class);
 		return this.mapString(result, MuseumDto.class).stream().map(myDto -> this.tableMapper.map(myDto)).toList();
 	}
 
 	@Override
 	public List<MuseumHours> importMuseumHours() {
-		RestClient restClient = RestClient.create();
-		String result = restClient.get().uri(
+		String result = this.restClient.get().uri(
 				"https://raw.githubusercontent.com/Angular2Guy/AIDocumentLibraryChat/master/museumDataset/museum_hours.csv")
 				.retrieve().body(String.class);
 		return this.mapString(result, MuseumHoursDto.class).stream().map(myDto -> this.tableMapper.map(myDto)).toList();
 	}
 
 	@Override
 	public List<Work> importWorks() {
-		RestClient restClient = RestClient.create();
-		String result = restClient.get().uri(
+		String result = this.restClient.get().uri(
 				"https://raw.githubusercontent.com/Angular2Guy/AIDocumentLibraryChat/master/museumDataset/work.csv")
 				.retrieve().body(String.class);
 		return this.mapString(result, WorkDto.class).stream().map(myDto -> this.tableMapper.map(myDto)).toList();
 	}
 
 	@Override
 	public List<Subject> importSubjects() {
-		RestClient restClient = RestClient.create();
-		String result = restClient.get().uri(
+		String result = this.restClient.get().uri(
 				"https://raw.githubusercontent.com/Angular2Guy/AIDocumentLibraryChat/master/museumDataset/subject.csv")
 				.retrieve().body(String.class);
 		return this.mapString(result, SubjectDto.class).stream().map(myDto -> this.tableMapper.map(myDto)).toList();
 	}
 
 	@Override
 	public List<WorkLink> importWorkLinks() {
-		RestClient restClient = RestClient.create();
-		String result = restClient.get().uri(
+		String result = this.restClient.get().uri(
 				"https://raw.githubusercontent.com/Angular2Guy/AIDocumentLibraryChat/master/museumDataset/work_link.csv")
 				.retrieve().body(String.class);
 		return this.mapString(result, WorkLinkDto.class).stream().map(myDto -> this.tableMapper.map(myDto)).toList();

backend/src/main/java/ch/xxx/aidoclibchat/adapter/client/OpenLibraryRestClient.java

@@ -29,7 +29,12 @@
 public class OpenLibraryRestClient implements OpenLibraryClient {
 	private static final Logger LOGGER = LoggerFactory.getLogger(OpenLibraryRestClient.class);
 	private final String baseUrl = "https://openlibrary.org/search.json";
-
+	private final RestClient restClient;
+	
+	public OpenLibraryRestClient(RestClient restClient) {
+		this.restClient = restClient;
+	}
+	
 	@Override
 	public Response apply(Request request) {
 		var authorOpt = this.createParamOpt(request.author(), "author");
@@ -40,7 +45,7 @@ public Response apply(Request request) {
 		var urlStr = 
 				String.format("%s?%s", this.baseUrl, paramsStr);
 		LOGGER.info(urlStr);
-		var response = RestClient.create().get().uri(urlStr).retrieve().body(Response.class);
+		var response = this.restClient.get().uri(urlStr).retrieve().body(Response.class);
 		return response;
 	}
 

backend/src/main/java/ch/xxx/aidoclibchat/adapter/config/ApplicationConfig.java

@@ -17,12 +17,19 @@
 
 import java.util.function.Function;
 
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.util.Timeout;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.web.client.RestClient;
 
 import ch.xxx.aidoclibchat.domain.client.OpenLibraryClient;
 
+
 @Configuration
 @EnableAsync
 public class ApplicationConfig {
@@ -43,4 +50,14 @@ public ApplicationConfig(OpenLibraryClient openLibraryClient) {
 	public Function<OpenLibraryClient.Request, OpenLibraryClient.Response> openLibraryClient() {		
 		return this.openLibraryClient::apply;
 	}
+	
+	@Bean
+	public RestClient createRestClient() {
+		RequestConfig requestConfig = RequestConfig.custom().setResponseTimeout(Timeout.ofMilliseconds(5000)).build();
+		CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+		var factory = new HttpComponentsClientHttpRequestFactory(httpClient);
+		factory.setConnectTimeout(2000);
+		factory.setConnectionRequestTimeout(2000);
+		return RestClient.builder().requestFactory(factory).build();
+	}
 }

runOllama.sh

@@ -8,4 +8,5 @@ docker exec -it ollama ollama run stable-beluga:13bc
 #docker exec -it ollama ollama run sqlcoder:15b
 #docker exec -it ollama ollama run mixtral:8x7b-text-v0.1-q6_K
 #docker exec -it ollama ollama run llava:34b-v1.6-q6_K
+#docker exec -it ollama ollama run granite-code:20b
 #docker exec -it ollama bash