fix:将人格表达和remote请求改为异步,不阻塞启动主线程
This commit is contained in:
@@ -1,9 +1,10 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
|
|
||||||
import requests
|
import aiohttp
|
||||||
import platform
|
import platform
|
||||||
|
|
||||||
from src.common.logger import get_logger
|
from src.common.logger import get_logger
|
||||||
|
from src.common.tcp_connector import get_tcp_connector
|
||||||
from src.config.config import global_config
|
from src.config.config import global_config
|
||||||
from src.manager.async_task_manager import AsyncTask
|
from src.manager.async_task_manager import AsyncTask
|
||||||
from src.manager.local_store_manager import local_storage
|
from src.manager.local_store_manager import local_storage
|
||||||
@@ -64,22 +65,18 @@ class TelemetryHeartBeatTask(AsyncTask):
|
|||||||
logger.info("正在向遥测服务端请求UUID...")
|
logger.info("正在向遥测服务端请求UUID...")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = requests.post(
|
async with aiohttp.ClientSession(connector=await get_tcp_connector()) as session:
|
||||||
|
async with session.post(
|
||||||
f"{TELEMETRY_SERVER_URL}/stat/reg_client",
|
f"{TELEMETRY_SERVER_URL}/stat/reg_client",
|
||||||
json={"deploy_time": local_storage["deploy_time"]},
|
json={"deploy_time": local_storage["deploy_time"]},
|
||||||
timeout=5, # 设置超时时间为5秒
|
timeout=aiohttp.ClientTimeout(total=5), # 设置超时时间为5秒
|
||||||
)
|
) as response:
|
||||||
except Exception as e:
|
|
||||||
logger.warning(f"请求UUID出错,不过你还是可以正常使用麦麦: {e}") # 可能是网络问题
|
|
||||||
|
|
||||||
logger.debug(f"{TELEMETRY_SERVER_URL}/stat/reg_client")
|
logger.debug(f"{TELEMETRY_SERVER_URL}/stat/reg_client")
|
||||||
|
|
||||||
logger.debug(local_storage["deploy_time"])
|
logger.debug(local_storage["deploy_time"])
|
||||||
|
logger.debug(f"Response status: {response.status}")
|
||||||
|
|
||||||
logger.debug(response)
|
if response.status == 200:
|
||||||
|
data = await response.json()
|
||||||
if response.status_code == 200:
|
|
||||||
data = response.json()
|
|
||||||
if client_id := data.get("mmc_uuid"):
|
if client_id := data.get("mmc_uuid"):
|
||||||
# 将UUID存储到本地
|
# 将UUID存储到本地
|
||||||
local_storage["mmc_uuid"] = client_id
|
local_storage["mmc_uuid"] = client_id
|
||||||
@@ -89,9 +86,15 @@ class TelemetryHeartBeatTask(AsyncTask):
|
|||||||
else:
|
else:
|
||||||
logger.error("无效的服务端响应")
|
logger.error("无效的服务端响应")
|
||||||
else:
|
else:
|
||||||
|
response_text = await response.text()
|
||||||
logger.error(
|
logger.error(
|
||||||
f"请求UUID失败,不过你还是可以正常使用麦麦,状态码: {response.status_code}, 响应内容: {response.text}"
|
f"请求UUID失败,不过你还是可以正常使用麦麦,状态码: {response.status}, 响应内容: {response_text}"
|
||||||
)
|
)
|
||||||
|
except Exception as e:
|
||||||
|
import traceback
|
||||||
|
error_msg = str(e) if str(e) else "未知错误"
|
||||||
|
logger.warning(f"请求UUID出错,不过你还是可以正常使用麦麦: {type(e).__name__}: {error_msg}") # 可能是网络问题
|
||||||
|
logger.debug(f"完整错误信息: {traceback.format_exc()}")
|
||||||
|
|
||||||
# 请求失败,重试次数+1
|
# 请求失败,重试次数+1
|
||||||
try_count += 1
|
try_count += 1
|
||||||
@@ -112,26 +115,23 @@ class TelemetryHeartBeatTask(AsyncTask):
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.debug(f"正在发送心跳到服务器: {self.server_url}")
|
logger.debug(f"正在发送心跳到服务器: {self.server_url}")
|
||||||
|
|
||||||
logger.debug(headers)
|
logger.debug(headers)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = requests.post(
|
async with aiohttp.ClientSession(connector=await get_tcp_connector()) as session:
|
||||||
|
async with session.post(
|
||||||
f"{self.server_url}/stat/client_heartbeat",
|
f"{self.server_url}/stat/client_heartbeat",
|
||||||
headers=headers,
|
headers=headers,
|
||||||
json=self.info_dict,
|
json=self.info_dict,
|
||||||
timeout=5, # 设置超时时间为5秒
|
timeout=aiohttp.ClientTimeout(total=5), # 设置超时时间为5秒
|
||||||
)
|
) as response:
|
||||||
except Exception as e:
|
logger.debug(f"Response status: {response.status}")
|
||||||
logger.warning(f"(此消息不会影响正常使用)状态未发生: {e}")
|
|
||||||
|
|
||||||
logger.debug(response)
|
|
||||||
|
|
||||||
# 处理响应
|
# 处理响应
|
||||||
if 200 <= response.status_code < 300:
|
if 200 <= response.status < 300:
|
||||||
# 成功
|
# 成功
|
||||||
logger.debug(f"心跳发送成功,状态码: {response.status_code}")
|
logger.debug(f"心跳发送成功,状态码: {response.status}")
|
||||||
elif response.status_code == 403:
|
elif response.status == 403:
|
||||||
# 403 Forbidden
|
# 403 Forbidden
|
||||||
logger.warning(
|
logger.warning(
|
||||||
"(此消息不会影响正常使用)心跳发送失败,403 Forbidden: 可能是UUID无效或未注册。"
|
"(此消息不会影响正常使用)心跳发送失败,403 Forbidden: 可能是UUID无效或未注册。"
|
||||||
@@ -141,9 +141,15 @@ class TelemetryHeartBeatTask(AsyncTask):
|
|||||||
del local_storage["mmc_uuid"] # 删除本地存储的UUID
|
del local_storage["mmc_uuid"] # 删除本地存储的UUID
|
||||||
else:
|
else:
|
||||||
# 其他错误
|
# 其他错误
|
||||||
|
response_text = await response.text()
|
||||||
logger.warning(
|
logger.warning(
|
||||||
f"(此消息不会影响正常使用)状态未发送,状态码: {response.status_code}, 响应内容: {response.text}"
|
f"(此消息不会影响正常使用)状态未发送,状态码: {response.status}, 响应内容: {response_text}"
|
||||||
)
|
)
|
||||||
|
except Exception as e:
|
||||||
|
import traceback
|
||||||
|
error_msg = str(e) if str(e) else "未知错误"
|
||||||
|
logger.warning(f"(此消息不会影响正常使用)状态未发生: {type(e).__name__}: {error_msg}")
|
||||||
|
logger.debug(f"完整错误信息: {traceback.format_exc()}")
|
||||||
|
|
||||||
async def run(self):
|
async def run(self):
|
||||||
# 发送心跳
|
# 发送心跳
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
import asyncio
|
||||||
from .personality import Personality
|
from .personality import Personality
|
||||||
from .identity import Identity
|
from .identity import Identity
|
||||||
from .expression_style import PersonalityExpression
|
from .expression_style import PersonalityExpression
|
||||||
@@ -86,7 +87,7 @@ class Individuality:
|
|||||||
)
|
)
|
||||||
logger.info("已将完整人设更新到bot的impression中")
|
logger.info("已将完整人设更新到bot的impression中")
|
||||||
|
|
||||||
await self.express_style.extract_and_store_personality_expressions()
|
asyncio.create_task(self.express_style.extract_and_store_personality_expressions())
|
||||||
|
|
||||||
def to_dict(self) -> dict:
|
def to_dict(self) -> dict:
|
||||||
"""将个体特征转换为字典格式"""
|
"""将个体特征转换为字典格式"""
|
||||||
|
|||||||
Reference in New Issue
Block a user