langchain-google-genai 1.0.9__tar.gz → 2.0.0.dev1__tar.gz

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 1.0.9
+Version: 2.0.0.dev1
 Summary: An integration package connecting Google's genai package and LangChain
 Home-page: https://github.com/langchain-ai/langchain-google
 License: MIT
@@ -13,8 +13,9 @@ 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.32,<0.3)
+Requires-Dist: langchain-core (>=0.3.0.dev4,<0.4.0)
 Requires-Dist: pillow (>=10.1.0,<11.0.0) ; extra == "images"
+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
 Description-Content-Type: text/markdown

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/langchain_google_genai/_function_utils.py

@@ -22,7 +22,6 @@ import google.ai.generativelanguage as glm
 import google.ai.generativelanguage_v1beta.types as gapic
 import proto  # type: ignore[import]
 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
 from langchain_core.utils.function_calling import (
@@ -30,6 +29,8 @@ from langchain_core.utils.function_calling import (
     convert_to_openai_tool,
 )
 from langchain_core.utils.json_schema import dereference_refs
+from pydantic import BaseModel
+from pydantic.v1 import BaseModel as BaseModelV1
 
 logger = logging.getLogger(__name__)
 
@@ -107,6 +108,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:
@@ -198,7 +206,7 @@ def _format_to_gapic_function_declaration(
             function = cast(dict, tool)
             function["parameters"] = {}
         else:
-            if "parameters" in tool and tool["parameters"].get("properties"):
+            if "parameters" in tool and tool["parameters"].get("properties"):  # type: ignore[index]
                 function = convert_to_openai_tool(cast(dict, tool))["function"]
             else:
                 function = cast(dict, tool)
@@ -225,7 +233,14 @@ def _format_base_tool_to_function_declaration(
             ),
         )
 
-    schema = tool.args_schema.schema()
+    if issubclass(tool.args_schema, BaseModel):
+        schema = tool.args_schema.model_json_schema()
+    elif issubclass(tool.args_schema, BaseModelV1):
+        schema = tool.args_schema.schema()
+    else:
+        raise NotImplementedError(
+            f"args_schema must be a Pydantic BaseModel, got {tool.args_schema}."
+        )
     parameters = _dict_to_gapic_schema(schema)
 
     return gapic.FunctionDeclaration(
@@ -240,7 +255,15 @@ def _convert_pydantic_to_genai_function(
     tool_name: Optional[str] = None,
     tool_description: Optional[str] = None,
 ) -> gapic.FunctionDeclaration:
-    schema = dereference_refs(pydantic_model.schema())
+    if issubclass(pydantic_model, BaseModel):
+        schema = pydantic_model.model_json_schema()
+    elif issubclass(pydantic_model, BaseModelV1):
+        schema = pydantic_model.schema()
+    else:
+        raise NotImplementedError(
+            f"pydantic_model must be a Pydantic BaseModel, got {pydantic_model}"
+        )
+    schema = dereference_refs(schema)
     schema.pop("definitions", None)
     function_declaration = gapic.FunctionDeclaration(
         name=tool_name if tool_name else schema.get("title"),

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/langchain_google_genai/chat_models.py

@@ -75,10 +75,16 @@ from langchain_core.output_parsers.openai_tools import (
     parse_tool_calls,
 )
 from langchain_core.outputs import ChatGeneration, ChatGenerationChunk, ChatResult
-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 import secret_from_env
 from langchain_core.utils.pydantic import is_basemodel_subclass
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    SecretStr,
+    model_validator,
+)
 from tenacity import (
     before_sleep_log,
     retry,
@@ -86,6 +92,7 @@ from tenacity import (
     stop_after_attempt,
     wait_exponential,
 )
+from typing_extensions import Self
 
 from langchain_google_genai._common import (
     GoogleGenerativeAIError,
@@ -817,9 +824,10 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
 
     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. 
-        
+    google_api_key: Optional[SecretStr] = Field(
+        alias="api_key", default_factory=secret_from_env("GOOGLE_API_KEY", default=None)
+    )
+    """Google AI API key.         
     If not specified will be read from env var ``GOOGLE_API_KEY``."""
     default_metadata: Sequence[Tuple[str, str]] = Field(
         default_factory=list
@@ -827,12 +835,13 @@ 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:
-        allow_population_by_field_name = True
+    model_config = ConfigDict(
+        populate_by_name=True,
+    )
 
     @property
     def lc_secrets(self) -> Dict[str, str]:
@@ -846,40 +855,36 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     def is_lc_serializable(self) -> bool:
         return True
 
-    @root_validator()
-    def validate_environment(cls, values: Dict) -> Dict:
+    @model_validator(mode="after")
+    def validate_environment(self) -> Self:
         """Validates params and passes them to google-generativeai package."""
-        if (
-            values.get("temperature") is not None
-            and not 0 <= values["temperature"] <= 1
-        ):
+        if self.temperature is not None and not 0 <= self.temperature <= 1:
             raise ValueError("temperature must be in the range [0.0, 1.0]")
 
-        if values.get("top_p") is not None and not 0 <= values["top_p"] <= 1:
+        if self.top_p is not None and not 0 <= self.top_p <= 1:
             raise ValueError("top_p must be in the range [0.0, 1.0]")
 
-        if values.get("top_k") is not None and values["top_k"] <= 0:
+        if self.top_k is not None and self.top_k <= 0:
             raise ValueError("top_k must be positive")
 
-        if not values["model"].startswith("models/"):
-            values["model"] = f"models/{values['model']}"
+        if not self.model.startswith("models/"):
+            self.model = f"models/{self.model}"
 
-        additional_headers = values.get("additional_headers") or {}
-        values["default_metadata"] = tuple(additional_headers.items())
+        additional_headers = self.additional_headers or {}
+        self.default_metadata = tuple(additional_headers.items())
         client_info = get_client_info("ChatGoogleGenerativeAI")
         google_api_key = None
-        if not values.get("credentials"):
-            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()
-        transport: Optional[str] = values.get("transport")
-        values["client"] = genaix.build_generative_service(
-            credentials=values.get("credentials"),
+        if not self.credentials:
+            if isinstance(self.google_api_key, SecretStr):
+                google_api_key = self.google_api_key.get_secret_value()
+            else:
+                google_api_key = self.google_api_key
+        transport: Optional[str] = self.transport
+        self.client = genaix.build_generative_service(
+            credentials=self.credentials,
             api_key=google_api_key,
             client_info=client_info,
-            client_options=values.get("client_options"),
+            client_options=self.client_options,
             transport=transport,
         )
 
@@ -889,17 +894,17 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         # this check ensures that async client is only initialized
         # within an asyncio event loop to avoid the error
         if _is_event_loop_running():
-            values["async_client"] = genaix.build_generative_async_service(
-                credentials=values.get("credentials"),
+            self.async_client = genaix.build_generative_async_service(
+                credentials=self.credentials,
                 api_key=google_api_key,
                 client_info=client_info,
-                client_options=values.get("client_options"),
+                client_options=self.client_options,
                 transport=transport,
             )
         else:
-            values["async_client"] = None
+            self.async_client = None
 
-        return values
+        return self
 
     @property
     def _identifying_params(self) -> Dict[str, Any]:

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/langchain_google_genai/embeddings.py

@@ -8,8 +8,9 @@ from google.ai.generativelanguage_v1beta.types import (
     EmbedContentRequest,
 )
 from langchain_core.embeddings import Embeddings
-from langchain_core.pydantic_v1 import BaseModel, Field, SecretStr, root_validator
-from langchain_core.utils import get_from_dict_or_env
+from langchain_core.utils import secret_from_env
+from pydantic import BaseModel, Field, SecretStr, model_validator
+from typing_extensions import Self
 
 from langchain_google_genai._common import (
     GoogleGenerativeAIError,
@@ -52,9 +53,11 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
         "semantic_similarity, classification, and clustering",
     )
     google_api_key: Optional[SecretStr] = Field(
-        default=None,
-        description="The Google API key to use. If not provided, "
-        "the GOOGLE_API_KEY environment variable will be used.",
+        default_factory=secret_from_env("GOOGLE_API_KEY", default=None),
+        description=(
+            "The Google API key to use. If not provided, "
+            "the GOOGLE_API_KEY environment variable will be used."
+        ),
     )
     credentials: Any = Field(
         default=None,
@@ -80,23 +83,22 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
         "Example: `{'timeout': 10}`",
     )
 
-    @root_validator()
-    def validate_environment(cls, values: Dict) -> Dict:
+    @model_validator(mode="after")
+    def validate_environment(self) -> Self:
         """Validates params and passes them to google-generativeai package."""
-        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()
+        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")
 
-        values["client"] = build_generative_service(
-            credentials=values.get("credentials"),
+        self.client = build_generative_service(
+            credentials=self.credentials,
             api_key=google_api_key,
             client_info=client_info,
-            client_options=values.get("client_options"),
+            client_options=self.client_options,
         )
-        return values
+        return self
 
     @staticmethod
     def _split_by_punctuation(text: str) -> List[str]:

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/langchain_google_genai/genai_aqa.py

@@ -9,9 +9,9 @@ https://developers.generativeai.google/guide
 from typing import Any, List, Optional
 
 import google.ai.generativelanguage as genai
-from langchain_core.pydantic_v1 import BaseModel, PrivateAttr
 from langchain_core.runnables import RunnableSerializable
 from langchain_core.runnables.config import RunnableConfig
+from pydantic import BaseModel, PrivateAttr
 
 from . import _genai_extension as genaix
 

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/langchain_google_genai/google_vector_store.py

@@ -21,9 +21,9 @@ from typing import (
 import google.ai.generativelanguage as genai
 from langchain_core.documents import Document
 from langchain_core.embeddings import Embeddings
-from langchain_core.pydantic_v1 import BaseModel, PrivateAttr
 from langchain_core.runnables import Runnable, RunnableLambda, RunnablePassthrough
 from langchain_core.vectorstores import VectorStore
+from pydantic import BaseModel, PrivateAttr
 
 from . import _genai_extension as genaix
 from .genai_aqa import (
@@ -467,7 +467,7 @@ class GoogleVectorStore(VectorStore):
         return (
             RunnablePassthrough[str]()
             | {
-                "prompt": RunnablePassthrough(),
+                "prompt": RunnablePassthrough(),  # type: ignore[dict-item]
                 "passages": self.as_retriever(),
             }
             | RunnableLambda(_toAqaInput)

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/langchain_google_genai/llms.py

@@ -9,11 +9,12 @@ 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
-from langchain_core.utils import get_from_dict_or_env
+from langchain_core.utils import secret_from_env
+from pydantic import BaseModel, Field, SecretStr, model_validator
+from typing_extensions import Self
 
 from langchain_google_genai._enums import (
     HarmBlockThreshold,
@@ -122,7 +123,9 @@ Supported examples:
     - models/text-bison-001""",
     )
     """Model name to use."""
-    google_api_key: Optional[SecretStr] = None
+    google_api_key: Optional[SecretStr] = Field(
+        alias="api_key", default_factory=secret_from_env("GOOGLE_API_KEY", default=None)
+    )
     credentials: Any = None
     "The default custom credentials (google.auth.credentials.Credentials) to use "
     "when making API calls. If not provided, credentials will be ascertained from "
@@ -214,30 +217,29 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
 
     client: Any = None  #: :meta private:
 
-    @root_validator()
-    def validate_environment(cls, values: Dict) -> Dict:
+    @model_validator(mode="after")
+    def validate_environment(self) -> Self:
         """Validates params and passes them to google-generativeai package."""
-        if values.get("credentials"):
+        if self.credentials:
             genai.configure(
-                credentials=values.get("credentials"),
-                transport=values.get("transport"),
-                client_options=values.get("client_options"),
+                credentials=self.credentials,
+                transport=self.transport,
+                client_options=self.client_options,
             )
         else:
-            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()
+            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
             genai.configure(
                 api_key=google_api_key,
-                transport=values.get("transport"),
-                client_options=values.get("client_options"),
+                transport=self.transport,
+                client_options=self.client_options,
             )
 
-        model_name = values["model"]
+        model_name = self.model
 
-        safety_settings = values["safety_settings"]
+        safety_settings = self.safety_settings
 
         if safety_settings and (
             not GoogleModelFamily(model_name) == GoogleModelFamily.GEMINI
@@ -245,28 +247,38 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
             raise ValueError("Safety settings are only supported for Gemini models")
 
         if GoogleModelFamily(model_name) == GoogleModelFamily.GEMINI:
-            values["client"] = genai.GenerativeModel(
+            self.client = genai.GenerativeModel(
                 model_name=model_name, safety_settings=safety_settings
             )
         else:
-            values["client"] = genai
+            self.client = genai
 
-        if values["temperature"] is not None and not 0 <= values["temperature"] <= 1:
+        if self.temperature is not None and not 0 <= self.temperature <= 1:
             raise ValueError("temperature must be in the range [0.0, 1.0]")
 
-        if values["top_p"] is not None and not 0 <= values["top_p"] <= 1:
+        if self.top_p is not None and not 0 <= self.top_p <= 1:
             raise ValueError("top_p must be in the range [0.0, 1.0]")
 
-        if values["top_k"] is not None and values["top_k"] <= 0:
+        if self.top_k is not None and self.top_k <= 0:
             raise ValueError("top_k must be positive")
 
-        if values["max_output_tokens"] is not None and values["max_output_tokens"] <= 0:
+        if self.max_output_tokens is not None and self.max_output_tokens <= 0:
             raise ValueError("max_output_tokens must be greater than zero")
 
-        if values["timeout"] is not None and values["timeout"] <= 0:
+        if self.timeout is not None and self.timeout <= 0:
             raise ValueError("timeout must be greater than zero")
 
-        return values
+        return self
+
+    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,

{langchain_google_genai-1.0.9 → langchain_google_genai-2.0.0.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "1.0.9"
+version = "2.0.0.dev1"
 description = "An integration package connecting Google's genai package and LangChain"
 authors = []
 readme = "README.md"
@@ -12,9 +12,10 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-langchain-core = ">=0.2.32,<0.3"
+langchain-core = { version = "^0.3.0.dev4", allow-prereleases = true }
 google-generativeai = "^0.7.0"
 pillow = { version = "^10.1.0", optional = true }
+pydantic = ">=2,<3"
 
 [tool.poetry.extras]
 images = ["pillow"]
@@ -30,8 +31,8 @@ syrupy = "^4.0.2"
 pytest-watcher = "^0.3.4"
 pytest-asyncio = "^0.21.1"
 numpy = "^1.26.2"
-langchain-core = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core" }
-langchain-standard-tests = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/standard-tests" }
+langchain-core = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core", branch = "v0.3rc" }
+langchain-standard-tests = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/standard-tests", branch = "v0.3rc" }
 
 [tool.codespell]
 ignore-words-list = "rouge"
@@ -56,12 +57,12 @@ optional = true
 ruff = "^0.1.5"
 
 [tool.poetry.group.typing.dependencies]
-mypy = "^0.991"
+mypy = "^1.10"
 types-requests = "^2.28.11.5"
 types-google-cloud-ndb = "^2.2.0.1"
 types-pillow = "^10.1.0.2"
 types-protobuf = "^4.24.0.20240302"
-langchain-core = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core" }
+langchain-core = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core", branch = "v0.3rc" }
 numpy = "^1.26.2"
 
 [tool.poetry.group.dev]
@@ -72,7 +73,7 @@ pillow = "^10.1.0"
 types-requests = "^2.31.0.10"
 types-pillow = "^10.1.0.2"
 types-google-cloud-ndb = "^2.2.0.1"
-langchain-core = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core" }
+langchain-core = { git = "https://github.com/langchain-ai/langchain.git", subdirectory = "libs/core", branch = "v0.3rc" }
 
 [tool.ruff.lint]
 select = [