From 40b9aa3a4cbaa7a55491b14c1beaf85201418f86 Mon Sep 17 00:00:00 2001 From: Raven95676 Date: Wed, 14 May 2025 19:15:13 +0800 Subject: [PATCH] style: format code --- astrbot/core/config/default.py | 65 +++++++++++++++---- .../core/pipeline/result_decorate/stage.py | 23 ++++--- 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/astrbot/core/config/default.py b/astrbot/core/config/default.py index 56bdd5bac..46654d873 100644 --- a/astrbot/core/config/default.py +++ b/astrbot/core/config/default.py @@ -211,9 +211,9 @@ CONFIG_METADATA_2 = { }, "items": { "kf_name": { - "description": "微信客服账号名", - "type": "string", - "hint": "可选。微信客服账号名(不是 ID)。可在 https://kf.weixin.qq.com/kf/frame#/accounts 获取" + "description": "微信客服账号名", + "type": "string", + "hint": "可选。微信客服账号名(不是 ID)。可在 https://kf.weixin.qq.com/kf/frame#/accounts 获取", }, "telegram_token": { "description": "Bot Token", @@ -798,46 +798,87 @@ CONFIG_METADATA_2 = { "azure_tts_rate": "1", "azure_tts_volume": "100", "azure_tts_subscription_key": "", - "azure_tts_region": "eastus" + "azure_tts_region": "eastus", }, }, "items": { "azure_tts_voice": { "type": "string", "description": "音色设置", - "hint": "API 音色" + "hint": "API 音色", }, "azure_tts_style": { "type": "string", "description": "风格设置", - "hint": "声音特定的讲话风格。 可以表达快乐、同情和平静等情绪。" + "hint": "声音特定的讲话风格。 可以表达快乐、同情和平静等情绪。", }, "azure_tts_role": { "type": "string", "description": "模仿设置（可选）", "hint": "讲话角色扮演。 声音可以模仿不同的年龄和性别，但声音名称不会更改。 例如，男性语音可以提高音调和改变语调来模拟女性语音，但语音名称不会更改。 如果角色缺失或不受声音的支持，则会忽略此属性。", - "options": ["Boy","Girl","YoungAdultFemale","YoungAdultMale","OlderAdultFemale","OlderAdultMale","SeniorFemale","SeniorMale","禁用"] + "options": [ + "Boy", + "Girl", + "YoungAdultFemale", + "YoungAdultMale", + "OlderAdultFemale", + "OlderAdultMale", + "SeniorFemale", + "SeniorMale", + "禁用", + ], }, "azure_tts_rate": { "type": "string", "description": "语速设置", - "hint": "指示文本的讲出速率。可在字词或句子层面应用语速。 速率变化应为原始音频的 0.5 到 2 倍。" + "hint": "指示文本的讲出速率。可在字词或句子层面应用语速。 速率变化应为原始音频的 0.5 到 2 倍。", }, "azure_tts_volume": { "type": "string", "description": "语音音量设置", - "hint": "指示语音的音量级别。 可在句子层面应用音量的变化。以从 0.0 到 100.0（从最安静到最大声，例如 75）的数字表示。 默认值为 100.0。" + "hint": "指示语音的音量级别。 可在句子层面应用音量的变化。以从 0.0 到 100.0（从最安静到最大声，例如 75）的数字表示。 默认值为 100.0。", }, "azure_tts_region": { "type": "string", "description": "API 地区", "hint": "Azure_TTS 处理数据所在区域，具体参考 https://learn.microsoft.com/zh-cn/azure/ai-services/speech-service/regions", - "options": ["southafricanorth", "eastasia", "southeastasia", "australiaeast", "centralindia", "japaneast", "japanwest", "koreacentral", "canadacentral", "northeurope", "westeurope", "francecentral", "germanywestcentral", "norwayeast", "swedencentral", "switzerlandnorth", "switzerlandwest", "uksouth", "uaenorth", "brazilsouth", "qatarcentral", "centralus", "eastus", "eastus2", "northcentralus", "southcentralus", "westcentralus", "westus", "westus2", "westus3"] + "options": [ + "southafricanorth", + "eastasia", + "southeastasia", + "australiaeast", + "centralindia", + "japaneast", + "japanwest", + "koreacentral", + "canadacentral", + "northeurope", + "westeurope", + "francecentral", + "germanywestcentral", + "norwayeast", + "swedencentral", + "switzerlandnorth", + "switzerlandwest", + "uksouth", + "uaenorth", + "brazilsouth", + "qatarcentral", + "centralus", + "eastus", + "eastus2", + "northcentralus", + "southcentralus", + "westcentralus", + "westus", + "westus2", + "westus3", + ], }, "azure_tts_subscription_key": { "type": "string", "description": "服务订阅密钥", - "hint": "Azure_TTS 服务的订阅密钥（注意不是令牌）" + "hint": "Azure_TTS 服务的订阅密钥（注意不是令牌）", }, "dashscope_tts_voice": { "description": "语音合成模型", @@ -1382,7 +1423,7 @@ CONFIG_METADATA_2 = { "description": "对外可达的回调接口地址", "type": "string", "obvious_hint": True, - "hint": "外部服务可能会通过 AstrBot 生成的回调链接（如文件下载链接）访问 AstrBot 后端。由于 AstrBot 无法自动判断部署环境中对外可达的主机地址（host），因此需要通过此配置项显式指定 “外部服务如何访问 AstrBot” 的地址。如 http://localhost:6185，https://example.com 等。" + "hint": "外部服务可能会通过 AstrBot 生成的回调链接（如文件下载链接）访问 AstrBot 后端。由于 AstrBot 无法自动判断部署环境中对外可达的主机地址（host），因此需要通过此配置项显式指定 “外部服务如何访问 AstrBot” 的地址。如 http://localhost:6185，https://example.com 等。", }, "log_level": { "description": "控制台日志级别", diff --git a/astrbot/core/pipeline/result_decorate/stage.py b/astrbot/core/pipeline/result_decorate/stage.py index 55abdfb0b..bf877cf4a 100644 --- a/astrbot/core/pipeline/result_decorate/stage.py +++ b/astrbot/core/pipeline/result_decorate/stage.py @@ -1,17 +1,18 @@ -import time import re +import time import traceback -from typing import Union, AsyncGenerator -from ..stage import Stage, register_stage, registered_stages -from ..context import PipelineContext -from astrbot.core.platform.astr_message_event import AstrMessageEvent +from typing import AsyncGenerator, Union + +from astrbot.core import html_renderer, logger +from astrbot.core.message.components import At, File, Image, Node, Plain, Record, Reply from astrbot.core.message.message_event_result import ResultContentType +from astrbot.core.platform.astr_message_event import AstrMessageEvent from astrbot.core.platform.message_type import MessageType -from astrbot.core import logger -from astrbot.core.message.components import Plain, Image, At, Reply, Record, File, Node -from astrbot.core import html_renderer -from astrbot.core.star.star_handler import star_handlers_registry, EventType from astrbot.core.star.star import star_map +from astrbot.core.star.star_handler import EventType, star_handlers_registry + +from ..context import PipelineContext +from ..stage import Stage, register_stage, registered_stages @register_stage @@ -184,7 +185,9 @@ class ResultDecorateStage(Stage): new_chain.append( Record(file=audio_path, url=audio_path) ) - if(self.ctx.astrbot_config["provider_tts_settings"]["dual_output"]): + if self.ctx.astrbot_config["provider_tts_settings"][ + "dual_output" + ]: new_chain.append(comp) else: logger.error(