feat: 命令行退出方式

pkg/core/app.py

@@ -4,6 +4,8 @@ import logging
 import asyncio
 import traceback
 
+import aioconsole
+
 from ..platform import manager as im_mgr
 from ..provider.session import sessionmgr as llm_session_mgr
 from ..provider.requester import modelmgr as llm_model_mgr
@@ -72,11 +74,21 @@ class Application:
         tasks = []
 
         try:
+
+                    
             tasks = [
                 asyncio.create_task(self.im_mgr.run()),
                 asyncio.create_task(self.ctrl.run())
             ]
-            await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
+
+            async def interrupt(tasks):
+                await asyncio.sleep(1.5)
+                while await aioconsole.ainput("使用 exit 退出程序 > ") != 'exit':
+                    pass
+                for task in tasks:
+                    task.cancel()
+            
+            await interrupt(tasks)
 
         except asyncio.CancelledError:
             pass

pkg/pipeline/resprule/rules/random.py

@@ -13,7 +13,8 @@ class RandomRespRule(rule_model.GroupRespondRule):
         self,
         message_text: str,
         message_chain: mirai.MessageChain,
-        rule_dict: dict
+        rule_dict: dict,
+        query: core_entities.Query
     ) -> entities.RuleJudgeResult:
         random_rate = rule_dict['random']
         

pkg/pipeline/resprule/rules/regexp.py

@@ -13,7 +13,8 @@ class RegExpRule(rule_model.GroupRespondRule):
         self,
         message_text: str,
         message_chain: mirai.MessageChain,
-        rule_dict: dict
+        rule_dict: dict,
+        query: core_entities.Query
     ) -> entities.RuleJudgeResult:
         regexps = rule_dict['regexp']
 

pkg/platform/manager.py

@@ -78,13 +78,6 @@ class PlatformManager:
                     adapter=adapter
                 )
 
-        # nakuru不区分好友和陌生人，故仅为yirimirai注册陌生人事件
-        # if self.ap.platform_cfg.data['platform-adapter'] == 'yiri-mirai':
-        #     self.adapter.register_listener(
-        #         StrangerMessage,
-        #         on_stranger_message
-        #     )
-
         async def on_group_message(event: GroupMessage, adapter: msadapter.MessageSourceAdapter):
 
             event_ctx = await self.ap.plugin_mgr.emit_event(
@@ -187,7 +180,10 @@ class PlatformManager:
             tasks = []
             for adapter in self.adapters:
                 tasks.append(adapter.run_async())
-            await asyncio.gather(*tasks)
+            
+            for task in tasks:
+                asyncio.create_task(task)
+
         except Exception as e:
             self.ap.logger.error('平台适配器运行出错: ' + str(e))
             self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")

requirements.txt

@@ -14,3 +14,4 @@ tiktoken
 PyYaml
 aiohttp
 pydantic
+aioconsole