langchain-google-genai 2.1.10__tar.gz → 2.1.11__tar.gz

{langchain_google_genai-2.1.10 → langchain_google_genai-2.1.11}/PKG-INFO

@@ -1,22 +1,14 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 2.1.10
+Version: 2.1.11
 Summary: An integration package connecting Google's genai package and LangChain
-Home-page: https://github.com/langchain-ai/langchain-google
 License: MIT
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-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.18,<0.7.0)
-Requires-Dist: langchain-core (>=0.3.75,<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
+Requires-Python: >=3.9
+Requires-Dist: langchain-core>=0.3.75
+Requires-Dist: google-ai-generativelanguage<1,>=0.7
+Requires-Dist: pydantic<3,>=2
+Requires-Dist: filetype<2,>=1.2
 Description-Content-Type: text/markdown
 
 # langchain-google-genai
@@ -258,4 +250,3 @@ print("Answerable probability:", response.answerable_probability)
 - [LangChain Documentation](https://docs.langchain.com/)
 - [Google Generative AI SDK](https://googleapis.github.io/python-genai/)
 - [Gemini Model Documentation](https://ai.google.dev/)
-

{langchain_google_genai-2.1.10 → langchain_google_genai-2.1.11}/langchain_google_genai/_function_utils.py

@@ -331,6 +331,10 @@ def _get_properties_from_schema(schema: Dict) -> Dict[str, Any]:
             logger.warning(f"Value '{v}' is not supported in schema, ignoring v={v}")
             continue
         properties_item: Dict[str, Union[str, int, Dict, List]] = {}
+
+        # Get description from original schema before any modifications
+        description = v.get("description")
+
         if v.get("anyOf") and all(
             anyOf_type.get("type") != "null" for anyOf_type in v.get("anyOf", [])
         ):
@@ -338,6 +342,9 @@ def _get_properties_from_schema(schema: Dict) -> Dict[str, Any]:
                 _format_json_schema_to_gapic(anyOf_type)
                 for anyOf_type in v.get("anyOf", [])
             ]
+            # For non-nullable anyOf, we still need to set a type
+            item_type_ = _get_type_from_schema(v)
+            properties_item["type_"] = item_type_
         elif v.get("type") or v.get("anyOf") or v.get("type_"):
             item_type_ = _get_type_from_schema(v)
             properties_item["type_"] = item_type_
@@ -354,7 +361,6 @@ def _get_properties_from_schema(schema: Dict) -> Dict[str, Any]:
         if v.get("enum"):
             properties_item["enum"] = v["enum"]
 
-        description = v.get("description")
         if description and isinstance(description, str):
             properties_item["description"] = description
 
@@ -377,8 +383,9 @@ def _get_properties_from_schema(schema: Dict) -> Dict[str, Any]:
                     properties_item["required"] = [
                         k for k, v in v_properties.items() if "default" not in v
                     ]
-            else:
-                # Providing dummy type for object without properties
+            elif not v.get("additionalProperties"):
+                # Only provide dummy type for object without properties AND without
+                # additionalProperties
                 properties_item["type_"] = glm.Type.STRING
 
         if k == "title" and "description" not in properties_item:
@@ -414,6 +421,8 @@ def _get_items_from_schema(schema: Union[Dict, List, str]) -> Dict[str, Any]:
             items["nullable"] = True
         if "required" in schema:
             items["required"] = schema["required"]
+        if "enum" in schema:
+            items["enum"] = schema["enum"]
     else:
         # str
         items["type_"] = _get_type_from_schema({"type": schema})

{langchain_google_genai-2.1.10 → langchain_google_genai-2.1.11}/langchain_google_genai/chat_models.py

@@ -92,13 +92,7 @@ from langchain_core.utils.function_calling import (
 )
 from langchain_core.utils.pydantic import is_basemodel_subclass
 from langchain_core.utils.utils import _build_model_kwargs
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    SecretStr,
-    model_validator,
-)
+from pydantic import BaseModel, ConfigDict, Field, SecretStr, model_validator
 from pydantic.v1 import BaseModel as BaseModelV1
 from tenacity import (
     before_sleep_log,
@@ -496,7 +490,12 @@ def _parse_chat_history(
     messages: List[Content] = []
 
     if convert_system_message_to_human:
-        warnings.warn("Convert_system_message_to_human will be deprecated!")
+        warnings.warn(
+            "The 'convert_system_message_to_human' parameter is deprecated and will be "
+            "removed in a future version. Use system instructions instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
 
     system_instruction: Optional[Content] = None
     messages_without_tool_messages = [
@@ -659,9 +658,15 @@ def _parse_response_candidate(
             function_call = {"name": part.function_call.name}
             # dump to match other function calling llm for now
             function_call_args_dict = proto.Message.to_dict(part.function_call)["args"]
-            function_call["arguments"] = json.dumps(
-                {k: function_call_args_dict[k] for k in function_call_args_dict}
-            )
+
+            # Fix: Correct integer-like floats from protobuf conversion
+            # The protobuf library sometimes converts integers to floats
+            corrected_args = {
+                k: int(v) if isinstance(v, float) and v.is_integer() else v
+                for k, v in function_call_args_dict.items()
+            }
+
+            function_call["arguments"] = json.dumps(corrected_args)
             additional_kwargs["function_call"] = function_call
 
             if streaming:
@@ -819,7 +824,15 @@ def _response_to_result(
         if stream:
             generations = [
                 ChatGenerationChunk(
-                    message=AIMessageChunk(content=""), generation_info={}
+                    message=AIMessageChunk(
+                        content="",
+                        response_metadata={
+                            "prompt_feedback": proto.Message.to_dict(
+                                response.prompt_feedback
+                            )
+                        },
+                    ),
+                    generation_info={},
                 )
             ]
         else:
@@ -1319,6 +1332,12 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     ``cachedContents/{cachedContent}``.
     """
 
+    stop: Optional[List[str]] = None
+    """Stop sequences for the model."""
+
+    streaming: Optional[bool] = None
+    """Whether to stream responses from the model."""
+
     model_kwargs: dict[str, Any] = Field(default_factory=dict)
     """Holds any unexpected initialization parameters."""
 
@@ -1530,18 +1549,21 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
                 "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 {}
+                        (
+                            {"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,
+                    if self.thinking_budget is not None
+                    or self.include_thoughts is not None
+                    else None
+                ),
             }.items()
             if v is not None
         }
@@ -1783,7 +1805,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         generation_config: Optional[Dict[str, Any]] = None,
         cached_content: Optional[str] = None,
         **kwargs: Any,
-    ) -> Tuple[GenerateContentRequest, Dict[str, Any]]:
+    ) -> GenerateContentRequest:
         if tool_choice and tool_config:
             raise ValueError(
                 "Must specify at most one of tool_choice and tool_config, received "
@@ -1809,10 +1831,13 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
                 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,
-        )
+        if self.convert_system_message_to_human:
+            system_instruction, history = _parse_chat_history(
+                messages,
+                convert_system_message_to_human=self.convert_system_message_to_human,
+            )
+        else:
+            system_instruction, history = _parse_chat_history(messages)
         if tool_choice:
             if not formatted_tools:
                 msg = (

{langchain_google_genai-2.1.10 → langchain_google_genai-2.1.11}/langchain_google_genai/embeddings.py

@@ -1,3 +1,4 @@
+import asyncio
 import re
 import string
 from typing import Any, Dict, List, Optional
@@ -26,6 +27,14 @@ _MAX_TOKENS_PER_BATCH = 20000
 _DEFAULT_BATCH_SIZE = 100
 
 
+def _is_event_loop_running() -> bool:
+    try:
+        asyncio.get_running_loop()
+        return True
+    except RuntimeError:
+        return False
+
+
 class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
     """`Google Generative AI Embeddings`.
 
@@ -107,15 +116,48 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
             client_options=self.client_options,
             transport=self.transport,
         )
-        self.async_client = build_generative_async_service(
-            credentials=self.credentials,
-            api_key=google_api_key,
-            client_info=client_info,
-            client_options=self.client_options,
-            transport=self.transport,
-        )
+        # Only initialize async client if there's an event loop running
+        # to avoid RuntimeError during synchronous initialization
+        if _is_event_loop_running():
+            # async clients don't support "rest" transport
+            transport = self.transport
+            if transport == "rest":
+                transport = "grpc_asyncio"
+            self.async_client = build_generative_async_service(
+                credentials=self.credentials,
+                api_key=google_api_key,
+                client_info=client_info,
+                client_options=self.client_options,
+                transport=transport,
+            )
+        else:
+            self.async_client = None
         return self
 
+    @property
+    def _async_client(self) -> Any:
+        """Get or create the async client when needed."""
+        if self.async_client is None:
+            if isinstance(self.google_api_key, SecretStr):
+                google_api_key: Optional[str] = self.google_api_key.get_secret_value()
+            else:
+                google_api_key = self.google_api_key
+
+            client_info = get_client_info("GoogleGenerativeAIEmbeddings")
+            # async clients don't support "rest" transport
+            transport = self.transport
+            if transport == "rest":
+                transport = "grpc_asyncio"
+
+            self.async_client = build_generative_async_service(
+                credentials=self.credentials,
+                api_key=google_api_key,
+                client_info=client_info,
+                client_options=self.client_options,
+                transport=transport,
+            )
+        return self.async_client
+
     @staticmethod
     def _split_by_punctuation(text: str) -> List[str]:
         """Splits a string by punctuation and whitespace characters."""
@@ -328,7 +370,7 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
             ]
 
             try:
-                result = await self.async_client.batch_embed_contents(
+                result = await self._async_client.batch_embed_contents(
                     BatchEmbedContentsRequest(requests=requests, model=self.model)
                 )
             except Exception as e:
@@ -366,7 +408,7 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
                 title=title,
                 output_dimensionality=output_dimensionality,
             )
-            result: EmbedContentResponse = await self.async_client.embed_content(
+            result: EmbedContentResponse = await self._async_client.embed_content(
                 request
             )
         except Exception as e:

{langchain_google_genai-2.1.10 → langchain_google_genai-2.1.11}/langchain_google_genai/llms.py

@@ -41,7 +41,7 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
         """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)

langchain_google_genai-2.1.11/pyproject.toml

@@ -0,0 +1,84 @@
+[build-system]
+requires = [
+    "pdm-backend",
+]
+build-backend = "pdm.backend"
+
+[project]
+name = "langchain-google-genai"
+version = "2.1.11"
+description = "An integration package connecting Google's genai package and LangChain"
+authors = []
+requires-python = ">=3.9"
+readme = "README.md"
+repository = "https://github.com/langchain-ai/langchain-google"
+dependencies = [
+    "langchain-core>=0.3.75",
+    "google-ai-generativelanguage>=0.7,<1",
+    "pydantic>=2,<3",
+    "filetype>=1.2,<2",
+]
+
+[project.license]
+text = "MIT"
+
+[project.urls]
+"Source Code" = "https://github.com/langchain-ai/langchain-google/tree/main/libs/genai"
+
+[dependency-groups]
+test = [
+    "pytest>=8.4,<9",
+    "freezegun>=1.5,<2",
+    "pytest-mock>=3.14,<4",
+    "syrupy>=4.9,<5",
+    "pytest-watcher>=0.4,<1",
+    "pytest-asyncio>=0.21,<1",
+    "pytest-retry>=1.7,<2",
+    "pytest-socket>=0.7,<1",
+    "numpy>=1.26.4; python_version<'3.13'",
+    "numpy>=2.1.0; python_version>='3.13'",
+    "langchain-tests>=0.3,<1",
+]
+test_integration = [
+    "pytest>=8.4,<9",
+]
+lint = [
+    "ruff>=0.12.10,<1",
+]
+typing = [
+    "mypy>=1.17.1,<2",
+    "types-requests>=2.31,<3",
+    "types-google-cloud-ndb>=2.2.0.1,<3",
+    "types-protobuf>=4.24.0.20240302,<5",
+    "numpy>=1.26.2",
+]
+dev = [
+    "types-requests>=2.31.0,<3",
+    "types-google-cloud-ndb>=2.2.0.1,<3",
+]
+
+[tool.ruff]
+fix = true
+
+[tool.ruff.lint]
+select = [
+    "E",
+    "F",
+    "I",
+]
+
+[tool.mypy]
+disallow_untyped_defs = "True"
+
+[tool.coverage.run]
+omit = [
+    "tests/*",
+]
+
+[tool.pytest.ini_options]
+markers = [
+    "requires: mark tests as requiring a specific library",
+    "asyncio: mark tests as requiring asyncio",
+    "compile: mark placeholder test used to compile integration tests without running them",
+]
+asyncio_mode = "auto"

langchain_google_genai-2.1.11/tests/conftest.py

@@ -0,0 +1,64 @@
+"""
+Tests configuration to be executed before tests execution.
+"""
+
+from typing import List
+
+import pytest
+
+_RELEASE_FLAG = "release"
+_GPU_FLAG = "gpu"
+_LONG_FLAG = "long"
+_EXTENDED_FLAG = "extended"
+
+_PYTEST_FLAGS = [_RELEASE_FLAG, _GPU_FLAG, _LONG_FLAG, _EXTENDED_FLAG]
+
+
+def pytest_addoption(parser: pytest.Parser) -> None:
+    """
+    Add flags accepted by pytest CLI.
+
+    Args:
+        parser: The pytest parser object.
+
+    Returns:
+
+    """
+    for flag in _PYTEST_FLAGS:
+        parser.addoption(
+            f"--{flag}", action="store_true", default=False, help=f"run {flag} tests"
+        )
+
+
+def pytest_configure(config: pytest.Config) -> None:
+    """
+    Add pytest custom configuration.
+
+    Args:
+        config: The pytest config object.
+
+    Returns:
+    """
+    for flag in _PYTEST_FLAGS:
+        config.addinivalue_line(
+            "markers", f"{flag}: mark test to run as {flag} only test"
+        )
+
+
+def pytest_collection_modifyitems(
+    config: pytest.Config, items: List[pytest.Item]
+) -> None:
+    """
+    Skip tests with a marker from our list that were not explicitly invoked.
+
+    Args:
+        config: The pytest config object.
+        items: The list of tests to be executed.
+
+    Returns:
+    """
+    for item in items:
+        keywords = list(set(item.keywords).intersection(_PYTEST_FLAGS))
+        if keywords and not any((config.getoption(f"--{kw}") for kw in keywords)):
+            skip = pytest.mark.skip(reason=f"need --{keywords[0]} option to run")
+            item.add_marker(skip)

langchain_google_genai-2.1.11/tests/integration_tests/.env.example

@@ -0,0 +1 @@
+PROJECT_ID=project_id

langchain_google_genai-2.1.11/tests/integration_tests/terraform/main.tf

@@ -0,0 +1,12 @@
+module "cloudbuild" {
+  source = "./../../../../../terraform/cloudbuild"
+  
+  library                    = "genai"
+  project_id                 = ""
+  cloudbuildv2_repository_id = ""
+  cloudbuild_env_vars = {
+  }
+  cloudbuild_secret_vars = {
+    GOOGLE_API_KEY = ""
+  }
+}

langchain_google_genai-2.1.11/tests/integration_tests/test_callbacks.py

@@ -0,0 +1,31 @@
+from typing import Any, List
+
+from langchain_core.callbacks import BaseCallbackHandler
+from langchain_core.outputs import LLMResult
+from langchain_core.prompts import PromptTemplate
+
+from langchain_google_genai import ChatGoogleGenerativeAI
+
+
+class StreamingLLMCallbackHandler(BaseCallbackHandler):
+    def __init__(self, **kwargs: Any):
+        super().__init__(**kwargs)
+        self.tokens: List[Any] = []
+        self.generations: List[Any] = []
+
+    def on_llm_new_token(self, token: str, **kwargs: Any) -> None:
+        self.tokens.append(token)
+
+    def on_llm_end(self, response: LLMResult, **kwargs: Any) -> Any:
+        self.generations.append(response.generations[0][0].text)
+
+
+def test_streaming_callback() -> None:
+    prompt_template = "Tell me details about the Company {name} with 2 bullet point?"
+    cb = StreamingLLMCallbackHandler()
+    llm = ChatGoogleGenerativeAI(model="models/gemini-2.0-flash-001", callbacks=[cb])
+    llm_chain = PromptTemplate.from_template(prompt_template) | llm
+    for t in llm_chain.stream({"name": "Google"}):
+        pass
+    assert len(cb.tokens) > 1
+    assert len(cb.generations) == 1