langchain-google-genai 2.0.11__tar.gz → 2.1.0__tar.gz

{langchain_google_genai-2.0.11 → langchain_google_genai-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 2.0.11
+Version: 2.1.0
 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.16,<0.7.0)
-Requires-Dist: langchain-core (>=0.3.37,<0.4.0)
+Requires-Dist: langchain-core (>=0.3.43,<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.11 → langchain_google_genai-2.1.0}/langchain_google_genai/chat_models.py

@@ -67,7 +67,7 @@ from langchain_core.messages.ai import UsageMetadata
 from langchain_core.messages.tool import invalid_tool_call, tool_call, tool_call_chunk
 from langchain_core.output_parsers.base import OutputParserLike
 from langchain_core.output_parsers.openai_tools import (
-    JsonOutputToolsParser,
+    JsonOutputKeyToolsParser,
     PydanticToolsParser,
     parse_tool_calls,
 )
@@ -89,7 +89,7 @@ from tenacity import (
     stop_after_attempt,
     wait_exponential,
 )
-from typing_extensions import Self
+from typing_extensions import Self, is_typeddict
 
 from langchain_google_genai._common import (
     GoogleGenerativeAIError,
@@ -110,6 +110,9 @@ from langchain_google_genai._image_utils import ImageBytesLoader
 
 from . import _genai_extension as genaix
 
+WARNED_STRUCTURED_OUTPUT_JSON_MODE = False
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -1177,6 +1180,16 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         elif functions:
             formatted_tools = [convert_to_genai_function_declarations(functions)]
 
+        filtered_messages = []
+        for message in messages:
+            if isinstance(message, HumanMessage) and not message.content:
+                warnings.warn(
+                    "HumanMessage with empty content was removed to prevent API error"
+                )
+            else:
+                filtered_messages.append(message)
+        messages = filtered_messages
+
         system_instruction, history = _parse_chat_history(
             messages,
             convert_system_message_to_human=self.convert_system_message_to_human,
@@ -1245,14 +1258,33 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     ) -> Runnable[LanguageModelInput, Union[Dict, BaseModel]]:
         if kwargs:
             raise ValueError(f"Received unsupported arguments {kwargs}")
+        tool_name = _get_tool_name(schema)  # type: ignore[arg-type]
         if isinstance(schema, type) and is_basemodel_subclass_safe(schema):
             parser: OutputParserLike = PydanticToolsParser(
                 tools=[schema], first_tool_only=True
             )
         else:
-            parser = JsonOutputToolsParser()
-        tool_choice = _get_tool_name(schema) if self._supports_tool_choice else None  # type: ignore[arg-type]
-        llm = self.bind_tools([schema], tool_choice=tool_choice)  # type: ignore[list-item]
+            global WARNED_STRUCTURED_OUTPUT_JSON_MODE
+            warnings.warn(
+                "ChatGoogleGenerativeAI.with_structured_output with dict schema has "
+                "changed recently to align with behavior of other LangChain chat "
+                "models. More context: "
+                "https://github.com/langchain-ai/langchain-google/pull/772"
+            )
+            WARNED_STRUCTURED_OUTPUT_JSON_MODE = True
+            parser = JsonOutputKeyToolsParser(key_name=tool_name, first_tool_only=True)
+        tool_choice = tool_name if self._supports_tool_choice else None
+        try:
+            llm = self.bind_tools(
+                [schema],
+                tool_choice=tool_choice,
+                ls_structured_output_format={
+                    "kwargs": {"method": "function_calling"},
+                    "schema": convert_to_openai_tool(schema),
+                },
+            )
+        except Exception:
+            llm = self.bind_tools([schema], tool_choice=tool_choice)
         if include_raw:
             parser_with_fallback = RunnablePassthrough.assign(
                 parsed=itemgetter("raw") | parser, parsing_error=lambda _: None
@@ -1315,7 +1347,13 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
 
 
 def _get_tool_name(
-    tool: Union[_ToolDict, GoogleTool],
+    tool: Union[_ToolDict, GoogleTool, Dict],
 ) -> str:
-    genai_tool = tool_to_dict(convert_to_genai_function_declarations([tool]))
-    return [f["name"] for f in genai_tool["function_declarations"]][0]  # type: ignore[index]
+    try:
+        genai_tool = tool_to_dict(convert_to_genai_function_declarations([tool]))
+        return [f["name"] for f in genai_tool["function_declarations"]][0]  # type: ignore[index]
+    except ValueError as e:  # other TypedDict
+        if is_typeddict(tool):
+            return convert_to_openai_tool(cast(Dict, tool))["function"]["name"]
+        else:
+            raise e

{langchain_google_genai-2.0.11 → langchain_google_genai-2.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "2.0.11"
+version = "2.1.0"
 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.37"
+langchain-core = "^0.3.43"
 google-ai-generativelanguage = "^0.6.16"
 pydantic = ">=2,<3"
 filetype = "^1.2.0"
@@ -28,7 +28,7 @@ syrupy = "^4.0.2"
 pytest-watcher = "^0.3.4"
 pytest-asyncio = "^0.21.1"
 numpy = "^1.26.2"
-langchain-tests = "0.3.12"
+langchain-tests = "0.3.14"
 
 [tool.codespell]
 ignore-words-list = "rouge"