From 029bbf8727de23f4014723c36505b1de20b2bc15 Mon Sep 17 00:00:00 2001 From: sinomoe Date: Wed, 22 Jan 2025 14:11:52 +0800 Subject: [PATCH 1/2] feat(ark): support doubao 1.5 series of models --- .../volcengine_maas/llm/models.py | 16 +++++++++++++ .../volcengine_maas/volcengine_maas.yaml | 24 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py b/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py index 7c37368086e0e6..1cd497652e22db 100644 --- a/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py +++ b/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py @@ -18,6 +18,22 @@ class ModelConfig(BaseModel): configs: dict[str, ModelConfig] = { + "Doubao-1.5-vision-pro-32k": ModelConfig( + properties=ModelProperties(context_size=32768, max_tokens=12288, mode=LLMMode.CHAT), + features=[ModelFeature.VISION], + ), + "Doubao-1.5-pro-32k": ModelConfig( + properties=ModelProperties(context_size=32768, max_tokens=12288, mode=LLMMode.CHAT), + features=[], + ), + "Doubao-1.5-lite-32k": ModelConfig( + properties=ModelProperties(context_size=32768, max_tokens=12288, mode=LLMMode.CHAT), + features=[], + ), + "Doubao-1.5-pro-256k": ModelConfig( + properties=ModelProperties(context_size=262144, max_tokens=12288, mode=LLMMode.CHAT), + features=[], + ), "Doubao-vision-pro-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=4096, mode=LLMMode.CHAT), features=[ModelFeature.VISION], diff --git a/api/core/model_runtime/model_providers/volcengine_maas/volcengine_maas.yaml b/api/core/model_runtime/model_providers/volcengine_maas/volcengine_maas.yaml index 2ddb612546690c..976cd26ac932b6 100644 --- a/api/core/model_runtime/model_providers/volcengine_maas/volcengine_maas.yaml +++ b/api/core/model_runtime/model_providers/volcengine_maas/volcengine_maas.yaml @@ -118,6 +118,30 @@ model_credential_schema: type: select required: true options: + - label: + en_US: Doubao-1.5-vision-pro-32k + value: Doubao-1.5-vision-pro-32k + show_on: + - variable: __model_type + value: llm + - label: + en_US: Doubao-1.5-pro-32k + value: Doubao-1.5-pro-32k + show_on: + - variable: __model_type + value: llm + - label: + en_US: Doubao-1.5-lite-32k + value: Doubao-1.5-lite-32k + show_on: + - variable: __model_type + value: llm + - label: + en_US: Doubao-1.5-pro-256k + value: Doubao-1.5-pro-256k + show_on: + - variable: __model_type + value: llm - label: en_US: Doubao-vision-pro-32k value: Doubao-vision-pro-32k From 7a962484ce0139df46eb082136800bfcf84778ba Mon Sep 17 00:00:00 2001 From: sinomoe Date: Wed, 22 Jan 2025 14:25:42 +0800 Subject: [PATCH 2/2] feat(ark): support doubao 1.5 series of models --- .../volcengine_maas/llm/models.py | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py b/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py index 1cd497652e22db..94315cd026a80a 100644 --- a/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py +++ b/api/core/model_runtime/model_providers/volcengine_maas/llm/models.py @@ -20,86 +20,91 @@ class ModelConfig(BaseModel): configs: dict[str, ModelConfig] = { "Doubao-1.5-vision-pro-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=12288, mode=LLMMode.CHAT), - features=[ModelFeature.VISION], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.VISION], ), "Doubao-1.5-pro-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=12288, mode=LLMMode.CHAT), - features=[], + features=[ModelFeature.AGENT_THOUGHT], ), "Doubao-1.5-lite-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=12288, mode=LLMMode.CHAT), - features=[], + features=[ModelFeature.AGENT_THOUGHT], ), "Doubao-1.5-pro-256k": ModelConfig( properties=ModelProperties(context_size=262144, max_tokens=12288, mode=LLMMode.CHAT), - features=[], + features=[ModelFeature.AGENT_THOUGHT], ), "Doubao-vision-pro-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.VISION], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.VISION], ), "Doubao-vision-lite-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.VISION], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.VISION], ), "Doubao-pro-4k": ModelConfig( properties=ModelProperties(context_size=4096, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Doubao-lite-4k": ModelConfig( properties=ModelProperties(context_size=4096, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Doubao-pro-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Doubao-lite-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Doubao-pro-256k": ModelConfig( properties=ModelProperties(context_size=262144, max_tokens=4096, mode=LLMMode.CHAT), - features=[], + features=[ModelFeature.AGENT_THOUGHT], ), "Doubao-pro-128k": ModelConfig( properties=ModelProperties(context_size=131072, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Doubao-lite-128k": ModelConfig( - properties=ModelProperties(context_size=131072, max_tokens=4096, mode=LLMMode.CHAT), features=[] + properties=ModelProperties(context_size=131072, max_tokens=4096, mode=LLMMode.CHAT), + features=[ModelFeature.AGENT_THOUGHT], ), "Skylark2-pro-4k": ModelConfig( - properties=ModelProperties(context_size=4096, max_tokens=4096, mode=LLMMode.CHAT), features=[] + properties=ModelProperties(context_size=4096, max_tokens=4096, mode=LLMMode.CHAT), + features=[ModelFeature.AGENT_THOUGHT], ), "Llama3-8B": ModelConfig( - properties=ModelProperties(context_size=8192, max_tokens=8192, mode=LLMMode.CHAT), features=[] + properties=ModelProperties(context_size=8192, max_tokens=8192, mode=LLMMode.CHAT), + features=[ModelFeature.AGENT_THOUGHT], ), "Llama3-70B": ModelConfig( - properties=ModelProperties(context_size=8192, max_tokens=8192, mode=LLMMode.CHAT), features=[] + properties=ModelProperties(context_size=8192, max_tokens=8192, mode=LLMMode.CHAT), + features=[ModelFeature.AGENT_THOUGHT], ), "Moonshot-v1-8k": ModelConfig( properties=ModelProperties(context_size=8192, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Moonshot-v1-32k": ModelConfig( properties=ModelProperties(context_size=32768, max_tokens=16384, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Moonshot-v1-128k": ModelConfig( properties=ModelProperties(context_size=131072, max_tokens=65536, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "GLM3-130B": ModelConfig( properties=ModelProperties(context_size=8192, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "GLM3-130B-Fin": ModelConfig( properties=ModelProperties(context_size=8192, max_tokens=4096, mode=LLMMode.CHAT), - features=[ModelFeature.TOOL_CALL], + features=[ModelFeature.AGENT_THOUGHT, ModelFeature.TOOL_CALL], ), "Mistral-7B": ModelConfig( - properties=ModelProperties(context_size=8192, max_tokens=2048, mode=LLMMode.CHAT), features=[] + properties=ModelProperties(context_size=8192, max_tokens=2048, mode=LLMMode.CHAT), + features=[ModelFeature.AGENT_THOUGHT], ), }