nestybox
diff --git a/‎go.mod‎
Lines changed: 1 addition & 0 deletions b/‎go.mod‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎go.sum‎
Lines changed: 2 additions & 0 deletions b/‎go.sum‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎internal/ociartifact/store.go‎
Lines changed: 22 additions & 2 deletions b/‎internal/ociartifact/store.go‎
Lines changed: 22 additions & 2 deletions
diff --git a/‎vendor/github.com/CloudNativeAI/model-spec/LICENSE‎
Lines changed: 201 additions & 0 deletions b/‎vendor/github.com/CloudNativeAI/model-spec/LICENSE‎
Lines changed: 201 additions & 0 deletions
diff --git a/‎vendor/github.com/CloudNativeAI/model-spec/specs-go/v1/annotations.go‎
Lines changed: 22 additions & 0 deletions b/‎vendor/github.com/CloudNativeAI/model-spec/specs-go/v1/annotations.go‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎vendor/github.com/CloudNativeAI/model-spec/specs-go/v1/config.go‎
Lines changed: 103 additions & 0 deletions b/‎vendor/github.com/CloudNativeAI/model-spec/specs-go/v1/config.go‎
Lines changed: 103 additions & 0 deletions
@@ -4,6 +4,7 @@ module github.com/cri-o/cri-o
 
 require (
 	github.com/BurntSushi/toml v1.5.0
+	github.com/CloudNativeAI/model-spec v0.0.3
 	github.com/Microsoft/go-winio v0.6.2
 	github.com/blang/semver/v4 v4.0.0
 	github.com/checkpoint-restore/checkpointctl v1.3.0
 
@@ -10,6 +10,8 @@ github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg6
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/CloudNativeAI/model-spec v0.0.3 h1:5mvgFQ+3pyupzxYjtV5XAeg9zRe6+46pLPBFNHlOrqE=
+github.com/CloudNativeAI/model-spec v0.0.3/go.mod h1:3U/4zubBfbUkW59ATSg41HnkYyKrKUcKFH/cVdoPQnk=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 
@@ -10,6 +10,7 @@ import (
 	"slices"
 	"strings"
 
+	modelSpec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/containers/common/libimage"
 	"github.com/containers/image/v5/docker/reference"
 	"github.com/containers/image/v5/manifest"
@@ -342,7 +343,7 @@ func (s *Store) artifactData(ctx context.Context, nameOrDigest string, maxArtifa
 	layerInfos := s.impl.LayerInfos(artifact.manifest)
 	for i := range layerInfos {
 		layer := &layerInfos[i]
-		title := layer.Annotations[specs.AnnotationTitle]
+		title := artifactName(layer.Annotations)
 
 		layerBytes, err := s.readBlob(ctx, imageSource, layer, maxArtifactSize)
 		if err != nil {
@@ -493,11 +494,30 @@ func (s *Store) BlobMountPaths(ctx context.Context, artifact *Artifact, sys *typ
 			return nil, fmt.Errorf("failed to get a local blob path: %w", err)
 		}
 
+		name := artifactName(l.Annotations)
+		if name == "" {
+			log.Warnf(ctx, "Unable to find name for artifact layer which makes it not mountable")
+
+			continue
+		}
+
 		mountPaths = append(mountPaths, BlobMountPath{
 			SourcePath: path,
-			Name:       l.Annotations[specs.AnnotationTitle],
+			Name:       name,
 		})
 	}
 
 	return mountPaths, nil
 }
+
+func artifactName(annotations map[string]string) string {
+	if name, ok := annotations[specs.AnnotationTitle]; ok {
+		return name
+	}
+
+	if name, ok := annotations[modelSpec.AnnotationFilepath]; ok {
+		return name
+	}
+
+	return ""
+}