diff --git a/langchain4j-dashscope/pom.xml b/langchain4j-dashscope/pom.xml index 241b942d969..fa8bb5f4481 100644 --- a/langchain4j-dashscope/pom.xml +++ b/langchain4j-dashscope/pom.xml @@ -24,7 +24,7 @@ com.alibaba dashscope-sdk-java - 2.10.1 + 2.13.0 diff --git a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenChatModel.java b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenChatModel.java index 731a594df6c..d7c3cf7f4ca 100644 --- a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenChatModel.java +++ b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenChatModel.java @@ -20,7 +20,7 @@ import java.util.List; -import static com.alibaba.dashscope.aigc.generation.models.QwenParam.ResultFormat.MESSAGE; +import static com.alibaba.dashscope.aigc.conversation.ConversationParam.ResultFormat.MESSAGE; import static dev.langchain4j.model.dashscope.QwenHelper.*; import static dev.langchain4j.spi.ServiceHelper.loadFactories; diff --git a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenLanguageModel.java b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenLanguageModel.java index da1d289ca54..9cdf1ecb6f8 100644 --- a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenLanguageModel.java +++ b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenLanguageModel.java @@ -14,7 +14,7 @@ import java.util.List; -import static com.alibaba.dashscope.aigc.generation.models.QwenParam.ResultFormat.MESSAGE; +import static com.alibaba.dashscope.aigc.generation.GenerationParam.ResultFormat.MESSAGE; import static dev.langchain4j.internal.Utils.isNullOrBlank; import static dev.langchain4j.model.dashscope.QwenHelper.*; import static dev.langchain4j.model.dashscope.QwenModelName.QWEN_PLUS; diff --git a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenModelName.java b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenModelName.java index 7538eb861f3..4275db88fb2 100644 --- a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenModelName.java +++ b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenModelName.java @@ -9,8 +9,14 @@ public class QwenModelName { public static final String QWEN_TURBO = "qwen-turbo"; // Qwen base model, 4k context. public static final String QWEN_PLUS = "qwen-plus"; // Qwen plus model, 8k context. public static final String QWEN_MAX = "qwen-max"; // Qwen max model, 200-billion-parameters, 8k context. - public static final String QWEN_7B_CHAT = "qwen-7b-chat"; // Qwen open sourced 7-billion-parameters version - public static final String QWEN_14B_CHAT = "qwen-14b-chat"; // Qwen open sourced 14-billion-parameters version + public static final String QWEN_MAX_LONGCONTEXT = "qwen-max-longcontext"; // Qwen max model, 200-billion-parameters, 30k context. + public static final String QWEN_7B_CHAT = "qwen-7b-chat"; // Qwen open sourced 7-billion-parameters model + public static final String QWEN_14B_CHAT = "qwen-14b-chat"; // Qwen open sourced 14-billion-parameters model + public static final String QWEN_72B_CHAT = "qwen-72b-chat"; // Qwen open sourced 72-billion-parameters model + public static final String QWEN1_5_7B_CHAT = "qwen1.5-7b-chat"; // Qwen open sourced 7-billion-parameters model (v1.5) + public static final String QWEN1_5_14B_CHAT = "qwen1.5-14b-chat"; // Qwen open sourced 14-billion-parameters model (v1.5) + public static final String QWEN1_5_32B_CHAT = "qwen1.5-32b-chat"; // Qwen open sourced 32-billion-parameters model (v1.5) + public static final String QWEN1_5_72B_CHAT = "qwen1.5-72b-chat"; // Qwen open sourced 72-billion-parameters model (v1.5) public static final String QWEN_VL_PLUS = "qwen-vl-plus"; // Qwen multi-modal model, supports image and text information. public static final String QWEN_VL_MAX = "qwen-vl-max"; // Qwen multi-modal model, offers optimal performance on a wider range of complex tasks. diff --git a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingChatModel.java b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingChatModel.java index 6b60fc597a9..60c69dbd832 100644 --- a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingChatModel.java +++ b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingChatModel.java @@ -21,7 +21,7 @@ import java.util.List; -import static com.alibaba.dashscope.aigc.generation.models.QwenParam.ResultFormat.MESSAGE; +import static com.alibaba.dashscope.aigc.conversation.ConversationParam.ResultFormat.MESSAGE; import static dev.langchain4j.model.dashscope.QwenHelper.toQwenMessages; import static dev.langchain4j.model.dashscope.QwenHelper.toQwenMultiModalMessages; import static dev.langchain4j.spi.ServiceHelper.loadFactories; diff --git a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingLanguageModel.java b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingLanguageModel.java index 956f682fce2..b55e902f693 100644 --- a/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingLanguageModel.java +++ b/langchain4j-dashscope/src/main/java/dev/langchain4j/model/dashscope/QwenStreamingLanguageModel.java @@ -17,7 +17,7 @@ import java.util.List; -import static com.alibaba.dashscope.aigc.generation.models.QwenParam.ResultFormat.MESSAGE; +import static com.alibaba.dashscope.aigc.generation.GenerationParam.ResultFormat.MESSAGE; import static dev.langchain4j.internal.Utils.isNullOrBlank; import static dev.langchain4j.model.dashscope.QwenModelName.QWEN_PLUS; import static dev.langchain4j.spi.ServiceHelper.loadFactories; diff --git a/langchain4j-dashscope/src/test/java/dev/langchain4j/model/dashscope/QwenTestHelper.java b/langchain4j-dashscope/src/test/java/dev/langchain4j/model/dashscope/QwenTestHelper.java index cfa01e159de..e06f90106dd 100644 --- a/langchain4j-dashscope/src/test/java/dev/langchain4j/model/dashscope/QwenTestHelper.java +++ b/langchain4j-dashscope/src/test/java/dev/langchain4j/model/dashscope/QwenTestHelper.java @@ -20,14 +20,32 @@ public class QwenTestHelper { public static Stream languageModelNameProvider() { return Stream.of( Arguments.of(QwenModelName.QWEN_TURBO), - Arguments.of(QwenModelName.QWEN_PLUS) + Arguments.of(QwenModelName.QWEN_PLUS), + Arguments.of(QwenModelName.QWEN_MAX), + Arguments.of(QwenModelName.QWEN_MAX_LONGCONTEXT), + Arguments.of(QwenModelName.QWEN_7B_CHAT), + Arguments.of(QwenModelName.QWEN_14B_CHAT), + Arguments.of(QwenModelName.QWEN_72B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_7B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_14B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_32B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_72B_CHAT) ); } public static Stream nonMultimodalChatModelNameProvider() { return Stream.of( Arguments.of(QwenModelName.QWEN_TURBO), - Arguments.of(QwenModelName.QWEN_PLUS) + Arguments.of(QwenModelName.QWEN_PLUS), + Arguments.of(QwenModelName.QWEN_MAX), + Arguments.of(QwenModelName.QWEN_MAX_LONGCONTEXT), + Arguments.of(QwenModelName.QWEN_7B_CHAT), + Arguments.of(QwenModelName.QWEN_14B_CHAT), + Arguments.of(QwenModelName.QWEN_72B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_7B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_14B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_32B_CHAT), + Arguments.of(QwenModelName.QWEN1_5_72B_CHAT) ); }