chore: release v3.4.2

增加xAI模型支持

.github/workflows/build-dev-image.yaml

@@ -7,9 +7,14 @@ on:
 jobs:
   build-dev-image:
     runs-on: ubuntu-latest
+    # 如果是tag则跳过
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+
       - name: Generate Tag
         id: generate_tag
         run: |

.github/workflows/build-docker-image.yml

@@ -13,6 +13,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+
       - name: judge has env GITHUB_REF  # 如果没有GITHUB_REF环境变量，则把github.ref变量赋值给GITHUB_REF
         run: |
           if [ -z "$GITHUB_REF" ]; then

.github/workflows/build-release-artifacts.yaml

@@ -12,6 +12,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       - name: Check version
         id: check_version
@@ -50,3 +52,11 @@ jobs:
         with:
           name: langbot-${{ steps.check_version.outputs.version }}-all
           path: .
+
+      - name: Upload To Release
+        env:
+          GH_TOKEN: ${{ secrets.RELEASE_UPLOAD_GITHUB_TOKEN }}
+        run: |
+          # 本目录下所有文件打包成zip
+          zip -r langbot-${{ steps.check_version.outputs.version }}-all.zip .
+          gh release upload ${{ github.event.release.tag_name }} langbot-${{ steps.check_version.outputs.version }}-all.zip

.github/workflows/test-pr.yml

@@ -1,80 +0,0 @@
-name: Test Pull Request
-
-on:
-  pull_request:
-    types: [ready_for_review]
-    paths:
-      # 任何py文件改动都会触发
-      - '**.py'
-  pull_request_review:
-    types: [submitted]
-  issue_comment:
-    types: [created]
-  # 允许手动触发
-  workflow_dispatch:
-
-jobs:
-  perform-test:
-    runs-on: ubuntu-latest
-    # 如果事件为pull_request_review且review状态为approved，则执行
-    if: >
-      github.event_name == 'pull_request' ||
-      (github.event_name == 'pull_request_review' && github.event.review.state == 'APPROVED') ||
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'issue_comment' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/test') && github.event.comment.user.login == 'RockChinQ')
-    steps:
-      # 签出测试工程仓库代码
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          # 仓库地址
-          repository: RockChinQ/qcg-tester
-          # 仓库路径
-          path: qcg-tester
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.10'
-
-      - name: Install dependencies
-        run: |
-          cd qcg-tester
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Get PR details
-        id: get-pr
-        if: github.event_name == 'issue_comment'
-        uses: octokit/request-action@v2.x
-        with:
-          route: GET /repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set PR source branch as env variable
-        if: github.event_name == 'issue_comment'
-        run: |
-          PR_SOURCE_BRANCH=$(echo '${{ steps.get-pr.outputs.data }}' | jq -r '.head.ref')
-          echo "BRANCH=$PR_SOURCE_BRANCH" >> $GITHUB_ENV
-
-      - name: Set PR Branch as bash env
-        if: github.event_name != 'issue_comment'
-        run: |
-          echo "BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
-      - name: Set OpenAI API Key from Secrets
-        run: |
-          echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> $GITHUB_ENV
-      - name: Set OpenAI Reverse Proxy URL from Secrets
-        run: |
-          echo "OPENAI_REVERSE_PROXY=${{ secrets.OPENAI_REVERSE_PROXY }}" >> $GITHUB_ENV
-      - name: Run test
-        run: |
-          cd qcg-tester
-          python main.py
-
-      - name: Upload coverage reports to Codecov
-        run: |
-          cd qcg-tester/resource/QChatGPT
-          curl -Os https://uploader.codecov.io/latest/linux/codecov
-          chmod +x codecov
-          ./codecov -t ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -2,7 +2,6 @@
 .idea/
 __pycache__/
 database.db
-qchatgpt.log
 langbot.log
 /banlist.py
 /plugins/
@@ -17,8 +16,7 @@ scenario/
 !scenario/default-template.json
 override.json
 cookies.json
