From a07de626ad2ddfe5de230391e0493358d4984186 Mon Sep 17 00:00:00 2001
From: hubian <908234780@qq.com>
Date: Sun, 12 Apr 2026 00:34:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DAI=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- _process_message 只保存用户消息并通知
- 新增 generate_ai_response action 统一处理AI回复
- 避免重复调用AI和重复发送消息
---
 ai_chat.db                                    | Bin 86016 -> 86016 bytes
 main.py                                       |  58 ++++++++++++++++++
 ...x.tphai.com_GALBNVJOSG.blacklisted_devices |   0
 ...atrix.tphai.com_GALBNVJOSG.ignored_devices |   0
 ...atrix.tphai.com_GALBNVJOSG.trusted_devices |   8 +++
 .../matrix_service.cpython-310.pyc            | Bin 9779 -> 9327 bytes
 services/matrix_service.py                    |  35 +----------
 7 files changed, 69 insertions(+), 32 deletions(-)
 create mode 100644 matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.blacklisted_devices
 create mode 100644 matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.ignored_devices
 create mode 100644 matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.trusted_devices

diff --git a/ai_chat.db b/ai_chat.db
index 4d26ed55c5c6b0472ef723f50d471c0f9f4c34d4..5ed26fbec25f3fae36a7d3a161fe09b74cc918f5 100644
GIT binary patch
delta 1502
zcmaKs%TF6u6o=!6hkz7SRU<WNrCO+~k%IgH3@j?q7ErT6Z4sqiq$L7XL<x&P(nyu+
zvGHrn7~9xj@B=&81_QM{U>@TaR=bL-Zo1FP%(*kOGJitPF!Z6esWiHpnRCzMcg}Y&
zooJ>L&A!{Obrk*Yeu(SAH`47J#-2gFse7PbZ!-23#@~_dck~bH2f7WqKAq8282zED
zzdqVI8EEC0md@$Ud!3U7z4qtV-)z3F(Tt8N>&S?*4i6U|oP{knnwnl-Yk$!uwg#GB
z9{7K4YP0u@wq4V_=WY%Cc31PZS=?Cxmy@`BQa&pNkHO24%yX!CFXDl6qrzyl?d=qG
zPP1e^4(TAA#^k-oIqj)OGZckJN_M)1B11JQVOaE%V+-z+lbiA`*Ql`MAWjYo=!XB#
zX)9E>AXk*>IFz=@rUh#Ijf$BCcTM0u;LQ{Ed84|i#FT7)a<mDY7nmK0mXzT5`vWaF
zS+bE4ct*4qF+8N!z_X@o3#7%c4XYOeCsK8rqW)eiMS<f`syXFI22M}WO%3H+hSH8u
zGsg(OE9MSlCyOSzRF=+?;^IE6uq5gdN;$H!3C<FDb5IRHz=LVz$Qj{+C<o)T*XbZW
z_$JlX$znlV-o5H%<WP*PfG^aj#8H}1POBR9-CBy0IG-FZkgX62ADO{frcj`Z<b$wn
zt<zBwW$N_0w6$NSH%KT!tjRhZQ}Ynk3638jwJRlyxB;?0!gz2$<QTALh%H`^*&4i8
z9h*T(C2p4`?m(s!;7vnnM>>vNCKIX&5=$%L%(<{yaid~U{fvqqI8NnI=1L1271^jz
z^r>~a{KV^(YRY^u3|geT=OP~TT)`sKjKI?ZzeiR%$SV4YYfYl<u;vC!R2lF^e4TkT
zweWcMnL%d={nD@LFdMEAH}x2db59;Vw0%0FFzOn*HFUFOYJPrpeqm~E0lOsbSw!23
z0<33Ct&Xf@i8~Gcbx3kzsrDDP6ot*iQp8*qysR8q#Wo_c2riE6oc4j8C#&{L$jl05
z=d>RUm;jd3LbZk^i{%YDyhPTVz{f;3C-828PhlXT#7I^K^{Xa1l#@7%v{(hsCh%Eh
z;+z8<5qY%+*$uK0SBnsLYib=z<I2k<n-VGsfiH>aO*48DW=W-AQMt?s<)p~C5E|?;
z_*fD;0mla9u;r*JjI>F$Dt_Vt!ElgEfp>{4y1`%hhiF)J<783#)p-65EJAAjFG`ik
za#6eq)IPsr_<v&af4He^i@^*Q2RRo>?7^8G?09rykm4cr@#Q&Iu7mii7_{<GDN@u$
zd?krfs?*z2{uEIoOS^v{75b@P^Og}w()D!r=?!{QpF)!5-Y}AMQ-5p7`bo=^`I*Pq
zPbq(-@OgRVfp6#1al~L6?CtID)fo-Cf$zI!p3clId_6neHK^@+|H0Vgow+Z@hMzsX
x|M}R&)QF*X+%RMKa(ZIiXzcm!(a@dGCcgd3G_0HcNEbSILo<E);;yE@`FAROTP6Si

delta 92
zcmZozz}m2Yb%GQV*W-yYPC#;F!V4)LBU39AV?9#?GZRD8%^}h+lDLhmOpWynjSNkU
wEjGK??KNa};mexLzM*rop~5ZR%~|_qHL@{sonYWPvDr{yAJ_I1UW^v30ARcxKL7v#

diff --git a/main.py b/main.py
index 3d9542b..654e697 100644
--- a/main.py
+++ b/main.py
@@ -457,6 +457,64 @@ async def handle_matrix_message(action: str, conversation_id: str = None, user_m
             db.close()
         return
     
+    if action == "generate_ai_response":
+        # 生成AI回复并同步
+        db = SessionLocal()
+        try:
+            conv_service = ConversationService(db)
+            conversation = conv_service.get_conversation(conversation_id)
+            
+            if conversation:
+                # 发送"正在输入"状态
+                try:
+                    await matrix_bot.client.room_typing(room_id, typing_state=True)
+                except:
+                    pass
+                
+                # 获取会话历史
+                history = conv_service.get_conversation_history(conversation_id, limit=20)
+                
+                # 调用AI
+                ai_response = await ai_service.chat(history)
+                
+                # 保存AI回复
+                assistant_msg = conv_service.add_message(
+                    conversation_id=conversation.id,
+                    role='assistant',
+                    content=ai_response,
+                    source='matrix'
+                )
+                
+                # 发送到Matrix
+                await matrix_bot.send_message(room_id, ai_response)
+                
+                # 关闭"正在输入"状态
+                try:
+                    await matrix_bot.client.room_typing(room_id, typing_state=False)
+                except:
+                    pass
+                
+                # 同步到网页端WebSocket
+                await manager.send_to_user(MAIN_USER_ID, {
+                    "type": "assistant_message",
+                    "conversation_id": conversation_id,
+                    "message": {
+                        "id": assistant_msg.id,
+                        "role": "assistant",
+                        "content": ai_response,
+                        "source": "matrix",
+                        "created_at": assistant_msg.created_at.isoformat()
+                    }
+                })
+                
+                logger.info(f"Matrix AI回复已发送: {ai_response[:50]}")
+        except Exception as e:
+            logger.error(f"生成AI回复失败: {e}")
+            await matrix_bot.send_message(room_id, f"处理消息时出错: {str(e)}")
+        finally:
+            db.close()
+        return
+    
     if action == "chat":
         db = SessionLocal()
         try:
diff --git a/matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.blacklisted_devices b/matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.blacklisted_devices
new file mode 100644
index 0000000..e69de29
diff --git a/matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.ignored_devices b/matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.ignored_devices
new file mode 100644
index 0000000..e69de29
diff --git a/matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.trusted_devices b/matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.trusted_devices
new file mode 100644
index 0000000..fc15253
--- /dev/null
+++ b/matrix_store/@tester:matrix.tphai.com_GALBNVJOSG.trusted_devices
@@ -0,0 +1,8 @@
+@tester:matrix.tphai.com AJFVRTHLJY matrix-ed25519 4mRjLhM8xbwjkwQP2T/iB3UZJoaADgP6cCVUiB8AtSk
+@tester:matrix.tphai.com BDTRXIGPBE matrix-ed25519 gjQNtLEpIEYCjmzUx5ma91G498n4UADh84KUmiReJUM
+@tester:matrix.tphai.com GVSFGGYNJL matrix-ed25519 8qV2own4G3m2nki+izFDBOrAxtbGl8RoneM3qUPkThU
+@tester:matrix.tphai.com IMEQIQPXTR matrix-ed25519 6Yd4lmhP6jdkkNvh1rIw6TRK331ZUyiAt5G5hPeYqSE
+@tester:matrix.tphai.com MIPPYHRVAS matrix-ed25519 s8Ol56sxLCjCOi0Gkv/Kj7LqVMp/8ZmuAJ6QA1rUi7o
+@tester:matrix.tphai.com UKJGJYQQLT matrix-ed25519 opC9rhsz1nzrvQqNWMKTF5FxWIGuHTDfixx+q/Y8ea0
+@tester:matrix.tphai.com UPMZGRLESG matrix-ed25519 86c6XPCIYHgesq83C2k5xhXNa0EYMnqTq4jFrTwJX8I
+@huangzhuang_bro:matrix.tphai.com BQHGFLQEPR matrix-ed25519 IrEHmvqotfHKLyx1JRJp4RthUVyBT8qQX72qBifRRyQ
diff --git a/services/__pycache__/matrix_service.cpython-310.pyc b/services/__pycache__/matrix_service.cpython-310.pyc
index 9f156986d3d109418f007403b01ac7e1a05105cc..3090148bb8b8888c09e53fef0cd78a8ae808dac5 100644
GIT binary patch
delta 485
zcmdn&^WK9mpO=@50SMNX-^zStv60VNgr6741&JL7;^Gpf$q6D8SgPJuO`H5fM4qv0
zvV^EPW7FgSQA@^|le<K%84pfACaP3l!;mFhbP+_Rh}Cdp3Dq!Wai;L~GJ7(lFnKUA
zGL$ebU`Y`#5l>-Ck!WR-WSGq`muVp*BSSbto(Bs<iNplPN;O7?T5d*$Dr=xx$rQ;N
zZkU=B{uHJhsahV8cn!}2>4gj+oiz*#1i`jQmB`d6ayK)Al{3LCtl|SYMm9?htVB9R
zW^$EyFr)0|bK)(GVz)%nQ}a@b5=&C!6EowBQi}`n^NLd^Kaq?PcGG0M#ZyvQkeQbr
zUt9uIp(#JvNoqg;Ep8;0MUIp0q{T&w1c4!Ri@PX4KQ|ttMU!`OxOD8~)6#N`vnIci
zmStp_%ps$~Y|3+Pvc8NC9~&17BNHPF5c2$$VcR@iW)dr7<zy|TDU9`#_bXX4_D=q(
zWW-tuG*x)BfwCSWW9Z~~l`8H^pg<8wv}o?+Cn}0!B0wew0|z4qmw*h1G6xTb2?xJW
X+GJVP)!g$ys&qg^(d5gj@r>R8vATnl

delta 1019
zcmah|O=}ZT6n%GQl1}s8HlNdJo2FeDC?X<+T8oGx6{_F|NI{9AFC>}TNtv0pB%PSl
zwl2hA^a(CXApyG*krHvKU^o5&L9%mEZE@ibsG{#Bt))e9hI?k-edpbC?j7dGSbf};
zbvkW`Uc0l6%-PWm*LknoO_waUNkdn7a>rXaR)KtqhTCwMmL(`yO{?NGT(}L3xV_95
z+DsnXra0{p@%m!0OvZh~uu2~IMqrbC@I{Jwmx+{s5;Q?+$9^0rbC(e2#t@*JNR<R+
zgmT{j73_fWE(59(4x08=w8qtdF(xRtV83TqEv@G~%p=oU?KVZFvjzo+Ay<1$M-5sv
z3r=dzPxm}HWIAyNmdZr|kcp}tOx|?X{)!*6)qTWPH?viNT<nlB`M<`H(p3R%oHpEr
zdzeL&FE)j3)KPEQvfnxFQ^0-HA&0{&TnHWXtB&nS*Y>1GD7P2)A4p?2=I-_t*sOX@
zS2bKiY*PCz;)p@HOVF&yn)NkDeY9J$?7t2J_0RrgDBg%d!(rrRGHNQW8wn#hE77mN
z_4vt7X>t1<*;-lu_VDf3(&E;OjqNw<r^Ai*gsx{OQ#GQ3mZV%Q&EN`y%M>oQ3ar$3
zp1=BM0bw$oFrpR>vlCs-3JQC@%3z8D(So<QXoP$Tz8}>(Xrf`)vf1f)%cXXX@nS3;
zOeKx@WLBL^YI?%RWYu_@I?HM~&B-__c^wLHQ8#IXZU-9TbW+z7sifYpCo*v@sn29p
zJxO9xZ{J7C=1Ml+0|GcGy7(a1T8X@s6Nw=W^4A<2WK|kE!`WnTfed1a`|S|u30?rM
zd0T&aMUI!jv$rb>Y^N2p?yfA>KS@t5ut3t`XK<hV3J*ht#QINK=BWOOy4rsnKqG6B
z{DlQ(pJlZw1NkuYuqFFfy)<+`1rdoL+B~v2AUecTq8k-E1u`-4(q3cKAqF~e55^(=
E2fIcExc~qF

diff --git a/services/matrix_service.py b/services/matrix_service.py
index 2cb4143..cefe093 100644
--- a/services/matrix_service.py
+++ b/services/matrix_service.py
@@ -250,41 +250,12 @@ class MatrixBot:
                     sender=sender
                 )
             
-            # 发送"正在输入"状态
-            try:
-                await self.client.room_typing(room.room_id, typing_state=True)
-            except Exception as e:
-                logger.warning(f"发送输入状态失败: {e}")
-            
-            # 获取AI回复 - 使用字典格式
-            messages = conv_service.get_conversation_history(conversation.conversation_id)
-            ai_response = await ai_service.chat(messages)
-            
-            # 保存AI回复
-            conv_service.add_message(
-                conversation_id=conversation.id,
-                role='assistant',
-                content=ai_response,
-                source='matrix'
-            )
-            
-            # 发送回复
-            await self.send_message(room.room_id, ai_response)
-            
-            # 关闭"正在输入"状态
-            try:
-                await self.client.room_typing(room.room_id, typing_state=False)
-            except Exception as e:
-                logger.warning(f"关闭输入状态失败: {e}")
-            
-            # 调用回调（用于网页同步）
+            # 通知回调处理 AI 回复（不再在这里直接调用 AI）
             if self.on_message_callback:
                 await self.on_message_callback(
-                    action="chat",
+                    action="generate_ai_response",
                     conversation_id=conversation.conversation_id,
-                    user_message=message_text,
-                    room_id=room.room_id,
-                    message_id=user_msg.id
+                    room_id=room.room_id
                 )
             
             logger.info(f"Matrix回复已发送: {ai_response[:50]}")