Added more chat language model listeners

stephanj · stephanj · commit 038bacc2df14 · 2025-03-30T22:45:53.000+02:00
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/anthropic/AnthropicChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/anthropic/AnthropicChatModelFactory.java
@@ -43,6 +43,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())
             .maxTokens(chatModel.getMaxTokens())
+            .listeners(getListener())
             .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/azureopenai/AzureOpenAIChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/azureopenai/AzureOpenAIChatModelFactory.java
@@ -28,7 +28,8 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
                 .maxRetries(chatModel.getMaxRetries())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
                 .topP(isO1 ? 1.0 : chatModel.getTopP())
-                .endpoint(DevoxxGenieStateService.getInstance().getAzureOpenAIEndpoint());
+                .endpoint(DevoxxGenieStateService.getInstance().getAzureOpenAIEndpoint())
+                .listeners(getListener());
 
         return builder.build();
     }
@@ -42,7 +43,8 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
                 .deploymentName(DevoxxGenieStateService.getInstance().getAzureOpenAIDeployment())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
                 .topP(isO1 ? 1.0 : chatModel.getTopP())
-                .endpoint(DevoxxGenieStateService.getInstance().getAzureOpenAIEndpoint());
+                .endpoint(DevoxxGenieStateService.getInstance().getAzureOpenAIEndpoint())
+                .listeners(getListener());
 
         return builder.build();
     }
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/deepinfra/DeepInfraChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/deepinfra/DeepInfraChatModelFactory.java
@@ -28,6 +28,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
             .maxTokens(chatModel.getMaxTokens())
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
             .topP(chatModel.getTopP())
+            .listeners(getListener())
             .build();
     }
 
@@ -40,6 +41,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+            .listeners(getListener())
             .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/deepseek/DeepSeekChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/deepseek/DeepSeekChatModelFactory.java
@@ -28,6 +28,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
             .maxTokens(4_000)   // 8K Beta https://platform.deepseek.com/api-docs/quick_start/pricing
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
             .topP(chatModel.getTopP())
+            .listeners(getListener())
             .build();
     }
 
@@ -41,6 +42,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+            .listeners(getListener())
             .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/google/GoogleChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/google/GoogleChatModelFactory.java
@@ -23,6 +23,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
             .modelName(chatModel.getModelName())
             .temperature(chatModel.getTemperature())
             .maxOutputTokens(chatModel.getMaxTokens())
+            .listeners(getListener())
             .build();
     }
 
@@ -33,6 +34,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
                 .modelName(chatModel.getModelName())
                 .temperature(chatModel.getTemperature())
                 .maxOutputTokens(chatModel.getMaxTokens())
+                .listeners(getListener())
                 .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/groq/GroqChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/groq/GroqChatModelFactory.java
@@ -27,6 +27,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
             .temperature(chatModel.getTemperature())
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
             .topP(chatModel.getTopP())
+            .listeners(getListener())
             .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/openai/OpenAIChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/openai/OpenAIChatModelFactory.java
@@ -26,6 +26,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
                 .defaultRequestParameters(createChatContextParameters(chatModel))
                 .maxRetries(chatModel.getMaxRetries())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+                .listeners(getListener())
                 .build();
     }
 
@@ -36,6 +37,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
                 .defaultRequestParameters(createChatContextParameters(chatModel))
                 .modelName(chatModel.getModelName())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+                .listeners(getListener())
                 .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/cloud/openrouter/OpenRouterChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/cloud/openrouter/OpenRouterChatModelFactory.java
@@ -40,6 +40,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
             .maxTokens(4_000)
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
             .topP(chatModel.getTopP())
+            .listeners(getListener())
             .build();
     }
 
@@ -53,6 +54,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+            .listeners(getListener())
             .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/LocalChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/LocalChatModelFactory.java
@@ -50,6 +50,7 @@ protected ChatLanguageModel createOpenAiChatModel(@NotNull ChatModel chatModel)
                 .maxTokens(chatModel.getMaxTokens())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
                 .topP(chatModel.getTopP())
+                .listeners(getListener())
                 .build();
     }
 
@@ -61,6 +62,7 @@ protected StreamingChatLanguageModel createOpenAiStreamingChatModel(@NotNull Cha
                 .temperature(chatModel.getTemperature())
                 .topP(chatModel.getTopP())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+                .listeners(getListener())
                 .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/customopenai/CustomOpenAIChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/customopenai/CustomOpenAIChatModelFactory.java
@@ -22,12 +22,14 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
         return OpenAiChatModel.builder()
                 .baseUrl(stateInstance.getCustomOpenAIUrl())
                 .apiKey(stateInstance.isCustomOpenAIApiKeyEnabled() ? stateInstance.getCustomOpenAIApiKey() : "na")
-                .modelName(stateInstance.isCustomOpenAIModelNameEnabled() ? (stateInstance.getCustomOpenAIModelName().isBlank() ? "default" : stateInstance.getCustomOpenAIModelName()) : "")
+                .modelName(stateInstance.isCustomOpenAIModelNameEnabled() ?
+                        (stateInstance.getCustomOpenAIModelName().isBlank() ? "default" : stateInstance.getCustomOpenAIModelName()) : "")
                 .maxRetries(chatModel.getMaxRetries())
                 .temperature(chatModel.getTemperature())
                 .maxTokens(chatModel.getMaxTokens())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
                 .topP(chatModel.getTopP())
+                .listeners(getListener())
                 .build();
     }
 
