My/Xinyue-Search
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

使用docker搭建cow

Browse Source
This commit is contained in:
Alone
2024-10-24 09:30:10 +08:00
parent 71f1dd0922
commit 16fd7106d6
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chatgpt-on-wechat/chat_channel.py
+15 -15
View File
@@ -20,7 +20,6 @@ except Exception as e:
handler_pool = ThreadPoolExecutor(max_workers=8) # 处理消息的线程池 handler_pool = ThreadPoolExecutor(max_workers=8) # 处理消息的线程池
# 抽象类, 它包含了与消息通道无关的通用处理逻辑 # 抽象类, 它包含了与消息通道无关的通用处理逻辑
class ChatChannel(Channel): class ChatChannel(Channel):
name = None # 登录的用户名 name = None # 登录的用户名
@@ -205,11 +204,9 @@ class ChatChannel(Channel):
logger.info("[chat_channel]receive group at") logger.info("[chat_channel]receive group at")
if not conf().get("group_at_off", False): if not conf().get("group_at_off", False):
flag = True flag = True
self.name = self.name if self.name is not None else "" # 部分渠道self.name可能没有赋值
pattern = f"@{re.escape(self.name)}(\u2005|\u0020)" pattern = f"@{re.escape(self.name)}(\u2005|\u0020)"
subtract_res = re.sub(pattern, r"", content) subtract_res = re.sub(pattern, r"", content)
if subtract_res.startswith("画"):
subtract_res = "生成图片要求如下：\n" + subtract_res[1:]
if isinstance(context["msg"].at_list, list): if isinstance(context["msg"].at_list, list):
for at in context["msg"].at_list: for at in context["msg"].at_list:
pattern = f"@{re.escape(at)}(\u2005|\u0020)" pattern = f"@{re.escape(at)}(\u2005|\u0020)"
@@ -427,24 +424,27 @@ class ChatChannel(Channel):
while True: while True:
with self.lock: with self.lock:
session_ids = list(self.sessions.keys()) session_ids = list(self.sessions.keys())
for session_id in session_ids: for session_id in session_ids:
with self.lock:
context_queue, semaphore = self.sessions[session_id] context_queue, semaphore = self.sessions[session_id]
if semaphore.acquire(blocking=False): # 等线程处理完毕才能删除 if semaphore.acquire(blocking=False): # 等线程处理完毕才能删除
if not context_queue.empty(): if not context_queue.empty():
context = context_queue.get() context = context_queue.get()
logger.debug("[chat_channel] consume context: {}".format(context)) logger.debug("[chat_channel] consume context: {}".format(context))
future: Future = handler_pool.submit(self._handle, context) future: Future = handler_pool.submit(self._handle, context)
future.add_done_callback(self._thread_pool_callback(session_id, context=context)) future.add_done_callback(self._thread_pool_callback(session_id, context=context))
with self.lock:
if session_id not in self.futures: if session_id not in self.futures:
self.futures[session_id] = [] self.futures[session_id] = []
self.futures[session_id].append(future) self.futures[session_id].append(future)
elif semaphore._initial_value == semaphore._value + 1: # 除了当前，没有任务再申请到信号量，说明所有任务都处理完毕 elif semaphore._initial_value == semaphore._value + 1: # 除了当前，没有任务再申请到信号量，说明所有任务都处理完毕
with self.lock:
self.futures[session_id] = [t for t in self.futures[session_id] if not t.done()] self.futures[session_id] = [t for t in self.futures[session_id] if not t.done()]
assert len(self.futures[session_id]) == 0, "thread pool error" assert len(self.futures[session_id]) == 0, "thread pool error"
del self.sessions[session_id] del self.sessions[session_id]
else: else:
semaphore.release() semaphore.release()
time.sleep(0.1) time.sleep(0.2)
# 取消session_id对应的所有任务，只能取消排队的消息和已提交线程池但未执行的任务 # 取消session_id对应的所有任务，只能取消排队的消息和已提交线程池但未执行的任务
def cancel_session(self, session_id): def cancel_session(self, session_id):