chore: bump requests-toolbelt to 1.1.0 fixes #10470

components/google-cloud/google_cloud_pipeline_components/aiplatform/__init__.py

@@ -162,7 +162,7 @@
 
 ModelDeployOp = load_component_from_file(
     os.path.join(
-        os.path.dirname(__file__), 'endpoint/deploy_model/component.yaml'))
+        os.path.dirname(__file__), 'model/deploy_model/component.yaml'))
 
 ModelUndeployOp = load_component_from_file(
     os.path.join(

components/google-cloud/google_cloud_pipeline_components/aiplatform/endpoint/create_endpoint/component.yaml

@@ -8,6 +8,8 @@ description: |
             Required. Project to create the endpoint.
         location (Optional[str]):
             Location to create the endpoint. If not set, default to us-central1.
+        endpoint_name (str):
+            Required. The resource name of the Endpoint.
         display_name (str):
             Required. The user-defined name of the Endpoint.
             The name can be up to 128 characters long and can be consist
@@ -33,14 +35,6 @@ description: |
             resource is created.
 
             If set, this Endpoint and all sub-resources of this Endpoint will be secured by this key.
-        network (Optional[str]):
-            The full name of the Google Compute Engine network to which the
-            Endpoint should be peered. Private services access must already be configured for
-            the network. If left unspecified, the Endpoint is not peered with any network.
-
-            [Format](https://cloud.google.com/compute/docs/reference/rest/v1/networks/insert):
-            projects/{project}/global/networks/{network}.
-            Where {project} is a project number, as in '12345', and {network} is network name.
     Returns:
         endpoint (google.VertexEndpoint):
             Artifact tracking the created endpoint.
@@ -51,32 +45,47 @@ description: |
 inputs:
 - {name: project, type: String}
 - {name: location, type: String, default: "us-central1"}
+- {name: endpoint_name, type: String}
 - {name: display_name, type: String}
 - {name: description, type: String, optional: true, default: ''}
 - {name: labels, type: JsonObject, optional: true, default: '{}'}
-- {name: encryption_spec_key_name, type: String, optional: true, default: ''}
-- {name: network, type: String, optional: true, default: ''}
+- {name: encryption_spec_key_name, type: String, optional: true}
 outputs:
 - {name: endpoint, type: google.VertexEndpoint}
 - {name: gcp_resources, type: String}
 implementation:
   container:
     image: gcr.io/ml-pipeline/google-cloud-pipeline-components:latest
-    command: [python3, -u, -m, google_cloud_pipeline_components.container.v1.endpoint.create_endpoint.launcher]
-    args: [
-      --type, CreateEndpoint,
-      --payload,
-      concat: [
-          '{',
-          '"display_name": "', {inputValue: display_name}, '"',
-          ', "description": "', {inputValue: description}, '"',
-          ', "labels": ', {inputValue: labels},
-          ', "encryption_spec": {"kms_key_name":"', {inputValue: encryption_spec_key_name}, '"}',
-          ', "network": "', {inputValue: network}, '"',
-          '}'
-      ],
-      --project, {inputValue: project},
-      --location, {inputValue: location},
-      --gcp_resources, {outputPath: gcp_resources},
-      --executor_input, "{{$}}",
-    ]
+    command: [python3, -u, -m, google_cloud_pipeline_components.container.aiplatform.remote_runner, --cls_name, Endpoint, --method_name, create]
+    args:
+      - --init.project
+      - {inputValue: project}
+      - --init.location
+      - {inputValue: location}
+      - --init.endpoint_name
+      - {inputValue: endpoint_name}
+      - --method.project
+      - {inputValue: project}
+      - --method.location
+      - {inputValue: location}
+      - --method.display_name
+      - {inputValue: display_name}
+      - if:
+          cond: {isPresent: description}
+          then:
+          - --method.description
+          - {inputValue: description}
+      - if:
+          cond: {isPresent: labels}
+          then:
+          - --method.labels
+          - {inputValue: labels}
+      - if:
+          cond: {isPresent: encryption_spec_key_name}
+          then:
+          - --method.encryption_spec_key_name
+          - {inputValue: encryption_spec_key_name}
+      - --gcp_resources
+      - {outputPath: gcp_resources}
+      - --executor_input
+      - "{{$}}"

components/google-cloud/google_cloud_pipeline_components/aiplatform/endpoint/delete_endpoint/component.yaml

@@ -6,6 +6,10 @@ description: |
     Args:
         endpoint (google.VertexEndpoint):
             Required. The endpoint to be deleted.
+        force (Optional[bool]):
+            Optional. If force is set to True, all deployed models on this Endpoint will be undeployed first. Default is False.
+        sync (Optional[bool]):
+            Optional. Whether to execute this method synchronously.
 
     Returns:
         gcp_resources (str):
@@ -14,21 +18,28 @@ description: |
             For more details, see https://github.com/kubeflow/pipelines/blob/master/components/google-cloud/google_cloud_pipeline_components/proto/README.md.
 inputs:
 - {name: endpoint, type: google.VertexEndpoint}
+- {name: force, type: Boolean, optional: true, default: False}
+- {name: sync, type: Boolean, optional: true, default: True}
 outputs:
 - {name: gcp_resources, type: String}
 implementation:
   container:
     image: gcr.io/ml-pipeline/google-cloud-pipeline-components:latest
-    command: [python3, -u, -m, google_cloud_pipeline_components.container.v1.endpoint.delete_endpoint.launcher]
-    args: [
-      --type, DeleteEndpoint,
-      --payload,
-      concat: [
-          '{',
-          '"endpoint": "', "{{$.inputs.artifacts['endpoint'].metadata['resourceName']}}", '"',
-          '}'
-      ],
-      --project, '', # not being used
-      --location, '', # not being used
-      --gcp_resources, {outputPath: gcp_resources},
-    ]
+    command: [python3, -u, -m, google_cloud_pipeline_components.container.aiplatform.remote_runner, --cls_name, Endpoint, --method_name, delete]
+    args: 
+      - --init.endpoint_name
+      - "{{$.inputs.artifacts['endpoint'].metadata['resourceName']}}"
+      - if:
+          cond: {isPresent: force}
+          then:
+          - --method.force
+          - {inputValue: force}
+      - if:
+          cond: {isPresent: sync}
+          then:
+          - --method.sync
+          - {inputValue: sync}
+      - --gcp_resources,
+      - {outputPath: gcp_resources}
+      - --executor_input
+      - "{{$}}"