langchain-google-genai 2.1.4__tar.gz → 2.1.5__tar.gz

{langchain_google_genai-2.1.4 → langchain_google_genai-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 2.1.4
+Version: 2.1.5
 Summary: An integration package connecting Google's genai package and LangChain
 Home-page: https://github.com/langchain-ai/langchain-google
 License: MIT
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: filetype (>=1.2.0,<2.0.0)
 Requires-Dist: google-ai-generativelanguage (>=0.6.18,<0.7.0)
-Requires-Dist: langchain-core (>=0.3.52,<0.4.0)
+Requires-Dist: langchain-core (>=0.3.62,<0.4.0)
 Requires-Dist: pydantic (>=2,<3)
 Project-URL: Repository, https://github.com/langchain-ai/langchain-google
 Project-URL: Source Code, https://github.com/langchain-ai/langchain-google/tree/main/libs/genai

{langchain_google_genai-2.1.4 → langchain_google_genai-2.1.5}/langchain_google_genai/_common.py

@@ -84,6 +84,11 @@ Supported examples:
         default=None, description="Indicates the thinking budget in tokens."
     )
 
+    include_thoughts: Optional[bool] = Field(
+        default=None,
+        description="Indicates whether to include thoughts in the response.",
+    )
+
     safety_settings: Optional[Dict[HarmCategory, HarmBlockThreshold]] = None
     """The default safety settings to use for all generations. 
     

{langchain_google_genai-2.1.4 → langchain_google_genai-2.1.5}/langchain_google_genai/chat_models.py

@@ -247,6 +247,23 @@ def _is_lc_content_block(part: dict) -> bool:
     return "type" in part
 
 
+def _is_openai_image_block(block: dict) -> bool:
+    """Check if the block contains image data in OpenAI Chat Completions format."""
+    if block.get("type") == "image_url":
+        if (
+            (set(block.keys()) <= {"type", "image_url", "detail"})
+            and (image_url := block.get("image_url"))
+            and isinstance(image_url, dict)
+        ):
+            url = image_url.get("url")
+            if isinstance(url, str):
+                return True
+    else:
+        return False
+
+    return False
+
+
 def _convert_to_parts(
     raw_content: Union[str, Sequence[Union[str, dict]]],
 ) -> List[Part]:
@@ -334,14 +351,28 @@ def _convert_to_parts(
     return parts
 
 
-def _convert_tool_message_to_part(
+def _convert_tool_message_to_parts(
     message: ToolMessage | FunctionMessage, name: Optional[str] = None
-) -> Part:
+) -> list[Part]:
     """Converts a tool or function message to a google part."""
     # Legacy agent stores tool name in message.additional_kwargs instead of message.name
     name = message.name or name or message.additional_kwargs.get("name")
     response: Any
-    if not isinstance(message.content, str):
+    parts: list[Part] = []
+    if isinstance(message.content, list):
+        media_blocks = []
+        other_blocks = []
+        for block in message.content:
+            if isinstance(block, dict) and (
+                is_data_content_block(block) or _is_openai_image_block(block)
+            ):
+                media_blocks.append(block)
+            else:
+                other_blocks.append(block)
+        parts.extend(_convert_to_parts(media_blocks))
+        response = other_blocks
+
+    elif not isinstance(message.content, str):
         response = message.content
     else:
         try:
@@ -356,7 +387,8 @@ def _convert_tool_message_to_part(
             ),
         )
     )
-    return part
+    parts.append(part)
+    return parts
 
 
 def _get_ai_message_tool_messages_parts(
@@ -374,8 +406,10 @@ def _get_ai_message_tool_messages_parts(
             break
         if message.tool_call_id in tool_calls_ids:
             tool_call = tool_calls_ids[message.tool_call_id]
-            part = _convert_tool_message_to_part(message, name=tool_call.get("name"))
-            parts.append(part)
+            message_parts = _convert_tool_message_to_parts(
+                message, name=tool_call.get("name")
+            )
+            parts.extend(message_parts)
             # remove the id from the dict, so that we do not iterate over it again
             tool_calls_ids.pop(message.tool_call_id)
     return parts
@@ -442,7 +476,7 @@ def _parse_chat_history(
                 system_instruction = None
         elif isinstance(message, FunctionMessage):
             role = "user"
-            parts = [_convert_tool_message_to_part(message)]
+            parts = _convert_tool_message_to_parts(message)
         else:
             raise ValueError(
                 f"Unexpected message with type {type(message)} at the position {i}."
@@ -470,7 +504,21 @@ def _parse_response_candidate(
         except AttributeError:
             text = None
 
-        if text is not None:
+        if part.thought:
+            thinking_message = {
+                "type": "thinking",
+                "thinking": part.text,
+            }
+            if not content:
+                content = [thinking_message]
+            elif isinstance(content, str):
+                content = [thinking_message, content]
+            elif isinstance(content, list):
+                content.append(thinking_message)
+            else:
+                raise Exception("Unexpected content type")
+
+        elif text is not None:
             if not content:
                 content = text
             elif isinstance(content, str) and text:
@@ -658,6 +706,13 @@ def _response_to_result(
             proto.Message.to_dict(safety_rating, use_integers_for_enums=False)
             for safety_rating in candidate.safety_ratings
         ]
+        try:
+            if candidate.grounding_metadata:
+                generation_info["grounding_metadata"] = proto.Message.to_dict(
+                    candidate.grounding_metadata
+                )
+        except AttributeError:
+            pass
         message = _parse_response_candidate(candidate, streaming=stream)
         message.usage_metadata = lc_usage
         if stream:
@@ -712,7 +767,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
 
             from langchain_google_genai import ChatGoogleGenerativeAI
 
-            llm = ChatGoogleGenerativeAI(model="gemini-1.5-pro")
+            llm = ChatGoogleGenerativeAI(model="gemini-2.0-flash-001")
             llm.invoke("Write me a ballad about LangChain")
 
     Invoke:
@@ -797,7 +852,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
                 file = client.files.get(name=file.name)
 
             # Create cache
-            model = 'models/gemini-1.5-flash-001'
+            model = 'models/gemini-1.5-flash-latest'
             cache = client.caches.create(
                 model=model,
                 config=types.CreateCachedContentConfig(
@@ -853,7 +908,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
                     ],
                 )
             ]
-            model = "gemini-1.5-flash-001"
+            model = "gemini-1.5-flash-latest"
             cache = client.caches.create(
                 model=model,
                 config=CreateCachedContentConfig(
@@ -1034,7 +1089,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         """Needed for arg validation."""
         # Get all valid field names, including aliases
         valid_fields = set()
-        for field_name, field_info in self.model_fields.items():
+        for field_name, field_info in self.__class__.model_fields.items():
             valid_fields.add(field_name)
             if hasattr(field_info, "alias") and field_info.alias is not None:
                 valid_fields.add(field_info.alias)
@@ -1160,6 +1215,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
             "safety_settings": self.safety_settings,
             "response_modalities": self.response_modalities,
             "thinking_budget": self.thinking_budget,
+            "include_thoughts": self.include_thoughts,
         }
 
     def invoke(
@@ -1236,8 +1292,19 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
                 "top_k": self.top_k,
                 "top_p": self.top_p,
                 "response_modalities": self.response_modalities,
-                "thinking_config": {"thinking_budget": self.thinking_budget}
-                if self.thinking_budget is not None
+                "thinking_config": (
+                    (
+                        {"thinking_budget": self.thinking_budget}
+                        if self.thinking_budget is not None
+                        else {}
+                    )
+                    | (
+                        {"include_thoughts": self.include_thoughts}
+                        if self.include_thoughts is not None
+                        else {}
+                    )
+                )
+                if self.thinking_budget is not None or self.include_thoughts is not None
                 else None,
             }.items()
             if v is not None

{langchain_google_genai-2.1.4 → langchain_google_genai-2.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "2.1.4"
+version = "2.1.5"
 description = "An integration package connecting Google's genai package and LangChain"
 authors = []
 readme = "README.md"
@@ -12,7 +12,7 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-langchain-core = "^0.3.52"
+langchain-core = "^0.3.62"
 google-ai-generativelanguage = "^0.6.18"
 pydantic = ">=2,<3"
 filetype = "^1.2.0"
@@ -27,6 +27,7 @@ pytest-mock = "^3.10.0"
 syrupy = "^4.0.2"
 pytest-watcher = "^0.3.4"
 pytest-asyncio = "^0.21.1"
+pytest-retry = "^1.7.0"
 numpy = ">=1.26.2"
 langchain-tests = "0.3.19"