refactor: 命令基本完成

pkg/pipeline/process/handlers/chat.py

@@ -7,6 +7,7 @@ import mirai
 from .. import handler
 from ... import entities
 from ....core import entities as core_entities
+from ....openai import entities as llm_entities
 
 
 class ChatMessageHandler(handler.MessageHandler):
@@ -25,6 +26,13 @@ class ChatMessageHandler(handler.MessageHandler):
 
         conversation = await self.ap.sess_mgr.get_conversation(session)
 
+        conversation.messages.append(
+            llm_entities.Message(
+                role="user",
+                content=str(query.message_chain)
+            )
+        )
+
         async for result in conversation.use_model.requester.request(query, conversation):
             conversation.messages.append(result)
 

pkg/pipeline/process/handlers/command.py

@@ -34,13 +34,17 @@ class CommandHandler(handler.MessageHandler):
                     result_type=entities.ResultType.CONTINUE,
                     new_query=query
                 )
-            else:
-                if ret.text is not None:
-                    query.resp_message_chain = mirai.MessageChain([
-                        mirai.Plain(ret.text)
-                    ])
+            elif ret.text is not None:
+                query.resp_message_chain = mirai.MessageChain([
+                    mirai.Plain(ret.text)
+                ])
 
-                    yield entities.StageProcessResult(
-                        result_type=entities.ResultType.CONTINUE,
-                        new_query=query
-                    )
+                yield entities.StageProcessResult(
+                    result_type=entities.ResultType.CONTINUE,
+                    new_query=query
+                )
+            else:
+                yield entities.StageProcessResult(
+                    result_type=entities.ResultType.INTERRUPT,
+                    new_query=query
+                )