diff --git a/automl/beta/requirements.txt b/automl/beta/requirements.txt new file mode 100644 index 00000000000..7d202213a88 --- /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 00000000000..436e427ec82 --- /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, filter_='') + + 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 00000000000..88a0164c66a --- /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 00000000000..abc6f180a52 --- /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 00000000000..7e124c36a93 --- /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/detect_test.py b/vision/cloud-client/detect/detect_test.py index 29e87a89126..13c61d160cd 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):