diff --git a/.sample_configs/param_handlers/export_model_sample.py b/.sample_configs/param_handlers/export_model_sample.py index c096b20d45..0e2b096659 100644 --- a/.sample_configs/param_handlers/export_model_sample.py +++ b/.sample_configs/param_handlers/export_model_sample.py @@ -23,7 +23,9 @@ def make_output_config(gcs_destination_output_uri_prefix: str) -> google.cloud.a output_config = { 'artifact_destination': { 'output_uri_prefix': gcs_destination_output_uri_prefix - } + }, + # For information about export formats: https://cloud.google.com/ai-platform-unified/docs/export/export-edge-model#aiplatform_export_model_sample-drest + 'export_format_id': 'tf-saved-model' } return output_config diff --git a/samples/snippets/export_model_sample.py b/samples/snippets/export_model_sample.py index ab066e99ed..86b7755e50 100644 --- a/samples/snippets/export_model_sample.py +++ b/samples/snippets/export_model_sample.py @@ -30,7 +30,11 @@ def export_model_sample( # This client only needs to be created once, and can be reused for multiple requests. client = aiplatform.gapic.ModelServiceClient(client_options=client_options) output_config = { - "artifact_destination": {"output_uri_prefix": gcs_destination_output_uri_prefix} + "artifact_destination": { + "output_uri_prefix": gcs_destination_output_uri_prefix + }, + # For information about export formats: https://cloud.google.com/ai-platform-unified/docs/export/export-edge-model#aiplatform_export_model_sample-drest + "export_format_id": "tf-saved-model", } name = client.model_path(project=project, location=location, model=model_id) response = client.export_model(name=name, output_config=output_config) diff --git a/samples/snippets/export_model_sample_test.py b/samples/snippets/export_model_sample_test.py new file mode 100644 index 0000000000..67a625b657 --- /dev/null +++ b/samples/snippets/export_model_sample_test.py @@ -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 +# +# https://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 pytest + +import export_model_sample + +PROJECT_ID = os.getenv("BUILD_SPECIFIC_GCLOUD_PROJECT") +MODEL_ID = ( + "3422489426196955136" # permanent_swim_run_videos_action_recognition_edge_model +) +GCS_URI = ( + "gs://ucaip-samples-test-output/tmp/export_model_sample" +) + + +@pytest.fixture(scope="function", autouse=True) +def teardown(storage_client): + yield + + bucket = storage_client.get_bucket("ucaip-samples-test-output") + blobs = bucket.list_blobs(prefix="tmp/export_model_sample") + for blob in blobs: + blob.delete() + + +def test_export_model_sample(capsys): + export_model_sample.export_model_sample( + project=PROJECT_ID, + model_id=MODEL_ID, + gcs_destination_output_uri_prefix=GCS_URI + ) + out, _ = capsys.readouterr() + assert "output_info" in out