Merge pull request #1810 from dgageot/freeze-v5

Freeze v5 (and a few refactoring)

Author: dgageot

agent-schema.json

@@ -14,15 +14,17 @@
         "2",
         "3",
         "4",
-        "5"
+        "5",
+        "6"
       ],
       "examples": [
         "0",
         "1",
         "2",
         "3",
         "4",
-        "5"
+        "5",
+        "6"
       ]
     },
     "providers": {

pkg/config/config.go

@@ -70,7 +70,7 @@ func CheckRequiredEnvVars(ctx context.Context, cfg *latest.Config, modelsGateway
 }
 
 func parseCurrentVersion(data []byte, version string) (any, error) {
-	parsers := Parsers()
+	parsers, _ := versions()
 	parser, found := parsers[version]
 	if !found {
 		return nil, fmt.Errorf("unsupported config version: %v (valid versions: %s)", version, strings.Join(slices.Sorted(maps.Keys(parsers)), ", "))
@@ -81,7 +81,8 @@ func parseCurrentVersion(data []byte, version string) (any, error) {
 func migrateToLatestConfig(c any, raw []byte) (latest.Config, error) {
 	var err error
 
-	for _, upgrade := range Upgrades() {
+	_, upgraders := versions()
+	for _, upgrade := range upgraders {
 		c, err = upgrade(c, raw)
 		if err != nil {
 			return latest.Config{}, err

pkg/config/latest/parse.go

@@ -1,9 +1,30 @@
 package latest
 
-import "github.com/goccy/go-yaml"
+import (
+	"github.com/goccy/go-yaml"
 
-func Parse(data []byte) (Config, error) {
+	"github.com/docker/cagent/pkg/config/types"
+	previous "github.com/docker/cagent/pkg/config/v5"
+)
+
+func Register(parsers map[string]func([]byte) (any, error), upgraders *[]func(any, []byte) (any, error)) {
+	parsers[Version] = func(d []byte) (any, error) { return parse(d) }
+	*upgraders = append(*upgraders, upgradeIfNeeded)
+}
+
+func parse(data []byte) (Config, error) {
 	var cfg Config
 	err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict())
 	return cfg, err
 }
+
+func upgradeIfNeeded(c any, _ []byte) (any, error) {
+	old, ok := c.(previous.Config)
+	if !ok {
+		return c, nil
+	}
+
+	var config Config
+	types.CloneThroughJSON(old, &config)
+	return config, nil
+}

pkg/config/latest/types.go

@@ -13,7 +13,7 @@ import (
 	"github.com/docker/cagent/pkg/config/types"
 )
 
-const Version = "5"
+const Version = "6"
 
 // Config represents the entire configuration file
 type Config struct {

pkg/config/latest/types_test.go

@@ -133,7 +133,7 @@ agents:
     instructions: "You are a helpful assistant."
 `)
 
-	_, err := Parse(input)
+	_, err := parse(input)
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "instructions")
 }
@@ -148,7 +148,7 @@ agents:
     instruction: "You are a helpful assistant."
 `)
 
-	cfg, err := Parse(input)
+	cfg, err := parse(input)
 	require.NoError(t, err)
 	require.Len(t, cfg.Agents, 1)
 	require.Equal(t, "root", cfg.Agents[0].Name)

pkg/config/latest/upgrade.go

@@ -2,8 +2,17 @@ package v0
 
 import "github.com/goccy/go-yaml"
 
-func Parse(data []byte) (Config, error) {
+func Register(parsers map[string]func([]byte) (any, error), upgraders *[]func(any, []byte) (any, error)) {
+	parsers[Version] = func(d []byte) (any, error) { return parse(d) }
+	*upgraders = append(*upgraders, upgradeIfNeeded)
+}
+
+func parse(data []byte) (Config, error) {
 	var cfg Config
 	err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict())
 	return cfg, err
 }
+
+func upgradeIfNeeded(old any, _ []byte) (any, error) {
+	return old, nil
+}

pkg/config/v0/parse.go

@@ -1,9 +1,72 @@
 package v1
 
-import "github.com/goccy/go-yaml"
+import (
+	"github.com/goccy/go-yaml"
 
-func Parse(data []byte) (Config, error) {
+	"github.com/docker/cagent/pkg/config/types"
+	previous "github.com/docker/cagent/pkg/config/v0"
+)
+
+func Register(parsers map[string]func([]byte) (any, error), upgraders *[]func(any, []byte) (any, error)) {
+	parsers[Version] = func(d []byte) (any, error) { return parse(d) }
+	*upgraders = append(*upgraders, upgradeIfNeeded)
+}
+
+func parse(data []byte) (Config, error) {
 	var cfg Config
 	err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict())
 	return cfg, err
 }
+
+func upgradeIfNeeded(c any, _ []byte) (any, error) {
+	old, ok := c.(previous.Config)
+	if !ok {
+		return c, nil
+	}
+
+	var config Config
+	types.CloneThroughJSON(old, &config)
+
+	// model.Type --> model.Provider
+	for name := range old.Models {
+		oldModel := old.Models[name]
+		newModel := config.Models[name]
+
+		newModel.Provider = oldModel.Type
+		config.Models[name] = newModel
+	}
+
+	// todo:true --> toolsets: [{type: todo}]
+	// think:true --> toolsets: [{type: think}]
+	// memory:{path: PATH} --> toolsets: [{type: memory, path: PATH}]
+	for name := range old.Agents {
+		oldAgent := old.Agents[name]
+		newAgent := config.Agents[name]
+
+		var toolsets []Toolset
+
+		if oldAgent.Todo.Enabled {
+			toolsets = append(toolsets, Toolset{
+				Type:   "todo",
+				Shared: oldAgent.Todo.Shared,
+			})
+		}
+		if oldAgent.Think {
+			toolsets = append(toolsets, Toolset{
+				Type: "think",
+			})
+		}
+		if oldAgent.MemoryConfig.Path != "" {
+			toolsets = append(toolsets, Toolset{
+				Type: "memory",
+				Path: oldAgent.MemoryConfig.Path,
+			})
+		}
+
+		toolsets = append(toolsets, newAgent.Toolsets...)
+		newAgent.Toolsets = toolsets
+		config.Agents[name] = newAgent
+	}
+
+	return config, nil
+}