Add loading image from filename. by daspecster · Pull Request #2778 · googleapis/google-cloud-python

daspecster · 2016-11-30T03:35:17Z

Towards #2753

Adding support to pass in a filename when instantiating an Image.

dhermes

Mostly looks good (the benefit of tiny PRs!) though the constructor needs to be sorted out before I can sign off

Sign in to view

 >>> client = vision.Client(project='my-project', credentials=creds)


+Creating an :class:`~google.cloud.vision.image.Image` object.


Sign in to view

+Creating an :class:`~google.cloud.vision.image.Image` object.
+-------------------------------------------------------------
+
+The :class:`~google.cloud.vision.image.Image` object is used to load your image


Sign in to view

+data from sources such as a Google Cloud Storage URI, raw bytes, or a file.
+
+
+**From a Google Cloud Storage URI**


Sign in to view


 Image Properties
-~~~~~~~~~~~~~~~~
+----------------


Sign in to view

- self._source = source_uri
- else:
- self._content = _bytes_to_unicode(b64encode(_to_bytes(content)))
+ if filename:


Sign in to view

+ with open(filename, 'rb') as file_obj:
+ content = file_obj.read()
+
+ if content:


Sign in to view

 """

- def __init__(self, client, content=None, source_uri=None):
+ def __init__(self, client, content=None, filename=None, source_uri=None):


Sign in to view

 pip install --quiet --upgrade {toxinidir}/../core
 deps =
 {toxinidir}/../core
+ mock


Sign in to view

 image = self._make_one(CLIENT_MOCK, content=IMAGE_CONTENT)

-_AS_DICT = {
+_as_dict = {


Sign in to view

 image = self._make_one(CLIENT_MOCK, source_uri=IMAGE_SOURCE)

-_AS_DICT = {
+_as_dict = {


Sign in to view

 """

- def __init__(self, client, content=None, source_uri=None):
+ def __init__(self, client, content=None, filename=None, source_uri=None):


Sign in to view

- 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)


Sign in to view

+ if len(sources) != 1:
+ raise ValueError(
+ 'Specify exactly one of \'content\', \'filename\', or'
+ '\'source_uri\'.')


Sign in to view

- 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()


Sign in to view

 pip install --quiet --upgrade {toxinidir}/../core
 deps =
 {toxinidir}/../core
+ mock


daspecster · 2016-12-01T20:00:00Z

Thanks @dhermes! I cancelled travis and rerun after squashing.

…e-support Add loading image from filename.

Add loading image from filename.

daspecster added the api: vision Issues related to the Cloud Vision API. label Nov 30, 2016

daspecster assigned tseaver and dhermes Nov 30, 2016

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Nov 30, 2016

daspecster mentioned this pull request Nov 30, 2016
Tracking Vision Development. #2753
Closed
10 tasks

dhermes reviewed Nov 30, 2016
View reviewed changes

daspecster mentioned this pull request Nov 30, 2016
Add system test for Vision Logo detection. #2788
Merged

dhermes reviewed Dec 1, 2016
View reviewed changes

dhermes approved these changes Dec 1, 2016
View reviewed changes

Add loading image from filename.
0bc1c4b

daspecster force-pushed the vision-add-filename-support branch from b77ed78 to 0bc1c4bCompare December 1, 2016 20:00

daspecster merged commit e96c06a into googleapis:masterDec 1, 2016

daspecster deleted the vision-add-filename-support branch December 1, 2016 20:23

dhermes mentioned this pull request Dec 9, 2016
Update versions for mega-release. #2846
Merged

richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017
Merge pull requestgoogleapis#2778from daspecster/vision-add-filenam…
7a52ef3
…e-support Add loading image from filename.

theacodes unassigned dhermes Sep 28, 2018

parthea pushed a commit that referenced this pull request Oct 21, 2023
Merge pull request#2778from daspecster/vision-add-filename-support
7804235
Add loading image from filename.

		>>> client = vision.Client(project='my-project', credentials=creds)


		Creating an :class:`~google.cloud.vision.image.Image` object.

		data from sources such as a Google Cloud Storage URI, raw bytes, or a file.


		From a Google Cloud Storage URI

Uh oh!

Conversation

daspecster commented Nov 30, 2016

Uh oh!

dhermes left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

daspecster commented Dec 1, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants