Add image.detect() for detecting multiple types. by daspecster · Pull Request #2770 · googleapis/google-cloud-python

daspecster · 2016-11-24T03:45:54Z

daspecster · 2016-11-29T14:32:33Z

Bumpidy bump bump.

Sign in to view

+==================
+
+Image Annotations
+~~~~~~~~~~~~~~~~~


Sign in to view

+ self.assertEqual(items.labels[2].description, 'truck')
+ self.assertEqual(items.labels[2].score, 0.88429511)
+
+ image_request = client._connection._requested[0]['data']['requests'][0]


Sign in to view

+ from google.cloud.vision.feature import FeatureTypes
+ from unit_tests._fixtures import LABEL_DETECTION_RESPONSE
+ from unit_tests._fixtures import LOGO_DETECTION_RESPONSE
+ RETURNED = LABEL_DETECTION_RESPONSE


Sign in to view

+ from unit_tests._fixtures import LOGO_DETECTION_RESPONSE
+ RETURNED = LABEL_DETECTION_RESPONSE
+ LOGOS = LOGO_DETECTION_RESPONSE['responses'][0]['logoAnnotations']
+ RETURNED['responses'][0]['logoAnnotations'] = LOGOS


Sign in to view

+from google.cloud.vision.entity import EntityAnnotation
+from google.cloud.vision.face import Face
+from google.cloud.vision.feature import FeatureTypes
+from google.cloud.vision.color import ImagePropertiesAnnotation


Sign in to view

+
+ for feature_type, annotation in response.items():
+ annotations[feature_type].extend(
+ _entity_from_response_type(feature_type, annotation))


Sign in to view

+ texts = annotations.get(
+ _REVERSE_TYPES[FeatureTypes.TEXT_DETECTION], [])
+
+ return cls(faces=faces, properties=properties, labels=labels,


Sign in to view

+
+def _entity_from_response_type(feature_type, results):
+ """Convert a JSON result to an entity type based on the feature."""
+


Sign in to view

+
+
+def _entity_from_response_type(feature_type, results):
+ """Convert a JSON result to an entity type based on the feature."""


Sign in to view

+ """Convert a JSON result to an entity type based on the feature."""
+
+ detected_objects = []
+ if feature_type == _REVERSE_TYPES[FeatureTypes.FACE_DETECTION]:


daspecster · 2016-11-29T21:00:30Z

Great feedback!

I was able to remove a good chunk of code from your suggestions.

daspecster · 2016-11-29T21:54:28Z

Rebased to get rid of the conflict.

Sign in to view

+ """
+ def __init__(self, faces=None, properties=None, labels=None,
+ landmarks=None, logos=None, safe_searches=None, texts=None):
+ self.faces = faces or ()


Sign in to view

+ 'logoAnnotations': 'logos',
+ 'safeSearchAnnotation': 'safe_searches',
+ 'textAnnotations': 'texts'
+ }


Sign in to view

+ :class:`~google.cloud.vision.safe.SafeSearchAnnotation`.
+ """
+ detected_objects = []
+ if feature_type == 'faceAnnotations':


Sign in to view

+IMAGE_PROPERTIES_ANNOTATION = 'imagePropertiesAnnotation'
+SAFE_SEARCH_ANNOTATION = 'safeSearchAnnotation'
+
+KEY_MAP = {


dhermes

LGTM after nit

…ant, make duplicated response keys constants.

daspecster · 2016-11-30T03:31:03Z

Travis went green so I'm merging.

Sign in to view


+FACE_ANNOTATIONS = 'faceAnnotations'
+IMAGE_PROPERTIES_ANNOTATION = 'imagePropertiesAnnotation'
+SAFE_SEARCH_ANNOTATION = 'safeSearchAnnotation'


…to-vision-2697 Add image.detect() for detecting multiple types.

…2697 Add image.detect() for detecting multiple types.

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

daspecster assigned tseaver and dhermes Nov 24, 2016

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

daspecster force-pushed the add-manual-detect-to-vision-2697 branch from 5c6485d to 74eef27Compare November 24, 2016 16:06

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

daspecster mentioned this pull request Nov 29, 2016
Cleaning up docs and fixing typos #2754
Merged

dhermes reviewed Nov 29, 2016
View reviewed changes

daspecster added 2 commits November 29, 2016 16:29

Add image.detect() for detecting multiple types.
b8d6b06

Streamline annotations and filtering responses.
a720bff

daspecster force-pushed the add-manual-detect-to-vision-2697 branch from 2da9e85 to a720bffCompare November 29, 2016 21:29

dhermes reviewed Nov 29, 2016
View reviewed changes

daspecster mentioned this pull request Nov 29, 2016
Add support for query parameters #2776
Merged

dhermes reviewed Nov 30, 2016
View reviewed changes

dhermes approved these changes Nov 30, 2016
View reviewed changes

Make __init__ defaults immutable tuples, move key_map to modual const…
52aaf05
…ant, make duplicated response keys constants.

daspecster force-pushed the add-manual-detect-to-vision-2697 branch from ec99e2f to 52aaf05Compare November 30, 2016 03:14

daspecster merged commit 5cbbcb9 into googleapis:masterNov 30, 2016

daspecster deleted the add-manual-detect-to-vision-2697 branch November 30, 2016 03:31

dhermes reviewed Nov 30, 2016
View reviewed changes

Comment threadvision/google/cloud/vision/annotations.py

FACE_ANNOTATIONS = 'faceAnnotations'
IMAGE_PROPERTIES_ANNOTATION = 'imagePropertiesAnnotation'
SAFE_SEARCH_ANNOTATION = 'safeSearchAnnotation'
This comment was marked as spam.
Sign in to view
This comment was marked as spam.
Sign in to view

daspecster mentioned this pull request Nov 30, 2016
Make annotation constants private. #2779
Merged

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#2770from daspecster/add-manual-detect-…
dd611d5
…to-vision-2697 Add image.detect() for detecting multiple types.

theacodes unassigned dhermes Sep 28, 2018

parthea pushed a commit that referenced this pull request Oct 21, 2023
Merge pull request#2770from daspecster/add-manual-detect-to-vision-…
e222714
…2697 Add image.detect() for detecting multiple types.


		def _entity_from_response_type(feature_type, results):
		"""Convert a JSON result to an entity type based on the feature."""

Uh oh!

Conversation

daspecster commented Nov 24, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

daspecster commented Nov 29, 2016

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 Nov 29, 2016

Uh oh!

daspecster commented Nov 29, 2016

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!

dhermes left a comment

Choose a reason for hiding this comment

Uh oh!

daspecster commented Nov 30, 2016

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

daspecster commented Nov 24, 2016•
edited
Loading