Merge branch 'tmp-generated-samples' of https://github.com/GoogleCloudPlatform/python-docs-samples into tmp-generated-samples

nnegrey · nnegrey · commit 1acc94538c10 · 2019-06-10T12:10:00.000-06:00
diff --git a/vision/cloud-client/detect/vision_async_batch_annotate_images.py b/vision/cloud-client/detect/vision_async_batch_annotate_images.py
@@ -19,6 +19,10 @@
 # To install the latest published package dependency, execute the following:
 #   pip install google-cloud-vision
 
+# sample-metadata
+#   title: Async Batch Image Annotation
+#   description: Perform async batch image annotation
+#   usage: python3 samples/v1/vision_async_batch_annotate_images.py [--input_image_uri "gs://cloud-samples-data/vision/label/wakeupcat.jpg"] [--output_uri "gs://your-bucket/prefix/"]
 import sys
 
 # [START vision_async_batch_annotate_images]
@@ -33,7 +37,7 @@ def sample_async_batch_annotate_images(input_image_uri, output_uri):
 
   client = vision_v1.ImageAnnotatorClient()
 
-  # input_image_uri = 'gs://cloud-samples-data/vision/label/woman.jpg'
+  # input_image_uri = 'gs://cloud-samples-data/vision/label/wakeupcat.jpg'
   # output_uri = 'gs://your-bucket/prefix/'
 
   if isinstance(input_image_uri, six.binary_type):
@@ -44,11 +48,9 @@ def sample_async_batch_annotate_images(input_image_uri, output_uri):
   image = {'source': source}
   type_ = enums.Feature.Type.LABEL_DETECTION
   features_element = {'type': type_}
-  type_2 = enums.Feature.Type.TEXT_DETECTION
+  type_2 = enums.Feature.Type.IMAGE_PROPERTIES
   features_element_2 = {'type': type_2}
-  type_3 = enums.Feature.Type.IMAGE_PROPERTIES
-  features_element_3 = {'type': type_3}
-  features = [features_element, features_element_2, features_element_3]
+  features = [features_element, features_element_2]
   requests_element = {'image': image, 'features': features}
   requests = [requests_element]
   gcs_destination = {'uri': output_uri}
@@ -73,7 +75,7 @@ def main():
   import argparse
 
   parser = argparse.ArgumentParser()
-  parser.add_argument('--input_image_uri', type=str, default='gs://cloud-samples-data/vision/label/woman.jpg')
+  parser.add_argument('--input_image_uri', type=str, default='gs://cloud-samples-data/vision/label/wakeupcat.jpg')
   parser.add_argument('--output_uri', type=str, default='gs://your-bucket/prefix/')
   args = parser.parse_args()
 
diff --git a/vision/cloud-client/detect/vision_batch_annotate_files.py b/vision/cloud-client/detect/vision_batch_annotate_files.py
@@ -19,6 +19,10 @@
 # To install the latest published package dependency, execute the following:
 #   pip install google-cloud-vision
 
+# sample-metadata
+#   title:
+#   description: Perform batch file annotation
+#   usage: python3 samples/v1/vision_batch_annotate_files.py [--file_path "resources/kafka.pdf"]
 import sys
 
 # [START vision_batch_annotate_files]
diff --git a/vision/cloud-client/detect/vision_batch_annotate_files_gcs.py b/vision/cloud-client/detect/vision_batch_annotate_files_gcs.py
@@ -19,6 +19,10 @@
 # To install the latest published package dependency, execute the following:
 #   pip install google-cloud-vision
 
+# sample-metadata
+#   title:
+#   description: Perform batch file annotation
+#   usage: python3 samples/v1/vision_batch_annotate_files_gcs.py [--storage_uri "gs://cloud-samples-data/vision/document_understanding/kafka.pdf"]
 import sys
 
 # [START vision_batch_annotate_files_gcs]
@@ -27,24 +31,31 @@
 from google.cloud.vision_v1 import enums
 import six
 
-def sample_batch_annotate_files(gcs_uri):
-  """Perform batch file annotation"""
+def sample_batch_annotate_files(storage_uri):
+  """
+    Perform batch file annotation
+
+    Args:
+      storage_uri Cloud Storage URI to source image in the format gs://[bucket]/
+      [file]
+    """
   # [START vision_batch_annotate_files_gcs_core]
 
   client = vision_v1.ImageAnnotatorClient()
 
-  # gcs_uri = 'gs://cloud-samples-data/vision/document_understanding/kafka.pdf'
+  # storage_uri = 'gs://cloud-samples-data/vision/document_understanding/kafka.pdf'
 
-  if isinstance(gcs_uri, six.binary_type):
-    gcs_uri = gcs_uri.decode('utf-8')
-  gcs_source = {'uri': gcs_uri}
+  if isinstance(storage_uri, six.binary_type):
+    storage_uri = storage_uri.decode('utf-8')
+  gcs_source = {'uri': storage_uri}
   input_config = {'gcs_source': gcs_source}
   type_ = enums.Feature.Type.DOCUMENT_TEXT_DETECTION
   features_element = {'type': type_}
   features = [features_element]
 
-  # The service can process up to 5 pages per document file. Here we specify the
-  # first, second, and last page of the document to be processed.
+  # The service can process up to 5 pages per document file.
+  # Here we specify the first, second, and last page of the document to be
+  # processed.
   pages_element = 1
   pages_element_2 = 2
   pages_element_3 = -1
@@ -57,7 +68,6 @@ def sample_batch_annotate_files(gcs_uri):
     print('Full text: {}'.format(image_response.full_text_annotation.text))
     for page in image_response.full_text_annotation.pages:
       for block in page.blocks:
-        # The service also returns the bounding boxes for blocks, paragraphs, words, and symbols.
         print('\nBlock confidence: {}'.format(block.confidence))
         for par in block.paragraphs:
           print('\tParagraph confidence: {}'.format(par.confidence))
@@ -73,10 +83,10 @@ def main():
   import argparse
 
   parser = argparse.ArgumentParser()
-  parser.add_argument('--gcs_uri', type=str, default='gs://cloud-samples-data/vision/document_understanding/kafka.pdf')
+  parser.add_argument('--storage_uri', type=str, default='gs://cloud-samples-data/vision/document_understanding/kafka.pdf')
   args = parser.parse_args()
 
-  sample_batch_annotate_files(args.gcs_uri)
+  sample_batch_annotate_files(args.storage_uri)
 
 if __name__ == '__main__':
   main()
