core[patch]: rm image loading (#27797)

This commit is contained in:
Bagatur 2024-10-31 10:34:51 -07:00 committed by GitHub
parent ad0387ac97
commit c1e742347f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 35 additions and 73 deletions

View File

@ -9,7 +9,6 @@ from langchain_core.prompts.string import (
PromptTemplateFormat,
)
from langchain_core.runnables import run_in_executor
from langchain_core.utils import image as image_utils
class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
@ -80,8 +79,8 @@ class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
A formatted string.
Raises:
ValueError: If the url or path is not provided.
ValueError: If the path or url is not a string.
ValueError: If the url is not provided.
ValueError: If the url is not a string.
Example:
@ -98,19 +97,20 @@ class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
else:
formatted[k] = v
url = kwargs.get("url") or formatted.get("url")
path = kwargs.get("path") or formatted.get("path")
if kwargs.get("path") or formatted.get("path"):
msg = (
"Loading images from 'path' has been removed as of 0.3.15 for security "
"reasons. Please specify images by 'url'."
)
raise ValueError(msg)
detail = kwargs.get("detail") or formatted.get("detail")
if not url and not path:
msg = "Must provide either url or path."
raise ValueError(msg)
if not url:
if not isinstance(path, str):
msg = "path must be a string."
msg = "Must provide url."
raise ValueError(msg)
url = image_utils.image_to_data_url(path)
if not isinstance(url, str):
elif not isinstance(url, str):
msg = "url must be a string."
raise ValueError(msg)
else:
output: ImageURL = {"url": url}
if detail:
# Don't check literal values here: let the API check them
@ -127,7 +127,6 @@ class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
A formatted string.
Raises:
ValueError: If the url or path is not provided.
ValueError: If the path or url is not a string.
"""
return await run_in_executor(None, self.format, **kwargs)

View File

@ -1,29 +1,8 @@
import base64
import mimetypes
from typing import Any
def encode_image(image_path: str) -> str:
"""Get base64 string from image URI.
Args:
image_path: The path to the image.
Returns:
The base64 string of the image.
"""
with open(image_path, "rb") as image_file:
return base64.b64encode(image_file.read()).decode("utf-8")
def image_to_data_url(image_path: str) -> str:
"""Get data URL from image URI.
Args:
image_path: The path to the image.
Returns:
The data URL of the image.
"""
encoding = encode_image(image_path)
mime_type = mimetypes.guess_type(image_path)[0]
return f"data:{mime_type};base64,{encoding}"
def __getattr__(name: str) -> Any:
if name in ("encode_image", "image_to_data_url"):
msg = f"'{name}' has been removed for security reasons."
raise ValueError(msg)
raise AttributeError(name)

View File

@ -719,7 +719,7 @@ async def test_chat_tmpl_from_messages_multipart_image() -> None:
async def test_chat_tmpl_from_messages_multipart_formatting_with_path() -> None:
"""Verify that we can pass `path` for an image as a variable."""
"""Verify that we cannot pass `path` for an image as a variable."""
in_mem = "base64mem"
in_file_data = "base64file01"
@ -746,35 +746,19 @@ async def test_chat_tmpl_from_messages_multipart_formatting_with_path() -> None:
),
]
)
expected = [
SystemMessage(content="You are an AI assistant named R2D2."),
HumanMessage(
content=[
{"type": "text", "text": "What's in this image?"},
{
"type": "image_url",
"image_url": {"url": f"data:image/jpeg;base64,{in_mem}"},
},
{
"type": "image_url",
"image_url": {"url": f"data:image/jpeg;base64,{in_file_data}"},
},
]
),
]
messages = template.format_messages(
with pytest.raises(ValueError):
template.format_messages(
name="R2D2",
in_mem=in_mem,
file_path=temp_file.name,
)
assert messages == expected
messages = await template.aformat_messages(
with pytest.raises(ValueError):
await template.aformat_messages(
name="R2D2",
in_mem=in_mem,
file_path=temp_file.name,
)
assert messages == expected
def test_messages_placeholder() -> None: