Merge pull request #2162 from gtardif/evals_dont_provide_keys_with_gateway

Evals: don't provide all API keys when using models gateway

Author: dgageot

pkg/evaluation/eval.go

@@ -388,13 +388,6 @@ func (r *Runner) runDockerAgentInContainer(ctx context.Context, imageID string,
 
 	var env []string
 
-	for _, name := range []string{"OPENAI_API_KEY", "ANTHROPIC_API_KEY", "GOOGLE_API_KEY", "MISTRAL_API_KEY", "XAI_API_KEY", "NEBIUS_API_KEY"} {
-		if val, ok := r.runConfig.EnvProvider().Get(ctx, name); ok && val != "" {
-			args = append(args, "-e", name)
-			env = append(env, name+"="+val)
-		}
-	}
-
 	if r.runConfig.ModelsGateway != "" {
 		args = append(args, "-e", "DOCKER_AGENT_MODELS_GATEWAY")
 		env = append(env, "DOCKER_AGENT_MODELS_GATEWAY="+r.runConfig.ModelsGateway)
@@ -403,6 +396,13 @@ func (r *Runner) runDockerAgentInContainer(ctx context.Context, imageID string,
 			args = append(args, "-e", environment.DockerDesktopTokenEnv)
 			env = append(env, environment.DockerDesktopTokenEnv+"="+token)
 		}
+	} else {
+		for _, name := range []string{"OPENAI_API_KEY", "ANTHROPIC_API_KEY", "GOOGLE_API_KEY", "MISTRAL_API_KEY", "XAI_API_KEY", "NEBIUS_API_KEY"} {
+			if val, ok := r.runConfig.EnvProvider().Get(ctx, name); ok && val != "" {
+				args = append(args, "-e", name)
+				env = append(env, name+"="+val)
+			}
+		}
 	}
 
 	// Pass additional environment variables specified via -e flag