@@ -37,10 +39,12 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
         return OpenAiStreamingChatModel.builder()
                 .baseUrl(stateInstance.getCustomOpenAIUrl())
                 .apiKey(stateInstance.isCustomOpenAIApiKeyEnabled() ? stateInstance.getCustomOpenAIApiKey() : "na")
-                .modelName(stateInstance.isCustomOpenAIModelNameEnabled() ? (stateInstance.getCustomOpenAIModelName().isBlank() ? "default" : stateInstance.getCustomOpenAIModelName()) : "")
+                .modelName(stateInstance.isCustomOpenAIModelNameEnabled() ?
+                        (stateInstance.getCustomOpenAIModelName().isBlank() ? "default" : stateInstance.getCustomOpenAIModelName()) : "")
                 .temperature(chatModel.getTemperature())
                 .topP(chatModel.getTopP())
                 .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+                .listeners(getListener())
                 .build();
     }
 
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/llamacpp/LlamaChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/llamacpp/LlamaChatModelFactory.java
@@ -25,6 +25,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
             .topP(chatModel.getTopP())
             .maxRetries(chatModel.getMaxRetries())
             .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+            .listeners(getListener())
             .build();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch`
`43`	`43`	`.temperature(chatModel.getTemperature())`
`44`	`44`	`.topP(chatModel.getTopP())`
`45`	`45`	`.maxTokens(chatModel.getMaxTokens())`
	`46`	`+ .listeners(getListener())`
`46`	`47`	`.build();`
`47`	`48`	`}`
`48`	`49`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`28`	`28`	`.maxTokens(chatModel.getMaxTokens())`
`29`	`29`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
`30`	`30`	`.topP(chatModel.getTopP())`
	`31`	`+ .listeners(getListener())`
`31`	`32`	`.build();`
`32`	`33`	`}`
`33`	`34`
`@@ -40,6 +41,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch`
`40`	`41`	`.temperature(chatModel.getTemperature())`
`41`	`42`	`.topP(chatModel.getTopP())`
`42`	`43`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
	`44`	`+ .listeners(getListener())`
`43`	`45`	`.build();`
`44`	`46`	`}`
`45`	`47`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`23`	`23`	`.modelName(chatModel.getModelName())`
`24`	`24`	`.temperature(chatModel.getTemperature())`
`25`	`25`	`.maxOutputTokens(chatModel.getMaxTokens())`
	`26`	`+ .listeners(getListener())`
`26`	`27`	`.build();`
`27`	`28`	`}`
`28`	`29`
`@@ -33,6 +34,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch`
`33`	`34`	`.modelName(chatModel.getModelName())`
`34`	`35`	`.temperature(chatModel.getTemperature())`
`35`	`36`	`.maxOutputTokens(chatModel.getMaxTokens())`
	`37`	`+ .listeners(getListener())`
`36`	`38`	`.build();`
`37`	`39`	`}`
`38`	`40`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`27`	`27`	`.temperature(chatModel.getTemperature())`
`28`	`28`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
`29`	`29`	`.topP(chatModel.getTopP())`
	`30`	`+ .listeners(getListener())`
`30`	`31`	`.build();`
`31`	`32`	`}`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`26`	`26`	`.defaultRequestParameters(createChatContextParameters(chatModel))`
`27`	`27`	`.maxRetries(chatModel.getMaxRetries())`
`28`	`28`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
	`29`	`+ .listeners(getListener())`
`29`	`30`	`.build();`
`30`	`31`	`}`
`31`	`32`
`@@ -36,6 +37,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch`
`36`	`37`	`.defaultRequestParameters(createChatContextParameters(chatModel))`
`37`	`38`	`.modelName(chatModel.getModelName())`
`38`	`39`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
	`40`	`+ .listeners(getListener())`
`39`	`41`	`.build();`
`40`	`42`	`}`
`41`	`43`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`40`	`40`	`.maxTokens(4_000)`
`41`	`41`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
`42`	`42`	`.topP(chatModel.getTopP())`
	`43`	`+ .listeners(getListener())`
`43`	`44`	`.build();`
`44`	`45`	`}`
`45`	`46`
`@@ -53,6 +54,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch`
`53`	`54`	`.temperature(chatModel.getTemperature())`
`54`	`55`	`.topP(chatModel.getTopP())`
`55`	`56`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
	`57`	`+ .listeners(getListener())`
`56`	`58`	`.build();`
`57`	`59`	`}`
`58`	`60`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected ChatLanguageModel createOpenAiChatModel(@NotNull ChatModel chatModel)`
`50`	`50`	`.maxTokens(chatModel.getMaxTokens())`
`51`	`51`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
`52`	`52`	`.topP(chatModel.getTopP())`
	`53`	`+ .listeners(getListener())`
`53`	`54`	`.build();`
`54`	`55`	`}`
`55`	`56`
`@@ -61,6 +62,7 @@ protected StreamingChatLanguageModel createOpenAiStreamingChatModel(@NotNull Cha`
`61`	`62`	`.temperature(chatModel.getTemperature())`
`62`	`63`	`.topP(chatModel.getTopP())`
`63`	`64`	`.timeout(Duration.ofSeconds(chatModel.getTimeout()))`
	`65`	`+ .listeners(getListener())`
`64`	`66`	`.build();`
`65`	`67`	`}`
`66`	`68`