Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make tool parameters parsing compatible with the response of glm4 model in xinference provider when function tool call integerated #11049

Merged
merged 5 commits into from
Nov 25, 2024
+6 −1
Merged

make tool parameters parsing compatible with the response of glm4 model in xinference provider when function tool call integerated #11049

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2cae7f9
fix function call support issue for ollama and xinference
cyflhn Nov 20, 2024
1cfdf8d
update
cyflhn Nov 23, 2024
3e8c85b
add invoke timeout retry settings for xinference
cyflhn Nov 23, 2024
36430b3
fix bug xinference glm4 function tool call
cyflhn Nov 25, 2024
076b95e
merge from dify
cyflhn Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion api/core/tools/tool_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ def agent_invoke(
if parameters and len(parameters) == 1:
tool_parameters = {parameters[0].name: tool_parameters}
else:
raise ValueError(f"tool_parameters should be a dict, but got a string: {tool_parameters}")
try:
tool_parameters = json.loads(tool_parameters)
except Exception as e:
pass
if not isinstance(tool_parameters, dict):
raise ValueError(f"tool_parameters should be a dict, but got a string: {tool_parameters}")

# invoke the tool
try:
Expand Down