Merge PR #46: Add DashScope support

nanobot/config/schema.py

@@ -75,6 +75,7 @@ class ProvidersConfig(BaseModel):
     deepseek: ProviderConfig = Field(default_factory=ProviderConfig)
     groq: ProviderConfig = Field(default_factory=ProviderConfig)
     zhipu: ProviderConfig = Field(default_factory=ProviderConfig)
+    dashscope: ProviderConfig = Field(default_factory=ProviderConfig)  # 阿里云通义千问
     vllm: ProviderConfig = Field(default_factory=ProviderConfig)
     gemini: ProviderConfig = Field(default_factory=ProviderConfig)
     moonshot: ProviderConfig = Field(default_factory=ProviderConfig)
@@ -137,6 +138,8 @@ class Config(BaseSettings):
             "zhipu": self.providers.zhipu,
             "glm": self.providers.zhipu,
             "zai": self.providers.zhipu,
+            "dashscope": self.providers.dashscope,
+            "qwen": self.providers.dashscope,
             "groq": self.providers.groq,
             "moonshot": self.providers.moonshot,
             "kimi": self.providers.moonshot,
@@ -158,8 +161,8 @@ class Config(BaseSettings):
             self.providers.openrouter, self.providers.deepseek,
             self.providers.anthropic, self.providers.openai,
             self.providers.gemini, self.providers.zhipu,
-            self.providers.moonshot, self.providers.vllm,
-            self.providers.groq,
+            self.providers.dashscope, self.providers.moonshot,
+            self.providers.vllm, self.providers.groq,
         ]:
             if provider.api_key:
                 return provider.api_key

nanobot/providers/litellm_provider.py

@@ -53,6 +53,8 @@ class LiteLLMProvider(LLMProvider):
                 os.environ.setdefault("GEMINI_API_KEY", api_key)
             elif "zhipu" in default_model or "glm" in default_model or "zai" in default_model:
                 os.environ.setdefault("ZAI_API_KEY", api_key)
+            elif "dashscope" in default_model or "qwen" in default_model.lower():
+                os.environ.setdefault("DASHSCOPE_API_KEY", api_key)
             elif "groq" in default_model:
                 os.environ.setdefault("GROQ_API_KEY", api_key)
             elif "moonshot" in default_model or "kimi" in default_model:
@@ -101,6 +103,13 @@ class LiteLLMProvider(LLMProvider):
         ):
             model = f"zai/{model}"
 
+        # For DashScope/Qwen, ensure dashscope/ prefix
+        if ("qwen" in model.lower() or "dashscope" in model.lower()) and not (
+            model.startswith("dashscope/") or
+            model.startswith("openrouter/")
+        ):
+            model = f"dashscope/{model}"
+
         # For Moonshot/Kimi, ensure moonshot/ prefix (before vLLM check)
         if ("moonshot" in model.lower() or "kimi" in model.lower()) and not (
             model.startswith("moonshot/") or model.startswith("openrouter/")
@@ -111,6 +120,7 @@ class LiteLLMProvider(LLMProvider):
         if "gemini" in model.lower() and not model.startswith("gemini/"):
             model = f"gemini/{model}"
 
+
         # For vLLM, use hosted_vllm/ prefix per LiteLLM docs
         # Convert openai/ prefix to hosted_vllm/ if user specified it
         if self.is_vllm: