mirror of
https://github.com/hwchase17/langchain.git
synced 2025-06-23 15:19:33 +00:00
core[patch]: rm image loading (#27797)
This commit is contained in:
parent
ad0387ac97
commit
c1e742347f
@ -9,7 +9,6 @@ from langchain_core.prompts.string import (
|
|||||||
PromptTemplateFormat,
|
PromptTemplateFormat,
|
||||||
)
|
)
|
||||||
from langchain_core.runnables import run_in_executor
|
from langchain_core.runnables import run_in_executor
|
||||||
from langchain_core.utils import image as image_utils
|
|
||||||
|
|
||||||
|
|
||||||
class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
|
class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
|
||||||
@ -80,8 +79,8 @@ class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
|
|||||||
A formatted string.
|
A formatted string.
|
||||||
|
|
||||||
Raises:
|
Raises:
|
||||||
ValueError: If the url or path is not provided.
|
ValueError: If the url is not provided.
|
||||||
ValueError: If the path or url is not a string.
|
ValueError: If the url is not a string.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
@ -98,23 +97,24 @@ class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
|
|||||||
else:
|
else:
|
||||||
formatted[k] = v
|
formatted[k] = v
|
||||||
url = kwargs.get("url") or formatted.get("url")
|
url = kwargs.get("url") or formatted.get("url")
|
||||||
path = kwargs.get("path") or formatted.get("path")
|
if kwargs.get("path") or formatted.get("path"):
|
||||||
detail = kwargs.get("detail") or formatted.get("detail")
|
msg = (
|
||||||
if not url and not path:
|
"Loading images from 'path' has been removed as of 0.3.15 for security "
|
||||||
msg = "Must provide either url or path."
|
"reasons. Please specify images by 'url'."
|
||||||
|
)
|
||||||
raise ValueError(msg)
|
raise ValueError(msg)
|
||||||
|
detail = kwargs.get("detail") or formatted.get("detail")
|
||||||
if not url:
|
if not url:
|
||||||
if not isinstance(path, str):
|
msg = "Must provide url."
|
||||||
msg = "path must be a string."
|
raise ValueError(msg)
|
||||||
raise ValueError(msg)
|
elif not isinstance(url, str):
|
||||||
url = image_utils.image_to_data_url(path)
|
|
||||||
if not isinstance(url, str):
|
|
||||||
msg = "url must be a string."
|
msg = "url must be a string."
|
||||||
raise ValueError(msg)
|
raise ValueError(msg)
|
||||||
output: ImageURL = {"url": url}
|
else:
|
||||||
if detail:
|
output: ImageURL = {"url": url}
|
||||||
# Don't check literal values here: let the API check them
|
if detail:
|
||||||
output["detail"] = detail # type: ignore[typeddict-item]
|
# Don't check literal values here: let the API check them
|
||||||
|
output["detail"] = detail # type: ignore[typeddict-item]
|
||||||
return output
|
return output
|
||||||
|
|
||||||
async def aformat(self, **kwargs: Any) -> ImageURL:
|
async def aformat(self, **kwargs: Any) -> ImageURL:
|
||||||
@ -127,7 +127,6 @@ class ImagePromptTemplate(BasePromptTemplate[ImageURL]):
|
|||||||
A formatted string.
|
A formatted string.
|
||||||
|
|
||||||
Raises:
|
Raises:
|
||||||
ValueError: If the url or path is not provided.
|
|
||||||
ValueError: If the path or url is not a string.
|
ValueError: If the path or url is not a string.
|
||||||
"""
|
"""
|
||||||
return await run_in_executor(None, self.format, **kwargs)
|
return await run_in_executor(None, self.format, **kwargs)
|
||||||
|
@ -1,29 +1,8 @@
|
|||||||
import base64
|
from typing import Any
|
||||||
import mimetypes
|
|
||||||
|
|
||||||
|
|
||||||
def encode_image(image_path: str) -> str:
|
def __getattr__(name: str) -> Any:
|
||||||
"""Get base64 string from image URI.
|
if name in ("encode_image", "image_to_data_url"):
|
||||||
|
msg = f"'{name}' has been removed for security reasons."
|
||||||
Args:
|
raise ValueError(msg)
|
||||||
image_path: The path to the image.
|
raise AttributeError(name)
|
||||||
|
|
||||||
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}"
|
|
||||||
|
@ -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:
|
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_mem = "base64mem"
|
||||||
in_file_data = "base64file01"
|
in_file_data = "base64file01"
|
||||||
|
|
||||||
@ -746,35 +746,19 @@ async def test_chat_tmpl_from_messages_multipart_formatting_with_path() -> None:
|
|||||||
),
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
expected = [
|
with pytest.raises(ValueError):
|
||||||
SystemMessage(content="You are an AI assistant named R2D2."),
|
template.format_messages(
|
||||||
HumanMessage(
|
name="R2D2",
|
||||||
content=[
|
in_mem=in_mem,
|
||||||
{"type": "text", "text": "What's in this image?"},
|
file_path=temp_file.name,
|
||||||
{
|
)
|
||||||
"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(
|
|
||||||
name="R2D2",
|
|
||||||
in_mem=in_mem,
|
|
||||||
file_path=temp_file.name,
|
|
||||||
)
|
|
||||||
assert messages == expected
|
|
||||||
|
|
||||||
messages = await template.aformat_messages(
|
with pytest.raises(ValueError):
|
||||||
name="R2D2",
|
await template.aformat_messages(
|
||||||
in_mem=in_mem,
|
name="R2D2",
|
||||||
file_path=temp_file.name,
|
in_mem=in_mem,
|
||||||
)
|
file_path=temp_file.name,
|
||||||
assert messages == expected
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_messages_placeholder() -> None:
|
def test_messages_placeholder() -> None:
|
||||||
|
Loading…
Reference in New Issue
Block a user