seg_yinzy
/
dify-on-wechat
mirror of https://github.com/fwasdfw/dify-on-wechat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: support fastgpt tool call response (#39)

master
Han Fangyuan 2024-05-19 12:48:53 +08:00 committed by GitHub
parent b30c36d9b1
commit 5d4502df22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bot/chatgpt/chat_gpt_bot.py
View File

@ -129,10 +129,52 @@ class ChatGPTBot(Bot, OpenAIImage, OpenAIVision):
response = openai.ChatCompletion.create(api_key=api_key, messages=session.messages, **args) response = openai.ChatCompletion.create(api_key=api_key, messages=session.messages, **args)
# logger.debug("[CHATGPT] response={}".format(response)) # logger.debug("[CHATGPT] response={}".format(response))
# logger.info("[ChatGPT] reply={}, total_tokens={}".format(response.choices[0]['message']['content'], response["usage"]["total_tokens"])) # logger.info("[ChatGPT] reply={}, total_tokens={}".format(response.choices[0]['message']['content'], response["usage"]["total_tokens"]))
content = response.choices[0]["message"]["content"]
# fastgpt工具调用格式处理
if isinstance(content, list):
# {
# "id": "",
# "model": "",
# "usage": {},
# "choices": [
# {
# "message": {
# "role": "assistant",
# "content": [
# {
# "type": "tool",
# "tools": [
# {
# "id": "xx",
# "toolName": "HTTP请求",
# "toolAvatar": "xx",
# "functionName": "xx",
# "params": "{\"key1\":\"xx\",\"key2\":\"xxx"}",
# "response": "xxx"
# }
# ]
# },
# {
# "type": "text",
# "text": {
# "content": "xxx"
# }
# }
# ]
# },
# "finish_reason": "stop",
# "index": 0
# }
# ]
# }
for item in content:
if item["type"] == "text":
content = item["text"]["content"]
break
return { return {
"total_tokens": response["usage"]["total_tokens"], "total_tokens": response["usage"]["total_tokens"],
"completion_tokens": response["usage"]["completion_tokens"], "completion_tokens": response["usage"]["completion_tokens"],
"content": response.choices[0]["message"]["content"], "content": content,
} }
except Exception as e: except Exception as e:
need_retry = retry_count < 2 need_retry = retry_count < 2