feat: support channel start in sub thread

common/linkai_client.py

@@ -2,9 +2,12 @@ from bridge.context import Context, ContextType
 from bridge.reply import Reply, ReplyType
 from common.log import logger
 from linkai import LinkAIClient, PushMsg
-from config import conf, pconf, plugin_config, available_setting, write_plugin_config
+from config import conf, pconf, plugin_config, available_setting, write_plugin_config, get_root
 from plugins import PluginManager
+import threading
 import time
+import json
+import os
 
 
 chat_client: LinkAIClient
@@ -15,6 +18,7 @@ class ChatClient(LinkAIClient):
         super().__init__(api_key, host)
         self.channel = channel
         self.client_type = channel.channel_type
+        self.channel_mgr = None
 
     def on_message(self, push_msg: PushMsg):
         session_id = push_msg.session_id
@@ -34,9 +38,12 @@ class ChatClient(LinkAIClient):
             return
 
         local_config = conf()
+        need_restart_channel = False
+        
         for key in config.keys():
             if key in available_setting and config.get(key) is not None:
                 local_config[key] = config.get(key)
+        
         # 语音配置
         reply_voice_mode = config.get("reply_voice_mode")
         if reply_voice_mode:
@@ -50,6 +57,55 @@ class ChatClient(LinkAIClient):
                 local_config["always_reply_voice"] = False
                 local_config["voice_reply_voice"] = False
 
+        # Model configuration
+        if config.get("model"):
+            local_config["model"] = config.get("model")
+        
+        # Channel configuration
+        if config.get("channelType"):
+            if local_config.get("channel_type") != config.get("channelType"):
+                local_config["channel_type"] = config.get("channelType")
+                need_restart_channel = True
+        
+        # Channel-specific app credentials
+        current_channel_type = local_config.get("channel_type", "")
+        
+        if config.get("app_id") is not None:
+            if current_channel_type == "feishu":
+                if local_config.get("feishu_app_id") != config.get("app_id"):
+                    local_config["feishu_app_id"] = config.get("app_id")
+                    need_restart_channel = True
+            elif current_channel_type == "dingtalk":
+                if local_config.get("dingtalk_client_id") != config.get("app_id"):
+                    local_config["dingtalk_client_id"] = config.get("app_id")
+                    need_restart_channel = True
+            elif current_channel_type == "wechatmp" or current_channel_type == "wechatmp_service":
+                if local_config.get("wechatmp_app_id") != config.get("app_id"):
+                    local_config["wechatmp_app_id"] = config.get("app_id")
+                    need_restart_channel = True
+            elif current_channel_type == "wechatcom_app":
+                if local_config.get("wechatcomapp_agent_id") != config.get("app_id"):
+                    local_config["wechatcomapp_agent_id"] = config.get("app_id")
+                    need_restart_channel = True
+        
+        if config.get("app_secret"):
+            if current_channel_type == "feishu":
+                if local_config.get("feishu_app_secret") != config.get("app_secret"):
+                    local_config["feishu_app_secret"] = config.get("app_secret")
+                    need_restart_channel = True
+            elif current_channel_type == "dingtalk":
+                if local_config.get("dingtalk_client_secret") != config.get("app_secret"):
+                    local_config["dingtalk_client_secret"] = config.get("app_secret")
+                    need_restart_channel = True
+            elif current_channel_type == "wechatmp" or current_channel_type == "wechatmp_service":
+                if local_config.get("wechatmp_app_secret") != config.get("app_secret"):
+                    local_config["wechatmp_app_secret"] = config.get("app_secret")
+                    need_restart_channel = True
+            elif current_channel_type == "wechatcom_app":
+                if local_config.get("wechatcomapp_secret") != config.get("app_secret"):
+                    local_config["wechatcomapp_secret"] = config.get("app_secret")
+                    need_restart_channel = True
+
         if config.get("admin_password"):
             if not pconf("Godcmd"):
                 write_plugin_config({"Godcmd": {"password": config.get("admin_password"), "admin_users": []} })
@@ -71,11 +127,67 @@ class ChatClient(LinkAIClient):
         elif config.get("text_to_image") and config.get("text_to_image") in ["dall-e-2", "dall-e-3"]:
             if pconf("linkai")["midjourney"]:
                 pconf("linkai")["midjourney"]["use_image_create_prefix"] = False
