Merge pull request #1457 from mariofusco/beta4

Bump to langchain4j beta4

Author: geoand

core/deployment/src/main/java/io/quarkiverse/langchain4j/deployment/BeansProcessor.java

@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.image.ImageModel;
 import dev.langchain4j.model.moderation.ModerationModel;
@@ -119,7 +119,7 @@ public void handleProviders(BeanDiscoveryFinishedBuildItem beanDiscoveryFinished
         final String dot = ".";
 
         // bean types for models
-        final String chatModelBeanType = "ChatLanguageModel or StreamingChatLanguageModel";
+        final String chatModelBeanType = "ChatModel or StreamingChatModel";
         final String embeddingModelBeanType = "EmbeddingModel";
         final String scoringModelBeanType = "ScoringModel";
         final String moderationModelBeanType = "ModerationModel";
@@ -188,7 +188,7 @@ public void handleProviders(BeanDiscoveryFinishedBuildItem beanDiscoveryFinished
 
                 String provider = selectProvider(
                         chatCandidateItems,
-                        beanDiscoveryFinished.beanStream().withBeanType(ChatLanguageModel.class),
+                        beanDiscoveryFinished.beanStream().withBeanType(ChatModel.class),
                         userSelectedProvider,
                         chatModelBeanType,
                         configNamespace);
@@ -324,15 +324,15 @@ public void handleProviders(BeanDiscoveryFinishedBuildItem beanDiscoveryFinished
 
         // There can be configured models for which we found no injection points.
         // While we cannot perform full validation of those, we can still add them as beans.
-        // This enabled injection such as @Inject @Any Instance<ChatLanguageModel>
+        // This enabled injection such as @Inject @Any Instance<ChatModel>
 
         // process default configuration
         LangChain4jBuildConfig.BaseConfig defaultConfig = buildConfig.defaultConfig();
         if (!defaultChatModelRequested && !defaultConfig.chatModel().provider().isEmpty()) {
             Optional<String> userSelectedProvider = defaultConfig.chatModel().provider();
             String provider = selectProvider(
                     chatCandidateItems,
-                    beanDiscoveryFinished.beanStream().withBeanType(ChatLanguageModel.class),
+                    beanDiscoveryFinished.beanStream().withBeanType(ChatModel.class),
                     userSelectedProvider,
                     chatModelBeanType,
                     chatModelConfigNamespace);
@@ -404,7 +404,7 @@ public void handleProviders(BeanDiscoveryFinishedBuildItem beanDiscoveryFinished
                 String configNamespace = entry.getKey() + dot + chatModelConfigNamespace;
                 String provider = selectProvider(
                         chatCandidateItems,
-                        beanDiscoveryFinished.beanStream().withBeanType(ChatLanguageModel.class),
+                        beanDiscoveryFinished.beanStream().withBeanType(ChatModel.class),
                         userSelectedProvider,
                         chatModelBeanType,
                         configNamespace);

core/deployment/src/main/java/io/quarkiverse/langchain4j/deployment/ChatMemoryBuildConfig.java

@@ -4,7 +4,7 @@
 
 import dev.langchain4j.memory.ChatMemory;
 import dev.langchain4j.memory.chat.ChatMemoryProvider;
-import dev.langchain4j.model.Tokenizer;
+import dev.langchain4j.model.TokenCountEstimator;
 import dev.langchain4j.store.memory.chat.ChatMemoryStore;
 import dev.langchain4j.store.memory.chat.InMemoryChatMemoryStore;
 import io.quarkiverse.langchain4j.RegisterAiService;
@@ -24,7 +24,7 @@ public interface ChatMemoryBuildConfig {
      * configuration to set things up while also depending on the presence of a bean of type {@link ChatMemoryStore} (for which
      * the extension also provides a default in the form of {@link InMemoryChatMemoryStore}).
      * <p>
-     * If {@code token-window} is used, then the application must also provide a bean of type {@link Tokenizer}.
+     * If {@code token-window} is used, then the application must also provide a bean of type {@link TokenCountEstimator}.
      * <p>
      * Users can choose to provide their own {@link ChatMemoryStore} bean or even their own {@link ChatMemoryProvider} bean
      * if full control over the details is needed.

core/deployment/src/main/java/io/quarkiverse/langchain4j/deployment/ChatMemoryProcessor.java

@@ -7,7 +7,7 @@
 import org.jboss.jandex.ClassType;
 
 import dev.langchain4j.memory.chat.ChatMemoryProvider;
-import dev.langchain4j.model.Tokenizer;
+import dev.langchain4j.model.TokenCountEstimator;
 import dev.langchain4j.store.memory.chat.ChatMemoryStore;
 import io.quarkiverse.langchain4j.runtime.ChatMemoryRecorder;
 import io.quarkiverse.langchain4j.runtime.aiservice.ChatMemoryConfig;
@@ -40,7 +40,7 @@ void setupBeans(ChatMemoryBuildConfig buildConfig, ChatMemoryConfig runtimeConfi
         if (buildConfig.type() == ChatMemoryBuildConfig.Type.MESSAGE_WINDOW) {
             fun = recorder.messageWindow(runtimeConfig);
         } else if (buildConfig.type() == ChatMemoryBuildConfig.Type.TOKEN_WINDOW) {
-            configurator.addInjectionPoint(ClassType.create(Tokenizer.class));
+            configurator.addInjectionPoint(ClassType.create(TokenCountEstimator.class));
             fun = recorder.tokenWindow(runtimeConfig);
         } else {
             throw new IllegalStateException(

core/deployment/src/main/java/io/quarkiverse/langchain4j/deployment/LangChain4jDotNames.java

@@ -6,8 +6,8 @@
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.pdf.PdfFile;
 import dev.langchain4j.memory.chat.ChatMemoryProvider;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.chat.StreamingChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
+import dev.langchain4j.model.chat.StreamingChatModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.image.ImageModel;
 import dev.langchain4j.model.input.structured.StructuredPrompt;
@@ -39,8 +39,8 @@
 import io.quarkiverse.langchain4j.runtime.aiservice.QuarkusAiServiceContextQualifier;
 
 public class LangChain4jDotNames {
-    public static final DotName CHAT_MODEL = DotName.createSimple(ChatLanguageModel.class);
-    public static final DotName STREAMING_CHAT_MODEL = DotName.createSimple(StreamingChatLanguageModel.class);
+    public static final DotName CHAT_MODEL = DotName.createSimple(ChatModel.class);
+    public static final DotName STREAMING_CHAT_MODEL = DotName.createSimple(StreamingChatModel.class);
     public static final DotName SCORING_MODEL = DotName.createSimple(ScoringModel.class);
     public static final DotName EMBEDDING_MODEL = DotName.createSimple(EmbeddingModel.class);
     public static final DotName MODERATION_MODEL = DotName.createSimple(ModerationModel.class);

core/deployment/src/test/java/io/quarkiverse/langchain4j/test/AiServiceMethodParametersAnnotationsTest.java

@@ -19,7 +19,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
 import dev.langchain4j.model.chat.request.ChatRequest;
 import dev.langchain4j.model.chat.response.ChatResponse;
 import dev.langchain4j.service.MemoryId;
@@ -79,10 +79,10 @@ public void execute(BuildContext context) {
         };
     }
 
-    public static class MirrorModelSupplier implements Supplier<ChatLanguageModel> {
+    public static class MirrorModelSupplier implements Supplier<ChatModel> {
         @Override
-        public ChatLanguageModel get() {
-            return new ChatLanguageModel() {
+        public ChatModel get() {
+            return new ChatModel() {
                 @Override
                 public ChatResponse doChat(ChatRequest chatRequest) {
                     return ChatResponse.builder().aiMessage(new AiMessage(chatMessageToText(chatRequest.messages().get(0))))

core/deployment/src/test/java/io/quarkiverse/langchain4j/test/BlockingChatLanguageModelSupplierTest.java

@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
 import dev.langchain4j.model.chat.request.ChatRequest;
 import dev.langchain4j.model.chat.response.ChatResponse;
 import io.quarkiverse.langchain4j.RegisterAiService;
@@ -36,11 +36,11 @@ public String blocking() {
         }
     }
 
-    public static class MyModelSupplier implements Supplier<ChatLanguageModel> {
+    public static class MyModelSupplier implements Supplier<ChatModel> {
 
         @Override
-        public ChatLanguageModel get() {
-            return new ChatLanguageModel() {
+        public ChatModel get() {
+            return new ChatModel() {
                 @Override
                 public ChatResponse doChat(ChatRequest chatRequest) {
                     return ChatResponse.builder().aiMessage(new AiMessage("42")).build();

core/deployment/src/test/java/io/quarkiverse/langchain4j/test/ChatMessageSerializerTest.java

@@ -100,20 +100,19 @@ void should_serialize_and_deserialize_list_with_all_types_of_messages() {
                 systemMessage("Hello from system"),
                 userMessage("Hello from user"),
                 userMessage("Klaus", "Hello from Klaus"),
-                aiMessage("Hello from AI"),
-                aiMessage(ToolExecutionRequest.builder()
+                aiMessage("Hello from AI", List.of(ToolExecutionRequest.builder()
                         .name("calculator")
                         .arguments("{}")
-                        .build()),
+                        .build())),
                 toolExecutionResultMessage("12345", "calculator", "4"));
 
         String json = ChatMessageSerializer.messagesToJson(messages);
         assertThat(json).isEqualTo("[" +
                 "{\"text\":\"Hello from system\",\"type\":\"SYSTEM\"}," +
                 "{\"contents\":[{\"text\":\"Hello from user\",\"type\":\"TEXT\"}],\"type\":\"USER\"}," +
                 "{\"name\":\"Klaus\",\"contents\":[{\"text\":\"Hello from Klaus\",\"type\":\"TEXT\"}],\"type\":\"USER\"}," +
-                "{\"text\":\"Hello from AI\",\"type\":\"AI\"}," +
-                "{\"toolExecutionRequests\":[{\"name\":\"calculator\",\"arguments\":\"{}\"}],\"type\":\"AI\"}," +
+                "{\"toolExecutionRequests\":[{\"name\":\"calculator\",\"arguments\":\"{}\"}],\"text\":\"Hello from AI\",\"type\":\"AI\"},"
+                +
                 "{\"text\":\"4\",\"id\":\"12345\",\"toolName\":\"calculator\",\"type\":\"TOOL_EXECUTION_RESULT\"}" +
                 "]");
 

core/deployment/src/test/java/io/quarkiverse/langchain4j/test/NamedAiServicesAreResolvableByNameTest.java

@@ -17,7 +17,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
 import dev.langchain4j.model.chat.request.ChatRequest;
 import dev.langchain4j.model.chat.response.ChatResponse;
 import dev.langchain4j.service.UserMessage;
@@ -44,7 +44,7 @@ interface MyNamedService {
     }
 
     @Singleton
-    public static class MyLanguageModel implements ChatLanguageModel {
+    public static class MyLanguageModel implements ChatModel {
         @Override
         public ChatResponse doChat(ChatRequest request) {
             return null;

core/deployment/src/test/java/io/quarkiverse/langchain4j/test/NoChatLanguageProviderButCustomBeanTest.java

@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
 import dev.langchain4j.model.chat.request.ChatRequest;
 import dev.langchain4j.model.chat.response.ChatResponse;
 import io.quarkus.test.QuarkusUnitTest;
@@ -21,15 +21,15 @@ public class NoChatLanguageProviderButCustomBeanTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
 
     @Inject
-    ChatLanguageModel chatLanguageModel;
+    ChatModel chatLanguageModel;
 
     @Test
     void test() {
         Assertions.assertThat(chatLanguageModel).isInstanceOf(CustomChatLanguageModel.class);
     }
 
     @Singleton
-    public static class CustomChatLanguageModel implements ChatLanguageModel {
+    public static class CustomChatLanguageModel implements ChatModel {
 
         @Override
         public ChatResponse doChat(ChatRequest request) {

core/deployment/src/test/java/io/quarkiverse/langchain4j/test/NoChatLanguageProviderTest.java

@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.test.QuarkusUnitTest;
 
@@ -22,7 +22,7 @@ public class NoChatLanguageProviderTest {
             .assertException(t -> assertThat(t).isInstanceOf(ConfigurationException.class));
 
     @Inject
-    ChatLanguageModel chatLanguageModel;
+    ChatModel chatLanguageModel;
 
     @Test
     void test() {