Feedback from PR googleapis#1803

Author: daspecster

gcloud/vision/__init__.py

@@ -16,3 +16,4 @@
 
 
 from gcloud.vision.client import Client
+from gcloud.vision.feature import FeatureTypes

gcloud/vision/annotation.py

@@ -16,16 +16,6 @@
 
 
 class EntityAnnotation(object):
-    _mid = None
-    _locale = None
-    _description = None
-    _score = None
-    _confidence = None
-    _topicality = None
-    _bounding_poly = None
-    _locations = []
-    _properties = []
-
     def __init__(self, mid, locale, description, score, confidence, topicality,
                  bounding_poly, locations, properties):
         self._mid = mid

gcloud/vision/client.py

@@ -36,15 +36,15 @@ def __init__(self, image, feature):
         self._features = []
         self._image = image
 
-        if type(feature) == list:
+        if isinstance(feature, list):
             self._features.extend(feature)
-        elif type(feature) == Feature:
+        elif isinstance(feature, Feature):
             self._features.append(feature)
 
     def as_dict(self):
         return {
-            "image": self.image,
-            "features": self.features
+            'image': self.image,
+            'features': self.features
         }
 
     @property
@@ -77,18 +77,22 @@ class Client(JSONClient):
                  ``credentials`` for the current object.
 
     Usage:
-    >>> from gcloud import vision
-    >>> vision_client = vision.Client()
-    >>> f = open('/tmp/car.jpg', 'r')
-    >>> vision_client.annotate(f.read(), "LABEL_DETECTION", 3)
+    .. code::
+        >>> from gcloud import vision
+        >>> vision_client = vision.Client()
+        >>> with open('/tmp/car.jpg', 'r') as f:
+        ...     vision_client.annotate(f.read(), vision.LABEL_DETECTION, 3)
 
     Multiple images example:
-    >>> images = (("./image.jpg", ["LABEL_DETECTION", "LANDMARK_DETECTION"]),
-    >>>           ("./image2.jpg", ["FACE_DETECTION", "TEXT_DETECTION"]),)
-    >>> annotated_images = []
-    >>> for image, feature_types in images:
-    >>>     annotated_images.append(vision_client.annotate(image,
-    >>>                                                    feature_types))
+    .. code::
+        >>> images = (('./image.jpg', [vision.FeatureTypes.LABEL_DETECTION,
+        ...                            vision.FeatureTypes.LANDMARK_DETECTION]),
+        ...           ('./image2.jpg', [vision.FeatureTypes.FACE_DETECTION,
+                                        vision.FeatureTypes.TEXT_DETECTION]),)
+        >>> annotated_images = []
+        >>> for image, feature_types in images:
+        ...     annotated_images.append(vision_client.annotate(image,
+        ...                                                    feature_types))
     """
 
     _connection_class = Connection
@@ -113,24 +117,23 @@ def annotate(self, image, feature_type, max_results=1):
         :param max_results: The number of results per feature type to be
                             returned.
         """
-        vision_requests = []
+        data = {'requests': []}
         features = []
 
-        if type(image) == str:
+        if isinstance(image, str):
             img = Image(image)
 
-            if type(feature_type) == list:
+            if isinstance(feature_type, list):
                 for feature in feature_type:
                     features.append(Feature(feature, max_results))
             else:
                 features.append(Feature(feature_type, max_results))
 
-            vision_requests.append(VisionRequest(img, features))
+            data['requests'].append(VisionRequest(img, features))
 
-        data = {"requests": vision_requests}
         data = json.dumps(data, cls=VisionJSONEncoder)
-        resp = self.connection.api_request(method="POST",
-                                           path="/images:annotate",
+        resp = self.connection.api_request(method='POST',
+                                           path='/images:annotate',
                                            data=data)
         resp = resp['responses']
         return resp

gcloud/vision/feature.py

@@ -19,17 +19,16 @@ class FeatureTypes(object):
     See:
     https://cloud.google.com/vision/reference/rest/v1/images/annotate#Type
     """
-    FACE_DETECTION = "FACE_DETECTION"
-    LANDMARK_DETECTION = "LANDMARK_DETECTION"
-    LOGO_DETECTION = "LOGO_DETECTION"
-    LABEL_DETECTION = "LABEL_DETECTION"
-    TEXT_DETECTION = "TEXT_DETECTION"
-    SAFE_SEARCH_DETECTION = "SAFE_SEARCH_DETECTION"
+    FACE_DETECTION = 'FACE_DETECTION'
+    LANDMARK_DETECTION = 'LANDMARK_DETECTION'
+    LOGO_DETECTION = 'LOGO_DETECTION'
+    LABEL_DETECTION = 'LABEL_DETECTION'
+    TEXT_DETECTION = 'TEXT_DETECTION'
+    SAFE_SEARCH_DETECTION = 'SAFE_SEARCH_DETECTION'
 
 
 class Feature(object):
-    """Feature object specifying the annotation and number of results for the
-    specified feature type.
+    """Feature object specifying the annotation type and maximum results.
 
     :type feature_type: str
     :param feature_type: String representation of feature type.
@@ -48,8 +47,8 @@ def __init__(self, feature_type, max_results=1):
     def as_dict(self):
         """Generate dictionary for Feature request format."""
         return {
-            "type": self.feature_type,
-            "maxResults": self.max_results
+            'type': self.feature_type,
+            'maxResults': self.max_results
         }
 
     @property

gcloud/vision/image.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import httplib2
 
 from base64 import b64encode
 
@@ -33,27 +34,26 @@ def __init__(self, image):
 
         # TODO: string index out of range for len(string) < 4.
         # TODO: Support file path.
-        if image[:4] == 'http':
-            import httplib2
+        if image.startswith('http'):
             http = httplib2.Http()
             response, downloaded_image = http.request(image, 'GET')
             self._content = b64encode(downloaded_image)
-        elif image[:5] == 'gs://':
+        elif image.startswith('gs://'):
             self._source = image
-        elif type(image) == str:
+        elif isinstance(image, str):
             self._content = b64encode(image)
 
     def as_dict(self):
         """Generate dictionary for request"""
 
         if self.content:
             return {
-                "content": self.content
+                'content': self.content
             }
         else:
             return {
-                "source": {
-                    "gcs_image_uri": self.source
+                'source': {
+                    'gcs_image_uri': self.source
                 }
             }
 

gcloud/vision/test_client.py

@@ -23,8 +23,8 @@ class TestFeature(unittest2.TestCase):
     def test_construct_feature(self):
         feature = Feature(FeatureTypes.LABEL_DETECTION)
         self.assertEqual(1, feature.max_results)
-        self.assertEqual("LABEL_DETECTION", feature.feature_type)
+        self.assertEqual('LABEL_DETECTION', feature.feature_type)
 
         feature = Feature(FeatureTypes.FACE_DETECTION, 3)
         self.assertEqual(3, feature.max_results)
-        self.assertEqual("FACE_DETECTION", feature.feature_type)
+        self.assertEqual('FACE_DETECTION', feature.feature_type)

gcloud/vision/test_feature.py

@@ -19,8 +19,8 @@
 
 
 class TestVisionImage(unittest2.TestCase):
-    IMAGE_SOURCE = "gs://some/image.jpg"
-    IMAGE_CONTENT = "/9j/4QNURXhpZgAASUkq"
+    IMAGE_SOURCE = 'gs://some/image.jpg'
+    IMAGE_CONTENT = '/9j/4QNURXhpZgAASUkq'
     B64_IMAGE_CONTENT = base64.b64encode(IMAGE_CONTENT)
 
     def test_image_source_type_content(self):