Merge branch 'master' into master

pkg/core/app.py

@@ -197,5 +197,27 @@ class Application:
 
                 await self.plugin_mgr.load_plugins()
                 await self.plugin_mgr.initialize_plugins()
+            case core_entities.LifecycleControlScope.PROVIDER.value:
+                self.logger.info("执行热重载 scope="+scope)
+
+                llm_model_mgr_inst = llm_model_mgr.ModelManager(self)
+                await llm_model_mgr_inst.initialize()
+                self.model_mgr = llm_model_mgr_inst
+
+                llm_session_mgr_inst = llm_session_mgr.SessionManager(self)
+                await llm_session_mgr_inst.initialize()
+                self.sess_mgr = llm_session_mgr_inst
+
+                llm_prompt_mgr_inst = llm_prompt_mgr.PromptManager(self)
+                await llm_prompt_mgr_inst.initialize()
+                self.prompt_mgr = llm_prompt_mgr_inst
+
+                llm_tool_mgr_inst = llm_tool_mgr.ToolManager(self)
+                await llm_tool_mgr_inst.initialize()
+                self.tool_mgr = llm_tool_mgr_inst
+
+                runner_mgr_inst = runnermgr.RunnerManager(self)
+                await runner_mgr_inst.initialize()
+                self.runner_mgr = runner_mgr_inst
             case _:
-                pass
+                pass

pkg/core/bootutils/files.py

@@ -24,6 +24,7 @@ required_paths = [
     "data/scenario",
     "data/logs",
     "data/config",
+    "data/labels",
     "plugins"
 ]
 

pkg/core/entities.py

@@ -23,6 +23,7 @@ class LifecycleControlScope(enum.Enum):
     APPLICATION = "application"
     PLATFORM = "platform"
     PLUGIN = "plugin"
+    PROVIDER = "provider"
 
 
 class LauncherTypes(enum.Enum):

pkg/core/migrations/m018_xai_config.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("xai-config", 18)
+class XaiConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return 'xai-chat-completions' not in self.ap.provider_cfg.data['requester']
+
+    async def run(self):
+        """执行迁移"""
+        self.ap.provider_cfg.data['requester']['xai-chat-completions'] = {
+            "base-url": "https://api.x.ai/v1",
+            "args": {},
+            "timeout": 120
+        }
+        self.ap.provider_cfg.data['keys']['xai'] = [
+            "xai-1234567890"
+        ]
+
+        await self.ap.provider_cfg.dump_config()

pkg/core/migrations/m019_zhipuai_config.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("zhipuai-config", 19)
+class ZhipuaiConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return 'zhipuai-chat-completions' not in self.ap.provider_cfg.data['requester']
+
+    async def run(self):
+        """执行迁移"""
+        self.ap.provider_cfg.data['requester']['zhipuai-chat-completions'] = {
+            "base-url": "https://open.bigmodel.cn/api/paas/v4",
+            "args": {},
+            "timeout": 120
+        }
+        self.ap.provider_cfg.data['keys']['zhipuai'] = [
+            "xxxxxxx"
+        ]
+
+        await self.ap.provider_cfg.dump_config()

pkg/core/stages/migrate.py

@@ -7,7 +7,7 @@ from .. import migration
 from ..migrations import m001_sensitive_word_migration, m002_openai_config_migration, m003_anthropic_requester_cfg_completion, m004_moonshot_cfg_completion
 from ..migrations import m005_deepseek_cfg_completion, m006_vision_config, m007_qcg_center_url, m008_ad_fixwin_config_migrate, m009_msg_truncator_cfg
 from ..migrations import m010_ollama_requester_config, m011_command_prefix_config, m012_runner_config, m013_http_api_config, m014_force_delay_config
-from ..migrations import m015_gitee_ai_config, m016_dify_service_api, m017_dify_api_timeout_params
+from ..migrations import m015_gitee_ai_config, m016_dify_service_api, m017_dify_api_timeout_params, m018_xai_config, m019_zhipuai_config
 from ..migrations import m020_wecom_config