mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-06-02 12:05:54 +00:00
fix: 修复nakuru无法运行的问题
This commit is contained in:
@@ -151,7 +151,7 @@ class Controller:
|
||||
except Exception as e:
|
||||
self.ap.logger.error(f"处理请求时出错 query_id={query.query_id}: {e}")
|
||||
self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
|
||||
# traceback.print_exc()
|
||||
traceback.print_exc()
|
||||
finally:
|
||||
self.ap.logger.debug(f"Query {query} processed")
|
||||
|
||||
|
||||
@@ -101,8 +101,12 @@ class PlatformManager:
|
||||
adapter=adapter
|
||||
)
|
||||
|
||||
index = 0
|
||||
|
||||
for adap_cfg in self.ap.platform_cfg.data['platform-adapters']:
|
||||
if adap_cfg['enable']:
|
||||
self.ap.logger.info(f'初始化平台适配器 {index}: {adap_cfg["adapter"]}')
|
||||
index += 1
|
||||
cfg_copy = adap_cfg.copy()
|
||||
del cfg_copy['enable']
|
||||
adapter_name = cfg_copy['adapter']
|
||||
@@ -179,7 +183,14 @@ class PlatformManager:
|
||||
try:
|
||||
tasks = []
|
||||
for adapter in self.adapters:
|
||||
tasks.append(adapter.run_async())
|
||||
async def exception_wrapper(adapter):
|
||||
try:
|
||||
await adapter.run_async()
|
||||
except Exception as e:
|
||||
self.ap.logger.error('平台适配器运行出错: ' + str(e))
|
||||
self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
|
||||
|
||||
tasks.append(exception_wrapper(adapter))
|
||||
|
||||
for task in tasks:
|
||||
asyncio.create_task(task)
|
||||
@@ -187,3 +198,4 @@ class PlatformManager:
|
||||
except Exception as e:
|
||||
self.ap.logger.error('平台适配器运行出错: ' + str(e))
|
||||
self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from __future__ import annotations
|
||||
# 加了之后会导致:https://github.com/Lxns-Network/nakuru-project/issues/25
|
||||
# from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import typing
|
||||
@@ -12,7 +13,6 @@ import nakuru.entities.components as nkc
|
||||
|
||||
from .. import adapter as adapter_model
|
||||
from ...pipeline.longtext.strategies import forward
|
||||
from ...core import app
|
||||
|
||||
|
||||
class NakuruProjectMessageConverter(adapter_model.MessageConverter):
|
||||
@@ -170,11 +170,11 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
|
||||
|
||||
listener_list: list[dict]
|
||||
|
||||
ap: app.Application
|
||||
# ap: app.Application
|
||||
|
||||
cfg: dict
|
||||
|
||||
def __init__(self, cfg: dict, ap: app.Application):
|
||||
def __init__(self, cfg: dict, ap):
|
||||
"""初始化nakuru-project的对象"""
|
||||
cfg['port'] = cfg['ws_port']
|
||||
del cfg['ws_port']
|
||||
@@ -261,8 +261,10 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
|
||||
):
|
||||
try:
|
||||
|
||||
source_cls = NakuruProjectEventConverter.yiri2target(event_type)
|
||||
|
||||
# 包装函数
|
||||
async def listener_wrapper(app: nakuru.CQHTTP, source: NakuruProjectAdapter.event_converter.yiri2target(event_type)):
|
||||
async def listener_wrapper(app: nakuru.CQHTTP, source: source_cls):
|
||||
await callback(self.event_converter.target2yiri(source), self)
|
||||
|
||||
# 将包装函数和原函数的对应关系存入列表
|
||||
@@ -275,7 +277,7 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
|
||||
)
|
||||
|
||||
# 注册监听器
|
||||
self.bot.receiver(self.event_converter.yiri2target(event_type).__name__)(listener_wrapper)
|
||||
self.bot.receiver(source_cls.__name__)(listener_wrapper)
|
||||
except Exception as e:
|
||||
traceback.print_exc()
|
||||
raise e
|
||||
@@ -325,7 +327,7 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
|
||||
await self.bot._run()
|
||||
self.ap.logger.info("运行 Nakuru 适配器")
|
||||
while True:
|
||||
await asyncio.sleep(100)
|
||||
await asyncio.sleep(1)
|
||||
|
||||
def kill(self) -> bool:
|
||||
return False
|
||||
Reference in New Issue
Block a user