From 988c37fda3f0a0a30e0106a21f2f7ce88659e1f7 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Tue, 30 Apr 2024 14:34:54 -0700 Subject: [PATCH 1/2] Disambiguate invalid model name errors because that error can be thrown in several different places, so knowing the function it's being thrown from can be very useul for debugging. --- litellm/proxy/proxy_server.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index a0f8e9aa57f..26987f478ee 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -3644,7 +3644,7 @@ async def chat_completion( raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail={ - "error": "Invalid model name passed in model=" + "error": "chat_completion: Invalid model name passed in model=" + data.get("model", "") }, ) @@ -3833,7 +3833,7 @@ async def completion( raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail={ - "error": "Invalid model name passed in model=" + "error": "completion: Invalid model name passed in model=" + data.get("model", "") }, ) @@ -4041,7 +4041,7 @@ async def embeddings( raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail={ - "error": "Invalid model name passed in model=" + "error": "embeddings: Invalid model name passed in model=" + data.get("model", "") }, ) @@ -4197,7 +4197,7 @@ async def image_generation( raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail={ - "error": "Invalid model name passed in model=" + "error": "image_generation: Invalid model name passed in model=" + data.get("model", "") }, ) @@ -4372,7 +4372,7 @@ async def audio_transcriptions( raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail={ - "error": "Invalid model name passed in model=" + "error": "audio_transcriptions: Invalid model name passed in model=" + data.get("model", "") }, ) @@ -4538,7 +4538,7 @@ async def moderations( raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail={ - "error": "Invalid model name passed in model=" + "error": "moderations: Invalid model name passed in model=" + data.get("model", "") }, ) From 6d154e2317a4f4984d51b2e87ac73bb4e8814062 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Thu, 2 May 2024 14:50:46 -0700 Subject: [PATCH 2/2] Update tests to reflect new error messages --- litellm/tests/test_proxy_exception_mapping.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/litellm/tests/test_proxy_exception_mapping.py b/litellm/tests/test_proxy_exception_mapping.py index 82957b658cc..0cc7b0d30d0 100644 --- a/litellm/tests/test_proxy_exception_mapping.py +++ b/litellm/tests/test_proxy_exception_mapping.py @@ -169,7 +169,7 @@ def test_chat_completion_exception_any_model(client): ) assert isinstance(openai_exception, openai.BadRequestError) _error_message = openai_exception.message - assert "Invalid model name passed in model=Lite-GPT-12" in str(_error_message) + assert "chat_completion: Invalid model name passed in model=Lite-GPT-12" in str(_error_message) except Exception as e: pytest.fail(f"LiteLLM Proxy test failed. Exception {str(e)}") @@ -197,7 +197,7 @@ def test_embedding_exception_any_model(client): print("Exception raised=", openai_exception) assert isinstance(openai_exception, openai.BadRequestError) _error_message = openai_exception.message - assert "Invalid model name passed in model=Lite-GPT-12" in str(_error_message) + assert "embeddings: Invalid model name passed in model=Lite-GPT-12" in str(_error_message) except Exception as e: pytest.fail(f"LiteLLM Proxy test failed. Exception {str(e)}")