phoenix/litellm
1
0
Fork 0
forked from phoenix/litellm-mirror
Code Pull requests Activity

Less changes

Browse source
This commit is contained in:
Pamela Fox 2024-07-15 11:09:45 -07:00
parent d43dbc756b
commit a2188a869e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
litellm/utils.py
View file

@ -1635,12 +1635,12 @@ def openai_token_counter(
image_url_dict = c["image_url"] image_url_dict = c["image_url"]
detail = image_url_dict.get("detail", "auto") detail = image_url_dict.get("detail", "auto")
url = image_url_dict.get("url") url = image_url_dict.get("url")
num_tokens += _calculate_img_tokens( num_tokens += calculate_img_tokens(
data=url, mode=detail data=url, mode=detail
) )
elif isinstance(c["image_url"], str): elif isinstance(c["image_url"], str):
image_url_str = c["image_url"] image_url_str = c["image_url"]
num_tokens += _calculate_img_tokens( num_tokens += calculate_img_tokens(
data=image_url_str, mode="auto" data=image_url_str, mode="auto"
) )
elif text is not None and count_response_tokens == True: elif text is not None and count_response_tokens == True:
@ -1749,7 +1749,7 @@ def get_image_dimensions(data):
return None, None return None, None
def _calculate_img_tokens( def calculate_img_tokens(
data, data,
mode: Literal["low", "high", "auto"] = "auto", mode: Literal["low", "high", "auto"] = "auto",
base_tokens: int = 85, # openai default - https://openai.com/pricing base_tokens: int = 85, # openai default - https://openai.com/pricing
@ -1909,12 +1909,12 @@ def token_counter(
image_url_dict = c["image_url"] image_url_dict = c["image_url"]
detail = image_url_dict.get("detail", "auto") detail = image_url_dict.get("detail", "auto")
url = image_url_dict.get("url") url = image_url_dict.get("url")
num_tokens += _calculate_img_tokens( num_tokens += calculate_img_tokens(
data=url, mode=detail data=url, mode=detail
) )
elif isinstance(c["image_url"], str): elif isinstance(c["image_url"], str):
image_url_str = c["image_url"] image_url_str = c["image_url"]
num_tokens += _calculate_img_tokens( num_tokens += calculate_img_tokens(
data=image_url_str, mode="auto" data=image_url_str, mode="auto"
) )
if "tool_calls" in message: if "tool_calls" in message: