Refactor Llama recorder

Author: gastaldi

model-providers/jlama/deployment/src/main/java/io/quarkiverse/langchain4j/jlama/deployment/JlamaProcessor.java

@@ -36,7 +36,6 @@
 import io.quarkiverse.langchain4j.deployment.items.SelectedEmbeddingModelCandidateBuildItem;
 import io.quarkiverse.langchain4j.jlama.JlamaModelRegistry;
 import io.quarkiverse.langchain4j.jlama.runtime.JlamaAiRecorder;
-import io.quarkiverse.langchain4j.jlama.runtime.config.LangChain4jJlamaConfig;
 import io.quarkiverse.langchain4j.jlama.runtime.config.LangChain4jJlamaFixedRuntimeConfig;
 import io.quarkiverse.langchain4j.runtime.NamedConfigUtil;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
@@ -89,27 +88,24 @@ public void providerCandidates(BuildProducer<ChatModelProviderCandidateBuildItem
         }
     }
 
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     void generateBeans(JlamaAiRecorder recorder, List<SelectedChatModelProviderBuildItem> selectedChatItem,
             List<SelectedEmbeddingModelCandidateBuildItem> selectedEmbedding,
-            LangChain4jJlamaConfig runtimeConfig,
-            LangChain4jJlamaFixedRuntimeConfig fixedRuntimeConfig,
             BuildProducer<SyntheticBeanBuildItem> beanProducer) {
 
         for (var selected : selectedChatItem) {
             if (PROVIDER.equals(selected.getProvider())) {
                 String configName = selected.getConfigName();
                 var builder = SyntheticBeanBuildItem.configure(CHAT_MODEL).setRuntimeInit().defaultBean()
                         .scope(ApplicationScoped.class)
-                        .supplier(recorder.chatModel(runtimeConfig, fixedRuntimeConfig, configName));
+                        .supplier(recorder.chatModel(configName));
                 addQualifierIfNecessary(builder, configName);
                 beanProducer.produce(builder.done());
 
                 var streamingBuilder = SyntheticBeanBuildItem.configure(STREAMING_CHAT_MODEL).setRuntimeInit()
                         .defaultBean().scope(ApplicationScoped.class)
-                        .supplier(recorder.streamingChatModel(runtimeConfig, fixedRuntimeConfig, configName));
+                        .supplier(recorder.streamingChatModel(configName));
                 addQualifierIfNecessary(streamingBuilder, configName);
                 beanProducer.produce(streamingBuilder.done());
             }
@@ -120,7 +116,7 @@ void generateBeans(JlamaAiRecorder recorder, List<SelectedChatModelProviderBuild
                 String configName = selected.getConfigName();
                 var builder = SyntheticBeanBuildItem.configure(EMBEDDING_MODEL).setRuntimeInit().defaultBean()
                         .unremovable().scope(ApplicationScoped.class)
-                        .supplier(recorder.embeddingModel(runtimeConfig, fixedRuntimeConfig, configName));
+                        .supplier(recorder.embeddingModel(configName));
                 addQualifierIfNecessary(builder, configName);
                 beanProducer.produce(builder.done());
             }

model-providers/jlama/runtime/src/main/java/io/quarkiverse/langchain4j/jlama/runtime/JlamaAiRecorder.java

@@ -15,25 +15,32 @@
 import io.quarkiverse.langchain4j.jlama.runtime.config.LangChain4jJlamaConfig;
 import io.quarkiverse.langchain4j.jlama.runtime.config.LangChain4jJlamaFixedRuntimeConfig;
 import io.quarkiverse.langchain4j.runtime.NamedConfigUtil;
+import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder
 public class JlamaAiRecorder {
+    private final RuntimeValue<LangChain4jJlamaConfig> runtimeConfig;
+    private final RuntimeValue<LangChain4jJlamaFixedRuntimeConfig> fixedRuntimeConfig;
 
-    public Supplier<ChatModel> chatModel(LangChain4jJlamaConfig runtimeConfig,
-            LangChain4jJlamaFixedRuntimeConfig fixedRuntimeConfig,
-            String configName) {
-        LangChain4jJlamaConfig.JlamaConfig jlamaConfig = correspondingJlamaConfig(runtimeConfig, configName);
+    public JlamaAiRecorder(RuntimeValue<LangChain4jJlamaConfig> runtimeConfig,
+            RuntimeValue<LangChain4jJlamaFixedRuntimeConfig> fixedRuntimeConfig) {
+        this.runtimeConfig = runtimeConfig;
+        this.fixedRuntimeConfig = fixedRuntimeConfig;
+    }
+
+    public Supplier<ChatModel> chatModel(String configName) {
+        LangChain4jJlamaConfig.JlamaConfig jlamaConfig = correspondingJlamaConfig(configName);
         LangChain4jJlamaFixedRuntimeConfig.JlamaConfig jlamaFixedRuntimeConfig = correspondingJlamaFixedRuntimeConfig(
-                fixedRuntimeConfig, configName);
+                configName);
 
         if (jlamaConfig.enableIntegration()) {
             ChatModelConfig chatModelConfig = jlamaConfig.chatModel();
 
             String modelName = jlamaFixedRuntimeConfig.chatModel().modelName();
             var builder = JlamaChatModel.builder()
                     .modelName(modelName)
-                    .modelCachePath(fixedRuntimeConfig.modelsPath());
+                    .modelCachePath(fixedRuntimeConfig.getValue().modelsPath());
 
             jlamaConfig.logRequests().ifPresent(builder::logRequests);
             jlamaConfig.logResponses().ifPresent(builder::logResponses);
@@ -57,19 +64,16 @@ public ChatModel get() {
         }
     }
 
-    public Supplier<StreamingChatModel> streamingChatModel(LangChain4jJlamaConfig runtimeConfig,
-            LangChain4jJlamaFixedRuntimeConfig fixedRuntimeConfig,
-            String configName) {
-        LangChain4jJlamaConfig.JlamaConfig jlamaConfig = correspondingJlamaConfig(runtimeConfig, configName);
+    public Supplier<StreamingChatModel> streamingChatModel(String configName) {
+        LangChain4jJlamaConfig.JlamaConfig jlamaConfig = correspondingJlamaConfig(configName);
         LangChain4jJlamaFixedRuntimeConfig.JlamaConfig jlamaFixedRuntimeConfig = correspondingJlamaFixedRuntimeConfig(
-                fixedRuntimeConfig, configName);
-
+                configName);
         if (jlamaConfig.enableIntegration()) {
             ChatModelConfig chatModelConfig = jlamaConfig.chatModel();
 
             var builder = JlamaStreamingChatModel.builder()
                     .modelName(jlamaFixedRuntimeConfig.chatModel().modelName())
-                    .modelCachePath(fixedRuntimeConfig.modelsPath());
+                    .modelCachePath(fixedRuntimeConfig.getValue().modelsPath());
 
             chatModelConfig.temperature().ifPresent(temp -> builder.temperature((float) temp));
 
@@ -89,17 +93,15 @@ public StreamingChatModel get() {
         }
     }
 
-    public Supplier<EmbeddingModel> embeddingModel(LangChain4jJlamaConfig runtimeConfig,
-            LangChain4jJlamaFixedRuntimeConfig fixedRuntimeConfig,
-            String configName) {
-        LangChain4jJlamaConfig.JlamaConfig jlamaConfig = correspondingJlamaConfig(runtimeConfig, configName);
+    public Supplier<EmbeddingModel> embeddingModel(String configName) {
+        LangChain4jJlamaConfig.JlamaConfig jlamaConfig = correspondingJlamaConfig(configName);
         LangChain4jJlamaFixedRuntimeConfig.JlamaConfig jlamaFixedRuntimeConfig = correspondingJlamaFixedRuntimeConfig(
-                fixedRuntimeConfig, configName);
+                configName);
 
         if (jlamaConfig.enableIntegration()) {
             var builder = JlamaEmbeddingModel.builder()
                     .modelName(jlamaFixedRuntimeConfig.embeddingModel().modelName())
-                    .modelCachePath(fixedRuntimeConfig.modelsPath());
+                    .modelCachePath(fixedRuntimeConfig.getValue().modelsPath());
 
             return new Supplier<>() {
                 @Override
@@ -117,17 +119,15 @@ public EmbeddingModel get() {
         }
     }
 
-    private LangChain4jJlamaConfig.JlamaConfig correspondingJlamaConfig(LangChain4jJlamaConfig runtimeConfig,
-            String configName) {
-        return NamedConfigUtil.isDefault(configName) ? runtimeConfig.defaultConfig()
-                : runtimeConfig.namedConfig().get(configName);
+    private LangChain4jJlamaConfig.JlamaConfig correspondingJlamaConfig(String configName) {
+        return NamedConfigUtil.isDefault(configName) ? runtimeConfig.getValue().defaultConfig()
+                : runtimeConfig.getValue().namedConfig().get(configName);
     }
 
     private LangChain4jJlamaFixedRuntimeConfig.JlamaConfig correspondingJlamaFixedRuntimeConfig(
-            LangChain4jJlamaFixedRuntimeConfig runtimeConfig,
             String configName) {
-        return NamedConfigUtil.isDefault(configName) ? runtimeConfig.defaultConfig()
-                : runtimeConfig.namedConfig().get(configName);
+        return NamedConfigUtil.isDefault(configName) ? fixedRuntimeConfig.getValue().defaultConfig()
+                : fixedRuntimeConfig.getValue().namedConfig().get(configName);
     }
 
 }