mirror of
https://github.com/tiennm99/litellm.git
synced 2026-08-11 16:26:07 +00:00
Revert "Merge pull request #18790 from BerriAI/litellm_key_team_routing_3"
This reverts commitae26d8e68a, reversing changes made to864e8c6543.
This commit is contained in:
@@ -77,84 +77,6 @@ class TestProxyBaseLLMRequestProcessing:
|
||||
pytest.fail("litellm_call_id is not a valid UUID")
|
||||
assert data_passed["litellm_call_id"] == returned_data["litellm_call_id"]
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_should_apply_hierarchical_router_settings_to_user_config(
|
||||
self, monkeypatch
|
||||
):
|
||||
processing_obj = ProxyBaseLLMRequestProcessing(data={})
|
||||
mock_request = MagicMock(spec=Request)
|
||||
mock_request.headers = {}
|
||||
|
||||
async def mock_add_litellm_data_to_request(*args, **kwargs):
|
||||
return {}
|
||||
|
||||
async def mock_common_processing_pre_call_logic(
|
||||
user_api_key_dict, data, call_type
|
||||
):
|
||||
data_copy = copy.deepcopy(data)
|
||||
return data_copy
|
||||
|
||||
mock_proxy_logging_obj = MagicMock(spec=ProxyLogging)
|
||||
mock_proxy_logging_obj.pre_call_hook = AsyncMock(
|
||||
side_effect=mock_common_processing_pre_call_logic
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
litellm.proxy.common_request_processing,
|
||||
"add_litellm_data_to_request",
|
||||
mock_add_litellm_data_to_request,
|
||||
)
|
||||
|
||||
mock_general_settings = {}
|
||||
mock_user_api_key_dict = MagicMock(spec=UserAPIKeyAuth)
|
||||
mock_proxy_config = MagicMock(spec=ProxyConfig)
|
||||
|
||||
mock_router_settings = {
|
||||
"routing_strategy": "least-busy",
|
||||
"timeout": 30.0,
|
||||
"num_retries": 3,
|
||||
}
|
||||
mock_proxy_config._get_hierarchical_router_settings = AsyncMock(
|
||||
return_value=mock_router_settings
|
||||
)
|
||||
|
||||
mock_model_list = [
|
||||
{"model_name": "gpt-3.5-turbo", "litellm_params": {"model": "gpt-3.5-turbo"}},
|
||||
{"model_name": "gpt-4", "litellm_params": {"model": "gpt-4"}},
|
||||
]
|
||||
mock_llm_router = MagicMock()
|
||||
mock_llm_router.get_model_list = MagicMock(return_value=mock_model_list)
|
||||
|
||||
mock_prisma_client = MagicMock()
|
||||
monkeypatch.setattr(
|
||||
"litellm.proxy.proxy_server.prisma_client",
|
||||
mock_prisma_client,
|
||||
)
|
||||
|
||||
route_type = "acompletion"
|
||||
|
||||
returned_data, logging_obj = await processing_obj.common_processing_pre_call_logic(
|
||||
request=mock_request,
|
||||
general_settings=mock_general_settings,
|
||||
user_api_key_dict=mock_user_api_key_dict,
|
||||
proxy_logging_obj=mock_proxy_logging_obj,
|
||||
proxy_config=mock_proxy_config,
|
||||
route_type=route_type,
|
||||
llm_router=mock_llm_router,
|
||||
)
|
||||
|
||||
mock_proxy_config._get_hierarchical_router_settings.assert_called_once_with(
|
||||
user_api_key_dict=mock_user_api_key_dict,
|
||||
prisma_client=mock_prisma_client,
|
||||
)
|
||||
mock_llm_router.get_model_list.assert_called_once()
|
||||
|
||||
assert "user_config" in returned_data
|
||||
user_config = returned_data["user_config"]
|
||||
assert user_config["model_list"] == mock_model_list
|
||||
assert user_config["routing_strategy"] == "least-busy"
|
||||
assert user_config["timeout"] == 30.0
|
||||
assert user_config["num_retries"] == 3
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_stream_timeout_header_processing(self):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user