Merge branch 'fix/provider-strategy-response-format-support' of https://github.com/RohanDisa/langchain-google into fix/provider-strategy-response-format-support

Author: RohanDisa

libs/genai/tests/unit_tests/test_chat_models.py

@@ -10,7 +10,6 @@
 from unittest.mock import ANY, AsyncMock, Mock, patch
 
 import google.ai.generativelanguage as glm
-import proto  # type: ignore[import-untyped]
 import pytest
 from google.ai.generativelanguage_v1beta.types import (
     Candidate,
@@ -2962,17 +2961,16 @@ def _convert_proto_to_dict(obj: Any) -> Any:
     """Recursively convert proto objects to dicts for comparison."""
     if isinstance(obj, dict):
         return {k: _convert_proto_to_dict(v) for k, v in obj.items()}
-    elif isinstance(obj, (list, tuple)):
+    if isinstance(obj, (list, tuple)):
         return [_convert_proto_to_dict(item) for item in obj]
-    elif hasattr(obj, "__class__") and "proto" in str(type(obj)):
+    if hasattr(obj, "__class__") and "proto" in str(type(obj)):
         # Try to convert proto object to dict
         try:
             if hasattr(obj, "__iter__") and not isinstance(obj, str):
                 converted = dict(obj)
                 # Recursively convert nested proto objects
                 return {k: _convert_proto_to_dict(v) for k, v in converted.items()}
-            else:
-                return obj
+            return obj
         except (TypeError, ValueError):
             return obj
     return obj
@@ -3006,9 +3004,12 @@ def test_response_format_provider_strategy() -> None:
         },
     }
 
-    gen_config = llm._prepare_params(stop=None, response_format=response_format)
+    gen_config = llm._prepare_params(
+        stop=None, response_format=response_format
+    )
 
-    # response_json_schema may be converted to proto object, so convert to dict for comparison
+    # response_json_schema may be converted to proto object, so convert to
+    # dict for comparison
     schema = _convert_proto_to_dict(gen_config.response_json_schema)
     assert schema == schema_dict
     assert gen_config.response_mime_type == "application/json"
@@ -3025,13 +3026,14 @@ def test_response_format_provider_strategy() -> None:
         response_format=response_format,
         response_json_schema=different_schema,
     )
-    
-    # response_json_schema may be converted to proto object, so convert to dict for comparison
+
+    # response_json_schema may be converted to proto object, so convert to
+    # dict for comparison
     schema_2 = _convert_proto_to_dict(gen_config_2.response_json_schema)
     assert schema_2 == different_schema
     assert gen_config_2.response_mime_type == "application/json"
 
-    
+
     old_schema = {
         "type": "object",
         "properties": {"old_field": {"type": "string"}},
@@ -3044,7 +3046,8 @@ def test_response_format_provider_strategy() -> None:
         response_format=response_format,
     )
 
-    # response_json_schema may be converted to proto object, so convert to dict for comparison
+    # response_json_schema may be converted to proto object, so convert to
+    # dict for comparison
     schema_3 = _convert_proto_to_dict(gen_config_3.response_json_schema)
     assert schema_3 == schema_dict
     assert gen_config_3.response_mime_type == "application/json"
@@ -3056,7 +3059,8 @@ def test_response_format_provider_strategy() -> None:
         response_schema=schema_dict,
     )
     # Should fall back to response_schema
-    # response_json_schema may be converted to proto object, so convert to dict for comparison
+    # response_json_schema may be converted to proto object, so convert to
+    # dict for comparison
     schema_4 = _convert_proto_to_dict(gen_config_4.response_json_schema)
     assert schema_4 == schema_dict
     assert gen_config_4.response_mime_type == "application/json"