Merge pull request #163 from dgageot/gather-models

Gather model names instead of api token names

Author: jeanlaurent

pkg/config/models.go

@@ -0,0 +1,22 @@
+package config
+
+import (
+	"sort"
+
+	latest "github.com/docker/cagent/pkg/config/v2"
+)
+
+func GatherModelNames(cfg *latest.Config) []string {
+	modelNames := map[string]bool{}
+	for _, model := range cfg.Models {
+		modelNames[model.Provider+"/"+model.Model] = true
+	}
+
+	var names []string
+	for e := range modelNames {
+		names = append(names, e)
+	}
+	sort.Strings(names)
+
+	return names
+}

pkg/oci/Dockerfile.template

@@ -17,4 +17,4 @@ LABEL com.docker.agent.runtime="cagent"
 LABEL org.opencontainers.image.description="{{ .Description }}"
 LABEL org.opencontainers.image.licenses="{{ .Licenses }}"
 LABEL com.docker.agent.mcp-servers="{{ .McpServers }}"
-LABEL com.docker.agent.secrets="{{ .Secrets }}"
+LABEL com.docker.agent.models="{{ .Models }}"

pkg/oci/build.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	_ "embed"
+	"fmt"
 	"log/slog"
 	"os"
 	"os/exec"
@@ -12,7 +13,6 @@ import (
 	"text/template"
 
 	"github.com/docker/cagent/pkg/config"
-	"github.com/docker/cagent/pkg/secrets"
 )
 
 //go:embed Dockerfile.template
@@ -32,7 +32,7 @@ func BuildDockerImage(ctx context.Context, agentFilePath, dockerImageName string
 	}
 
 	// Analyze the config to find which secrets are needed
-	modelSecrets := secrets.GatherEnvVarsForModels(cfg)
+	modelNames := config.GatherModelNames(cfg)
 	mcpServers := config.GatherMCPServerReferences(cfg)
 
 	// Generate the Dockerfile
@@ -44,13 +44,15 @@ func BuildDockerImage(ctx context.Context, agentFilePath, dockerImageName string
 		"Description": cfg.Agents["root"].Description,
 		"Licenses":    cfg.Metadata.License,
 		"McpServers":  strings.Join(mcpServers, ","),
-		"Secrets":     strings.Join(modelSecrets, ","),
+		"Models":      strings.Join(modelNames, ","),
 	}); err != nil {
 		return err
 	}
 
 	dockerfile := dockerfileBuf.String()
-	slog.Debug("Generated Dockerfile", "dockerfile", dockerfile)
+	if slog.Default().Enabled(ctx, slog.LevelDebug) {
+		fmt.Println(dockerfile)
+	}
 
 	// Run docker build
 	buildArgs := []string{"build"}

pkg/secrets/gather.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"sort"
-	"strings"
 
 	"github.com/docker/cagent/pkg/config"
 	latest "github.com/docker/cagent/pkg/config/v2"
@@ -73,25 +72,6 @@ func GatherEnvVarsForModels(cfg *latest.Config) []string {
 		}
 	}
 
-	for _, agent := range cfg.Agents {
-		model := agent.Model
-
-		for prefix, alias := range provider.ProviderAliases {
-			if strings.HasPrefix(model, prefix+"/") && alias.TokenEnvVar != "" {
-				requiredEnv[alias.TokenEnvVar] = true
-			}
-		}
-
-		switch {
-		case strings.HasPrefix(model, "openai/"):
-			requiredEnv["OPENAI_API_KEY"] = true
-		case strings.HasPrefix(model, "anthropic/"):
-			requiredEnv["ANTHROPIC_API_KEY"] = true
-		case strings.HasPrefix(model, "google/"):
-			requiredEnv["GOOGLE_API_KEY"] = true
-		}
-	}
-
 	return mcpToSortedList(requiredEnv)
 }