Update model to be a single object on kitfile

Updates the build and export to adjust to single object.

Author: gorkem

pkg/artifact/jozu_file.go

@@ -10,14 +10,14 @@ import (
 
 type (
 	JozuFile struct {
-		ManifestVersion string         `json:"manifestVersion"`
-		Package         Package        `json:"package,omitempty"`
-		Code            []Code         `json:"code,omitempty"`
-		DataSets        []DataSet      `json:"datasets,omitempty"`
-		Models          []TrainedModel `json:"models,omitempty"`
+		ManifestVersion string       `json:"manifestVersion"`
+		Kit             ModelKit     `json:"modelkit,omitempty"`
+		Code            []Code       `json:"code,omitempty"`
+		DataSets        []DataSet    `json:"datasets,omitempty"`
+		Model           TrainedModel `json:"model,omitempty"`
 	}
 
-	Package struct {
+	ModelKit struct {
 		Name        string   `json:"name,omitempty"`
 		Version     string   `json:"version,omitempty"`
 		Description string   `json:"description,omitempty"`

pkg/cmd/build/build.go

@@ -134,17 +134,16 @@ func (options *BuildOptions) RunBuild() error {
 	}
 
 	// 4. package the TrainedModels
-	for _, trainedModel := range jozufile.Models {
-		modelPath, err := filesystem.VerifySubpath(options.ContextDir, trainedModel.Path)
-		if err != nil {
-			return err
-		}
-		layer := &artifact.ModelLayer{
-			BaseDir:   modelPath,
-			MediaType: constants.ModelLayerMediaType,
-		}
-		model.Layers = append(model.Layers, *layer)
+
+	modelPath, err := filesystem.VerifySubpath(options.ContextDir, jozufile.Model.Path)
+	if err != nil {
+		return err
+	}
+	layer := &artifact.ModelLayer{
+		BaseDir:   modelPath,
+		MediaType: constants.ModelLayerMediaType,
 	}
+	model.Layers = append(model.Layers, *layer)
 
 	modelStorePath := options.storageHome
 	repo := ""

pkg/cmd/build/jozu-file.md pkg/cmd/build/kit-file.md

@@ -1,18 +1,18 @@
-# Jozu AI/ML Packaging Manifest Format Reference
+# Kitfile AI/ML Packaging Manifest Format Reference
 
-The Jozu manifest for AI/ML is a YAML file designed to encapsulate all the necessary information about the package, including code, datasets, models, and their metadata. This reference documentation outlines the structure and specifications of the manifest format.
+The Kitfile manifest for AI/ML is a YAML file designed to encapsulate all the necessary information about the package, including code, datasets, model, and their metadata. This reference documentation outlines the structure and specifications of the manifest format.
 
 ## Overview
 
-The manifest is structured into several key sections: `version`, `package`,`code`, `datasets` and `models`. Each section serves a specific purpose in describing the AI/ML package components and requirements.
+The manifest is structured into several key sections: `version`, `package`,`code`, `datasets` and `model`. Each section serves a specific purpose in describing the AI/ML package components and requirements.
 
 ### `ManifestVersion`
 
 - **Description**: Specifies the manifest format version.
 - **Type**: String
 - **Example**: `1.0`
 
-### `package`
+### `modelkit`
 
 This section provides general information about the AI/ML project.
 
@@ -56,10 +56,10 @@ This section provides general information about the AI/ML project.
   - `license`: SPDX license identifier for the dataset.
   - `preprocessing`: Reference to preprocessing steps.
 
-#### `models`
+#### `model`
 
 - **Description**: Details of the trained models included in the package.
-- **Type**: Object Array
+- **Type**: Object
   - `name`: Name of the model 
   - `path`: Location of the model file or directory relative to the context
   - `framework`: AI/ML framework

pkg/cmd/dev/cmd.go

@@ -0,0 +1,58 @@
+package dev
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+const (
+	shortDesc = `Start development server`
+	longDesc  = `Start development server TODO`
+)
+
+var (
+	flags *DevFlags
+	opts  *DevOptions
+)
+
+type DevFlags struct {
+	Port int
+}
+
+type DevOptions struct {
+	port int
+}
+
+func (opts *DevOptions) complete(args []string) error {
+	opts.port = flags.Port
+	return nil
+}
+func (opts *DevOptions) validate() error {
+	return nil
+}
+
+func DevCommand() *cobra.Command {
+	opts = &DevOptions{}
+	flags = &DevFlags{}
+	cmd := &cobra.Command{
+		Use:   "dev",
+		Short: shortDesc,
+		Long:  longDesc,
+		RunE:  runCommand(opts),
+	}
+	cmd.Flags().IntVar(&flags.Port, "port", 8080, "Port for development server to listen on")
+	return cmd
+}
+
+func runCommand(opts *DevOptions) func(cmd *cobra.Command, args []string) error {
+	return func(cmd *cobra.Command, args []string) error {
+		if err := opts.complete(args); err != nil {
+			return fmt.Errorf("failed to complete options: %w", err)
+		}
+		if err := opts.validate(); err != nil {
+			return fmt.Errorf("failed to validate options: %w", err)
+		}
+		return nil
+	}
+}

pkg/cmd/export/export.go

@@ -39,18 +39,17 @@ func ExportModel(ctx context.Context, store oras.Target, ref *registry.Reference
 
 	// Since there might be multiple models, etc. we need to synchronously iterate
 	// through the config's relevant field to get the correct path for exporting
-	var modelIdx, codeIdx, datasetIdx int
+	var codeIdx, datasetIdx int
 	for _, layerDesc := range manifest.Layers {
 		layerDir := ""
 		switch layerDesc.MediaType {
 		case constants.ModelLayerMediaType:
 			if !options.exportConf.ExportModels {
 				continue
 			}
-			modelEntry := config.Models[modelIdx]
+			modelEntry := config.Model
 			layerDir = filepath.Join(options.exportDir, modelEntry.Path)
 			fmt.Printf("Exporting model %s to %s\n", modelEntry.Name, layerDir)
-			modelIdx += 1
 
 		case constants.CodeLayerMediaType:
 			if !options.exportConf.ExportCode {

pkg/cmd/models/models.go

@@ -111,7 +111,14 @@ func getManifestInfoLine(repo string, desc ocispec.Descriptor, manifest *ocispec
 	}
 	sizeStr := formatBytes(size)
 
-	info := fmt.Sprintf(ModelsTableFmt, repo, ref, config.Package.Authors[0], config.Package.Name, sizeStr, desc.Digest)
+	var author string
+	if len(config.Kit.Authors) > 0 {
+		author = config.Kit.Authors[0]
+	} else {
+		author = "<none>"
+	}
+
+	info := fmt.Sprintf(ModelsTableFmt, repo, ref, author, config.Kit.Name, sizeStr, desc.Digest)
 	return info
 }
 

pkg/cmd/models/models_test.go

@@ -224,7 +224,7 @@ func Manifest(configDigest string, layerDigests ...string) ocispec.Manifest {
 
 func Config(maintainer, name string) artifact.JozuFile {
 	config := artifact.JozuFile{
-		Package: artifact.Package{Authors: []string{maintainer}, Name: name},
+		Kit: artifact.ModelKit{Authors: []string{maintainer}, Name: name},
 	}
 
 	return config