Resolve merge conflicts

Author: fm1320

adalflow/adalflow/components/model_client/openai_client.py

@@ -379,11 +379,7 @@ def parse_image_generation_response(self, response: List[Image]) -> GeneratorOut
             )
         except Exception as e:
             log.error(f"Error parsing image generation response: {e}")
-            return GeneratorOutput(
-                data=None,
-                error=str(e),
-                raw_response=str(response)
-            )
+            return GeneratorOutput(data=None, error=str(e), raw_response=str(response))
 
     @backoff.on_exception(
         backoff.expo,

tutorials/multimodal_client_testing_examples.py

@@ -17,27 +17,20 @@
 from adalflow.core import Generator
 from adalflow.components.model_client.openai_client import OpenAIClient
 from adalflow.core.types import ModelType
-import asyncio
-import numpy as np
-from dataclasses import dataclass
-from typing import List
-from numpy.linalg import norm
+
 
 def test_basic_generation():
     """Test basic text generation"""
     client = OpenAIClient()  # Default model_type is LLM
     gen = Generator(
-        model_client=client,
-        model_kwargs={
-            "model": "gpt-4o-mini",
-            "max_tokens": 100
-        }
+        model_client=client, model_kwargs={"model": "gpt-4o-mini", "max_tokens": 100}
     )
-    
+
     print("\n=== Testing Basic Generation ===")
     response = gen({"input_str": "Hello, world!"})
     print(f"Response: {response}")
 
+
 def test_invalid_image_url():
     """Test Generator output with invalid image URL"""
     client = OpenAIClient()  # Default model_type is LLM
@@ -46,14 +39,15 @@ def test_invalid_image_url():
         model_kwargs={
             "model": "gpt-4o-mini",
             "images": "https://invalid.url/nonexistent.jpg",
-            "max_tokens": 300
-        }
+            "max_tokens": 300,
+        },
     )
-    
+
     print("\n=== Testing Invalid Image URL ===")
     response = gen({"input_str": "What do you see in this image?"})
     print(f"Response with invalid image URL: {response}")
 
+
 def test_invalid_image_generation():
     """Test DALL-E generation with invalid parameters"""
     client = OpenAIClient(model_type=ModelType.IMAGE_GENERATION)
@@ -63,14 +57,15 @@ def test_invalid_image_generation():
             "model": "dall-e-3",
             "size": "invalid_size",  # Invalid size parameter
             "quality": "standard",
-            "n": 1
-        }
+            "n": 1,
+        },
     )
-    
+
     print("\n=== Testing Invalid DALL-E Parameters ===")
     response = gen({"input_str": "A cat"})
     print(f"Response with invalid DALL-E parameters: {response}")
 
+
 def test_vision_and_generation():
     """Test both vision analysis and image generation"""
     # 1. Test Vision Analysis with LLM client
@@ -80,11 +75,13 @@ def test_vision_and_generation():
         model_kwargs={
             "model": "gpt-4o-mini",
             "images": "https://upload.wikimedia.org/wikipedia/en/7/7d/Lenna_%28test_image%29.png",
-            "max_tokens": 300
-        }
+            "max_tokens": 300,
+        },
+    )
+
+    vision_response = vision_gen(
+        {"input_str": "What do you see in this image? Be detailed but concise."}
     )
-    
-    vision_response = vision_gen({"input_str": "What do you see in this image? Be detailed but concise."})
     print("\n=== Vision Analysis ===")
     print(f"Description: {vision_response.raw_response}")
 
@@ -96,20 +93,23 @@ def test_vision_and_generation():
             "model": "dall-e-3",
             "size": "1024x1024",
             "quality": "standard",
-            "n": 1
-        }
+            "n": 1,
+        },
     )
-    
+
     # For image generation, input_str becomes the prompt
-    response = dalle_gen({"input_str": "A happy siamese cat playing with a red ball of yarn"})
+    response = dalle_gen(
+        {"input_str": "A happy siamese cat playing with a red ball of yarn"}
+    )
     print("\n=== DALL-E Generation ===")
     print(f"Generated Image URL: {response.data}")
 
+
 if __name__ == "__main__":
     print("Starting OpenAI Vision and DALL-E test...\n")
-    
+
     # Run all tests - they will show errors if API key is invalid/empty
     test_basic_generation()
     test_invalid_image_url()
     test_invalid_image_generation()
-    test_vision_and_generation() 
+    test_vision_and_generation()