Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

Allow context propagation in the controller

JBD0a75bec3278d
diff --git a/cmd/gar/serve.go b/cmd/gar/serve.go
index f8542b7..4b28212 100644
--- a/cmd/gar/serve.go
+++ b/cmd/gar/serve.go
@@ -1,6 +1,7 @@
package main
import (
+ "context"
"fmt"
"os"
"os/signal"
@@ -30,6 +31,8 @@ func init() {
}
func runServe(cmd *cobra.Command, args []string) error {
+ ctx := context.Background()
+
// Load configuration from YAML file
cfg, err := config.LoadFromFile(serveConfigFile)
if err != nil {
@@ -47,7 +50,7 @@ func runServe(cmd *cobra.Command, args []string) error {
fmt.Printf("Health check interval: %s\n", cfg.Controller.HealthCheckInterval)
// Create controller with config
- c, err := newControllerFromConfig(cfg)
+ c, err := newControllerFromConfig(ctx, cfg)
if err != nil {
return fmt.Errorf("error creating controller: %w", err)
}
@@ -74,7 +77,7 @@ func runServe(cmd *cobra.Command, args []string) error {
return nil
}
-func newControllerFromConfig(cfg *config.Config) (*controller.Controller, error) {
+func newControllerFromConfig(ctx context.Context, cfg *config.Config) (*controller.Controller, error) {
// Create event log factory
eventLogFactory := func(sessionID string) (eventlog.EventLog, error) {
return eventlog.NewFileEventLog(eventlog.FileConfig{
@@ -93,7 +96,7 @@ func newControllerFromConfig(cfg *config.Config) (*controller.Controller, error)
}
// Create controller
- c, err := controller.New(controllerConfig)
+ c, err := controller.New(ctx, controllerConfig)
if err != nil {
return nil, err
}
diff --git a/examples/local_agent/main.go b/examples/local_agent/main.go
index 467f029..b853456 100644
--- a/examples/local_agent/main.go
+++ b/examples/local_agent/main.go
@@ -25,7 +25,7 @@ func main() {
log.Fatalf("Error creating agent: %v\n", err)
}
- c, err := controller.New(controller.Config{
+ c, err := controller.New(ctx, controller.Config{
EventLogFactory: func(sessionID string) (eventlog.EventLog, error) {
return eventlog.NewFileEventLog(eventlog.FileConfig{
SessionID: sessionID,
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
index c02a70b..678f3b6 100644
--- a/internal/controller/controller.go
+++ b/internal/controller/controller.go
@@ -30,7 +30,7 @@ type Config struct {
}
// New creates a new controller instance.
-func New(config Config) (*Controller, error) {
+func New(ctx context.Context, config Config) (*Controller, error) {
if config.MaxSteps == 0 {
config.MaxSteps = 100
}
@@ -45,7 +45,7 @@ func New(config Config) (*Controller, error) {
registry := NewRegistry(config.HealthCheckInterval)
// Initialize loop executor
- loopExecutor, err := NewLoopExecutor(LoopConfig{
+ loopExecutor, err := NewLoopExecutor(ctx, LoopConfig{
Registry: registry,
SessionManager: sessionManager,
MaxSteps: config.MaxSteps,
@@ -115,17 +115,17 @@ func (d *Controller) TriggerSession(ctx context.Context, sessionID string, input
}
// GetSession retrieves a session by ID.
-func (d *Controller) GetSession(sessionID string) (*Session, error) {
+func (d *Controller) GetSession(ctx context.Context, sessionID string) (*Session, error) {
return d.sessionManager.GetSession(sessionID)
}
// LoadSession loads a session from event log.
-func (d *Controller) LoadSession(sessionID string) (*Session, error) {
+func (d *Controller) LoadSession(ctx context.Context, sessionID string) (*Session, error) {
return d.sessionManager.LoadSession(sessionID)
}
// CloseSession closes a session.
-func (d *Controller) CloseSession(sessionID string) error {
+func (d *Controller) CloseSession(ctx context.Context, sessionID string) error {
return d.sessionManager.CloseSession(sessionID)
}
diff --git a/internal/controller/gemini.go b/internal/controller/gemini.go
index 16c85de..c45375e 100644
--- a/internal/controller/gemini.go
+++ b/internal/controller/gemini.go
@@ -26,7 +26,7 @@ type GeminiPlannerConfig struct {
// NewGeminiPlanFunc creates a planning function that uses Gemini for intelligent agent selection.
// It converts available agents into function declarations and lets Gemini decide which agent
// to invoke based on the session context and agent capabilities.
-func NewGeminiPlanFunc(registry *Registry, config GeminiPlannerConfig) (PlanFunc, error) {
+func NewGeminiPlanFunc(ctx context.Context, registry *Registry, config GeminiPlannerConfig) (PlanFunc, error) {
// Set defaults
if config.Model == "" {
config.Model = "gemini-2.0-flash-exp"
@@ -73,7 +73,6 @@ Guidelines:
}
// Create Gemini client
- ctx := context.Background()
client, err := genai.NewClient(ctx, option.WithAPIKey(config.APIKey))
if err != nil {
return nil, fmt.Errorf("failed to create Gemini client: %w", err)
diff --git a/internal/controller/loop.go b/internal/controller/loop.go
index 1af1d4f..8b85cd8 100644
--- a/internal/controller/loop.go
+++ b/internal/controller/loop.go
@@ -44,7 +44,7 @@ type LoopConfig struct {
}
// NewLoopExecutor creates a new loop executor.
-func NewLoopExecutor(config LoopConfig) (*LoopExecutor, error) {
+func NewLoopExecutor(ctx context.Context, config LoopConfig) (*LoopExecutor, error) {
if config.Registry == nil {
return nil, fmt.Errorf("registry cannot be nil")
}
@@ -58,7 +58,7 @@ func NewLoopExecutor(config LoopConfig) (*LoopExecutor, error) {
// Provide default plan function if not specified
if config.PlanFunc == nil {
// Use Gemini planner by default
- geminiPlanFunc, err := NewGeminiPlanFunc(config.Registry, GeminiPlannerConfig{})
+ geminiPlanFunc, err := NewGeminiPlanFunc(ctx, config.Registry, GeminiPlannerConfig{})
if err != nil {
return nil, fmt.Errorf("failed to initialize default Gemini planner: %w (set GEMINI_API_KEY env var or provide custom PlanFunc)", err)
}
diff --git a/internal/server/server.go b/internal/server/server.go
index 2290eec..cdaf355 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -57,7 +57,7 @@ func (s *Server) TriggerSession(req *proto.TriggerSessionRequest, stream grpc.Se
}
// Get session state
- session, err := s.controller.GetSession(sessionID)
+ session, err := s.controller.GetSession(stream.Context(), sessionID)
if err != nil {
stream.Send(&proto.TriggerSessionResponse{
State: proto.State_STATE_FAILED,
@@ -88,10 +88,10 @@ func (s *Server) GetSession(ctx context.Context, req *proto.GetSessionRequest) (
}
// Load session if not already loaded
- session, err := s.controller.GetSession(req.SessionId)
+ session, err := s.controller.GetSession(ctx, req.SessionId)
if err != nil {
// Try loading from event log
- session, err = s.controller.LoadSession(req.SessionId)
+ session, err = s.controller.LoadSession(ctx, req.SessionId)
if err != nil {
return nil, fmt.Errorf("session not found: %w", err)
}