-res/announcement_saved
-res/announcement_saved.json
+data/labels/announcement_saved.json
 cmdpriv.json
 tips.py
 .venv
@@ -32,7 +30,7 @@ claude.json
 bard.json
 /*yaml
 !/docker-compose.yaml
-res/instance_id.json
+data/labels/instance_id.json
 .DS_Store
 /data
 botpy.log*

main.py

@@ -49,12 +49,10 @@ async def main_entry(loop: asyncio.AbstractEventLoop):
     generated_files = await files.generate_files()
 
     if generated_files:
-        print("以下文件不存在，已自动生成，请按需修改配置文件后重启：")
+        print("以下文件不存在，已自动生成：")
         for file in generated_files:
             print("-", file)
 
-        sys.exit(0)
-
     from pkg.core import boot
     await boot.main(loop)
 

pkg/api/http/controller/groups/logs.py

@@ -12,7 +12,7 @@ from .. import group
 class LogsRouterGroup(group.RouterGroup):
     
     async def initialize(self) -> None:
-        @self.route('', methods=['GET'])
+        @self.route('', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
 
             start_page_number = int(quart.request.args.get('start_page_number', 0))

pkg/api/http/controller/groups/plugins.py

@@ -13,7 +13,7 @@ from .. import group
 class PluginsRouterGroup(group.RouterGroup):
 
     async def initialize(self) -> None:
-        @self.route('', methods=['GET'])
+        @self.route('', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             plugins = self.ap.plugin_mgr.plugins()
 
@@ -23,14 +23,14 @@ class PluginsRouterGroup(group.RouterGroup):
                 'plugins': plugins_data
             })
         
-        @self.route('/<author>/<plugin_name>/toggle', methods=['PUT'])
+        @self.route('/<author>/<plugin_name>/toggle', methods=['PUT'], auth_type=group.AuthType.USER_TOKEN)
         async def _(author: str, plugin_name: str) -> str:
             data = await quart.request.json
             target_enabled = data.get('target_enabled')
             await self.ap.plugin_mgr.update_plugin_switch(plugin_name, target_enabled)
             return self.success()
         
-        @self.route('/<author>/<plugin_name>/update', methods=['POST'])
+        @self.route('/<author>/<plugin_name>/update', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
         async def _(author: str, plugin_name: str) -> str:
             ctx = taskmgr.TaskContext.new()
             wrapper = self.ap.task_mgr.create_user_task(
@@ -44,7 +44,7 @@ class PluginsRouterGroup(group.RouterGroup):
                 'task_id': wrapper.id
             })
         
-        @self.route('/<author>/<plugin_name>', methods=['DELETE'])
+        @self.route('/<author>/<plugin_name>', methods=['DELETE'], auth_type=group.AuthType.USER_TOKEN)
         async def _(author: str, plugin_name: str) -> str:
             ctx = taskmgr.TaskContext.new()
             wrapper = self.ap.task_mgr.create_user_task(
@@ -59,13 +59,13 @@ class PluginsRouterGroup(group.RouterGroup):
                 'task_id': wrapper.id
             })
 
-        @self.route('/reorder', methods=['PUT'])
+        @self.route('/reorder', methods=['PUT'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             data = await quart.request.json
             await self.ap.plugin_mgr.reorder_plugins(data.get('plugins'))
             return self.success()
         
-        @self.route('/install/github', methods=['POST'])
+        @self.route('/install/github', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             data = await quart.request.json
             

pkg/api/http/controller/groups/settings.py

@@ -9,7 +9,7 @@ class SettingsRouterGroup(group.RouterGroup):
     
     async def initialize(self) -> None:
         
-        @self.route('', methods=['GET'])
+        @self.route('', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             return self.success(
                 data={
@@ -23,7 +23,7 @@ class SettingsRouterGroup(group.RouterGroup):
                 }
             )
         
-        @self.route('/<manager_name>', methods=['GET'])
+        @self.route('/<manager_name>', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _(manager_name: str) -> str:
 
             manager = self.ap.settings_mgr.get_manager(manager_name)
@@ -44,7 +44,7 @@ class SettingsRouterGroup(group.RouterGroup):
                 }
             )
         
-        @self.route('/<manager_name>/data', methods=['PUT'])
+        @self.route('/<manager_name>/data', methods=['PUT'], auth_type=group.AuthType.USER_TOKEN)
         async def _(manager_name: str) -> str:
             data = await quart.request.json
             manager = self.ap.settings_mgr.get_manager(manager_name)

pkg/api/http/controller/groups/stats.py

@@ -9,7 +9,7 @@ from .. import group
 class StatsRouterGroup(group.RouterGroup):
     
     async def initialize(self) -> None:
-        @self.route('/basic', methods=['GET'])
+        @self.route('/basic', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
 
             conv_count = 0

pkg/api/http/controller/groups/system.py

@@ -20,7 +20,7 @@ class SystemRouterGroup(group.RouterGroup):
                 }
             )
 
-        @self.route('/tasks', methods=['GET'])
+        @self.route('/tasks', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             task_type = quart.request.args.get("type")
 
@@ -31,7 +31,7 @@ class SystemRouterGroup(group.RouterGroup):
                 data=self.ap.task_mgr.get_tasks_dict(task_type)
             )
         
-        @self.route('/tasks/<task_id>', methods=['GET'])
+        @self.route('/tasks/<task_id>', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _(task_id: str) -> str:
             task = self.ap.task_mgr.get_task_by_id(int(task_id))
 
@@ -40,7 +40,7 @@ class SystemRouterGroup(group.RouterGroup):
             
             return self.success(data=task.to_dict())
         
-        @self.route('/reload', methods=['POST'])
+        @self.route('/reload', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             json_data = await quart.request.json
 
@@ -51,7 +51,7 @@ class SystemRouterGroup(group.RouterGroup):
             )
             return self.success()
 
-        @self.route('/_debug/exec', methods=['POST'])
+        @self.route('/_debug/exec', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             if not constants.debug_mode:
                 return self.http_status(403, 403, "Forbidden")

pkg/audit/identifier.py

@@ -13,14 +13,14 @@ identifier = {
     'instance_create_ts': 0,
 }
 
-HOST_ID_FILE = os.path.expanduser('~/.qchatgpt/host_id.json')
-INSTANCE_ID_FILE = 'res/instance_id.json'
+HOST_ID_FILE = os.path.expanduser('~/.langbot/host_id.json')
+INSTANCE_ID_FILE = 'data/labels/instance_id.json'
 
 def init():
     global identifier
 
-    if not os.path.exists(os.path.expanduser('~/.qchatgpt')):
-        os.mkdir(os.path.expanduser('~/.qchatgpt'))
+    if not os.path.exists(os.path.expanduser('~/.langbot')):
+        os.mkdir(os.path.expanduser('~/.langbot'))
 
     if not os.path.exists(HOST_ID_FILE):
         new_host_id = 'host_'+str(uuid.uuid4())

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

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/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
 
 
 @stage.stage_class("MigrationStage")

pkg/pipeline/process/handlers/chat.py

@@ -105,7 +105,7 @@ class ChatMessageHandler(handler.MessageHandler):
                 await self.ap.ctr_mgr.usage.post_query_record(
                     session_type=query.session.launcher_type.value,
                     session_id=str(query.session.launcher_id),
-                    query_ability_provider="QChatGPT.Chat",
+                    query_ability_provider="LangBot.Chat",
                     usage=text_length,
                     model_name=query.use_model.name,
                     response_seconds=int(time.time() - start_time),

pkg/platform/manager.py

@@ -50,17 +50,6 @@ class PlatformManager:
                 adapter=adapter
             )
 
-        async def on_stranger_message(event: platform_events.StrangerMessage, adapter: msadapter.MessageSourceAdapter):
-            
-            await self.ap.query_pool.add_query(
-                launcher_type=core_entities.LauncherTypes.PERSON,
-                launcher_id=event.sender.id,
-                sender_id=event.sender.id,
-                message_event=event,
-                message_chain=event.message_chain,
-                adapter=adapter
-            )
-
         async def on_group_message(event: platform_events.GroupMessage, adapter: msadapter.MessageSourceAdapter):
 
             await self.ap.query_pool.add_query(
@@ -96,12 +85,6 @@ class PlatformManager:
                         )
                         self.adapters.append(adapter_inst)
 
-                        if adapter_name == 'yiri-mirai':
-                            adapter_inst.register_listener(
-                                platform_events.StrangerMessage,
-                                on_stranger_message
-                            )
-
                         adapter_inst.register_listener(
                             platform_events.FriendMessage,
                             on_friend_message

pkg/platform/sources/aiocqhttp.py

@@ -60,7 +60,7 @@ class AiocqhttpMessageConverter(adapter.MessageConverter):
             elif type(msg) is forward.Forward:
 
                 for node in msg.node_list:
-                    msg_list.extend(await AiocqhttpMessageConverter.yiri2target(node.message_chain)[0])
+                    msg_list.extend((await AiocqhttpMessageConverter.yiri2target(node.message_chain))[0])
                 
             else:
                 msg_list.append(aiocqhttp.MessageSegment.text(str(msg)))
@@ -244,7 +244,7 @@ class AiocqhttpAdapter(adapter.MessageSourceAdapter):
     async def send_message(
         self, target_type: str, target_id: str, message: platform_message.MessageChain
     ):
-        aiocq_msg = await AiocqhttpMessageConverter.yiri2target(message)[0]
+        aiocq_msg = (await AiocqhttpMessageConverter.yiri2target(message))[0]
 
         if target_type == "group":
             await self.bot.send_group_msg(group_id=int(target_id), message=aiocq_msg)

pkg/plugin/context.py

@@ -127,16 +127,16 @@ class APIHost:
         Returns:
             bool: 是否满足要求, False时为无法获取版本号，True时为满足要求，报错为不满足要求
         """
-        qchatgpt_version = ""
+        langbot_version = ""
 
         try:
-            qchatgpt_version = self.ap.ver_mgr.get_current_version()  # 从updater模块获取版本号
+            langbot_version = self.ap.ver_mgr.get_current_version()  # 从updater模块获取版本号
         except:
             return False
 
-        if self.ap.ver_mgr.compare_version_str(qchatgpt_version, ge) < 0 or \
-            (self.ap.ver_mgr.compare_version_str(qchatgpt_version, le) > 0):
-            raise Exception("LangBot 版本不满足要求，某些功能（可能是由插件提供的）无法正常使用。（要求版本：{}-{}，但当前版本：{}）".format(ge, le, qchatgpt_version))
+        if self.ap.ver_mgr.compare_version_str(langbot_version, ge) < 0 or \
+            (self.ap.ver_mgr.compare_version_str(langbot_version, le) > 0):
+            raise Exception("LangBot 版本不满足要求，某些功能（可能是由插件提供的）无法正常使用。（要求版本：{}-{}，但当前版本：{}）".format(ge, le, langbot_version))
 
         return True
 

pkg/provider/modelmgr/modelmgr.py

@@ -6,7 +6,7 @@ from . import entities, requester
 from ...core import app
 
 from . import token
-from .requesters import chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl
+from .requesters import chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, xaichatcmpl
 
 FETCH_MODEL_LIST_URL = "https://api.qchatgpt.rockchin.top/api/v2/fetch/model_list"
 

pkg/provider/modelmgr/requesters/chatcmpl.py

@@ -124,7 +124,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
             req_messages.append(msg_dict)
 
         try:
-            return await self._closure(query, req_messages, model, funcs)
+            return await self._closure(query=query, req_messages=req_messages, use_model=model, use_funcs=funcs)
         except asyncio.TimeoutError:
             raise errors.RequesterError('请求超时')
         except openai.BadRequestError as e:

pkg/provider/modelmgr/requesters/deepseekchatcmpl.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from ....core import app
-
 from . import chatcmpl
 from .. import entities, errors, requester
 from ....core import entities as core_entities, app
@@ -19,6 +17,7 @@ class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
 
     async def _closure(
         self,
+        query: core_entities.Query,
         req_messages: list[dict],
         use_model: entities.LLMModelInfo,
         use_funcs: list[tools_entities.LLMFunction] = None,

pkg/provider/modelmgr/requesters/giteeaichatcmpl.py

@@ -8,7 +8,7 @@ import typing
 
 from . import chatcmpl
 from .. import entities, errors, requester
-from ....core import app
+from ....core import app, entities as core_entities
 from ... import entities as llm_entities
 from ...tools import entities as tools_entities
 from .. import entities as modelmgr_entities
@@ -24,6 +24,7 @@ class GiteeAIChatCompletions(chatcmpl.OpenAIChatCompletions):
 
     async def _closure(
         self,
+        query: core_entities.Query,
         req_messages: list[dict],
         use_model: entities.LLMModelInfo,
         use_funcs: list[tools_entities.LLMFunction] = None,

pkg/provider/modelmgr/requesters/moonshotchatcmpl.py

@@ -19,6 +19,7 @@ class MoonshotChatCompletions(chatcmpl.OpenAIChatCompletions):
 
     async def _closure(
         self,
+        query: core_entities.Query,
         req_messages: list[dict],
         use_model: entities.LLMModelInfo,
         use_funcs: list[tools_entities.LLMFunction] = None,

pkg/provider/modelmgr/requesters/xaichatcmpl.py

@@ -0,0 +1,145 @@
+from __future__ import annotations
+
+import asyncio
+import typing
+import json
+import base64
+from typing import AsyncGenerator
+
+import openai
+import openai.types.chat.chat_completion as chat_completion
+import httpx
+import aiohttp
+import async_lru
+
+from . import chatcmpl
+from .. import entities, errors, requester
+from ....core import entities as core_entities, app
+from ... import entities as llm_entities
+from ...tools import entities as tools_entities
+from ....utils import image
+
+
+@requester.requester_class("xai-chat-completions")
+class XaiChatCompletions(chatcmpl.OpenAIChatCompletions):
+    """xAI ChatCompletion API 请求器"""
+
+    client: openai.AsyncClient
+
+    requester_cfg: dict
+
+    def __init__(self, ap: app.Application):
+        self.ap = ap
+
+        self.requester_cfg = self.ap.provider_cfg.data['requester']['xai-chat-completions']
+
+    # async def initialize(self):
+
+    #     self.client = openai.AsyncClient(
+    #         api_key="",
+    #         base_url=self.requester_cfg['base-url'],
+    #         timeout=self.requester_cfg['timeout'],
+    #         http_client=httpx.AsyncClient(
+    #             proxies=self.ap.proxy_mgr.get_forward_proxies()
+    #         )
+    #     )
+
+    # async def _req(
+    #     self,
+    #     args: dict,
+    # ) -> chat_completion.ChatCompletion:
+    #     return await self.client.chat.completions.create(**args)
+
+    # async def _make_msg(
+    #     self,
+    #     chat_completion: chat_completion.ChatCompletion,
+    # ) -> llm_entities.Message:
+    #     chatcmpl_message = chat_completion.choices[0].message.dict()
+
+    #     # 确保 role 字段存在且不为 None
+    #     if 'role' not in chatcmpl_message or chatcmpl_message['role'] is None:
+    #         chatcmpl_message['role'] = 'assistant'
+
+    #     message = llm_entities.Message(**chatcmpl_message)
+
+    #     return message
+
+    # async def _closure(
+    #     self,
+    #     req_messages: list[dict],
+    #     use_model: entities.LLMModelInfo,
+    #     use_funcs: list[tools_entities.LLMFunction] = None,
+    # ) -> llm_entities.Message:
+    #     self.client.api_key = use_model.token_mgr.get_token()
+
+    #     args = self.requester_cfg['args'].copy()
+    #     args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
+
+    #     if use_funcs:
+    #         tools = await self.ap.tool_mgr.generate_tools_for_openai(use_funcs)
+
+    #         if tools:
+    #             args["tools"] = tools
+
+    #     # 设置此次请求中的messages
+    #     messages = req_messages.copy()
+
+    #     # 检查vision
+    #     for msg in messages:
+    #         if 'content' in msg and isinstance(msg["content"], list):
+    #             for me in msg["content"]:
+    #                 if me["type"] == "image_url":
+    #                     me["image_url"]['url'] = await self.get_base64_str(me["image_url"]['url'])
+
+    #     args["messages"] = messages
+
+    #     # 发送请求
+    #     resp = await self._req(args)
+
+    #     # 处理请求结果
+    #     message = await self._make_msg(resp)
+
+    #     return message
+    
+    # async def call(
+    #     self,
+    #     model: entities.LLMModelInfo,
+    #     messages: typing.List[llm_entities.Message],
+    #     funcs: typing.List[tools_entities.LLMFunction] = None,
+    # ) -> llm_entities.Message:
+    #     req_messages = []  # req_messages 仅用于类内，外部同步由 query.messages 进行
+    #     for m in messages:
+    #         msg_dict = m.dict(exclude_none=True)
+    #         content = msg_dict.get("content")
+    #         if isinstance(content, list):
+    #             # 检查 content 列表中是否每个部分都是文本
+    #             if all(isinstance(part, dict) and part.get("type") == "text" for part in content):
+    #                 # 将所有文本部分合并为一个字符串
+    #                 msg_dict["content"] = "\n".join(part["text"] for part in content)
+    #         req_messages.append(msg_dict)
+
+    #     try:
+    #         return await self._closure(req_messages, model, funcs)
+    #     except asyncio.TimeoutError:
+    #         raise errors.RequesterError('请求超时')
+    #     except openai.BadRequestError as e:
+    #         if 'context_length_exceeded' in e.message:
+    #             raise errors.RequesterError(f'上文过长，请重置会话: {e.message}')
+    #         else:
+    #             raise errors.RequesterError(f'请求参数错误: {e.message}')
+    #     except openai.AuthenticationError as e:
+    #         raise errors.RequesterError(f'无效的 api-key: {e.message}')
+    #     except openai.NotFoundError as e:
+    #         raise errors.RequesterError(f'请求路径错误: {e.message}')
+    #     except openai.RateLimitError as e:
+    #         raise errors.RequesterError(f'请求过于频繁或余额不足: {e.message}')
+    #     except openai.APIError as e:
+    #         raise errors.RequesterError(f'请求错误: {e.message}')
+
+    # @async_lru.alru_cache(maxsize=128)
+    # async def get_base64_str(
+    #     self,
+    #     original_url: str,
+    # ) -> str:
+    #     base64_image, image_format = await image.qq_image_url_to_base64(original_url)
+    #     return f"data:image/{image_format};base64,{base64_image}"

pkg/utils/announce.py

@@ -62,11 +62,11 @@ class AnnouncementManager:
     async def fetch_saved(
         self
     ) -> list[Announcement]:
-        if not os.path.exists("res/announcement_saved.json"):
-            with open("res/announcement_saved.json", "w", encoding="utf-8") as f:
+        if not os.path.exists("data/labels/announcement_saved.json"):
+            with open("data/labels/announcement_saved.json", "w", encoding="utf-8") as f:
                 f.write("[]")
 
-        with open("res/announcement_saved.json", "r", encoding="utf-8") as f:
+        with open("data/labels/announcement_saved.json", "r", encoding="utf-8") as f:
             content = f.read()
 
         if not content:
@@ -79,7 +79,7 @@ class AnnouncementManager:
         content: list[Announcement]
     ):
 
-        with open("res/announcement_saved.json", "w", encoding="utf-8") as f:
+        with open("data/labels/announcement_saved.json", "w", encoding="utf-8") as f:
             f.write(json.dumps([
                 item.to_dict() for item in content
             ], indent=4, ensure_ascii=False))

pkg/utils/constants.py

@@ -1,4 +1,4 @@
-semantic_version = "v3.4.1.3"
+semantic_version = "v3.4.2"
 
 debug_mode = False
 

templates/metadata/llm-models.json

@@ -115,6 +115,38 @@
             "name": "deepseek-coder",
             "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"
         }
     ]
 }

templates/provider.json

@@ -16,6 +16,9 @@
         ],
         "gitee-ai": [
             "XXXXX"
+        ],
+        "xai": [
+            "xai-1234567890"
         ]
     },
     "requester": {
@@ -50,6 +53,11 @@
             "base-url": "https://ai.gitee.com/v1",
             "args": {},
             "timeout": 120
+        },
+        "xai-chat-completions": {
+            "base-url": "https://api.x.ai/v1",
+            "args": {},
+            "timeout": 120
         }
     },
     "model": "gpt-4o",

templates/schema/provider.json

@@ -22,7 +22,6 @@
                 "openai": {
                     "type": "array",
                     "title": "OpenAI API 密钥",
-                    "description": "OpenAI API 密钥",
                     "items": {
                         "type": "string"
                     },
@@ -31,7 +30,6 @@
                 "anthropic": {
                     "type": "array",
                     "title": "Anthropic API 密钥",
-                    "description": "Anthropic API 密钥",
                     "items": {
                         "type": "string"
                     },
@@ -40,7 +38,6 @@
                 "moonshot": {
                     "type": "array",
                     "title": "Moonshot API 密钥",
-                    "description": "Moonshot API 密钥",
                     "items": {
                         "type": "string"
                     },
@@ -49,7 +46,6 @@
                 "deepseek": {
                     "type": "array",
                     "title": "DeepSeek API 密钥",
-                    "description": "DeepSeek API 密钥",
                     "items": {
                         "type": "string"
                     },
@@ -57,8 +53,15 @@
                 },
                 "gitee": {
                     "type": "array",
-                    "title": "Gitee API 密钥",
-                    "description": "Gitee API 密钥",
+                    "title": "Gitee AI API 密钥",
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": []
+                },
+                "xai": {
+                    "type": "array",
+                    "title": "xAI API 密钥",
                     "items": {
                         "type": "string"
                     },
@@ -188,6 +191,25 @@
                             "default": 120
                         }
                     }
+                },
+                "xai-chat-completions": {
+                    "type": "object",
+                    "title": "xAI API 请求配置",
+                    "description": "仅可编辑 URL 和 超时时间，额外请求参数不支持可视化编辑，请到编辑器编辑",
+                    "properties": {
+                        "base-url": {
+                            "type": "string",
+                            "title": "API URL"
+                        },
+                        "args": {
+                            "type": "object"
+                        },
+                        "timeout": {
+                            "type": "number",
+                            "title": "API 请求超时时间",
+                            "default": 120
+                        }
+                    }
                 }
             }
         },

web/src/App.vue

@@ -79,6 +79,12 @@
                           重载插件
                         </v-list-item-title>
                       </v-list-item>
+
+                      <v-list-item @click="reload('provider')">
+                        <v-list-item-title>
+                          重载 LLM 管理器
+                        </v-list-item-title>
+                      </v-list-item>
                     </v-list>
                   </v-menu>
                 </v-list-item>
@@ -169,7 +175,8 @@ function openDocs() {
 
 const reloadScopeLabel = {
   'platform': "消息平台",
-  'plugin': "插件"
+  'plugin': "插件",
+  'provider': "LLM 管理器"
 }
 
 function reload(scope) {