Use the default LangChain4j BedrockStreamingChatModel

Author: tomas1885

model-providers/bedrock/deployment/src/test/java/io/quarkiverse/langchain4j/bedrock/deployment/BedrockStreamingChatModelTest.java

@@ -23,10 +23,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import dev.langchain4j.model.bedrock.BedrockStreamingChatModel;
 import dev.langchain4j.model.chat.StreamingChatModel;
 import dev.langchain4j.model.output.FinishReason;
 import dev.langchain4j.model.output.TokenUsage;
-import io.quarkiverse.langchain4j.bedrock.runtime.BedrockConverseStreamingChatModel;
 import io.quarkus.arc.ClientProxy;
 import io.quarkus.test.QuarkusUnitTest;
 import software.amazon.awssdk.services.bedrockruntime.model.ConversationRole;
@@ -61,7 +61,7 @@ void should_create_bedrock_model() {
         // when
 
         // then
-        assertThat(ClientProxy.unwrap(streamingChatModel)).isInstanceOf(BedrockConverseStreamingChatModel.class);
+        assertThat(ClientProxy.unwrap(streamingChatModel)).isInstanceOf(BedrockStreamingChatModel.class);
     }
 
     @Test

model-providers/bedrock/runtime/src/main/java/io/quarkiverse/langchain4j/bedrock/runtime/BedrockRecorder.java

@@ -129,48 +129,36 @@ public Supplier<StreamingChatModel> streamingChatModel(final String configName)
 
             var modelId = modelConfig.modelId().orElse("anthropic.claude-v2");
 
-            Supplier<StreamingChatModel> supplier;
-            if (modelId.contains("anthropic")) {
-
-                var paramsBuilder = ChatRequestParameters.builder()
-                        .maxOutputTokens(modelConfig.maxTokens());
+            var paramsBuilder = ChatRequestParameters.builder()
+                    .maxOutputTokens(modelConfig.maxTokens());
 
-                if (modelConfig.temperature().isPresent()) {
-                    paramsBuilder.temperature(modelConfig.temperature().getAsDouble());
-                }
+            if (modelConfig.temperature().isPresent()) {
+                paramsBuilder.temperature(modelConfig.temperature().getAsDouble());
+            }
 
-                if (modelConfig.topP().isPresent()) {
-                    paramsBuilder.topP(modelConfig.topP().getAsDouble());
-                }
+            if (modelConfig.topP().isPresent()) {
+                paramsBuilder.topP(modelConfig.topP().getAsDouble());
+            }
 
-                if (modelConfig.topK().isPresent()) {
-                    paramsBuilder.topK(modelConfig.topK().getAsInt());
-                }
+            if (modelConfig.topK().isPresent()) {
+                paramsBuilder.topK(modelConfig.topK().getAsInt());
+            }
 
-                if (modelConfig.stopSequences().isPresent()) {
-                    paramsBuilder.stopSequences(modelConfig.stopSequences().get().toArray(new String[0]));
-                }
+            if (modelConfig.stopSequences().isPresent()) {
+                paramsBuilder.stopSequences(modelConfig.stopSequences().get().toArray(new String[0]));
+            }
 
-                var builder = BedrockStreamingChatModel.builder()
-                        .modelId(modelConfig.modelId().orElse("anthropic.claude-v2"))
-                        .client(clientBuilder.build())
-                        .defaultRequestParameters(paramsBuilder.build());
+            var builder = BedrockStreamingChatModel.builder()
+                    .modelId(modelConfig.modelId().orElse("anthropic.claude-v2"))
+                    .client(clientBuilder.build())
+                    .defaultRequestParameters(paramsBuilder.build());
 
-                supplier = new Supplier<StreamingChatModel>() {
-                    @Override
-                    public StreamingChatModel get() {
-                        return builder.build();
-                    }
-                };
-            } else {
-                var client = clientBuilder.build();
-                supplier = new Supplier<StreamingChatModel>() {
-                    @Override
-                    public StreamingChatModel get() {
-                        return new BedrockConverseStreamingChatModel(client, modelId, modelConfig);
-                    }
-                };
-            }
+            Supplier<StreamingChatModel> supplier = new Supplier<StreamingChatModel>() {
+                @Override
+                public StreamingChatModel get() {
+                    return builder.build();
+                }
+            };
 
             return supplier;
         } else {