mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-26 11:14:04 +00:00
fix(utils.py): don't modify openai_token_counter
This commit is contained in:
parent
294de31803
commit
b12a9892b7
2 changed files with 3 additions and 2 deletions
|
@ -1674,7 +1674,7 @@ def openai_token_counter( # noqa: PLR0915
|
||||||
|
|
||||||
if tools:
|
if tools:
|
||||||
num_tokens += len(encoding.encode(_format_function_definitions(tools)))
|
num_tokens += len(encoding.encode(_format_function_definitions(tools)))
|
||||||
num_tokens += FUNCTION_DEFINITION_TOKEN_COUNT # Additional tokens for function definition of tools
|
num_tokens += 9 # Additional tokens for function definition of tools
|
||||||
# If there's a system message and tools are present, subtract four tokens
|
# If there's a system message and tools are present, subtract four tokens
|
||||||
if tools and includes_system_message:
|
if tools and includes_system_message:
|
||||||
num_tokens -= 4
|
num_tokens -= 4
|
||||||
|
@ -1684,7 +1684,7 @@ def openai_token_counter( # noqa: PLR0915
|
||||||
if tool_choice == "none":
|
if tool_choice == "none":
|
||||||
num_tokens += 1
|
num_tokens += 1
|
||||||
elif isinstance(tool_choice, dict):
|
elif isinstance(tool_choice, dict):
|
||||||
num_tokens += TOOL_CHOICE_OBJECT_TOKEN_COUNT
|
num_tokens += 7
|
||||||
num_tokens += len(encoding.encode(tool_choice["function"]["name"]))
|
num_tokens += len(encoding.encode(tool_choice["function"]["name"]))
|
||||||
|
|
||||||
return num_tokens
|
return num_tokens
|
||||||
|
|
|
@ -135,6 +135,7 @@ def main():
|
||||||
"token_counter.py",
|
"token_counter.py",
|
||||||
"mock_functions.py",
|
"mock_functions.py",
|
||||||
"duration_parser.py",
|
"duration_parser.py",
|
||||||
|
"utils.py",
|
||||||
]
|
]
|
||||||
ignore_folder = "types"
|
ignore_folder = "types"
|
||||||
for root, dirs, files in os.walk(folder):
|
for root, dirs, files in os.walk(folder):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue