-
Notifications
You must be signed in to change notification settings - Fork 6.6k
automl: video beta move model samples from branch to master #2754
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ca3dba3
automl: video beta move model samples from branch to master
nnegrey 0fa0879
Merge branch 'master' into automl-video-beta-model
leahecole fc9fd40
Fix region tag
nnegrey a589458
Merge branch 'automl-video-beta-model' of https://github.com/GoogleCl…
nnegrey dac753f
Merge branch 'master' into automl-video-beta-model
leahecole 694757b
Merge branch 'master' into automl-video-beta-model
leahecole File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Copyright 2020 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 delete_model(project_id, model_id): | ||
"""Delete a model.""" | ||
# [START automl_delete_model_beta] | ||
from google.cloud import automl_v1beta1 as automl | ||
|
||
# TODO(developer): Uncomment and set the following variables | ||
# project_id = "YOUR_PROJECT_ID" | ||
# model_id = "YOUR_MODEL_ID" | ||
|
||
client = automl.AutoMlClient() | ||
# Get the full path of the model. | ||
model_full_id = client.model_path(project_id, "us-central1", model_id) | ||
response = client.delete_model(model_full_id) | ||
|
||
print("Model deleted. {}".format(response.result())) | ||
# [END automl_delete_model_beta] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Copyright 2020 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 delete_model | ||
|
||
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"] | ||
|
||
|
||
def test_delete_model(capsys): | ||
# As model creation can take many hours, instead try to delete a | ||
# nonexistent model and confirm that the model was not found, but other | ||
# elements of the request were valid. | ||
try: | ||
delete_model.delete_model(PROJECT_ID, "TRL0000000000000000000") | ||
out, _ = capsys.readouterr() | ||
assert "The model does not exist" in out | ||
except Exception as e: | ||
assert "The model does not exist" in e.message |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# Copyright 2020 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 get_model(project_id, model_id): | ||
"""Get a model.""" | ||
# [START automl_get_model_beta] | ||
from google.cloud import automl_v1beta1 as automl | ||
|
||
# TODO(developer): Uncomment and set the following variables | ||
# project_id = "YOUR_PROJECT_ID" | ||
# model_id = "YOUR_MODEL_ID" | ||
|
||
client = automl.AutoMlClient() | ||
# Get the full path of the model. | ||
model_full_id = client.model_path(project_id, "us-central1", model_id) | ||
model = client.get_model(model_full_id) | ||
|
||
# Retrieve deployment state. | ||
if model.deployment_state == automl.enums.Model.DeploymentState.DEPLOYED: | ||
deployment_state = "deployed" | ||
else: | ||
deployment_state = "undeployed" | ||
|
||
# Display the model information. | ||
print("Model name: {}".format(model.name)) | ||
print("Model id: {}".format(model.name.split("/")[-1])) | ||
print("Model display name: {}".format(model.display_name)) | ||
print("Model create time:") | ||
print("\tseconds: {}".format(model.create_time.seconds)) | ||
print("\tnanos: {}".format(model.create_time.nanos)) | ||
print("Model deployment state: {}".format(deployment_state)) | ||
# [END automl_get_model_beta] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
# Copyright 2020 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 get_model_evaluation(project_id, model_id, model_evaluation_id): | ||
"""Get model evaluation.""" | ||
# [START automl_video_classification_get_model_evaluation_beta] | ||
from google.cloud import automl_v1beta1 as automl | ||
|
||
# TODO(developer): Uncomment and set the following variables | ||
# project_id = "YOUR_PROJECT_ID" | ||
# model_id = "YOUR_MODEL_ID" | ||
# model_evaluation_id = "YOUR_MODEL_EVALUATION_ID" | ||
|
||
client = automl.AutoMlClient() | ||
# Get the full path of the model evaluation. | ||
model_evaluation_full_id = client.model_evaluation_path( | ||
project_id, "us-central1", model_id, model_evaluation_id | ||
) | ||
|
||
# Get complete detail of the model evaluation. | ||
response = client.get_model_evaluation(model_evaluation_full_id) | ||
|
||
print("Model evaluation name: {}".format(response.name)) | ||
print("Model annotation spec id: {}".format(response.annotation_spec_id)) | ||
print("Create Time:") | ||
print("\tseconds: {}".format(response.create_time.seconds)) | ||
print("\tnanos: {}".format(response.create_time.nanos / 1e9)) | ||
print( | ||
"Evaluation example count: {}".format(response.evaluated_example_count) | ||
) | ||
|
||
print( | ||
"Classification model evaluation metrics: {}".format( | ||
response.classification_evaluation_metrics | ||
) | ||
) | ||
# [END automl_video_classification_get_model_evaluation_beta] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# Copyright 2020 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 | ||
|
||
from google.cloud import automl_v1beta1 as automl | ||
import pytest | ||
|
||
import get_model_evaluation | ||
|
||
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"] | ||
MODEL_ID = os.environ["ENTITY_EXTRACTION_MODEL_ID"] | ||
|
||
|
||
@pytest.fixture(scope="function") | ||
leahecole marked this conversation as resolved.
Show resolved
Hide resolved
|
||
def model_evaluation_id(): | ||
client = automl.AutoMlClient() | ||
model_full_id = client.model_path(PROJECT_ID, "us-central1", MODEL_ID) | ||
generator = client.list_model_evaluations(model_full_id, "").pages | ||
page = next(generator) | ||
evaluation = page.next() | ||
model_evaluation_id = evaluation.name.split( | ||
"{}/modelEvaluations/".format(MODEL_ID) | ||
)[1].split("\n")[0] | ||
yield model_evaluation_id | ||
|
||
|
||
def test_get_model_evaluation(capsys, model_evaluation_id): | ||
get_model_evaluation.get_model_evaluation( | ||
PROJECT_ID, MODEL_ID, model_evaluation_id | ||
) | ||
out, _ = capsys.readouterr() | ||
assert "Model evaluation name: " in out |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# Copyright 2020 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 get_model | ||
|
||
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"] | ||
MODEL_ID = os.environ["ENTITY_EXTRACTION_MODEL_ID"] | ||
|
||
|
||
def test_get_model(capsys): | ||
get_model.get_model(PROJECT_ID, MODEL_ID) | ||
out, _ = capsys.readouterr() | ||
assert "Model id: " in out |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# Copyright 2020 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 list_models(project_id): | ||
"""List models.""" | ||
# [START automl_list_models_beta] | ||
from google.cloud import automl_v1beta1 as automl | ||
|
||
# TODO(developer): Uncomment and set the following variables | ||
# project_id = "YOUR_PROJECT_ID" | ||
|
||
client = automl.AutoMlClient() | ||
# A resource that represents Google Cloud Platform location. | ||
project_location = client.location_path(project_id, "us-central1") | ||
response = client.list_models(project_location, "") | ||
|
||
print("List of models:") | ||
for model in response: | ||
# Display the model information. | ||
if ( | ||
model.deployment_state | ||
== automl.enums.Model.DeploymentState.DEPLOYED | ||
): | ||
deployment_state = "deployed" | ||
else: | ||
deployment_state = "undeployed" | ||
|
||
print("Model name: {}".format(model.name)) | ||
print("Model id: {}".format(model.name.split("/")[-1])) | ||
print("Model display name: {}".format(model.display_name)) | ||
print("Model create time:") | ||
print("\tseconds: {}".format(model.create_time.seconds)) | ||
print("\tnanos: {}".format(model.create_time.nanos)) | ||
print("Model deployment state: {}".format(deployment_state)) | ||
# [END automl_list_models_beta] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Copyright 2020 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 list_models | ||
|
||
PROJECT_ID = os.environ["AUTOML_PROJECT_ID"] | ||
|
||
|
||
def test_list_models(capsys): | ||
list_models.list_models(PROJECT_ID) | ||
out, _ = capsys.readouterr() | ||
assert "Model id: " in out |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.