Skip to content

Web detection constant #3073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukesneeringer merged 2 commits into from
Feb 26, 2017
Merged

Web detection constant #3073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e50f1f
Amend missed find/replace for WEB_DETECTION rename.
lukesneeringer Feb 25, 2017
b64a233
Version bump to 0.23.2
lukesneeringer Feb 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions vision/google/cloud/vision/annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
_FULL_TEXT_ANNOTATION = 'fullTextAnnotation'
_IMAGE_PROPERTIES_ANNOTATION = 'imagePropertiesAnnotation'
_SAFE_SEARCH_ANNOTATION = 'safeSearchAnnotation'
_WEB_ANNOTATION = 'webDetection'
_WEB_DETECTION = 'webDetection'

_KEY_MAP = {
_CROP_HINTS_ANNOTATION: 'crop_hints',
Expand All @@ -43,7 +43,7 @@
'logoAnnotations': 'logos',
_SAFE_SEARCH_ANNOTATION: 'safe_searches',
'textAnnotations': 'texts',
_WEB_ANNOTATION: 'web',
_WEB_DETECTION: 'web',
}


Expand Down Expand Up @@ -275,7 +275,7 @@ def _entity_from_response_type(feature_type, results):
return ImagePropertiesAnnotation.from_api_repr(results)
elif feature_type == _SAFE_SEARCH_ANNOTATION:
return SafeSearchAnnotation.from_api_repr(results)
elif feature_type == _WEB_ANNOTATION:
elif feature_type == _WEB_DETECTION:
return WebDetection.from_api_repr(results)
elif feature_type == _CROP_HINTS_ANNOTATION:
crop_hints = results.get('cropHints', [])
Expand Down
2 changes: 1 addition & 1 deletion vision/google/cloud/vision/feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class FeatureTypes(object):
TEXT_DETECTION = 'TEXT_DETECTION'
SAFE_SEARCH_DETECTION = 'SAFE_SEARCH_DETECTION'
IMAGE_PROPERTIES = 'IMAGE_PROPERTIES'
WEB_ANNOTATION = 'WEB_ANNOTATION'
WEB_DETECTION = 'WEB_DETECTION'


class Feature(object):
Expand Down
2 changes: 1 addition & 1 deletion vision/google/cloud/vision/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,6 @@ def detect_web(self, limit=10):
:returns: List of
:class:`~google.cloud.vision.entity.EntityAnnotation`.
"""
features = [Feature(FeatureTypes.WEB_ANNOTATION, limit)]
features = [Feature(FeatureTypes.WEB_DETECTION, limit)]
annotations = self.detect(features)
return annotations[0].web
2 changes: 1 addition & 1 deletion vision/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

setup(
name='google-cloud-vision',
version='0.23.1',
version='0.23.2',
description='Python Client for Google Cloud Vision',
long_description=README,
namespace_packages=[
Expand Down
2 changes: 1 addition & 1 deletion vision/unit_tests/_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@
}


WEB_ANNOTATION_RESPONSE = {
WEB_DETECTION_RESPONSE = {
'responses': [
{
'webDetection': {
Expand Down
6 changes: 3 additions & 3 deletions vision/unit_tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,9 +576,9 @@ def test_detect_web_detection(self):
from google.cloud.vision.web import WebEntity
from google.cloud.vision.web import WebImage
from google.cloud.vision.web import WebPage
from unit_tests._fixtures import WEB_ANNOTATION_RESPONSE
from unit_tests._fixtures import WEB_DETECTION_RESPONSE

returned = WEB_ANNOTATION_RESPONSE
returned = WEB_DETECTION_RESPONSE
credentials = _make_credentials()
client = self._make_one(project=PROJECT, credentials=credentials,
use_gax=False)
Expand All @@ -604,7 +604,7 @@ def test_detect_web_detection(self):
IMAGE_SOURCE)
self.assertEqual(image_request['features'][0]['maxResults'], 2)
self.assertEqual(image_request['features'][0]['type'],
'WEB_ANNOTATION')
'WEB_DETECTION')


class _Connection(object):
Expand Down