+        
+        # Save configuration to config.json file
+        self._save_config_to_file(local_config)
+
+        if need_restart_channel:
+            self._restart_channel(local_config.get("channel_type", ""))
+    
+    def _restart_channel(self, new_channel_type: str):
+        """
+        Restart the channel via ChannelManager when channel type changes.
+        """
+        if self.channel_mgr:
+            logger.info(f"[LinkAI] Restarting channel to '{new_channel_type}'...")
+            threading.Thread(target=self._do_restart_channel, args=(self.channel_mgr, new_channel_type), daemon=True).start()
+        else:
+            logger.warning("[LinkAI] ChannelManager not available, please restart the application manually")
+
+    def _do_restart_channel(self, mgr, new_channel_type: str):
+        """
+        Perform the channel restart in a separate thread to avoid blocking the config callback.
+        """
+        try:
+            mgr.restart(new_channel_type)
+            # Update the linkai client's channel reference
+            if mgr.channel:
+                self.channel = mgr.channel
+                self.client_type = mgr.channel.channel_type
+                logger.info(f"[LinkAI] Channel reference updated to '{new_channel_type}'")
+        except Exception as e:
+            logger.error(f"[LinkAI] Channel restart failed: {e}")
+
+    def _save_config_to_file(self, local_config: dict):
+        """
+        Save configuration to config.json file
+        """
+        try:
+            config_path = os.path.join(get_root(), "config.json")
+            if not os.path.exists(config_path):
+                logger.warning(f"[LinkAI] config.json not found at {config_path}, skip saving")
+                return
+            
+            # Read current config file
+            with open(config_path, "r", encoding="utf-8") as f:
+                file_config = json.load(f)
+            
+            # Update file config with memory config
+            file_config.update(dict(local_config))
+            
+            # Write back to file
+            with open(config_path, "w", encoding="utf-8") as f:
+                json.dump(file_config, f, indent=4, ensure_ascii=False)
+            
+            logger.info("[LinkAI] Configuration saved to config.json successfully")
+        except Exception as e:
+            logger.error(f"[LinkAI] Failed to save configuration to config.json: {e}")
 
 
-def start(channel):
+def start(channel, channel_mgr=None):
     global chat_client
-    chat_client = ChatClient(api_key=conf().get("linkai_api_key"), host="", channel=channel)
+    chat_client = ChatClient(api_key=conf().get("linkai_api_key"), channel=channel)
+    chat_client.channel_mgr = channel_mgr
     chat_client.config = _build_config()
     chat_client.start()
     time.sleep(1.5)
@@ -97,14 +209,38 @@ def _build_config():
         "nick_name_black_list": local_conf.get("nick_name_black_list"),
         "speech_recognition": "Y" if local_conf.get("speech_recognition") else "N",
         "text_to_image": local_conf.get("text_to_image"),
-        "image_create_prefix": local_conf.get("image_create_prefix")
+        "image_create_prefix": local_conf.get("image_create_prefix"),
+        "model": local_conf.get("model"),
+        "agent_max_context_turns": local_conf.get("agent_max_context_turns"),
+        "agent_max_context_tokens": local_conf.get("agent_max_context_tokens"),
+        "agent_max_steps": local_conf.get("agent_max_steps"),
+        "channelType": local_conf.get("channel_type")
     }
+    
     if local_conf.get("always_reply_voice"):
         config["reply_voice_mode"] = "always_reply_voice"
     elif local_conf.get("voice_reply_voice"):
         config["reply_voice_mode"] = "voice_reply_voice"
+    
     if pconf("linkai"):
         config["group_app_map"] = pconf("linkai").get("group_app_map")
+    
     if plugin_config.get("Godcmd"):
         config["admin_password"] = plugin_config.get("Godcmd").get("password")
+    
+    # Add channel-specific app credentials
+    current_channel_type = local_conf.get("channel_type", "")
+    if current_channel_type == "feishu":
+        config["app_id"] = local_conf.get("feishu_app_id")
+        config["app_secret"] = local_conf.get("feishu_app_secret")
+    elif current_channel_type == "dingtalk":
+        config["app_id"] = local_conf.get("dingtalk_client_id")
+        config["app_secret"] = local_conf.get("dingtalk_client_secret")
+    elif current_channel_type == "wechatmp" or current_channel_type == "wechatmp_service":
+        config["app_id"] = local_conf.get("wechatmp_app_id")
+        config["app_secret"] = local_conf.get("wechatmp_app_secret")
+    elif current_channel_type == "wechatcom_app":
+        config["app_id"] = local_conf.get("wechatcomapp_agent_id")
+        config["app_secret"] = local_conf.get("wechatcomapp_secret")
+    
     return config