diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index e8483771569..c79614c049e 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -187,7 +187,7 @@ jobs: - shard: proxy-server artifact-name: proxy-server - test-path: "tests/test_litellm/proxy/proxy_server" + test-path: "tests/unit/proxy/proxy_server" workers: 4 reruns: 2 timeout-minutes: 60 @@ -196,17 +196,106 @@ jobs: - shard: proxy-infra artifact-name: proxy-infra test-path: >- - tests/test_litellm/proxy/db - tests/test_litellm/proxy/middleware - tests/test_litellm/proxy/spend_tracking + tests/unit/proxy/db + --ignore=tests/unit/proxy/db/db_transaction_queue/test_e2e_pod_lock_manager.py + --ignore=tests/unit/proxy/db/test_update_daily_tag_spend.py + tests/unit/proxy/middleware + --ignore=tests/unit/proxy/middleware/test_request_size_limit_middleware.py + tests/unit/proxy/spend_tracking + --ignore=tests/unit/proxy/spend_tracking/test_search_api_logging.py + tests/unit/proxy/pass_through_endpoints tests/test_litellm/proxy/pass_through_endpoints - tests/test_litellm/proxy/_experimental - tests/test_litellm/proxy/experimental - tests/test_litellm/proxy/common_utils - tests/test_litellm/proxy/enterprise_billing - tests/test_litellm/proxy/types_utils - tests/test_litellm/proxy/logging_endpoints - tests/test_litellm/proxy/test_*.py + tests/unit/proxy/_experimental + --ignore=tests/unit/proxy/_experimental/mcp_server + tests/unit/proxy/experimental + tests/unit/proxy/common_utils + --ignore=tests/unit/proxy/common_utils/test_cache_aware_routing.py + --ignore=tests/unit/proxy/common_utils/test_check_batch_cost.py + --ignore=tests/unit/proxy/common_utils/test_check_responses_cost.py + --ignore=tests/unit/proxy/common_utils/test_proxy_encrypt_decrypt.py + --ignore=tests/unit/proxy/common_utils/test_realtime_cache.py + tests/unit/proxy/enterprise_billing + tests/unit/proxy/types_utils + tests/unit/proxy/logging_endpoints + tests/unit/proxy/test__types.py + tests/unit/proxy/test_aiohttp_cleanup_closed.py + tests/unit/proxy/test_aiohttp_session_recovery.py + tests/unit/proxy/test_api_key_masking_in_errors.py + tests/unit/proxy/test_audio_speech_prometheus_hooks.py + tests/unit/proxy/test_batch_expiry.py + tests/unit/proxy/test_batch_metadata_none_fix.py + tests/unit/proxy/test_batch_retrieve_bedrock.py + tests/unit/proxy/test_batch_x_litellm_model_encoding.py + tests/unit/proxy/test_blocked_response_usage.py + tests/unit/proxy/test_body_snapshot_callback_params.py + tests/unit/proxy/test_budget_reservation.py + tests/unit/proxy/test_bug_report_config.py + tests/unit/proxy/test_caching_routes.py + tests/unit/proxy/test_chat_completion_metadata.py + tests/unit/proxy/test_claude_code_marketplace.py + tests/unit/proxy/test_collector.py + tests/unit/proxy/test_common_request_processing.py + tests/unit/proxy/test_component_allowlists.py + tests/unit/proxy/test_conftest.py + tests/unit/proxy/test_cors_config.py + tests/unit/proxy/test_custom_proxy.py + tests/unit/proxy/test_dynamic_mcp_route.py + tests/unit/proxy/test_empty_model_list.py + tests/unit/proxy/test_enforce_user_param.py + tests/unit/proxy/test_fallback_management_endpoints.py + tests/unit/proxy/test_fastapi_offline_routes.py + tests/unit/proxy/test_filter_models_by_team_access_group.py + tests/unit/proxy/test_health_check_functions.py + tests/unit/proxy/test_health_check_max_tokens.py + tests/unit/proxy/test_init_litellm_callbacks.py + tests/unit/proxy/test_langfuse_passthrough_security.py + tests/unit/proxy/test_lazy_openapi_snapshot.py + tests/unit/proxy/test_litellm_pre_call_utils.py + tests/unit/proxy/test_max_budget_env_var.py + tests/unit/proxy/test_mcp_asgi_response.py + tests/unit/proxy/test_model_based_routing_files_batches.py + tests/unit/proxy/test_model_deprecations_endpoint.py + tests/unit/proxy/test_model_dump_with_preserved_fields.py + tests/unit/proxy/test_model_id_header_propagation.py + tests/unit/proxy/test_model_info_default_limits.py + tests/unit/proxy/test_model_level_guardrails.py + tests/unit/proxy/test_model_list_aliases.py + tests/unit/proxy/test_model_list_callback_filter.py + tests/unit/proxy/test_model_list_discoverable.py + tests/unit/proxy/test_model_list_healthy_only.py + tests/unit/proxy/test_modify_response_streaming_passthrough.py + tests/unit/proxy/test_native_compaction.py + tests/unit/proxy/test_openai_ws_passthrough_routes.py + tests/unit/proxy/test_openapi_schema_validation.py + tests/unit/proxy/test_plugin_routes.py + tests/unit/proxy/test_pointfive_dashboard_config.py + tests/unit/proxy/test_pointfive_ui_callback.py + tests/unit/proxy/test_pricing_field_strip.py + tests/unit/proxy/test_prisma_engine_watchdog.py + tests/unit/proxy/test_prisma_migration.py + tests/unit/proxy/test_prometheus_cleanup.py + tests/unit/proxy/test_prometheus_metrics_server.py + tests/unit/proxy/test_provider_url_destination_guard.py + tests/unit/proxy/test_proxy_cli.py + tests/unit/proxy/test_proxy_logging_hook_detection.py + tests/unit/proxy/test_proxy_types.py + tests/unit/proxy/test_pyroscope.py + tests/unit/proxy/test_read_model_list.py + tests/unit/proxy/test_redis_auth_cache_flag.py + tests/unit/proxy/test_response_model_sanitization.py + tests/unit/proxy/test_route_a2a_models.py + tests/unit/proxy/test_route_llm_request.py + tests/unit/proxy/test_route_priority.py + tests/unit/proxy/test_sensitive_route_auth.py + tests/unit/proxy/test_shared_health_check.py + tests/unit/proxy/test_spend_log_cleanup.py + tests/unit/proxy/test_swagger_chat_completions.py + tests/unit/proxy/test_team_member_update.py + tests/unit/proxy/test_team_org_move.py + tests/unit/proxy/test_tools_allowlist_enforcement.py + tests/unit/proxy/test_tracing_endpoints.py + tests/unit/proxy/test_update_llm_router_resilience.py + tests/unit/proxy/test_zerobus_dashboard_config.py tests/unit/proxy/test_proxy_server_endpoints_and_startup.py tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py unit-flag: proxy-infra diff --git a/.gitignore b/.gitignore index 7da917ce450..ac8e2919372 100644 --- a/.gitignore +++ b/.gitignore @@ -104,7 +104,7 @@ litellm_config.yaml .cursor litellm/proxy/to_delete_loadtest_work/* update_model_cost_map.py -tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py +tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py scripts/test_vertex_ai_search.py LAZY_LOADING_IMPROVEMENTS.md STABILIZATION_TODO.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5ad6e97f3d..28538472a3f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,7 +98,7 @@ Add your tests to the [`tests/unit/` directory](https://github.com/BerriAI/litel The `tests/unit/` directory follows the same structure as `litellm/`: -- `litellm/proxy/caching_routes.py` → `tests/test_litellm/proxy/test_caching_routes.py` +- `litellm/proxy/caching_routes.py` → `tests/unit/proxy/test_caching_routes.py` - `litellm/utils.py` → `tests/unit/test_utils.py` ### Example Test diff --git a/Makefile b/Makefile index ed1f9e3e1e5..def7c57a324 100644 --- a/Makefile +++ b/Makefile @@ -324,10 +324,91 @@ test-unit-proxy-guardrails: install-test-deps $(UV_RUN) pytest tests/unit/proxy/guardrails tests/unit/proxy/management_endpoints tests/unit/proxy/management_helpers --tb=short -vv -n 4 --durations=20 test-unit-proxy-core: install-test-deps - $(UV_RUN) pytest tests/unit/proxy/auth tests/unit/proxy/client tests/test_litellm/proxy/db tests/unit/proxy/hooks tests/unit/proxy/policy_engine --tb=short -vv -n 4 --durations=20 + $(UV_RUN) pytest tests/unit/proxy/auth tests/unit/proxy/client tests/unit/proxy/db tests/unit/proxy/hooks tests/unit/proxy/policy_engine --ignore=tests/unit/proxy/db/db_transaction_queue/test_e2e_pod_lock_manager.py --ignore=tests/unit/proxy/db/test_update_daily_tag_spend.py --tb=short -vv -n 4 --durations=20 + +PROXY_INFRA_ROOT_TESTS := \ + tests/unit/proxy/test__types.py \ + tests/unit/proxy/test_aiohttp_cleanup_closed.py \ + tests/unit/proxy/test_aiohttp_session_recovery.py \ + tests/unit/proxy/test_api_key_masking_in_errors.py \ + tests/unit/proxy/test_audio_speech_prometheus_hooks.py \ + tests/unit/proxy/test_batch_expiry.py \ + tests/unit/proxy/test_batch_metadata_none_fix.py \ + tests/unit/proxy/test_batch_retrieve_bedrock.py \ + tests/unit/proxy/test_batch_x_litellm_model_encoding.py \ + tests/unit/proxy/test_blocked_response_usage.py \ + tests/unit/proxy/test_body_snapshot_callback_params.py \ + tests/unit/proxy/test_budget_reservation.py \ + tests/unit/proxy/test_bug_report_config.py \ + tests/unit/proxy/test_caching_routes.py \ + tests/unit/proxy/test_chat_completion_metadata.py \ + tests/unit/proxy/test_claude_code_marketplace.py \ + tests/unit/proxy/test_collector.py \ + tests/unit/proxy/test_common_request_processing.py \ + tests/unit/proxy/test_component_allowlists.py \ + tests/unit/proxy/test_conftest.py \ + tests/unit/proxy/test_cors_config.py \ + tests/unit/proxy/test_custom_proxy.py \ + tests/unit/proxy/test_dynamic_mcp_route.py \ + tests/unit/proxy/test_empty_model_list.py \ + tests/unit/proxy/test_enforce_user_param.py \ + tests/unit/proxy/test_fallback_management_endpoints.py \ + tests/unit/proxy/test_fastapi_offline_routes.py \ + tests/unit/proxy/test_filter_models_by_team_access_group.py \ + tests/unit/proxy/test_health_check_functions.py \ + tests/unit/proxy/test_health_check_max_tokens.py \ + tests/unit/proxy/test_init_litellm_callbacks.py \ + tests/unit/proxy/test_langfuse_passthrough_security.py \ + tests/unit/proxy/test_lazy_openapi_snapshot.py \ + tests/unit/proxy/test_litellm_pre_call_utils.py \ + tests/unit/proxy/test_max_budget_env_var.py \ + tests/unit/proxy/test_mcp_asgi_response.py \ + tests/unit/proxy/test_model_based_routing_files_batches.py \ + tests/unit/proxy/test_model_deprecations_endpoint.py \ + tests/unit/proxy/test_model_dump_with_preserved_fields.py \ + tests/unit/proxy/test_model_id_header_propagation.py \ + tests/unit/proxy/test_model_info_default_limits.py \ + tests/unit/proxy/test_model_level_guardrails.py \ + tests/unit/proxy/test_model_list_aliases.py \ + tests/unit/proxy/test_model_list_callback_filter.py \ + tests/unit/proxy/test_model_list_discoverable.py \ + tests/unit/proxy/test_model_list_healthy_only.py \ + tests/unit/proxy/test_modify_response_streaming_passthrough.py \ + tests/unit/proxy/test_native_compaction.py \ + tests/unit/proxy/test_openai_ws_passthrough_routes.py \ + tests/unit/proxy/test_openapi_schema_validation.py \ + tests/unit/proxy/test_plugin_routes.py \ + tests/unit/proxy/test_pointfive_dashboard_config.py \ + tests/unit/proxy/test_pointfive_ui_callback.py \ + tests/unit/proxy/test_pricing_field_strip.py \ + tests/unit/proxy/test_prisma_engine_watchdog.py \ + tests/unit/proxy/test_prisma_migration.py \ + tests/unit/proxy/test_prometheus_cleanup.py \ + tests/unit/proxy/test_prometheus_metrics_server.py \ + tests/unit/proxy/test_provider_url_destination_guard.py \ + tests/unit/proxy/test_proxy_cli.py \ + tests/unit/proxy/test_proxy_logging_hook_detection.py \ + tests/unit/proxy/test_proxy_types.py \ + tests/unit/proxy/test_pyroscope.py \ + tests/unit/proxy/test_read_model_list.py \ + tests/unit/proxy/test_redis_auth_cache_flag.py \ + tests/unit/proxy/test_response_model_sanitization.py \ + tests/unit/proxy/test_route_a2a_models.py \ + tests/unit/proxy/test_route_llm_request.py \ + tests/unit/proxy/test_route_priority.py \ + tests/unit/proxy/test_sensitive_route_auth.py \ + tests/unit/proxy/test_shared_health_check.py \ + tests/unit/proxy/test_spend_log_cleanup.py \ + tests/unit/proxy/test_swagger_chat_completions.py \ + tests/unit/proxy/test_team_member_update.py \ + tests/unit/proxy/test_team_org_move.py \ + tests/unit/proxy/test_tools_allowlist_enforcement.py \ + tests/unit/proxy/test_tracing_endpoints.py \ + tests/unit/proxy/test_update_llm_router_resilience.py \ + tests/unit/proxy/test_zerobus_dashboard_config.py test-unit-proxy-misc: install-test-deps - $(UV_RUN) pytest tests/test_litellm/proxy/_experimental tests/unit/proxy/agent_endpoints tests/unit/proxy/anthropic_endpoints tests/test_litellm/proxy/common_utils tests/unit/proxy/discovery_endpoints tests/test_litellm/proxy/experimental tests/unit/proxy/google_endpoints tests/unit/proxy/health_endpoints tests/unit/proxy/image_endpoints tests/test_litellm/proxy/middleware tests/unit/proxy/openai_files_endpoint tests/test_litellm/proxy/pass_through_endpoints tests/unit/proxy/prompts tests/unit/proxy/public_endpoints tests/unit/proxy/response_api_endpoints tests/unit/proxy/shutdown tests/test_litellm/proxy/spend_tracking tests/unit/proxy/ui_crud_endpoints tests/unit/proxy/vector_store_endpoints tests/test_litellm/proxy/test_*.py tests/unit/proxy/test_proxy_server_endpoints_and_startup.py tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py tests/unit/proxy/_experimental/mcp_server/test_mcp_server_tool_calls_and_headers.py --ignore=tests/unit/proxy/google_endpoints/test_gemini_agents_endpoints.py --ignore=tests/unit/proxy/google_endpoints/test_google_endpoint_routing.py --ignore=tests/unit/proxy/google_endpoints/test_google_gemini_proxy_request.py --ignore=tests/unit/proxy/public_endpoints/test_blog_posts_endpoint.py --tb=short -vv -n 4 --durations=20 + $(UV_RUN) pytest tests/unit/proxy/agent_endpoints tests/unit/proxy/anthropic_endpoints tests/unit/proxy/common_utils --ignore=tests/unit/proxy/common_utils/test_cache_aware_routing.py --ignore=tests/unit/proxy/common_utils/test_check_batch_cost.py --ignore=tests/unit/proxy/common_utils/test_check_responses_cost.py --ignore=tests/unit/proxy/common_utils/test_proxy_encrypt_decrypt.py --ignore=tests/unit/proxy/common_utils/test_realtime_cache.py tests/unit/proxy/discovery_endpoints tests/unit/proxy/experimental tests/unit/proxy/google_endpoints tests/unit/proxy/health_endpoints tests/unit/proxy/image_endpoints tests/unit/proxy/middleware --ignore=tests/unit/proxy/middleware/test_request_size_limit_middleware.py tests/unit/proxy/openai_files_endpoint tests/unit/proxy/pass_through_endpoints tests/test_litellm/proxy/pass_through_endpoints tests/unit/proxy/prompts tests/unit/proxy/public_endpoints tests/unit/proxy/response_api_endpoints tests/unit/proxy/shutdown tests/unit/proxy/spend_tracking --ignore=tests/unit/proxy/spend_tracking/test_search_api_logging.py tests/unit/proxy/ui_crud_endpoints tests/unit/proxy/vector_store_endpoints $(PROXY_INFRA_ROOT_TESTS) tests/unit/proxy/test_proxy_server_endpoints_and_startup.py tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py tests/unit/proxy/_experimental/mcp_server/test_mcp_server_tool_calls_and_headers.py --ignore=tests/unit/proxy/google_endpoints/test_gemini_agents_endpoints.py --ignore=tests/unit/proxy/google_endpoints/test_google_endpoint_routing.py --ignore=tests/unit/proxy/google_endpoints/test_google_gemini_proxy_request.py --ignore=tests/unit/proxy/public_endpoints/test_blog_posts_endpoint.py --tb=short -vv -n 4 --durations=20 test-unit-integrations: install-test-deps $(UV_RUN) pytest tests/unit/integrations --tb=short -vv -n 4 --durations=20 diff --git a/scripts/test_tool_allowlist_script.py b/scripts/test_tool_allowlist_script.py index f94aac60f80..607a8c39473 100644 --- a/scripts/test_tool_allowlist_script.py +++ b/scripts/test_tool_allowlist_script.py @@ -6,7 +6,7 @@ Run from repo root: uv run python scripts/test_tool_allowlist_script.py Or run the unit tests: - uv run pytest tests/test_litellm/proxy/test_tools_allowlist_enforcement.py -v + uv run pytest tests/unit/proxy/test_tools_allowlist_enforcement.py -v """ import asyncio @@ -148,7 +148,7 @@ def main(): asyncio.run(test_check_tools_allowlist()) print("Done. For full unit tests run:") print( - " uv run pytest tests/test_litellm/proxy/test_tools_allowlist_enforcement.py -v" + " uv run pytest tests/unit/proxy/test_tools_allowlist_enforcement.py -v" ) diff --git a/tests/e2e/quota_management/spend_tracking/SPEND_TRACKING_COVERAGE_MATRIX.md b/tests/e2e/quota_management/spend_tracking/SPEND_TRACKING_COVERAGE_MATRIX.md index 32dc0c47dda..d9380098891 100644 --- a/tests/e2e/quota_management/spend_tracking/SPEND_TRACKING_COVERAGE_MATRIX.md +++ b/tests/e2e/quota_management/spend_tracking/SPEND_TRACKING_COVERAGE_MATRIX.md @@ -6,7 +6,7 @@ that would catch a regression. Companion: live suite `test_spend_tracking_e2e.py` + route breadth `test_spend_routes.py` (this directory). Offline regression suite: -`tests/test_litellm/proxy/spend_tracking/`. Reference PR: BerriAI/litellm#29956. +`tests/unit/proxy/spend_tracking/`. Reference PR: BerriAI/litellm#29956. Levels: `unit` mocked; `integration` real DB/cost-map; `live` real provider + proxy + SpendLogs rows. Status: `covered` / `partial` / `gap`. diff --git a/tests/proxy_behavior/spend/test_autorouter_session_rollup.py b/tests/proxy_behavior/spend/test_autorouter_session_rollup.py index 9ef42f5dc7a..effb5ca83ed 100644 --- a/tests/proxy_behavior/spend/test_autorouter_session_rollup.py +++ b/tests/proxy_behavior/spend/test_autorouter_session_rollup.py @@ -2,7 +2,7 @@ Behavior tests for the LiteLLM_AutoRouterSession conditional upsert and the benchmarks aggregate, against a real Postgres. The classification lives in SQL, so these tests are the ones that exercise it; the builder and flush contracts are unit-tested in -tests/test_litellm/proxy/db/test_autorouter_session_rollup.py. +tests/unit/proxy/db/test_autorouter_session_rollup.py. """ import asyncio diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/conftest.py b/tests/test_litellm/proxy/_experimental/mcp_server/conftest.py deleted file mode 100644 index 76e92efd31a..00000000000 --- a/tests/test_litellm/proxy/_experimental/mcp_server/conftest.py +++ /dev/null @@ -1,80 +0,0 @@ -import os - -import pytest - - -@pytest.fixture(autouse=True) -def _hermetic_mcp_server_registry(): - """Restore the singleton ``global_mcp_server_manager``'s registry state around every - test, so entries seeded by one test never leak into another on a shared shard.""" - from litellm.proxy._experimental.mcp_server.mcp_server_manager import ( - global_mcp_server_manager, - ) - - saved_registry = dict(global_mcp_server_manager.registry) - saved_config_servers = dict(global_mcp_server_manager.config_mcp_servers) - saved_tool_mapping = dict(global_mcp_server_manager.tool_name_to_mcp_server_name_mapping) - saved_oauth_slots = global_mcp_server_manager._oauth_discovery_slots - try: - yield - finally: - global_mcp_server_manager.registry.clear() - global_mcp_server_manager.registry.update(saved_registry) - global_mcp_server_manager.config_mcp_servers.clear() - global_mcp_server_manager.config_mcp_servers.update(saved_config_servers) - global_mcp_server_manager.tool_name_to_mcp_server_name_mapping.clear() - global_mcp_server_manager.tool_name_to_mcp_server_name_mapping.update(saved_tool_mapping) - global_mcp_server_manager._oauth_discovery_slots = saved_oauth_slots - - -@pytest.fixture(autouse=True) -def _hermetic_server_root_path(): - """Isolate MCP discovery tests from a leaked ``SERVER_ROOT_PATH``. - - ``tests/test_litellm/proxy/test_custom_proxy.py`` sets ``SERVER_ROOT_PATH`` at import time - (its app mounts under a custom path) and never restores it, so in a shared shard the value - leaks into this process. The discovery routes and the 401 challenges read it, so a leaked - value would silently rewrite every ``resource_metadata`` URL and make these tests depend on - shard ordering. Clearing it here pins the default (root-mounted) deployment; a test that - exercises a sub-path deployment sets the value explicitly within its own body. - """ - saved = os.environ.pop("SERVER_ROOT_PATH", None) - try: - yield - finally: - if saved is not None: - os.environ["SERVER_ROOT_PATH"] = saved - - -@pytest.fixture -def config_only_mcp_manager_factory(): - from litellm.proxy._experimental.mcp_server.mcp_server_manager import MCPServerManager - - class ConfigOnlyManager(MCPServerManager): - def initialize_tool_name_to_mcp_server_name_mapping(self): - return None - - return ConfigOnlyManager - - -@pytest.fixture -def _mcp_request_ctx(): - def _mcp_request_ctx(**overrides): - from types import SimpleNamespace - - from mcp.server.context import ServerRequestContext - - kwargs = { - "session": SimpleNamespace(), - "lifespan_context": {}, - "protocol_version": "2025-06-18", - "method": "", - "params": None, - "request_id": 1, - "meta": None, - "request": None, - } - kwargs.update(overrides) - return ServerRequestContext(**kwargs) - - return _mcp_request_ctx diff --git a/tests/test_spend_logs.py b/tests/test_spend_logs.py index c575fa07551..f0dda539352 100644 --- a/tests/test_spend_logs.py +++ b/tests/test_spend_logs.py @@ -101,7 +101,7 @@ async def get_spend_logs(session, request_id=None, api_key=None): @pytest.mark.skip( - reason="Flaky in CI: /spend/logs?request_id=... returns 500 even after a 20s wait for the spend log to be written. Spend-log accuracy is covered by tests/test_litellm/proxy/spend_tracking/ and the proxy_spend_accuracy_tests CircleCI job." + reason="Flaky in CI: /spend/logs?request_id=... returns 500 even after a 20s wait for the spend log to be written. Spend-log accuracy is covered by tests/unit/proxy/spend_tracking/ and the proxy_spend_accuracy_tests CircleCI job." ) @pytest.mark.asyncio async def test_spend_logs(): @@ -159,7 +159,7 @@ async def generate_team(session: aiohttp.ClientSession, org_id: str) -> dict: @pytest.mark.skip( - reason="Flaky in CI: /spend/logs?request_id=... returns 500 even after a 20s wait for the spend log to be written. Same write-then-read race against the spend logs DB as test_spend_logs. Spend-log accuracy is covered by tests/test_litellm/proxy/spend_tracking/ and the proxy_spend_accuracy_tests CircleCI job." + reason="Flaky in CI: /spend/logs?request_id=... returns 500 even after a 20s wait for the spend log to be written. Same write-then-read race against the spend logs DB as test_spend_logs. Spend-log accuracy is covered by tests/unit/proxy/spend_tracking/ and the proxy_spend_accuracy_tests CircleCI job." ) @pytest.mark.asyncio async def test_spend_logs_with_org_id(): diff --git a/tests/test_litellm/proxy/logging_endpoints/__init__.py b/tests/unit/proxy/_experimental/mcp_server/auth/__init__.py similarity index 100% rename from tests/test_litellm/proxy/logging_endpoints/__init__.py rename to tests/unit/proxy/_experimental/mcp_server/auth/__init__.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/auth/test_managed_agent_access.py b/tests/unit/proxy/_experimental/mcp_server/auth/test_managed_agent_access.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/auth/test_managed_agent_access.py rename to tests/unit/proxy/_experimental/mcp_server/auth/test_managed_agent_access.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/auth/test_token_endpoint_auth.py b/tests/unit/proxy/_experimental/mcp_server/auth/test_token_endpoint_auth.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/auth/test_token_endpoint_auth.py rename to tests/unit/proxy/_experimental/mcp_server/auth/test_token_endpoint_auth.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py b/tests/unit/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py rename to tests/unit/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py diff --git a/tests/test_litellm/proxy/proxy_server/__init__.py b/tests/unit/proxy/_experimental/mcp_server/faults/__init__.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/__init__.py rename to tests/unit/proxy/_experimental/mcp_server/faults/__init__.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/faults/test_classify.py b/tests/unit/proxy/_experimental/mcp_server/faults/test_classify.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/faults/test_classify.py rename to tests/unit/proxy/_experimental/mcp_server/faults/test_classify.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/faults/test_list_outcomes.py b/tests/unit/proxy/_experimental/mcp_server/faults/test_list_outcomes.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/faults/test_list_outcomes.py rename to tests/unit/proxy/_experimental/mcp_server/faults/test_list_outcomes.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/faults/test_render_oauth.py b/tests/unit/proxy/_experimental/mcp_server/faults/test_render_oauth.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/faults/test_render_oauth.py rename to tests/unit/proxy/_experimental/mcp_server/faults/test_render_oauth.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/faults/test_traversal.py b/tests/unit/proxy/_experimental/mcp_server/faults/test_traversal.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/faults/test_traversal.py rename to tests/unit/proxy/_experimental/mcp_server/faults/test_traversal.py diff --git a/tests/test_litellm/proxy/types_utils/__init__.py b/tests/unit/proxy/_experimental/mcp_server/guardrail_translation/__init__.py similarity index 100% rename from tests/test_litellm/proxy/types_utils/__init__.py rename to tests/unit/proxy/_experimental/mcp_server/guardrail_translation/__init__.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/guardrail_translation/test_mcp_guardrail_handler.py b/tests/unit/proxy/_experimental/mcp_server/guardrail_translation/test_mcp_guardrail_handler.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/guardrail_translation/test_mcp_guardrail_handler.py rename to tests/unit/proxy/_experimental/mcp_server/guardrail_translation/test_mcp_guardrail_handler.py diff --git a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/__init__.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_authz_code_refresher.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_authz_code_refresher.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_authz_code_refresher.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_authz_code_refresher.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_bridge_credentials.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_bridge_credentials.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_bridge_credentials.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_bridge_credentials.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_client_credentials.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_client_credentials.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_client_credentials.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_client_credentials.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_dual_cache_token_backend.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_dual_cache_token_backend.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_dual_cache_token_backend.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_dual_cache_token_backend.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_envelope.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_envelope.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_envelope.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_envelope.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_httpx_auth.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_httpx_auth.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_httpx_auth.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_httpx_auth.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_oauth_token_store.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_oauth_token_store.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_oauth_token_store.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_oauth_token_store.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_per_user_oauth_store.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_per_user_oauth_store.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_per_user_oauth_store.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_per_user_oauth_store.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_presented_token_store.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_presented_token_store.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_presented_token_store.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_presented_token_store.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_redis_distributed_lock.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_redis_distributed_lock.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_redis_distributed_lock.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_redis_distributed_lock.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_redis_refresh_coordinator.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_redis_refresh_coordinator.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_redis_refresh_coordinator.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_redis_refresh_coordinator.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_result.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_result.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_result.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_result.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_session_credentials.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_session_credentials.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_session_credentials.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_session_credentials.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_session_token.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_session_token.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_session_token.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_session_token.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_cache_codec.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_cache_codec.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_cache_codec.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_cache_codec.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_endpoint.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_endpoint.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_endpoint.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_endpoint.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchange_provider.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchange_provider.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchange_provider.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchange_provider.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchanger.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchanger.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchanger.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_token_exchanger.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_types.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_types.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_types.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_types.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_v2_token_store.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_v2_token_store.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/outbound_credentials/test_v2_token_store.py rename to tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_v2_token_store.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_byok_credential_cache.py b/tests/unit/proxy/_experimental/mcp_server/test_byok_credential_cache.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_byok_credential_cache.py rename to tests/unit/proxy/_experimental/mcp_server/test_byok_credential_cache.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_byok_oauth_endpoints.py b/tests/unit/proxy/_experimental/mcp_server/test_byok_oauth_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_byok_oauth_endpoints.py rename to tests/unit/proxy/_experimental/mcp_server/test_byok_oauth_endpoints.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_callback_oauth_error_responses.py b/tests/unit/proxy/_experimental/mcp_server/test_callback_oauth_error_responses.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_callback_oauth_error_responses.py rename to tests/unit/proxy/_experimental/mcp_server/test_callback_oauth_error_responses.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_capabilities.py b/tests/unit/proxy/_experimental/mcp_server/test_capabilities.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_capabilities.py rename to tests/unit/proxy/_experimental/mcp_server/test_capabilities.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_client_allowlist.py b/tests/unit/proxy/_experimental/mcp_server/test_client_allowlist.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_client_allowlist.py rename to tests/unit/proxy/_experimental/mcp_server/test_client_allowlist.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_contracts.py b/tests/unit/proxy/_experimental/mcp_server/test_contracts.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_contracts.py rename to tests/unit/proxy/_experimental/mcp_server/test_contracts.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_db_credentials.py b/tests/unit/proxy/_experimental/mcp_server/test_db_credentials.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_db_credentials.py rename to tests/unit/proxy/_experimental/mcp_server/test_db_credentials.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_discoverable_endpoints.py b/tests/unit/proxy/_experimental/mcp_server/test_discoverable_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_discoverable_endpoints.py rename to tests/unit/proxy/_experimental/mcp_server/test_discoverable_endpoints.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py b/tests/unit/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py rename to tests/unit/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_idp_token_exchange.py b/tests/unit/proxy/_experimental/mcp_server/test_idp_token_exchange.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_idp_token_exchange.py rename to tests/unit/proxy/_experimental/mcp_server/test_idp_token_exchange.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_is_tool_name_prefixed.py b/tests/unit/proxy/_experimental/mcp_server/test_is_tool_name_prefixed.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_is_tool_name_prefixed.py rename to tests/unit/proxy/_experimental/mcp_server/test_is_tool_name_prefixed.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_jwt_mcp_enforcement.py b/tests/unit/proxy/_experimental/mcp_server/test_jwt_mcp_enforcement.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_jwt_mcp_enforcement.py rename to tests/unit/proxy/_experimental/mcp_server/test_jwt_mcp_enforcement.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_jwt_mcp_simple.py b/tests/unit/proxy/_experimental/mcp_server/test_jwt_mcp_simple.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_jwt_mcp_simple.py rename to tests/unit/proxy/_experimental/mcp_server/test_jwt_mcp_simple.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_block_recording.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_block_recording.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_block_recording.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_block_recording.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_cost_calculator.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_cost_calculator.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_cost_calculator.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_cost_calculator.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_custom_fields.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_custom_fields.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_custom_fields.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_custom_fields.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_debug.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_debug.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_debug.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_debug.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_discovery.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_discovery.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_discovery.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_discovery.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_elicitation_handler.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_elicitation_handler.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_elicitation_handler.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_elicitation_handler.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_env_vars.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_env_vars.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_env_vars.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_env_vars.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_guardrail_usage_monitor.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_guardrail_usage_monitor.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_guardrail_usage_monitor.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_guardrail_usage_monitor.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_header_alias_utils.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_header_alias_utils.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_header_alias_utils.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_header_alias_utils.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_hook_extra_headers.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_hook_extra_headers.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_hook_extra_headers.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_hook_extra_headers.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_metadata_preservation.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_metadata_preservation.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_metadata_preservation.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_metadata_preservation.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_cold_start.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_cold_start.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_cold_start.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_cold_start.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_partial_update.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_partial_update.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_partial_update.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_partial_update.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_proxy_mode.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_proxy_mode.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_proxy_mode.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_proxy_mode.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_completion_flow.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_completion_flow.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_completion_flow.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_completion_flow.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_model_access.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_model_access.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_model_access.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_model_access.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_model_resolution.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_model_resolution.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_model_resolution.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_model_resolution.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_priority_selection.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_priority_selection.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_priority_selection.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_priority_selection.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_request_builder.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_request_builder.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_request_builder.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_request_builder.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_response_conversion.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_response_conversion.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_response_conversion.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_response_conversion.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_tool_conversion.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_tool_conversion.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sampling_tool_conversion.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sampling_tool_conversion.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_session_logging.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_session_logging.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_session_logging.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_session_logging.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sigv4_auth.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_sigv4_auth.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_sigv4_auth.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_sigv4_auth.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_stale_session.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_stale_session.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_stale_session.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_stale_session.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_tool_search.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_tool_search.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_tool_search.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_tool_search.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_toolset_scope.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_toolset_scope.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_toolset_scope.py rename to tests/unit/proxy/_experimental/mcp_server/test_mcp_toolset_scope.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_oauth2_flow_backfill.py b/tests/unit/proxy/_experimental/mcp_server/test_oauth2_flow_backfill.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_oauth2_flow_backfill.py rename to tests/unit/proxy/_experimental/mcp_server/test_oauth2_flow_backfill.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_oauth2_token_cache.py b/tests/unit/proxy/_experimental/mcp_server/test_oauth2_token_cache.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_oauth2_token_cache.py rename to tests/unit/proxy/_experimental/mcp_server/test_oauth2_token_cache.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_oauth_identity_binding.py b/tests/unit/proxy/_experimental/mcp_server/test_oauth_identity_binding.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_oauth_identity_binding.py rename to tests/unit/proxy/_experimental/mcp_server/test_oauth_identity_binding.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_oauth_issuer_stamp_backfill.py b/tests/unit/proxy/_experimental/mcp_server/test_oauth_issuer_stamp_backfill.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_oauth_issuer_stamp_backfill.py rename to tests/unit/proxy/_experimental/mcp_server/test_oauth_issuer_stamp_backfill.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py b/tests/unit/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py rename to tests/unit/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_tool_auth.py b/tests/unit/proxy/_experimental/mcp_server/test_openapi_tool_auth.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_tool_auth.py rename to tests/unit/proxy/_experimental/mcp_server/test_openapi_tool_auth.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_operations.py b/tests/unit/proxy/_experimental/mcp_server/test_operations.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_operations.py rename to tests/unit/proxy/_experimental/mcp_server/test_operations.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_proxy_api_credentials.py b/tests/unit/proxy/_experimental/mcp_server/test_proxy_api_credentials.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_proxy_api_credentials.py rename to tests/unit/proxy/_experimental/mcp_server/test_proxy_api_credentials.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_rest_endpoints.py b/tests/unit/proxy/_experimental/mcp_server/test_rest_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_rest_endpoints.py rename to tests/unit/proxy/_experimental/mcp_server/test_rest_endpoints.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_result_conversion.py b/tests/unit/proxy/_experimental/mcp_server/test_result_conversion.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_result_conversion.py rename to tests/unit/proxy/_experimental/mcp_server/test_result_conversion.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_semantic_tool_filter.py b/tests/unit/proxy/_experimental/mcp_server/test_semantic_tool_filter.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_semantic_tool_filter.py rename to tests/unit/proxy/_experimental/mcp_server/test_semantic_tool_filter.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_server_resolution.py b/tests/unit/proxy/_experimental/mcp_server/test_server_resolution.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_server_resolution.py rename to tests/unit/proxy/_experimental/mcp_server/test_server_resolution.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_short_mcp_tool_prefix.py b/tests/unit/proxy/_experimental/mcp_server/test_short_mcp_tool_prefix.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_short_mcp_tool_prefix.py rename to tests/unit/proxy/_experimental/mcp_server/test_short_mcp_tool_prefix.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_ui_session_utils.py b/tests/unit/proxy/_experimental/mcp_server/test_ui_session_utils.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_ui_session_utils.py rename to tests/unit/proxy/_experimental/mcp_server/test_ui_session_utils.py diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_utils.py b/tests/unit/proxy/_experimental/mcp_server/test_utils.py similarity index 100% rename from tests/test_litellm/proxy/_experimental/mcp_server/test_utils.py rename to tests/unit/proxy/_experimental/mcp_server/test_utils.py diff --git a/tests/unit/proxy/common_utils/html_forms/__init__.py b/tests/unit/proxy/common_utils/html_forms/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/common_utils/html_forms/test_native_client_consent.py b/tests/unit/proxy/common_utils/html_forms/test_native_client_consent.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/html_forms/test_native_client_consent.py rename to tests/unit/proxy/common_utils/html_forms/test_native_client_consent.py diff --git a/tests/test_litellm/proxy/common_utils/html_forms/test_ui_login.py b/tests/unit/proxy/common_utils/html_forms/test_ui_login.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/html_forms/test_ui_login.py rename to tests/unit/proxy/common_utils/html_forms/test_ui_login.py diff --git a/tests/test_litellm/proxy/common_utils/test_admin_ui_utils.py b/tests/unit/proxy/common_utils/test_admin_ui_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_admin_ui_utils.py rename to tests/unit/proxy/common_utils/test_admin_ui_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_auth_cache_invalidation_pubsub.py b/tests/unit/proxy/common_utils/test_auth_cache_invalidation_pubsub.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_auth_cache_invalidation_pubsub.py rename to tests/unit/proxy/common_utils/test_auth_cache_invalidation_pubsub.py diff --git a/tests/test_litellm/proxy/common_utils/test_cache_codec.py b/tests/unit/proxy/common_utils/test_cache_codec.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_cache_codec.py rename to tests/unit/proxy/common_utils/test_cache_codec.py diff --git a/tests/test_litellm/proxy/common_utils/test_callback_config_validation.py b/tests/unit/proxy/common_utils/test_callback_config_validation.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_callback_config_validation.py rename to tests/unit/proxy/common_utils/test_callback_config_validation.py diff --git a/tests/test_litellm/proxy/common_utils/test_callback_utils.py b/tests/unit/proxy/common_utils/test_callback_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_callback_utils.py rename to tests/unit/proxy/common_utils/test_callback_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_config_sync_pubsub.py b/tests/unit/proxy/common_utils/test_config_sync_pubsub.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_config_sync_pubsub.py rename to tests/unit/proxy/common_utils/test_config_sync_pubsub.py diff --git a/tests/test_litellm/proxy/common_utils/test_custom_openapi_spec.py b/tests/unit/proxy/common_utils/test_custom_openapi_spec.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_custom_openapi_spec.py rename to tests/unit/proxy/common_utils/test_custom_openapi_spec.py diff --git a/tests/test_litellm/proxy/common_utils/test_debug_utils.py b/tests/unit/proxy/common_utils/test_debug_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_debug_utils.py rename to tests/unit/proxy/common_utils/test_debug_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_discoverable_model_filter.py b/tests/unit/proxy/common_utils/test_discoverable_model_filter.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_discoverable_model_filter.py rename to tests/unit/proxy/common_utils/test_discoverable_model_filter.py diff --git a/tests/test_litellm/proxy/common_utils/test_encrypt_decrypt_utils.py b/tests/unit/proxy/common_utils/test_encrypt_decrypt_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_encrypt_decrypt_utils.py rename to tests/unit/proxy/common_utils/test_encrypt_decrypt_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_error_body_call_id.py b/tests/unit/proxy/common_utils/test_error_body_call_id.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_error_body_call_id.py rename to tests/unit/proxy/common_utils/test_error_body_call_id.py diff --git a/tests/test_litellm/proxy/common_utils/test_expired_ui_session_key_cleanup_manager.py b/tests/unit/proxy/common_utils/test_expired_ui_session_key_cleanup_manager.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_expired_ui_session_key_cleanup_manager.py rename to tests/unit/proxy/common_utils/test_expired_ui_session_key_cleanup_manager.py diff --git a/tests/test_litellm/proxy/common_utils/test_get_routes.py b/tests/unit/proxy/common_utils/test_get_routes.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_get_routes.py rename to tests/unit/proxy/common_utils/test_get_routes.py diff --git a/tests/test_litellm/proxy/common_utils/test_http_parsing_utils.py b/tests/unit/proxy/common_utils/test_http_parsing_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_http_parsing_utils.py rename to tests/unit/proxy/common_utils/test_http_parsing_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_json_merge_patch.py b/tests/unit/proxy/common_utils/test_json_merge_patch.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_json_merge_patch.py rename to tests/unit/proxy/common_utils/test_json_merge_patch.py diff --git a/tests/test_litellm/proxy/common_utils/test_key_rotation_e2e.py b/tests/unit/proxy/common_utils/test_key_rotation_e2e.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_key_rotation_e2e.py rename to tests/unit/proxy/common_utils/test_key_rotation_e2e.py diff --git a/tests/test_litellm/proxy/common_utils/test_key_rotation_integration.py b/tests/unit/proxy/common_utils/test_key_rotation_integration.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_key_rotation_integration.py rename to tests/unit/proxy/common_utils/test_key_rotation_integration.py diff --git a/tests/test_litellm/proxy/common_utils/test_key_rotation_lock.py b/tests/unit/proxy/common_utils/test_key_rotation_lock.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_key_rotation_lock.py rename to tests/unit/proxy/common_utils/test_key_rotation_lock.py diff --git a/tests/test_litellm/proxy/common_utils/test_key_rotation_manager.py b/tests/unit/proxy/common_utils/test_key_rotation_manager.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_key_rotation_manager.py rename to tests/unit/proxy/common_utils/test_key_rotation_manager.py diff --git a/tests/test_litellm/proxy/common_utils/test_load_config_utils.py b/tests/unit/proxy/common_utils/test_load_config_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_load_config_utils.py rename to tests/unit/proxy/common_utils/test_load_config_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_model_deprecation.py b/tests/unit/proxy/common_utils/test_model_deprecation.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_model_deprecation.py rename to tests/unit/proxy/common_utils/test_model_deprecation.py diff --git a/tests/test_litellm/proxy/common_utils/test_model_listing_utils.py b/tests/unit/proxy/common_utils/test_model_listing_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_model_listing_utils.py rename to tests/unit/proxy/common_utils/test_model_listing_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_openai_endpoint_utils.py b/tests/unit/proxy/common_utils/test_openai_endpoint_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_openai_endpoint_utils.py rename to tests/unit/proxy/common_utils/test_openai_endpoint_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_openai_error_payload.py b/tests/unit/proxy/common_utils/test_openai_error_payload.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_openai_error_payload.py rename to tests/unit/proxy/common_utils/test_openai_error_payload.py diff --git a/tests/test_litellm/proxy/common_utils/test_path_utils.py b/tests/unit/proxy/common_utils/test_path_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_path_utils.py rename to tests/unit/proxy/common_utils/test_path_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_periodic_reload_schedule.py b/tests/unit/proxy/common_utils/test_periodic_reload_schedule.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_periodic_reload_schedule.py rename to tests/unit/proxy/common_utils/test_periodic_reload_schedule.py diff --git a/tests/test_litellm/proxy/common_utils/test_prompt_cache_pricing.py b/tests/unit/proxy/common_utils/test_prompt_cache_pricing.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_prompt_cache_pricing.py rename to tests/unit/proxy/common_utils/test_prompt_cache_pricing.py diff --git a/tests/test_litellm/proxy/common_utils/test_rbac_utils.py b/tests/unit/proxy/common_utils/test_rbac_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_rbac_utils.py rename to tests/unit/proxy/common_utils/test_rbac_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_registry_read_through.py b/tests/unit/proxy/common_utils/test_registry_read_through.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_registry_read_through.py rename to tests/unit/proxy/common_utils/test_registry_read_through.py diff --git a/tests/test_litellm/proxy/common_utils/test_reset_budget_job.py b/tests/unit/proxy/common_utils/test_reset_budget_job.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_reset_budget_job.py rename to tests/unit/proxy/common_utils/test_reset_budget_job.py diff --git a/tests/test_litellm/proxy/common_utils/test_scheduled_job_stagger.py b/tests/unit/proxy/common_utils/test_scheduled_job_stagger.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_scheduled_job_stagger.py rename to tests/unit/proxy/common_utils/test_scheduled_job_stagger.py diff --git a/tests/test_litellm/proxy/common_utils/test_sse_keepalive.py b/tests/unit/proxy/common_utils/test_sse_keepalive.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_sse_keepalive.py rename to tests/unit/proxy/common_utils/test_sse_keepalive.py diff --git a/tests/test_litellm/proxy/common_utils/test_static_asset_utils.py b/tests/unit/proxy/common_utils/test_static_asset_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_static_asset_utils.py rename to tests/unit/proxy/common_utils/test_static_asset_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_swagger_utils.py b/tests/unit/proxy/common_utils/test_swagger_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_swagger_utils.py rename to tests/unit/proxy/common_utils/test_swagger_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_timezone_utils.py b/tests/unit/proxy/common_utils/test_timezone_utils.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_timezone_utils.py rename to tests/unit/proxy/common_utils/test_timezone_utils.py diff --git a/tests/test_litellm/proxy/common_utils/test_upsert_budget_membership.py b/tests/unit/proxy/common_utils/test_upsert_budget_membership.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_upsert_budget_membership.py rename to tests/unit/proxy/common_utils/test_upsert_budget_membership.py diff --git a/tests/test_litellm/proxy/common_utils/test_user_api_key_cache.py b/tests/unit/proxy/common_utils/test_user_api_key_cache.py similarity index 100% rename from tests/test_litellm/proxy/common_utils/test_user_api_key_cache.py rename to tests/unit/proxy/common_utils/test_user_api_key_cache.py diff --git a/tests/unit/proxy/conftest.py b/tests/unit/proxy/conftest.py index 0e8acf3b905..50c89387d80 100644 --- a/tests/unit/proxy/conftest.py +++ b/tests/unit/proxy/conftest.py @@ -3,11 +3,15 @@ import asyncio import copy import inspect +import os +import tempfile import warnings from collections.abc import Iterator -from typing import Dict +from typing import Dict, Optional import pytest +import yaml +from fastapi.testclient import TestClient from prisma.errors import ClientNotConnectedError @@ -56,7 +60,7 @@ def _snapshot_mutable_state(module): continue if value is None or isinstance(value, _SNAPSHOT_TYPES): try: - snapshot[attr] = copy.deepcopy(value) + snapshot[attr] = _restored_value(value) except Exception as exc: warnings.warn( f"conftest: could not snapshot {module.__name__}.{attr}: {exc}", @@ -65,10 +69,25 @@ def _snapshot_mutable_state(module): return snapshot +_MUTABLE_CONTAINERS = (list, dict, set, bytearray) + + +def _holds_mutable_container(value) -> bool: + if isinstance(value, _MUTABLE_CONTAINERS): + return True + if isinstance(value, tuple): + return any(_holds_mutable_container(element) for element in value) + return False + + +def _restored_value(value): + return copy.deepcopy(value) if _holds_mutable_container(value) else value + + def _restore_mutable_state(module, snapshot): for attr, default in snapshot.items(): try: - setattr(module, attr, copy.deepcopy(default)) + setattr(module, attr, _restored_value(default)) except Exception as exc: warnings.warn( f"conftest: could not restore {module.__name__}.{attr}: {exc}", @@ -230,3 +249,168 @@ def _reset_graceful_shutdown_state(): GracefulShutdownManager.reset() yield GracefulShutdownManager.reset() + + +def build_cache_config(enable_cache: bool = True) -> Optional[Dict]: + """ + Build Redis cache configuration from environment variables. + + Args: + enable_cache: Whether to enable cache (default: True) + + Returns: + dict: Cache configuration dict with 'cache' and 'cache_params' keys, or None + """ + if not enable_cache: + return None + + redis_host = os.getenv("REDIS_HOST") + if not redis_host: + return None + + redis_port = os.getenv("REDIS_PORT", "6379") + cache_params = { + "type": "redis", + "host": redis_host, + "port": int(redis_port) if redis_port.isdigit() else redis_port, + } + + redis_password = os.getenv("REDIS_PASSWORD") + if redis_password: + cache_params["password"] = redis_password + + return {"cache": True, "cache_params": cache_params} + + +def build_minimal_proxy_config( + database_url: Optional[str] = None, **init_options +) -> Dict: + """ + Build a minimal proxy configuration YAML. + + Args: + database_url: Optional database URL (falls back to DATABASE_URL env var) + **init_options: Additional configuration options: + - master_key: API key for authentication (default: "sk-1234") + - enable_cache: Whether to enable Redis cache (default: True) + - success_callback: Callback function for success events + + Returns: + dict: Configuration dictionary ready to be written as YAML + """ + config = { + "general_settings": {"master_key": init_options.get("master_key", "sk-1234")}, + "litellm_settings": {}, + } + + db_url = database_url or os.getenv("DATABASE_URL") + if db_url: + config["general_settings"]["database_url"] = db_url + + enable_cache = init_options.get("enable_cache", True) + cache_config = build_cache_config(enable_cache=enable_cache) + if cache_config: + config["litellm_settings"].update(cache_config) + + if init_options.get("success_callback") is not None: + config["litellm_settings"]["success_callback"] = init_options[ + "success_callback" + ] + + excluded_keys = { + "master_key", + "debug", + "success_callback", + "database_url", + "enable_cache", + } + for key, value in init_options.items(): + if key not in excluded_keys and key not in config["litellm_settings"]: + config["litellm_settings"][key] = value + + return config + + +def set_proxy_environment_variables( + monkeypatch, database_url: Optional[str] = None +) -> None: + """ + Set environment variables for database and Redis. + + Args: + monkeypatch: pytest monkeypatch fixture + database_url: Optional database URL (falls back to DATABASE_URL env var) + """ + db_url = database_url or os.getenv("DATABASE_URL") + if db_url: + monkeypatch.setenv("DATABASE_URL", db_url) + + redis_host = os.getenv("REDIS_HOST") + if redis_host: + monkeypatch.setenv("REDIS_HOST", redis_host) + monkeypatch.setenv("REDIS_PORT", os.getenv("REDIS_PORT", "6379")) + redis_password = os.getenv("REDIS_PASSWORD") + if redis_password: + monkeypatch.setenv("REDIS_PASSWORD", redis_password) + + +def create_proxy_test_client( + monkeypatch, database_url: Optional[str] = None, **init_options +) -> TestClient: + """ + Create a proxy TestClient with optional database and Redis cache configuration. + + Args: + monkeypatch: pytest monkeypatch fixture + database_url: Optional database URL (falls back to DATABASE_URL env var) + **init_options: Additional configuration options: + - master_key: API key for authentication (default: "sk-1234") + - enable_cache: Whether to enable Redis cache (default: True) + - success_callback: Callback function for success events + - debug: Enable debug mode + + Returns: + TestClient: FastAPI test client for the proxy server + """ + from litellm.proxy.proxy_server import ( + cleanup_router_config_variables, + initialize, + app, + ) + + cleanup_router_config_variables() + + filepath = os.path.dirname(os.path.abspath(__file__)) + default_config_fp = os.path.join( + filepath, "test_configs", "test_config_hosted_vllm_embedding.yaml" + ) + + enable_cache = init_options.get("enable_cache", True) + needs_redis = enable_cache and os.getenv("REDIS_HOST") is not None + needs_db = (database_url or os.getenv("DATABASE_URL")) is not None + + if not os.path.exists(default_config_fp) or needs_redis or needs_db: + minimal_config = build_minimal_proxy_config( + database_url=database_url, **init_options + ) + + with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f: + yaml.dump(minimal_config, f) + config_fp = f.name + else: + config_fp = default_config_fp + + set_proxy_environment_variables(monkeypatch, database_url=database_url) + monkeypatch.setenv("LITELLM_DANGEROUSLY_PERMIT_WEAK_OR_UNSET_MASTER_KEY", "true") + + asyncio.run(initialize(config=config_fp, debug=init_options.get("debug", False))) + return TestClient(app) + + +@pytest.fixture +def fresh_agent_read_through(monkeypatch): + from litellm.proxy.common_utils import registry_read_through + + read_through = registry_read_through.RegistryReadThrough(resync=registry_read_through._resync_agents) + monkeypatch.setattr(registry_read_through, "agent_registry_read_through", read_through) + return read_through diff --git a/tests/test_litellm/proxy/db/conftest.py b/tests/unit/proxy/db/conftest.py similarity index 100% rename from tests/test_litellm/proxy/db/conftest.py rename to tests/unit/proxy/db/conftest.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_base_update_queue.py b/tests/unit/proxy/db/db_transaction_queue/test_base_update_queue.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_base_update_queue.py rename to tests/unit/proxy/db/db_transaction_queue/test_base_update_queue.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_daily_spend_update_queue.py b/tests/unit/proxy/db/db_transaction_queue/test_daily_spend_update_queue.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_daily_spend_update_queue.py rename to tests/unit/proxy/db/db_transaction_queue/test_daily_spend_update_queue.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_pod_lock_manager.py b/tests/unit/proxy/db/db_transaction_queue/test_pod_lock_manager.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_pod_lock_manager.py rename to tests/unit/proxy/db/db_transaction_queue/test_pod_lock_manager.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_redis_update_buffer.py b/tests/unit/proxy/db/db_transaction_queue/test_redis_update_buffer.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_redis_update_buffer.py rename to tests/unit/proxy/db/db_transaction_queue/test_redis_update_buffer.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_spend_logs_partition_manager.py b/tests/unit/proxy/db/db_transaction_queue/test_spend_logs_partition_manager.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_spend_logs_partition_manager.py rename to tests/unit/proxy/db/db_transaction_queue/test_spend_logs_partition_manager.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_spend_update_queue.py b/tests/unit/proxy/db/db_transaction_queue/test_spend_update_queue.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_spend_update_queue.py rename to tests/unit/proxy/db/db_transaction_queue/test_spend_update_queue.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_tool_discovery_queue.py b/tests/unit/proxy/db/db_transaction_queue/test_tool_discovery_queue.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_tool_discovery_queue.py rename to tests/unit/proxy/db/db_transaction_queue/test_tool_discovery_queue.py diff --git a/tests/test_litellm/proxy/db/db_transaction_queue/test_window_spend_update_queue.py b/tests/unit/proxy/db/db_transaction_queue/test_window_spend_update_queue.py similarity index 100% rename from tests/test_litellm/proxy/db/db_transaction_queue/test_window_spend_update_queue.py rename to tests/unit/proxy/db/db_transaction_queue/test_window_spend_update_queue.py diff --git a/tests/unit/proxy/db/mcp_server/__init__.py b/tests/unit/proxy/db/mcp_server/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/db/mcp_server/test_db.py b/tests/unit/proxy/db/mcp_server/test_db.py similarity index 100% rename from tests/test_litellm/proxy/db/mcp_server/test_db.py rename to tests/unit/proxy/db/mcp_server/test_db.py diff --git a/tests/test_litellm/proxy/db/test_autorouter_session_rollup.py b/tests/unit/proxy/db/test_autorouter_session_rollup.py similarity index 100% rename from tests/test_litellm/proxy/db/test_autorouter_session_rollup.py rename to tests/unit/proxy/db/test_autorouter_session_rollup.py diff --git a/tests/test_litellm/proxy/db/test_budget_window_spend_writer.py b/tests/unit/proxy/db/test_budget_window_spend_writer.py similarity index 100% rename from tests/test_litellm/proxy/db/test_budget_window_spend_writer.py rename to tests/unit/proxy/db/test_budget_window_spend_writer.py diff --git a/tests/test_litellm/proxy/db/test_check_migration.py b/tests/unit/proxy/db/test_check_migration.py similarity index 100% rename from tests/test_litellm/proxy/db/test_check_migration.py rename to tests/unit/proxy/db/test_check_migration.py diff --git a/tests/test_litellm/proxy/db/test_create_views.py b/tests/unit/proxy/db/test_create_views.py similarity index 100% rename from tests/test_litellm/proxy/db/test_create_views.py rename to tests/unit/proxy/db/test_create_views.py diff --git a/tests/test_litellm/proxy/db/test_daily_spend_bulk_upsert.py b/tests/unit/proxy/db/test_daily_spend_bulk_upsert.py similarity index 100% rename from tests/test_litellm/proxy/db/test_daily_spend_bulk_upsert.py rename to tests/unit/proxy/db/test_daily_spend_bulk_upsert.py diff --git a/tests/test_litellm/proxy/db/test_db_lookup_gate.py b/tests/unit/proxy/db/test_db_lookup_gate.py similarity index 100% rename from tests/test_litellm/proxy/db/test_db_lookup_gate.py rename to tests/unit/proxy/db/test_db_lookup_gate.py diff --git a/tests/test_litellm/proxy/db/test_db_spend_update_writer.py b/tests/unit/proxy/db/test_db_spend_update_writer.py similarity index 100% rename from tests/test_litellm/proxy/db/test_db_spend_update_writer.py rename to tests/unit/proxy/db/test_db_spend_update_writer.py diff --git a/tests/test_litellm/proxy/db/test_db_url_settings.py b/tests/unit/proxy/db/test_db_url_settings.py similarity index 100% rename from tests/test_litellm/proxy/db/test_db_url_settings.py rename to tests/unit/proxy/db/test_db_url_settings.py diff --git a/tests/test_litellm/proxy/db/test_exception_handler.py b/tests/unit/proxy/db/test_exception_handler.py similarity index 100% rename from tests/test_litellm/proxy/db/test_exception_handler.py rename to tests/unit/proxy/db/test_exception_handler.py diff --git a/tests/test_litellm/proxy/db/test_exception_handler_reconnect_retry.py b/tests/unit/proxy/db/test_exception_handler_reconnect_retry.py similarity index 100% rename from tests/test_litellm/proxy/db/test_exception_handler_reconnect_retry.py rename to tests/unit/proxy/db/test_exception_handler_reconnect_retry.py diff --git a/tests/test_litellm/proxy/db/test_gateway_request_tracking.py b/tests/unit/proxy/db/test_gateway_request_tracking.py similarity index 100% rename from tests/test_litellm/proxy/db/test_gateway_request_tracking.py rename to tests/unit/proxy/db/test_gateway_request_tracking.py diff --git a/tests/test_litellm/proxy/db/test_health_check_latest.py b/tests/unit/proxy/db/test_health_check_latest.py similarity index 100% rename from tests/test_litellm/proxy/db/test_health_check_latest.py rename to tests/unit/proxy/db/test_health_check_latest.py diff --git a/tests/test_litellm/proxy/db/test_master_key_migration.py b/tests/unit/proxy/db/test_master_key_migration.py similarity index 100% rename from tests/test_litellm/proxy/db/test_master_key_migration.py rename to tests/unit/proxy/db/test_master_key_migration.py diff --git a/tests/test_litellm/proxy/db/test_model_access_group_spend.py b/tests/unit/proxy/db/test_model_access_group_spend.py similarity index 100% rename from tests/test_litellm/proxy/db/test_model_access_group_spend.py rename to tests/unit/proxy/db/test_model_access_group_spend.py diff --git a/tests/test_litellm/proxy/db/test_model_insights_tasks.py b/tests/unit/proxy/db/test_model_insights_tasks.py similarity index 100% rename from tests/test_litellm/proxy/db/test_model_insights_tasks.py rename to tests/unit/proxy/db/test_model_insights_tasks.py diff --git a/tests/test_litellm/proxy/db/test_model_usage_rollup.py b/tests/unit/proxy/db/test_model_usage_rollup.py similarity index 100% rename from tests/test_litellm/proxy/db/test_model_usage_rollup.py rename to tests/unit/proxy/db/test_model_usage_rollup.py diff --git a/tests/test_litellm/proxy/db/test_pgbouncer.py b/tests/unit/proxy/db/test_pgbouncer.py similarity index 100% rename from tests/test_litellm/proxy/db/test_pgbouncer.py rename to tests/unit/proxy/db/test_pgbouncer.py diff --git a/tests/test_litellm/proxy/db/test_prisma_client.py b/tests/unit/proxy/db/test_prisma_client.py similarity index 100% rename from tests/test_litellm/proxy/db/test_prisma_client.py rename to tests/unit/proxy/db/test_prisma_client.py diff --git a/tests/test_litellm/proxy/db/test_prisma_planned_engine_restart.py b/tests/unit/proxy/db/test_prisma_planned_engine_restart.py similarity index 100% rename from tests/test_litellm/proxy/db/test_prisma_planned_engine_restart.py rename to tests/unit/proxy/db/test_prisma_planned_engine_restart.py diff --git a/tests/test_litellm/proxy/db/test_prisma_self_heal.py b/tests/unit/proxy/db/test_prisma_self_heal.py similarity index 100% rename from tests/test_litellm/proxy/db/test_prisma_self_heal.py rename to tests/unit/proxy/db/test_prisma_self_heal.py diff --git a/tests/test_litellm/proxy/db/test_proxy_worker_heartbeat.py b/tests/unit/proxy/db/test_proxy_worker_heartbeat.py similarity index 100% rename from tests/test_litellm/proxy/db/test_proxy_worker_heartbeat.py rename to tests/unit/proxy/db/test_proxy_worker_heartbeat.py diff --git a/tests/test_litellm/proxy/db/test_query_engine_reaper.py b/tests/unit/proxy/db/test_query_engine_reaper.py similarity index 100% rename from tests/test_litellm/proxy/db/test_query_engine_reaper.py rename to tests/unit/proxy/db/test_query_engine_reaper.py diff --git a/tests/test_litellm/proxy/db/test_rds_iam_token_expiry.py b/tests/unit/proxy/db/test_rds_iam_token_expiry.py similarity index 99% rename from tests/test_litellm/proxy/db/test_rds_iam_token_expiry.py rename to tests/unit/proxy/db/test_rds_iam_token_expiry.py index ca24f856022..5e2356dedea 100644 --- a/tests/test_litellm/proxy/db/test_rds_iam_token_expiry.py +++ b/tests/unit/proxy/db/test_rds_iam_token_expiry.py @@ -10,7 +10,7 @@ The fix implements: 4. Fixed __getattr__ fallback that now waits for reconnection Run these tests: - uv run pytest tests/test_litellm/proxy/db/test_rds_iam_token_expiry.py -v -s + uv run pytest tests/unit/proxy/db/test_rds_iam_token_expiry.py -v -s """ import asyncio diff --git a/tests/test_litellm/proxy/db/test_replica_identity.py b/tests/unit/proxy/db/test_replica_identity.py similarity index 100% rename from tests/test_litellm/proxy/db/test_replica_identity.py rename to tests/unit/proxy/db/test_replica_identity.py diff --git a/tests/test_litellm/proxy/db/test_routing_prisma_wrapper.py b/tests/unit/proxy/db/test_routing_prisma_wrapper.py similarity index 100% rename from tests/test_litellm/proxy/db/test_routing_prisma_wrapper.py rename to tests/unit/proxy/db/test_routing_prisma_wrapper.py diff --git a/tests/test_litellm/proxy/db/test_shadow_eval_funnel.py b/tests/unit/proxy/db/test_shadow_eval_funnel.py similarity index 100% rename from tests/test_litellm/proxy/db/test_shadow_eval_funnel.py rename to tests/unit/proxy/db/test_shadow_eval_funnel.py diff --git a/tests/test_litellm/proxy/db/test_spend_counter_reseed.py b/tests/unit/proxy/db/test_spend_counter_reseed.py similarity index 100% rename from tests/test_litellm/proxy/db/test_spend_counter_reseed.py rename to tests/unit/proxy/db/test_spend_counter_reseed.py diff --git a/tests/test_litellm/proxy/db/test_spend_log_batching.py b/tests/unit/proxy/db/test_spend_log_batching.py similarity index 100% rename from tests/test_litellm/proxy/db/test_spend_log_batching.py rename to tests/unit/proxy/db/test_spend_log_batching.py diff --git a/tests/test_litellm/proxy/db/test_spend_log_tool_index.py b/tests/unit/proxy/db/test_spend_log_tool_index.py similarity index 100% rename from tests/test_litellm/proxy/db/test_spend_log_tool_index.py rename to tests/unit/proxy/db/test_spend_log_tool_index.py diff --git a/tests/test_litellm/proxy/db/test_token_auth.py b/tests/unit/proxy/db/test_token_auth.py similarity index 100% rename from tests/test_litellm/proxy/db/test_token_auth.py rename to tests/unit/proxy/db/test_token_auth.py diff --git a/tests/test_litellm/proxy/db/test_tool_registry_writer.py b/tests/unit/proxy/db/test_tool_registry_writer.py similarity index 100% rename from tests/test_litellm/proxy/db/test_tool_registry_writer.py rename to tests/unit/proxy/db/test_tool_registry_writer.py diff --git a/tests/unit/proxy/enterprise_billing/__init__.py b/tests/unit/proxy/enterprise_billing/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/enterprise_billing/test_billing_metrics.py b/tests/unit/proxy/enterprise_billing/test_billing_metrics.py similarity index 100% rename from tests/test_litellm/proxy/enterprise_billing/test_billing_metrics.py rename to tests/unit/proxy/enterprise_billing/test_billing_metrics.py diff --git a/tests/unit/proxy/experimental/__init__.py b/tests/unit/proxy/experimental/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/unit/proxy/experimental/mcp_server/__init__.py b/tests/unit/proxy/experimental/mcp_server/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/experimental/mcp_server/test_tool_registry.py b/tests/unit/proxy/experimental/mcp_server/test_tool_registry.py similarity index 95% rename from tests/test_litellm/proxy/experimental/mcp_server/test_tool_registry.py rename to tests/unit/proxy/experimental/mcp_server/test_tool_registry.py index 9fc2e8744c1..c7df359aae2 100644 --- a/tests/test_litellm/proxy/experimental/mcp_server/test_tool_registry.py +++ b/tests/unit/proxy/experimental/mcp_server/test_tool_registry.py @@ -59,7 +59,7 @@ def test_load_tools_from_config(): "name": "config_tool", "description": "A tool from config", "input_schema": {"type": "object"}, - "handler": "test_tool_registry.example_handler", + "handler": "tests.unit.proxy.experimental.mcp_server.test_tool_registry.example_handler", } ] diff --git a/tests/unit/proxy/health_endpoints/test_health_endpoints.py b/tests/unit/proxy/health_endpoints/test_health_endpoints.py index 3ec5176159d..f40c33b1e91 100644 --- a/tests/unit/proxy/health_endpoints/test_health_endpoints.py +++ b/tests/unit/proxy/health_endpoints/test_health_endpoints.py @@ -35,7 +35,7 @@ from litellm.proxy.health_endpoints._health_endpoints import ( ) # Import shared proxy test helpers from conftest -from tests.test_litellm.proxy.conftest import create_proxy_test_client +from tests.unit.proxy.conftest import create_proxy_test_client @pytest.mark.asyncio diff --git a/tests/unit/proxy/logging_endpoints/__init__.py b/tests/unit/proxy/logging_endpoints/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/logging_endpoints/test_callback_logs_endpoints.py b/tests/unit/proxy/logging_endpoints/test_callback_logs_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/logging_endpoints/test_callback_logs_endpoints.py rename to tests/unit/proxy/logging_endpoints/test_callback_logs_endpoints.py diff --git a/tests/test_litellm/proxy/middleware/test_admission_control_middleware.py b/tests/unit/proxy/middleware/test_admission_control_middleware.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_admission_control_middleware.py rename to tests/unit/proxy/middleware/test_admission_control_middleware.py diff --git a/tests/test_litellm/proxy/middleware/test_billable_request_metrics_middleware.py b/tests/unit/proxy/middleware/test_billable_request_metrics_middleware.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_billable_request_metrics_middleware.py rename to tests/unit/proxy/middleware/test_billable_request_metrics_middleware.py diff --git a/tests/test_litellm/proxy/middleware/test_budget_reservation_release_middleware.py b/tests/unit/proxy/middleware/test_budget_reservation_release_middleware.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_budget_reservation_release_middleware.py rename to tests/unit/proxy/middleware/test_budget_reservation_release_middleware.py diff --git a/tests/test_litellm/proxy/middleware/test_in_flight_requests_middleware.py b/tests/unit/proxy/middleware/test_in_flight_requests_middleware.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_in_flight_requests_middleware.py rename to tests/unit/proxy/middleware/test_in_flight_requests_middleware.py diff --git a/tests/test_litellm/proxy/middleware/test_per_request_root_path_middleware.py b/tests/unit/proxy/middleware/test_per_request_root_path_middleware.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_per_request_root_path_middleware.py rename to tests/unit/proxy/middleware/test_per_request_root_path_middleware.py diff --git a/tests/test_litellm/proxy/middleware/test_prometheus_auth_middleware.py b/tests/unit/proxy/middleware/test_prometheus_auth_middleware.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_prometheus_auth_middleware.py rename to tests/unit/proxy/middleware/test_prometheus_auth_middleware.py diff --git a/tests/test_litellm/proxy/middleware/test_prometheus_auth_middleware_asgi.py b/tests/unit/proxy/middleware/test_prometheus_auth_middleware_asgi.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_prometheus_auth_middleware_asgi.py rename to tests/unit/proxy/middleware/test_prometheus_auth_middleware_asgi.py diff --git a/tests/test_litellm/proxy/middleware/test_security_headers_middleware.py b/tests/unit/proxy/middleware/test_security_headers_middleware.py similarity index 100% rename from tests/test_litellm/proxy/middleware/test_security_headers_middleware.py rename to tests/unit/proxy/middleware/test_security_headers_middleware.py diff --git a/tests/unit/proxy/pass_through_endpoints/__init__.py b/tests/unit/proxy/pass_through_endpoints/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/__init__.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_azure_speech_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_azure_speech_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_azure_speech_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_azure_speech_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_batch_attribution.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_batch_attribution.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_batch_attribution.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_batch_attribution.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_cohere_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_cohere_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_cohere_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_cohere_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_comprehend_medical_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_comprehend_medical_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_comprehend_medical_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_comprehend_medical_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_cursor_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_cursor_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_cursor_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_cursor_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_deepgram_listen_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_deepgram_listen_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_deepgram_listen_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_deepgram_listen_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_fal_ai_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_fal_ai_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_fal_ai_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_fal_ai_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_gemini_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_gemini_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_gemini_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_gemini_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_openai_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_openai_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_openai_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_openai_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_tinyfish_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_tinyfish_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_tinyfish_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_tinyfish_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_transcribe_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_transcribe_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_transcribe_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_transcribe_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_typesafe_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_typesafe_passthrough_logging_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/llm_provider_handlers/test_typesafe_passthrough_logging_handler.py rename to tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_typesafe_passthrough_logging_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_carry_guardrail_logging_info.py b/tests/unit/proxy/pass_through_endpoints/test_carry_guardrail_logging_info.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_carry_guardrail_logging_info.py rename to tests/unit/proxy/pass_through_endpoints/test_carry_guardrail_logging_info.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_deepgram_ws_passthrough_routes.py b/tests/unit/proxy/pass_through_endpoints/test_deepgram_ws_passthrough_routes.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_deepgram_ws_passthrough_routes.py rename to tests/unit/proxy/pass_through_endpoints/test_deepgram_ws_passthrough_routes.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py b/tests/unit/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py rename to tests/unit/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_managed_id_rewriter.py b/tests/unit/proxy/pass_through_endpoints/test_managed_id_rewriter.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_managed_id_rewriter.py rename to tests/unit/proxy/pass_through_endpoints/test_managed_id_rewriter.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_method_specific_routing.py b/tests/unit/proxy/pass_through_endpoints/test_method_specific_routing.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_method_specific_routing.py rename to tests/unit/proxy/pass_through_endpoints/test_method_specific_routing.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_auth_default.py b/tests/unit/proxy/pass_through_endpoints/test_passthrough_auth_default.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_auth_default.py rename to tests/unit/proxy/pass_through_endpoints/test_passthrough_auth_default.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_endpoint_router.py b/tests/unit/proxy/pass_through_endpoints/test_passthrough_endpoint_router.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_endpoint_router.py rename to tests/unit/proxy/pass_through_endpoints/test_passthrough_endpoint_router.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_endpoints_common_utils.py b/tests/unit/proxy/pass_through_endpoints/test_passthrough_endpoints_common_utils.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_endpoints_common_utils.py rename to tests/unit/proxy/pass_through_endpoints/test_passthrough_endpoints_common_utils.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_guardrail_block_otel_span.py b/tests/unit/proxy/pass_through_endpoints/test_passthrough_guardrail_block_otel_span.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_guardrail_block_otel_span.py rename to tests/unit/proxy/pass_through_endpoints/test_passthrough_guardrail_block_otel_span.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_guardrails.py b/tests/unit/proxy/pass_through_endpoints/test_passthrough_guardrails.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_guardrails.py rename to tests/unit/proxy/pass_through_endpoints/test_passthrough_guardrails.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_guardrails_field_targeting.py b/tests/unit/proxy/pass_through_endpoints/test_passthrough_guardrails_field_targeting.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_guardrails_field_targeting.py rename to tests/unit/proxy/pass_through_endpoints/test_passthrough_guardrails_field_targeting.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_post_call_guardrails.py b/tests/unit/proxy/pass_through_endpoints/test_passthrough_post_call_guardrails.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_passthrough_post_call_guardrails.py rename to tests/unit/proxy/pass_through_endpoints/test_passthrough_post_call_guardrails.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_streaming_handler.py b/tests/unit/proxy/pass_through_endpoints/test_streaming_handler.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_streaming_handler.py rename to tests/unit/proxy/pass_through_endpoints/test_streaming_handler.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py b/tests/unit/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py rename to tests/unit/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_upstream_usage_headers.py b/tests/unit/proxy/pass_through_endpoints/test_upstream_usage_headers.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_upstream_usage_headers.py rename to tests/unit/proxy/pass_through_endpoints/test_upstream_usage_headers.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py b/tests/unit/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py rename to tests/unit/proxy/pass_through_endpoints/test_vertex_ai_batch_passthrough.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_vertex_passthrough_load_balancing.py b/tests/unit/proxy/pass_through_endpoints/test_vertex_passthrough_load_balancing.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_vertex_passthrough_load_balancing.py rename to tests/unit/proxy/pass_through_endpoints/test_vertex_passthrough_load_balancing.py diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_watsonx_proxy_route.py b/tests/unit/proxy/pass_through_endpoints/test_watsonx_proxy_route.py similarity index 100% rename from tests/test_litellm/proxy/pass_through_endpoints/test_watsonx_proxy_route.py rename to tests/unit/proxy/pass_through_endpoints/test_watsonx_proxy_route.py diff --git a/tests/test_litellm/proxy/proxy_server/.coverage_baseline b/tests/unit/proxy/proxy_server/.coverage_baseline similarity index 100% rename from tests/test_litellm/proxy/proxy_server/.coverage_baseline rename to tests/unit/proxy/proxy_server/.coverage_baseline diff --git a/tests/unit/proxy/proxy_server/__init__.py b/tests/unit/proxy/proxy_server/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/proxy_server/_coverage_check.py b/tests/unit/proxy/proxy_server/_coverage_check.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/_coverage_check.py rename to tests/unit/proxy/proxy_server/_coverage_check.py diff --git a/tests/test_litellm/proxy/proxy_server/_pin_check.py b/tests/unit/proxy/proxy_server/_pin_check.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/_pin_check.py rename to tests/unit/proxy/proxy_server/_pin_check.py diff --git a/tests/test_litellm/proxy/proxy_server/conftest.py b/tests/unit/proxy/proxy_server/conftest.py similarity index 99% rename from tests/test_litellm/proxy/proxy_server/conftest.py rename to tests/unit/proxy/proxy_server/conftest.py index ae1b42363ef..0d7ec4812ce 100644 --- a/tests/test_litellm/proxy/proxy_server/conftest.py +++ b/tests/unit/proxy/proxy_server/conftest.py @@ -1,4 +1,4 @@ -"""Shared fixtures for tests/test_litellm/proxy/proxy_server/. +"""Shared fixtures for tests/unit/proxy/proxy_server/. All fixtures and helpers used by PR1/PR2/PR3 test files live here. Do NOT add fixtures inside individual test files. If a fixture is missing, add it diff --git a/tests/test_litellm/proxy/proxy_server/test_background_health.py b/tests/unit/proxy/proxy_server/test_background_health.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_background_health.py rename to tests/unit/proxy/proxy_server/test_background_health.py diff --git a/tests/test_litellm/proxy/proxy_server/test_exception_handlers.py b/tests/unit/proxy/proxy_server/test_exception_handlers.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_exception_handlers.py rename to tests/unit/proxy/proxy_server/test_exception_handlers.py diff --git a/tests/test_litellm/proxy/proxy_server/test_harness_smoke.py b/tests/unit/proxy/proxy_server/test_harness_smoke.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_harness_smoke.py rename to tests/unit/proxy/proxy_server/test_harness_smoke.py diff --git a/tests/test_litellm/proxy/proxy_server/test_lifecycle.py b/tests/unit/proxy/proxy_server/test_lifecycle.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_lifecycle.py rename to tests/unit/proxy/proxy_server/test_lifecycle.py diff --git a/tests/test_litellm/proxy/proxy_server/test_openapi_customization.py b/tests/unit/proxy/proxy_server/test_openapi_customization.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_openapi_customization.py rename to tests/unit/proxy/proxy_server/test_openapi_customization.py diff --git a/tests/test_litellm/proxy/proxy_server/test_proxy_config.py b/tests/unit/proxy/proxy_server/test_proxy_config.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_proxy_config.py rename to tests/unit/proxy/proxy_server/test_proxy_config.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_anthropic_beta.py b/tests/unit/proxy/proxy_server/test_routes_anthropic_beta.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_anthropic_beta.py rename to tests/unit/proxy/proxy_server/test_routes_anthropic_beta.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_assistants.py b/tests/unit/proxy/proxy_server/test_routes_assistants.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_assistants.py rename to tests/unit/proxy/proxy_server/test_routes_assistants.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_audio.py b/tests/unit/proxy/proxy_server/test_routes_audio.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_audio.py rename to tests/unit/proxy/proxy_server/test_routes_audio.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_chat_completions.py b/tests/unit/proxy/proxy_server/test_routes_chat_completions.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_chat_completions.py rename to tests/unit/proxy/proxy_server/test_routes_chat_completions.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_completions.py b/tests/unit/proxy/proxy_server/test_routes_completions.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_completions.py rename to tests/unit/proxy/proxy_server/test_routes_completions.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_config.py b/tests/unit/proxy/proxy_server/test_routes_config.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_config.py rename to tests/unit/proxy/proxy_server/test_routes_config.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_embeddings.py b/tests/unit/proxy/proxy_server/test_routes_embeddings.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_embeddings.py rename to tests/unit/proxy/proxy_server/test_routes_embeddings.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_invitation.py b/tests/unit/proxy/proxy_server/test_routes_invitation.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_invitation.py rename to tests/unit/proxy/proxy_server/test_routes_invitation.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_login_sso.py b/tests/unit/proxy/proxy_server/test_routes_login_sso.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_login_sso.py rename to tests/unit/proxy/proxy_server/test_routes_login_sso.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_misc.py b/tests/unit/proxy/proxy_server/test_routes_misc.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_misc.py rename to tests/unit/proxy/proxy_server/test_routes_misc.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_model_cost_map.py b/tests/unit/proxy/proxy_server/test_routes_model_cost_map.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_model_cost_map.py rename to tests/unit/proxy/proxy_server/test_routes_model_cost_map.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_model_info.py b/tests/unit/proxy/proxy_server/test_routes_model_info.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_model_info.py rename to tests/unit/proxy/proxy_server/test_routes_model_info.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_model_metrics.py b/tests/unit/proxy/proxy_server/test_routes_model_metrics.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_model_metrics.py rename to tests/unit/proxy/proxy_server/test_routes_model_metrics.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_models.py b/tests/unit/proxy/proxy_server/test_routes_models.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_models.py rename to tests/unit/proxy/proxy_server/test_routes_models.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_moderations.py b/tests/unit/proxy/proxy_server/test_routes_moderations.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_moderations.py rename to tests/unit/proxy/proxy_server/test_routes_moderations.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_onboarding.py b/tests/unit/proxy/proxy_server/test_routes_onboarding.py similarity index 95% rename from tests/test_litellm/proxy/proxy_server/test_routes_onboarding.py rename to tests/unit/proxy/proxy_server/test_routes_onboarding.py index 6c1d869d113..f96e2d1e367 100644 --- a/tests/test_litellm/proxy/proxy_server/test_routes_onboarding.py +++ b/tests/unit/proxy/proxy_server/test_routes_onboarding.py @@ -8,11 +8,14 @@ Routes covered: from __future__ import annotations from datetime import datetime, timedelta, timezone +import hashlib from types import SimpleNamespace from unittest.mock import AsyncMock, MagicMock +import httpx import jwt import pytest +import respx from .conftest import normalize @@ -202,7 +205,17 @@ def _make_onboarding_jwt( ) -def test_claim_onboarding_link_happy(client, monkeypatch, mock_prisma): +def _hibp_url_for(password: str) -> str: + sha1 = hashlib.sha1(password.encode("utf-8"), usedforsecurity=False).hexdigest().upper() + return f"https://api.pwnedpasswords.com/range/{sha1[:5]}" + + +def _hibp_suffix_for(password: str) -> str: + return hashlib.sha1(password.encode("utf-8"), usedforsecurity=False).hexdigest().upper()[5:] + + +@respx.mock +def test_claim_onboarding_link_happy(client, monkeypatch, mock_prisma, httpx_transport): """Valid claim → returns login_url, token, user_email, user.""" from litellm.proxy import proxy_server as ps @@ -228,13 +241,18 @@ def test_claim_onboarding_link_happy(client, monkeypatch, mock_prisma): ps, "_generate_onboarding_ui_session_token", _fake_session_token ) + password = "Hunter2Strong!" + respx.get(_hibp_url_for(password)).mock( + return_value=httpx.Response(200, text=f"{_hibp_suffix_for('unrelated-password')}:9") + ) + onboarding_jwt = _make_onboarding_jwt("sk-master-test") response = client.post( "/onboarding/claim_token", json={ "invitation_link": "inv-123", "user_id": "user-abc", - "password": "Hunter2Strong!", + "password": password, }, headers={"Authorization": f"Bearer {onboarding_jwt}"}, ) diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_queue.py b/tests/unit/proxy/proxy_server/test_routes_queue.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_queue.py rename to tests/unit/proxy/proxy_server/test_routes_queue.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_threads.py b/tests/unit/proxy/proxy_server/test_routes_threads.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_routes_threads.py rename to tests/unit/proxy/proxy_server/test_routes_threads.py diff --git a/tests/test_litellm/proxy/proxy_server/test_routes_utils.py b/tests/unit/proxy/proxy_server/test_routes_utils.py similarity index 98% rename from tests/test_litellm/proxy/proxy_server/test_routes_utils.py rename to tests/unit/proxy/proxy_server/test_routes_utils.py index 6cd613197ee..91329d122ee 100644 --- a/tests/test_litellm/proxy/proxy_server/test_routes_utils.py +++ b/tests/unit/proxy/proxy_server/test_routes_utils.py @@ -12,7 +12,9 @@ from __future__ import annotations import asyncio import json +import httpx import pytest +import respx import litellm from litellm.litellm_core_utils import get_llm_provider_logic @@ -282,10 +284,16 @@ def test_model_info_lookup_unknown_model_returns_404(client, auth_as, monkeypatc assert "is not in the model cost map" in response.text -def test_model_info_lookup_returns_404_when_typed_info_has_no_cost_map_entry(client, auth_as, monkeypatch): +@respx.mock +def test_model_info_lookup_returns_404_when_typed_info_has_no_cost_map_entry( + client, auth_as, monkeypatch, local_model_cost_map +): """``get_model_info`` synthesizes info for huggingface fallbacks absent from ``model_cost``; with no raw entry the route must 404 rather than answer 200 with typed fields only.""" monkeypatch.setattr(proxy_server, "llm_router", None) + respx.get("https://huggingface.co/not-in-map-org/not-in-map-model/raw/main/config.json").mock( + return_value=httpx.Response(404) + ) with auth_as(): response = client.get("/utils/model_info", params={"model": "huggingface/not-in-map-org/not-in-map-model"}) assert response.status_code == 404, response.text diff --git a/tests/test_litellm/proxy/proxy_server/test_spend_counters.py b/tests/unit/proxy/proxy_server/test_spend_counters.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_spend_counters.py rename to tests/unit/proxy/proxy_server/test_spend_counters.py diff --git a/tests/test_litellm/proxy/proxy_server/test_streaming_helpers.py b/tests/unit/proxy/proxy_server/test_streaming_helpers.py similarity index 100% rename from tests/test_litellm/proxy/proxy_server/test_streaming_helpers.py rename to tests/unit/proxy/proxy_server/test_streaming_helpers.py diff --git a/tests/test_litellm/proxy/proxy_server/test_team_model_name_translation.py b/tests/unit/proxy/proxy_server/test_team_model_name_translation.py similarity index 99% rename from tests/test_litellm/proxy/proxy_server/test_team_model_name_translation.py rename to tests/unit/proxy/proxy_server/test_team_model_name_translation.py index baa032f75e6..b848c4f1976 100644 --- a/tests/test_litellm/proxy/proxy_server/test_team_model_name_translation.py +++ b/tests/unit/proxy/proxy_server/test_team_model_name_translation.py @@ -1,6 +1,6 @@ """Coverage for team-scoped model-name translation in /model/info responses. -These live in tests/test_litellm/proxy/proxy_server/ (not the top-level +These live in tests/unit/proxy/proxy_server/ (not the top-level test_proxy_server.py) because the CI coverage job collects this directory. They exercise the read-path fix for issue #28382: `/v1`, `/v2`, and `/model/info` must surface `model_info.team_public_model_name` for team-scoped diff --git a/tests/test_litellm/proxy/spend_tracking/test_baseline_accounting.py b/tests/unit/proxy/spend_tracking/test_baseline_accounting.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_baseline_accounting.py rename to tests/unit/proxy/spend_tracking/test_baseline_accounting.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_budget_reservation.py b/tests/unit/proxy/spend_tracking/test_budget_reservation.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_budget_reservation.py rename to tests/unit/proxy/spend_tracking/test_budget_reservation.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_budget_reservation_redis_failure.py b/tests/unit/proxy/spend_tracking/test_budget_reservation_redis_failure.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_budget_reservation_redis_failure.py rename to tests/unit/proxy/spend_tracking/test_budget_reservation_redis_failure.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_carried_budget_state.py b/tests/unit/proxy/spend_tracking/test_carried_budget_state.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_carried_budget_state.py rename to tests/unit/proxy/spend_tracking/test_carried_budget_state.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_cloudzero_endpoints.py b/tests/unit/proxy/spend_tracking/test_cloudzero_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_cloudzero_endpoints.py rename to tests/unit/proxy/spend_tracking/test_cloudzero_endpoints.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_compression_savings.py b/tests/unit/proxy/spend_tracking/test_compression_savings.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_compression_savings.py rename to tests/unit/proxy/spend_tracking/test_compression_savings.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_input_tokens.py b/tests/unit/proxy/spend_tracking/test_input_tokens.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_input_tokens.py rename to tests/unit/proxy/spend_tracking/test_input_tokens.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_key_metadata_recovery.py b/tests/unit/proxy/spend_tracking/test_key_metadata_recovery.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_key_metadata_recovery.py rename to tests/unit/proxy/spend_tracking/test_key_metadata_recovery.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_ptu_feature_flag.py b/tests/unit/proxy/spend_tracking/test_ptu_feature_flag.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_ptu_feature_flag.py rename to tests/unit/proxy/spend_tracking/test_ptu_feature_flag.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_ptu_flat_cost_rollup.py b/tests/unit/proxy/spend_tracking/test_ptu_flat_cost_rollup.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_ptu_flat_cost_rollup.py rename to tests/unit/proxy/spend_tracking/test_ptu_flat_cost_rollup.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_savings.py b/tests/unit/proxy/spend_tracking/test_savings.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_savings.py rename to tests/unit/proxy/spend_tracking/test_savings.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_capture_rate.py b/tests/unit/proxy/spend_tracking/test_spend_capture_rate.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_capture_rate.py rename to tests/unit/proxy/spend_tracking/test_spend_capture_rate.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_counter_batch.py b/tests/unit/proxy/spend_tracking/test_spend_counter_batch.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_counter_batch.py rename to tests/unit/proxy/spend_tracking/test_spend_counter_batch.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_event.py b/tests/unit/proxy/spend_tracking/test_spend_event.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_event.py rename to tests/unit/proxy/spend_tracking/test_spend_event.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_event_producer.py b/tests/unit/proxy/spend_tracking/test_spend_event_producer.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_event_producer.py rename to tests/unit/proxy/spend_tracking/test_spend_event_producer.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_log_error_logger.py b/tests/unit/proxy/spend_tracking/test_spend_log_error_logger.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_log_error_logger.py rename to tests/unit/proxy/spend_tracking/test_spend_log_error_logger.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_management_endpoints.py b/tests/unit/proxy/spend_tracking/test_spend_management_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_management_endpoints.py rename to tests/unit/proxy/spend_tracking/test_spend_management_endpoints.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_query_optimization.py b/tests/unit/proxy/spend_tracking/test_spend_query_optimization.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_query_optimization.py rename to tests/unit/proxy/spend_tracking/test_spend_query_optimization.py diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_tracking_utils.py b/tests/unit/proxy/spend_tracking/test_spend_tracking_utils.py similarity index 100% rename from tests/test_litellm/proxy/spend_tracking/test_spend_tracking_utils.py rename to tests/unit/proxy/spend_tracking/test_spend_tracking_utils.py diff --git a/tests/test_litellm/proxy/test__types.py b/tests/unit/proxy/test__types.py similarity index 100% rename from tests/test_litellm/proxy/test__types.py rename to tests/unit/proxy/test__types.py diff --git a/tests/test_litellm/proxy/test_aiohttp_cleanup_closed.py b/tests/unit/proxy/test_aiohttp_cleanup_closed.py similarity index 100% rename from tests/test_litellm/proxy/test_aiohttp_cleanup_closed.py rename to tests/unit/proxy/test_aiohttp_cleanup_closed.py diff --git a/tests/test_litellm/proxy/test_aiohttp_session_recovery.py b/tests/unit/proxy/test_aiohttp_session_recovery.py similarity index 100% rename from tests/test_litellm/proxy/test_aiohttp_session_recovery.py rename to tests/unit/proxy/test_aiohttp_session_recovery.py diff --git a/tests/test_litellm/proxy/test_api_key_masking_in_errors.py b/tests/unit/proxy/test_api_key_masking_in_errors.py similarity index 100% rename from tests/test_litellm/proxy/test_api_key_masking_in_errors.py rename to tests/unit/proxy/test_api_key_masking_in_errors.py diff --git a/tests/test_litellm/proxy/test_audio_speech_prometheus_hooks.py b/tests/unit/proxy/test_audio_speech_prometheus_hooks.py similarity index 99% rename from tests/test_litellm/proxy/test_audio_speech_prometheus_hooks.py rename to tests/unit/proxy/test_audio_speech_prometheus_hooks.py index 959cb2b1e89..01650e7a77d 100644 --- a/tests/test_litellm/proxy/test_audio_speech_prometheus_hooks.py +++ b/tests/unit/proxy/test_audio_speech_prometheus_hooks.py @@ -44,7 +44,7 @@ def client_no_auth(): cleanup_router_config_variables() filepath = os.path.dirname(os.path.abspath(__file__)) - config_fp = os.path.join(filepath, "test_configs", "test_config_no_auth.yaml") + config_fp = os.path.join(filepath, "test_configs", "test_config_hosted_vllm_embedding.yaml") asyncio.run(initialize(config=config_fp, debug=True)) return TestClient(app) diff --git a/tests/test_litellm/proxy/test_batch_expiry.py b/tests/unit/proxy/test_batch_expiry.py similarity index 100% rename from tests/test_litellm/proxy/test_batch_expiry.py rename to tests/unit/proxy/test_batch_expiry.py diff --git a/tests/test_litellm/proxy/test_batch_metadata_none_fix.py b/tests/unit/proxy/test_batch_metadata_none_fix.py similarity index 100% rename from tests/test_litellm/proxy/test_batch_metadata_none_fix.py rename to tests/unit/proxy/test_batch_metadata_none_fix.py diff --git a/tests/test_litellm/proxy/test_batch_retrieve_bedrock.py b/tests/unit/proxy/test_batch_retrieve_bedrock.py similarity index 100% rename from tests/test_litellm/proxy/test_batch_retrieve_bedrock.py rename to tests/unit/proxy/test_batch_retrieve_bedrock.py diff --git a/tests/test_litellm/proxy/test_batch_x_litellm_model_encoding.py b/tests/unit/proxy/test_batch_x_litellm_model_encoding.py similarity index 100% rename from tests/test_litellm/proxy/test_batch_x_litellm_model_encoding.py rename to tests/unit/proxy/test_batch_x_litellm_model_encoding.py diff --git a/tests/test_litellm/proxy/test_blocked_response_usage.py b/tests/unit/proxy/test_blocked_response_usage.py similarity index 100% rename from tests/test_litellm/proxy/test_blocked_response_usage.py rename to tests/unit/proxy/test_blocked_response_usage.py diff --git a/tests/test_litellm/proxy/test_body_snapshot_callback_params.py b/tests/unit/proxy/test_body_snapshot_callback_params.py similarity index 100% rename from tests/test_litellm/proxy/test_body_snapshot_callback_params.py rename to tests/unit/proxy/test_body_snapshot_callback_params.py diff --git a/tests/test_litellm/proxy/test_budget_reservation.py b/tests/unit/proxy/test_budget_reservation.py similarity index 100% rename from tests/test_litellm/proxy/test_budget_reservation.py rename to tests/unit/proxy/test_budget_reservation.py diff --git a/tests/test_litellm/proxy/test_bug_report_config.py b/tests/unit/proxy/test_bug_report_config.py similarity index 100% rename from tests/test_litellm/proxy/test_bug_report_config.py rename to tests/unit/proxy/test_bug_report_config.py diff --git a/tests/test_litellm/proxy/test_caching_routes.py b/tests/unit/proxy/test_caching_routes.py similarity index 100% rename from tests/test_litellm/proxy/test_caching_routes.py rename to tests/unit/proxy/test_caching_routes.py diff --git a/tests/test_litellm/proxy/test_chat_completion_metadata.py b/tests/unit/proxy/test_chat_completion_metadata.py similarity index 100% rename from tests/test_litellm/proxy/test_chat_completion_metadata.py rename to tests/unit/proxy/test_chat_completion_metadata.py diff --git a/tests/test_litellm/proxy/test_claude_code_marketplace.py b/tests/unit/proxy/test_claude_code_marketplace.py similarity index 100% rename from tests/test_litellm/proxy/test_claude_code_marketplace.py rename to tests/unit/proxy/test_claude_code_marketplace.py diff --git a/tests/test_litellm/proxy/test_collector.py b/tests/unit/proxy/test_collector.py similarity index 100% rename from tests/test_litellm/proxy/test_collector.py rename to tests/unit/proxy/test_collector.py diff --git a/tests/test_litellm/proxy/test_common_request_processing.py b/tests/unit/proxy/test_common_request_processing.py similarity index 100% rename from tests/test_litellm/proxy/test_common_request_processing.py rename to tests/unit/proxy/test_common_request_processing.py diff --git a/tests/test_litellm/proxy/test_component_allowlists.py b/tests/unit/proxy/test_component_allowlists.py similarity index 100% rename from tests/test_litellm/proxy/test_component_allowlists.py rename to tests/unit/proxy/test_component_allowlists.py diff --git a/tests/test_litellm/proxy/test_configs/test_config_no_auth.yaml b/tests/unit/proxy/test_configs/test_config_hosted_vllm_embedding.yaml similarity index 100% rename from tests/test_litellm/proxy/test_configs/test_config_no_auth.yaml rename to tests/unit/proxy/test_configs/test_config_hosted_vllm_embedding.yaml diff --git a/tests/test_litellm/proxy/test_conftest.py b/tests/unit/proxy/test_conftest.py similarity index 100% rename from tests/test_litellm/proxy/test_conftest.py rename to tests/unit/proxy/test_conftest.py diff --git a/tests/test_litellm/proxy/test_cors_config.py b/tests/unit/proxy/test_cors_config.py similarity index 100% rename from tests/test_litellm/proxy/test_cors_config.py rename to tests/unit/proxy/test_cors_config.py diff --git a/tests/test_litellm/proxy/test_custom_proxy.py b/tests/unit/proxy/test_custom_proxy.py similarity index 100% rename from tests/test_litellm/proxy/test_custom_proxy.py rename to tests/unit/proxy/test_custom_proxy.py diff --git a/tests/test_litellm/proxy/test_dynamic_mcp_route.py b/tests/unit/proxy/test_dynamic_mcp_route.py similarity index 100% rename from tests/test_litellm/proxy/test_dynamic_mcp_route.py rename to tests/unit/proxy/test_dynamic_mcp_route.py diff --git a/tests/test_litellm/proxy/test_empty_model_list.py b/tests/unit/proxy/test_empty_model_list.py similarity index 100% rename from tests/test_litellm/proxy/test_empty_model_list.py rename to tests/unit/proxy/test_empty_model_list.py diff --git a/tests/test_litellm/proxy/test_enforce_user_param.py b/tests/unit/proxy/test_enforce_user_param.py similarity index 99% rename from tests/test_litellm/proxy/test_enforce_user_param.py rename to tests/unit/proxy/test_enforce_user_param.py index 1001372aeb5..cca2fbadaa9 100644 --- a/tests/test_litellm/proxy/test_enforce_user_param.py +++ b/tests/unit/proxy/test_enforce_user_param.py @@ -488,5 +488,5 @@ class TestEnforceUserParamEdgeCases: if __name__ == "__main__": - # Run tests with: pytest tests/test_litellm/proxy/test_enforce_user_param.py -v + # Run tests with: pytest tests/unit/proxy/test_enforce_user_param.py -v pytest.main([__file__, "-v"]) diff --git a/tests/test_litellm/proxy/test_fallback_management_endpoints.py b/tests/unit/proxy/test_fallback_management_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/test_fallback_management_endpoints.py rename to tests/unit/proxy/test_fallback_management_endpoints.py diff --git a/tests/test_litellm/proxy/test_fastapi_offline_routes.py b/tests/unit/proxy/test_fastapi_offline_routes.py similarity index 100% rename from tests/test_litellm/proxy/test_fastapi_offline_routes.py rename to tests/unit/proxy/test_fastapi_offline_routes.py diff --git a/tests/test_litellm/proxy/test_filter_models_by_team_access_group.py b/tests/unit/proxy/test_filter_models_by_team_access_group.py similarity index 100% rename from tests/test_litellm/proxy/test_filter_models_by_team_access_group.py rename to tests/unit/proxy/test_filter_models_by_team_access_group.py diff --git a/tests/test_litellm/proxy/test_health_check_functions.py b/tests/unit/proxy/test_health_check_functions.py similarity index 100% rename from tests/test_litellm/proxy/test_health_check_functions.py rename to tests/unit/proxy/test_health_check_functions.py diff --git a/tests/test_litellm/proxy/test_health_check_max_tokens.py b/tests/unit/proxy/test_health_check_max_tokens.py similarity index 100% rename from tests/test_litellm/proxy/test_health_check_max_tokens.py rename to tests/unit/proxy/test_health_check_max_tokens.py diff --git a/tests/test_litellm/proxy/test_init_litellm_callbacks.py b/tests/unit/proxy/test_init_litellm_callbacks.py similarity index 100% rename from tests/test_litellm/proxy/test_init_litellm_callbacks.py rename to tests/unit/proxy/test_init_litellm_callbacks.py diff --git a/tests/test_litellm/proxy/test_langfuse_passthrough_security.py b/tests/unit/proxy/test_langfuse_passthrough_security.py similarity index 100% rename from tests/test_litellm/proxy/test_langfuse_passthrough_security.py rename to tests/unit/proxy/test_langfuse_passthrough_security.py diff --git a/tests/test_litellm/proxy/test_lazy_openapi_snapshot.py b/tests/unit/proxy/test_lazy_openapi_snapshot.py similarity index 100% rename from tests/test_litellm/proxy/test_lazy_openapi_snapshot.py rename to tests/unit/proxy/test_lazy_openapi_snapshot.py diff --git a/tests/test_litellm/proxy/test_litellm_pre_call_utils.py b/tests/unit/proxy/test_litellm_pre_call_utils.py similarity index 100% rename from tests/test_litellm/proxy/test_litellm_pre_call_utils.py rename to tests/unit/proxy/test_litellm_pre_call_utils.py diff --git a/tests/test_litellm/proxy/test_max_budget_env_var.py b/tests/unit/proxy/test_max_budget_env_var.py similarity index 100% rename from tests/test_litellm/proxy/test_max_budget_env_var.py rename to tests/unit/proxy/test_max_budget_env_var.py diff --git a/tests/test_litellm/proxy/test_mcp_asgi_response.py b/tests/unit/proxy/test_mcp_asgi_response.py similarity index 100% rename from tests/test_litellm/proxy/test_mcp_asgi_response.py rename to tests/unit/proxy/test_mcp_asgi_response.py diff --git a/tests/test_litellm/proxy/test_model_based_routing_files_batches.py b/tests/unit/proxy/test_model_based_routing_files_batches.py similarity index 100% rename from tests/test_litellm/proxy/test_model_based_routing_files_batches.py rename to tests/unit/proxy/test_model_based_routing_files_batches.py diff --git a/tests/test_litellm/proxy/test_model_deprecations_endpoint.py b/tests/unit/proxy/test_model_deprecations_endpoint.py similarity index 100% rename from tests/test_litellm/proxy/test_model_deprecations_endpoint.py rename to tests/unit/proxy/test_model_deprecations_endpoint.py diff --git a/tests/test_litellm/proxy/test_model_dump_with_preserved_fields.py b/tests/unit/proxy/test_model_dump_with_preserved_fields.py similarity index 100% rename from tests/test_litellm/proxy/test_model_dump_with_preserved_fields.py rename to tests/unit/proxy/test_model_dump_with_preserved_fields.py diff --git a/tests/test_litellm/proxy/test_model_id_header_propagation.py b/tests/unit/proxy/test_model_id_header_propagation.py similarity index 100% rename from tests/test_litellm/proxy/test_model_id_header_propagation.py rename to tests/unit/proxy/test_model_id_header_propagation.py diff --git a/tests/test_litellm/proxy/test_model_info_default_limits.py b/tests/unit/proxy/test_model_info_default_limits.py similarity index 100% rename from tests/test_litellm/proxy/test_model_info_default_limits.py rename to tests/unit/proxy/test_model_info_default_limits.py diff --git a/tests/test_litellm/proxy/test_model_level_guardrails.py b/tests/unit/proxy/test_model_level_guardrails.py similarity index 100% rename from tests/test_litellm/proxy/test_model_level_guardrails.py rename to tests/unit/proxy/test_model_level_guardrails.py diff --git a/tests/test_litellm/proxy/test_model_list_aliases.py b/tests/unit/proxy/test_model_list_aliases.py similarity index 100% rename from tests/test_litellm/proxy/test_model_list_aliases.py rename to tests/unit/proxy/test_model_list_aliases.py diff --git a/tests/test_litellm/proxy/test_model_list_callback_filter.py b/tests/unit/proxy/test_model_list_callback_filter.py similarity index 100% rename from tests/test_litellm/proxy/test_model_list_callback_filter.py rename to tests/unit/proxy/test_model_list_callback_filter.py diff --git a/tests/test_litellm/proxy/test_model_list_discoverable.py b/tests/unit/proxy/test_model_list_discoverable.py similarity index 100% rename from tests/test_litellm/proxy/test_model_list_discoverable.py rename to tests/unit/proxy/test_model_list_discoverable.py diff --git a/tests/test_litellm/proxy/test_model_list_healthy_only.py b/tests/unit/proxy/test_model_list_healthy_only.py similarity index 100% rename from tests/test_litellm/proxy/test_model_list_healthy_only.py rename to tests/unit/proxy/test_model_list_healthy_only.py diff --git a/tests/test_litellm/proxy/test_modify_response_streaming_passthrough.py b/tests/unit/proxy/test_modify_response_streaming_passthrough.py similarity index 100% rename from tests/test_litellm/proxy/test_modify_response_streaming_passthrough.py rename to tests/unit/proxy/test_modify_response_streaming_passthrough.py diff --git a/tests/test_litellm/proxy/test_native_compaction.py b/tests/unit/proxy/test_native_compaction.py similarity index 100% rename from tests/test_litellm/proxy/test_native_compaction.py rename to tests/unit/proxy/test_native_compaction.py diff --git a/tests/test_litellm/proxy/test_openai_ws_passthrough_routes.py b/tests/unit/proxy/test_openai_ws_passthrough_routes.py similarity index 100% rename from tests/test_litellm/proxy/test_openai_ws_passthrough_routes.py rename to tests/unit/proxy/test_openai_ws_passthrough_routes.py diff --git a/tests/test_litellm/proxy/test_openapi_schema_validation.py b/tests/unit/proxy/test_openapi_schema_validation.py similarity index 100% rename from tests/test_litellm/proxy/test_openapi_schema_validation.py rename to tests/unit/proxy/test_openapi_schema_validation.py diff --git a/tests/test_litellm/proxy/test_plugin_routes.py b/tests/unit/proxy/test_plugin_routes.py similarity index 100% rename from tests/test_litellm/proxy/test_plugin_routes.py rename to tests/unit/proxy/test_plugin_routes.py diff --git a/tests/test_litellm/proxy/test_pointfive_dashboard_config.py b/tests/unit/proxy/test_pointfive_dashboard_config.py similarity index 100% rename from tests/test_litellm/proxy/test_pointfive_dashboard_config.py rename to tests/unit/proxy/test_pointfive_dashboard_config.py diff --git a/tests/test_litellm/proxy/test_pointfive_ui_callback.py b/tests/unit/proxy/test_pointfive_ui_callback.py similarity index 100% rename from tests/test_litellm/proxy/test_pointfive_ui_callback.py rename to tests/unit/proxy/test_pointfive_ui_callback.py diff --git a/tests/test_litellm/proxy/test_pricing_field_strip.py b/tests/unit/proxy/test_pricing_field_strip.py similarity index 100% rename from tests/test_litellm/proxy/test_pricing_field_strip.py rename to tests/unit/proxy/test_pricing_field_strip.py diff --git a/tests/test_litellm/proxy/test_prisma_engine_watchdog.py b/tests/unit/proxy/test_prisma_engine_watchdog.py similarity index 100% rename from tests/test_litellm/proxy/test_prisma_engine_watchdog.py rename to tests/unit/proxy/test_prisma_engine_watchdog.py diff --git a/tests/test_litellm/proxy/test_prisma_migration.py b/tests/unit/proxy/test_prisma_migration.py similarity index 100% rename from tests/test_litellm/proxy/test_prisma_migration.py rename to tests/unit/proxy/test_prisma_migration.py diff --git a/tests/test_litellm/proxy/test_prometheus_cleanup.py b/tests/unit/proxy/test_prometheus_cleanup.py similarity index 100% rename from tests/test_litellm/proxy/test_prometheus_cleanup.py rename to tests/unit/proxy/test_prometheus_cleanup.py diff --git a/tests/test_litellm/proxy/test_prometheus_metrics_server.py b/tests/unit/proxy/test_prometheus_metrics_server.py similarity index 100% rename from tests/test_litellm/proxy/test_prometheus_metrics_server.py rename to tests/unit/proxy/test_prometheus_metrics_server.py diff --git a/tests/test_litellm/proxy/test_provider_url_destination_guard.py b/tests/unit/proxy/test_provider_url_destination_guard.py similarity index 100% rename from tests/test_litellm/proxy/test_provider_url_destination_guard.py rename to tests/unit/proxy/test_provider_url_destination_guard.py diff --git a/tests/test_litellm/proxy/test_proxy_cli.py b/tests/unit/proxy/test_proxy_cli.py similarity index 99% rename from tests/test_litellm/proxy/test_proxy_cli.py rename to tests/unit/proxy/test_proxy_cli.py index a275dd62400..7007189aab9 100644 --- a/tests/test_litellm/proxy/test_proxy_cli.py +++ b/tests/unit/proxy/test_proxy_cli.py @@ -2575,7 +2575,7 @@ class TestWorkerStartupHooks: from litellm.proxy.proxy_server import proxy_startup_event env_overrides = { - "LITELLM_WORKER_STARTUP_HOOKS": "tests.test_litellm.proxy.test_proxy_cli:_dummy_hook", + "LITELLM_WORKER_STARTUP_HOOKS": "tests.unit.proxy.test_proxy_cli:_dummy_hook", } # Remove DATABASE_URL to avoid real DB setup clean_env = { @@ -2603,7 +2603,7 @@ class TestWorkerStartupHooks: from litellm.proxy.proxy_server import proxy_startup_event env_overrides = { - "LITELLM_WORKER_STARTUP_HOOKS": "tests.test_litellm.proxy.test_proxy_cli:_dummy_async_hook", + "LITELLM_WORKER_STARTUP_HOOKS": "tests.unit.proxy.test_proxy_cli:_dummy_async_hook", } clean_env = { k: v @@ -2627,7 +2627,7 @@ class TestWorkerStartupHooks: from litellm.proxy.proxy_server import proxy_startup_event env_overrides = { - "LITELLM_WORKER_STARTUP_HOOKS": "tests.test_litellm.proxy.test_proxy_cli:_failing_hook", + "LITELLM_WORKER_STARTUP_HOOKS": "tests.unit.proxy.test_proxy_cli:_failing_hook", } clean_env = { k: v @@ -2663,8 +2663,8 @@ class TestWorkerStartupHooks: from litellm.proxy.proxy_server import proxy_startup_event hooks = ( - "tests.test_litellm.proxy.test_proxy_cli:_dummy_hook," - "tests.test_litellm.proxy.test_proxy_cli:_dummy_async_hook" + "tests.unit.proxy.test_proxy_cli:_dummy_hook," + "tests.unit.proxy.test_proxy_cli:_dummy_async_hook" ) env_overrides = { "LITELLM_WORKER_STARTUP_HOOKS": hooks, diff --git a/tests/test_litellm/proxy/test_proxy_logging_hook_detection.py b/tests/unit/proxy/test_proxy_logging_hook_detection.py similarity index 100% rename from tests/test_litellm/proxy/test_proxy_logging_hook_detection.py rename to tests/unit/proxy/test_proxy_logging_hook_detection.py diff --git a/tests/test_litellm/proxy/test_proxy_types.py b/tests/unit/proxy/test_proxy_types.py similarity index 100% rename from tests/test_litellm/proxy/test_proxy_types.py rename to tests/unit/proxy/test_proxy_types.py diff --git a/tests/test_litellm/proxy/test_pyroscope.py b/tests/unit/proxy/test_pyroscope.py similarity index 100% rename from tests/test_litellm/proxy/test_pyroscope.py rename to tests/unit/proxy/test_pyroscope.py diff --git a/tests/test_litellm/proxy/test_read_model_list.py b/tests/unit/proxy/test_read_model_list.py similarity index 100% rename from tests/test_litellm/proxy/test_read_model_list.py rename to tests/unit/proxy/test_read_model_list.py diff --git a/tests/test_litellm/proxy/test_redis_auth_cache_flag.py b/tests/unit/proxy/test_redis_auth_cache_flag.py similarity index 98% rename from tests/test_litellm/proxy/test_redis_auth_cache_flag.py rename to tests/unit/proxy/test_redis_auth_cache_flag.py index 573bfc40c96..cb600bbb5fd 100644 --- a/tests/test_litellm/proxy/test_redis_auth_cache_flag.py +++ b/tests/unit/proxy/test_redis_auth_cache_flag.py @@ -65,6 +65,7 @@ def _patched_init_cache(litellm_settings: dict, cache_params: dict): fresh_user_cache = DualCache() fresh_spend_cache = DualCache() fresh_cli_sso_cache = DualCache() + fresh_config_cache = DualCache() enable_redis_auth_cache = litellm_settings.get("enable_redis_auth_cache", False) @@ -72,6 +73,7 @@ def _patched_init_cache(litellm_settings: dict, cache_params: dict): patch.object(ps, "user_api_key_cache", fresh_user_cache), patch.object(ps, "spend_counter_cache", fresh_spend_cache), patch.object(ps, "cli_sso_session_cache", fresh_cli_sso_cache), + patch.object(ps, "litellm_config_cache", fresh_config_cache), patch.object(ps, "llm_router", None), # Cache is locally imported inside _init_cache: patch it at source. patch("litellm.Cache", return_value=mock_litellm_cache), diff --git a/tests/test_litellm/proxy/test_response_model_sanitization.py b/tests/unit/proxy/test_response_model_sanitization.py similarity index 100% rename from tests/test_litellm/proxy/test_response_model_sanitization.py rename to tests/unit/proxy/test_response_model_sanitization.py diff --git a/tests/test_litellm/proxy/test_route_a2a_models.py b/tests/unit/proxy/test_route_a2a_models.py similarity index 100% rename from tests/test_litellm/proxy/test_route_a2a_models.py rename to tests/unit/proxy/test_route_a2a_models.py diff --git a/tests/test_litellm/proxy/test_route_llm_request.py b/tests/unit/proxy/test_route_llm_request.py similarity index 100% rename from tests/test_litellm/proxy/test_route_llm_request.py rename to tests/unit/proxy/test_route_llm_request.py diff --git a/tests/test_litellm/proxy/test_route_priority.py b/tests/unit/proxy/test_route_priority.py similarity index 100% rename from tests/test_litellm/proxy/test_route_priority.py rename to tests/unit/proxy/test_route_priority.py diff --git a/tests/test_litellm/proxy/test_sensitive_route_auth.py b/tests/unit/proxy/test_sensitive_route_auth.py similarity index 100% rename from tests/test_litellm/proxy/test_sensitive_route_auth.py rename to tests/unit/proxy/test_sensitive_route_auth.py diff --git a/tests/test_litellm/proxy/test_shared_health_check.py b/tests/unit/proxy/test_shared_health_check.py similarity index 100% rename from tests/test_litellm/proxy/test_shared_health_check.py rename to tests/unit/proxy/test_shared_health_check.py diff --git a/tests/test_litellm/proxy/test_spend_log_cleanup.py b/tests/unit/proxy/test_spend_log_cleanup.py similarity index 100% rename from tests/test_litellm/proxy/test_spend_log_cleanup.py rename to tests/unit/proxy/test_spend_log_cleanup.py diff --git a/tests/test_litellm/proxy/test_swagger_chat_completions.py b/tests/unit/proxy/test_swagger_chat_completions.py similarity index 100% rename from tests/test_litellm/proxy/test_swagger_chat_completions.py rename to tests/unit/proxy/test_swagger_chat_completions.py diff --git a/tests/test_litellm/proxy/test_team_member_update.py b/tests/unit/proxy/test_team_member_update.py similarity index 100% rename from tests/test_litellm/proxy/test_team_member_update.py rename to tests/unit/proxy/test_team_member_update.py diff --git a/tests/test_litellm/proxy/test_team_org_move.py b/tests/unit/proxy/test_team_org_move.py similarity index 100% rename from tests/test_litellm/proxy/test_team_org_move.py rename to tests/unit/proxy/test_team_org_move.py diff --git a/tests/test_litellm/proxy/test_tools_allowlist_enforcement.py b/tests/unit/proxy/test_tools_allowlist_enforcement.py similarity index 100% rename from tests/test_litellm/proxy/test_tools_allowlist_enforcement.py rename to tests/unit/proxy/test_tools_allowlist_enforcement.py diff --git a/tests/test_litellm/proxy/test_tracing_endpoints.py b/tests/unit/proxy/test_tracing_endpoints.py similarity index 100% rename from tests/test_litellm/proxy/test_tracing_endpoints.py rename to tests/unit/proxy/test_tracing_endpoints.py diff --git a/tests/test_litellm/proxy/test_update_llm_router_resilience.py b/tests/unit/proxy/test_update_llm_router_resilience.py similarity index 100% rename from tests/test_litellm/proxy/test_update_llm_router_resilience.py rename to tests/unit/proxy/test_update_llm_router_resilience.py diff --git a/tests/test_litellm/proxy/test_zerobus_dashboard_config.py b/tests/unit/proxy/test_zerobus_dashboard_config.py similarity index 100% rename from tests/test_litellm/proxy/test_zerobus_dashboard_config.py rename to tests/unit/proxy/test_zerobus_dashboard_config.py diff --git a/tests/unit/proxy/types_utils/__init__.py b/tests/unit/proxy/types_utils/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_litellm/proxy/types_utils/test_db_overlay_remote_module_scrub.py b/tests/unit/proxy/types_utils/test_db_overlay_remote_module_scrub.py similarity index 100% rename from tests/test_litellm/proxy/types_utils/test_db_overlay_remote_module_scrub.py rename to tests/unit/proxy/types_utils/test_db_overlay_remote_module_scrub.py diff --git a/tests/test_litellm/proxy/types_utils/test_get_instance_fn_runtime_gate.py b/tests/unit/proxy/types_utils/test_get_instance_fn_runtime_gate.py similarity index 100% rename from tests/test_litellm/proxy/types_utils/test_get_instance_fn_runtime_gate.py rename to tests/unit/proxy/types_utils/test_get_instance_fn_runtime_gate.py