fz-mirrors/AstrBot
1
0
Fork 0
mirror of https://github.com/AstrBotDevs/AstrBot synced 2026-07-19 18:47:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 抱错时首先移除 tool

Browse Source
This commit is contained in:
Soulter
2025-02-02 23:17:59 +08:00
parent 37076d7920
commit d6e8655792
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
astrbot/core/provider/sources/openai_source.py
View File

@@ -102,17 +102,28 @@ class ProviderOpenAIOfficial(Provider):
)
except BaseException as e:
# 处理不支持 Function Calling 的模型
if 'does not support Function Calling' in str(e) \
or 'does not support tools' in str(e) \
or 'Function call is not supported' in str(e): # siliconcloud
del payloads['tools']
logger.debug(f"模型 {self.model_name} 不支持 tools，已自动移除")
completion = await self.client.chat.completions.create(
**payloads,
stream=False
)
# issue #305
# if 'does not support Function Calling' in str(e) \
# or 'does not support tools' in str(e) \
# or 'Function call is not supported' in str(e): # siliconcloud
# del payloads['tools']
# logger.debug(f"模型 {self.model_name} 不支持 tools，已自动移除")
# completion = await self.client.chat.completions.create(
# **payloads,
# stream=False
# )
# else:
# raise e
if 'tools' in payloads:
del payloads['tools']
logger.debug(f"模型 {self.model_name} 不支持 tools，已自动移除")
completion = await self.client.chat.completions.create(
**payloads,
stream=False
)
else:
raise e
assert isinstance(completion, ChatCompletion)
logger.debug(f"completion: {completion}")