Agent Executor (AX) is Google's open agentic orchestration runtime
Go
Move experimental features to internal/experimental (#257)
Jaana Dogan13a77b89462f
diff --git a/Makefile b/Makefileindex e873336..0562892 100644--- a/Makefile+++ b/Makefile@@ -72,7 +72,7 @@ ax-image:ate-agent-image:@echo "Building ATE agent container image with ko..."- GOFLAGS="-tags=ate" ko build --base-import-paths ./internal/examples/ate_agent+ GOFLAGS="-tags=ate" ko build --base-import-paths ./internal/experimental/examples/ate_agentk8s-sandbox-router-image:@echo "Building sandbox-router container image with ko..."diff --git a/internal/controller/controller.go b/internal/controller/controller.goindex 788e6d1..c37f5c7 100644--- a/internal/controller/controller.go+++ b/internal/controller/controller.go@@ -25,7 +25,7 @@ import ("github.com/google/ax/internal/agent""github.com/google/ax/internal/controller/executor"- "github.com/google/ax/internal/testagent"+ "github.com/google/ax/internal/experimental/testagent""github.com/google/ax/proto""github.com/google/uuid")diff --git a/internal/controller/registry.go b/internal/controller/registry.goindex e09b933..421ebe1 100644--- a/internal/controller/registry.go+++ b/internal/controller/registry.go@@ -21,6 +21,7 @@ import ("github.com/google/ax/internal/agent""github.com/google/ax/internal/config"+ expagent "github.com/google/ax/internal/experimental/agent")// AgentInfo contains metadata about a registered agent.@@ -125,7 +126,7 @@ func (r *Registry) RegisterKubernetesSandbox(ctx context.Context, cfg config.Sanreturn fmt.Errorf("agent %s already registered", cfg.ID)}- sandboxAgent, err := agent.NewKubernetesSandboxAgent(ctx, agent.KubernetesSandboxAgentConfig{+ sandboxAgent, err := expagent.NewKubernetesSandboxAgent(ctx, expagent.KubernetesSandboxAgentConfig{ID: cfg.ID,SandboxTemplateRef: cfg.SandboxTemplateRef,ContainerPort: cfg.ContainerPort,@@ -160,7 +161,7 @@ func (r *Registry) RegisterColab(cfg config.ColabAgentConfig) error {return fmt.Errorf("agent %s already registered", cfg.ID)}- colabAgent, err := agent.NewColabAgent(agent.ColabAgentConfig{+ colabAgent, err := expagent.NewColabAgent(expagent.ColabAgentConfig{ID: cfg.ID,LocalFile: cfg.LocalFile,DriveFile: cfg.DriveFile,diff --git a/internal/agent/ate.go b/internal/experimental/agent/ate.gosimilarity index 92%rename from internal/agent/ate.gorename to internal/experimental/agent/ate.goindex 0849b18..c9eb323 100644--- a/internal/agent/ate.go+++ b/internal/experimental/agent/ate.go@@ -22,7 +22,8 @@ import ("log""time"- "github.com/google/ax/internal/ate"+ "github.com/google/ax/internal/agent"+ "github.com/google/ax/internal/experimental/k8s/ate""github.com/google/ax/proto")@@ -55,7 +56,7 @@ func NewATEAgent(endpoint string, config ATEAgentConfig) (*ATEAgent, error) {}// Connect handles processing of input content by creating an actor and delegating to RemoteAgent.-func (a *ATEAgent) Connect(ctx context.Context, conversationID string, execID string, start *proto.AgentStart, e Executor, o OutputHandler) error {+func (a *ATEAgent) Connect(ctx context.Context, conversationID string, execID string, start *proto.AgentStart, e agent.Executor, o agent.OutputHandler) error {// 1. Create Actorresp, err := a.ateClient.CreateActor(ctx, execID)if err != nil {@@ -74,7 +75,7 @@ func (a *ATEAgent) Connect(ctx context.Context, conversationID string, execID st}remoteAddr := fmt.Sprintf("%s:%d", worker.Ip, a.config.Port)- remoteAgent, err := NewRemoteAgent(RemoteAgentConfig{+ remoteAgent, err := agent.NewRemoteAgent(agent.RemoteAgentConfig{Address: remoteAddr,Reconnect: true,MaxRetries: 3,diff --git a/internal/agent/colab.go b/internal/experimental/agent/colab.gosimilarity index 98%rename from internal/agent/colab.gorename to internal/experimental/agent/colab.goindex 9513114..67a3b8d 100644--- a/internal/agent/colab.go+++ b/internal/experimental/agent/colab.go@@ -29,6 +29,7 @@ import ("sync""time"+ "github.com/google/ax/internal/agent""github.com/google/ax/proto")@@ -157,7 +158,7 @@ const (// the agent code, and tears the session down. If the session is terminated// due to idle timeout (e.g. while the user is authorizing Drive access),// it automatically recreates the session and retries once.-func (a *ColabAgent) Connect(ctx context.Context, conversationID string, execID string, start *proto.AgentStart, e Executor, o OutputHandler) error {+func (a *ColabAgent) Connect(ctx context.Context, conversationID string, execID string, start *proto.AgentStart, e agent.Executor, o agent.OutputHandler) error {sessionName := colabSessionName(a.config.ID, execID)for attempt := 0; attempt <= maxRetries; attempt++ {@@ -201,7 +202,7 @@ func (a *ColabAgent) Connect(ctx context.Context, conversationID string, execID// run executes the setup and agent code on an existing Colab session.// This is called by Connect and may be retried if the session times out.-func (a *ColabAgent) run(ctx context.Context, sessionName string, start *proto.AgentStart, o OutputHandler) error {+func (a *ColabAgent) run(ctx context.Context, sessionName string, start *proto.AgentStart, o agent.OutputHandler) error {// Mount Google Drive if any Drive feature is used (drive_file,// output_drive_path, or explicit drive_mount_path). This step is// interactive because drivemount may prompt for OAuth authorization@@ -425,7 +426,7 @@ func (a *ColabAgent) runColabExecBatch(ctx context.Context, sessionName, command// runColabExec pipes Python code to colab exec via stdin and streams stdout// line-by-line to the OutputHandler as the script runs. Stderr is buffered// and treated as an error after the process exits.-func (a *ColabAgent) runColabExec(ctx context.Context, sessionName, command string, o OutputHandler) error {+func (a *ColabAgent) runColabExec(ctx context.Context, sessionName, command string, o agent.OutputHandler) error {cmd := exec.CommandContext(ctx, "colab", "exec", "-s", sessionName)cmd.Stdin = strings.NewReader(command)diff --git a/internal/agent/colab_test.go b/internal/experimental/agent/colab_test.gosimilarity index 98%rename from internal/agent/colab_test.gorename to internal/experimental/agent/colab_test.goindex a4b1051..99073c4 100644--- a/internal/agent/colab_test.go+++ b/internal/experimental/agent/colab_test.go@@ -21,6 +21,7 @@ import ("strings""testing"+ baseagent "github.com/google/ax/internal/agent""github.com/google/ax/proto")@@ -201,7 +202,7 @@ func TestConnect_FullSequence(t *testing.T) {t.Setenv("COLAB_EXEC_STDOUT", "line 1\nline 2\nline 3")var outputs []string- handler := OutputHandler(func(resp *proto.AgentOutputs) error {+ handler := baseagent.OutputHandler(func(resp *proto.AgentOutputs) error {for _, m := range resp.Messages {if t := m.GetContent().GetText(); t != nil {outputs = append(outputs, t.Text)@@ -362,7 +363,7 @@ func TestConnect_RetryOnSessionTimeout(t *testing.T) {}var output string- handler := OutputHandler(func(resp *proto.AgentOutputs) error {+ handler := baseagent.OutputHandler(func(resp *proto.AgentOutputs) error {for _, m := range resp.Messages {if txt := m.GetContent().GetText(); txt != nil {output = txt.Text@@ -398,7 +399,7 @@ func TestConnect_RetryOnSessionTimeout(t *testing.T) {// Test helpers// ----------------------------------------------------------------------------var noopHandler = OutputHandler(func(*proto.AgentOutputs) error { return nil })+var noopHandler = baseagent.OutputHandler(func(*proto.AgentOutputs) error { return nil })const fakeColabScript = `#!/bin/shecho "$*" >> "$COLAB_TEST_LOG"diff --git a/internal/agent/k8s_sandbox.go b/internal/experimental/agent/k8s_sandbox.gosimilarity index 95%rename from internal/agent/k8s_sandbox.gorename to internal/experimental/agent/k8s_sandbox.goindex 5584124..ffb6d3f 100644--- a/internal/agent/k8s_sandbox.go+++ b/internal/experimental/agent/k8s_sandbox.go@@ -24,7 +24,8 @@ import ("sync""time"- "github.com/google/ax/internal/sandboxclient"+ "github.com/google/ax/internal/agent"+ "github.com/google/ax/internal/experimental/k8s/sandboxclient""github.com/google/ax/proto""google.golang.org/grpc/metadata")@@ -76,7 +77,7 @@ func newKubernetesSandboxAgentWithClient(ctx context.Context, client *sandboxclireturn agent, nil}-func (a *KubernetesSandboxAgent) Connect(ctx context.Context, conversationID string, execID string, start *proto.AgentStart, e Executor, o OutputHandler) error {+func (a *KubernetesSandboxAgent) Connect(ctx context.Context, conversationID string, execID string, start *proto.AgentStart, e agent.Executor, o agent.OutputHandler) error {ctx, cancel := context.WithTimeout(ctx, 5*time.Second)defer cancel()@@ -175,7 +176,7 @@ func (a *KubernetesSandboxAgent) Connect(ctx context.Context, conversationID str}// Connect to the agent (either direct or via router)- remoteAgent, err := NewRemoteAgent(RemoteAgentConfig{+ remoteAgent, err := agent.NewRemoteAgent(agent.RemoteAgentConfig{Address: remoteAddr,// TODO: allow setup reconnect and max retires in yaml.// TODO: implement dynamic mTLS or PSK interceptors to secure the unauthenticated gRPC Sandbox transportdiff --git a/internal/examples/ate_agent/README.md b/internal/experimental/examples/ate_agent/README.mdsimilarity index 100%rename from internal/examples/ate_agent/README.mdrename to internal/experimental/examples/ate_agent/README.mddiff --git a/internal/examples/ate_agent/ax.yaml b/internal/experimental/examples/ate_agent/ax.yamlsimilarity index 100%rename from internal/examples/ate_agent/ax.yamlrename to internal/experimental/examples/ate_agent/ax.yamldiff --git a/internal/examples/ate_agent/main.go b/internal/experimental/examples/ate_agent/main.gosimilarity index 100%rename from internal/examples/ate_agent/main.gorename to internal/experimental/examples/ate_agent/main.godiff --git a/internal/examples/ate_agent/manifest.yaml b/internal/experimental/examples/ate_agent/manifest.yamlsimilarity index 100%rename from internal/examples/ate_agent/manifest.yamlrename to internal/experimental/examples/ate_agent/manifest.yamldiff --git a/internal/ate/client.go b/internal/experimental/k8s/ate/client.gosimilarity index 100%rename from internal/ate/client.gorename to internal/experimental/k8s/ate/client.godiff --git a/internal/ate/doc.go b/internal/experimental/k8s/ate/doc.gosimilarity index 100%rename from internal/ate/doc.gorename to internal/experimental/k8s/ate/doc.godiff --git a/internal/sandboxclient/client.go b/internal/experimental/k8s/sandboxclient/client.gosimilarity index 100%rename from internal/sandboxclient/client.gorename to internal/experimental/k8s/sandboxclient/client.godiff --git a/internal/sandboxclient/portforward.go b/internal/experimental/k8s/sandboxclient/portforward.gosimilarity index 100%rename from internal/sandboxclient/portforward.gorename to internal/experimental/k8s/sandboxclient/portforward.godiff --git a/internal/testagent/agent.go b/internal/experimental/testagent/agent.gosimilarity index 100%rename from internal/testagent/agent.gorename to internal/experimental/testagent/agent.godiff --git a/internal/testagent/docker.go b/internal/experimental/testagent/docker.gosimilarity index 100%rename from internal/testagent/docker.gorename to internal/experimental/testagent/docker.go