langchain-google-genai 0.0.11__tar.gz → 1.0.2__tar.gz

{langchain_google_genai-0.0.11 → langchain_google_genai-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 0.0.11
+Version: 1.0.2
 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.4.1,<0.5.0)
-Requires-Dist: langchain-core (>=0.1,<0.2)
+Requires-Dist: google-generativeai (>=0.5.0,<0.6.0)
+Requires-Dist: langchain-core (>=0.1.27,<0.2)
 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-0.0.11 → langchain_google_genai-1.0.2}/langchain_google_genai/chat_models.py

@@ -4,6 +4,7 @@ import base64
 import json
 import logging
 import os
+import warnings
 from io import BytesIO
 from typing import (
     Any,
@@ -300,27 +301,16 @@ def _convert_to_parts(
 
 def _parse_chat_history(
     input_messages: Sequence[BaseMessage], convert_system_message_to_human: bool = False
-) -> List[genai.types.ContentDict]:
+) -> Tuple[Optional[genai.types.ContentDict], List[genai.types.ContentDict]]:
     messages: List[genai.types.MessageDict] = []
 
-    raw_system_message: Optional[SystemMessage] = None
-    for i, message in enumerate(input_messages):
-        if (
-            i == 0
-            and isinstance(message, SystemMessage)
-            and not convert_system_message_to_human
-        ):
-            raise ValueError(
-                """SystemMessages are not yet supported!
+    if convert_system_message_to_human:
+        warnings.warn("Convert_system_message_to_human will be deprecated!")
 
-To automatically convert the leading SystemMessage to a HumanMessage,
-set  `convert_system_message_to_human` to True. Example:
-
-llm = ChatGoogleGenerativeAI(model="gemini-pro", convert_system_message_to_human=True)
-"""
-            )
-        elif i == 0 and isinstance(message, SystemMessage):
-            raw_system_message = message
+    system_instruction: Optional[genai.types.ContentDict] = None
+    for i, message in enumerate(input_messages):
+        if i == 0 and isinstance(message, SystemMessage):
+            system_instruction = _convert_to_parts(message.content)
             continue
         elif isinstance(message, AIMessage):
             role = "model"
@@ -365,16 +355,8 @@ llm = ChatGoogleGenerativeAI(model="gemini-pro", convert_system_message_to_human
                 f"Unexpected message with type {type(message)} at the position {i}."
             )
 
-        if raw_system_message:
-            if role == "model":
-                raise ValueError(
-                    "SystemMessage should be followed by a HumanMessage and "
-                    "not by AIMessage."
-                )
-            parts = _convert_to_parts(raw_system_message.content) + parts
-            raw_system_message = None
         messages.append({"role": role, "parts": parts})
-    return messages
+    return system_instruction, messages
 
 
 def _parse_response_candidate(
@@ -483,17 +465,29 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     @root_validator()
     def validate_environment(cls, values: Dict) -> Dict:
         """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()
-
-        genai.configure(
-            api_key=google_api_key,
-            transport=values.get("transport"),
-            client_options=values.get("client_options"),
-        )
+        additional_headers = values.get("additional_headers") or {}
+        default_metadata = tuple(additional_headers.items())
+
+        if values.get("credentials"):
+            genai.configure(
+                credentials=values.get("credentials"),
+                transport=values.get("transport"),
+                client_options=values.get("client_options"),
+                default_metadata=default_metadata,
+            )
+        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()
+
+            genai.configure(
+                api_key=google_api_key,
+                transport=values.get("transport"),
+                client_options=values.get("client_options"),
+                default_metadata=default_metadata,
+            )
         if (
             values.get("temperature") is not None
             and not 0 <= values["temperature"] <= 1
@@ -647,11 +641,15 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
             )
 
         params = self._prepare_params(stop, **kwargs)
-        history = _parse_chat_history(
+        system_instruction, history = _parse_chat_history(
             messages,
             convert_system_message_to_human=self.convert_system_message_to_human,
         )
         message = history.pop()
+        if self.client._system_instruction != system_instruction:
+            self.client = genai.GenerativeModel(
+                model_name=self.model, system_instruction=system_instruction
+            )
         chat = client.start_chat(history=history)
         return params, chat, message
 

{langchain_google_genai-0.0.11 → langchain_google_genai-1.0.2}/langchain_google_genai/embeddings.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional
+from typing import Any, Dict, List, Optional
 
 # TODO: remove ignore once the google package is published with types
 import google.generativeai as genai  # type: ignore[import]
@@ -43,6 +43,13 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
         description="The Google API key to use. If not provided, "
         "the GOOGLE_API_KEY environment variable will be used.",
     )
+    credentials: Any = Field(
+        default=None,
+        exclude=True,
+        description="The default custom credentials "
+        "(google.auth.credentials.Credentials) to use when making API calls. If not "
+        "provided, credentials will be ascertained from the GOOGLE_API_KEY envvar",
+    )
     client_options: Optional[Dict] = Field(
         None,
         description=(
@@ -58,17 +65,24 @@ class GoogleGenerativeAIEmbeddings(BaseModel, Embeddings):
     @root_validator()
     def validate_environment(cls, values: Dict) -> Dict:
         """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()
-
-        genai.configure(
-            api_key=google_api_key,
-            transport=values.get("transport"),
-            client_options=values.get("client_options"),
-        )
+        if values.get("credentials"):
+            genai.configure(
+                credentials=values.get("credentials"),
+                transport=values.get("transport"),
+                client_options=values.get("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()
+
+            genai.configure(
+                api_key=google_api_key,
+                transport=values.get("transport"),
+                client_options=values.get("client_options"),
+            )
         return values
 
     def _embed(

{langchain_google_genai-0.0.11 → langchain_google_genai-1.0.2}/langchain_google_genai/llms.py

@@ -122,6 +122,10 @@ Supported examples:
     )
     """Model name to use."""
     google_api_key: Optional[SecretStr] = 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 "
+    "the GOOGLE_API_KEY envvar"
     temperature: float = 0.7
     """Run inference with this temperature. Must by in the closed interval
        [0.0, 1.0]."""
@@ -150,6 +154,12 @@ Supported examples:
         None,
         description="A string, one of: [`rest`, `grpc`, `grpc_asyncio`].",
     )
+    additional_headers: Optional[Dict[str, str]] = Field(
+        None,
+        description=(
+            "A key-value dictionary representing additional headers for the model call"
+        ),
+    )
 
     safety_settings: Optional[Dict[HarmCategory, HarmBlockThreshold]] = None
     """The default safety settings to use for all generations. 
@@ -203,22 +213,28 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
     @root_validator()
     def validate_environment(cls, values: Dict) -> Dict:
         """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 values.get("credentials"):
+            genai.configure(
+                credentials=values.get("credentials"),
+                transport=values.get("transport"),
+                client_options=values.get("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()
+            genai.configure(
+                api_key=google_api_key,
+                transport=values.get("transport"),
+                client_options=values.get("client_options"),
+            )
+
         model_name = values["model"]
 
         safety_settings = values["safety_settings"]
 
-        if isinstance(google_api_key, SecretStr):
-            google_api_key = google_api_key.get_secret_value()
-
-        genai.configure(
-            api_key=google_api_key,
-            transport=values.get("transport"),
-            client_options=values.get("client_options"),
-        )
-
         if safety_settings and (
             not GoogleModelFamily(model_name) == GoogleModelFamily.GEMINI
         ):

{langchain_google_genai-0.0.11 → langchain_google_genai-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "0.0.11"
+version = "1.0.2"
 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.1"
-google-generativeai = "^0.4.1"
+langchain-core = ">=0.1.27,<0.2"
+google-generativeai = "^0.5.0"
 pillow = { version = "^10.1.0", optional = true }
 
 [tool.poetry.extras]
@@ -30,6 +30,7 @@ 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"}
 
 [tool.poetry.group.codespell]
 optional = true
@@ -56,6 +57,7 @@ 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"}
 
 [tool.poetry.group.dev]
 optional = true
@@ -65,6 +67,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"}
 
 [tool.ruff]
 select = [