feat: add model_version_id to UploadModelResponse in aiplatform v1 model_service.proto

.kokoro/samples/python3.6/common.cfg

@@ -0,0 +1,40 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+ define_artifacts {
+ regex: "**/*sponge_log.xml"
+ }
+}
+
+# Specify which tests to run
+env_vars: {
+ key: "RUN_TESTS_SESSION"
+ value: "py-3.6"
+}
+
+# Declare build specific Cloud project.
+env_vars: {
+ key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
+ value: "ucaip-sample-tests"
+}
+
+env_vars: {
+ key: "TRAMPOLINE_BUILD_FILE"
+ value: "github/python-aiplatform/.kokoro/test-samples.sh"
+}
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+ key: "TRAMPOLINE_IMAGE"
+ value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
+}
+
+# Download secrets for samples
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "python-aiplatform/.kokoro/trampoline_v2.sh"

.kokoro/samples/python3.6/continuous.cfg

@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "INSTALL_LIBRARY_FROM_SOURCE"
+ value: "True"
+}
+

.kokoro/samples/python3.6/periodic-head.cfg

@@ -0,0 +1,11 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "INSTALL_LIBRARY_FROM_SOURCE"
+ value: "True"
+}
+
+env_vars: {
+ key: "TRAMPOLINE_BUILD_FILE"
+ value: "github/python-aiplatform/.kokoro/test-samples-against-head.sh"
+}

.kokoro/samples/python3.6/presubmit.cfg

@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "INSTALL_LIBRARY_FROM_SOURCE"
+ value: "True"
+}

google/cloud/aiplatform_v1/services/migration_service/client.py

@@ -218,40 +218,40 @@ def parse_dataset_path(path: str) -> Dict[str, str]:
  @staticmethod
  def dataset_path(
  project: str,
+ location: str,
  dataset: str,
  ) -> str:
  """Returns a fully-qualified dataset string."""
- return "projects/{project}/datasets/{dataset}".format(
+ return "projects/{project}/locations/{location}/datasets/{dataset}".format(
  project=project,
+ location=location,
  dataset=dataset,
  )
 
  @staticmethod
  def parse_dataset_path(path: str) -> Dict[str, str]:
  """Parses a dataset path into its component segments."""
- m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
+ m = re.match(
+ r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
+ path,
+ )
  return m.groupdict() if m else {}
 
  @staticmethod
  def dataset_path(
  project: str,
- location: str,
  dataset: str,
  ) -> str:
  """Returns a fully-qualified dataset string."""
- return "projects/{project}/locations/{location}/datasets/{dataset}".format(
+ return "projects/{project}/datasets/{dataset}".format(
  project=project,
- location=location,
  dataset=dataset,
  )
 
  @staticmethod
  def parse_dataset_path(path: str) -> Dict[str, str]:
  """Parses a dataset path into its component segments."""
- m = re.match(
- r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
- path,
- )
+ m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
  return m.groupdict() if m else {}
 
  @staticmethod

google/cloud/aiplatform_v1/types/model_service.py

@@ -121,12 +121,19 @@ class UploadModelResponse(proto.Message):
  model (str):
  The name of the uploaded Model resource. Format:
  ``projects/{project}/locations/{location}/models/{model}``
+ model_version_id (str):
+ Output only. The version ID of the model that
+ is uploaded.
  """
 
  model = proto.Field(
  proto.STRING,
  number=1,
  )
+ model_version_id = proto.Field(
+ proto.STRING,
+ number=2,
+ )
 
 
 class GetModelRequest(proto.Message):

mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.6
 namespace_packages = True

samples/model-builder/noxfile.py

@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:
 
 # DO NOT EDIT - automatically generated.
 # All versions used to test samples.
-ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
+ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
 # Any default versions that should be ignored.
 IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]

samples/snippets/noxfile.py

@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:
 
 # DO NOT EDIT - automatically generated.
 # All versions used to test samples.
-ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
+ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
 # Any default versions that should be ignored.
 IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]

scripts/readme-gen/templates/install_deps.tmpl.rst

@@ -12,7 +12,7 @@ Install Dependencies
  .. _Python Development Environment Setup Guide:
  https://cloud.google.com/python/setup
 
-#. Create a virtualenv. Samples are compatible with Python 3.7+.
+#. Create a virtualenv. Samples are compatible with Python 3.6+.
 
  .. code-block:: bash
 

tests/unit/gapic/aiplatform_v1/test_migration_service.py

@@ -1979,19 +1979,22 @@ def test_parse_dataset_path():
 
 def test_dataset_path():
  project = "squid"
- dataset = "clam"
- expected = "projects/{project}/datasets/{dataset}".format(
+ location = "clam"
+ dataset = "whelk"
+ expected = "projects/{project}/locations/{location}/datasets/{dataset}".format(
  project=project,
+ location=location,
  dataset=dataset,
  )
- actual = MigrationServiceClient.dataset_path(project, dataset)
+ actual = MigrationServiceClient.dataset_path(project, location, dataset)
  assert expected == actual
 
 
 def test_parse_dataset_path():
  expected = {
- "project": "whelk",
- "dataset": "octopus",
+ "project": "octopus",
+ "location": "oyster",
+ "dataset": "nudibranch",
  }
  path = MigrationServiceClient.dataset_path(**expected)
 
@@ -2001,22 +2004,19 @@ def test_parse_dataset_path():
 
 
 def test_dataset_path():
- project = "oyster"
- location = "nudibranch"
- dataset = "cuttlefish"
- expected = "projects/{project}/locations/{location}/datasets/{dataset}".format(
+ project = "cuttlefish"
+ dataset = "mussel"
+ expected = "projects/{project}/datasets/{dataset}".format(
  project=project,
- location=location,
  dataset=dataset,
  )
- actual = MigrationServiceClient.dataset_path(project, location, dataset)
+ actual = MigrationServiceClient.dataset_path(project, dataset)
  assert expected == actual
 
 
 def test_parse_dataset_path():
  expected = {
- "project": "mussel",
- "location": "winkle",
+ "project": "winkle",
  "dataset": "nautilus",
  }
  path = MigrationServiceClient.dataset_path(**expected)