langchain-google-genai 2.0.3__tar.gz → 2.0.5__tar.gz

{langchain_google_genai-2.0.3 → langchain_google_genai-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 2.0.3
+Version: 2.0.5
 Summary: An integration package connecting Google's genai package and LangChain
 Home-page: https://github.com/langchain-ai/langchain-google
 License: MIT
@@ -11,10 +11,8 @@ Classifier: Programming Language :: Python :: 3.9
 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.8.0,<0.9.0)
-Requires-Dist: langchain-core (>=0.3.13,<0.4)
-Requires-Dist: pillow (>=10.1.0,<11.0.0) ; extra == "images"
+Requires-Dist: langchain-core (>=0.3.15,<0.4)
 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
@@ -30,12 +28,6 @@ This package contains the LangChain integrations for Gemini through their genera
 pip install -U langchain-google-genai
 ```
 
-### Image utilities
-To use image utility methods, like loading images from GCS urls, install with extras group 'images':
-
-```bash
-pip install -e "langchain-google-genai[images]"
-```
 
 ## Chat Models
 
@@ -82,9 +74,7 @@ The value of `image_url` can be any of the following:
 
 - A public image URL
 - An accessible gcs file (e.g., "gcs://path/to/file.png")
-- A local file path
 - A base64 encoded image (e.g., `data:image/png;base64,abcd124`)
-- A PIL image
 
 
 

{langchain_google_genai-2.0.3 → langchain_google_genai-2.0.5}/README.md

@@ -8,12 +8,6 @@ This package contains the LangChain integrations for Gemini through their genera
 pip install -U langchain-google-genai
 ```
 
-### Image utilities
-To use image utility methods, like loading images from GCS urls, install with extras group 'images':
-
-```bash
-pip install -e "langchain-google-genai[images]"
-```
 
 ## Chat Models
 
@@ -60,9 +54,7 @@ The value of `image_url` can be any of the following:
 
 - A public image URL
 - An accessible gcs file (e.g., "gcs://path/to/file.png")
-- A local file path
 - A base64 encoded image (e.g., `data:image/png;base64,abcd124`)
-- A PIL image
 
 
 

{langchain_google_genai-2.0.3 → langchain_google_genai-2.0.5}/langchain_google_genai/_image_utils.py

@@ -25,7 +25,6 @@ class ImageBytesLoader:
 
     Currently supported:
         - B64 Encoded image string
-        - Local file path
         - URL
     """
 
@@ -35,7 +34,6 @@ class ImageBytesLoader:
         Args:
             image_string: Can be either:
                     - B64 Encoded image string
-                    - Local file path
                     - URL
 
         Returns:
@@ -51,12 +49,17 @@ class ImageBytesLoader:
             return self._bytes_from_url(image_string)
 
         if route == Route.LOCAL_FILE:
+            raise ValueError(
+                "Loading from local files is no longer supported for security reasons. "
+                "Please pass in images as Google Cloud Storage URI, "
+                "b64 encoded image string (data:image/...), or valid image url."
+            )
             return self._bytes_from_file(image_string)
 
         raise ValueError(
             "Image string must be one of: Google Cloud Storage URI, "
-            "b64 encoded image string (data:image/...), valid image url, "
-            f"or existing local image file. Instead got '{image_string}'."
+            "b64 encoded image string (data:image/...), or valid image url."
+            f"Instead got '{image_string}'."
         )
 
     def load_part(self, image_string: str) -> Part:
@@ -65,7 +68,6 @@ class ImageBytesLoader:
         Args:
             image_string: Can be either:
                     - B64 Encoded image string
-                    - Local file path
                     - URL
         """
         route = self._route(image_string)
@@ -77,7 +79,12 @@ class ImageBytesLoader:
             bytes_ = self._bytes_from_url(image_string)
 
         if route == Route.LOCAL_FILE:
-            bytes_ = self._bytes_from_file(image_string)
+            msg = (
+                "Loading from local files is no longer supported for security reasons. "
+                "Please specify images as Google Cloud Storage URI, "
+                "b64 encoded image string (data:image/...), or valid image url."
+            )
+            raise ValueError(msg)
 
         inline_data: Dict[str, Any] = {"data": bytes_}
         mime_type, _ = mimetypes.guess_type(image_string)
