Refactor _detect_annotation() to support all annotation types. - #2712
Merged
daspecster merged 1 commit intoNov 11, 2016
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
daspecster
force-pushed
the
refactor-vision-requests
branch
from
51433d6 to
7d4a998
Compare
November 9, 2016 21:08
daspecster
force-pushed
the
refactor-vision-requests
branch
from
7d4a998 to
e766ac9
Compare
November 10, 2016 18:05
dhermes
reviewed
Nov 10, 2016
dhermes
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Mostly LGTM though ISTM you should be doing
features = [feature]in _detect_annotation
Sorry, something went wrong.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| :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` |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
| return self._source | ||
|
|
||
| def _detect_annotation(self, feature): | ||
| def _detect_annotation(self, features): |
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/google/cloud/vision/image.py
Outdated
| """Convert a JSON result to an entity type based on the feature.""" | ||
|
|
||
| reverse_types = { | ||
| 'FACE_DETECTION': 'faceAnnotations', |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| return detected_objects[0] | ||
| return detected_objects | ||
|
|
||
| @staticmethod |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| self._entity_from_response_type(feature.feature_type, results)) | ||
|
|
||
| if len(detected_objects) == 1: | ||
| return detected_objects[0] |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| result = results[feature_key] | ||
| detected_objects.append(SafeSearchAnnotation.from_api_repr(result)) | ||
| else: | ||
| for result in results[feature_key]: |
This comment was marked as spam.
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| detected_objects.append(detected_object) | ||
| feature_key = reverse_types[feature_type] | ||
|
|
||
| if feature_type == 'FACE_DETECTION': |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
|
|
||
| if feature_type == 'FACE_DETECTION': | ||
| for face in results[feature_key]: | ||
| detected_objects.append(Face.from_api_repr(face)) |
This comment was marked as spam.
Comment thread
vision/google/cloud/vision/image.py
Outdated
| detected_objects.append(SafeSearchAnnotation.from_api_repr(result)) | ||
| else: | ||
| for result in results[feature_key]: | ||
| detected_objects.append(EntityAnnotation.from_api_repr(result)) |
This comment was marked as spam.
Copy link
Copy Markdown
Contributor
Author
|
Regarding your comment about features = [features], if I do that, then I'll need to put a check there as well. if not isinstance(features, list):
features = [features] |
Sorry, something went wrong.
tseaver
reviewed
Nov 11, 2016
Comment thread
vision/google/cloud/vision/image.py
| 'LOGO_DETECTION': 'logoAnnotations', | ||
| _SAFE_SEARCH_DETECTION: 'safeSearchAnnotation', | ||
| 'TEXT_DETECTION': 'textAnnotations', | ||
| } |
This comment was marked as spam.
This comment was marked as spam.
Copy link
Copy Markdown
Contributor
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. |
Sorry, something went wrong.
daspecster
force-pushed
the
refactor-vision-requests
branch
from
1bfd25f to
f164c3f
Compare
November 11, 2016 19:26
Copy link
Copy Markdown
Contributor
Author
|
Squished. Once the build goes green I'll merge. |
Sorry, something went wrong.
daspecster
force-pushed
the
refactor-vision-requests
branch
from
f164c3f to
83b128a
Compare
November 11, 2016 19:27
richkadel
pushed a commit
to richkadel/google-cloud-python
that referenced
this pull request
May 6, 2017
…quests Refactor _detect_annotation() to support all annotation types.
parthea
pushed a commit
that referenced
this pull request
Oct 21, 2023
Refactor _detect_annotation() to support all annotation types.
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.
This is a step towards adding the manual detect method.
See: #2697