mirror of
https://github.com/tiennm99/litellm.git
synced 2026-08-02 00:22:06 +00:00
* test: modernize models used in CircleCI e2e test suites
Replaces obsolete models (gpt-4o, gpt-4o-mini, gpt-3.5-turbo,
claude-3-5-sonnet-20240620, claude-sonnet-4-20250514) with current
equivalents across the e2e_openai_endpoints and
proxy_e2e_anthropic_messages_tests CircleCI jobs.
- gpt-4o -> gpt-5.5 (responses API e2e tests)
- gpt-4o-mini -> gpt-5-mini (websocket responses, oai_misc_config)
- gpt-4o-mini-2024-07-18 -> gpt-4.1-mini-2025-04-14 (fine-tuning,
still actively fine-tunable)
- gpt-4 / gpt-3.5-turbo target_model_names example -> gpt-5.5 /
gpt-5-mini
- bedrock claude-3-5-sonnet-20240620 batch entry -> haiku-4-5-20251001
(also aligning oai_misc_config model_name with what
test_bedrock_batches_api.py actually requests)
- bedrock claude-sonnet-4-20250514 (deprecated, retires 2026-06-15)
-> claude-sonnet-4-5-20250929
* test: point bedrock-claude-sonnet-4 alias at Sonnet 4.6, not 4.5
Greptile/Cursor flagged that after the previous commit, the
bedrock-claude-sonnet-4 alias collided with bedrock-claude-sonnet-4.5
(both pointed to claude-sonnet-4-5-20250929). Rename to
bedrock-claude-sonnet-4.6 and point it at the Sonnet 4.6 Bedrock ID
(us.anthropic.claude-sonnet-4-6, already in the litellm model
registry) so the alias name matches the underlying model version.
* test: modernize models across remaining CI-mounted configs & tests
Expands the modernization sweep to all CircleCI-mounted proxy configs
and to test directories where the model literal is a fixture/route key
(not the test's subject).
Config changes:
- proxy_server_config.yaml: bump gpt-3.5-turbo / gpt-3.5-turbo-1106 /
gpt-4o / gemini-1.5-flash / dall-e-3 underlying models; rename
gpt-3.5-turbo-end-user-test alias to gpt-5-mini-end-user-test; bump
text-embedding-ada-002 underlying to text-embedding-3-small. User-
facing aliases (gpt-3.5-turbo, gpt-4, text-embedding-ada-002, etc.)
preserved for backward compatibility with tests.
- simple_config.yaml, otel_test_config.yaml, spend_tracking_config.yaml:
bump gpt-3.5-turbo underlying to gpt-5-mini.
- pass_through_config.yaml: claude-3-5-sonnet / claude-3-7-sonnet /
claude-3-haiku entries replaced with claude-sonnet-4-5 / claude-
haiku-4-5 / claude-opus-4-7.
- oai_misc_config.yaml: align alias name with the gpt-5-mini rename.
Test changes (proactive: claude-sonnet-4-20250514 / claude-opus-4-
20250514 retire 2026-06-15):
- tests/llm_translation/test_anthropic_completion.py: bump 3 references
+ paired Vertex AI ID to claude-sonnet-4-5.
- tests/llm_translation/test_optional_params.py: bump 2 references.
- tests/pass_through_unit_tests/test_anthropic_messages_passthrough.py
and test_bedrock_anthropic_messages_test.py: bump router fixtures
using the deprecated model IDs.
- tests/pass_through_unit_tests/base_anthropic_messages_tool_search_test.py:
modernize docstring examples.
- tests/test_end_users.py: update references to renamed alias.
* test: modernize placeholder model literals in router_unit_tests
Mass replace_all on fixture/placeholder model literals across the
router_unit_tests/ suite (model name is a routing key / label, not the
test subject). Sub-agent sweep so far — additional commits will follow
for logging_callback_tests/, enterprise/, top-level tests/test_*.py,
and other CI-mounted dirs.
Mappings applied:
- gpt-3.5-turbo -> gpt-5-mini
- gpt-4 (bare) -> gpt-5.5
- gpt-4o (bare) -> gpt-5
- text-embedding-ada-002 -> text-embedding-3-small
- claude-3-sonnet-20240229 / claude-3-opus-20240229 /
claude-3-haiku-20240307 / claude-3-5-sonnet-20240620 ->
claude-sonnet-4-5-20250929 / claude-opus-4-7 /
claude-haiku-4-5-20251001 as appropriate
Explicitly preserved:
- gpt-4o-mini-* variants (transcribe, tts, etc.) where they're current
- gpt-4-turbo / gpt-4-vision-preview / gpt-4-0613 (subject literals)
- JSONL batch body literals
- Mock LLM response model fields (must match upstream)
- Fake/mock identifiers
* test: modernize placeholder model literals across remaining CI suites
Sub-agent sweep across logging_callback_tests/, guardrails_tests/,
enterprise/, pass_through_unit_tests/, otel_tests/,
llm_responses_api_testing/, batches_tests/, spend_tracking_tests/,
litellm_utils_tests/, unified_google_tests/, and a few top-level
tests/test_*.py files where the model literal is a fixture or
placeholder (router model_list, mock standard logging payload, mock
callback data) rather than the test's subject.
Mappings applied (see scope notes below):
- gpt-3.5-turbo -> gpt-5-mini
- gpt-4 (bare) -> gpt-5.5
- gpt-4o (bare) -> gpt-5.5 (corrected from initial gpt-5 — bare gpt-5
is not a valid OpenAI alias; only gpt-5.5 / gpt-5.4 / gpt-5.2-codex
/ gpt-5-mini exist)
- gpt-4o-mini (bare) -> gpt-5-mini
- text-embedding-ada-002 -> text-embedding-3-small
- claude-3-sonnet-20240229 -> claude-sonnet-4-5-20250929
- claude-3-opus-20240229 -> claude-opus-4-7
- claude-3-haiku-20240307 -> claude-haiku-4-5-20251001
- claude-3-5-sonnet-20240620/20241022 -> claude-sonnet-4-5-20250929
- claude-3-7-sonnet-20250219 -> claude-sonnet-4-6
- gemini-1.5-flash -> gemini-2.5-flash
- gemini-1.5-pro -> gemini-2.5-pro
Explicitly preserved (not modernized):
- llm_translation/ tests where model is the SUBJECT (provider-specific
translation/transformation logic). Only the deprecated 20250514
references were already bumped in a prior commit.
- Cost-calc / tokenizer subject tests in test_utils.py (skip-ranges
documented by the sub-agent).
- Bedrock model IDs in test_health_check.py path-stripping tests.
- JSONL batch request bodies and mock LLM response bodies (must match
upstream literal).
- Langfuse expected-request-body JSON fixtures (cost values are exact-
match-asserted; changing the model would shift response_cost).
- gpt-3.5-turbo-instruct (text-completion endpoint; no modern OpenAI
equivalent).
- Top-level tests calling the proxy through user-facing aliases
(gpt-3.5-turbo, gpt-4, text-embedding-ada-002, dall-e-3) — aliases
in proxy_server_config.yaml stay; only the underlying model was
bumped.
- tests/test_gpt5_azure_temperature_support.py (the test's whole point
is model-name handling).
- Fake / mock / openai/fake identifiers.
Notable side fixes:
- test_spend_accuracy_tests.py: UPSTREAM_MODEL now matches what
spend_tracking_config.yaml's proxy actually routes to (gpt-5-mini),
resolving a latent inconsistency.
- proxy_server_config.yaml: bare `gpt-5` alias renamed to `gpt-5.5`
(bare gpt-5 is not a valid OpenAI alias).
- test_batches_logging_unit_tests.py: explicit_models list entries
kept distinct (gpt-5-mini + gpt-5.5) after bulk rename.
* test: fix CI failures from model modernization sweep
CI surfaced 4 categories of regression from the bulk modernization:
1. Azure deployment names are customer-specific. Reverted:
- tests/litellm_utils_tests/test_health_check.py: azure/text-
embedding-3-small -> azure/text-embedding-ada-002 (the CI Azure
account does not have a text-embedding-3-small deployment).
- tests/logging_callback_tests/test_custom_callback_router.py:
same revert for two router fixtures driving aembedding.
2. gpt-5 family does not accept temperature != 1. Tests that pass a
custom temperature swapped from gpt-5-mini to gpt-4.1-mini (modern
non-reasoning OpenAI mini that still accepts temperature/logprobs):
- tests/logging_callback_tests/test_datadog.py
- tests/logging_callback_tests/test_langsmith_unit_test.py
- tests/logging_callback_tests/test_otel_logging.py
3. proxy_server_config.yaml's gpt-3.5-turbo-large alias was routing to
gpt-5.5 (a reasoning model that rejects logprobs). The proxy test
tests/test_openai_endpoints.py::test_chat_completion_streaming
exercises logprobs/top_logprobs through that alias. Bumped the
underlying model to gpt-4.1 (non-reasoning, still modern).
4. tests/logging_callback_tests/test_gcs_pub_sub.py asserts against a
pinned JSON fixture (gcs_pub_sub_body/spend_logs_payload.json) with
hardcoded model="gpt-4o" and a model-specific spend value. Reverted
the litellm.acompletion calls in the test to model="gpt-4o" so the
fixture's exact-match assertions still hold.
5. tests/pass_through_unit_tests/test_anthropic_messages_passthrough.py:
anthropic.messages.create routing to openai/gpt-5-mini returned an
empty content[0] with max_tokens=100 (reasoning-token consumption).
Swapped to openai/gpt-4.1-mini.
* test: fix Assistants API model + 2 cursor[bot] review nits
1. pass_through_unit_tests/test_custom_logger_passthrough.py: gpt-5.5
isn't accepted by the /v1/assistants endpoint
("unsupported_model"). Switch to gpt-4.1-mini (modern, Assistants-
API-supported, non-reasoning).
2. example_config_yaml/pass_through_config.yaml: the previous sweep
bumped the claude-3-7-sonnet alias to claude-opus-4-7, which is a
tier change (Sonnet -> Opus). Map to claude-sonnet-4-6 to keep the
Sonnet tier intact. (Cursor bugbot review.)
3. example_config_yaml/simple_config.yaml: model_name was left as
gpt-3.5-turbo while the underlying was bumped to gpt-5-mini, which
muddles the "simple" example. Make both sides gpt-5-mini so the
most basic example is a straight 1:1 mapping again. (Cursor bugbot
review.)
* fix: revert gpt-4/gpt-3.5-turbo alias underlying to non-reasoning models
tests/test_openai_endpoints.py::test_completion calls the proxy alias
"gpt-4" with temperature=0, and other tests call gpt-3.5-turbo with
custom temperature / logprobs / the legacy /v1/completions endpoint.
The earlier modernization mapped both aliases to gpt-5.5 / gpt-5-mini,
which are reasoning models that reject temperature != 1 and don't
expose /v1/completions. Map the aliases to gpt-4.1 / gpt-4.1-mini
(modern non-reasoning OpenAI models) instead — keeps user-facing
aliases preserved while picking a current underlying that still
supports the parameters/endpoints the tests exercise.
513 lines
19 KiB
Python
513 lines
19 KiB
Python
import asyncio
|
|
import json
|
|
import os
|
|
import sys
|
|
import traceback
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
from dotenv import load_dotenv
|
|
|
|
load_dotenv()
|
|
sys.path.insert(
|
|
0, os.path.abspath("../..")
|
|
) # Adds the parent directory to the system-path
|
|
import logging
|
|
import time
|
|
|
|
import pytest
|
|
from typing import Optional
|
|
import litellm
|
|
from litellm import create_batch, create_file
|
|
from litellm._logging import verbose_logger
|
|
from litellm.batches.batch_utils import (
|
|
_batch_cost_calculator,
|
|
_get_file_content_as_dictionary,
|
|
_get_batch_job_cost_from_file_content,
|
|
_get_batch_job_total_usage_from_file_content,
|
|
_get_batch_job_usage_from_response_body,
|
|
_get_response_from_batch_job_output_file,
|
|
_batch_response_was_successful,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def sample_file_content():
|
|
return b"""
|
|
{"id": "batch_req_6769ca596b38819093d7ae9f522de924", "custom_id": "request-1", "response": {"status_code": 200, "request_id": "07bc45ab4e7e26ac23a0c949973327e7", "body": {"id": "chatcmpl-AhjSMl7oZ79yIPHLRYgmgXSixTJr7", "object": "chat.completion", "created": 1734986202, "model": "gpt-4o-mini-2024-07-18", "choices": [{"index": 0, "message": {"role": "assistant", "content": "Hello! How can I assist you today?", "refusal": null}, "logprobs": null, "finish_reason": "stop"}], "usage": {"prompt_tokens": 20, "completion_tokens": 10, "total_tokens": 30, "prompt_tokens_details": {"cached_tokens": 0, "audio_tokens": 0}, "completion_tokens_details": {"reasoning_tokens": 0, "audio_tokens": 0, "accepted_prediction_tokens": 0, "rejected_prediction_tokens": 0}}, "system_fingerprint": "fp_0aa8d3e20b"}}, "error": null}
|
|
{"id": "batch_req_6769ca597e588190920666612634e2b4", "custom_id": "request-2", "response": {"status_code": 200, "request_id": "82e04f4c001fe2c127cbad199f5fd31b", "body": {"id": "chatcmpl-AhjSNgVB4Oa4Hq0NruTRsBaEbRWUP", "object": "chat.completion", "created": 1734986203, "model": "gpt-4o-mini-2024-07-18", "choices": [{"index": 0, "message": {"role": "assistant", "content": "Hello! What can I do for you today?", "refusal": null}, "logprobs": null, "finish_reason": "length"}], "usage": {"prompt_tokens": 22, "completion_tokens": 10, "total_tokens": 32, "prompt_tokens_details": {"cached_tokens": 0, "audio_tokens": 0}, "completion_tokens_details": {"reasoning_tokens": 0, "audio_tokens": 0, "accepted_prediction_tokens": 0, "rejected_prediction_tokens": 0}}, "system_fingerprint": "fp_0aa8d3e20b"}}, "error": null}
|
|
"""
|
|
|
|
|
|
@pytest.fixture
|
|
def sample_file_content_dict():
|
|
return [
|
|
{
|
|
"id": "batch_req_6769ca596b38819093d7ae9f522de924",
|
|
"custom_id": "request-1",
|
|
"response": {
|
|
"status_code": 200,
|
|
"request_id": "07bc45ab4e7e26ac23a0c949973327e7",
|
|
"body": {
|
|
"id": "chatcmpl-AhjSMl7oZ79yIPHLRYgmgXSixTJr7",
|
|
"object": "chat.completion",
|
|
"created": 1734986202,
|
|
"model": "gpt-4o-mini-2024-07-18",
|
|
"choices": [
|
|
{
|
|
"index": 0,
|
|
"message": {
|
|
"role": "assistant",
|
|
"content": "Hello! How can I assist you today?",
|
|
"refusal": None,
|
|
},
|
|
"logprobs": None,
|
|
"finish_reason": "stop",
|
|
}
|
|
],
|
|
"usage": {
|
|
"prompt_tokens": 20,
|
|
"completion_tokens": 10,
|
|
"total_tokens": 30,
|
|
"prompt_tokens_details": {
|
|
"cached_tokens": 0,
|
|
"audio_tokens": 0,
|
|
},
|
|
"completion_tokens_details": {
|
|
"reasoning_tokens": 0,
|
|
"audio_tokens": 0,
|
|
"accepted_prediction_tokens": 0,
|
|
"rejected_prediction_tokens": 0,
|
|
},
|
|
},
|
|
"system_fingerprint": "fp_0aa8d3e20b",
|
|
},
|
|
},
|
|
"error": None,
|
|
},
|
|
{
|
|
"id": "batch_req_6769ca597e588190920666612634e2b4",
|
|
"custom_id": "request-2",
|
|
"response": {
|
|
"status_code": 200,
|
|
"request_id": "82e04f4c001fe2c127cbad199f5fd31b",
|
|
"body": {
|
|
"id": "chatcmpl-AhjSNgVB4Oa4Hq0NruTRsBaEbRWUP",
|
|
"object": "chat.completion",
|
|
"created": 1734986203,
|
|
"model": "gpt-4o-mini-2024-07-18",
|
|
"choices": [
|
|
{
|
|
"index": 0,
|
|
"message": {
|
|
"role": "assistant",
|
|
"content": "Hello! What can I do for you today?",
|
|
"refusal": None,
|
|
},
|
|
"logprobs": None,
|
|
"finish_reason": "length",
|
|
}
|
|
],
|
|
"usage": {
|
|
"prompt_tokens": 22,
|
|
"completion_tokens": 10,
|
|
"total_tokens": 32,
|
|
"prompt_tokens_details": {
|
|
"cached_tokens": 0,
|
|
"audio_tokens": 0,
|
|
},
|
|
"completion_tokens_details": {
|
|
"reasoning_tokens": 0,
|
|
"audio_tokens": 0,
|
|
"accepted_prediction_tokens": 0,
|
|
"rejected_prediction_tokens": 0,
|
|
},
|
|
},
|
|
"system_fingerprint": "fp_0aa8d3e20b",
|
|
},
|
|
},
|
|
"error": None,
|
|
},
|
|
]
|
|
|
|
|
|
def test_get_file_content_as_dictionary(sample_file_content):
|
|
result = _get_file_content_as_dictionary(sample_file_content)
|
|
assert len(result) == 2
|
|
assert result[0]["id"] == "batch_req_6769ca596b38819093d7ae9f522de924"
|
|
assert result[0]["custom_id"] == "request-1"
|
|
assert result[0]["response"]["status_code"] == 200
|
|
assert result[0]["response"]["body"]["usage"]["total_tokens"] == 30
|
|
|
|
|
|
def test_get_batch_job_total_usage_from_file_content(sample_file_content_dict):
|
|
usage = _get_batch_job_total_usage_from_file_content(
|
|
sample_file_content_dict, custom_llm_provider="openai"
|
|
)
|
|
assert usage.total_tokens == 62 # 30 + 32
|
|
assert usage.prompt_tokens == 42 # 20 + 22
|
|
assert usage.completion_tokens == 20 # 10 + 10
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_batch_cost_calculator(sample_file_content_dict):
|
|
"""
|
|
mock litellm.completion_cost to return 0.5
|
|
|
|
we know sample_file_content_dict has 2 successful responses
|
|
|
|
so we expect the cost to be 0.5 * 2 = 1.0
|
|
"""
|
|
with patch("litellm.completion_cost", return_value=0.5):
|
|
cost = _batch_cost_calculator(
|
|
file_content_dictionary=sample_file_content_dict,
|
|
custom_llm_provider="openai",
|
|
)
|
|
assert cost == 1.0 # 0.5 * 2 successful responses
|
|
|
|
|
|
def test_get_response_from_batch_job_output_file(sample_file_content_dict):
|
|
result = _get_response_from_batch_job_output_file(sample_file_content_dict[0])
|
|
assert result["id"] == "chatcmpl-AhjSMl7oZ79yIPHLRYgmgXSixTJr7"
|
|
assert result["object"] == "chat.completion"
|
|
assert result["usage"]["total_tokens"] == 30
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_batch_retrieve_cost_tracking_with_completed_batch_no_explicit_cost():
|
|
"""
|
|
Test that cost is calculated for completed batches when no explicit cost data is provided.
|
|
|
|
Regression test for: When batch status is "completed" and explicit batch_cost/batch_usage/batch_models
|
|
are not provided, the system should compute batch data by calling _handle_completed_batch.
|
|
"""
|
|
from litellm.litellm_core_utils.litellm_logging import Logging
|
|
from litellm.types.utils import CallTypes
|
|
from litellm.types.utils import LiteLLMBatch
|
|
from unittest.mock import AsyncMock, patch
|
|
|
|
# Mock batch result with completed status
|
|
mock_batch = LiteLLMBatch(
|
|
id="batch-test-123",
|
|
object="batch",
|
|
endpoint="/v1/chat/completions",
|
|
errors=None,
|
|
input_file_id="file-input-123",
|
|
completion_window="24h",
|
|
status="completed",
|
|
output_file_id="file-output-123",
|
|
error_file_id=None,
|
|
created_at=1234567890,
|
|
in_progress_at=1234567900,
|
|
expires_at=1234654290,
|
|
finalizing_at=1234568000,
|
|
completed_at=1234568100,
|
|
failed_at=None,
|
|
expired_at=None,
|
|
cancelling_at=None,
|
|
cancelled_at=None,
|
|
request_counts={
|
|
"total": 10,
|
|
"completed": 10,
|
|
"failed": 0,
|
|
},
|
|
metadata=None,
|
|
)
|
|
mock_batch._hidden_params = {}
|
|
|
|
# Create logging object
|
|
logging_obj = Logging(
|
|
model="gpt-5-mini",
|
|
messages=[{"role": "user", "content": "test"}],
|
|
stream=False,
|
|
call_type=CallTypes.aretrieve_batch.value,
|
|
litellm_call_id="test-call-123",
|
|
function_id="test-function",
|
|
start_time=time.time(),
|
|
dynamic_success_callbacks=[],
|
|
)
|
|
logging_obj.custom_llm_provider = "openai"
|
|
|
|
# Mock _handle_completed_batch to return cost data
|
|
expected_cost = 0.05
|
|
expected_usage = litellm.Usage(
|
|
prompt_tokens=100,
|
|
completion_tokens=50,
|
|
total_tokens=150,
|
|
)
|
|
expected_models = ["gpt-5-mini"]
|
|
|
|
with patch(
|
|
"litellm.litellm_core_utils.litellm_logging._handle_completed_batch",
|
|
new=AsyncMock(return_value=(expected_cost, expected_usage, expected_models)),
|
|
) as mock_handle_batch:
|
|
# Call async_success_handler
|
|
await logging_obj.async_success_handler(
|
|
result=mock_batch,
|
|
start_time=time.time(),
|
|
end_time=time.time() + 1,
|
|
)
|
|
|
|
# Verify _handle_completed_batch was called
|
|
mock_handle_batch.assert_called_once()
|
|
|
|
# Verify cost and usage were set on the batch result
|
|
assert mock_batch._hidden_params["response_cost"] == expected_cost
|
|
assert mock_batch._hidden_params["batch_models"] == expected_models
|
|
assert mock_batch.usage == expected_usage
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_batch_retrieve_cost_tracking_with_explicit_cost_data():
|
|
"""
|
|
Test that explicit cost data is used when provided, skipping computation.
|
|
|
|
Regression test for: When batch_cost, batch_usage, and batch_models are explicitly
|
|
provided in kwargs, they should be used directly without calling _handle_completed_batch.
|
|
"""
|
|
from litellm.litellm_core_utils.litellm_logging import Logging
|
|
from litellm.types.utils import CallTypes
|
|
from litellm.types.utils import LiteLLMBatch
|
|
from unittest.mock import AsyncMock, patch
|
|
|
|
# Mock batch result with completed status
|
|
mock_batch = LiteLLMBatch(
|
|
id="batch-test-456",
|
|
object="batch",
|
|
endpoint="/v1/chat/completions",
|
|
errors=None,
|
|
input_file_id="file-input-456",
|
|
completion_window="24h",
|
|
status="completed",
|
|
output_file_id="file-output-456",
|
|
error_file_id=None,
|
|
created_at=1234567890,
|
|
in_progress_at=1234567900,
|
|
expires_at=1234654290,
|
|
finalizing_at=1234568000,
|
|
completed_at=1234568100,
|
|
failed_at=None,
|
|
expired_at=None,
|
|
cancelling_at=None,
|
|
cancelled_at=None,
|
|
request_counts={
|
|
"total": 5,
|
|
"completed": 5,
|
|
"failed": 0,
|
|
},
|
|
metadata=None,
|
|
)
|
|
mock_batch._hidden_params = {}
|
|
|
|
# Create logging object
|
|
logging_obj = Logging(
|
|
model="gpt-5-mini",
|
|
messages=[{"role": "user", "content": "test"}],
|
|
stream=False,
|
|
call_type=CallTypes.aretrieve_batch.value,
|
|
litellm_call_id="test-call-456",
|
|
function_id="test-function",
|
|
start_time=time.time(),
|
|
dynamic_success_callbacks=[],
|
|
)
|
|
logging_obj.custom_llm_provider = "openai"
|
|
|
|
# Explicit cost data to pass in kwargs
|
|
explicit_cost = 0.10
|
|
explicit_usage = litellm.Usage(
|
|
prompt_tokens=200,
|
|
completion_tokens=100,
|
|
total_tokens=300,
|
|
)
|
|
explicit_models = ["gpt-5-mini", "gpt-5.5"]
|
|
|
|
with patch(
|
|
"litellm.litellm_core_utils.litellm_logging._handle_completed_batch",
|
|
new=AsyncMock(),
|
|
) as mock_handle_batch:
|
|
# Call async_success_handler with explicit cost data
|
|
await logging_obj.async_success_handler(
|
|
result=mock_batch,
|
|
start_time=time.time(),
|
|
end_time=time.time() + 1,
|
|
batch_cost=explicit_cost,
|
|
batch_usage=explicit_usage,
|
|
batch_models=explicit_models,
|
|
)
|
|
|
|
# Verify _handle_completed_batch was NOT called (since explicit data provided)
|
|
mock_handle_batch.assert_not_called()
|
|
|
|
# Verify explicit cost data was used
|
|
assert mock_batch._hidden_params["response_cost"] == explicit_cost
|
|
assert mock_batch._hidden_params["batch_models"] == explicit_models
|
|
assert mock_batch.usage == explicit_usage
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_batch_retrieve_cost_tracking_with_unified_file_id_incomplete_batch():
|
|
"""
|
|
Test that cost computation is skipped for unified file IDs with non-completed batches.
|
|
|
|
Regression test for: For unified file IDs (base64 encoded), cost should only be computed
|
|
when batch status is "completed" and explicit data is not provided.
|
|
"""
|
|
import base64
|
|
from litellm.litellm_core_utils.litellm_logging import Logging
|
|
from litellm.types.utils import CallTypes, SpecialEnums
|
|
from litellm.types.utils import LiteLLMBatch
|
|
from unittest.mock import AsyncMock, patch
|
|
|
|
# Create a proper unified file ID by encoding the correct prefix
|
|
unified_id_str = f"{SpecialEnums.LITELM_MANAGED_FILE_ID_PREFIX.value}:test_file_789;unified_id:batch-789"
|
|
encoded_unified_id = (
|
|
base64.urlsafe_b64encode(unified_id_str.encode()).decode().rstrip("=")
|
|
)
|
|
|
|
# Mock batch result with in_progress status and unified file ID
|
|
mock_batch = LiteLLMBatch(
|
|
id=encoded_unified_id, # Properly encoded unified ID
|
|
object="batch",
|
|
endpoint="/v1/chat/completions",
|
|
errors=None,
|
|
input_file_id="file-input-789",
|
|
completion_window="24h",
|
|
status="in_progress", # Not completed
|
|
output_file_id=None,
|
|
error_file_id=None,
|
|
created_at=1234567890,
|
|
in_progress_at=1234567900,
|
|
expires_at=1234654290,
|
|
finalizing_at=None,
|
|
completed_at=None,
|
|
failed_at=None,
|
|
expired_at=None,
|
|
cancelling_at=None,
|
|
cancelled_at=None,
|
|
request_counts={
|
|
"total": 10,
|
|
"completed": 3,
|
|
"failed": 0,
|
|
},
|
|
metadata=None,
|
|
)
|
|
mock_batch._hidden_params = {}
|
|
|
|
# Create logging object
|
|
logging_obj = Logging(
|
|
model="gpt-5-mini",
|
|
messages=[{"role": "user", "content": "test"}],
|
|
stream=False,
|
|
call_type=CallTypes.aretrieve_batch.value,
|
|
litellm_call_id="test-call-789",
|
|
function_id="test-function",
|
|
start_time=time.time(),
|
|
dynamic_success_callbacks=[],
|
|
)
|
|
logging_obj.custom_llm_provider = "openai"
|
|
|
|
with patch(
|
|
"litellm.litellm_core_utils.litellm_logging._handle_completed_batch",
|
|
new=AsyncMock(),
|
|
) as mock_handle_batch:
|
|
# Call async_success_handler with in_progress batch (unified file ID)
|
|
await logging_obj.async_success_handler(
|
|
result=mock_batch,
|
|
start_time=time.time(),
|
|
end_time=time.time() + 1,
|
|
)
|
|
|
|
# Verify _handle_completed_batch was NOT called (batch not completed and is unified file ID)
|
|
mock_handle_batch.assert_not_called()
|
|
|
|
# Verify cost data was not set
|
|
assert "response_cost" not in mock_batch._hidden_params
|
|
assert "batch_models" not in mock_batch._hidden_params
|
|
assert not hasattr(mock_batch, "usage") or mock_batch.usage is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_batch_retrieve_cost_tracking_with_partial_explicit_data():
|
|
"""
|
|
Test that cost is computed when only partial explicit data is provided.
|
|
|
|
Regression test for: If batch_cost, batch_usage, or batch_models is missing
|
|
(not all three provided), and batch is completed, system should compute the data.
|
|
"""
|
|
from litellm.litellm_core_utils.litellm_logging import Logging
|
|
from litellm.types.utils import CallTypes
|
|
from litellm.types.utils import LiteLLMBatch
|
|
from unittest.mock import AsyncMock, patch
|
|
|
|
# Mock batch result with completed status
|
|
mock_batch = LiteLLMBatch(
|
|
id="batch-test-partial",
|
|
object="batch",
|
|
endpoint="/v1/chat/completions",
|
|
errors=None,
|
|
input_file_id="file-input-partial",
|
|
completion_window="24h",
|
|
status="completed",
|
|
output_file_id="file-output-partial",
|
|
error_file_id=None,
|
|
created_at=1234567890,
|
|
in_progress_at=1234567900,
|
|
expires_at=1234654290,
|
|
finalizing_at=1234568000,
|
|
completed_at=1234568100,
|
|
failed_at=None,
|
|
expired_at=None,
|
|
cancelling_at=None,
|
|
cancelled_at=None,
|
|
request_counts={
|
|
"total": 8,
|
|
"completed": 8,
|
|
"failed": 0,
|
|
},
|
|
metadata=None,
|
|
)
|
|
mock_batch._hidden_params = {}
|
|
|
|
# Create logging object
|
|
logging_obj = Logging(
|
|
model="gpt-5-mini",
|
|
messages=[{"role": "user", "content": "test"}],
|
|
stream=False,
|
|
call_type=CallTypes.aretrieve_batch.value,
|
|
litellm_call_id="test-call-partial",
|
|
function_id="test-function",
|
|
start_time=time.time(),
|
|
dynamic_success_callbacks=[],
|
|
)
|
|
|
|
logging_obj.custom_llm_provider = "openai"
|
|
|
|
# Only provide batch_cost, missing batch_usage and batch_models
|
|
partial_cost = 0.08
|
|
|
|
expected_cost = 0.06
|
|
expected_usage = litellm.Usage(
|
|
prompt_tokens=150,
|
|
completion_tokens=75,
|
|
total_tokens=225,
|
|
)
|
|
expected_models = ["gpt-5-mini"]
|
|
|
|
with patch(
|
|
"litellm.litellm_core_utils.litellm_logging._handle_completed_batch",
|
|
new=AsyncMock(return_value=(expected_cost, expected_usage, expected_models)),
|
|
) as mock_handle_batch:
|
|
# Call async_success_handler with partial explicit data
|
|
await logging_obj.async_success_handler(
|
|
result=mock_batch,
|
|
start_time=time.time(),
|
|
end_time=time.time() + 1,
|
|
batch_cost=partial_cost, # Only cost provided, not usage or models
|
|
)
|
|
|
|
# Verify _handle_completed_batch WAS called (since not all data provided)
|
|
mock_handle_batch.assert_called_once()
|
|
|
|
# Verify computed cost data was used (not partial explicit data)
|
|
assert mock_batch._hidden_params["response_cost"] == expected_cost
|
|
assert mock_batch._hidden_params["batch_models"] == expected_models
|
|
assert mock_batch.usage == expected_usage
|