feat: switch to the modelpack model-spec (#415)

chlins · web-flow · commit b21be440d0f3 · 2026-02-12T16:47:40.000+08:00
Signed-off-by: chlins &lt;chlins.zhang@gmail.com&gt;
diff --git a/pkg/backend/attach.go b/pkg/backend/attach.go
@@ -53,10 +53,10 @@ const (
 var (
 	// mediaTypePriorityMap defines the priority for layer sorting by group.
 	mediaTypePriorityMap = map[string]int{
-		legacymodelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,
-		legacymodelspec.MediaTypeModelWeight:       modelWeightPriority,
-		legacymodelspec.MediaTypeModelCode:         modelCodePriority,
-		legacymodelspec.MediaTypeModelDoc:          modelDocPriority,
+		modelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,
+		modelspec.MediaTypeModelWeight:       modelWeightPriority,
+		modelspec.MediaTypeModelCode:         modelCodePriority,
+		modelspec.MediaTypeModelDoc:          modelDocPriority,
 	}
 )
 
@@ -143,7 +143,7 @@ func (b *backend) Attach(ctx context.Context, filepath string, cfg *config.Attac
 		}
 	}
 
-	var config legacymodelspec.Model
+	var config modelspec.Model
 	if !cfg.Config {
 		var reasoning bool
 		if srcModelConfig.Config.Capabilities != nil && srcModelConfig.Config.Capabilities.Reasoning != nil {
@@ -307,33 +307,33 @@ func (b *backend) getModelConfig(ctx context.Context, reference string, desc oci
 
 func (b *backend) getProcessor(destDir, filepath string, rawMediaType bool) processor.Processor {
 	if modelfile.IsFileType(filepath, modelfile.ConfigFilePatterns) {
-		mediaType := legacymodelspec.MediaTypeModelWeightConfig
+		mediaType := modelspec.MediaTypeModelWeightConfig
 		if rawMediaType {
-			mediaType = legacymodelspec.MediaTypeModelWeightConfigRaw
+			mediaType = modelspec.MediaTypeModelWeightConfigRaw
 		}
 		return processor.NewModelConfigProcessor(b.store, mediaType, []string{filepath}, destDir)
 	}
 
 	if modelfile.IsFileType(filepath, modelfile.ModelFilePatterns) {
-		mediaType := legacymodelspec.MediaTypeModelWeight
+		mediaType := modelspec.MediaTypeModelWeight
 		if rawMediaType {
-			mediaType = legacymodelspec.MediaTypeModelWeightRaw
+			mediaType = modelspec.MediaTypeModelWeightRaw
 		}
 		return processor.NewModelProcessor(b.store, mediaType, []string{filepath}, destDir)
 	}
 
 	if modelfile.IsFileType(filepath, modelfile.CodeFilePatterns) {
-		mediaType := legacymodelspec.MediaTypeModelCode
+		mediaType := modelspec.MediaTypeModelCode
 		if rawMediaType {
-			mediaType = legacymodelspec.MediaTypeModelCodeRaw
+			mediaType = modelspec.MediaTypeModelCodeRaw
 		}
 		return processor.NewCodeProcessor(b.store, mediaType, []string{filepath}, destDir)
 	}
 
 	if modelfile.IsFileType(filepath, modelfile.DocFilePatterns) {
-		mediaType := legacymodelspec.MediaTypeModelDoc
+		mediaType := modelspec.MediaTypeModelDoc
 		if rawMediaType {
-			mediaType = legacymodelspec.MediaTypeModelDocRaw
+			mediaType = modelspec.MediaTypeModelDocRaw
 		}
 		return processor.NewDocProcessor(b.store, mediaType, []string{filepath}, destDir)
 	}
diff --git a/pkg/backend/attach_test.go b/pkg/backend/attach_test.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
 
diff --git a/pkg/backend/build.go b/pkg/backend/build.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 
 	retry "github.com/avast/retry-go/v4"
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
 
@@ -40,7 +40,7 @@ import (
 
 const (
 	// annotationModelfile is the annotation key for the Modelfile.
-	annotationModelfile = "org.cnai.modctl.modelfile"
+	annotationModelfile = "org.cncf.modctl.modelfile"
 )
 
 // Build builds the user materials into the model artifact which follows the Model Spec.
diff --git a/pkg/backend/build/builder.go b/pkg/backend/build/builder.go
@@ -29,8 +29,8 @@ import (
 	"syscall"
 	"time"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
 	sha256 "github.com/minio/sha256-simd"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	spec "github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/pkg/backend/build/builder_test.go b/pkg/backend/build/builder_test.go
@@ -29,7 +29,7 @@ import (
 	"testing"
 	"time"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/backend/build/local.go b/pkg/backend/build/local.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
diff --git a/pkg/backend/build/local_test.go b/pkg/backend/build/local_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/mock"
diff --git a/pkg/backend/build/remote.go b/pkg/backend/build/remote.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
diff --git a/pkg/backend/processor/code_test.go b/pkg/backend/processor/code_test.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/backend/processor/doc_test.go b/pkg/backend/processor/doc_test.go
@@ -25,7 +25,7 @@ import (
 	buildmock "github.com/modelpack/modctl/test/mocks/backend/build"
 	"github.com/modelpack/modctl/test/mocks/storage"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/backend/processor/model_config_test.go b/pkg/backend/processor/model_config_test.go
@@ -25,7 +25,7 @@ import (
 	buildmock "github.com/modelpack/modctl/test/mocks/backend/build"
 	"github.com/modelpack/modctl/test/mocks/storage"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/backend/processor/model_test.go b/pkg/backend/processor/model_test.go
@@ -25,7 +25,7 @@ import (
 	buildmock "github.com/modelpack/modctl/test/mocks/backend/build"
 	"github.com/modelpack/modctl/test/mocks/storage"
 
-	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
+	modelspec "github.com/modelpack/model-spec/specs-go/v1"
 	godigest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
diff --git a/test/mocks/backend/build/builder.go b/test/mocks/backend/build/builder.go

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ const (`
`53`	`53`	`var (`
`54`	`54`	`// mediaTypePriorityMap defines the priority for layer sorting by group.`
`55`	`55`	`mediaTypePriorityMap = map[string]int{`
`56`		`- legacymodelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,`
`57`		`- legacymodelspec.MediaTypeModelWeight: modelWeightPriority,`
`58`		`- legacymodelspec.MediaTypeModelCode: modelCodePriority,`
`59`		`- legacymodelspec.MediaTypeModelDoc: modelDocPriority,`
	`56`	`+ modelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,`
	`57`	`+ modelspec.MediaTypeModelWeight: modelWeightPriority,`
	`58`	`+ modelspec.MediaTypeModelCode: modelCodePriority,`
	`59`	`+ modelspec.MediaTypeModelDoc: modelDocPriority,`
`60`	`60`	`}`
`61`	`61`	`)`
`62`	`62`
`@@ -143,7 +143,7 @@ func (b backend) Attach(ctx context.Context, filepath string, cfg config.Attac`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`146`		`- var config legacymodelspec.Model`
	`146`	`+ var config modelspec.Model`
`147`	`147`	`if !cfg.Config {`
`148`	`148`	`var reasoning bool`
`149`	`149`	`if srcModelConfig.Config.Capabilities != nil && srcModelConfig.Config.Capabilities.Reasoning != nil {`
`@@ -307,33 +307,33 @@ func (b *backend) getModelConfig(ctx context.Context, reference string, desc oci`
`307`	`307`
`308`	`308`	`func (b *backend) getProcessor(destDir, filepath string, rawMediaType bool) processor.Processor {`
`309`	`309`	`if modelfile.IsFileType(filepath, modelfile.ConfigFilePatterns) {`
`310`		`- mediaType := legacymodelspec.MediaTypeModelWeightConfig`
	`310`	`+ mediaType := modelspec.MediaTypeModelWeightConfig`
`311`	`311`	`if rawMediaType {`
`312`		`- mediaType = legacymodelspec.MediaTypeModelWeightConfigRaw`
	`312`	`+ mediaType = modelspec.MediaTypeModelWeightConfigRaw`
`313`	`313`	`}`
`314`	`314`	`return processor.NewModelConfigProcessor(b.store, mediaType, []string{filepath}, destDir)`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`if modelfile.IsFileType(filepath, modelfile.ModelFilePatterns) {`
`318`		`- mediaType := legacymodelspec.MediaTypeModelWeight`
	`318`	`+ mediaType := modelspec.MediaTypeModelWeight`
`319`	`319`	`if rawMediaType {`
`320`		`- mediaType = legacymodelspec.MediaTypeModelWeightRaw`
	`320`	`+ mediaType = modelspec.MediaTypeModelWeightRaw`
`321`	`321`	`}`
`322`	`322`	`return processor.NewModelProcessor(b.store, mediaType, []string{filepath}, destDir)`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`if modelfile.IsFileType(filepath, modelfile.CodeFilePatterns) {`
`326`		`- mediaType := legacymodelspec.MediaTypeModelCode`
	`326`	`+ mediaType := modelspec.MediaTypeModelCode`
`327`	`327`	`if rawMediaType {`
`328`		`- mediaType = legacymodelspec.MediaTypeModelCodeRaw`
	`328`	`+ mediaType = modelspec.MediaTypeModelCodeRaw`
`329`	`329`	`}`
`330`	`330`	`return processor.NewCodeProcessor(b.store, mediaType, []string{filepath}, destDir)`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`if modelfile.IsFileType(filepath, modelfile.DocFilePatterns) {`
`334`		`- mediaType := legacymodelspec.MediaTypeModelDoc`
	`334`	`+ mediaType := modelspec.MediaTypeModelDoc`
`335`	`335`	`if rawMediaType {`
`336`		`- mediaType = legacymodelspec.MediaTypeModelDocRaw`
	`336`	`+ mediaType = modelspec.MediaTypeModelDocRaw`
`337`	`337`	`}`
`338`	`338`	`return processor.NewDocProcessor(b.store, mediaType, []string{filepath}, destDir)`
`339`	`339`	`}`