revert: switch back to the legacy mediatype for v0.1.0 (#287)

chlins · web-flow · commit fc74e955947a · 2025-09-19T16:00:15.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
@@ -52,10 +52,10 @@ const (
 var (
 	// mediaTypePriorityMap defines the priority for layer sorting by group.
 	mediaTypePriorityMap = map[string]int{
-		modelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,
-		modelspec.MediaTypeModelWeight:       modelWeightPriority,
-		modelspec.MediaTypeModelCode:         modelCodePriority,
-		modelspec.MediaTypeModelDoc:          modelDocPriority,
+		legacymodelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,
+		legacymodelspec.MediaTypeModelWeight:       modelWeightPriority,
+		legacymodelspec.MediaTypeModelCode:         modelCodePriority,
+		legacymodelspec.MediaTypeModelDoc:          modelDocPriority,
 	}
 )
 
@@ -137,7 +137,7 @@ func (b *backend) Attach(ctx context.Context, filepath string, cfg *config.Attac
 		}
 	}
 
-	var config modelspec.Model
+	var config legacymodelspec.Model
 	if !cfg.Config {
 		var reasoning bool
 		if srcModelConfig.Config.Capabilities != nil && srcModelConfig.Config.Capabilities.Reasoning != nil {
@@ -301,33 +301,33 @@ func (b *backend) getModelConfig(ctx context.Context, reference string, desc oci
 
 func (b *backend) getProcessor(filepath string, rawMediaType bool) processor.Processor {
 	if modelfile.IsFileType(filepath, modelfile.ConfigFilePatterns) {
-		mediaType := modelspec.MediaTypeModelWeightConfig
+		mediaType := legacymodelspec.MediaTypeModelWeightConfig
 		if rawMediaType {
-			mediaType = modelspec.MediaTypeModelWeightConfigRaw
+			mediaType = legacymodelspec.MediaTypeModelWeightConfigRaw
 		}
 		return processor.NewModelConfigProcessor(b.store, mediaType, []string{filepath})
 	}
 
 	if modelfile.IsFileType(filepath, modelfile.ModelFilePatterns) {
-		mediaType := modelspec.MediaTypeModelWeight
+		mediaType := legacymodelspec.MediaTypeModelWeight
 		if rawMediaType {
-			mediaType = modelspec.MediaTypeModelWeightRaw
+			mediaType = legacymodelspec.MediaTypeModelWeightRaw
 		}
 		return processor.NewModelProcessor(b.store, mediaType, []string{filepath})
 	}
 
 	if modelfile.IsFileType(filepath, modelfile.CodeFilePatterns) {
-		mediaType := modelspec.MediaTypeModelCode
+		mediaType := legacymodelspec.MediaTypeModelCode
 		if rawMediaType {
-			mediaType = modelspec.MediaTypeModelCodeRaw
+			mediaType = legacymodelspec.MediaTypeModelCodeRaw
 		}
 		return processor.NewCodeProcessor(b.store, mediaType, []string{filepath})
 	}
 
 	if modelfile.IsFileType(filepath, modelfile.DocFilePatterns) {
-		mediaType := modelspec.MediaTypeModelDoc
+		mediaType := legacymodelspec.MediaTypeModelDoc
 		if rawMediaType {
-			mediaType = modelspec.MediaTypeModelDocRaw
+			mediaType = legacymodelspec.MediaTypeModelDocRaw
 		}
 		return processor.NewDocProcessor(b.store, mediaType, []string{filepath})
 	}
diff --git a/pkg/backend/attach_test.go b/pkg/backend/attach_test.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	modelspec "github.com/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/model-spec/specs-go/v1"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
 
diff --git a/pkg/backend/build/builder.go b/pkg/backend/build/builder.go
@@ -30,8 +30,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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/base.go b/pkg/backend/processor/base.go
@@ -27,6 +27,7 @@ import (
 	"sync"
 
 	"github.com/avast/retry-go/v4"
+	legacymodelspec "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"
@@ -171,11 +172,19 @@ func (b *base) Process(ctx context.Context, builder build.Builder, workDir strin
 		// Sort by filepath by default.
 		var pathI, pathJ string
 		if descriptors[i].Annotations != nil {
-			pathI = descriptors[i].Annotations[modelspec.AnnotationFilepath]
+			if descriptors[i].Annotations[modelspec.AnnotationFilepath] != "" {
+				pathI = descriptors[i].Annotations[modelspec.AnnotationFilepath]
+			} else {
+				pathI = descriptors[i].Annotations[legacymodelspec.AnnotationFilepath]
+			}
 		}
 
 		if descriptors[j].Annotations != nil {
-			pathJ = descriptors[j].Annotations[modelspec.AnnotationFilepath]
+			if descriptors[i].Annotations[modelspec.AnnotationFilepath] != "" {
+				pathJ = descriptors[i].Annotations[modelspec.AnnotationFilepath]
+			} else {
+				pathJ = descriptors[i].Annotations[legacymodelspec.AnnotationFilepath]
+			}
 		}
 
 		return pathI < pathJ
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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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/modelpack/model-spec/specs-go/v1"
+	modelspec "github.com/dragonflyoss/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
`@@ -52,10 +52,10 @@ const (`
`52`	`52`	`var (`
`53`	`53`	`// mediaTypePriorityMap defines the priority for layer sorting by group.`
`54`	`54`	`mediaTypePriorityMap = map[string]int{`
`55`		`- modelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,`
`56`		`- modelspec.MediaTypeModelWeight: modelWeightPriority,`
`57`		`- modelspec.MediaTypeModelCode: modelCodePriority,`
`58`		`- modelspec.MediaTypeModelDoc: modelDocPriority,`
	`55`	`+ legacymodelspec.MediaTypeModelWeightConfig: modelWeightConfigPriority,`
	`56`	`+ legacymodelspec.MediaTypeModelWeight: modelWeightPriority,`
	`57`	`+ legacymodelspec.MediaTypeModelCode: modelCodePriority,`
	`58`	`+ legacymodelspec.MediaTypeModelDoc: modelDocPriority,`
`59`	`59`	`}`
`60`	`60`	`)`
`61`	`61`
`@@ -137,7 +137,7 @@ func (b backend) Attach(ctx context.Context, filepath string, cfg config.Attac`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`- var config modelspec.Model`
	`140`	`+ var config legacymodelspec.Model`
`141`	`141`	`if !cfg.Config {`
`142`	`142`	`var reasoning bool`
`143`	`143`	`if srcModelConfig.Config.Capabilities != nil && srcModelConfig.Config.Capabilities.Reasoning != nil {`
`@@ -301,33 +301,33 @@ func (b *backend) getModelConfig(ctx context.Context, reference string, desc oci`
`301`	`301`
`302`	`302`	`func (b *backend) getProcessor(filepath string, rawMediaType bool) processor.Processor {`
`303`	`303`	`if modelfile.IsFileType(filepath, modelfile.ConfigFilePatterns) {`
`304`		`- mediaType := modelspec.MediaTypeModelWeightConfig`
	`304`	`+ mediaType := legacymodelspec.MediaTypeModelWeightConfig`
`305`	`305`	`if rawMediaType {`
`306`		`- mediaType = modelspec.MediaTypeModelWeightConfigRaw`
	`306`	`+ mediaType = legacymodelspec.MediaTypeModelWeightConfigRaw`
`307`	`307`	`}`
`308`	`308`	`return processor.NewModelConfigProcessor(b.store, mediaType, []string{filepath})`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`if modelfile.IsFileType(filepath, modelfile.ModelFilePatterns) {`
`312`		`- mediaType := modelspec.MediaTypeModelWeight`
	`312`	`+ mediaType := legacymodelspec.MediaTypeModelWeight`
`313`	`313`	`if rawMediaType {`
`314`		`- mediaType = modelspec.MediaTypeModelWeightRaw`
	`314`	`+ mediaType = legacymodelspec.MediaTypeModelWeightRaw`
`315`	`315`	`}`
`316`	`316`	`return processor.NewModelProcessor(b.store, mediaType, []string{filepath})`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`if modelfile.IsFileType(filepath, modelfile.CodeFilePatterns) {`
`320`		`- mediaType := modelspec.MediaTypeModelCode`
	`320`	`+ mediaType := legacymodelspec.MediaTypeModelCode`
`321`	`321`	`if rawMediaType {`
`322`		`- mediaType = modelspec.MediaTypeModelCodeRaw`
	`322`	`+ mediaType = legacymodelspec.MediaTypeModelCodeRaw`
`323`	`323`	`}`
`324`	`324`	`return processor.NewCodeProcessor(b.store, mediaType, []string{filepath})`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`if modelfile.IsFileType(filepath, modelfile.DocFilePatterns) {`
`328`		`- mediaType := modelspec.MediaTypeModelDoc`
	`328`	`+ mediaType := legacymodelspec.MediaTypeModelDoc`
`329`	`329`	`if rawMediaType {`
`330`		`- mediaType = modelspec.MediaTypeModelDocRaw`
	`330`	`+ mediaType = legacymodelspec.MediaTypeModelDocRaw`
`331`	`331`	`}`
`332`	`332`	`return processor.NewDocProcessor(b.store, mediaType, []string{filepath})`
`333`	`333`	`}`