diff --git a/pkg/core/app.py b/pkg/core/app.py index bfea617b..e543cd27 100644 --- a/pkg/core/app.py +++ b/pkg/core/app.py @@ -215,8 +215,6 @@ class Application: await self.tool_mgr.shutdown() - latest_llm_model_config = await config.load_json_config("data/metadata/llm-models.json", "templates/metadata/llm-models.json") - self.llm_models_meta = latest_llm_model_config llm_model_mgr_inst = llm_model_mgr.ModelManager(self) await llm_model_mgr_inst.initialize() self.model_mgr = llm_model_mgr_inst diff --git a/pkg/core/bootutils/files.py b/pkg/core/bootutils/files.py index f52f7b09..c1d077d7 100644 --- a/pkg/core/bootutils/files.py +++ b/pkg/core/bootutils/files.py @@ -13,15 +13,12 @@ required_files = { "data/config/platform.json": "templates/platform.json", "data/config/provider.json": "templates/provider.json", "data/config/system.json": "templates/system.json", - "data/scenario/default.json": "templates/scenario-template.json", } required_paths = [ "temp", "data", "data/metadata", - "data/prompts", - "data/scenario", "data/logs", "data/config", "data/labels", diff --git a/pkg/core/stages/load_config.py b/pkg/core/stages/load_config.py index 9476240a..e7a7cb05 100644 --- a/pkg/core/stages/load_config.py +++ b/pkg/core/stages/load_config.py @@ -75,9 +75,6 @@ class LoadConfigStage(stage.BootingStage): ap.adapter_qq_botpy_meta = await config.load_json_config("data/metadata/adapter-qq-botpy.json", "templates/metadata/adapter-qq-botpy.json") await ap.adapter_qq_botpy_meta.dump_config() - ap.llm_models_meta = await config.load_json_config("data/metadata/llm-models.json", "templates/metadata/llm-models.json") - await ap.llm_models_meta.dump_config() - ap.instance_secret_meta = await config.load_json_config("data/metadata/instance-secret.json", template_data={ 'jwt_secret': secrets.token_hex(16) }) diff --git a/templates/metadata/llm-models.json b/templates/metadata/llm-models.json deleted file mode 100644 index a12c7687..00000000 --- a/templates/metadata/llm-models.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "list": [ - { - "name": "default", - "requester": "openai-chat-completions", - "token_mgr": "openai", - "tool_call_supported": false, - "vision_supported": false - }, - { - "name": "gpt-4o", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "gpt-4o-2024-11-20", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "gpt-4o-2024-08-06", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "gpt-4o-2024-05-13", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "chatgpt-4o-latest", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "gpt-4o-mini", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "o1-preview", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "o1-mini", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "gpt-4-turbo", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "gpt-4", - "tool_call_supported": true, - "vision_supported": true - }, - { - "name": "gpt-3.5-turbo", - "tool_call_supported": true, - "vision_supported": false - }, - { - "model_name": "SparkDesk", - "name": "OneAPI/SparkDesk" - }, - { - "model_name": "gemini-pro", - "name": "OneAPI/gemini-pro" - }, - { - "name": "claude-3-opus-latest", - "requester": "anthropic-messages", - "token_mgr": "anthropic", - "vision_supported": true, - "tool_call_supported": true - }, - { - "name": "claude-3-5-sonnet-latest", - "requester": "anthropic-messages", - "token_mgr": "anthropic", - "vision_supported": true, - "tool_call_supported": true - }, - { - "name": "claude-3-5-haiku-latest", - "requester": "anthropic-messages", - "token_mgr": "anthropic", - "vision_supported": true, - "tool_call_supported": true - }, - { - "name": "claude-3-7-sonnet-latest", - "requester": "anthropic-messages", - "token_mgr": "anthropic", - "vision_supported": true, - "tool_call_supported": true - }, - { - "name": "moonshot-v1-8k", - "requester": "moonshot-chat-completions", - "token_mgr": "moonshot", - "tool_call_supported": true - }, - { - "name": "moonshot-v1-32k", - "requester": "moonshot-chat-completions", - "token_mgr": "moonshot", - "tool_call_supported": true - }, - { - "name": "moonshot-v1-128k", - "requester": "moonshot-chat-completions", - "token_mgr": "moonshot", - "tool_call_supported": true - }, - { - "name": "deepseek-chat", - "requester": "deepseek-chat-completions", - "token_mgr": "deepseek" - }, - { - "name": "deepseek-coder", - "requester": "deepseek-chat-completions", - "token_mgr": "deepseek" - }, - { - "name": "deepseek-reasoner", - "requester": "deepseek-chat-completions", - "token_mgr": "deepseek" - }, - { - "name": "grok-2-latest", - "requester": "xai-chat-completions", - "token_mgr": "xai" - }, - { - "name": "grok-2", - "requester": "xai-chat-completions", - "token_mgr": "xai" - }, - { - "name": "grok-2-vision-1212", - "requester": "xai-chat-completions", - "token_mgr": "xai", - "vision_supported": true - }, - { - "name": "grok-2-1212", - "requester": "xai-chat-completions", - "token_mgr": "xai" - }, - { - "name": "grok-vision-beta", - "requester": "xai-chat-completions", - "token_mgr": "xai", - "vision_supported": true - }, - { - "name": "grok-beta", - "requester": "xai-chat-completions", - "token_mgr": "xai" - }, - { - "name": "glm-4-plus", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "tool_call_supported": true - }, - { - "name": "glm-4-0520", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "tool_call_supported": true - }, - { - "name": "glm-4-air", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "tool_call_supported": true - }, - { - "name": "glm-4-airx", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "tool_call_supported": true - }, - { - "name": "glm-4-long", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "tool_call_supported": true - }, - { - "name": "glm-4-flashx", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "tool_call_supported": true - }, - { - "name": "glm-4-flash", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "tool_call_supported": true - }, - { - "name": "glm-4v-plus", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "vision_supported": true, - "tool_call_supported": true - }, - { - "name": "glm-4v", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "vision_supported": true, - "tool_call_supported": true - }, - { - "name": "glm-4v-flash", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "vision_supported": true, - "tool_call_supported": true - }, - { - "name": "glm-zero-preview", - "requester": "zhipuai-chat-completions", - "token_mgr": "zhipuai", - "vision_supported": true, - "tool_call_supported": true - } - ] -} \ No newline at end of file diff --git a/templates/scenario-template.json b/templates/scenario-template.json deleted file mode 100644 index d9b7267a..00000000 --- a/templates/scenario-template.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "prompt": [ - { - "role": "system", - "content": "You are a helpful assistant. 如果我需要帮助,你要说“输入!help获得帮助”" - }, - { - "role": "assistant", - "content": "好的,我是一个能干的AI助手。 如果你需要帮助,我会说“输入!help获得帮助”" - } - ] -} \ No newline at end of file