AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-17 12:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue #13483 and #13434 (#13518)

Browse Source 
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
This commit is contained in:
yihong 2025-02-11 12:45:49 +08:00 committed by GitHub
parent 47a64610ca
commit 1f38d4846b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py
View File

@ -807,9 +807,12 @@ class OAIAPICompatLargeLanguageModel(_CommonOaiApiCompat, LargeLanguageModel):
# calculate num tokens for function object # calculate num tokens for function object
num_tokens += self._get_num_tokens_by_gpt2("name") num_tokens += self._get_num_tokens_by_gpt2("name")
if hasattr(tool, "name"):
num_tokens += self._get_num_tokens_by_gpt2(tool.name) num_tokens += self._get_num_tokens_by_gpt2(tool.name)
num_tokens += self._get_num_tokens_by_gpt2("description") num_tokens += self._get_num_tokens_by_gpt2("description")
if hasattr(tool, "description"):
num_tokens += self._get_num_tokens_by_gpt2(tool.description) num_tokens += self._get_num_tokens_by_gpt2(tool.description)
if hasattr(tool, "parameters"):
parameters = tool.parameters parameters = tool.parameters
num_tokens += self._get_num_tokens_by_gpt2("parameters") num_tokens += self._get_num_tokens_by_gpt2("parameters")
if "title" in parameters: if "title" in parameters:
@ -819,7 +822,7 @@ class OAIAPICompatLargeLanguageModel(_CommonOaiApiCompat, LargeLanguageModel):
num_tokens += self._get_num_tokens_by_gpt2(parameters.get("type")) num_tokens += self._get_num_tokens_by_gpt2(parameters.get("type"))
if "properties" in parameters: if "properties" in parameters:
num_tokens += self._get_num_tokens_by_gpt2("properties") num_tokens += self._get_num_tokens_by_gpt2("properties")
for key, value in parameters.get("properties").items(): for key, value in parameters.get("properties", {}).items():
num_tokens += self._get_num_tokens_by_gpt2(key) num_tokens += self._get_num_tokens_by_gpt2(key)
for field_key, field_value in value.items(): for field_key, field_value in value.items():
num_tokens += self._get_num_tokens_by_gpt2(field_key) num_tokens += self._get_num_tokens_by_gpt2(field_key)