langchain-google-genai 2.0.8__py3-none-any.whl → 2.0.10__py3-none-any.whl

langchain_google_genai/_function_utils.py

@@ -235,13 +235,16 @@ def _format_base_tool_to_function_declaration(
             ),
         )
 
-    if issubclass(tool.args_schema, BaseModel):
+    if isinstance(tool.args_schema, dict):
+        schema = tool.args_schema
+    elif issubclass(tool.args_schema, BaseModel):
         schema = tool.args_schema.model_json_schema()
     elif issubclass(tool.args_schema, BaseModelV1):
         schema = tool.args_schema.schema()
     else:
         raise NotImplementedError(
-            f"args_schema must be a Pydantic BaseModel, got {tool.args_schema}."
+            "args_schema must be a Pydantic BaseModel or JSON schema, "
+            f"got {tool.args_schema}."
         )
     parameters = _dict_to_gapic_schema(schema)
 
@@ -301,10 +304,18 @@ def _get_properties_from_schema(schema: Dict) -> Dict[str, Any]:
             continue
         properties_item: Dict[str, Union[str, int, Dict, List]] = {}
         if v.get("type") or v.get("anyOf") or v.get("type_"):
-            properties_item["type_"] = _get_type_from_schema(v)
+            item_type_ = _get_type_from_schema(v)
+            properties_item["type_"] = item_type_
             if _is_nullable_schema(v):
                 properties_item["nullable"] = True
 
+            # Replace `v` with chosen definition for array / object json types
+            any_of_types = v.get("anyOf")
+            if any_of_types and item_type_ in [glm.Type.ARRAY, glm.Type.OBJECT]:
+                json_type_ = "array" if item_type_ == glm.Type.ARRAY else "object"
+                # Use Index -1 for consistency with `_get_nullable_type_from_schema`
+                v = [val for val in any_of_types if val.get("type") == json_type_][-1]
+
         if v.get("enum"):
             properties_item["enum"] = v["enum"]
 

langchain_google_genai/chat_models.py

@@ -301,6 +301,53 @@ def _convert_to_parts(
     return parts
 
 
+def _convert_tool_message_to_part(
+    message: ToolMessage | FunctionMessage, name: Optional[str] = None
+) -> 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):
+        response = message.content
+    else:
+        try:
+            response = json.loads(message.content)
+        except json.JSONDecodeError:
+            response = message.content  # leave as str representation
+    part = Part(
+        function_response=FunctionResponse(
+            name=name,
+            response=(
+                {"output": response} if not isinstance(response, dict) else response
+            ),
+        )
+    )
+    return part
+
+
+def _get_ai_message_tool_messages_parts(
+    tool_messages: Sequence[ToolMessage], ai_message: AIMessage
+) -> list[Part]:
+    """
+    Finds relevant tool messages for the AI message and converts them to a single
+    list of Parts.
+    """
+    # We are interested only in the tool messages that are part of the AI message
+    tool_calls_ids = {tool_call["id"]: tool_call for tool_call in ai_message.tool_calls}
+    parts = []
+    for i, message in enumerate(tool_messages):
+        if not tool_calls_ids:
+            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)
+            # 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
+
+
 def _parse_chat_history(
     input_messages: Sequence[BaseMessage], convert_system_message_to_human: bool = False
 ) -> Tuple[Optional[Content], List[Content]]:
