Remove useless code

Signed-off-by: David Gageot <david.gageot@docker.com>
This commit is contained in:
David Gageot committed 2026-01-12 18:50:57 +01:00
1 parent 47953e0e55
commit 75654ed120
2 files changed
+4 -55

No files matched your search

-45
View File
@@ -1,45 +0,0 @@
package evaluation
import (
"context"
"os/exec"
"sync"
"time"
)
// containerTracker tracks running containers for cleanup on cancellation.
type containerTracker struct {
mu sync.Mutex
containers map[string]struct{}
}
func newContainerTracker() *containerTracker {
return &containerTracker{containers: make(map[string]struct{})}
}
func (ct *containerTracker) add(id string) {
ct.mu.Lock()
ct.containers[id] = struct{}{}
ct.mu.Unlock()
}
func (ct *containerTracker) remove(id string) {
ct.mu.Lock()
delete(ct.containers, id)
ct.mu.Unlock()
}
func (ct *containerTracker) killAll() {
ct.mu.Lock()
var ids []string
for id := range ct.containers {
ids = append(ids, id)
}
ct.mu.Unlock()
for _, id := range ids {
killCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
_ = exec.CommandContext(killCtx, "docker", "kill", id).Run()
cancel()
}
}
+4 -10
View File
@@ -109,9 +109,6 @@ func (r *Runner) Run(ctx context.Context, out io.Writer, isTTY bool) ([]Result,
}
fmt.Fprintf(out, "Running %d evaluations with concurrency %d\n\n", len(evals), r.concurrency)
tracker := newContainerTracker()
defer tracker.killAll()
progress := newProgressBar(out, r.ttyFd, len(evals), isTTY)
progress.start()
defer progress.stop()
@@ -133,7 +130,7 @@ func (r *Runner) Run(ctx context.Context, out io.Writer, isTTY bool) ([]Result,
}
progress.setRunning(item.eval.Title)
result, runErr := r.runSingleEval(ctx, item.eval, tracker)
result, runErr := r.runSingleEval(ctx, item.eval)
if runErr != nil {
result.Error = runErr.Error()
slog.Error("Evaluation failed", "title", item.eval.Title, "error", runErr)
@@ -211,7 +208,7 @@ func (r *Runner) loadEvalSessions(ctx context.Context) ([]EvalSession, error) {
return evals, nil
}
func (r *Runner) runSingleEval(ctx context.Context, evalSess *EvalSession, tracker *containerTracker) (Result, error) {
func (r *Runner) runSingleEval(ctx context.Context, evalSess *EvalSession) (Result, error) {
startTime := time.Now()
slog.Debug("Starting evaluation", "title", evalSess.Title)
@@ -234,7 +231,7 @@ func (r *Runner) runSingleEval(ctx context.Context, evalSess *EvalSession, track
return result, fmt.Errorf("building eval image: %w", err)
}
events, err := r.runCagentInContainer(ctx, imageID, result.Question, tracker)
events, err := r.runCagentInContainer(ctx, imageID, result.Question)
if err != nil {
return result, fmt.Errorf("running cagent in container: %w", err)
}
@@ -265,7 +262,7 @@ func (r *Runner) runSingleEval(ctx context.Context, evalSess *EvalSession, track
return result, nil
}
func (r *Runner) runCagentInContainer(ctx context.Context, imageID, question string, tracker *containerTracker) ([]map[string]any, error) {
func (r *Runner) runCagentInContainer(ctx context.Context, imageID, question string) ([]map[string]any, error) {
agentDir := r.agentSource.ParentDir()
agentFile := filepath.Base(r.agentSource.Name())
containerName := fmt.Sprintf("cagent-eval-%d", uuid.New().ID())
@@ -316,9 +313,6 @@ func (r *Runner) runCagentInContainer(ctx context.Context, imageID, question str
return nil, fmt.Errorf("starting docker run: %w", err)
}
tracker.add(containerName)
defer tracker.remove(containerName)
var stderrBuf strings.Builder
go func() {
buf := make([]byte, 4096)