From 9c287c6777b1b421a4bd4dfe78cffa171057795f Mon Sep 17 00:00:00 2001 From: Yu-Han Liu Date: Tue, 20 Nov 2018 23:02:03 -0800 Subject: [PATCH 1/2] update samples for product search GA --- .../cloud-client/product_search/import_product_sets.py | 2 +- .../product_in_product_set_management.py | 2 +- .../product_in_product_set_management_test.py | 8 ++++---- .../cloud-client/product_search/product_management.py | 2 +- vision/cloud-client/product_search/product_search.py | 2 +- .../product_search/product_set_management.py | 2 +- .../product_search/reference_image_management.py | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/vision/cloud-client/product_search/import_product_sets.py b/vision/cloud-client/product_search/import_product_sets.py index d08c15c5ec3..e2d037143a6 100755 --- a/vision/cloud-client/product_search/import_product_sets.py +++ b/vision/cloud-client/product_search/import_product_sets.py @@ -24,7 +24,7 @@ import argparse # [START vision_product_search_tutorial_import] -from google.cloud import vision_v1p3beta1 as vision +from google.cloud import vision # [END vision_product_search_tutorial_import] diff --git a/vision/cloud-client/product_search/product_in_product_set_management.py b/vision/cloud-client/product_search/product_in_product_set_management.py index e9bfad9bdd9..8c08c8a05e7 100755 --- a/vision/cloud-client/product_search/product_in_product_set_management.py +++ b/vision/cloud-client/product_search/product_in_product_set_management.py @@ -25,7 +25,7 @@ # [START vision_product_search_add_product_to_product_set] # [START vision_product_search_remove_product_from_product_set] -from google.cloud import vision_v1p3beta1 as vision +from google.cloud import vision # [END vision_product_search_add_product_to_product_set] # [END vision_product_search_remove_product_from_product_set] diff --git a/vision/cloud-client/product_search/product_in_product_set_management_test.py b/vision/cloud-client/product_search/product_in_product_set_management_test.py index cae2d2caa02..21a23bdb774 100644 --- a/vision/cloud-client/product_search/product_in_product_set_management_test.py +++ b/vision/cloud-client/product_search/product_in_product_set_management_test.py @@ -54,13 +54,13 @@ def product_and_product_set(): def test_add_product_to_product_set(capsys, product_and_product_set): list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID) out, _ = capsys.readouterr() - assert PRODUCT_ID not in out + assert 'Product id: {}'.format(PRODUCT_ID) not in out add_product_to_product_set( PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID) list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID) out, _ = capsys.readouterr() - assert PRODUCT_ID in out + assert 'Product id: {}'.format(PRODUCT_ID) in out def test_remove_product_from_product_set(capsys, product_and_product_set): @@ -68,10 +68,10 @@ def test_remove_product_from_product_set(capsys, product_and_product_set): PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID) list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID) out, _ = capsys.readouterr() - assert PRODUCT_ID in out + assert 'Product id: {}'.format(PRODUCT_ID) in out remove_product_from_product_set( PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID) list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID) out, _ = capsys.readouterr() - assert PRODUCT_ID not in out + assert 'Product id: {}'.format(PRODUCT_ID) not in out diff --git a/vision/cloud-client/product_search/product_management.py b/vision/cloud-client/product_search/product_management.py index 4b187e98235..01c0571487a 100755 --- a/vision/cloud-client/product_search/product_management.py +++ b/vision/cloud-client/product_search/product_management.py @@ -28,7 +28,7 @@ # [START vision_product_search_list_products] # [START vision_product_search_get_product] # [START vision_product_search_update_product_labels] -from google.cloud import vision_v1p3beta1 as vision +from google.cloud import vision # [END vision_product_search_create_product] # [END vision_product_search_delete_product] diff --git a/vision/cloud-client/product_search/product_search.py b/vision/cloud-client/product_search/product_search.py index 05f19ea3e96..343bb6d0173 100755 --- a/vision/cloud-client/product_search/product_search.py +++ b/vision/cloud-client/product_search/product_search.py @@ -26,7 +26,7 @@ # [START vision_product_search_get_similar_products] # [START vision_product_search_get_similar_products_gcs] -from google.cloud import vision_v1p3beta1 as vision +from google.cloud import vision # [END vision_product_search_get_similar_products] # [END vision_product_search_get_similar_products_gcs] diff --git a/vision/cloud-client/product_search/product_set_management.py b/vision/cloud-client/product_search/product_set_management.py index 941f59fa954..7964bc27b30 100755 --- a/vision/cloud-client/product_search/product_set_management.py +++ b/vision/cloud-client/product_search/product_set_management.py @@ -27,7 +27,7 @@ # [START vision_product_search_list_product_sets] # [START vision_product_search_get_product_set] # [START vision_product_search_create_product_set] -from google.cloud import vision_v1p3beta1 as vision +from google.cloud import vision # [END vision_product_search_delete_product_set] # [END vision_product_search_list_product_sets] diff --git a/vision/cloud-client/product_search/reference_image_management.py b/vision/cloud-client/product_search/reference_image_management.py index a5392783955..19c5622afbf 100755 --- a/vision/cloud-client/product_search/reference_image_management.py +++ b/vision/cloud-client/product_search/reference_image_management.py @@ -27,7 +27,7 @@ # [START vision_product_search_delete_reference_image] # [START vision_product_search_list_reference_images] # [START vision_product_search_get_reference_image] -from google.cloud import vision_v1p3beta1 as vision +from google.cloud import vision # [END vision_product_search_create_reference_image] # [END vision_product_search_delete_reference_image] @@ -108,9 +108,9 @@ def get_reference_image( client = vision.ProductSearchClient() # Get the full path of the reference image. - reference_image_path = client.reference_image_path( + reference_image_path = client.image_path( project=project_id, location=location, product=product_id, - reference_image=reference_image_id) + image=reference_image_id) # Get complete detail of the reference image. image = client.get_reference_image(name=reference_image_path) @@ -136,9 +136,9 @@ def delete_reference_image( client = vision.ProductSearchClient() # Get the full path of the reference image. - reference_image_path = client.reference_image_path( + reference_image_path = client.image_path( project=project_id, location=location, product=product_id, - reference_image=reference_image_id) + image=reference_image_id) # Delete the reference image. client.delete_reference_image(name=reference_image_path) From d4ccc35162ba459e9feccc1ff7c8bffab1fc270a Mon Sep 17 00:00:00 2001 From: Yu-Han Liu Date: Mon, 26 Nov 2018 11:25:50 -0800 Subject: [PATCH 2/2] update to use 0.35.1 --- .../product_search/reference_image_management.py | 8 ++++---- vision/cloud-client/product_search/requirements.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vision/cloud-client/product_search/reference_image_management.py b/vision/cloud-client/product_search/reference_image_management.py index 19c5622afbf..7e546b7e74a 100755 --- a/vision/cloud-client/product_search/reference_image_management.py +++ b/vision/cloud-client/product_search/reference_image_management.py @@ -108,9 +108,9 @@ def get_reference_image( client = vision.ProductSearchClient() # Get the full path of the reference image. - reference_image_path = client.image_path( + reference_image_path = client.reference_image_path( project=project_id, location=location, product=product_id, - image=reference_image_id) + reference_image=reference_image_id) # Get complete detail of the reference image. image = client.get_reference_image(name=reference_image_path) @@ -136,9 +136,9 @@ def delete_reference_image( client = vision.ProductSearchClient() # Get the full path of the reference image. - reference_image_path = client.image_path( + reference_image_path = client.reference_image_path( project=project_id, location=location, product=product_id, - image=reference_image_id) + reference_image=reference_image_id) # Delete the reference image. client.delete_reference_image(name=reference_image_path) diff --git a/vision/cloud-client/product_search/requirements.txt b/vision/cloud-client/product_search/requirements.txt index 01a92ffcaeb..e0dc4537cde 100644 --- a/vision/cloud-client/product_search/requirements.txt +++ b/vision/cloud-client/product_search/requirements.txt @@ -1 +1 @@ -google-cloud-vision==0.35.0 +google-cloud-vision==0.35.1