@@ -98,8 +105,8 @@ class ImageBytesLoader:
 
         raise ValueError(
             "Image string must be one of: "
-            "b64 encoded image string (data:image/...), valid image url, "
-            f"or existing local image file. Instead got '{image_string}'."
+            "b64 encoded image string (data:image/...) or valid image url."
+            f" Instead got '{image_string}'."
         )
 
     def _bytes_from_b64(self, base64_image: str) -> bytes:
@@ -121,19 +128,6 @@ class ImageBytesLoader:
 
         raise ValueError(f"Error in b64 encoded image. Must follow pattern: {pattern}")
 
-    def _bytes_from_file(self, file_path: str) -> bytes:
-        """Gets image bytes from a local file path.
-
-        Args:
-            file_path: Existing file path.
-
-        Returns:
-            Image bytes
-        """
-        with open(file_path, "rb") as image_file:
-            image_bytes = image_file.read()
-        return image_bytes
-
     def _bytes_from_url(self, url: str) -> bytes:
         """Gets image bytes from a public url.
 

{langchain_google_genai-2.0.3 → langchain_google_genai-2.0.5}/langchain_google_genai/chat_models.py

@@ -1,13 +1,10 @@
 from __future__ import annotations
 
 import asyncio
-import base64
 import json
 import logging
-import os
 import uuid
 import warnings
-from io import BytesIO
 from operator import itemgetter
 from typing import (
     Any,
@@ -24,13 +21,11 @@ from typing import (
     Union,
     cast,
 )
-from urllib.parse import urlparse
 
 import google.api_core
 
 # TODO: remove ignore once the google package is published with types
 import proto  # type: ignore[import]
-import requests
 from google.ai.generativelanguage_v1beta import (
     GenerativeServiceAsyncClient as v1betaGenerativeServiceAsyncClient,
 )
@@ -117,16 +112,6 @@ from langchain_google_genai.llms import _BaseGoogleGenerativeAI
 
 from . import _genai_extension as genaix
 
-IMAGE_TYPES: Tuple = ()
-try:
-    import PIL
-    from PIL.Image import Image
-
-    IMAGE_TYPES = IMAGE_TYPES + (Image,)
-except ImportError:
-    PIL = None  # type: ignore
-    Image = None  # type: ignore
-
 logger = logging.getLogger(__name__)
 
 
@@ -248,75 +233,6 @@ def _is_openai_parts_format(part: dict) -> bool:
     return "type" in part
 
 
-def _is_vision_model(model: str) -> bool:
-    return "vision" in model
-
-
-def _is_url(s: str) -> bool:
-    try:
-        result = urlparse(s)
-        return all([result.scheme, result.netloc])
-    except Exception as e:
-        logger.debug(f"Unable to parse URL: {e}")
-        return False
-
-
-def _is_b64(s: str) -> bool:
-    return s.startswith("data:image")
-
-
-def _load_image_from_gcs(path: str, project: Optional[str] = None) -> Image:
-    try:
-        from google.cloud import storage  # type: ignore[attr-defined]
-    except ImportError:
-        raise ImportError(
-            "google-cloud-storage is required to load images from GCS."
-            " Install it with `pip install google-cloud-storage`"
-        )
-    if PIL is None:
-        raise ImportError(
-            "PIL is required to load images. Please install it "
-            "with `pip install pillow`"
-        )
-
-    gcs_client = storage.Client(project=project)
-    pieces = path.split("/")
-    blobs = list(gcs_client.list_blobs(pieces[2], prefix="/".join(pieces[3:])))
-    if len(blobs) > 1:
-        raise ValueError(f"Found more than one candidate for {path}!")
-    img_bytes = blobs[0].download_as_bytes()
-    return PIL.Image.open(BytesIO(img_bytes))
-
-
-def _url_to_pil(image_source: str) -> Image:
-    if PIL is None:
-        raise ImportError(
-            "PIL is required to load images. Please install it "
-            "with `pip install pillow`"
-        )
-    try:
-        if isinstance(image_source, IMAGE_TYPES):
-            return image_source  # type: ignore[return-value]
-        elif _is_url(image_source):
-            if image_source.startswith("gs://"):
-                return _load_image_from_gcs(image_source)
-            response = requests.get(image_source)
-            response.raise_for_status()
-            return PIL.Image.open(BytesIO(response.content))
-        elif _is_b64(image_source):
-            _, encoded = image_source.split(",", 1)
-            data = base64.b64decode(encoded)
-            return PIL.Image.open(BytesIO(data))
-        elif os.path.exists(image_source):
-            return PIL.Image.open(image_source)
-        else:
-            raise ValueError(
-                "The provided string is not a valid URL, base64, or file path."
-            )
-    except Exception as e:
-        raise ValueError(f"Unable to process the provided image source: {e}")
-
-
 def _convert_to_parts(
     raw_content: Union[str, Sequence[Union[str, dict]]],
 ) -> List[Part]:
@@ -400,8 +316,17 @@ def _parse_chat_history(
             continue
         elif isinstance(message, AIMessage):
             role = "model"
-            raw_function_call = message.additional_kwargs.get("function_call")
-            if raw_function_call:
+            if message.tool_calls:
+                parts = []
+                for tool_call in message.tool_calls:
+                    function_call = FunctionCall(
+                        {
+                            "name": tool_call["name"],
+                            "args": tool_call["args"],
+                        }
+                    )
+                    parts.append(Part(function_call=function_call))
+            elif raw_function_call := message.additional_kwargs.get("function_call"):
                 function_call = FunctionCall(
                     {
                         "name": raw_function_call["name"],

{langchain_google_genai-2.0.3 → langchain_google_genai-2.0.5}/langchain_google_genai/llms.py

@@ -310,10 +310,21 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
                     generation_config=generation_config,
                     safety_settings=kwargs.pop("safety_settings", None),
                 )
+                generation_info = None
+                if res.usage_metadata is not None:
+                    generation_info = {
+                        "usage_metadata": res.to_dict().get("usage_metadata")
+                    }
+
                 candidates = [
                     "".join([p.text for p in c.content.parts]) for c in res.candidates
                 ]
-                generations.append([Generation(text=c) for c in candidates])
+                generations.append(
+                    [
+                        Generation(text=c, generation_info=generation_info)
+                        for c in candidates
+                    ]
+                )
             else:
                 res = _completion_with_retry(
                     self,

{langchain_google_genai-2.0.3 → langchain_google_genai-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "2.0.3"
+version = "2.0.5"
 description = "An integration package connecting Google's genai package and LangChain"
 authors = []
 readme = "README.md"
@@ -12,14 +12,10 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-langchain-core = ">=0.3.13,<0.4"
+langchain-core = ">=0.3.15,<0.4"
 google-generativeai = "^0.8.0"
-pillow = { version = "^10.1.0", optional = true }
 pydantic = ">=2,<3"
 
-[tool.poetry.extras]
-images = ["pillow"]
-
 [tool.poetry.group.test]
 optional = true
 
@@ -31,15 +27,12 @@ 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-tests = "0.3.1"
 
 [tool.codespell]
 ignore-words-list = "rouge"
 
 
-
-
 [tool.poetry.group.codespell]
 optional = true
 
@@ -47,15 +40,11 @@ optional = true
 codespell = "^2.2.0"
 
 
-
-
 [tool.poetry.group.test_integration]
 optional = true
 
 [tool.poetry.group.test_integration.dependencies]
-pillow = "^10.1.0"
-
-
+pytest = "^7.3.0"
 
 
 [tool.poetry.group.lint]
@@ -65,29 +54,20 @@ optional = true
 ruff = "^0.1.5"
 
 
-
-
 [tool.poetry.group.typing.dependencies]
 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" }
 numpy = "^1.26.2"
 
 
-
-
 [tool.poetry.group.dev]
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-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.lint]
 select = [