Vision: Add gRPC support for face detection. #2922

daspecster · 2017-01-06T22:21:03Z

~~Based from #2918~~

This adds gRPC support for face_detect().

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)


system_tests/vision.py

@@ -133,6 +132,7 @@ def test_detect_logos_gcs(self):

 class TestVisionClientFace(BaseVisionTestCase):
    def setUp(self):
+        Config.CLIENT = vision.Client(use_gax=True)


system_tests/vision.py

@@ -423,6 +425,7 @@ def _assert_text(self, text):

    def test_detect_text_content(self):
        client = Config.CLIENT
+        client._use_gax = True


vision/google/cloud/vision/face.py

+    :rtype: :class:`~google.cloud.vision.likelihood.Likelihood`
+    :returns: Instance of ``Likelihood`` converted from gRPC value.
+    """
+    likelihood_pb = LIKELIHOOD_PB.get(likelihood)


vision/google/cloud/vision/face.py

@@ -42,6 +65,23 @@ def from_api_repr(cls, response):

        return cls(roll, pan, tilt)

+    @classmethod
+    def from_pb(cls, response):


vision/google/cloud/vision/face.py

+    def from_pb(cls, response_landmark):
+        """Factory: construct an instance of a Landmark from a response.
+
+        :type response_landmark: dict


vision/google/cloud/vision/face.py

+        """
+        landmarks = []
+        for landmark in response:
+            landmarks.append(Landmark.from_api_repr(landmark))


vision/google/cloud/vision/image.py

@@ -54,7 +54,7 @@ def __init__(self, client, content=None, filename=None, source_uri=None):
                content = file_obj.read()

        if content is not None:
-            content = _bytes_to_unicode(b64encode(_to_bytes(content)))
+            content = _to_bytes(content)


vision/google/cloud/vision/image.py

@@ -67,7 +67,7 @@ def as_dict(self):
        """
        if self.content:
            return {
-                'content': self.content
+                'content': _bytes_to_unicode(b64encode(self.content))


vision/unit_tests/test_annotations.py

@@ -88,6 +88,21 @@ def test_make_entity_from_pb(self):
        self.assertEqual(entity.locations[0].longitude, 2.0)


+class TestMakeFacesFromPB(unittest.TestCase):


googlebot · 2017-01-13T15:53:47Z

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

googlebot · 2017-01-13T15:54:51Z

CLAs look good, thanks!

daspecster · 2017-01-14T00:29:10Z

Rebased on master.

system_tests/vision.py

@@ -137,6 +137,7 @@ def test_detect_logos_gcs(self):

 class TestVisionClientFace(BaseVisionTestCase):
    def setUp(self):
+        Config.CLIENT = vision.Client()


vision/google/cloud/vision/_gax.py

@@ -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)


vision/google/cloud/vision/client.py

@@ -58,7 +58,7 @@ class Client(JSONClient):
    _vision_api_internal = None

    def __init__(self, project=None, credentials=None, http=None,
-                 use_gax=False):
+                 use_gax=None):


vision/google/cloud/vision/face.py

+        joy_likelihood = Likelihood[emotions['joyLikelihood']]
+        sorrow_likelihood = Likelihood[emotions['sorrowLikelihood']]
+        surprise_likelihood = Likelihood[emotions['surpriseLikelihood']]
+        anger_likelihood = Likelihood[emotions['angerLikelihood']]


vision/google/cloud/vision/face.py

-    CHIN_LEFT_GONION = 'CHIN_LEFT_GONION'
-    CHIN_RIGHT_GONION = 'CHIN_RIGHT_GONION'
+    # Unknown face landmark detected. Should not be filled.
+    UNKNOWN_LANDMARK = 0


vision/google/cloud/vision/geometry.py

