From faada9e8ef42549e39fd0db1d69f314bb8bac119 Mon Sep 17 00:00:00 2001 From: "Formatter [BOT]" Date: Wed, 7 Jan 2026 06:40:53 +0000 Subject: [PATCH] =?UTF-8?q?Auto-format=20code=20=F0=9F=A7=B9=F0=9F=8C=9F?= =?UTF-8?q?=F0=9F=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/cli.py | 19 +++++++++---------- xiaomusic/conversation.py | 8 ++++++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/xiaomusic/cli.py b/xiaomusic/cli.py index 1e13ba5..f0060cf 100644 --- a/xiaomusic/cli.py +++ b/xiaomusic/cli.py @@ -2,9 +2,7 @@ import argparse import json import logging -import os import signal -import sys import sentry_sdk from sentry_sdk.integrations.asyncio import AsyncioIntegration @@ -36,8 +34,6 @@ ignore_logger("miservice") def main(): - import uvicorn - from xiaomusic import __version__ from xiaomusic.api import HttpInit from xiaomusic.api import app as HttpApp @@ -104,7 +100,7 @@ def main(): def filter(self, record): if record.exc_info: exc_type = record.exc_info[0] - if exc_type and exc_type.__name__ == 'CancelledError': + if exc_type and exc_type.__name__ == "CancelledError": return False return True @@ -180,12 +176,14 @@ def main(): print(f"Execption {e}") import asyncio - from uvicorn import Config as UvicornConfig, Server + + from uvicorn import Config as UvicornConfig + from uvicorn import Server xiaomusic = XiaoMusic(config) HttpInit(xiaomusic) port = int(config.port) - + # 创建 uvicorn 配置,禁用其信号处理 uvicorn_config = UvicornConfig( HttpApp, @@ -194,19 +192,20 @@ def main(): log_config=LOGGING_CONFIG, ) server = Server(uvicorn_config) - + # 自定义信号处理 shutdown_initiated = False + def handle_exit(signum, frame): nonlocal shutdown_initiated if not shutdown_initiated: shutdown_initiated = True print("\n正在关闭服务器...") server.should_exit = True - + signal.signal(signal.SIGINT, handle_exit) signal.signal(signal.SIGTERM, handle_exit) - + # 运行服务器 asyncio.run(server.serve()) diff --git a/xiaomusic/conversation.py b/xiaomusic/conversation.py index b502268..0c22a5d 100644 --- a/xiaomusic/conversation.py +++ b/xiaomusic/conversation.py @@ -127,7 +127,9 @@ class ConversationPoller: await asyncio.sleep(5) continue - self.log.debug(f"Listening new message, timestamp: {self.last_timestamp}") + self.log.debug( + f"Listening new message, timestamp: {self.last_timestamp}" + ) # 动态获取最新的 cookie_jar if self.auth_manager.cookie_jar is not None: session._cookie_jar = self.auth_manager.cookie_jar @@ -146,7 +148,9 @@ class ConversationPoller: ) or self.config.get_ask_by_mina: tasks.append(self.get_latest_ask_by_mina(device_id)) else: - tasks.append(self.get_latest_ask_from_xiaoai(session, device_id)) + tasks.append( + self.get_latest_ask_from_xiaoai(session, device_id) + ) await asyncio.gather(*tasks) start = time.perf_counter()