From eaf52b436dfa3e4561801667f69d3406628f2562 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Mon, 7 Oct 2019 15:45:22 -0700 Subject: [PATCH] Adds updates for samples profiler ... vision [(#2439)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2439) --- samples/snippets/crop_hints/requirements.txt | 4 ++-- samples/snippets/detect/beta_snippets.py | 2 +- samples/snippets/detect/detect_test.py | 6 +++--- samples/snippets/detect/requirements.txt | 4 ++-- samples/snippets/document_text/doctext.py | 2 +- samples/snippets/document_text/requirements.txt | 4 ++-- samples/snippets/face_detection/faces.py | 3 ++- samples/snippets/face_detection/requirements.txt | 4 ++-- samples/snippets/quickstart/requirements.txt | 2 +- samples/snippets/web/requirements.txt | 2 +- samples/snippets/web/web_detect_test.py | 8 +++++--- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/samples/snippets/crop_hints/requirements.txt b/samples/snippets/crop_hints/requirements.txt index 044a582a..6bc78d07 100644 --- a/samples/snippets/crop_hints/requirements.txt +++ b/samples/snippets/crop_hints/requirements.txt @@ -1,2 +1,2 @@ -google-cloud-vision==0.35.2 -pillow==5.4.1 +google-cloud-vision==0.39.0 +pillow==6.1.0 diff --git a/samples/snippets/detect/beta_snippets.py b/samples/snippets/detect/beta_snippets.py index 52dd0011..0b98d055 100644 --- a/samples/snippets/detect/beta_snippets.py +++ b/samples/snippets/detect/beta_snippets.py @@ -321,7 +321,7 @@ def async_batch_annotate_images_uri(input_image_uri, output_uri): bucket_name = match.group(1) prefix = match.group(2) - bucket = storage_client.get_bucket(bucket_name=bucket_name) + bucket = storage_client.get_bucket(bucket_name) # Lists objects with the given prefix. blob_list = list(bucket.list_blobs(prefix=prefix)) diff --git a/samples/snippets/detect/detect_test.py b/samples/snippets/detect/detect_test.py index eda2afb9..29e87a89 100644 --- a/samples/snippets/detect/detect_test.py +++ b/samples/snippets/detect/detect_test.py @@ -265,14 +265,14 @@ def test_detect_crop_hints(capsys): 'resources/wakeupcat.jpg') detect.detect_crop_hints(file_name) out, _ = capsys.readouterr() - assert 'bounds: (0,0)' in out + assert 'bounds: ' in out def test_detect_crop_hints_uri(capsys): file_name = 'gs://{}/vision/label/wakeupcat.jpg'.format(ASSET_BUCKET) detect.detect_crop_hints_uri(file_name) out, _ = capsys.readouterr() - assert 'bounds: (0,0)' in out + assert 'bounds: ' in out def test_detect_crop_hints_http(capsys): @@ -280,7 +280,7 @@ def test_detect_crop_hints_http(capsys): '/vision/label/wakeupcat.jpg' detect.detect_crop_hints_uri(uri.format(ASSET_BUCKET)) out, _ = capsys.readouterr() - assert 'bounds: (0,0)' in out + assert 'bounds: ' in out def test_async_detect_document(capsys): diff --git a/samples/snippets/detect/requirements.txt b/samples/snippets/detect/requirements.txt index 7dff97ac..c67a5c02 100644 --- a/samples/snippets/detect/requirements.txt +++ b/samples/snippets/detect/requirements.txt @@ -1,2 +1,2 @@ -google-cloud-vision==0.36.0 -google-cloud-storage==1.13.2 +google-cloud-vision==0.39.0 +google-cloud-storage==1.19.1 diff --git a/samples/snippets/document_text/doctext.py b/samples/snippets/document_text/doctext.py index 7ad5b101..6bffc7a1 100644 --- a/samples/snippets/document_text/doctext.py +++ b/samples/snippets/document_text/doctext.py @@ -102,7 +102,7 @@ def render_doc_text(filein, fileout): bounds = get_document_bounds(filein, FeatureType.WORD) draw_boxes(image, bounds, 'yellow') - if fileout is not 0: + if fileout != 0: image.save(fileout) else: image.show() diff --git a/samples/snippets/document_text/requirements.txt b/samples/snippets/document_text/requirements.txt index 044a582a..6bc78d07 100644 --- a/samples/snippets/document_text/requirements.txt +++ b/samples/snippets/document_text/requirements.txt @@ -1,2 +1,2 @@ -google-cloud-vision==0.35.2 -pillow==5.4.1 +google-cloud-vision==0.39.0 +pillow==6.1.0 diff --git a/samples/snippets/face_detection/faces.py b/samples/snippets/face_detection/faces.py index 317057db..7b95fa1e 100755 --- a/samples/snippets/face_detection/faces.py +++ b/samples/snippets/face_detection/faces.py @@ -42,7 +42,8 @@ def detect_face(face_file, max_results=4): content = face_file.read() image = types.Image(content=content) - return client.face_detection(image=image, max_results=max_results).face_annotations + return client.face_detection( + image=image, max_results=max_results).face_annotations # [END vision_face_detection_tutorial_send_request] diff --git a/samples/snippets/face_detection/requirements.txt b/samples/snippets/face_detection/requirements.txt index 6a4025f0..1bb0aa1f 100644 --- a/samples/snippets/face_detection/requirements.txt +++ b/samples/snippets/face_detection/requirements.txt @@ -1,2 +1,2 @@ -google-cloud-vision==0.35.2 -Pillow==5.4.1 +google-cloud-vision==0.39.0 +Pillow==6.1.0 diff --git a/samples/snippets/quickstart/requirements.txt b/samples/snippets/quickstart/requirements.txt index dad4a99e..aab93a35 100644 --- a/samples/snippets/quickstart/requirements.txt +++ b/samples/snippets/quickstart/requirements.txt @@ -1 +1 @@ -google-cloud-vision==0.35.2 +google-cloud-vision==0.39.0 diff --git a/samples/snippets/web/requirements.txt b/samples/snippets/web/requirements.txt index dad4a99e..aab93a35 100644 --- a/samples/snippets/web/requirements.txt +++ b/samples/snippets/web/requirements.txt @@ -1 +1 @@ -google-cloud-vision==0.35.2 +google-cloud-vision==0.39.0 diff --git a/samples/snippets/web/web_detect_test.py b/samples/snippets/web/web_detect_test.py index a6c7b59a..20311748 100644 --- a/samples/snippets/web/web_detect_test.py +++ b/samples/snippets/web/web_detect_test.py @@ -22,7 +22,8 @@ def test_detect_file(capsys): web_detect.report(web_detect.annotate(file_name)) out, _ = capsys.readouterr() print(out) - assert 'description: palace of fine arts' in out.lower() + assert 'description' in out.lower() + assert 'palace' in out.lower() def test_detect_web_gsuri(capsys): @@ -30,11 +31,12 @@ def test_detect_web_gsuri(capsys): ASSET_BUCKET)) web_detect.report(web_detect.annotate(file_name)) out, _ = capsys.readouterr() - assert 'description: palace of fine arts' in out.lower() + assert 'description:' in out.lower() + assert 'palace' in out.lower() def test_detect_web_http(capsys): web_detect.report(web_detect.annotate( 'https://cloud.google.com/images/products/vision/extract-text.png')) out, _ = capsys.readouterr() - assert 'https://cloud.google.com/vision' in out + assert 'web entities' in out.lower()