Skip to content

Commit cc9d409

Browse files
committed
🚚 修改css文件命名,支持配置超时时间
1 parent ba81ed5 commit cc9d409

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

nonebot_plugin_deepseek/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def parse_model_dict(model_dict: dict[str, dict[str, list[str]]], start_index: i
280280
model_lines = "".join(f"<div>{line}</div>" for line in model_list_msg.split("\n") if line)
281281
model_html = f"<h2 class='header-title'>{header_msg}</h2><div class='models-container'>{model_lines}</div>"
282282
final_html = header_html + model_html
283-
css_path = str(Path(__file__).parent / "resources/text.css")
283+
css_path = str(Path(__file__).parent / "resources/tts_models.css")
284284
await deepseek.finish(UniMessage.image(raw=await text_to_pic(text=final_html, css_path=css_path, width=1440)))
285285
await deepseek.finish(message)
286286

nonebot_plugin_deepseek/apis/request.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ async def get_tts_models(cls) -> list[TTSModelInfo]:
7070
f"{tts_config.base_url}/models",
7171
headers={**cls._headers},
7272
json={"version": tts_config.tts_version},
73-
timeout=30,
73+
timeout=tts_config.timeout,
7474
)
7575
if response.status_code != 200:
7676
raise RequestException(f"获取 TTS 模型列表失败,状态码: {response.status_code}")
@@ -92,6 +92,7 @@ async def text_to_speach(cls, text: str, model: str) -> bytes:
9292
"app_key": tts_config.access_token,
9393
"access_token": tts_config.access_token,
9494
"version": tts_config.tts_version,
95+
"dl_url": tts_config.dl_url,
9596
**model_config.to_dict(),
9697
}
9798

@@ -102,12 +103,12 @@ async def text_to_speach(cls, text: str, model: str) -> bytes:
102103
f"{tts_config.base_url}/infer_single",
103104
headers={**cls._headers, "Authorization": f"Bearer {tts_config.access_token}"},
104105
json=json,
105-
timeout=50,
106+
timeout=tts_config.timeout,
106107
)
107108
tts_logger("DEBUG", f"Response: {response.status_code} {response.text}")
108109
if audio_url := response.json().get("audio_url"):
109110
async with httpx.AsyncClient() as client:
110-
response = await client.get(audio_url, timeout=50)
111+
response = await client.get(audio_url, timeout=tts_config.timeout)
111112
return response.content
112113
else:
113114
raise RequestException("语音合成失败")

nonebot_plugin_deepseek/config.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,16 @@ class ScopedTTSConfig(BaseModel):
310310
"""Your GPT-Sovits API Access Token"""
311311
tts_version: str = "v4"
312312
"""Your GPT-Sovits API Version"""
313+
dl_url: str = ""
314+
"""audio download url"""
315+
timeout: int = Field(default=60)
316+
317+
@model_validator(mode="before")
318+
@classmethod
319+
def check_audio_dl_url(cls, data: dict) -> dict:
320+
if not data.get("audio_dl_url") and data.get("base_url"):
321+
data["audio_dl_url"] = data["base_url"]
322+
return data
313323

314324
def get_enable_tts(self) -> list[str]:
315325
if isinstance(self.enable_models, bool):

0 commit comments

Comments
 (0)