chore: release v3.1.1

Feat: 支持 deepseek 模型

README.md

@@ -2,11 +2,12 @@
 <p align="center">
 <img src="https://qchatgpt.rockchin.top/logo.png" alt="QChatGPT" width="180" />
 </p>
-
 <div align="center">
 
 # QChatGPT
 
+<a href="https://trendshift.io/repositories/6187" target="_blank"><img src="https://trendshift.io/api/badge/repositories/6187" alt="RockChinQ%2FQChatGPT | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/RockChinQ/QChatGPT)](https://github.com/RockChinQ/QChatGPT/releases/latest)
 <a href="https://hub.docker.com/repository/docker/rockchin/qchatgpt">
     <img src="https://img.shields.io/docker/pulls/rockchin/qchatgpt?color=blue" alt="docker pull">
@@ -14,7 +15,7 @@
  ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.qchatgpt.rockchin.top%2Fapi%2Fv2%2Fview%2Frealtime%2Fcount_query%3Fminute%3D10080&query=%24.data.count&label=%E4%BD%BF%E7%94%A8%E9%87%8F%EF%BC%887%E6%97%A5%EF%BC%89)
 ![Wakapi Count](https://wakapi.rockchin.top/api/badge/RockChinQ/interval:any/project:QChatGPT)
 <br/>
-<img src="https://img.shields.io/badge/python-3.9 | 3.10 | 3.11-blue.svg" alt="python">
+<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
 <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=66-aWvn8cbP4c1ut_1YYkvvGVeEtyTH8&authKey=pTaKBK5C%2B8dFzQ4XlENf6MHTCLaHnlKcCRx7c14EeVVlpX2nRSaS8lJm8YeM4mCU&noverify=0&group_code=195992197">
 <img alt="Static Badge" src="https://img.shields.io/badge/%E5%AE%98%E6%96%B9%E7%BE%A4-195992197-purple">
 </a>

main.py

@@ -51,17 +51,6 @@ async def main_entry():
 
 if __name__ == '__main__':
     import os
-    import psutil
-
-    if os.name == 'nt':
-        allowed_parent_process = ['cmd.exe', 'powershell.exe', 'wsl.exe']
-
-        parent_process = psutil.Process(os.getppid()).name()
-
-        if parent_process not in allowed_parent_process:
-            print("请在命令行中运行此程序。")
-            input("按任意键退出...")
-            exit(0)
 
     # 检查本目录是否有main.py，且包含QChatGPT字符串
     invalid_pwd = False
@@ -74,7 +63,7 @@ if __name__ == '__main__':
             if "QChatGPT/main.py" not in content:
                 invalid_pwd = True
     if invalid_pwd:
-        print("请在QChatGPT项目根目录下运行此程序。")
+        print("请在QChatGPT项目根目录下以命令形式运行此程序。")
         input("按任意键退出...")
         exit(0)
 

pkg/config/migrations/m005_deepseek_cfg_completion.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("deepseek-config-completion", 5)
+class DeepseekConfigCompletionMigration(migration.Migration):
+    """OpenAI配置迁移
+    """
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移
+        """
+        return 'deepseek-chat-completions' not in self.ap.provider_cfg.data['requester'] \
+            or 'deepseek' not in self.ap.provider_cfg.data['keys']
+
+    async def run(self):
+        """执行迁移
+        """
+        if 'deepseek-chat-completions' not in self.ap.provider_cfg.data['requester']:
+            self.ap.provider_cfg.data['requester']['deepseek-chat-completions'] = {
+                'base-url': 'https://api.deepseek.com',
+                'args': {},
+                'timeout': 120,
+            }
+
+        if 'deepseek' not in self.ap.provider_cfg.data['keys']:
+            self.ap.provider_cfg.data['keys']['deepseek'] = []
+
+        await self.ap.provider_cfg.dump_config()

pkg/core/bootutils/deps.py

@@ -13,6 +13,7 @@ required_deps = {
     "tiktoken": "tiktoken",
     "yaml": "pyyaml",
     "aiohttp": "aiohttp",
+    "psutil": "psutil",
 }
 
 

pkg/core/stages/migrate.py

@@ -5,6 +5,7 @@ import importlib
 from .. import stage, app
 from ...config import migration
 from ...config.migrations import m001_sensitive_word_migration, m002_openai_config_migration, m003_anthropic_requester_cfg_completion, m004_moonshot_cfg_completion
+from ...config.migrations import m005_deepseek_cfg_completion
 
 
 @stage.stage_class("MigrationStage")

pkg/platform/manager.py

@@ -82,8 +82,8 @@ class PlatformManager:
 
             event_ctx = await self.ap.plugin_mgr.emit_event(
                 event=events.GroupMessageReceived(
-                    launcher_type='person',
-                    launcher_id=event.sender.id,
+                    launcher_type='group',
+                    launcher_id=event.group.id,
                     sender_id=event.sender.id,
                     message_chain=event.message_chain,
                     query=None

pkg/platform/sources/aiocqhttp.py

@@ -30,7 +30,14 @@ class AiocqhttpMessageConverter(adapter.MessageConverter):
                 msg_id = msg.id
                 msg_time = msg.time
             elif type(msg) is mirai.Image:
-                msg_list.append(aiocqhttp.MessageSegment.image(msg.path))
+                arg = ''
+
+                if msg.url:
+                    arg = msg.url
+                elif msg.path:
+                    arg = msg.path
+
+                msg_list.append(aiocqhttp.MessageSegment.image(arg))
             elif type(msg) is mirai.At:
                 msg_list.append(aiocqhttp.MessageSegment.at(msg.target))
             elif type(msg) is mirai.AtAll:

pkg/provider/modelmgr/apis/deepseekchatcmpl.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from ....core import app
+
+from . import chatcmpl
+from .. import api
+
+
+@api.requester_class("deepseek-chat-completions")
+class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
+    """Deepseek ChatCompletion API 请求器"""
+
+    def __init__(self, ap: app.Application):
+        self.requester_cfg = ap.provider_cfg.data['requester']['deepseek-chat-completions']
+        self.ap = ap

pkg/provider/modelmgr/modelmgr.py

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

pkg/provider/tools/toolmgr.py

@@ -35,7 +35,7 @@ class ToolManager:
         for plugin in self.ap.plugin_mgr.plugins:
             for function in plugin.content_functions:
                 if function.name == name:
-                    return function, plugin
+                    return function, plugin.plugin_inst
         return None, None
     
     async def get_all_functions(self) -> list[entities.LLMFunction]:

pkg/utils/constants.py

@@ -1 +1 @@
-semantic_version = "v3.1.0.2"
+semantic_version = "v3.1.1"

requirements.txt

@@ -12,4 +12,5 @@ PyYaml
 aiohttp
 pydantic
 websockets
-urllib3
+urllib3
+psutil

templates/metadata/llm-models.json

@@ -59,6 +59,11 @@
             "name": "moonshot-v1-128k",
             "requester": "moonshot-chat-completions",
             "token_mgr": "moonshot"
+        },
+        {
+            "name": "deepseek-chat",
+            "requester": "deepseek-chat-completions",
+            "token_mgr": "deepseek"
         }
     ]
 }

templates/pipeline.json

@@ -25,7 +25,6 @@
         "api-key": "",
         "api-secret": ""
     },
-    "submit-messages-tokens": 3072,
     "rate-limit": {
         "strategy": "drop",
         "algo": "fixwin",

templates/provider.json

@@ -9,6 +9,9 @@
         ],
         "moonshot": [
             "sk-1234567890"
+        ],
+        "deepseek": [
+            "sk-1234567890"
         ]
     },
     "requester": {
@@ -28,6 +31,11 @@
             "base-url": "https://api.moonshot.cn/v1",
             "args": {},
             "timeout": 120
+        },
+        "deepseek-chat-completions": {
+            "base-url": "https://api.deepseek.com",
+            "args": {},
+            "timeout": 120
         }
     },
     "model": "gpt-3.5-turbo",