Add GAPIC support for face detection.

Author: daspecster

system_tests/vision.py

@@ -63,7 +63,6 @@ def _assert_coordinate(self, coordinate):
         if coordinate is None:
             return
         self.assertIsInstance(coordinate, (int, float))
-        self.assertNotEqual(coordinate, 0.0)
 
     def _assert_likelihood(self, likelihood):
         from google.cloud.vision.likelihood import Likelihood
@@ -137,6 +136,7 @@ def test_detect_logos_gcs(self):
 
 class TestVisionClientFace(BaseVisionTestCase):
     def setUp(self):
+        Config.CLIENT = vision.Client(use_gax=True)
         self.to_delete_by_case = []
 
     def tearDown(self):
@@ -150,7 +150,7 @@ def _assert_landmarks(self, landmarks):
 
         for landmark in LandmarkTypes:
             if landmark is not LandmarkTypes.UNKNOWN_LANDMARK:
-                feature = getattr(landmarks, landmark.value.lower())
+                feature = getattr(landmarks, landmark.name.lower())
                 self.assertIsInstance(feature, Landmark)
                 self.assertIsInstance(feature.position, Position)
                 self._assert_coordinate(feature.position.x_coordinate)
@@ -297,6 +297,7 @@ class TestVisionClientLandmark(BaseVisionTestCase):
     DESCRIPTIONS = ('Mount Rushmore',)
 
     def setUp(self):
+        Config.CLIENT = vision.Client(use_gax=True)
         self.to_delete_by_case = []
 
     def tearDown(self):
@@ -356,6 +357,7 @@ def test_detect_landmark_filename(self):
 
 class TestVisionClientSafeSearch(BaseVisionTestCase):
     def setUp(self):
+        Config.CLIENT = vision.Client(use_gax=False)
         self.to_delete_by_case = []
 
     def tearDown(self):
@@ -478,6 +480,7 @@ def test_detect_text_filename(self):
 
 class TestVisionClientImageProperties(BaseVisionTestCase):
     def setUp(self):
+        Config.CLIENT = vision.Client(use_gax=False)
         self.to_delete_by_case = []
 
     def tearDown(self):

vision/google/cloud/vision/_gax.py

@@ -17,8 +17,6 @@
 from google.cloud.gapic.vision.v1 import image_annotator_client
 from google.cloud.grpc.vision.v1 import image_annotator_pb2
 
-from google.cloud._helpers import _to_bytes
-
 from google.cloud.vision.annotations import Annotations
 
 
@@ -85,7 +83,7 @@ def _to_gapic_image(image):
               :class:`~google.cloud.vision.image.Image`.
     """
     if image.content is not None:
-        return image_annotator_pb2.Image(content=_to_bytes(image.content))
+        return image_annotator_pb2.Image(content=image.content)
     if image.source is not None:
         return image_annotator_pb2.Image(
             source=image_annotator_pb2.ImageSource(

vision/google/cloud/vision/annotations.py

@@ -119,6 +119,7 @@ def _process_image_annotations(image):
     :returns: Dictionary populated with entities from response.
     """
     return {
+        'faces': _make_faces_from_pb(image.face_annotations),
         'labels': _make_entity_from_pb(image.label_annotations),
         'landmarks': _make_entity_from_pb(image.landmark_annotations),
         'logos': _make_entity_from_pb(image.logo_annotations),
@@ -139,6 +140,22 @@ def _make_entity_from_pb(annotations):
     return [EntityAnnotation.from_pb(annotation) for annotation in annotations]
 
 
+def _make_faces_from_pb(annotations):
+    """Create face objects from a gRPC response.
+
+    :type annotations:
+    :class:`~google.cloud.grpc.vision.v1.image_annotator_pb2.FaceAnnotation`
+    :param annotations: gRPC instance of ``FaceAnnotation``.
+
+    :rtype: list
+    :returns: List of ``Face``.
+    """
+    faces = []
+    for annotation in annotations:
+        faces.append(Face.from_pb(annotation))
+    return faces
+
+
 def _entity_from_response_type(feature_type, results):
     """Convert a JSON result to an entity type based on the feature.