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: move tests/test_litellm integrations and secret_managers into tests/unit Rename-only. Mirrors the old paths, including the directory conftests and the prompt and JSON fixtures. Follow-up commits prune and wire them. * test: prune and repoint the moved integrations tests Deletes the 7 audited tests a stronger test in the same tree already covers, imports the TLS sink helpers from their new conftest path, and restores os.environ after each integrations test. Some presets write OTEL_EXPORTER_OTLP_HEADERS straight into os.environ, and without the legacy tree's test ordering that header leaked into the AgentOps tests. * ci: run the moved integrations tests under their legacy flag The integrations GHA shard and a new CircleCI job run the integrations unit selection. secret_managers joins the misc selection. * docs: point integrations and secret_managers references at tests/unit * test: make the moved integrations directories packages * 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>
264 lines
8.7 KiB
Python
264 lines
8.7 KiB
Python
import asyncio
|
|
import json
|
|
from datetime import datetime
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
# Adds the grandparent directory to sys.path to allow importing project modules
|
|
|
|
import pytest
|
|
|
|
import litellm
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_mlflow_logging_functionality():
|
|
"""Test that inputs, outputs and tags are properly logged in MLflow traces."""
|
|
|
|
# Mock MLflow client and dependencies
|
|
mock_client = MagicMock()
|
|
mock_span = MagicMock()
|
|
mock_span.parent_id = None # Simulate root trace
|
|
mock_span.request_id = "test_trace_id"
|
|
mock_client.start_trace.return_value = mock_span
|
|
|
|
# Mock all MLflow-related imports to avoid requiring MLflow as a dependency
|
|
mock_mlflow_tracking = MagicMock()
|
|
mock_mlflow_tracking.MlflowClient = MagicMock(return_value=mock_client)
|
|
|
|
mock_mlflow_entities = MagicMock()
|
|
mock_mlflow_entities.SpanStatusCode.OK = "OK"
|
|
mock_mlflow_entities.SpanStatusCode.ERROR = "ERROR"
|
|
mock_mlflow_entities.SpanType.LLM = "LLM"
|
|
|
|
mock_mlflow = MagicMock()
|
|
mock_mlflow.get_current_active_span.return_value = None
|
|
|
|
with patch.dict(
|
|
"sys.modules",
|
|
{
|
|
"mlflow": mock_mlflow,
|
|
"mlflow.tracking": mock_mlflow_tracking,
|
|
"mlflow.entities": mock_mlflow_entities,
|
|
"mlflow.tracing.utils": MagicMock(),
|
|
},
|
|
):
|
|
# Now we can safely import MlflowLogger
|
|
from litellm.integrations.mlflow import MlflowLogger
|
|
|
|
# Create MlflowLogger instance
|
|
mlflow_logger = MlflowLogger()
|
|
litellm.callbacks = [mlflow_logger]
|
|
|
|
# Test completion with request_tags and prediction parameter
|
|
test_prediction = {"type": "content", "content": "This is a predicted output"}
|
|
await litellm.acompletion(
|
|
model="gpt-3.5-turbo",
|
|
messages=[{"role": "user", "content": "test message"}],
|
|
prediction=test_prediction,
|
|
mock_response="test response",
|
|
metadata={
|
|
"tags": [
|
|
"tag1",
|
|
"tag2",
|
|
"production",
|
|
"jobID:214590dsff09fds",
|
|
"taskName:run_page_classification",
|
|
]
|
|
},
|
|
)
|
|
|
|
# Allow time for async processing
|
|
await asyncio.sleep(1)
|
|
|
|
# Verify start_trace was called with tags parameter
|
|
assert mock_client.start_trace.called, "start_trace should have been called"
|
|
|
|
# Get the call arguments
|
|
call_args = mock_client.start_trace.call_args
|
|
assert call_args is not None, "start_trace call args should not be None"
|
|
|
|
# Check that tags parameter was included and properly transformed
|
|
tags_param = call_args.kwargs.get("tags", {})
|
|
expected_tags = {
|
|
"tag1": "",
|
|
"tag2": "",
|
|
"production": "",
|
|
"jobID": "214590dsff09fds",
|
|
"taskName": "run_page_classification",
|
|
}
|
|
assert (
|
|
tags_param == expected_tags
|
|
), f"Expected tags {expected_tags}, got {tags_param}"
|
|
|
|
# Check that prediction parameter was included in inputs
|
|
inputs_param = call_args.kwargs.get("inputs", {})
|
|
assert (
|
|
"prediction" in inputs_param
|
|
), "Prediction should be included in span inputs"
|
|
assert (
|
|
inputs_param["prediction"] == test_prediction
|
|
), f"Expected prediction {test_prediction}, got {inputs_param['prediction']}"
|
|
|
|
|
|
def test_mlflow_token_usage_attribute_structure():
|
|
"""Ensure token usage attributes are formatted with mlflow.chat.tokenUsage."""
|
|
|
|
mock_mlflow_tracking = MagicMock()
|
|
mock_mlflow_tracking.MlflowClient = MagicMock()
|
|
|
|
with patch.dict(
|
|
"sys.modules",
|
|
{
|
|
"mlflow": MagicMock(),
|
|
"mlflow.tracking": mock_mlflow_tracking,
|
|
"mlflow.tracing.utils": MagicMock(),
|
|
},
|
|
):
|
|
from litellm.integrations.mlflow import MlflowLogger
|
|
|
|
mlflow_logger = MlflowLogger()
|
|
|
|
attrs = mlflow_logger._extract_attributes( # type: ignore
|
|
{
|
|
"litellm_call_id": "123",
|
|
"call_type": "completion",
|
|
"model": "gpt-3.5-turbo",
|
|
"standard_logging_object": {
|
|
"prompt_tokens": 5,
|
|
"completion_tokens": 7,
|
|
"total_tokens": 12,
|
|
},
|
|
}
|
|
)
|
|
|
|
assert attrs["mlflow.chat.tokenUsage"] == {
|
|
"input_tokens": 5,
|
|
"output_tokens": 7,
|
|
"total_tokens": 12,
|
|
}
|
|
|
|
|
|
def _mock_mlflow_modules():
|
|
mock_tracking = MagicMock()
|
|
mock_tracking.MlflowClient = MagicMock()
|
|
|
|
class DummySpanEvent:
|
|
def __init__(self, name, attributes):
|
|
self.name = name
|
|
self.attributes = attributes
|
|
|
|
mock_entities = MagicMock()
|
|
mock_entities.SpanStatusCode.OK = "OK"
|
|
mock_entities.SpanEvent = DummySpanEvent
|
|
|
|
return {
|
|
"mlflow": MagicMock(),
|
|
"mlflow.tracking": mock_tracking,
|
|
"mlflow.entities": mock_entities,
|
|
"mlflow.tracing.utils": MagicMock(),
|
|
}
|
|
|
|
|
|
def test_mlflow_stream_handler_uses_async_complete_response():
|
|
modules = _mock_mlflow_modules()
|
|
with patch.dict("sys.modules", modules):
|
|
from litellm.integrations.mlflow import MlflowLogger
|
|
|
|
mlflow_logger = MlflowLogger()
|
|
mlflow_logger._start_span_or_trace = MagicMock(return_value="mock_span")
|
|
mlflow_logger._end_span_or_trace = MagicMock()
|
|
mlflow_logger._extract_and_set_chat_attributes = MagicMock()
|
|
|
|
class DummyDelta:
|
|
def model_dump(self, exclude_none=True):
|
|
return {"content": "chunk"}
|
|
|
|
response_obj = MagicMock()
|
|
response_obj.choices = [MagicMock(delta=DummyDelta())]
|
|
|
|
final_response = MagicMock()
|
|
kwargs = {
|
|
"litellm_call_id": "abc123",
|
|
"async_complete_streaming_response": final_response,
|
|
}
|
|
|
|
mlflow_logger._handle_stream_event(
|
|
kwargs=kwargs,
|
|
response_obj=response_obj,
|
|
start_time=datetime.utcnow(),
|
|
end_time=datetime.utcnow(),
|
|
)
|
|
|
|
mlflow_logger._end_span_or_trace.assert_called_once()
|
|
assert (
|
|
mlflow_logger._end_span_or_trace.call_args.kwargs["outputs"]
|
|
is final_response
|
|
)
|
|
assert "abc123" not in mlflow_logger._stream_id_to_span
|
|
|
|
|
|
def test_mlflow_stream_handler_pops_span_when_end_raises():
|
|
modules = _mock_mlflow_modules()
|
|
with patch.dict("sys.modules", modules):
|
|
from litellm.integrations.mlflow import MlflowLogger
|
|
|
|
mlflow_logger = MlflowLogger()
|
|
mlflow_logger._start_span_or_trace = MagicMock(return_value="mock_span")
|
|
mlflow_logger._end_span_or_trace = MagicMock(
|
|
side_effect=TypeError("unexpected keyword argument 'trace_id'")
|
|
)
|
|
mlflow_logger._extract_and_set_chat_attributes = MagicMock()
|
|
|
|
response_obj = MagicMock()
|
|
response_obj.choices = []
|
|
|
|
kwargs = {
|
|
"litellm_call_id": "leak123",
|
|
"complete_streaming_response": MagicMock(),
|
|
}
|
|
|
|
with pytest.raises(TypeError):
|
|
mlflow_logger._handle_stream_event(
|
|
kwargs=kwargs,
|
|
response_obj=response_obj,
|
|
start_time=datetime.utcnow(),
|
|
end_time=datetime.utcnow(),
|
|
)
|
|
|
|
assert "leak123" not in mlflow_logger._stream_id_to_span
|
|
|
|
|
|
class _Mlflow2StyleClient:
|
|
"""Mimics the mlflow 2.x client signatures, which have no trace_id kwarg."""
|
|
|
|
def __init__(self):
|
|
self.ended_traces = []
|
|
self.ended_spans = []
|
|
|
|
def end_trace(self, request_id, outputs=None, attributes=None, status="OK", end_time_ns=None):
|
|
self.ended_traces.append(request_id)
|
|
|
|
def end_span(self, request_id, span_id, outputs=None, attributes=None, status="OK", end_time_ns=None):
|
|
self.ended_spans.append((request_id, span_id))
|
|
|
|
|
|
def test_mlflow_end_span_or_trace_works_with_mlflow_2x_client():
|
|
modules = _mock_mlflow_modules()
|
|
with patch.dict("sys.modules", modules):
|
|
from litellm.integrations.mlflow import MlflowLogger
|
|
|
|
mlflow_logger = MlflowLogger()
|
|
client = _Mlflow2StyleClient()
|
|
mlflow_logger._client = client
|
|
|
|
root_span = MagicMock(parent_id=None, request_id="req-1")
|
|
mlflow_logger._end_span_or_trace(
|
|
span=root_span, outputs="out", end_time_ns=1, status="OK"
|
|
)
|
|
assert client.ended_traces == ["req-1"]
|
|
|
|
child_span = MagicMock(parent_id="parent-1", request_id="req-2", span_id="span-2")
|
|
mlflow_logger._end_span_or_trace(
|
|
span=child_span, outputs="out", end_time_ns=1, status="OK"
|
|
)
|
|
assert client.ended_spans == [("req-2", "span-2")]
|