Merge pull request #3 from r7b7/claude/trusting-kepler-787f0d

Refactor: unify clients, constructor injection, virtual threads, type…

Author: r7b7

src/main/java/com/r7b7/client/DefaultAnthropicClient.java

@@ -13,13 +13,13 @@
 import com.r7b7.client.model.AnthroToolResponse;
 import com.r7b7.client.model.AnthropicResponse;
 import com.r7b7.client.model.Message;
-import com.r7b7.constant.HospAiKeys;
 import com.r7b7.config.PropertyConfig;
+import com.r7b7.constant.HospAiKeys;
 import com.r7b7.entity.CompletionRequest;
 import com.r7b7.entity.CompletionResponse;
 import com.r7b7.entity.ErrorResponse;
 
-public class DefaultAnthropicClient implements IAnthropicClient {
+public class DefaultAnthropicClient implements LlmHttpClient {
     private final String ANTHROPIC_API_URL;
     private final String ANTHROPIC_VERSION;
     private final HttpClient httpClient;

src/main/java/com/r7b7/client/DefaultGroqClient.java

@@ -12,13 +12,13 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.r7b7.client.model.Message;
 import com.r7b7.client.model.OllamaResponse;
-import com.r7b7.constant.HospAiKeys;
 import com.r7b7.config.PropertyConfig;
+import com.r7b7.constant.HospAiKeys;
 import com.r7b7.entity.CompletionRequest;
 import com.r7b7.entity.CompletionResponse;
 import com.r7b7.entity.ErrorResponse;
 
-public class DefaultOllamaClient implements IOllamaClient {
+public class DefaultOllamaClient implements LlmHttpClient {
     private final String OLLAMA_API_URL;
     private final HttpClient httpClient;
     private final ObjectMapper objectMapper;

src/main/java/com/r7b7/client/DefaultOllamaClient.java

@@ -18,24 +18,28 @@
 import com.r7b7.entity.CompletionResponse;
 import com.r7b7.entity.ErrorResponse;
 
-public class DefaultOpenAIClient implements IOpenAIClient {
-    private final String OPENAI_API_URL;
+public class DefaultOpenAIClient implements LlmHttpClient {
+    private final String apiUrl;
+    private final String providerName;
     private final HttpClient httpClient;
     private final ObjectMapper objectMapper;
     private final Duration requestTimeout;
 
     public DefaultOpenAIClient() {
-        this(null, null, null, null);
+        this(null, null, null, null, null);
     }
 
-    public DefaultOpenAIClient(URI baseUri, HttpClient httpClient, ObjectMapper objectMapper, Duration requestTimeout) {
+    public DefaultOpenAIClient(URI baseUri, String providerName, HttpClient httpClient,
+            ObjectMapper objectMapper, Duration requestTimeout) {
         try {
             Properties properties = PropertyConfig.loadConfig();
-            URI resolved = baseUri != null ? baseUri : URI.create(properties.getProperty(HospAiKeys.Properties.OPENAI_URL));
-            this.OPENAI_API_URL = resolved.toString();
+            URI resolved = baseUri != null ? baseUri
+                    : URI.create(properties.getProperty(HospAiKeys.Properties.OPENAI_URL));
+            this.apiUrl = resolved.toString();
         } catch (Exception ex) {
             throw new IllegalStateException("Critical configuration missing: " + HospAiKeys.Properties.OPENAI_URL, ex);
         }
+        this.providerName = providerName != null ? providerName : "OpenAI";
         this.httpClient = httpClient != null ? httpClient : HttpClient.newHttpClient();
         this.objectMapper = objectMapper != null ? objectMapper : new ObjectMapper();
         this.requestTimeout = requestTimeout;
@@ -47,7 +51,7 @@ public CompletionResponse generateCompletion(CompletionRequest request) {
             String jsonRequest = this.objectMapper.writeValueAsString(request.requestBody());
 
             HttpRequest.Builder httpRequestBuilder = HttpRequest.newBuilder()
-                    .uri(URI.create(this.OPENAI_API_URL))
+                    .uri(URI.create(this.apiUrl))
                     .header(HospAiKeys.Headers.CONTENT_TYPE, HospAiKeys.ContentTypes.APPLICATION_JSON)
                     .header(HospAiKeys.Headers.AUTHORIZATION, "Bearer " + request.apiKey())
                     .POST(HttpRequest.BodyPublishers.ofString(jsonRequest));
@@ -56,10 +60,10 @@ public CompletionResponse generateCompletion(CompletionRequest request) {
                 httpRequestBuilder.timeout(requestTimeout);
             }
 
-            HttpRequest httpRequest = httpRequestBuilder.build();
-            HttpResponse<String> response = httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+            HttpResponse<String> response = httpClient.send(httpRequestBuilder.build(),
+                    HttpResponse.BodyHandlers.ofString());
             if (response.statusCode() == 200) {
-                return extractResponseText(response.body());
+                return extractResponse(response.body());
             } else {
                 return new CompletionResponse(null, null, new ErrorResponse(
                         "Request sent to LLM failed: " + response.statusCode() + response.body(), null));
@@ -69,28 +73,24 @@ public CompletionResponse generateCompletion(CompletionRequest request) {
         }
     }
 
-    private CompletionResponse extractResponseText(String responseBody) {
-        List<Message> msgs = null;
-        OpenAIResponse response = null;
-        ErrorResponse error = null;
-        Map<String, Object> metadata = null;
-
+    private CompletionResponse extractResponse(String responseBody) {
         try {
-            response = objectMapper.readValue(responseBody, OpenAIResponse.class);
-            msgs = response.choices().stream()
+            OpenAIResponse response = objectMapper.readValue(responseBody, OpenAIResponse.class);
+            List<Message> msgs = response.choices().stream()
                     .map(choice -> new Message(choice.message().role(), choice.message().content(),
                             choice.message().toolCalls()))
                     .toList();
-            metadata = Map.of(
+            Map<String, Object> metadata = Map.of(
                     "id", response.id(),
                     "model", response.model(),
-                    "provider", "OpenAi",
+                    "provider", providerName,
                     "prompt_tokens", response.usage().promptTokens(),
                     "completion_tokens", response.usage().completionTokens(),
                     "total_tokens", response.usage().totalTokens());
+            return new CompletionResponse(msgs, metadata, null);
         } catch (Exception ex) {
-            error = new ErrorResponse("Exception occurred in extracting response", ex);
+            return new CompletionResponse(null, null,
+                    new ErrorResponse("Exception occurred in extracting response", ex));
         }
-        return new CompletionResponse(msgs, metadata, error);
     }
 }

src/main/java/com/r7b7/client/DefaultOpenAIClient.java

@@ -3,6 +3,6 @@
 import com.r7b7.entity.CompletionRequest;
 import com.r7b7.entity.CompletionResponse;
 
-public interface IOpenAIClient {
+public interface LlmHttpClient {
     CompletionResponse generateCompletion(CompletionRequest request);
 }

src/main/java/com/r7b7/client/IAnthropicClient.java

@@ -4,6 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record AnthroUsage(@JsonProperty("input_tokens") String inputTokens,
-        @JsonProperty("output_tokens") String outputTokens) {
+public record AnthroUsage(@JsonProperty("input_tokens") int inputTokens,
+        @JsonProperty("output_tokens") int outputTokens) {
 }