dominikc
diff --git a/‎vision/api/face_detection/requirements.txt
Copy file name to clipboardExpand all lines: vision/api/face_detection/requirements.txt
-2Lines changed: 0 additions & 2 deletions b/‎vision/api/face_detection/requirements.txt
Copy file name to clipboardExpand all lines: vision/api/face_detection/requirements.txt
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎vision/cloud-client/face_detection/.gitignore
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎vision/cloud-client/face_detection/.gitignore
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎vision/api/face_detection/README.rst renamed to ‎vision/cloud-client/face_detection/README.rst
Copy file name to clipboard b/‎vision/api/face_detection/README.rst renamed to ‎vision/cloud-client/face_detection/README.rst
Copy file name to clipboard
diff --git a/‎vision/api/face_detection/README.rst.in renamed to ‎vision/cloud-client/face_detection/README.rst.in
Copy file name to clipboard b/‎vision/api/face_detection/README.rst.in renamed to ‎vision/cloud-client/face_detection/README.rst.in
Copy file name to clipboard
diff --git a/‎vision/api/face_detection/faces.py renamed to ‎vision/cloud-client/face_detection/faces.py
Copy file name to clipboardExpand all lines: vision/cloud-client/face_detection/faces.py
+12-32Lines changed: 12 additions & 32 deletions b/‎vision/api/face_detection/faces.py renamed to ‎vision/cloud-client/face_detection/faces.py
Copy file name to clipboardExpand all lines: vision/cloud-client/face_detection/faces.py
+12-32Lines changed: 12 additions & 32 deletions
diff --git a/‎vision/api/face_detection/faces_test.py renamed to ‎vision/cloud-client/face_detection/faces_test.py
Copy file name to clipboard b/‎vision/api/face_detection/faces_test.py renamed to ‎vision/cloud-client/face_detection/faces_test.py
Copy file name to clipboard
diff --git a/‎vision/cloud-client/face_detection/requirements.txt
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎vision/cloud-client/face_detection/requirements.txt
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎vision/api/face_detection/resources/face-input.jpg renamed to ‎vision/cloud-client/face_detection/resources/face-input.jpg
Copy file name to clipboard b/‎vision/api/face_detection/resources/face-input.jpg renamed to ‎vision/cloud-client/face_detection/resources/face-input.jpg
Copy file name to clipboard
@@ -0,0 +1 @@
+out.jpg
@@ -14,20 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Draws squares around faces in the given image."""
+"""Draws squares around detected faces in the given image."""
 
 import argparse
-import base64
 
-import googleapiclient.discovery
-from PIL import Image
-from PIL import ImageDraw
-
-
-# [START get_vision_service]
-def get_vision_service():
-    return googleapiclient.discovery.build('vision', 'v1')
-# [END get_vision_service]
+from google.cloud import vision
+from PIL import Image, ImageDraw
 
 
 def detect_face(face_file, max_results=4):
@@ -37,26 +29,14 @@ def detect_face(face_file, max_results=4):
         face_file: A file-like object containing an image with faces.
 
     Returns:
-        An array of dicts with information about the faces in the picture.
+        An array of Face objects with information about the picture.
     """
-    image_content = face_file.read()
-    batch_request = [{
-        'image': {
-            'content': base64.b64encode(image_content).decode('utf-8')
-            },
-        'features': [{
-            'type': 'FACE_DETECTION',
-            'maxResults': max_results,
-            }]
-        }]
-
-    service = get_vision_service()
-    request = service.images().annotate(body={
-        'requests': batch_request,
-        })
-    response = request.execute()
-
-    return response['responses'][0]['faceAnnotations']
+    content = face_file.read()
+    # [START get_vision_service]
+    image = vision.Client().image(content=content)
+    # [END get_vision_service]
+
+    return image.detect_faces()
 
 
 def highlight_faces(image, faces, output_filename):
@@ -73,8 +53,8 @@ def highlight_faces(image, faces, output_filename):
     draw = ImageDraw.Draw(im)
 
     for face in faces:
-        box = [(v.get('x', 0.0), v.get('y', 0.0))
-               for v in face['fdBoundingPoly']['vertices']]
+        box = [(bound.x_coordinate, bound.y_coordinate)
+               for bound in face.bounds.vertices]
         draw.line(box + [box[0]], width=5, fill='#00ff00')
 
     im.save(output_filename)
 
@@ -0,0 +1,2 @@
+google-cloud-vision==0.23.3
+Pillow==4.0.0
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+google-cloud-vision==0.23.3`
	`2`	`+Pillow==4.0.0`