Allow system.Model artifacts in the Modelcar format (kubeflow#11674)

This skips uploading the model to S3 when the model URI starts with
oci://.

Signed-off-by: mprahl <[email protected]>

Author: mprahl

.github/workflows/kfp-samples.yml

@@ -38,7 +38,7 @@ jobs:
 
     - name: Build and upload the sample Modelcar image to Kind
       run: |
-        docker build -f samples/v2/modelcar_import/Dockerfile -t registry.domain.local/modelcar:test .
+        docker build -f samples/v2/modelcar/Dockerfile -t registry.domain.local/modelcar:test .
         kind --name kfp load docker-image registry.domain.local/modelcar:test
 
     - name: Forward API port

backend/src/v2/component/launcher_v2.go

@@ -484,7 +484,7 @@ func uploadOutputArtifacts(ctx context.Context, executorInput *pipelinespec.Exec
 		localDir, err := LocalPathForURI(outputArtifact.Uri)
 		if err != nil {
 			glog.Warningf("Output Artifact %q does not have a recognized storage URI %q. Skipping uploading to remote storage.", name, outputArtifact.Uri)
-		} else {
+		} else if !strings.HasPrefix(outputArtifact.Uri, "oci://") {
 			blobKey, err := opts.bucketConfig.KeyFromURI(outputArtifact.Uri)
 			if err != nil {
 				return nil, fmt.Errorf("failed to upload output artifact %q: %w", name, err)

samples/v2/modelcar_import/Dockerfile renamed to samples/v2/modelcar/Dockerfile

@@ -24,6 +24,10 @@
 # normally need to specify `kfp_package_path` in their component definitions.
 _KFP_PACKAGE_PATH = os.getenv("KFP_PACKAGE_PATH")
 
+@dsl.component(kfp_package_path=_KFP_PACKAGE_PATH)
+def build_model_car(model: dsl.Output[dsl.Model]):
+    # Simulate pushing the Modelcar to an OCI registry
+    model.uri = "oci://registry.domain.local/org/repo:v1.0"
 
 @dsl.component(kfp_package_path=_KFP_PACKAGE_PATH)
 def get_model_files_list(input_model: dsl.Input[dsl.Model]) -> str:
@@ -59,7 +63,7 @@ def get_model_files_list(input_model: dsl.Input[dsl.Model]) -> str:
 
 
 @dsl.pipeline(name="pipeline-with-modelcar-model")
-def pipeline_modelcar_import(
+def pipeline_modelcar_test(
     model_uri: str = "oci://registry.domain.local/modelcar:test",
 ):
     model_source_oci_task = dsl.importer(
@@ -68,8 +72,10 @@ def pipeline_modelcar_import(
 
     get_model_files_list(input_model=model_source_oci_task.output).set_caching_options(False)
 
+    build_model_car().set_caching_options(False)
+
 
 if __name__ == "__main__":
     compiler.Compiler().compile(
-        pipeline_func=pipeline_modelcar_import, package_path=__file__ + ".yaml"
+        pipeline_func=pipeline_modelcar_test, package_path=__file__ + ".yaml"
     )

samples/v2/modelcar_import/modelcar_import.py renamed to samples/v2/modelcar/modelcar.py

@@ -32,7 +32,7 @@
 import parallel_after_dependency
 import two_step_pipeline_containerized
 import pipeline_with_placeholders
-from modelcar_import import modelcar_import
+from modelcar import modelcar
 
 _MINUTE = 60  # seconds
 _DEFAULT_TIMEOUT = 5 * _MINUTE
@@ -79,7 +79,7 @@ def test(self):
             TestCase(
                 pipeline_func=subdagio.multiple_artifacts_namedtuple.crust),
             TestCase(pipeline_func=pipeline_with_placeholders.pipeline_with_placeholders),
-            TestCase(pipeline_func=modelcar_import.pipeline_modelcar_import),
+            TestCase(pipeline_func=modelcar.pipeline_modelcar_test),
             TestCase(pipeline_func=parallel_consume_upstream.loop_consume_upstream),
             TestCase(pipeline_func=parallel_after_dependency.loop_with_after_dependency_set),
         ]