feat: release 2.0.3

models/claudeapi/claude_api_bot.py

@@ -30,11 +30,20 @@ user_session = dict()
 class ClaudeAPIBot(Bot, OpenAIImage):
     def __init__(self):
         super().__init__()
-        self.api_key = conf().get("claude_api_key")
-        self.api_base = conf().get("claude_api_base") or "https://api.anthropic.com/v1"
-        self.proxy = conf().get("proxy", None)
         self.sessions = SessionManager(BaiduWenxinSession, model=conf().get("model") or "text-davinci-003")
 
+    @property
+    def api_key(self):
+        return conf().get("claude_api_key")
+
+    @property
+    def api_base(self):
+        return conf().get("claude_api_base") or "https://api.anthropic.com/v1"
+
+    @property
+    def proxy(self):
+        return conf().get("proxy", None)
+
     def reply(self, query, context=None):
         # acquire reply content
         if context and context.type:

models/dashscope/dashscope_bot.py

@@ -35,10 +35,14 @@ class DashscopeBot(Bot):
         super().__init__()
         self.sessions = SessionManager(DashscopeSession, model=conf().get("model") or "qwen-plus")
         self.model_name = conf().get("model") or "qwen-plus"
-        self.api_key = conf().get("dashscope_api_key")
-        if self.api_key:
-            os.environ["DASHSCOPE_API_KEY"] = self.api_key
         self.client = dashscope.Generation
+        api_key = conf().get("dashscope_api_key")
+        if api_key:
+            os.environ["DASHSCOPE_API_KEY"] = api_key
+
+    @property
+    def api_key(self):
+        return conf().get("dashscope_api_key")
 
     @staticmethod
     def _is_multimodal_model(model_name: str) -> bool:

models/doubao/doubao_bot.py

@@ -24,13 +24,17 @@ class DoubaoBot(Bot):
             "temperature": conf().get("temperature", 0.8),
             "top_p": conf().get("top_p", 1.0),
         }
-        self.api_key = conf().get("ark_api_key")
-        self.base_url = conf().get("ark_base_url", "https://ark.cn-beijing.volces.com/api/v3")
-        # Ensure base_url does not end with /chat/completions
-        if self.base_url.endswith("/chat/completions"):
-            self.base_url = self.base_url.rsplit("/chat/completions", 1)[0]
-        if self.base_url.endswith("/"):
-            self.base_url = self.base_url.rstrip("/")
+
+    @property
+    def api_key(self):
+        return conf().get("ark_api_key")
+
+    @property
+    def base_url(self):
+        url = conf().get("ark_base_url", "https://ark.cn-beijing.volces.com/api/v3")
+        if url.endswith("/chat/completions"):
+            url = url.rsplit("/chat/completions", 1)[0]
+        return url.rstrip("/")
 
     def reply(self, query, context=None):
         # acquire reply content

models/gemini/google_gemini_bot.py

@@ -28,21 +28,18 @@ class GoogleGeminiBot(Bot):
 
     def __init__(self):
         super().__init__()
-        self.api_key = conf().get("gemini_api_key")
-        # 复用chatGPT的token计算方式
         self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "gpt-3.5-turbo")
-        self.model = conf().get("model") or "gemini-pro"
-        if self.model == "gemini":
-            self.model = "gemini-pro"
-        
-        # 支持自定义API base地址
-        self.api_base = conf().get("gemini_api_base", "").strip()
-        if self.api_base:
-            # 移除末尾的斜杠
-            self.api_base = self.api_base.rstrip('/')
-            logger.info(f"[Gemini] Using custom API base: {self.api_base}")
-        else:
-            self.api_base = "https://generativelanguage.googleapis.com"
+
+    @property
+    def api_key(self):
+        return conf().get("gemini_api_key")
+
+    @property
+    def api_base(self):
+        base = conf().get("gemini_api_base", "").strip()
+        if base:
+            return base.rstrip('/')
+        return "https://generativelanguage.googleapis.com"
 
     def reply(self, query, context: Context = None) -> Reply:
         session_id = None

models/minimax/minimax_bot.py

@@ -24,21 +24,19 @@ class MinimaxBot(Bot):
             "temperature": conf().get("temperature", 0.3),
             "top_p": conf().get("top_p", 0.95),
         }
-        # Use unified key name: minimax_api_key
-        self.api_key = conf().get("minimax_api_key")
-        if not self.api_key:
-            # Fallback to old key name for backward compatibility
-            self.api_key = conf().get("Minimax_api_key")
-            if self.api_key:
-                logger.warning("[MINIMAX] 'Minimax_api_key' is deprecated, please use 'minimax_api_key' instead")
-
-        # REST API endpoint
-        # Use Chinese endpoint by default, users can override in config
-        # International users should set: "minimax_api_base": "https://api.minimax.io/v1"
-        self.api_base = conf().get("minimax_api_base", "https://api.minimaxi.com/v1")
-
         self.sessions = SessionManager(MinimaxSession, model=const.MiniMax)
 
+    @property
+    def api_key(self):
+        key = conf().get("minimax_api_key")
+        if not key:
+            key = conf().get("Minimax_api_key")
+        return key
+
+    @property
+    def api_base(self):
+        return conf().get("minimax_api_base", "https://api.minimaxi.com/v1")
+
     def reply(self, query, context: Context = None) -> Reply:
         # acquire reply content
         logger.info("[MINIMAX] query={}".format(query))

models/modelscope/modelscope_bot.py

@@ -26,8 +26,14 @@ class ModelScopeBot(Bot):
             "temperature": conf().get("temperature", 0.3),  # 如果设置，值域须为 [0, 1] 我们推荐 0.3，以达到较合适的效果。
             "top_p": conf().get("top_p", 1.0),  # 使用默认值
         }
-        self.api_key = conf().get("modelscope_api_key")
-        self.base_url = conf().get("modelscope_base_url", "https://api-inference.modelscope.cn/v1/chat/completions")
+
+    @property
+    def api_key(self):
+        return conf().get("modelscope_api_key")
+
+    @property
+    def base_url(self):
+        return conf().get("modelscope_base_url", "https://api-inference.modelscope.cn/v1/chat/completions")
         """
         需要获取ModelScope支持API-inference的模型名称列表，请到魔搭社区官网模型中心查看 https://modelscope.cn/models?filter=inference_type&page=1。
         或者使用命令 curl https://api-inference.modelscope.cn/v1/models 对模型列表和ID进行获取。查看commend/const.py文件也可以获取模型列表。

models/moonshot/moonshot_bot.py

@@ -26,13 +26,17 @@ class MoonshotBot(Bot):
             "temperature": conf().get("temperature", 0.3),
             "top_p": conf().get("top_p", 1.0),
         }
-        self.api_key = conf().get("moonshot_api_key")
-        self.base_url = conf().get("moonshot_base_url", "https://api.moonshot.cn/v1")
-        # Ensure base_url does not end with /chat/completions (backward compat)
-        if self.base_url.endswith("/chat/completions"):
-            self.base_url = self.base_url.rsplit("/chat/completions", 1)[0]
-        if self.base_url.endswith("/"):
-            self.base_url = self.base_url.rstrip("/")
+
+    @property
+    def api_key(self):
+        return conf().get("moonshot_api_key")
+
+    @property
+    def base_url(self):
+        url = conf().get("moonshot_base_url", "https://api.moonshot.cn/v1")
+        if url.endswith("/chat/completions"):
+            url = url.rsplit("/chat/completions", 1)[0]
+        return url.rstrip("/")
 
     def reply(self, query, context=None):
         # acquire reply content