mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-26 11:14:04 +00:00
Less changes
This commit is contained in:
parent
a2188a869e
commit
8d01f91056
1 changed files with 5 additions and 5 deletions
|
@ -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 += calculage_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 += calculage_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 calculage_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 += calculage_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 += calculage_img_tokens(
|
||||||
data=image_url_str, mode="auto"
|
data=image_url_str, mode="auto"
|
||||||
)
|
)
|
||||||
if "tool_calls" in message:
|
if "tool_calls" in message:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue