Skip to content

Commit 5645e99

Browse files
authored
Merge pull request xinnan-tech#1552 from liammazy/main
增加timeout配置项,单位为秒
2 parents 8ccddd9 + 6c5d98f commit 5645e99

File tree

1 file changed

+5
-1
lines changed
  • main/xiaozhi-server/core/providers/llm/openai

1 file changed

+5
-1
lines changed

main/xiaozhi-server/core/providers/llm/openai/openai.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import httpx
12
import openai
23
from openai.types import CompletionUsage
34
from config.logger import setup_logging
@@ -16,6 +17,9 @@ def __init__(self, config):
1617
self.base_url = config.get("base_url")
1718
else:
1819
self.base_url = config.get("url")
20+
# 增加timeout的配置项,单位为秒
21+
timeout = config.get("timeout", 300)
22+
self.timeout = int(timeout) if timeout else 300
1923

2024
param_defaults = {
2125
"max_tokens": (500, int),
@@ -42,7 +46,7 @@ def __init__(self, config):
4246
model_key_msg = check_model_key("LLM", self.api_key)
4347
if model_key_msg:
4448
logger.bind(tag=TAG).error(model_key_msg)
45-
self.client = openai.OpenAI(api_key=self.api_key, base_url=self.base_url)
49+
self.client = openai.OpenAI(api_key=self.api_key, base_url=self.base_url, timeout=httpx.Timeout(self.timeout))
4650

4751
def response(self, session_id, dialogue, **kwargs):
4852
try:

0 commit comments

Comments
 (0)