Add loading image from filename. - #2778
Merged
daspecster merged 1 commit intoDec 1, 2016
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
10 tasks
dhermes
reviewed
Nov 30, 2016
dhermes
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Mostly looks good (the benefit of tiny PRs!) though the constructor needs to be sorted out before I can sign off
Sorry, something went wrong.
Comment thread
docs/vision-usage.rst
Outdated
| >>> client = vision.Client(project='my-project', credentials=creds) | ||
|
|
||
|
|
||
| Creating an :class:`~google.cloud.vision.image.Image` object. |
This comment was marked as spam.
Comment thread
docs/vision-usage.rst
Outdated
| Creating an :class:`~google.cloud.vision.image.Image` object. | ||
| ------------------------------------------------------------- | ||
|
|
||
| The :class:`~google.cloud.vision.image.Image` object is used to load your image |
This comment was marked as spam.
Comment thread
docs/vision-usage.rst
Outdated
| data from sources such as a Google Cloud Storage URI, raw bytes, or a file. | ||
|
|
||
|
|
||
| **From a Google Cloud Storage URI** |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
Comment thread
docs/vision-usage.rst
Outdated
|
|
||
| Image Properties | ||
| ~~~~~~~~~~~~~~~~ | ||
| ---------------- |
This comment was marked as spam.
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| self._source = source_uri | ||
| else: | ||
| self._content = _bytes_to_unicode(b64encode(_to_bytes(content))) | ||
| if filename: |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| with open(filename, 'rb') as file_obj: | ||
| content = file_obj.read() | ||
|
|
||
| if content: |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
| """ | ||
|
|
||
| def __init__(self, client, content=None, source_uri=None): | ||
| def __init__(self, client, content=None, filename=None, source_uri=None): |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
Comment thread
vision/tox.ini
| pip install --quiet --upgrade {toxinidir}/../core | ||
| deps = | ||
| {toxinidir}/../core | ||
| mock |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
Comment thread
vision/unit_tests/test_image.py
Outdated
| image = self._make_one(CLIENT_MOCK, content=IMAGE_CONTENT) | ||
|
|
||
| _AS_DICT = { | ||
| _as_dict = { |
This comment was marked as spam.
Comment thread
vision/unit_tests/test_image.py
Outdated
| image = self._make_one(CLIENT_MOCK, source_uri=IMAGE_SOURCE) | ||
|
|
||
| _AS_DICT = { | ||
| _as_dict = { |
This comment was marked as spam.
This comment was marked as spam.
dhermes
reviewed
Dec 1, 2016
Comment thread
vision/google/cloud/vision/image.py
| """ | ||
|
|
||
| def __init__(self, client, content=None, source_uri=None): | ||
| def __init__(self, client, content=None, filename=None, source_uri=None): |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| def __init__(self, client, content=None, source_uri=None): | ||
| def __init__(self, client, content=None, filename=None, source_uri=None): | ||
| sources = set(source for source in (content, filename, source_uri) | ||
| if source is not None) |
This comment was marked as spam.
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| if len(sources) != 1: | ||
| raise ValueError( | ||
| 'Specify exactly one of \'content\', \'filename\', or' | ||
| '\'source_uri\'.') |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
| self._content = _bytes_to_unicode(b64encode(_to_bytes(content))) | ||
| if filename is not None: | ||
| with open(filename, 'rb') as file_obj: | ||
| content = file_obj.read() |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
Comment thread
vision/tox.ini
| pip install --quiet --upgrade {toxinidir}/../core | ||
| deps = | ||
| {toxinidir}/../core | ||
| mock |
This comment was marked as spam.
dhermes
approved these changes
Dec 1, 2016
Copy link
Copy Markdown
Contributor
Author
|
Thanks @dhermes! I cancelled travis and rerun after squashing. |
Sorry, something went wrong.
daspecster
force-pushed
the
vision-add-filename-support
branch
from
b77ed78 to
0bc1c4b
Compare
December 1, 2016 20:00
richkadel
pushed a commit
to richkadel/google-cloud-python
that referenced
this pull request
May 6, 2017
…e-support Add loading image from filename.
parthea
pushed a commit
that referenced
this pull request
Oct 21, 2023
Add loading image from filename.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Towards #2753
Adding support to pass in a filename when instantiating an Image.