Merge branch 'main' into jfypk/main/update-format-output

libs/genai/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
 
@@ -61,7 +55,6 @@ 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 base64 encoded image (e.g., `data:image/png;base64,abcd124`)
-- A PIL image
 
 
 

libs/genai/langchain_google_genai/chat_models.py

@@ -5,7 +5,6 @@
 import logging
 import uuid
 import warnings
-from io import BytesIO
 from operator import itemgetter
 from typing import (
     Any,
@@ -22,7 +21,6 @@
     Union,
     cast,
 )
-from urllib.parse import urlparse
 
 import google.api_core
 
@@ -114,16 +112,6 @@
 
 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__)
 
 
@@ -245,46 +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 _convert_to_parts(
     raw_content: Union[str, Sequence[Union[str, dict]]],
 ) -> List[Part]:
@@ -368,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"],

libs/genai/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "2.0.4"
+version = "2.0.5"
 description = "An integration package connecting Google's genai package and LangChain"
 authors = []
 readme = "README.md"
@@ -14,12 +14,8 @@ license = "MIT"
 python = ">=3.9,<4.0"
 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,31 +27,24 @@ 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
 
 [tool.poetry.group.codespell.dependencies]
 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 = [

libs/vertexai/langchain_google_vertexai/utils.py

@@ -60,7 +60,7 @@ def create_context_cache(
         tool_config = _format_tool_config(tool_config)
 
     if tools is not None:
-        tools = _format_to_gapic_tool(tools)
+        tools = [_format_to_gapic_tool(tools)]
 
     cached_content = caching.CachedContent.create(
         model_name=model.full_model_name,