From 2d1cc68e228cc43264d6e7e21a7f5ffc855ebf5f Mon Sep 17 00:00:00 2001 From: Sameer Kankute Date: Thu, 23 Apr 2026 18:41:01 +0530 Subject: [PATCH] fix(dashscope): fail fast on image generation API errors Prevent silent empty image responses by raising provider errors for non-200 HTTP statuses and DashScope API-level error payloads, with regression tests covering both paths. Made-with: Cursor --- .../image_generation/transformation.py | 16 +++ .../test_dashscope_image_generation.py | 97 ++++++++++++++++--- 2 files changed, 101 insertions(+), 12 deletions(-) diff --git a/litellm/llms/dashscope/image_generation/transformation.py b/litellm/llms/dashscope/image_generation/transformation.py index 152c4791bf..77676b11d5 100644 --- a/litellm/llms/dashscope/image_generation/transformation.py +++ b/litellm/llms/dashscope/image_generation/transformation.py @@ -165,6 +165,13 @@ class DashScopeImageGenerationConfig(BaseImageGenerationConfig): DashScope response: output.choices[0].message.content[0].image OpenAI response: data[0].url """ + if raw_response.status_code != 200: + raise self.get_error_class( + error_message=raw_response.text, + status_code=raw_response.status_code, + headers=raw_response.headers, + ) + try: response_data = raw_response.json() except Exception as e: @@ -174,6 +181,15 @@ class DashScopeImageGenerationConfig(BaseImageGenerationConfig): headers=raw_response.headers, ) + # DashScope can return API-level errors in a 200 response body. + # Example: {"code": "InvalidParameter", "message": "Size not supported"} + if "code" in response_data and "output" not in response_data: + raise self.get_error_class( + error_message=str(response_data.get("message", response_data)), + status_code=raw_response.status_code, + headers=raw_response.headers, + ) + if not model_response.data: model_response.data = [] diff --git a/tests/test_litellm/test_dashscope_image_generation.py b/tests/test_litellm/test_dashscope_image_generation.py index b7680a7e7f..af95e2ca6b 100644 --- a/tests/test_litellm/test_dashscope_image_generation.py +++ b/tests/test_litellm/test_dashscope_image_generation.py @@ -49,7 +49,9 @@ def test_get_llm_provider_returns_dashscope(model_string: str): ("dashscope/qwen-image-2.0-pro", "dashscope"), ], ) -def test_get_model_info_mode_is_image_generation(model_string: str, custom_provider: str): +def test_get_model_info_mode_is_image_generation( + model_string: str, custom_provider: str +): import os prev_env = os.environ.get("LITELLM_LOCAL_MODEL_COST_MAP") @@ -58,10 +60,12 @@ def test_get_model_info_mode_is_image_generation(model_string: str, custom_provi os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True" litellm.model_cost = litellm.get_model_cost_map(url="") - info = litellm.get_model_info(model=model_string, custom_llm_provider=custom_provider) - assert info["mode"] == "image_generation", ( - f"Expected mode='image_generation', got '{info['mode']}'" + info = litellm.get_model_info( + model=model_string, custom_llm_provider=custom_provider ) + assert ( + info["mode"] == "image_generation" + ), f"Expected mode='image_generation', got '{info['mode']}'" finally: if prev_env is None: os.environ.pop("LITELLM_LOCAL_MODEL_COST_MAP", None) @@ -101,7 +105,10 @@ class TestDashScopeImageGenerationConfig: assert headers["Content-Type"] == "application/json" def test_validate_environment_raises_without_key(self): - with patch("litellm.llms.dashscope.image_generation.transformation.get_secret_str", return_value=None): + with patch( + "litellm.llms.dashscope.image_generation.transformation.get_secret_str", + return_value=None, + ): with pytest.raises(ValueError, match="DASHSCOPE_API_KEY"): self.cfg.validate_environment( headers={}, @@ -192,8 +199,20 @@ class TestDashScopeImageGenerationConfig: body = { "output": { "choices": [ - {"finish_reason": "stop", "message": {"role": "assistant", "content": [{"image": "https://example.com/img1.png"}]}}, - {"finish_reason": "stop", "message": {"role": "assistant", "content": [{"image": "https://example.com/img2.png"}]}}, + { + "finish_reason": "stop", + "message": { + "role": "assistant", + "content": [{"image": "https://example.com/img1.png"}], + }, + }, + { + "finish_reason": "stop", + "message": { + "role": "assistant", + "content": [{"image": "https://example.com/img2.png"}], + }, + }, ] }, "usage": {}, @@ -218,6 +237,49 @@ class TestDashScopeImageGenerationConfig: assert result.data[0].url == "https://example.com/img1.png" assert result.data[1].url == "https://example.com/img2.png" + def test_transform_response_raises_on_non_200_status(self): + mock_resp = MagicMock(spec=httpx.Response) + mock_resp.status_code = 400 + mock_resp.headers = {} + mock_resp.text = '{"code":"InvalidParameter","message":"Size not supported"}' + mock_resp.json.return_value = { + "code": "InvalidParameter", + "message": "Size not supported", + } + + with pytest.raises(Exception): + self.cfg.transform_image_generation_response( + model="qwen-image-2.0", + raw_response=mock_resp, + model_response=ImageResponse(), + logging_obj=MagicMock(), + request_data={}, + optional_params={}, + litellm_params={}, + encoding=None, + ) + + def test_transform_response_raises_on_api_error_body(self): + mock_resp = MagicMock(spec=httpx.Response) + mock_resp.status_code = 200 + mock_resp.headers = {} + mock_resp.json.return_value = { + "code": "InvalidParameter", + "message": "Size not supported", + } + + with pytest.raises(Exception): + self.cfg.transform_image_generation_response( + model="qwen-image-2.0", + raw_response=mock_resp, + model_response=ImageResponse(), + logging_obj=MagicMock(), + request_data={}, + optional_params={}, + litellm_params={}, + encoding=None, + ) + # --------------------------------------------------------------------------- # 5. OpenAI → DashScope parameter mapping # --------------------------------------------------------------------------- @@ -284,13 +346,21 @@ def test_litellm_image_generation_dashscope_end_to_end(): "message": { "role": "assistant", "content": [ - {"image": "https://dashscope-result.oss.aliyuncs.com/test.png"} + { + "image": "https://dashscope-result.oss.aliyuncs.com/test.png" + } ], }, } ] }, - "usage": {"input_tokens": 0, "output_tokens": 0, "width": 1024, "height": 1024, "image_count": 1}, + "usage": { + "input_tokens": 0, + "output_tokens": 0, + "width": 1024, + "height": 1024, + "image_count": 1, + }, } with patch( @@ -312,11 +382,15 @@ def test_litellm_image_generation_dashscope_end_to_end(): assert response is not None assert response.data is not None assert len(response.data) == 1 - assert response.data[0].url == "https://dashscope-result.oss.aliyuncs.com/test.png" + assert ( + response.data[0].url == "https://dashscope-result.oss.aliyuncs.com/test.png" + ) # Verify the HTTP call was made to the DashScope endpoint call_args = mock_post.call_args - called_url = call_args[0][0] if call_args[0] else call_args.kwargs.get("url", "") + called_url = ( + call_args[0][0] if call_args[0] else call_args.kwargs.get("url", "") + ) assert "dashscope" in called_url or "aliyuncs" in called_url # Verify request body contains DashScope format @@ -325,4 +399,3 @@ def test_litellm_image_generation_dashscope_end_to_end(): body = call_kwargs["json"] assert "input" in body assert "messages" in body["input"] -