phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-26 11:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add property ordering for vertex ai schema (#9828) + Fix combining multiple tool calls (#10040)

Browse source 
* fix #9783: Retain schema field ordering for google gemini and vertex (#9828)

* test: update test

* refactor(groq.py): initial commit migrating groq to base_llm_http_handler

* fix(streaming_chunk_builder_utils.py): fix how tool content is combined

Fixes https://github.com/BerriAI/litellm/issues/10034

* fix(vertex_ai/common_utils.py): prevent infinite loop in helper function

* fix(groq/chat/transformation.py): handle groq streaming errors correctly

* fix(groq/chat/transformation.py): handle max_retries

---------

Co-authored-by: Adrian Lyjak <adrian@chatmeter.com>
This commit is contained in:
Krish Dholakia 2025-04-15 22:29:25 -07:00 • committed by GitHub
parent 1b9b745cae
commit fdfa1108a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 493 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

158
tests/litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py Normal file
View file

@ -0,0 +1,158 @@
import json
import os
import sys
import pytest
sys.path.insert(
0, os.path.abspath("../../..")
) # Adds the parent directory to the system path
from litellm.litellm_core_utils.streaming_chunk_builder_utils import ChunkProcessor
from litellm.types.utils import (
ChatCompletionDeltaToolCall,
ChatCompletionMessageToolCall,
Delta,
Function,
ModelResponseStream,
StreamingChoices,
)
def test_get_combined_tool_content():
chunks = [
ModelResponseStream(
id="chatcmpl-8478099a-3724-42c7-9194-88d97ffd254b",
created=1744771912,
model="llama-3.3-70b-versatile",
object="chat.completion.chunk",
system_fingerprint=None,
choices=[
StreamingChoices(
finish_reason=None,
index=0,
delta=Delta(
provider_specific_fields=None,
content=None,
role="assistant",
function_call=None,
tool_calls=[
ChatCompletionDeltaToolCall(
id="call_m87w",
function=Function(
arguments='{"location": "San Francisco", "unit": "imperial"}',
name="get_current_weather",
),
type="function",
index=0,
)
],
audio=None,
),
logprobs=None,
)
],
provider_specific_fields=None,
stream_options=None,
),
ModelResponseStream(
id="chatcmpl-8478099a-3724-42c7-9194-88d97ffd254b",
created=1744771912,
model="llama-3.3-70b-versatile",
object="chat.completion.chunk",
system_fingerprint=None,
choices=[
StreamingChoices(
finish_reason=None,
index=0,
delta=Delta(
provider_specific_fields=None,
content=None,
role="assistant",
function_call=None,
tool_calls=[
ChatCompletionDeltaToolCall(
id="call_rrns",
function=Function(
arguments='{"location": "Tokyo", "unit": "metric"}',
name="get_current_weather",
),
type="function",
index=1,
)
],
audio=None,
),
logprobs=None,
)
],
provider_specific_fields=None,
stream_options=None,
),
ModelResponseStream(
id="chatcmpl-8478099a-3724-42c7-9194-88d97ffd254b",
created=1744771912,
model="llama-3.3-70b-versatile",
object="chat.completion.chunk",
system_fingerprint=None,
choices=[
StreamingChoices(
finish_reason=None,
index=0,
delta=Delta(
provider_specific_fields=None,
content=None,
role="assistant",
function_call=None,
tool_calls=[
ChatCompletionDeltaToolCall(
id="call_0k29",
function=Function(
arguments='{"location": "Paris", "unit": "metric"}',
name="get_current_weather",
),
type="function",
index=2,
)
],
audio=None,
),
logprobs=None,
)
],
provider_specific_fields=None,
stream_options=None,
),
]
chunk_processor = ChunkProcessor(chunks=chunks)
tool_calls_list = chunk_processor.get_combined_tool_content(chunks)
assert tool_calls_list == [
ChatCompletionMessageToolCall(
id="call_m87w",
function=Function(
arguments='{"location": "San Francisco", "unit": "imperial"}',
name="get_current_weather",
),
type="function",
index=0,
),
ChatCompletionMessageToolCall(
id="call_rrns",
function=Function(
arguments='{"location": "Tokyo", "unit": "metric"}',
name="get_current_weather",
),
type="function",
index=1,
),
ChatCompletionMessageToolCall(
id="call_0k29",
function=Function(
arguments='{"location": "Paris", "unit": "metric"}',
name="get_current_weather",
),
type="function",
index=2,
),
]