Skip to content

fix-tool-call:fixing json serializable errors in handling tool calls #13999

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 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

fix-tool-call:fixing json serializable errors in handling tool calls #13999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion litellm/litellm_core_utils/prompt_templates/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

from .common_utils import convert_content_list_to_str, is_non_content_values_set
from .image_handling import convert_url_to_base64
from pydantic import BaseModel


def default_pt(messages):
Expand Down Expand Up @@ -1001,6 +1002,8 @@ def infer_protocol_value(
def _gemini_tool_call_invoke_helper(
function_call_params: ChatCompletionToolCallFunctionChunk,
) -> Optional[VertexFunctionCall]:
if isinstance(function_call_params, BaseModel):
function_call_params = function_call_params.model_dump()
name = function_call_params.get("name", "") or ""
arguments = function_call_params.get("arguments", "")
if (
Expand Down Expand Up @@ -1145,7 +1148,10 @@ def convert_to_gemini_tool_call_result(
and prev_tool_call_id
and msg_tool_call_id == prev_tool_call_id
):
name = tool.get("function", {}).get("name", "")
function_idf = tool.get("function")
if isinstance(function_idf, BaseModel):
function_idf = function_idf.model_dump()
name = getattr(function_idf, "get", lambda *_: "")("name", "")

if not name:
raise Exception(
Expand Down
11 changes: 11 additions & 0 deletions litellm/llms/custom_httpx/llm_http_handler.py
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the wrong place for this transformation to happen.

The handling for pydantic objects should be done in .completion() by these functions -

litellm/litellm/main.py

Line 971 in f01c7d1

tools = validate_and_fix_openai_tools(tools=tools)

Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
ModelResponse,
ProviderConfigManager,
)
from pydantic import BaseModel

if TYPE_CHECKING:
from litellm.litellm_core_utils.litellm_logging import Logging as _LiteLLMLoggingObj
Expand Down Expand Up @@ -108,6 +109,16 @@ async def _make_common_async_call(
provider_config.max_retry_on_unprocessable_entity_error
)

for message in data.get("messages", []):
if message.get("role") == "assistant" and message.get("tool_calls"):
for tool in message["tool_calls"]:
fn = tool.get("function")
if fn:
tool["function"] = (
fn.model_dump() if isinstance(fn, BaseModel)
else getattr(fn, "__dict__", fn)
)

response: Optional[httpx.Response] = None
for i in range(max(max_retry_on_unprocessable_entity_error, 1)):
try:
Expand Down
Loading