mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-27 01:22:18 +00:00
* ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: move tests/test_litellm/llms into tests/unit/llms Rename-only. Moves the provider tests and the fine-tuning fixtures they load, mirroring the old paths. Follow-up commits merge, split and wire them. * test: merge, split and prune the moved llms tests Merges the Databricks chat transformation tests into the existing unit file, keeps the tests that need real keys or the network in tests/test_litellm, deletes the audited tests a stronger unit test already covers, and points imports at tests.unit.llms. * ci: run the moved llms tests under their legacy flags The Vertex AI and All Other Providers shards keep their legacy test-path for the retained files and add the llm-vertex-ai and llm-other-providers unit selections. CircleCI gets matching unit jobs. * test: make the tests/unit/llms directories packages Adds __init__.py to the moved dirs and drops the legacy ones whose directories no longer hold tests. * test: drop script runners and path hacks the llms split left dangling The __main__ runners in the split openai_like files and the Databricks e2e runner called tests that now live in the other half of the split or were deleted. The retained legacy halves also no longer need sys.path edits. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. * test: keep the Databricks manual e2e runner and fix the SageMaker Nova run path The Databricks e2e file is a manual script whose main() calls the tests that were pruned, so pruning them broke the documented run. It is back to its main version. The SageMaker Nova docstring now points at the file's real location in tests/local_testing. * test: keep the job's UNIT_FLAG out of the shard-script tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
223 lines
8 KiB
Python
223 lines
8 KiB
Python
from unittest.mock import AsyncMock, patch
|
|
|
|
import pytest
|
|
|
|
from litellm.llms.gemini.common_utils import GeminiModelInfo, GoogleAIStudioTokenCounter
|
|
|
|
|
|
class TestGeminiModelInfo:
|
|
"""Test suite for GeminiModelInfo class"""
|
|
|
|
def test_process_model_name_normal_cases(self):
|
|
"""Test process_model_name with normal model names"""
|
|
gemini_model_info = GeminiModelInfo()
|
|
|
|
# Test with normal model names
|
|
models = [
|
|
{"name": "models/gemini-1.5-flash"},
|
|
{"name": "models/gemini-1.5-pro"},
|
|
{"name": "models/gemini-2.0-flash-exp"},
|
|
]
|
|
|
|
result = gemini_model_info.process_model_name(models)
|
|
|
|
expected = [
|
|
"gemini/gemini-1.5-flash",
|
|
"gemini/gemini-1.5-pro",
|
|
"gemini/gemini-2.0-flash-exp",
|
|
]
|
|
|
|
assert result == expected
|
|
|
|
def test_process_model_name_edge_cases(self):
|
|
"""Test process_model_name with edge cases that could be affected by strip() vs replace()"""
|
|
gemini_model_info = GeminiModelInfo()
|
|
|
|
# Test edge cases where model names end with characters from "models/"
|
|
# These would be incorrectly processed if using strip("models/") instead of replace("models/", "")
|
|
models = [
|
|
{
|
|
"name": "models/gemini-1.5-pro"
|
|
}, # ends with 'o' - would become "gemini-1.5-pr" with strip()
|
|
{
|
|
"name": "models/test-model"
|
|
}, # ends with 'l' - would become "gemini/test-mode" with strip()
|
|
{
|
|
"name": "models/custom-models"
|
|
}, # ends with 's' - would become "gemini/custom-model" with strip()
|
|
{
|
|
"name": "models/demo"
|
|
}, # ends with 'o' - would become "gemini/dem" with strip()
|
|
]
|
|
|
|
result = gemini_model_info.process_model_name(models)
|
|
|
|
expected = [
|
|
"gemini/gemini-1.5-pro", # 'o' should be preserved
|
|
"gemini/test-model", # 'l' should be preserved
|
|
"gemini/custom-models", # 's' should be preserved
|
|
"gemini/demo", # 'o' should be preserved
|
|
]
|
|
|
|
assert result == expected
|
|
|
|
def test_process_model_name_empty_list(self):
|
|
"""Test process_model_name with empty list"""
|
|
gemini_model_info = GeminiModelInfo()
|
|
|
|
result = gemini_model_info.process_model_name([])
|
|
|
|
assert result == []
|
|
|
|
def test_process_model_name_no_models_prefix(self):
|
|
"""Test process_model_name with model names that don't have 'models/' prefix"""
|
|
gemini_model_info = GeminiModelInfo()
|
|
|
|
models = [
|
|
{"name": "gemini-1.5-flash"}, # No "models/" prefix
|
|
{"name": "custom-model"},
|
|
]
|
|
|
|
result = gemini_model_info.process_model_name(models)
|
|
|
|
expected = [
|
|
"gemini/gemini-1.5-flash",
|
|
"gemini/custom-model",
|
|
]
|
|
|
|
assert result == expected
|
|
|
|
|
|
class TestGoogleAIStudioTokenCounter:
|
|
"""Test suite for GoogleAIStudioTokenCounter class"""
|
|
|
|
def test_should_use_token_counting_api(self):
|
|
"""Test should_use_token_counting_api method with different provider values"""
|
|
from litellm.types.utils import LlmProviders
|
|
|
|
token_counter = GoogleAIStudioTokenCounter()
|
|
|
|
# Test with gemini provider - should return True
|
|
assert (
|
|
token_counter.should_use_token_counting_api(LlmProviders.GEMINI.value)
|
|
is True
|
|
)
|
|
|
|
# Test with other providers - should return False
|
|
assert (
|
|
token_counter.should_use_token_counting_api(LlmProviders.OPENAI.value)
|
|
is False
|
|
)
|
|
assert token_counter.should_use_token_counting_api("anthropic") is False
|
|
assert token_counter.should_use_token_counting_api("vertex_ai") is False
|
|
|
|
# Test with None - should return False
|
|
assert token_counter.should_use_token_counting_api(None) is False
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_count_tokens(self):
|
|
"""Test count_tokens method with mocked API response"""
|
|
from litellm.types.utils import TokenCountResponse
|
|
|
|
token_counter = GoogleAIStudioTokenCounter()
|
|
|
|
# Mock the GoogleAIStudioTokenCounter from handler module
|
|
mock_response = {
|
|
"totalTokens": 31,
|
|
"totalBillableCharacters": 96,
|
|
"promptTokensDetails": [{"modality": "TEXT", "tokenCount": 31}],
|
|
}
|
|
|
|
with patch(
|
|
"litellm.llms.gemini.count_tokens.handler.GoogleAIStudioTokenCounter.acount_tokens",
|
|
new_callable=AsyncMock,
|
|
) as mock_acount_tokens:
|
|
mock_acount_tokens.return_value = mock_response
|
|
|
|
# Test data
|
|
model_to_use = "gemini-1.5-flash"
|
|
contents = [{"parts": [{"text": "Hello world"}]}]
|
|
request_model = "gemini/gemini-1.5-flash"
|
|
|
|
# Call the method
|
|
result = await token_counter.count_tokens(
|
|
model_to_use=model_to_use,
|
|
messages=None,
|
|
contents=contents,
|
|
deployment=None,
|
|
request_model=request_model,
|
|
)
|
|
|
|
# Verify the result
|
|
assert result is not None
|
|
assert isinstance(result, TokenCountResponse)
|
|
assert result.total_tokens == 31
|
|
assert result.request_model == request_model
|
|
assert result.model_used == model_to_use
|
|
assert result.original_response == mock_response
|
|
|
|
# Verify the mock was called correctly
|
|
mock_acount_tokens.assert_called_once_with(
|
|
model=model_to_use, contents=contents
|
|
)
|
|
|
|
def test_clean_contents_for_gemini_api_removes_id_field(self):
|
|
"""Test that _clean_contents_for_gemini_api removes unsupported 'id' field from function responses"""
|
|
from litellm.llms.gemini.count_tokens.handler import GoogleAIStudioTokenCounter
|
|
|
|
token_counter = GoogleAIStudioTokenCounter()
|
|
|
|
# Test contents with function response containing 'id' field (camelCase)
|
|
contents_with_id = [
|
|
{"parts": [{"text": "Hello world"}], "role": "user"},
|
|
{
|
|
"parts": [
|
|
{
|
|
"functionResponse": {
|
|
"id": "read_many_files-1757526647518-730a691aac11c", # This should be removed
|
|
"name": "read_many_files",
|
|
"response": {
|
|
"output": "No files matching the criteria were found or all were skipped."
|
|
},
|
|
}
|
|
}
|
|
],
|
|
"role": "user",
|
|
},
|
|
]
|
|
|
|
# Clean the contents
|
|
cleaned_contents = token_counter._clean_contents_for_gemini_api(
|
|
contents_with_id
|
|
)
|
|
|
|
# Verify the 'id' field was removed
|
|
function_response = cleaned_contents[1]["parts"][0]["functionResponse"]
|
|
assert "id" not in function_response
|
|
assert "name" in function_response
|
|
assert "response" in function_response
|
|
assert function_response["name"] == "read_many_files"
|
|
assert (
|
|
function_response["response"]["output"]
|
|
== "No files matching the criteria were found or all were skipped."
|
|
)
|
|
|
|
def test_clean_contents_for_gemini_api_preserves_other_fields(self):
|
|
"""Test that _clean_contents_for_gemini_api preserves other fields and structure"""
|
|
from litellm.llms.gemini.count_tokens.handler import GoogleAIStudioTokenCounter
|
|
|
|
token_counter = GoogleAIStudioTokenCounter()
|
|
|
|
# Test contents without function responses
|
|
contents_without_function_response = [
|
|
{"parts": [{"text": "This is a regular message"}], "role": "user"},
|
|
{"parts": [{"text": "This is a model response"}], "role": "model"},
|
|
]
|
|
|
|
# Clean the contents
|
|
cleaned_contents = token_counter._clean_contents_for_gemini_api(
|
|
contents_without_function_response
|
|
)
|
|
|
|
# Verify the contents are unchanged
|
|
assert cleaned_contents == contents_without_function_response
|