From 750d2f6d36b1a030f7226067922c8ac3dab3a39b Mon Sep 17 00:00:00 2001 From: nnegrey Date: Fri, 25 Oct 2019 09:41:19 -0600 Subject: [PATCH 1/4] Add Set Endpoint Samples --- automl/beta/requirements.txt | 1 + automl/beta/set_endpoint.py | 39 +++++++++++++++++ automl/beta/set_endpoint_test.py | 26 +++++++++++ language/cloud-client/v1/set_endpoint.py | 40 +++++++++++++++++ language/cloud-client/v1/set_endpoint_test.py | 22 ++++++++++ vision/cloud-client/detect/set_endpoint.py | 43 +++++++++++++++++++ .../cloud-client/detect/set_endpoint_test.py | 22 ++++++++++ 7 files changed, 193 insertions(+) create mode 100644 automl/beta/requirements.txt create mode 100644 automl/beta/set_endpoint.py create mode 100644 automl/beta/set_endpoint_test.py create mode 100644 language/cloud-client/v1/set_endpoint.py create mode 100644 language/cloud-client/v1/set_endpoint_test.py create mode 100644 vision/cloud-client/detect/set_endpoint.py create mode 100644 vision/cloud-client/detect/set_endpoint_test.py diff --git a/automl/beta/requirements.txt b/automl/beta/requirements.txt new file mode 100644 index 000000000000..7d202213a88a --- /dev/null +++ b/automl/beta/requirements.txt @@ -0,0 +1 @@ +google-cloud-automl==0.7.0 diff --git a/automl/beta/set_endpoint.py b/automl/beta/set_endpoint.py new file mode 100644 index 000000000000..6a1fa362ce0a --- /dev/null +++ b/automl/beta/set_endpoint.py @@ -0,0 +1,39 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +def set_endpoint(project_id): + """Change your endpoint""" + # [START automl_set_endpoint] + from google.cloud import automl_v1beta1 as automl + + # You must first create a dataset, using the `eu` endpoint, before you can + # call other operations such as: list, get, import, delete, etc. + client_options = {'api_endpoint': 'eu-automl.googleapis.com:443'} + + # Instantiates a client + client = automl.AutoMlClient(client_options=client_options) + + # A resource that represents Google Cloud Platform location. + # project_id = 'YOUR_PROJECT_ID' + project_location = client.location_path(project_id, 'eu') + # [END automl_set_endpoint] + + # List all the datasets available + # Note: Create a dataset in `eu`, before calling `list_datasets`. + response = client.list_datasets( + project_location, '') + + for dataset in response: + print(dataset) diff --git a/automl/beta/set_endpoint_test.py b/automl/beta/set_endpoint_test.py new file mode 100644 index 000000000000..88a0164c66a2 --- /dev/null +++ b/automl/beta/set_endpoint_test.py @@ -0,0 +1,26 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import set_endpoint + +PROJECT_ID = os.environ['GCLOUD_PROJECT'] + + +def test_set_endpoint(capsys): + set_endpoint.set_endpoint(PROJECT_ID) + + out, _ = capsys.readouterr() + # Look for the display name + assert 'do_not_delete_me' in out diff --git a/language/cloud-client/v1/set_endpoint.py b/language/cloud-client/v1/set_endpoint.py new file mode 100644 index 000000000000..abc6f180a523 --- /dev/null +++ b/language/cloud-client/v1/set_endpoint.py @@ -0,0 +1,40 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +def set_endpoint(): + """Change your endpoint""" + # [START language_set_endpoint] + # Imports the Google Cloud client library + from google.cloud import language + + client_options = {'api_endpoint': 'eu-language.googleapis.com:443'} + + # Instantiates a client + client = language.LanguageServiceClient(client_options=client_options) + # [END language_set_endpoint] + + # The text to analyze + document = language.types.Document( + content='Hello, world!', + type=language.enums.Document.Type.PLAIN_TEXT) + + # Detects the sentiment of the text + sentiment = client.analyze_sentiment(document=document).document_sentiment + + print('Sentiment: {}, {}'.format(sentiment.score, sentiment.magnitude)) + + +if __name__ == '__main__': + set_endpoint() diff --git a/language/cloud-client/v1/set_endpoint_test.py b/language/cloud-client/v1/set_endpoint_test.py new file mode 100644 index 000000000000..7e124c36a93d --- /dev/null +++ b/language/cloud-client/v1/set_endpoint_test.py @@ -0,0 +1,22 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import set_endpoint + + +def test_set_endpoint(capsys): + set_endpoint.set_endpoint() + + out, _ = capsys.readouterr() + assert 'Sentiment' in out diff --git a/vision/cloud-client/detect/set_endpoint.py b/vision/cloud-client/detect/set_endpoint.py new file mode 100644 index 000000000000..2c9c9284ce26 --- /dev/null +++ b/vision/cloud-client/detect/set_endpoint.py @@ -0,0 +1,43 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +def set_endpoint(): + """Change your endpoint""" + # [START vision_set_endpoint] + from google.cloud import vision + + client_options = {'api_endpoint': 'eu-vision.googleapis.com:443'} + + client = vision.ImageAnnotatorClient(client_options=client_options) + # [END vision_set_endpoint] + + image = vision.types.Image() + image.source.image_uri = 'gs://cloud-samples-data/vision/text/screen.jpg' + + response = client.text_detection(image=image) + texts = response.text_annotations + print('Texts:') + + for text in texts: + print('\n"{}"'.format(text.description)) + + vertices = (['({},{})'.format(vertex.x, vertex.y) + for vertex in text.bounding_poly.vertices]) + + print('bounds: {}'.format(','.join(vertices))) + + +if __name__ == '__main__': + set_endpoint() diff --git a/vision/cloud-client/detect/set_endpoint_test.py b/vision/cloud-client/detect/set_endpoint_test.py new file mode 100644 index 000000000000..51ebe10ffe69 --- /dev/null +++ b/vision/cloud-client/detect/set_endpoint_test.py @@ -0,0 +1,22 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import set_endpoint + + +def test_set_endpoint(capsys): + set_endpoint.set_endpoint() + + out, _ = capsys.readouterr() + assert 'System Software Update' in out From 3931d4d7bae2f7897630056d6cc6947676a7ed29 Mon Sep 17 00:00:00 2001 From: nnegrey Date: Fri, 25 Oct 2019 10:05:00 -0600 Subject: [PATCH 2/4] Add additional test result option --- vision/cloud-client/detect/detect_test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vision/cloud-client/detect/detect_test.py b/vision/cloud-client/detect/detect_test.py index 29e87a89126a..13c61d160cd5 100644 --- a/vision/cloud-client/detect/detect_test.py +++ b/vision/cloud-client/detect/detect_test.py @@ -225,7 +225,8 @@ def test_detect_web_with_geo(capsys): detect.web_entities_include_geo_results(file_name) out, _ = capsys.readouterr() out = out.lower() - assert 'zepra' in out or 'electra tower' in out or 'tel aviv' in out + assert ('zepra' in out or 'electra tower' in out or 'tel aviv' in out or + 'jaffa' in out) def test_detect_web_with_geo_uri(capsys): @@ -233,7 +234,8 @@ def test_detect_web_with_geo_uri(capsys): detect.web_entities_include_geo_results_uri(file_name) out, _ = capsys.readouterr() out = out.lower() - assert 'zepra' in out or 'electra tower' in out or 'tel aviv' in out + assert ('zepra' in out or 'electra tower' in out or 'tel aviv' in out or + 'jaffa' in out) def test_detect_document(capsys): From c3f61bf4326f34e52f4737abce8cd23e542a259e Mon Sep 17 00:00:00 2001 From: nnegrey Date: Mon, 28 Oct 2019 16:39:13 -0600 Subject: [PATCH 3/4] Sample Request update --- vision/cloud-client/detect/set_endpoint.py | 43 ------------------- .../cloud-client/detect/set_endpoint_test.py | 22 ---------- 2 files changed, 65 deletions(-) delete mode 100644 vision/cloud-client/detect/set_endpoint.py delete mode 100644 vision/cloud-client/detect/set_endpoint_test.py diff --git a/vision/cloud-client/detect/set_endpoint.py b/vision/cloud-client/detect/set_endpoint.py deleted file mode 100644 index 2c9c9284ce26..000000000000 --- a/vision/cloud-client/detect/set_endpoint.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -def set_endpoint(): - """Change your endpoint""" - # [START vision_set_endpoint] - from google.cloud import vision - - client_options = {'api_endpoint': 'eu-vision.googleapis.com:443'} - - client = vision.ImageAnnotatorClient(client_options=client_options) - # [END vision_set_endpoint] - - image = vision.types.Image() - image.source.image_uri = 'gs://cloud-samples-data/vision/text/screen.jpg' - - response = client.text_detection(image=image) - texts = response.text_annotations - print('Texts:') - - for text in texts: - print('\n"{}"'.format(text.description)) - - vertices = (['({},{})'.format(vertex.x, vertex.y) - for vertex in text.bounding_poly.vertices]) - - print('bounds: {}'.format(','.join(vertices))) - - -if __name__ == '__main__': - set_endpoint() diff --git a/vision/cloud-client/detect/set_endpoint_test.py b/vision/cloud-client/detect/set_endpoint_test.py deleted file mode 100644 index 51ebe10ffe69..000000000000 --- a/vision/cloud-client/detect/set_endpoint_test.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import set_endpoint - - -def test_set_endpoint(capsys): - set_endpoint.set_endpoint() - - out, _ = capsys.readouterr() - assert 'System Software Update' in out From b50e5224c92a76f8381df132c8ce5b0c771b368c Mon Sep 17 00:00:00 2001 From: nnegrey Date: Fri, 15 Nov 2019 15:07:05 -0700 Subject: [PATCH 4/4] Add filter_ --- automl/beta/set_endpoint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automl/beta/set_endpoint.py b/automl/beta/set_endpoint.py index 6a1fa362ce0a..436e427ec827 100644 --- a/automl/beta/set_endpoint.py +++ b/automl/beta/set_endpoint.py @@ -33,7 +33,7 @@ def set_endpoint(project_id): # List all the datasets available # Note: Create a dataset in `eu`, before calling `list_datasets`. response = client.list_datasets( - project_location, '') + project_location, filter_='') for dataset in response: print(dataset)