feat: import model spec repo for building (#30)

Signed-off-by: Gaius <[email protected]>
CloudNativeAI · Nov 21, 2024 · 5435bae · 5435bae
1 parent 25cc1de
commit 5435bae
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 91 deletions.
diff --git a/go.mod b/go.mod
@@ -1,8 +1,9 @@
 module github.com/CloudNativeAI/modctl
 
-go 1.23.0
+go 1.23.3
 
 require (
+	github.com/CloudNativeAI/model-spec v0.0.0-20241121031550-59ad02d4a225
 	github.com/distribution/reference v0.6.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/emirpasic/gods v1.18.1
@@ -15,11 +16,9 @@ require (
 	github.com/vbauerster/mpb/v8 v8.8.3
 	golang.org/x/crypto v0.29.0
 	oras.land/oras-go/v2 v2.5.0
-	zotregistry.dev/zot v1.4.3
+	zotregistry.dev/zot v1.4.4-0.20241020091450-edb549142830
 )
 
-replace zotregistry.dev/zot v1.4.3 => zotregistry.dev/zot v1.4.4-0.20241020091450-edb549142830
-
 require (
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect

diff --git a/go.sum b/go.sum
@@ -55,6 +55,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mx
 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/CloudNativeAI/model-spec v0.0.0-20241121031550-59ad02d4a225 h1:/wakwn9KDTKnVSlg+H12XxsGSVSNs0XK/j9UjUw3vUs=
+github.com/CloudNativeAI/model-spec v0.0.0-20241121031550-59ad02d4a225/go.mod h1:/wGtOmyHRaxmWGWguc1oh7pcYbWyiuXG+VkAV8vmOTI=
 github.com/CycloneDX/cyclonedx-go v0.9.0 h1:inaif7qD8bivyxp7XLgxUYtOXWtDez7+j72qKTMQTb8=
 github.com/CycloneDX/cyclonedx-go v0.9.0/go.mod h1:NE/EWvzELOFlG6+ljX/QeMlVt9VKcTwu8u0ccsACEsw=
 github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible h1:juIaKLLVhqzP55d8x4cSVgwyQv76Z55/fRv/UBr2KkQ=

diff --git a/pkg/backend/build.go b/pkg/backend/build.go
@@ -26,7 +26,7 @@ import (
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
 	"github.com/CloudNativeAI/modctl/pkg/backend/processor"
 	"github.com/CloudNativeAI/modctl/pkg/modelfile"
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 
 	humanize "github.com/dustin/go-humanize"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/pkg/backend/build/build.go b/pkg/backend/build/build.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"time"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
 
 	godigest "github.com/opencontainers/go-digest"

diff --git a/pkg/backend/build_test.go b/pkg/backend/build_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/test/mocks/modelfile"
 
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/backend/inspect.go b/pkg/backend/inspect.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 

diff --git a/pkg/backend/list.go b/pkg/backend/list.go
@@ -23,7 +23,7 @@ import (
 	"sort"
 	"time"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

diff --git a/pkg/backend/processor/license.go b/pkg/backend/processor/license.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/pkg/backend/processor/license_test.go b/pkg/backend/processor/license_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"testing/fstest"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/test/mocks/storage"
 
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/backend/processor/model.go b/pkg/backend/processor/model.go
@@ -22,7 +22,7 @@ import (
 	"regexp"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/pkg/backend/processor/model_config.go b/pkg/backend/processor/model_config.go
@@ -22,7 +22,7 @@ import (
 	"regexp"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/pkg/backend/processor/model_config_test.go b/pkg/backend/processor/model_config_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"testing/fstest"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/test/mocks/storage"
 
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/backend/processor/model_test.go b/pkg/backend/processor/model_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"testing/fstest"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/test/mocks/storage"
 
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/backend/processor/readme.go b/pkg/backend/processor/readme.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/CloudNativeAI/modctl/pkg/backend/build"
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/pkg/storage"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/pkg/backend/processor/readme_test.go b/pkg/backend/processor/readme_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"testing/fstest"
 
-	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
 	"github.com/CloudNativeAI/modctl/test/mocks/storage"
 
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/spec/annotations.go b/pkg/spec/annotations.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ import ( @@
     	"sort"
     	"time"
-    	modelspec "github.com/CloudNativeAI/modctl/pkg/spec"
+    	modelspec "github.com/CloudNativeAI/model-spec/specs-go/v1"
     	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
     )
@@ Expand Down @@