langchain-google-genai 1.0.8__tar.gz → 1.0.10__tar.gz

{langchain_google_genai-1.0.8 → langchain_google_genai-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 1.0.8
+Version: 1.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
 Provides-Extra: images
 Requires-Dist: google-generativeai (>=0.7.0,<0.8.0)
-Requires-Dist: langchain-core (>=0.2.17,<0.3)
+Requires-Dist: langchain-core (>=0.2.33,<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.8 → langchain_google_genai-1.0.10}/langchain_google_genai/_function_utils.py

@@ -107,6 +107,13 @@ def _format_json_schema_to_gapic(schema: Dict[str, Any]) -> Dict[str, Any]:
                     pvalue
                 )
             continue
+        elif key == "allOf":
+            if len(value) > 1:
+                logger.warning(
+                    "Only first value for 'allOf' key is supported. "
+                    f"Got {len(value)}, ignoring other than first value!"
+                )
+            return _format_json_schema_to_gapic(value[0])
         elif key in ["type", "_type"]:
             converted_schema["type"] = str(value).upper()
         elif key not in _ALLOWED_SCHEMA_FIELDS_SET:
@@ -116,11 +123,13 @@ def _format_json_schema_to_gapic(schema: Dict[str, Any]) -> Dict[str, Any]:
     return converted_schema
 
 
