Handle registries that contain other OCI artifacts

Update pull and models command to ignore OCI artifacts that are not
Models (e.g. container images)

pkg/cmd/models/models.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io/fs"
 	"jmm/pkg/artifact"
+	"jmm/pkg/lib/constants"
 	"jmm/pkg/lib/storage"
 	"math"
 	"os"
@@ -54,11 +55,13 @@ func listModels(store storage.Store) ([]string, error) {
 		if err != nil {
 			return nil, err
 		}
+		if manifest.Config.MediaType != constants.ModelConfigMediaType {
+			continue
+		}
 		manifestConf, err := readManifestConfig(store, manifest)
 		if err != nil {
 			return nil, err
 		}
-		// TODO: filter list for our manifests only, ignore other artifacts
 		infoline := getManifestInfoLine(store.GetRepository(), manifestDesc, manifest, manifestConf)
 		infolines = append(infolines, infoline)
 	}

pkg/cmd/models/remote.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"jmm/pkg/artifact"
+	"jmm/pkg/lib/constants"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras-go/v2/registry"
@@ -69,6 +70,9 @@ func listImageTag(ctx context.Context, repo registry.Repository, ref *registry.R
 	if err := json.Unmarshal(manifestBytes, manifest); err != nil {
 		return nil, fmt.Errorf("failed to parse manifest: %w", err)
 	}
+	if manifest.Config.MediaType != constants.ModelConfigMediaType {
+		return nil, nil
+	}
 
 	configReader, err := repo.Fetch(ctx, manifest.Config)
 	if err != nil {

pkg/cmd/pull/cmd.go

@@ -99,7 +99,8 @@ func runCommand(opts *PullOptions) func(*cobra.Command, []string) {
 		fmt.Printf("Pulling %s\n", opts.modelRef.String())
 		desc, err := doPull(cmd.Context(), remoteRegistry, localStore, opts.modelRef)
 		if err != nil {
-			fmt.Printf("Failed to push: %s\n", err)
+			fmt.Printf("Failed to pull: %s\n", err)
+			return
 		}
 		fmt.Printf("Pulled %s\n", desc.Digest)
 	}

pkg/cmd/pull/pull.go

@@ -5,7 +5,10 @@ package pull
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"io"
+	"jmm/pkg/lib/constants"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras-go/v2"
@@ -19,6 +22,9 @@ func doPull(ctx context.Context, remoteRegistry *remote.Registry, localStore *oc
 	if err != nil {
 		return ocispec.DescriptorEmptyJSON, fmt.Errorf("failed to read repository: %w", err)
 	}
+	if err := referenceIsModel(ctx, ref, repo); err != nil {
+		return ocispec.DescriptorEmptyJSON, err
+	}
 
 	desc, err := oras.Copy(ctx, repo, ref.Reference, localStore, ref.Reference, oras.DefaultCopyOptions)
 	if err != nil {
@@ -27,3 +33,27 @@ func doPull(ctx context.Context, remoteRegistry *remote.Registry, localStore *oc
 
 	return desc, err
 }
+
+func referenceIsModel(ctx context.Context, ref *registry.Reference, repo registry.Repository) error {
+	desc, rc, err := repo.FetchReference(ctx, ref.Reference)
+	if err != nil {
+		return fmt.Errorf("failed to fetch %s: %w", ref.String(), err)
+	}
+	defer rc.Close()
+
+	if desc.MediaType != ocispec.MediaTypeImageManifest {
+		return fmt.Errorf("reference %s is not an image manifest", ref.String())
+	}
+	manifestBytes, err := io.ReadAll(rc)
+	if err != nil {
+		return fmt.Errorf("failed to read manifest: %w", err)
+	}
+	manifest := &ocispec.Manifest{}
+	if err := json.Unmarshal(manifestBytes, manifest); err != nil {
+		return fmt.Errorf("failed to parse manifest: %w", err)
+	}
+	if manifest.Config.MediaType != constants.ModelConfigMediaType {
+		return fmt.Errorf("reference %s does not refer to a model", ref.String())
+	}
+	return nil
+}

pkg/cmd/push/cmd.go

@@ -100,6 +100,7 @@ func runCommand(opts *PushOptions) func(*cobra.Command, []string) {
 		desc, err := doPush(cmd.Context(), localStore, remoteRegistry, opts.modelRef)
 		if err != nil {
 			fmt.Printf("Failed to push: %s\n", err)
+			return
 		}
 		fmt.Printf("Pushed %s\n", desc.Digest)
 	}