langchain-google-genai 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

langchain_google_genai/_function_utils.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import (
     Any,
     Callable,
+    Collection,
     Dict,
     List,
     Literal,
@@ -15,13 +16,9 @@ from typing import (
 )
 
 import google.ai.generativelanguage as glm
-from google.ai.generativelanguage import (
-    FunctionCallingConfig,
-    FunctionDeclaration,
-)
-from google.ai.generativelanguage import (
-    Tool as GoogleTool,
-)
+from google.ai.generativelanguage import FunctionCallingConfig, FunctionDeclaration
+from google.ai.generativelanguage import Tool as GoogleTool
+from google.generativeai.types.content_types import ToolDict  # type: ignore[import]
 from langchain_core.pydantic_v1 import BaseModel
 from langchain_core.tools import BaseTool
 from langchain_core.tools import tool as callable_as_lc_tool
@@ -38,38 +35,74 @@ TYPE_ENUM = {
 
 TYPE_ENUM_REVERSE = {v: k for k, v in TYPE_ENUM.items()}
 
+
+class _ToolDictLike(TypedDict):
+    function_declarations: _FunctionDeclarationLikeList
+
+
+class _FunctionDeclarationDict(TypedDict):
+    name: str
+    description: str
+    parameters: Dict[str, Collection[str]]
+
+
+class _ToolDict(TypedDict):
+    function_declarations: Sequence[_FunctionDeclarationDict]
+
+
+# Info: This is a FunctionDeclaration(=fc).
 _FunctionDeclarationLike = Union[
-    BaseTool, Type[BaseModel], dict, Callable, FunctionDeclaration
+    BaseTool, Type[BaseModel], FunctionDeclaration, Callable, Dict[str, Any]
 ]
 
+# Info: This mean one tool.
+_FunctionDeclarationLikeList = Sequence[_FunctionDeclarationLike]
 
-class _ToolDict(TypedDict):
-    function_declarations: Sequence[_FunctionDeclarationLike]
+
+# Info: This means one tool=Sequence of FunctionDeclaration
+# The dict should be GoogleTool like. {"function_declarations": [ { "name": ...}.
+# OpenAI like dict is not be accepted. {{'type': 'function', 'function': {'name': ...}
+_ToolsType = Union[
+    GoogleTool,
+    ToolDict,
+    _ToolDictLike,
+    _FunctionDeclarationLikeList,
+    _FunctionDeclarationLike,
+]
 
 
+#
+# Info: GoogleTool means function_declarations and proto.Message.
 def convert_to_genai_function_declarations(
-    tool: Union[
-        GoogleTool,
-        _ToolDict,
-        _FunctionDeclarationLike,
-        Sequence[_FunctionDeclarationLike],
-    ],
+    tool: _ToolsType,
 ) -> GoogleTool:
-    if isinstance(tool, GoogleTool):
-        return cast(GoogleTool, tool)
-    if isinstance(tool, type) and issubclass(tool, BaseModel):
-        return GoogleTool(function_declarations=[_convert_to_genai_function(tool)])
-    if callable(tool):
-        return _convert_tool_to_genai_function(callable_as_lc_tool()(tool))
     if isinstance(tool, list):
-        return convert_to_genai_function_declarations({"function_declarations": tool})
-    if isinstance(tool, dict) and "function_declarations" in tool:
+        # multiple _FunctionDeclarationLike
+        return GoogleTool(
+            function_declarations=_convert_fc_likes_to_genai_function(tool)
+        )
+    elif isinstance(tool, (BaseTool, FunctionDeclaration)):
+        # single _FunctionDeclarationLike
+        return GoogleTool(
+            function_declarations=[_convert_fc_like_to_genai_function(tool)]
+        )
+    elif isinstance(tool, type) and issubclass(tool, BaseModel):
+        # single _FunctionDeclarationLike
+        return GoogleTool(
+            function_declarations=[_convert_fc_like_to_genai_function(tool)]
+        )
+    elif isinstance(tool, GoogleTool):
+        return cast(GoogleTool, tool)
+    elif callable(tool):
         return GoogleTool(
             function_declarations=[
-                _convert_to_genai_function(fc) for fc in tool["function_declarations"]
-            ],
+                _convert_tool_to_genai_function(callable_as_lc_tool()(tool))
+            ]
         )
-    return GoogleTool(function_declarations=[_convert_to_genai_function(tool)])  # type: ignore[arg-type]
+    elif isinstance(tool, dict):
+        return GoogleTool(function_declarations=_convert_dict_to_genai_functions(tool))  # type: ignore
+    else:
+        raise ValueError(f"Unsupported tool type {tool}")
 
 
 def tool_to_dict(tool: GoogleTool) -> _ToolDict:
@@ -87,64 +120,112 @@ def tool_to_dict(tool: GoogleTool) -> _ToolDict:
             if property_description:
                 property_dict["description"] = property_description
             properties[property] = property_dict
-        function_declaration = {
-            "name": function_declaration_proto.name,
-            "description": function_declaration_proto.description,
-            "parameters": {"type": "object", "properties": properties},
-        }
+        name = function_declaration_proto.name
+        description = function_declaration_proto.description
+        parameters = {"type": "object", "properties": properties}
         if function_declaration_proto.parameters.required:
-            function_declaration["parameters"][  # type: ignore[index]
-                "required"
-            ] = function_declaration_proto.parameters.required
+            parameters["required"] = function_declaration_proto.parameters.required
+        function_declaration = _FunctionDeclarationDict(
+            name=name, description=description, parameters=parameters
+        )
         function_declarations.append(function_declaration)
     return {"function_declarations": function_declarations}
 
 
-def _convert_to_genai_function(fc: _FunctionDeclarationLike) -> FunctionDeclaration:
-    if isinstance(fc, BaseTool):
-        return _convert_tool_to_genai_function(fc)
-    elif isinstance(fc, type) and issubclass(fc, BaseModel):
-        return _convert_pydantic_to_genai_function(fc)
-    elif callable(fc):
-        return _convert_tool_to_genai_function(callable_as_lc_tool()(fc))
-    elif isinstance(fc, dict):
-        formatted_fc = {"name": fc["name"], "description": fc.get("description")}
-        if "parameters" in fc:
-            formatted_fc["parameters"] = {
-                "properties": {
-                    k: {
-                        "type_": TYPE_ENUM[v["type"]],
-                        "description": v.get("description"),
-                    }
-                    for k, v in fc["parameters"]["properties"].items()
-                },
-                "required": fc.get("parameters", []).get("required", []),
-                "type_": TYPE_ENUM[fc["parameters"]["type"]],
-            }
-        return FunctionDeclaration(**formatted_fc)
+def _convert_fc_likes_to_genai_function(
+    fc_likes: _FunctionDeclarationLikeList,
+) -> Sequence[FunctionDeclaration]:
+    if isinstance(fc_likes, list):
+        return [_convert_fc_like_to_genai_function(fc) for fc in fc_likes]
+    raise ValueError(f"Unsupported fc_likes type {fc_likes}")
+
+
+def _convert_fc_like_to_genai_function(
+    fc_like: _FunctionDeclarationLike,
+) -> FunctionDeclaration:
+    if isinstance(fc_like, BaseTool):
+        return _convert_tool_to_genai_function(fc_like)
+    elif isinstance(fc_like, type) and issubclass(fc_like, BaseModel):
+        return _convert_pydantic_to_genai_function(fc_like)
+    elif isinstance(fc_like, dict):
+        # TODO: add declaration_index
+        return _convert_dict_to_genai_function(fc_like)
+    elif callable(fc_like):
+        return _convert_tool_to_genai_function(callable_as_lc_tool()(fc_like))
     else:
-        raise ValueError(f"Unsupported function call type {fc}")
+        raise ValueError(f"Unsupported fc_like type {fc_like}")
+
+
+def _convert_tool_dict_to_genai_functions(
+    tool_dict: _ToolDictLike,
+) -> Sequence[FunctionDeclaration]:
+    if "function_declarations" in tool_dict:
+        return _convert_dicts_to_genai_functions(tool_dict["function_declarations"])  # type: ignore
+    else:
+        raise ValueError(f"Unsupported function tool_dict type {tool_dict}")
+
+
+def _convert_dict_to_genai_functions(
+    function_declarations_dict: Dict[str, Any],
+) -> Sequence[FunctionDeclaration]:
+    if "function_declarations" in function_declarations_dict:
+        # GoogleTool like
+        return [
+            _convert_dict_to_genai_function(fc, i)
+            for i, fc in enumerate(function_declarations_dict["function_declarations"])
+        ]
+    d = function_declarations_dict
+    if "name" in d and "description" in d and "parameters" in d:
+        # _FunctionDeclarationDict
+        return [_convert_dict_to_genai_function(d)]
+    else:
+        # OpenAI like?
+        raise ValueError(f"Unsupported function call type {function_declarations_dict}")
+
+
+def _convert_dicts_to_genai_functions(
+    function_declaration_dicts: Sequence[Dict[str, Any]],
+) -> Sequence[FunctionDeclaration]:
+    return [
+        _convert_dict_to_genai_function(function_declaration_dict, i)
+        for i, function_declaration_dict in enumerate(function_declaration_dicts)
+    ]
+
+
+def _convert_dict_to_genai_function(
+    function_declaration_dict: Dict[str, Any], declaration_index: int = 0
+) -> FunctionDeclaration:
+    formatted_fc = {
+        "name": function_declaration_dict.get("name", f"unknown-{declaration_index}"),
+        "description": function_declaration_dict.get("description", "no-description"),
+    }
+    if "parameters" in function_declaration_dict:
+        formatted_fc["parameters"] = {
+            "properties": {
+                k: {
+                    "type_": TYPE_ENUM[v["type"]],
+                    "description": v.get("description"),
+                }
+                for k, v in function_declaration_dict["parameters"][
+                    "properties"
+                ].items()
+            },
+            "required": function_declaration_dict.get("parameters", []).get(
+                "required", []
+            ),
+            "type_": TYPE_ENUM[function_declaration_dict["parameters"]["type"]],
+        }
+    return FunctionDeclaration(**formatted_fc)
 
 
 def _convert_tool_to_genai_function(tool: BaseTool) -> FunctionDeclaration:
     if tool.args_schema:
-        schema = dereference_refs(tool.args_schema.schema())
-        schema.pop("definitions", None)
-        return FunctionDeclaration(
-            name=tool.name or schema["title"],
-            description=tool.description or schema["description"],
-            parameters={
-                "properties": {
-                    k: {
-                        "type_": TYPE_ENUM[v["type"]],
-                        "description": v.get("description"),
-                    }
-                    for k, v in schema["properties"].items()
-                },
-                "required": schema.get("required", []),
-                "type_": TYPE_ENUM[schema["type"]],
-            },
-        )
+        fc = tool.args_schema
+        if isinstance(fc, type) and issubclass(fc, BaseModel):
+            return _convert_pydantic_to_genai_function(
+                fc, tool_name=tool.name, tool_description=tool.description
+            )
+        raise ValueError(f"Unsupported function call type {fc}")
     else:
         return FunctionDeclaration(
             name=tool.name,
@@ -161,24 +242,46 @@ def _convert_tool_to_genai_function(tool: BaseTool) -> FunctionDeclaration:
 
 def _convert_pydantic_to_genai_function(
     pydantic_model: Type[BaseModel],
+    tool_name: Optional[str] = None,
+    tool_description: Optional[str] = None,
 ) -> FunctionDeclaration:
     schema = dereference_refs(pydantic_model.schema())
     schema.pop("definitions", None)
-    return FunctionDeclaration(
-        name=schema["title"],
-        description=schema.get("description", ""),
+    function_declaration = FunctionDeclaration(
+        name=tool_name if tool_name else schema.get("title"),
+        description=tool_description if tool_description else schema.get("description"),
         parameters={
             "properties": {
                 k: {
-                    "type_": TYPE_ENUM[v["type"]],
+                    "type_": _get_type_from_schema(v),
                     "description": v.get("description"),
                 }
                 for k, v in schema["properties"].items()
             },
-            "required": schema["required"],
+            "required": schema.get("required", []),
             "type_": TYPE_ENUM[schema["type"]],
         },
     )
+    return function_declaration
+
+
+def _get_type_from_schema(schema: Dict[str, Any]) -> int:
+    if "anyOf" in schema:
+        types = [_get_type_from_schema(sub_schema) for sub_schema in schema["anyOf"]]
+        types = [t for t in types if t is not None]  # Remove None values
+        if types:
+            return types[-1]  # TODO: update FunctionDeclaration and pass all types?
+        else:
+            pass
+    elif "type" in schema:
+        stype = str(schema["type"])
+        if stype in TYPE_ENUM:
+            return TYPE_ENUM[stype]
+        else:
+            pass
+    else:
+        pass
+    return TYPE_ENUM["string"]  # Default to string if no valid types found
 
 
 _ToolChoiceType = Union[

langchain_google_genai/chat_models.py

@@ -8,6 +8,7 @@ import os
 import uuid
 import warnings
 from io import BytesIO
+from operator import itemgetter
 from typing import (
     Any,
     AsyncIterator,
@@ -19,6 +20,7 @@ from typing import (
     Optional,
     Sequence,
     Tuple,
+    Type,
     Union,
     cast,
 )
@@ -65,10 +67,15 @@ from langchain_core.messages import (
     ToolMessage,
 )
 from langchain_core.messages.ai import UsageMetadata
-from langchain_core.output_parsers.openai_tools import parse_tool_calls
+from langchain_core.output_parsers.base import OutputParserLike
+from langchain_core.output_parsers.openai_tools import (
+    JsonOutputToolsParser,
+    PydanticToolsParser,
+    parse_tool_calls,
+)
 from langchain_core.outputs import ChatGeneration, ChatGenerationChunk, ChatResult
-from langchain_core.pydantic_v1 import Field, SecretStr, root_validator
-from langchain_core.runnables import Runnable
+from langchain_core.pydantic_v1 import BaseModel, Field, SecretStr, root_validator
+from langchain_core.runnables import Runnable, RunnablePassthrough
 from langchain_core.utils import get_from_dict_or_env
 from tenacity import (
     before_sleep_log,
@@ -612,8 +619,8 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
 
     convert_system_message_to_human: bool = False
     """Whether to merge any leading SystemMessage into the following HumanMessage.
-    
-    Gemini does not support system messages; any unsupported messages will 
+
+    Gemini does not support system messages; any unsupported messages will
     raise an error."""
 
     class Config:
@@ -937,6 +944,33 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         )
         return result.total_tokens
 
+    def with_structured_output(
+        self,
+        schema: Union[Dict, Type[BaseModel]],
+        *,
+        include_raw: bool = False,
+        **kwargs: Any,
+    ) -> Runnable[LanguageModelInput, Union[Dict, BaseModel]]:
+        if kwargs:
+            raise ValueError(f"Received unsupported arguments {kwargs}")
+        if isinstance(schema, type) and issubclass(schema, BaseModel):
+            parser: OutputParserLike = PydanticToolsParser(
+                tools=[schema], first_tool_only=True
+            )
+        else:
+            parser = JsonOutputToolsParser()
+        llm = self.bind_tools([schema], tool_choice=False)
+        if include_raw:
+            parser_with_fallback = RunnablePassthrough.assign(
+                parsed=itemgetter("raw") | parser, parsing_error=lambda _: None
+            ).with_fallbacks(
+                [RunnablePassthrough.assign(parsed=lambda _: None)],
+                exception_key="parsing_error",
+            )
+            return {"raw": llm} | parser_with_fallback
+        else:
+            return llm | parser
+
     def bind_tools(
         self,
         tools: Sequence[Union[ToolDict, GoogleTool]],
@@ -963,7 +997,9 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
                 f"both:\n\n{tool_choice=}\n\n{tool_config=}"
             )
         # Bind dicts for easier serialization/deserialization.
-        genai_tools = [tool_to_dict(convert_to_genai_function_declarations(tools))]
+        genai_tools = [
+            tool_to_dict(convert_to_genai_function_declarations(tool)) for tool in tools
+        ]
         if tool_choice:
             all_names = [
                 f["name"]  # type: ignore[index]
@@ -971,4 +1007,5 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
                 for f in t["function_declarations"]
             ]
             tool_config = _tool_choice_to_tool_config(tool_choice, all_names)
+
         return self.bind(tools=genai_tools, tool_config=tool_config, **kwargs)

langchain_google_genai/embeddings.py

@@ -86,6 +86,8 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
         google_api_key = get_from_dict_or_env(
             values, "google_api_key", "GOOGLE_API_KEY"
         )
+        if isinstance(google_api_key, SecretStr):
+            google_api_key = google_api_key.get_secret_value()
         client_info = get_client_info("GoogleGenerativeAIEmbeddings")
 
         values["client"] = build_generative_service(

langchain_google_genai/llms.py

@@ -325,9 +325,16 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
         run_manager: Optional[CallbackManagerForLLMRun] = None,
         **kwargs: Any,
     ) -> Iterator[GenerationChunk]:
-        generation_config = kwargs.get("generation_config", {})
-        if stop:
-            generation_config["stop_sequences"] = stop
+        generation_config = {
+            "stop_sequences": stop,
+            "temperature": self.temperature,
+            "top_p": self.top_p,
+            "top_k": self.top_k,
+            "max_output_tokens": self.max_output_tokens,
+            "candidate_count": self.n,
+        }
+        generation_config = generation_config | kwargs.get("generation_config", {})
+
         for stream_resp in _completion_with_retry(
             self,
             prompt,

{langchain_google_genai-1.0.6.dist-info → langchain_google_genai-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 1.0.6
+Version: 1.0.7
 Summary: An integration package connecting Google's genai package and LangChain
 Home-page: https://github.com/langchain-ai/langchain-google
 License: MIT
@@ -12,8 +12,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: images
-Requires-Dist: google-generativeai (>=0.5.2,<0.6.0)
-Requires-Dist: langchain-core (>=0.2.2,<0.3)
+Requires-Dist: google-generativeai (>=0.7.0,<0.8.0)
+Requires-Dist: langchain-core (>=0.2.9,<0.3)
 Requires-Dist: pillow (>=10.1.0,<11.0.0) ; extra == "images"
 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-1.0.6.dist-info → langchain_google_genai-1.0.7.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=d0ApSCjoV9Em1CteBaGznilxrw-PDXqQ4sQa5p7cJfM,8232
+langchain_google_genai/_function_utils.py,sha256=-q26KAD_76am90O5-UFIuBRGiVZJygrEbXyNqxEUHCw,11918
 langchain_google_genai/_genai_extension.py,sha256=ZwNwLV22RSf9LB7FOCLsoHzLlQDF-EQmRNYM1an2uSw,20769
 langchain_google_genai/_image_utils.py,sha256=-0XgCMdYkvrIktFvUpy-2GPbFgfSVKZICawB2hiJzus,4999
-langchain_google_genai/chat_models.py,sha256=__GK7Z2YUyoe-Dm2l1CjFhp1GX8n4Tfu2vUgC-Nsp34,35231
-langchain_google_genai/embeddings.py,sha256=QdFaDmtBAjifE0G-Das7F8s4aotJjdsBcpiS4kIbzyQ,9929
+langchain_google_genai/chat_models.py,sha256=8Mk11KBSuXnNp1Kn9o0pf8BLQvc0kMPZcvS1ooBFKNk,36526
+langchain_google_genai/embeddings.py,sha256=7HjFvlDnH7Lww8MKkhskJTqoBbmC-CKl89pbQ7PvmnA,10042
 langchain_google_genai/genai_aqa.py,sha256=zcC5cdFYtqLK7DGPhYGvWNeHHeU-CQKA9KhewmsA5lw,4303
 langchain_google_genai/google_vector_store.py,sha256=PPIk-4FmD5UUdmYA2u7VcEhGsiztvRVN59QoGLXdfoA,16139
-langchain_google_genai/llms.py,sha256=S7tOy-c37DElcHtkGl8rwvvg1zOzCxb9PEyJ4E-j7qU,13431
+langchain_google_genai/llms.py,sha256=lsHvp8reQAP2pkLVM73J9bdJrxlNYFyNygKgef2Fwwo,13663
 langchain_google_genai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-langchain_google_genai-1.0.6.dist-info/LICENSE,sha256=DppmdYJVSc1jd0aio6ptnMUn5tIHrdAhQ12SclEBfBg,1072
-langchain_google_genai-1.0.6.dist-info/METADATA,sha256=fT0mcqbE97UxS0n5xistf03D7l_xVSAsLAZdhSpBz20,3817
-langchain_google_genai-1.0.6.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langchain_google_genai-1.0.6.dist-info/RECORD,,
+langchain_google_genai-1.0.7.dist-info/LICENSE,sha256=DppmdYJVSc1jd0aio6ptnMUn5tIHrdAhQ12SclEBfBg,1072
+langchain_google_genai-1.0.7.dist-info/METADATA,sha256=iIE9Ue4On45Y3NFBPsIk0mnILxqbyJcBlGyZXvIDpOk,3817
+langchain_google_genai-1.0.7.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langchain_google_genai-1.0.7.dist-info/RECORD,,