@@ -219,7 +231,8 @@ def x_coordinate(self):
        :rtype: float
        :returns: X position coordinate.
        """
-        return self._x_coordinate
+        if self._x_coordinate != 0:
+            return self._x_coordinate


vision/google/cloud/vision/image.py

@@ -54,7 +54,7 @@ def __init__(self, client, content=None, filename=None, source_uri=None):
                content = file_obj.read()

        if content is not None:
-            content = _bytes_to_unicode(b64encode(_to_bytes(content)))
+            content = _to_bytes(content)


vision/google/cloud/vision/image.py

@@ -67,7 +67,7 @@ def as_dict(self):
        """
        if self.content:
            return {
-                'content': self.content
+                'content': _bytes_to_unicode(b64encode(self.content))


vision/unit_tests/test_annotations.py

@@ -73,7 +73,7 @@ def test_from_pb(self):
        annotations = self._make_one().from_pb(image_response)
        self.assertEqual(annotations.labels, [])
        self.assertEqual(annotations.logos, [])
-        self.assertEqual(annotations.faces, ())
+        self.assertEqual(annotations.faces, [])


vision/unit_tests/test_annotations.py

+        from google.cloud.vision.annotations import _make_faces_from_pb
+        return _make_faces_from_pb(annotations)
+
+    def test_make_face_from_pb(self):


daspecster · 2017-01-19T17:35:32Z

Merging after chat LGTM and Travis went green.

…om-pb Vision: Add gRPC support for face detection.

daspecster added the api: vision Issues related to the Cloud Vision API. label Jan 6, 2017

daspecster assigned tseaver and dhermes Jan 6, 2017

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Jan 6, 2017

dhermes reviewed Jan 9, 2017

View reviewed changes

daspecster force-pushed the vision-add-face-from-pb branch from b5bf40f to 28bc79e Compare January 13, 2017 15:53

googlebot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Jan 13, 2017

daspecster force-pushed the vision-add-face-from-pb branch from 28bc79e to c30955d Compare January 13, 2017 15:54

googlebot added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Jan 13, 2017

daspecster force-pushed the vision-add-face-from-pb branch 2 times, most recently from 732c099 to 46edcc2 Compare January 14, 2017 00:28

daspecster force-pushed the vision-add-face-from-pb branch 3 times, most recently from b17c58a to 01474cc Compare January 17, 2017 01:02

daspecster mentioned this pull request Jan 17, 2017

Vision: Add gRPC support for image properties. #2937

Merged

daspecster changed the title ~~Vision add face from pb~~ Vision: Add gRPC support for face detection. Jan 17, 2017

dhermes reviewed Jan 18, 2017

View reviewed changes

Add GAPIC support for face detection.

04517cd

daspecster force-pushed the vision-add-face-from-pb branch from ff3f62b to 04517cd Compare January 19, 2017 17:20

daspecster merged commit 309fa8d into googleapis:master Jan 19, 2017

daspecster deleted the vision-add-face-from-pb branch January 19, 2017 17:36

daspecster mentioned this pull request Jan 31, 2017

Tracking Vision Development. #2753

Closed

10 tasks

daspecster mentioned this pull request Feb 24, 2017

Upgrading all versions for umbrella release. #3068

Merged

19 tasks

richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017

Merge pull request googleapis#2922 from daspecster/vision-add-face-fr…

daf47b0

…om-pb Vision: Add gRPC support for face detection.

theacodes unassigned dhermes Sep 28, 2018

		@@ -88,6 +88,21 @@ def test_make_entity_from_pb(self):
		self.assertEqual(entity.locations[0].longitude, 2.0)


		class TestMakeFacesFromPB(unittest.TestCase):

Vision: Add gRPC support for face detection. #2922

Vision: Add gRPC support for face detection. #2922

Conversation

daspecster commented Jan 6, 2017 • edited Loading

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

googlebot commented Jan 13, 2017

googlebot commented Jan 13, 2017

daspecster commented Jan 14, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

daspecster commented Jan 19, 2017 • edited Loading

daspecster commented Jan 6, 2017 •

edited

Loading

daspecster commented Jan 19, 2017 •

edited

Loading