@@ -310,14 +357,26 @@ def _parse_chat_history(
         warnings.warn("Convert_system_message_to_human will be deprecated!")
 
     system_instruction: Optional[Content] = None
-    for i, message in enumerate(input_messages):
-        if i == 0 and isinstance(message, SystemMessage):
-            system_instruction = Content(parts=_convert_to_parts(message.content))
+    messages_without_tool_messages = [
+        message for message in input_messages if not isinstance(message, ToolMessage)
+    ]
+    tool_messages = [
+        message for message in input_messages if isinstance(message, ToolMessage)
+    ]
+    for i, message in enumerate(messages_without_tool_messages):
+        if isinstance(message, SystemMessage):
+            system_parts = _convert_to_parts(message.content)
+            if i == 0:
+                system_instruction = Content(parts=system_parts)
+            elif system_instruction is not None:
+                system_instruction.parts.extend(system_parts)
+            else:
+                pass
             continue
         elif isinstance(message, AIMessage):
             role = "model"
             if message.tool_calls:
-                parts = []
+                ai_message_parts = []
                 for tool_call in message.tool_calls:
                     function_call = FunctionCall(
                         {
@@ -325,7 +384,13 @@ def _parse_chat_history(
                             "args": tool_call["args"],
                         }
                     )
-                    parts.append(Part(function_call=function_call))
+                    ai_message_parts.append(Part(function_call=function_call))
+                tool_messages_parts = _get_ai_message_tool_messages_parts(
+                    tool_messages=tool_messages, ai_message=message
+                )
+                messages.append(Content(role=role, parts=ai_message_parts))
+                messages.append(Content(role="user", parts=tool_messages_parts))
+                continue
             elif raw_function_call := message.additional_kwargs.get("function_call"):
                 function_call = FunctionCall(
                     {
@@ -344,60 +409,7 @@ def _parse_chat_history(
                 system_instruction = None
         elif isinstance(message, FunctionMessage):
             role = "user"
-            response: Any
-            if not isinstance(message.content, str):
-                response = message.content
-            else:
-                try:
-                    response = json.loads(message.content)
-                except json.JSONDecodeError:
-                    response = message.content  # leave as str representation
-            parts = [
-                Part(
-                    function_response=FunctionResponse(
-                        name=message.name,
-                        response=(
-                            {"output": response}
-                            if not isinstance(response, dict)
-                            else response
-                        ),
-                    )
-                )
-            ]
-        elif isinstance(message, ToolMessage):
-            role = "user"
-            prev_message: Optional[BaseMessage] = (
-                input_messages[i - 1] if i > 0 else None
-            )
-            if (
-                prev_message
-                and isinstance(prev_message, AIMessage)
-                and prev_message.tool_calls
-            ):
-                # message.name can be null for ToolMessage
-                name: str = prev_message.tool_calls[0]["name"]
-            else:
-                name = message.name  # type: ignore
-            tool_response: Any
-            if not isinstance(message.content, str):
-                tool_response = message.content
-            else:
-                try:
-                    tool_response = json.loads(message.content)
-                except json.JSONDecodeError:
-                    tool_response = message.content  # leave as str representation
-            parts = [
-                Part(
-                    function_response=FunctionResponse(
-                        name=name,
-                        response=(
-                            {"output": tool_response}
-                            if not isinstance(tool_response, dict)
-                            else tool_response
-                        ),
-                    )
-                )
-            ]
+            parts = [_convert_tool_message_to_part(message)]
         else:
             raise ValueError(
                 f"Unexpected message with type {type(message)} at the position {i}."

{langchain_google_genai-2.0.8.dist-info → langchain_google_genai-2.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 2.0.8
+Version: 2.0.10
 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-generativeai (>=0.8.0,<0.9.0)
-Requires-Dist: langchain-core (>=0.3.27,<0.4.0)
+Requires-Dist: langchain-core (>=0.3.37,<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.0.8.dist-info → langchain_google_genai-2.0.10.dist-info}/RECORD

@@ -1,16 +1,16 @@
 langchain_google_genai/__init__.py,sha256=Oji-S2KYWrku1wyQEskY84IOfY8MfRhujjJ4d7hbsk4,2758
 langchain_google_genai/_common.py,sha256=ASlwE8hEbvOm55BVF_D4rf2nl7RYsnpsi5xbM6DW3Cc,1576
 langchain_google_genai/_enums.py,sha256=KLPmxS1K83K4HjBIXFaXoL_sFEOv8Hq-2B2PDMKyDgo,197
-langchain_google_genai/_function_utils.py,sha256=xcUwX2DmGM4UwH7bhBC6W9E5oVAE8k_l9lMYzJUJwA0,17433
+langchain_google_genai/_function_utils.py,sha256=c0bYzUcWyDnaYQi5tPtBxl7KGV4FswzSb3ywu8tD6yI,18036
 langchain_google_genai/_genai_extension.py,sha256=81a4ly5ZHlqMf37uJfdB8K41qE6J5ujLnbUypIfFf2o,20775
 langchain_google_genai/_image_utils.py,sha256=tPrQyMvVmO8xkuow1SvA91omxUEv9ZUy1EMHNGjMAKY,5202
-langchain_google_genai/chat_models.py,sha256=OXm70GS_N6ror9A8imm6TIFVAfQ-DgdhIMbSZKExyVE,54450
+langchain_google_genai/chat_models.py,sha256=F36_mMwLgnsQIEDJomKLuF4QdXdjkatXR5Ut-nMEvRA,55022
 langchain_google_genai/embeddings.py,sha256=jQRWPXD9twXoVBlXJQG7Duz0fb8UC0kgRzzwAmW3Dic,10146
 langchain_google_genai/genai_aqa.py,sha256=qB6h3-BSXqe0YLR3eeVllYzmNKK6ofI6xJLdBahUVZo,4300
 langchain_google_genai/google_vector_store.py,sha256=4wvhIiOmc3Fo046FyafPmT9NBCLek-9bgluvuTfrbpQ,16148
 langchain_google_genai/llms.py,sha256=EPUgkz5aqKOyKbztT7br8w60Uo5D_X_bF5qP-zd6iLs,14593
 langchain_google_genai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-langchain_google_genai-2.0.8.dist-info/LICENSE,sha256=DppmdYJVSc1jd0aio6ptnMUn5tIHrdAhQ12SclEBfBg,1072
-langchain_google_genai-2.0.8.dist-info/METADATA,sha256=HiODJnDpI3kyP8KioKDXiJItnXQsVc_AC-wamxdeyMY,3594
-langchain_google_genai-2.0.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langchain_google_genai-2.0.8.dist-info/RECORD,,
+langchain_google_genai-2.0.10.dist-info/LICENSE,sha256=DppmdYJVSc1jd0aio6ptnMUn5tIHrdAhQ12SclEBfBg,1072
+langchain_google_genai-2.0.10.dist-info/METADATA,sha256=2VjXxw5v4_8anWbUPouX2Y3yjG8JmBk9mKTJwIpvEkw,3595
+langchain_google_genai-2.0.10.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langchain_google_genai-2.0.10.dist-info/RECORD,,