Refactor _detect_annotation() to support all annotation types. by daspecster · Pull Request #2712 · googleapis/google-cloud-python

daspecster · 2016-11-09T21:07:37Z

This is a step towards adding the manual detect method.

dhermes

Mostly LGTM though ISTM you should be doing

features= [feature]

in _detect_annotation

Sign in to view

- :type feature: :class:`~google.cloud.vision.feature.Feature`
- :param feature: The ``Feature`` indication the type of annotation to
- perform.
+ :type features: list of:class:`~google.cloud.vision.feature.Feature`


Sign in to view

 return self._source

- def _detect_annotation(self, feature):
+ def _detect_annotation(self, features):


Sign in to view

+ """Convert a JSON result to an entity type based on the feature."""
+
 reverse_types = {
+ 'FACE_DETECTION': 'faceAnnotations',


Sign in to view

+ return detected_objects[0]
+ return detected_objects
+
+ @staticmethod


Sign in to view

+ self._entity_from_response_type(feature.feature_type, results))
+
+ if len(detected_objects) == 1:
+ return detected_objects[0]


Sign in to view

+ result = results[feature_key]
+ detected_objects.append(SafeSearchAnnotation.from_api_repr(result))
+ else:
+ for result in results[feature_key]:


Sign in to view

- detected_objects.append(detected_object)
+ feature_key = reverse_types[feature_type]
+
+ if feature_type == 'FACE_DETECTION':


Sign in to view

+
+ if feature_type == 'FACE_DETECTION':
+ for face in results[feature_key]:
+ detected_objects.append(Face.from_api_repr(face))


Sign in to view

+ detected_objects.append(SafeSearchAnnotation.from_api_repr(result))
+ else:
+ for result in results[feature_key]:
+ detected_objects.append(EntityAnnotation.from_api_repr(result))


daspecster · 2016-11-11T18:37:38Z

Regarding your comment about features = [features], if I do that, then I'll need to put a check there as well.

ifnotisinstance(features, list):
features= [features]

Sign in to view

+ 'LOGO_DETECTION': 'logoAnnotations',
+ _SAFE_SEARCH_DETECTION: 'safeSearchAnnotation',
+ 'TEXT_DETECTION': 'textAnnotations',
+}


dhermes · 2016-11-11T19:20:39Z

if I do that, then I'll need to put a check there as well.

No, just make your callers obey the signature. So if it accepts one feature (which all the current callers so) then they send one feature.

However, as I mentioned before, just leave the change in.

daspecster · 2016-11-11T19:25:34Z

@dhermes this is lacking clarity as you mentioned before because I'm preparing for #2697.
detect() will need to pass a list of features. Which will be clear in the next PR for this.

daspecster · 2016-11-11T19:26:36Z

Squished. Once the build goes green I'll merge.

…quests Refactor _detect_annotation() to support all annotation types.

Refactor _detect_annotation() to support all annotation types.

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

daspecster assigned tseaver and dhermes Nov 9, 2016

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

daspecster force-pushed the refactor-vision-requests branch from 51433d6 to 7d4a998Compare November 9, 2016 21:08

daspecster changed the title ~~Refactor so _detect_annotation() support all types.~~Refactor _detect_annotation() to support all annotation types.Nov 9, 2016

daspecster force-pushed the refactor-vision-requests branch from 7d4a998 to e766ac9Compare November 10, 2016 18:05

dhermes reviewed Nov 10, 2016
View reviewed changes

tseaver reviewed Nov 11, 2016
View reviewed changes

Comment threadvision/google/cloud/vision/image.py
'LOGO_DETECTION': 'logoAnnotations',
_SAFE_SEARCH_DETECTION: 'safeSearchAnnotation',
'TEXT_DETECTION': 'textAnnotations',
}
This comment was marked as spam.
Sign in to view
This comment was marked as spam.
Sign in to view

daspecster force-pushed the refactor-vision-requests branch from 1bfd25f to f164c3fCompare November 11, 2016 19:26

Refactor so _detect_annotation() support all types.
83b128a

daspecster force-pushed the refactor-vision-requests branch from f164c3f to 83b128aCompare November 11, 2016 19:27

daspecster merged commit 0291dd4 into googleapis:masterNov 11, 2016

daspecster deleted the refactor-vision-requests branch November 11, 2016 19:50

daspecster mentioned this pull request Nov 17, 2016
Fix vision error when no results returned. #2750
Merged

richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017
Merge pull requestgoogleapis#2712from daspecster/refactor-vision-re…
9e27531
…quests Refactor _detect_annotation() to support all annotation types.

theacodes unassigned dhermes Sep 28, 2018

parthea pushed a commit that referenced this pull request Oct 21, 2023
Merge pull request#2712from daspecster/refactor-vision-requests
72733cc
Refactor _detect_annotation() to support all annotation types.

Uh oh!

Conversation

daspecster commented Nov 9, 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!

daspecster commented Nov 11, 2016

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

dhermes commented Nov 11, 2016

Uh oh!

daspecster commented Nov 11, 2016

Uh oh!

daspecster commented Nov 11, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants