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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 2.1.3
+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
@@ -12,8 +12,8 @@ Classifier: Programming Language :: Python :: 3.10
 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.52,<0.4.0)
+Requires-Dist: google-ai-generativelanguage (>=0.6.18,<0.7.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
@@ -116,6 +116,22 @@ chain = {"animal": RunnablePassthrough()} | prompt | llm
 res = chain.invoke("cat")
 ```
 
+#### Thinking support
+
+Gemini 2.5 Flash model supports reasoning through their thoughts
+
+```
+from langchain_google_genai import ChatGoogleGenerativeAI
+
+llm = ChatGoogleGenerativeAI(model="models/gemini-2.5-flash-preview-04-17", thinking_budget=1024)
+
+response = llm.invoke(
+    "How many O's are in Google? Please tell me how you double checked the result"
+)
+
+assert response.usage_metadata["output_token_details"]["reasoning"] > 0
+```
+
 ## Embeddings
 
 This package also adds support for google's embeddings models.

{langchain_google_genai-2.1.3 → langchain_google_genai-2.1.5}/README.md

@@ -95,6 +95,22 @@ chain = {"animal": RunnablePassthrough()} | prompt | llm
 res = chain.invoke("cat")
 ```
 
+#### Thinking support
+
+Gemini 2.5 Flash model supports reasoning through their thoughts
+
+```
+from langchain_google_genai import ChatGoogleGenerativeAI
+
+llm = ChatGoogleGenerativeAI(model="models/gemini-2.5-flash-preview-04-17", thinking_budget=1024)
+
+response = llm.invoke(
+    "How many O's are in Google? Please tell me how you double checked the result"
+)
+
+assert response.usage_metadata["output_token_details"]["reasoning"] > 0
+```
+
 ## Embeddings
 
 This package also adds support for google's embeddings models.

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

@@ -1,3 +1,4 @@
+import os
 from importlib import metadata
 from typing import Any, Dict, List, Optional, Tuple, TypedDict
 
@@ -7,6 +8,9 @@ from pydantic import BaseModel, Field, SecretStr
 
 from langchain_google_genai._enums import HarmBlockThreshold, HarmCategory, Modality
 
+_TELEMETRY_TAG = "remote_reasoning_engine"
+_TELEMETRY_ENV_VARIABLE_NAME = "GOOGLE_CLOUD_AGENT_ENGINE_ID"
+
 
 class GoogleGenerativeAIError(Exception):
     """
@@ -76,6 +80,15 @@ Supported examples:
         default=None, description=("A list of modalities of the response")
     )
 
+    thinking_budget: Optional[int] = Field(
+        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. 
     
@@ -124,6 +137,8 @@ def get_user_agent(module: Optional[str] = None) -> Tuple[str, str]:
     client_library_version = (
         f"{langchain_version}-{module}" if module else langchain_version
     )
+    if os.environ.get(_TELEMETRY_ENV_VARIABLE_NAME):
+        client_library_version += f"+{_TELEMETRY_TAG}"
     return client_library_version, f"langchain-google-genai/{client_library_version}"
 
 

{langchain_google_genai-2.1.3 → langchain_google_genai-2.1.5}/langchain_google_genai/_function_utils.py

@@ -384,6 +384,8 @@ def _get_items_from_schema(schema: Union[Dict, List, str]) -> Dict[str, Any]:
         items["type_"] = _get_type_from_schema(schema)
         if items["type_"] == glm.Type.OBJECT and "properties" in schema:
             items["properties"] = _get_properties_from_schema_any(schema["properties"])
+        if items["type_"] == glm.Type.ARRAY and "items" in schema:
+            items["items"] = _format_json_schema_to_gapic(schema["items"])
         if "title" in schema or "description" in schema:
             items["description"] = (
                 schema.get("description") or schema.get("title") or ""

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

@@ -78,7 +78,9 @@ from langchain_core.output_parsers.openai_tools import (
 from langchain_core.outputs import ChatGeneration, ChatGenerationChunk, ChatResult
 from langchain_core.runnables import Runnable, RunnableConfig, RunnablePassthrough
 from langchain_core.tools import BaseTool
+from langchain_core.utils import get_pydantic_field_names
 from langchain_core.utils.function_calling import convert_to_openai_tool
+from langchain_core.utils.utils import _build_model_kwargs
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -245,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]:
@@ -332,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:
@@ -354,7 +387,8 @@ def _convert_tool_message_to_part(
             ),
         )
     )
-    return part
+    parts.append(part)
+    return parts
 
 
 def _get_ai_message_tool_messages_parts(
@@ -372,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
@@ -440,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}."
@@ -463,12 +499,26 @@ def _parse_response_candidate(
         try:
             text: Optional[str] = part.text
             # Remove erroneous newline character if present
-            if text is not None:
+            if not streaming and text is not None:
                 text = text.rstrip("\n")
         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:
@@ -621,14 +671,24 @@ def _response_to_result(
         input_tokens = response.usage_metadata.prompt_token_count
         output_tokens = response.usage_metadata.candidates_token_count
         total_tokens = response.usage_metadata.total_token_count
+        thought_tokens = response.usage_metadata.thoughts_token_count
         cache_read_tokens = response.usage_metadata.cached_content_token_count
         if input_tokens + output_tokens + cache_read_tokens + total_tokens > 0:
-            lc_usage = UsageMetadata(
-                input_tokens=input_tokens - prev_input_tokens,
-                output_tokens=output_tokens - prev_output_tokens,
-                total_tokens=total_tokens - prev_total_tokens,
-                input_token_details={"cache_read": cache_read_tokens},
-            )
+            if thought_tokens > 0:
+                lc_usage = UsageMetadata(
+                    input_tokens=input_tokens - prev_input_tokens,
+                    output_tokens=output_tokens - prev_output_tokens,
+                    total_tokens=total_tokens - prev_total_tokens,
+                    input_token_details={"cache_read": cache_read_tokens},
+                    output_token_details={"reasoning": thought_tokens},
+                )
+            else:
+                lc_usage = UsageMetadata(
+                    input_tokens=input_tokens - prev_input_tokens,
+                    output_tokens=output_tokens - prev_output_tokens,
+                    total_tokens=total_tokens - prev_total_tokens,
+                    input_token_details={"cache_read": cache_read_tokens},
+                )
         else:
             lc_usage = None
     except AttributeError:
@@ -646,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:
@@ -700,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:
@@ -785,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(
@@ -841,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(
@@ -1015,11 +1082,14 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     ``cachedContents/{cachedContent}``.
     """
 
+    model_kwargs: dict[str, Any] = Field(default_factory=dict)
+    """Holds any unexpected initialization parameters."""
+
     def __init__(self, **kwargs: Any) -> None:
         """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)
@@ -1061,6 +1131,14 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     def is_lc_serializable(self) -> bool:
         return True
 
+    @model_validator(mode="before")
+    @classmethod
+    def build_extra(cls, values: dict[str, Any]) -> Any:
+        """Build extra kwargs from additional params that were passed in."""
+        all_required_field_names = get_pydantic_field_names(cls)
+        values = _build_model_kwargs(values, all_required_field_names)
+        return values
+
     @model_validator(mode="after")
     def validate_environment(self) -> Self:
         """Validates params and passes them to google-generativeai package."""
@@ -1080,7 +1158,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
 
         additional_headers = self.additional_headers or {}
         self.default_metadata = tuple(additional_headers.items())
-        client_info = get_client_info("ChatGoogleGenerativeAI")
+        client_info = get_client_info(f"ChatGoogleGenerativeAI:{self.model}")
         google_api_key = None
         if not self.credentials:
             if isinstance(self.google_api_key, SecretStr):
@@ -1120,7 +1198,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
             self.async_client_running = genaix.build_generative_async_service(
                 credentials=self.credentials,
                 api_key=google_api_key,
-                client_info=get_client_info("ChatGoogleGenerativeAI"),
+                client_info=get_client_info(f"ChatGoogleGenerativeAI:{self.model}"),
                 client_options=self.client_options,
                 transport=transport,
             )
@@ -1136,6 +1214,8 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
             "n": self.n,
             "safety_settings": self.safety_settings,
             "response_modalities": self.response_modalities,
+            "thinking_budget": self.thinking_budget,
+            "include_thoughts": self.include_thoughts,
         }
 
     def invoke(
@@ -1179,9 +1259,15 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     ) -> LangSmithParams:
         """Get standard params for tracing."""
         params = self._get_invocation_params(stop=stop, **kwargs)
+        models_prefix = "models/"
+        ls_model_name = (
+            self.model[len(models_prefix) :]
+            if self.model and self.model.startswith(models_prefix)
+            else self.model
+        )
         ls_params = LangSmithParams(
             ls_provider="google_genai",
-            ls_model_name=self.model,
+            ls_model_name=ls_model_name,
             ls_model_type="chat",
             ls_temperature=params.get("temperature", self.temperature),
         )
@@ -1206,6 +1292,20 @@ 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
+                        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.3 → langchain_google_genai-2.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "2.1.3"
+version = "2.1.5"
 description = "An integration package connecting Google's genai package and LangChain"
 authors = []
 readme = "README.md"
@@ -12,8 +12,8 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-langchain-core = "^0.3.52"
-google-ai-generativelanguage = "^0.6.16"
+langchain-core = "^0.3.62"
+google-ai-generativelanguage = "^0.6.18"
 pydantic = ">=2,<3"
 filetype = "^1.2.0"
 
@@ -27,8 +27,9 @@ 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.18"
+langchain-tests = "0.3.19"
 
 [tool.codespell]
 ignore-words-list = "rouge"