From 192e0842c6a78cb67ad9f86db2aa86312a0e6e2a Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 18 Apr 2024 11:48:43 -0700 Subject: [PATCH 1/3] fix - show _vertex_project, _vertex_location in exceptions --- litellm/utils.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/litellm/utils.py b/litellm/utils.py index 8e7c31867f4..9c73c68b427 100644 --- a/litellm/utils.py +++ b/litellm/utils.py @@ -7800,14 +7800,22 @@ def exception_type( # add model, deployment and model_group to the exception message _model = completion_kwargs.get("model") _kwargs = completion_kwargs.get("kwargs", {}) or {} + _vertex_project = completion_kwargs.get("vertex_project") + _vertex_location = completion_kwargs.get("vertex_location") + _metadata = _kwargs.get("metadata", {}) or {} _model_group = _metadata.get("model_group") _deployment = _metadata.get("deployment") + error_str += f"\nmodel: {_model}\n" if _model_group is not None: error_str += f"model_group: {_model_group}\n" if _deployment is not None: error_str += f"deployment: {_deployment}\n" + if _vertex_project is not None: + error_str += f"vertex_project: {_vertex_project}\n" + if _vertex_location is not None: + error_str += f"vertex_location: {_vertex_location}\n" if ( "Vertex AI API has not been used in project" in error_str From 930f8712e438a64404b4506b0ade50388d062fdc Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 18 Apr 2024 12:53:33 -0700 Subject: [PATCH 2/3] fix - track vertex_location and vertex_project in vertex exceptions --- litellm/utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/litellm/utils.py b/litellm/utils.py index 9c73c68b427..5aef30fb79b 100644 --- a/litellm/utils.py +++ b/litellm/utils.py @@ -7302,6 +7302,7 @@ def exception_type( original_exception, custom_llm_provider, completion_kwargs={}, + extra_kwargs={}, ): global user_logger_fn, liteDebuggerClient exception_mapping_worked = False @@ -7799,15 +7800,14 @@ def exception_type( if completion_kwargs is not None: # add model, deployment and model_group to the exception message _model = completion_kwargs.get("model") - _kwargs = completion_kwargs.get("kwargs", {}) or {} - _vertex_project = completion_kwargs.get("vertex_project") - _vertex_location = completion_kwargs.get("vertex_location") - - _metadata = _kwargs.get("metadata", {}) or {} + error_str += f"\nmodel: {_model}\n" + if extra_kwargs is not None: + _vertex_project = extra_kwargs.get("vertex_project") + _vertex_location = extra_kwargs.get("vertex_location") + _metadata = extra_kwargs.get("metadata", {}) or {} _model_group = _metadata.get("model_group") _deployment = _metadata.get("deployment") - error_str += f"\nmodel: {_model}\n" if _model_group is not None: error_str += f"model_group: {_model_group}\n" if _deployment is not None: From b66e4595e6582d37217c3a3fec5ac811184cc412 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 18 Apr 2024 12:58:30 -0700 Subject: [PATCH 3/3] fix - pass kwargs to exception_type --- litellm/main.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/litellm/main.py b/litellm/main.py index 9d79a33c4a8..8bff2ff4022 100644 --- a/litellm/main.py +++ b/litellm/main.py @@ -341,6 +341,7 @@ async def acompletion( custom_llm_provider=custom_llm_provider, original_exception=e, completion_kwargs=completion_kwargs, + extra_kwargs=kwargs, ) @@ -2137,6 +2138,7 @@ def completion( custom_llm_provider=custom_llm_provider, original_exception=e, completion_kwargs=args, + extra_kwargs=kwargs, ) @@ -2498,6 +2500,7 @@ async def aembedding(*args, **kwargs): custom_llm_provider=custom_llm_provider, original_exception=e, completion_kwargs=args, + extra_kwargs=kwargs, ) @@ -2939,7 +2942,10 @@ def embedding( ) ## Map to OpenAI Exception raise exception_type( - model=model, original_exception=e, custom_llm_provider=custom_llm_provider + model=model, + original_exception=e, + custom_llm_provider=custom_llm_provider, + extra_kwargs=kwargs, ) @@ -3033,6 +3039,7 @@ async def atext_completion(*args, **kwargs): custom_llm_provider=custom_llm_provider, original_exception=e, completion_kwargs=args, + extra_kwargs=kwargs, ) @@ -3370,6 +3377,7 @@ async def aimage_generation(*args, **kwargs): custom_llm_provider=custom_llm_provider, original_exception=e, completion_kwargs=args, + extra_kwargs=kwargs, ) @@ -3569,6 +3577,7 @@ def image_generation( custom_llm_provider=custom_llm_provider, original_exception=e, completion_kwargs=locals(), + extra_kwargs=kwargs, ) @@ -3618,6 +3627,7 @@ async def atranscription(*args, **kwargs): custom_llm_provider=custom_llm_provider, original_exception=e, completion_kwargs=args, + extra_kwargs=kwargs, )