Skip to content

Fix not supported field warnings in count_tokens_openai #6987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix not supported field warnings in count_tokens_openai #6987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d40c0a2
Fix not supported field warnings in count_tokens_openai
seunggil1 Sep 1, 2025
c5cbf31
Fix apply func_end(+12) only when tools exist in count_tokens_openai
seunggil1 Sep 1, 2025
f0589ec
Fix test coverage for optional parameters in count_tokens_openai
seunggil1 Sep 1, 2025
c7db7e4
Refactor count_tokens test cases in test_openai_chat_completion_clien…
seunggil1 Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,17 @@ def count_tokens_openai(
elif field == "description":
tool_tokens += 2
tool_tokens += len(encoding.encode(v["description"])) # pyright: ignore
elif field == "anyOf":
tool_tokens -= 3
for o in v["anyOf"]:
tool_tokens += 3
tool_tokens += len(encoding.encode(o["type"]))
elif field == "default":
tool_tokens += 2
tool_tokens += len(encoding.encode(json.dumps(v["default"])))
elif field == "title":
tool_tokens += 2
tool_tokens += len(encoding.encode(v["title"]))
elif field == "enum":
tool_tokens -= 3
for o in v["enum"]: # pyright: ignore
Expand All @@ -404,7 +415,9 @@ def count_tokens_openai(
if len(parameters["properties"]) == 0: # pyright: ignore
tool_tokens -= 2
num_tokens += tool_tokens
num_tokens += 12

if oai_tools:
num_tokens += 12
return num_tokens


Expand Down
23 changes: 21 additions & 2 deletions python/packages/autogen-ext/tests/models/test_openai_model_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import json
import logging
import os
from typing import Annotated, Any, AsyncGenerator, Dict, List, Literal, Tuple, TypeVar
from typing import Annotated, Any, AsyncGenerator, Dict, List, Literal, Tuple, TypeVar, Optional
from unittest.mock import AsyncMock, MagicMock

import httpx
Expand Down Expand Up @@ -450,11 +450,30 @@ def tool1(test: str, test2: str) -> str:
def tool2(test1: int, test2: List[int]) -> str:
return str(test1) + str(test2)

tools = [FunctionTool(tool1, description="example tool 1"), FunctionTool(tool2, description="example tool 2")]
def tool3(
test1: Annotated[Optional[str], "example"] = None,
test2: Literal["1", "2"] = "2"
) -> str:
return str(test1) + str(test2)

tools = [
FunctionTool(tool1, description="example tool 1"),
FunctionTool(tool2, description="example tool 2"),
FunctionTool(tool3, description="example tool 3")
]

mockcalculate_vision_tokens = MagicMock()
monkeypatch.setattr("autogen_ext.models.openai._openai_client.calculate_vision_tokens", mockcalculate_vision_tokens)

# Test count_tokens without tools
num_tokens = client.count_tokens(messages)
assert num_tokens

# Check that calculate_vision_tokens was called
mockcalculate_vision_tokens.assert_called_once()
mockcalculate_vision_tokens.reset_mock()

# Test count_tokens with tools
num_tokens = client.count_tokens(messages, tools=tools)
assert num_tokens

Expand Down