version v1.20.1

Author: SnapdragonLee

basic/task.py

@@ -8,7 +8,7 @@
 import websocket
 
 from shared.shared import *
-from services.ChatGPTAPI import ChatbotError
+from services.chat.ChatGPTAPI import ChatbotError
 from .send import send_txt_msg, send_pic_msg
 
 global_dict = dict()
@@ -73,7 +73,7 @@ def play(self):
 
         print("reply: " + self.reply)
         if self.is_citation:
-            self.reply = (self.bot.prev_question[-1] if self.type == "rg" else (
+            self.reply = (self.bot.prev_question[-1][0] if self.type == "rg" else (
                 "用150字内总结全部对话" if self.type == "z" else self.prompt)) + "\n- - - - - - - - - -\n" + self.reply.strip()
         self.ws.send(send_txt_msg(self.room_id if self.is_room else self.wx_id, self.reply.strip()))
 

client/handle.py

@@ -2,9 +2,11 @@
 
 from basic.task import *
 from multithread.threads import *
-from services.ChatGPTAPI import Chatbot
+from services.model import Selfinfo
+from services.chat.ChatGPTAPI import Chatbot
 
-global ws
+ws: websocket.WebSocketApp
+my_info: Selfinfo
 
 
 def handle_response(ws_t, j: json):
@@ -68,7 +70,7 @@ def handle_response(ws_t, j: json):
         GET_CHATROOM_INFO: print,
         GET_CHATROOM_MEMBER: hanle_memberlist,
         CHECK_LOGIN: print,
-        CHECK_SELF_INFO: print,
+        CHECK_SELF_INFO: handle_self_info,
         CHECK_DB_INFO: print,
         CHECK_PERSON_INFO: print,
         EXEC_SQL: print,
@@ -114,7 +116,10 @@ def handle_wxuser_list(j):
 def handle_recv_txt_msg(j):
     print(j)
 
-    wx_id = j['fromUser']
+    if j['fromUser'] == my_info.wx_id:
+        wx_id = j['toUser']
+    else:
+        wx_id = j['fromUser']
     room_id = ''
     content: str = j['content'].strip()
 
@@ -123,18 +128,16 @@ def handle_recv_txt_msg(j):
     chatbot: Chatbot
 
     if len(wx_id) < 9 or wx_id[-9] != '@':
-        if len(j['toUser']) == 20:
-            is_room = True
-            room_id = j['toUser']
-        else:
-            is_room = False
-
+        is_room = False
     else:
         is_room = True
         room_id = wx_id
         pos = content.find(':\n', 0)
-        wx_id = content[:pos]
-        content = content[pos + 2:].lstrip()
+        if pos != -1:
+            wx_id = content[:pos]
+            content = content[pos + 2:].lstrip()
+        else:
+            wx_id = my_info.wx_id
 
     chatbot = global_dict.get((wx_id, room_id))
 
@@ -238,3 +241,12 @@ def handle_recv_pic_msg(j):
 
 def handle_recv_xml_txt(j):
     print(j)
+
+
+def handle_self_info(j):
+    print(j)
+    data = j["data"]
+
+    global my_info
+    my_info = Selfinfo(data["wxid"], data["name"], data["account"], data["currentDataPath"], data["dataSavePath"],
+                       data["dbKey"])

client/wxclient.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from basic.get import *
 from basic.task import *
 from multithread.threads import *
 from .handle import handle_response
@@ -9,7 +10,7 @@
 
 
 def on_open(ws):
-    # ws.send(send_pic_msg(wx_id='filehelper', room_id='', content=''))
+    ws.send(get_self_info())
     # ws.send(send_wxuser_list())
     # ws.send(get_chatroom_memberlist())
 
@@ -45,7 +46,7 @@ def on_error(ws, error):
 
 def on_close(ws, close_status_code, close_msg):
     for key, value in global_dict.items():
-        print('clear conversation:' + key)
+        print('clear conversation:' + str(key))
         del value
 
     print(f'WebSocket closed with status code: 0')

services/ChatGPTAPI.py services/chat/ChatGPTAPI.py

@@ -0,0 +1,8 @@
+class Selfinfo:
+    def __init__(self, wxid, name, account_id, data_path, save_path, db_key):
+        self.wx_id = wxid
+        self.wx_idname = name
+        self.wx_idaccount_id = account_id
+        self.wx_iddata_path = data_path
+        self.wx_idsave_path = save_path
+        self.wx_iddb_key = db_key