Merge pull request #599 from RockChinQ/refactor/modern-openai-api-style

Refactor: 修改情景预设置入风格
RockChinQ · Nov 14, 2023 · 0407f3e · 0407f3e
2 parents b68daac + 5abca84
commit 0407f3e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/config-template.py b/config-template.py
@@ -114,7 +114,7 @@
 # 
 # 还可以加载文件中的预设文字，使用方法请查看：https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E9%A2%84%E8%AE%BE%E6%96%87%E5%AD%97
 default_prompt = {
-    "default": "如果我之后想获取帮助，请你说“输入!help获取帮助”",
+    "default": "如果用户之后想获取帮助，请你说“输入!help获取帮助”。",
 }
 
 # 情景预设格式

diff --git a/override-all.json b/override-all.json
@@ -24,7 +24,7 @@
     "switch_strategy": "active",
     "admin_qq": 0,
     "default_prompt": {
-        "default": "如果我之后想获取帮助，请你说“输入!help获取帮助”"
+        "default": "如果用户之后想获取帮助，请你说“输入!help获取帮助”。"
     },
     "preset_mode": "normal",
     "response_rules": {

diff --git a/pkg/openai/api/model.py b/pkg/openai/api/model.py
@@ -21,6 +21,7 @@ def _next_key(self):
 
     def _req(self, **kwargs):
         """处理代理问题"""
+        logging.debug("请求接口参数: %s", str(kwargs))
         import config
 
         ret = self.req_func(**kwargs)

diff --git a/pkg/openai/dprompt.py b/pkg/openai/dprompt.py
@@ -16,10 +16,6 @@
 # __scenario_from_files__ = {}
 
 
-__universal_first_reply__ = "ok, I'll follow your commands."
-"""通用首次回复"""
-
-
 class ScenarioMode:
     """情景预设模式抽象类"""
 
@@ -66,29 +62,22 @@ class NormalScenarioMode(ScenarioMode):
     """普通情景预设模式"""
 
     def __init__(self):
-        global __universal_first_reply__
         # 加载config中的default_prompt值
         if type(config.default_prompt) == str:
             self.using_prompt_name = "default"
             self.prompts = {"default": [
                 {
-                    "role": "user",
+                    "role": "system",
                     "content": config.default_prompt
-                },{
-                    "role": "assistant",
-                    "content": __universal_first_reply__
                 }
             ]}
 
         elif type(config.default_prompt) == dict:
             for key in config.default_prompt:
                 self.prompts[key] = [
                     {
-                        "role": "user",
+                        "role": "system",
                         "content": config.default_prompt[key]
-                    },{
-                        "role": "assistant",
-                        "content": __universal_first_reply__
                     }
                 ]
 
@@ -98,11 +87,8 @@ def __init__(self):
             with open(os.path.join("prompts", file), encoding="utf-8") as f:
                 self.prompts[file] = [
                     {
-                        "role": "user",
+                        "role": "system",
                         "content": f.read()
-                    },{
-                        "role": "assistant",
-                        "content": __universal_first_reply__
                     }
                 ]
 

diff --git a/pkg/openai/session.py b/pkg/openai/session.py
@@ -241,6 +241,7 @@ def query(self, text: str=None) -> tuple[str, str, list[str]]:
         if event.get_return_value('text_message') is not None:
             text = event.get_return_value('text_message')
 
+        # 裁剪messages到合适长度
         prompts, _ = self.cut_out(text, max_length, local_default_prompt, local_prompt)
 
         res_text = ""