Skip to content

Commit f233f84

Browse files
dgageotdgageot
committed
More cleanups
Signed-off-by: David Gageot <david.gageot@docker.com>
1 parent 3e029be commit f233f84

23 files changed

Lines changed: 45 additions & 138 deletions

File tree

‎cmd/root/build.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
"github.com/docker/cagent/pkg/build"
77
"github.com/docker/cagent/pkg/cli"
8-
"github.com/docker/cagent/pkg/filesystem"
98
"github.com/docker/cagent/pkg/telemetry"
109
)
1110

@@ -44,5 +43,5 @@ func (f *buildFlags) runBuildCommand(cmd *cobra.Command, args []string) error {
4443
dockerImageName = args[1]
4544
}
4645

47-
return build.DockerImage(ctx, out, agentFilename, filesystem.AllowAll, dockerImageName, f.opts)
46+
return build.DockerImage(ctx, out, agentFilename, dockerImageName, f.opts)
4847
}

‎pkg/a2a/executor_wrapper_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ type mockQueue struct {
1515
events []a2a.Event
1616
}
1717

18-
func (m *mockQueue) Write(ctx context.Context, event a2a.Event) error {
18+
func (m *mockQueue) Write(_ context.Context, event a2a.Event) error {
1919
m.events = append(m.events, event)
2020
return nil
2121
}
2222

23-
func (m *mockQueue) Read(ctx context.Context) (a2a.Event, error) {
23+
func (m *mockQueue) Read(context.Context) (a2a.Event, error) {
2424
return nil, nil
2525
}
2626

‎pkg/acp/agent.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (a *Agent) Initialize(ctx context.Context, params acp.InitializeRequest) (a
8989
}
9090

9191
// NewSession implements [acp.Agent]
92-
func (a *Agent) NewSession(ctx context.Context, params acp.NewSessionRequest) (acp.NewSessionResponse, error) {
92+
func (a *Agent) NewSession(context.Context, acp.NewSessionRequest) (acp.NewSessionResponse, error) {
9393
sid := uuid.New().String()
9494
slog.Debug("ACP NewSession called", "session_id", sid)
9595

@@ -110,19 +110,19 @@ func (a *Agent) NewSession(ctx context.Context, params acp.NewSessionRequest) (a
110110
}
111111

112112
// Authenticate implements [acp.Agent]
113-
func (a *Agent) Authenticate(ctx context.Context, params acp.AuthenticateRequest) (acp.AuthenticateResponse, error) {
113+
func (a *Agent) Authenticate(context.Context, acp.AuthenticateRequest) (acp.AuthenticateResponse, error) {
114114
slog.Debug("ACP Authenticate called")
115115
return acp.AuthenticateResponse{}, nil
116116
}
117117

118118
// LoadSession implements [acp.Agent] (optional, not supported)
119-
func (a *Agent) LoadSession(ctx context.Context, params acp.LoadSessionRequest) (acp.LoadSessionResponse, error) {
119+
func (a *Agent) LoadSession(context.Context, acp.LoadSessionRequest) (acp.LoadSessionResponse, error) {
120120
slog.Debug("ACP LoadSession called (not supported)")
121121
return acp.LoadSessionResponse{}, fmt.Errorf("load session not supported")
122122
}
123123

124124
// Cancel implements [acp.Agent]
125-
func (a *Agent) Cancel(ctx context.Context, params acp.CancelNotification) error {
125+
func (a *Agent) Cancel(_ context.Context, params acp.CancelNotification) error {
126126
sid := string(params.SessionId)
127127
slog.Debug("ACP Cancel called", "session_id", sid)
128128

@@ -138,7 +138,7 @@ func (a *Agent) Cancel(ctx context.Context, params acp.CancelNotification) error
138138
}
139139

140140
// Prompt implements [acp.Agent]
141-
func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {
141+
func (a *Agent) Prompt(_ context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {
142142
sid := string(params.SessionId)
143143
slog.Debug("ACP Prompt called", "session_id", sid)
144144

@@ -201,7 +201,7 @@ func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.Promp
201201
}
202202

203203
// SetSessionMode implements acp.Agent (optional)
204-
func (a *Agent) SetSessionMode(ctx context.Context, params acp.SetSessionModeRequest) (acp.SetSessionModeResponse, error) {
204+
func (a *Agent) SetSessionMode(context.Context, acp.SetSessionModeRequest) (acp.SetSessionModeResponse, error) {
205205
// We don't implement session modes, cagent agents have only one mode (for now? ;) ).
206206
return acp.SetSessionModeResponse{}, nil
207207
}

‎pkg/build/build.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/goccy/go-yaml"
1515

1616
"github.com/docker/cagent/pkg/config"
17-
"github.com/docker/cagent/pkg/filesystem"
1817
)
1918

2019
//go:embed Dockerfile.template
@@ -31,7 +30,7 @@ type Printer interface {
3130
Println(a ...any)
3231
}
3332

34-
func DockerImage(ctx context.Context, out Printer, agentFilename string, fs filesystem.FS, dockerImageName string, opts Options) error {
33+
func DockerImage(ctx context.Context, out Printer, agentFilename, dockerImageName string, opts Options) error {
3534
agentSource, err := config.Resolve(agentFilename)
3635
if err != nil {
3736
return err

‎pkg/config/auto_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type mockEnvProvider struct {
1111
envVars map[string]string
1212
}
1313

14-
func (m *mockEnvProvider) Get(ctx context.Context, name string) string {
14+
func (m *mockEnvProvider) Get(_ context.Context, name string) string {
1515
return m.envVars[name]
1616
}
1717

‎pkg/creator/agent.go‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@ import (
55
_ "embed"
66
"encoding/json"
77
"fmt"
8-
"log/slog"
9-
"os"
108
"strings"
119

12-
"github.com/docker/cagent/pkg/agent"
1310
"github.com/docker/cagent/pkg/config"
1411
"github.com/docker/cagent/pkg/config/latest"
15-
"github.com/docker/cagent/pkg/environment"
16-
"github.com/docker/cagent/pkg/model/provider/anthropic"
17-
"github.com/docker/cagent/pkg/model/provider/options"
18-
"github.com/docker/cagent/pkg/runtime"
19-
"github.com/docker/cagent/pkg/session"
2012
"github.com/docker/cagent/pkg/team"
2113
"github.com/docker/cagent/pkg/teamloader"
2214
"github.com/docker/cagent/pkg/tools"
@@ -76,53 +68,6 @@ func (f *fsToolset) customWriteFileHandler(ctx context.Context, toolCall tools.T
7668
return f.originalWriteFileHandler(ctx, toolCall)
7769
}
7870

79-
func CreateAgent(ctx context.Context, baseDir, prompt string, runConfig *config.RuntimeConfig) (out, path string, err error) {
80-
llm, err := anthropic.NewClient(
81-
ctx,
82-
&latest.ModelConfig{
83-
Provider: "anthropic",
84-
Model: "claude-sonnet-4-0",
85-
MaxTokens: 64000,
86-
},
87-
environment.NewDefaultProvider(),
88-
options.WithGateway(runConfig.ModelsGateway),
89-
)
90-
if err != nil {
91-
return "", "", fmt.Errorf("failed to create LLM client: %w", err)
92-
}
93-
94-
slog.Info("Generating agent configuration....")
95-
96-
fsToolset := fsToolset{inner: builtin.NewFilesystemTool([]string{baseDir})}
97-
newTeam := team.New(
98-
team.WithAgents(
99-
agent.New(
100-
"root",
101-
agentBuilderInstructions,
102-
agent.WithModel(llm),
103-
agent.WithToolSets(
104-
builtin.NewShellTool(os.Environ(), runConfig),
105-
&fsToolset,
106-
),
107-
)))
108-
rt, err := runtime.New(newTeam)
109-
if err != nil {
110-
return "", "", fmt.Errorf("failed to create runtime: %w", err)
111-
}
112-
113-
sess := session.New(
114-
session.WithUserMessage(prompt),
115-
session.WithToolsApproved(true),
116-
)
117-
118-
messages, err := rt.Run(ctx, sess)
119-
if err != nil {
120-
return "", "", fmt.Errorf("failed to run session: %w", err)
121-
}
122-
123-
return messages[len(messages)-1].Message.Content, fsToolset.path, nil
124-
}
125-
12671
func Agent(ctx context.Context, runConfig *config.RuntimeConfig, modelNameOverride string) (*team.Team, error) {
12772
usableProviders := config.AvailableProviders(ctx, runConfig.ModelsGateway, runConfig.EnvProvider())
12873

‎pkg/filesystem/config.go‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎pkg/js/expand.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (exp *Expander) Expand(ctx context.Context, text string) string {
8484
return fmt.Sprintf("%v", result.Export())
8585
}
8686

87-
func ExpandString(ctx context.Context, str string, values map[string]string) (string, error) {
87+
func ExpandString(_ context.Context, str string, values map[string]string) (string, error) {
8888
vm := goja.New()
8989

9090
for k, v := range values {

‎pkg/model/provider/dmr/client.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -631,9 +631,7 @@ func (c *Client) CreateEmbedding(ctx context.Context, text string) (*base.Embedd
631631
// Convert []float32 to []float64
632632
embedding32 := response.Data[0].Embedding
633633
embedding := make([]float64, len(embedding32))
634-
for i, v := range embedding32 {
635-
embedding[i] = v
636-
}
634+
copy(embedding, embedding32)
637635

638636
// Extract usage information
639637
inputTokens := int(response.Usage.PromptTokens)
@@ -690,9 +688,7 @@ func (c *Client) CreateBatchEmbedding(ctx context.Context, texts []string) (*bas
690688
for i, data := range response.Data {
691689
embedding32 := data.Embedding
692690
embedding := make([]float64, len(embedding32))
693-
for j, v := range embedding32 {
694-
embedding[j] = v
695-
}
691+
copy(embedding, embedding32)
696692
embeddings[i] = embedding
697693
}
698694

‎pkg/model/provider/openai/client.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -699,9 +699,7 @@ func (c *Client) CreateBatchEmbedding(ctx context.Context, texts []string) (*bas
699699
for i, data := range response.Data {
700700
embedding32 := data.Embedding
701701
embedding := make([]float64, len(embedding32))
702-
for j, v := range embedding32 {
703-
embedding[j] = v
704-
}
702+
copy(embedding, embedding32)
705703
embeddings[i] = embedding
706704
}
707705

0 commit comments

Comments
 (0)