Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions pkg/evaluation/containers.go

This file was deleted.

14 changes: 4 additions & 10 deletions pkg/evaluation/eval.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand Down Expand Up @@ -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)

Expand All @@ -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)
}
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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)
Expand Down