-def _dict_to_gapic_schema(schema: Dict[str, Any]) -> gapic.Schema:
-    dereferenced_schema = dereference_refs(schema)
-    formatted_schema = _format_json_schema_to_gapic(dereferenced_schema)
-    json_schema = json.dumps(formatted_schema)
-    return gapic.Schema.from_json(json_schema)
+def _dict_to_gapic_schema(schema: Dict[str, Any]) -> Optional[gapic.Schema]:
+    if schema:
+        dereferenced_schema = dereference_refs(schema)
+        formatted_schema = _format_json_schema_to_gapic(dereferenced_schema)
+        json_schema = json.dumps(formatted_schema)
+        return gapic.Schema.from_json(json_schema)
+    return None
 
 
 def _format_dict_to_function_declaration(
@@ -196,7 +205,11 @@ def _format_to_gapic_function_declaration(
             function = cast(dict, tool)
             function["parameters"] = {}
         else:
-            function = convert_to_openai_tool(cast(dict, tool))["function"]
+            if "parameters" in tool and tool["parameters"].get("properties"):
+                function = convert_to_openai_tool(cast(dict, tool))["function"]
+            else:
+                function = cast(dict, tool)
+                function["parameters"] = {}
         return _format_dict_to_function_declaration(cast(FunctionDescription, function))
     elif callable(tool):
         return _format_base_tool_to_function_declaration(callable_as_lc_tool()(tool))

{langchain_google_genai-1.0.8 → langchain_google_genai-1.0.10}/langchain_google_genai/chat_models.py

@@ -32,8 +32,10 @@ import google.api_core
 import proto  # type: ignore[import]
 import requests
 from google.ai.generativelanguage_v1beta.types import (
+    Blob,
     Candidate,
     Content,
+    FileData,
     FunctionCall,
     FunctionResponse,
     GenerateContentRequest,
@@ -42,6 +44,7 @@ from google.ai.generativelanguage_v1beta.types import (
     Part,
     SafetySetting,
     ToolConfig,
+    VideoMetadata,
 )
 from google.generativeai.types import Tool as GoogleTool  # type: ignore[import]
 from google.generativeai.types.content_types import (  # type: ignore[import]
@@ -75,6 +78,7 @@ from langchain_core.outputs import ChatGeneration, ChatGenerationChunk, ChatResu
 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 langchain_core.utils.pydantic import is_basemodel_subclass
 from tenacity import (
     before_sleep_log,
     retry,
@@ -324,8 +328,35 @@ def _convert_to_parts(
                             )
                         img_url = img_url["url"]
                     parts.append(image_loader.load_part(img_url))
+                # Handle media type like LangChain.js
+                # https://github.com/langchain-ai/langchainjs/blob/e536593e2585f1dd7b0afc187de4d07cb40689ba/libs/langchain-google-common/src/utils/gemini.ts#L93-L106
+                elif part["type"] == "media":
+                    if "mime_type" not in part:
+                        raise ValueError(f"Missing mime_type in media part: {part}")
+                    mime_type = part["mime_type"]
+                    media_part = Part()
+
+                    if "data" in part:
+                        media_part.inline_data = Blob(
+                            data=part["data"], mime_type=mime_type
+                        )
+                    elif "file_uri" in part:
+                        media_part.file_data = FileData(
+                            file_uri=part["file_uri"], mime_type=mime_type
+                        )
+                    else:
+                        raise ValueError(
+                            f"Media part must have either data or file_uri: {part}"
+                        )
+                    if "video_metadata" in part:
+                        metadata = VideoMetadata(part["video_metadata"])
+                        media_part.video_metadata = metadata
+                    parts.append(media_part)
                 else:
-                    raise ValueError(f"Unrecognized message part type: {part['type']}")
+                    raise ValueError(
+                        f"Unrecognized message part type: {part['type']}. Only text, "
+                        f"image_url, and media types are supported."
+                    )
             else:
                 # Yolo
                 logger.warning(
@@ -784,8 +815,8 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
 
     """  # noqa: E501
 
-    client: Any = None  #: :meta private:
-    async_client: Any = None  #: :meta private:
+    client: Any = Field(default=None, exclude=True)  #: :meta private:
+    async_client: Any = Field(default=None, exclude=True)  #: :meta private:
     google_api_key: Optional[SecretStr] = Field(default=None, alias="api_key")
     """Google AI API key. 
         
@@ -1153,7 +1184,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     ) -> Runnable[LanguageModelInput, Union[Dict, BaseModel]]:
         if kwargs:
             raise ValueError(f"Received unsupported arguments {kwargs}")
-        if isinstance(schema, type) and issubclass(schema, BaseModel):
+        if isinstance(schema, type) and is_basemodel_subclass(schema):
             parser: OutputParserLike = PydanticToolsParser(
                 tools=[schema], first_tool_only=True
             )

{langchain_google_genai-1.0.8 → langchain_google_genai-1.0.10}/langchain_google_genai/llms.py

@@ -9,7 +9,7 @@ from langchain_core.callbacks import (
     AsyncCallbackManagerForLLMRun,
     CallbackManagerForLLMRun,
 )
-from langchain_core.language_models import LanguageModelInput
+from langchain_core.language_models import LangSmithParams, LanguageModelInput
 from langchain_core.language_models.llms import BaseLLM, create_base_retry_decorator
 from langchain_core.outputs import Generation, GenerationChunk, LLMResult
 from langchain_core.pydantic_v1 import BaseModel, Field, SecretStr, root_validator
@@ -268,6 +268,16 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
 
         return values
 
+    def _get_ls_params(
+        self, stop: Optional[List[str]] = None, **kwargs: Any
+    ) -> LangSmithParams:
+        """Get standard params for tracing."""
+        ls_params = super()._get_ls_params(stop=stop, **kwargs)
+        ls_params["ls_provider"] = "google_genai"
+        if ls_max_tokens := kwargs.get("max_output_tokens", self.max_output_tokens):
+            ls_params["ls_max_tokens"] = ls_max_tokens
+        return ls_params
+
     def _generate(
         self,
         prompts: List[str],

{langchain_google_genai-1.0.8 → langchain_google_genai-1.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "1.0.8"
+version = "1.0.10"
 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.2.17,<0.3"
+langchain-core = ">=0.2.33,<0.3"
 google-generativeai = "^0.7.0"
 pillow = { version = "^10.1.0", optional = true }