From f08a53a23812c390e98532da30b84f8c6222491a Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Fri, 5 Mar 2021 09:27:45 -0800 Subject: [PATCH 1/5] fix: adds comment with explicit hostname change --- samples/snippets/process_document_sample_v1beta3.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/snippets/process_document_sample_v1beta3.py b/samples/snippets/process_document_sample_v1beta3.py index 5b045708..1e2d70e9 100644 --- a/samples/snippets/process_document_sample_v1beta3.py +++ b/samples/snippets/process_document_sample_v1beta3.py @@ -27,7 +27,10 @@ def process_document_sample( ): from google.cloud import documentai_v1beta3 as documentai - # Instantiates a client + # You must set the api_endpoint if you use a location other than 'us', e.g.: + # client = documentai.DocumentProcessorServiceClient( + # {"api_endpoint": "eu-documentai.googleapis.com"} + # ) client = documentai.DocumentProcessorServiceClient() # The full resource name of the processor, e.g.: From f270ffcd55e380911014d75fb50c2fe63fe8f48a Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Fri, 5 Mar 2021 10:19:03 -0800 Subject: [PATCH 2/5] feat(samples): adds more comments --- samples/snippets/batch_process_documents_sample_v1beta3.py | 4 ++++ samples/snippets/quickstart_sample_v1beta3.py | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/samples/snippets/batch_process_documents_sample_v1beta3.py b/samples/snippets/batch_process_documents_sample_v1beta3.py index dae938b2..a9873c9f 100644 --- a/samples/snippets/batch_process_documents_sample_v1beta3.py +++ b/samples/snippets/batch_process_documents_sample_v1beta3.py @@ -38,6 +38,10 @@ def batch_process_documents( timeout: int = 300, ): + # You must set the api_endpoint if you use a location other than 'us', e.g.: + # client = documentai.DocumentProcessorServiceClient( + # {"api_endpoint": "eu-documentai.googleapis.com"} + # ) client = documentai.DocumentProcessorServiceClient() destination_uri = f"{gcs_output_uri}/{gcs_output_uri_prefix}/" diff --git a/samples/snippets/quickstart_sample_v1beta3.py b/samples/snippets/quickstart_sample_v1beta3.py index 37d44bb0..3e082455 100644 --- a/samples/snippets/quickstart_sample_v1beta3.py +++ b/samples/snippets/quickstart_sample_v1beta3.py @@ -25,6 +25,11 @@ def quickstart(project_id: str, location: str, processor_id: str, file_path: str): + + # You must set the api_endpoint if you use a location other than 'us', e.g.: + # client = documentai.DocumentProcessorServiceClient( + # {"api_endpoint": "eu-documentai.googleapis.com"} + # ) client = documentai.DocumentProcessorServiceClient() # The full resource name of the processor, e.g.: From bed10cefcc798526fa6b001d11d4c3cbb3502147 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Mon, 8 Mar 2021 10:05:25 -0800 Subject: [PATCH 3/5] fix: per reviewer --- .../snippets/batch_process_documents_sample_v1beta3.py | 9 +++++---- samples/snippets/process_document_sample_v1beta3.py | 9 +++++---- samples/snippets/quickstart_sample_v1beta3.py | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/samples/snippets/batch_process_documents_sample_v1beta3.py b/samples/snippets/batch_process_documents_sample_v1beta3.py index a9873c9f..a424176c 100644 --- a/samples/snippets/batch_process_documents_sample_v1beta3.py +++ b/samples/snippets/batch_process_documents_sample_v1beta3.py @@ -39,10 +39,11 @@ def batch_process_documents( ): # You must set the api_endpoint if you use a location other than 'us', e.g.: - # client = documentai.DocumentProcessorServiceClient( - # {"api_endpoint": "eu-documentai.googleapis.com"} - # ) - client = documentai.DocumentProcessorServiceClient() + opts = {} + if location == 'eu': + opts = {"api_endpoint": "eu-documentai.googleapis.com"} + + client = documentai.DocumentProcessorServiceClient(opts) destination_uri = f"{gcs_output_uri}/{gcs_output_uri_prefix}/" diff --git a/samples/snippets/process_document_sample_v1beta3.py b/samples/snippets/process_document_sample_v1beta3.py index 1e2d70e9..0173221d 100644 --- a/samples/snippets/process_document_sample_v1beta3.py +++ b/samples/snippets/process_document_sample_v1beta3.py @@ -28,10 +28,11 @@ def process_document_sample( from google.cloud import documentai_v1beta3 as documentai # You must set the api_endpoint if you use a location other than 'us', e.g.: - # client = documentai.DocumentProcessorServiceClient( - # {"api_endpoint": "eu-documentai.googleapis.com"} - # ) - client = documentai.DocumentProcessorServiceClient() + opts = {} + if location == 'eu': + opts = {"api_endpoint": "eu-documentai.googleapis.com"} + + client = documentai.DocumentProcessorServiceClient(opts) # The full resource name of the processor, e.g.: # projects/project-id/locations/location/processor/processor-id diff --git a/samples/snippets/quickstart_sample_v1beta3.py b/samples/snippets/quickstart_sample_v1beta3.py index 3e082455..b423f42e 100644 --- a/samples/snippets/quickstart_sample_v1beta3.py +++ b/samples/snippets/quickstart_sample_v1beta3.py @@ -27,10 +27,11 @@ def quickstart(project_id: str, location: str, processor_id: str, file_path: str): # You must set the api_endpoint if you use a location other than 'us', e.g.: - # client = documentai.DocumentProcessorServiceClient( - # {"api_endpoint": "eu-documentai.googleapis.com"} - # ) - client = documentai.DocumentProcessorServiceClient() + opts = {} + if location == 'eu': + opts = {"api_endpoint": "eu-documentai.googleapis.com"} + + client = documentai.DocumentProcessorServiceClient(opts) # The full resource name of the processor, e.g.: # projects/project-id/locations/location/processor/processor-id From fb33c8c251f3da2e182a9e54a7c4ce9550d572a1 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Tue, 9 Mar 2021 10:27:22 -0800 Subject: [PATCH 4/5] fix: per reviewer --- samples/snippets/batch_process_documents_sample_v1beta3.py | 2 +- samples/snippets/process_document_sample_v1beta3.py | 2 +- samples/snippets/quickstart_sample_v1beta3.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/snippets/batch_process_documents_sample_v1beta3.py b/samples/snippets/batch_process_documents_sample_v1beta3.py index a424176c..5bfd48e2 100644 --- a/samples/snippets/batch_process_documents_sample_v1beta3.py +++ b/samples/snippets/batch_process_documents_sample_v1beta3.py @@ -40,7 +40,7 @@ def batch_process_documents( # You must set the api_endpoint if you use a location other than 'us', e.g.: opts = {} - if location == 'eu': + if location == "eu": opts = {"api_endpoint": "eu-documentai.googleapis.com"} client = documentai.DocumentProcessorServiceClient(opts) diff --git a/samples/snippets/process_document_sample_v1beta3.py b/samples/snippets/process_document_sample_v1beta3.py index 0173221d..ddd48ffe 100644 --- a/samples/snippets/process_document_sample_v1beta3.py +++ b/samples/snippets/process_document_sample_v1beta3.py @@ -29,7 +29,7 @@ def process_document_sample( # You must set the api_endpoint if you use a location other than 'us', e.g.: opts = {} - if location == 'eu': + if location == "eu": opts = {"api_endpoint": "eu-documentai.googleapis.com"} client = documentai.DocumentProcessorServiceClient(opts) diff --git a/samples/snippets/quickstart_sample_v1beta3.py b/samples/snippets/quickstart_sample_v1beta3.py index b423f42e..7e382ca2 100644 --- a/samples/snippets/quickstart_sample_v1beta3.py +++ b/samples/snippets/quickstart_sample_v1beta3.py @@ -28,7 +28,7 @@ def quickstart(project_id: str, location: str, processor_id: str, file_path: str # You must set the api_endpoint if you use a location other than 'us', e.g.: opts = {} - if location == 'eu': + if location == "eu": opts = {"api_endpoint": "eu-documentai.googleapis.com"} client = documentai.DocumentProcessorServiceClient(opts) From ce1885ba5937ce96a252aaf3ff37c36459235a70 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Wed, 10 Mar 2021 14:49:44 -0800 Subject: [PATCH 5/5] fix: tests --- samples/snippets/batch_process_documents_sample_v1beta3.py | 2 +- samples/snippets/process_document_sample_v1beta3.py | 2 +- samples/snippets/quickstart_sample_v1beta3.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/snippets/batch_process_documents_sample_v1beta3.py b/samples/snippets/batch_process_documents_sample_v1beta3.py index 5bfd48e2..33685e00 100644 --- a/samples/snippets/batch_process_documents_sample_v1beta3.py +++ b/samples/snippets/batch_process_documents_sample_v1beta3.py @@ -43,7 +43,7 @@ def batch_process_documents( if location == "eu": opts = {"api_endpoint": "eu-documentai.googleapis.com"} - client = documentai.DocumentProcessorServiceClient(opts) + client = documentai.DocumentProcessorServiceClient(client_options=opts) destination_uri = f"{gcs_output_uri}/{gcs_output_uri_prefix}/" diff --git a/samples/snippets/process_document_sample_v1beta3.py b/samples/snippets/process_document_sample_v1beta3.py index ddd48ffe..ab69d073 100644 --- a/samples/snippets/process_document_sample_v1beta3.py +++ b/samples/snippets/process_document_sample_v1beta3.py @@ -32,7 +32,7 @@ def process_document_sample( if location == "eu": opts = {"api_endpoint": "eu-documentai.googleapis.com"} - client = documentai.DocumentProcessorServiceClient(opts) + client = documentai.DocumentProcessorServiceClient(client_options=opts) # The full resource name of the processor, e.g.: # projects/project-id/locations/location/processor/processor-id diff --git a/samples/snippets/quickstart_sample_v1beta3.py b/samples/snippets/quickstart_sample_v1beta3.py index 7e382ca2..884b412c 100644 --- a/samples/snippets/quickstart_sample_v1beta3.py +++ b/samples/snippets/quickstart_sample_v1beta3.py @@ -31,7 +31,7 @@ def quickstart(project_id: str, location: str, processor_id: str, file_path: str if location == "eu": opts = {"api_endpoint": "eu-documentai.googleapis.com"} - client = documentai.DocumentProcessorServiceClient(opts) + client = documentai.DocumentProcessorServiceClient(client_options=opts) # The full resource name of the processor, e.g.: # projects/project-id/locations/location/processor/processor-id