Agent Executor (AX) is Google's open agentic orchestration runtime
Go
Rename sandbox agent to Kubernetes sandbox agent (#86)
Jaana Doganae0e298df0bc
diff --git a/README.md b/README.mdindex 7838575..0c6ec68 100644--- a/README.md+++ b/README.md@@ -233,7 +233,7 @@ registry:address: "localhost:50051"metadata:version: "1.0"- sandbox_agents:+ k8s_sandbox_agents:- id: "uppercase"name: "Upper Case Agent"description: "Converts text to uppercase."@@ -345,7 +345,7 @@ To use a Sandbox Agent, specify it in your `gar.yaml` configuration using the `s```yamlregistry:- sandbox_agents:+ k8s_sandbox_agents:- id: "my-sandbox-agent"name: "Sandbox Worker"description: "An ephemeral sandbox processor"@@ -379,7 +379,7 @@ kubectl apply -f examples/sandbox_agent/sandbox-template-and-pool.yamlEnsure your `gar.yaml` references this sandbox agent:```yamlregistry:- sandbox_agents:+ k8s_sandbox_agents:- id: "uppercase-agent"sandbox_template_ref: "uppercase-agent-template"container_port: 8494diff --git a/agent/sandbox.go b/agent/k8s_sandbox.gosimilarity index 83%rename from agent/sandbox.gorename to agent/k8s_sandbox.goindex f382f63..65339e9 100644--- a/agent/sandbox.go+++ b/agent/k8s_sandbox.go@@ -29,27 +29,27 @@ import ("google.golang.org/grpc/metadata")-type SandboxAgent struct {+type KubernetesSandboxAgent struct {client *sandboxclient.Client- config SandboxAgentConfig+ config KubernetesSandboxAgentConfiginCluster boolclaimMu sync.MutexactiveClaims map[string]struct{}}-// SandboxAgentConfig configures a sandbox agent client.-type SandboxAgentConfig struct {+// KubernetesSandboxAgentConfig configures a sandbox agent client.+type KubernetesSandboxAgentConfig struct {ID stringSandboxTemplateRef string- ContainerPort int- UseRouter bool- RouterAddress string+ ContainerPort int+ UseRouter bool+ RouterAddress string}-// NewSandboxAgent creates a new sandbox agent logic coordinator.-func NewSandboxAgent(ctx context.Context, config SandboxAgentConfig) (*SandboxAgent, error) {+// NewKubernetesSandboxAgent creates a new sandbox agent logic coordinator.+func NewKubernetesSandboxAgent(ctx context.Context, config KubernetesSandboxAgentConfig) (*KubernetesSandboxAgent, error) {namespace := "default"//TODO(lhuan): allow setup in yamlif ns := os.Getenv("POD_NAMESPACE"); ns != "" {@@ -61,30 +61,28 @@ func NewSandboxAgent(ctx context.Context, config SandboxAgentConfig) (*SandboxAgreturn nil, fmt.Errorf("failed to create sandbox client: %w", err)}- return newSandboxAgentWithClient(ctx, client, config)+ return newKubernetesSandboxAgentWithClient(ctx, client, config)}-// newSandboxAgentWithClient allows customizing the client instantiation.-func newSandboxAgentWithClient(ctx context.Context, client *sandboxclient.Client, config SandboxAgentConfig) (*SandboxAgent, error) {- agent := &SandboxAgent{+// newKubernetesSandboxAgentWithClient allows customizing the client instantiation.+func newKubernetesSandboxAgentWithClient(ctx context.Context, client *sandboxclient.Client, config KubernetesSandboxAgentConfig) (*KubernetesSandboxAgent, error) {+ agent := &KubernetesSandboxAgent{client: client,config: config,inCluster: os.Getenv("KUBERNETES_SERVICE_HOST") != "",activeClaims: make(map[string]struct{}),}--return agent, nil}// HealthCheck always returns nil for ephemeral agents since health is checked during Process.-func (a *SandboxAgent) HealthCheck(ctx context.Context) error {-// TODO: implement proper health check logic for sandbox agents.+func (a *KubernetesSandboxAgent) HealthCheck(ctx context.Context) error {+ // TODO: implement proper health check logic for sandbox agents.return nil}-func (a *SandboxAgent) Process(ctx context.Context, sessionID string, req *proto.ProcessRequest, handler OutputHandler) error {+func (a *KubernetesSandboxAgent) Process(ctx context.Context, sessionID string, req *proto.ProcessRequest, handler OutputHandler) error {// Use the sessionID deterministically so interactive sessions reuse the same sandbox pod,// rather than spawning a new pod for every exchanged message.safeSessionID := strings.ReplaceAll(sessionID, "-", "")@@ -186,8 +184,8 @@ func (a *SandboxAgent) Process(ctx context.Context, sessionID string, req *proto// Connect to the agent (either direct or via router)remoteAgent, err := NewRemoteAgent(RemoteAgentConfig{- Address: remoteAddr,- // TODO: allow setup reconnect and max retires in yaml.+ Address: remoteAddr,+ // TODO: allow setup reconnect and max retires in yaml.// TODO: implement dynamic mTLS or PSK interceptors to secure the unauthenticated gRPC Sandbox transportReconnect: true,MaxRetries: 3,@@ -216,7 +214,7 @@ func findAvailablePort() (int, error) {// Close gracefully shreds all active SandboxClaims generated by this agent// during interactive sessions.-func (a *SandboxAgent) Close() error {+func (a *KubernetesSandboxAgent) Close() error {ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)defer cancel()@@ -230,8 +228,6 @@ func (a *SandboxAgent) Close() error {}a.claimMu.Unlock()--if len(errs) > 0 {return fmt.Errorf("cleanup errors: %s", strings.Join(errs, "; "))}diff --git a/cmd/gar/serve.go b/cmd/gar/serve.goindex 84705cf..d013f1d 100644--- a/cmd/gar/serve.go+++ b/cmd/gar/serve.go@@ -131,9 +131,9 @@ func newControllerFromConfig(ctx context.Context, cfg *config.Config) (*controll}}- for _, agentCfg := range cfg.Registry.SandboxAgents {- if err := c.Registry().RegisterSandbox(ctx, agentCfg); err != nil {- return nil, fmt.Errorf("failed to register sandbox agent %s: %w", agentCfg.ID, err)+ for _, agentCfg := range cfg.Registry.KubernetesSandboxAgents {+ if err := c.Registry().RegisterKubernetesSandbox(ctx, agentCfg); err != nil {+ return nil, fmt.Errorf("failed to register kubernetes sandbox agent %s: %w", agentCfg.ID, err)}}return c, nildiff --git a/gar.yaml b/gar.yamlindex 1398c54..cfaaba9 100644--- a/gar.yaml+++ b/gar.yaml@@ -67,7 +67,7 @@ registry:address: "localhost:50051"metadata:version: "1.0"- sandbox_agents: # TODO: Rename to k8s_sandbox_agents+ k8s_sandbox_agents: # TODO: Rename to k8s_sandbox_agents- id: "uppercase"name: "Upper Case Agent"description: "Converts text to uppercase."diff --git a/internal/config/config.go b/internal/config/config.goindex d721fa5..03dcb27 100644--- a/internal/config/config.go+++ b/internal/config/config.go@@ -36,8 +36,8 @@ type Config struct {// RegistryConfig allows registring agents.type RegistryConfig struct {- RemoteAgents []RemoteAgentConfig `yaml:"remote_agents,omitempty"`- SandboxAgents []SandboxAgentConfig `yaml:"sandbox_agents,omitempty"`+ RemoteAgents []RemoteAgentConfig `yaml:"remote_agents,omitempty"`+ KubernetesSandboxAgents []SandboxAgentConfig `yaml:"k8s_sandbox_agents,omitempty"`}// HealthCheckConfig defines the configuration for agent health checks.@@ -94,9 +94,9 @@ type SandboxAgentConfig struct {Description string `yaml:"description"` // Description of agent capabilitiesSandboxTemplateRef string `yaml:"sandbox_template_ref"` // Name of the SandboxTemplate CR to use// TODO: implement shutdown_time for automatic sandbox shutdown- ContainerPort int `yaml:"container_port,omitempty"`// Optional container port, defaults to 8494- UseRouter bool `yaml:"use_router,omitempty"` // Override port-forwarding to use Sandbox Router- Metadata map[string]string `yaml:"metadata,omitempty"` // Optional metadata+ ContainerPort int `yaml:"container_port,omitempty"` // Optional container port, defaults to 8494+ UseRouter bool `yaml:"use_router,omitempty"` // Override port-forwarding to use Sandbox Router+ Metadata map[string]string `yaml:"metadata,omitempty"` // Optional metadata}type LocalAgentConfig struct {diff --git a/internal/controller/registry.go b/internal/controller/registry.goindex b23ab36..704b829 100644--- a/internal/controller/registry.go+++ b/internal/controller/registry.go@@ -28,9 +28,9 @@ import (type AgentType stringconst (- AgentTypeLocal AgentType = "local"- AgentTypeRemote AgentType = "remote"- AgentTypeSandbox AgentType = "sandbox"+ AgentTypeLocal AgentType = "local"+ AgentTypeRemote AgentType = "remote"+ AgentTypeKubernetesSandbox AgentType = "k8s_sandbox")// AgentInfo contains metadata about a registered agent.@@ -136,8 +136,8 @@ func (r *Registry) RegisterRemote(cfg config.RemoteAgentConfig) error {return nil}-// RegisterSandbox registers a sandbox agent by dynamically provisioning a Sandbox on GKE.-func (r *Registry) RegisterSandbox(ctx context.Context, cfg config.SandboxAgentConfig) error {+// RegisterKubernetesSandbox registers a sandbox agent by dynamically provisioning a Sandbox on GKE.+func (r *Registry) RegisterKubernetesSandbox(ctx context.Context, cfg config.SandboxAgentConfig) error {r.mu.Lock()defer r.mu.Unlock()@@ -149,7 +149,7 @@ func (r *Registry) RegisterSandbox(ctx context.Context, cfg config.SandboxAgentCreturn fmt.Errorf("agent %s already registered", cfg.ID)}- sandboxAgent, err := agent.NewSandboxAgent(ctx, agent.SandboxAgentConfig{+ sandboxAgent, err := agent.NewKubernetesSandboxAgent(ctx, agent.KubernetesSandboxAgentConfig{ID: cfg.ID,SandboxTemplateRef: cfg.SandboxTemplateRef,ContainerPort: cfg.ContainerPort,@@ -164,7 +164,7 @@ func (r *Registry) RegisterSandbox(ctx context.Context, cfg config.SandboxAgentCID: cfg.ID,Name: cfg.Name,Description: cfg.Description,- Type: AgentTypeSandbox,+ Type: AgentTypeKubernetesSandbox,Healthy: true,LastHealthCheck: time.Time{},Metadata: cfg.Metadata,diff --git a/test_multi.go b/test_multi.goindex 47572b6..464de35 100644--- a/test_multi.go+++ b/test_multi.go@@ -42,7 +42,7 @@ func main() {c, err := controller.New(ctx, controller.Config{MaxSteps: 15,HealthCheck: config.HealthCheckConfig{- Enabled: false, // disable to speed up+ Enabled: false, // disable to speed up},PlannerBuilder: func(ctx context.Context, r *controller.Registry) (agent.Agent, error) {return &mockPlanner{}, nil@@ -74,7 +74,7 @@ func main() {}// 5. Register Sandbox Agent- if err := c.Registry().RegisterSandbox(ctx, config.SandboxAgentConfig{+ if err := c.Registry().RegisterKubernetesSandbox(ctx, config.SandboxAgentConfig{ID: "uppercase",SandboxTemplateRef: "uppercase-agent-template",ContainerPort: 8494,@@ -104,7 +104,7 @@ func main() {}return nil})-+req := &proto.ProcessRequest{Contents: inputs,}@@ -152,10 +152,10 @@ func createLocalAgent() (*agent.LocalAgent, error) {type mockPlanner struct{}-func (m *mockPlanner) ID() string { return "__planner" }-func (m *mockPlanner) Name() string { return "Mock Planner" }+func (m *mockPlanner) ID() string { return "__planner" }+func (m *mockPlanner) Name() string { return "Mock Planner" }func (m *mockPlanner) HealthCheck(ctx context.Context) error { return nil }-func (m *mockPlanner) Close() error { return nil }+func (m *mockPlanner) Close() error { return nil }func (m *mockPlanner) Process(ctx context.Context, sessionID string, incoming *proto.ProcessRequest, handler agent.OutputHandler) error {var lastText stringfor _, c := range incoming.Contents {