-
Notifications
You must be signed in to change notification settings - Fork 150
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
added image loader with Cloud Vision API #107
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
from typing import Iterator, Optional | ||
|
||
from langchain_core.document_loaders import BaseBlobParser | ||
from langchain_core.document_loaders.blob_loaders import Blob | ||
from langchain_core.documents import Document | ||
|
||
from langchain_google_community._utils import get_client_info | ||
|
||
|
||
class CloudVisionLoader(BaseBlobParser): | ||
def __init__(self, project: Optional[str] = None): | ||
try: | ||
from google.cloud import vision # type: ignore[attr-defined] | ||
except ImportError as e: | ||
raise ImportError( | ||
"Cannot import google.cloud.vision, please install " | ||
"`pip install google-cloud-vision`." | ||
) from e | ||
client_options = None | ||
if project: | ||
client_options = {"quota_project_id": project} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you change this to use the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why? the client expect ClientOptions or a dict. |
||
self._client = vision.ImageAnnotatorClient( | ||
client_options=client_options, | ||
client_info=get_client_info(module="cloud-vision"), | ||
) | ||
|
||
def load(self, gcs_uri: str) -> Document: | ||
"""Loads an image from GCS path to a Document, only the text.""" | ||
from google.cloud import vision # type: ignore[attr-defined] | ||
|
||
image = vision.Image(source=vision.ImageSource(gcs_image_uri=gcs_uri)) | ||
text_detection_response = self._client.text_detection(image=image) | ||
annotations = text_detection_response.text_annotations | ||
|
||
if annotations: | ||
text = annotations[0].description | ||
else: | ||
text = "" | ||
return Document(page_content=text, metadata={"source": gcs_uri}) | ||
|
||
def lazy_parse(self, blob: Blob) -> Iterator[Document]: | ||
yield self.load(blob.path) # type: ignore[arg-type] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import os | ||
|
||
import pytest | ||
from langchain_core.document_loaders.blob_loaders import Blob | ||
from langchain_core.documents import Document | ||
|
||
from langchain_google_community import CloudVisionLoader | ||
|
||
|
||
@pytest.mark.skip(reason="CI/CD not ready.") | ||
def test_parse_image() -> None: | ||
gcs_path = os.environ["IMAGE_GCS_PATH"] | ||
project = os.environ["PROJECT"] | ||
blob = Blob(path=gcs_path, data="") # type: ignore | ||
loader = CloudVisionLoader(project=project) | ||
documents = loader.parse(blob) | ||
assert len(documents) == 1 | ||
assert isinstance(documents[0], Document) | ||
assert len(documents[0].page_content) > 1 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For consistency with other connectors, can this variable be
project_id
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually, for LLM/ChatModels we use
project
, so I'd rather stick toproject
and eventually change everything else to follow the most frequently used integration, wdyt?