Agent Executor (AX) is Google's open agentic orchestration runtime
Go
Rename the task package to executor (#138)
Jaana Dogan29e671745ecb
diff --git a/cmd/ax/serve.go b/cmd/ax/serve.goindex 1a44496..330cc96 100644--- a/cmd/ax/serve.go+++ b/cmd/ax/serve.go@@ -26,7 +26,7 @@ import ("github.com/google/ax/internal/agent""github.com/google/ax/internal/config""github.com/google/ax/internal/controller"- "github.com/google/ax/internal/controller/task"+ "github.com/google/ax/internal/controller/executor""github.com/google/ax/internal/server""github.com/google/ax/proto""github.com/spf13/cobra"@@ -92,8 +92,8 @@ func runServe(cmd *cobra.Command, args []string) error {func newControllerFromConfig(ctx context.Context, cfg *config.Config) (*controller.Controller, error) {// Create event log builder- eventLogBuilder := func() (task.EventLog, error) {- return task.OpenSQLiteEventLog(cfg.EventLog.SQLiteConfig.Filename)+ eventLogBuilder := func() (executor.EventLog, error) {+ return executor.OpenSQLiteEventLog(cfg.EventLog.SQLiteConfig.Filename)}// Create planner builderdiff --git a/cmd/ax/trace.go b/cmd/ax/trace.goindex 3874b12..506238d 100644--- a/cmd/ax/trace.go+++ b/cmd/ax/trace.go@@ -22,7 +22,7 @@ import ("time""github.com/google/ax/internal/config"- "github.com/google/ax/internal/controller/task"+ "github.com/google/ax/internal/controller/executor""github.com/google/ax/proto""github.com/spf13/cobra")@@ -130,7 +130,7 @@ func fetchEventsFromDB(configPath string, rootExecID string) ([]*proto.Executionreturn nil, fmt.Errorf("error loading config: %w", err)}- evLog, err := task.OpenSQLiteEventLog(cfg.EventLog.SQLiteConfig.Filename)+ evLog, err := executor.OpenSQLiteEventLog(cfg.EventLog.SQLiteConfig.Filename)if err != nil {return nil, fmt.Errorf("could not open sqlite eventlog: %w", err)}diff --git a/internal/controller/controller.go b/internal/controller/controller.goindex 3330bc1..b494650 100644--- a/internal/controller/controller.go+++ b/internal/controller/controller.go@@ -24,7 +24,7 @@ import ("github.com/google/ax/internal/agent""github.com/google/ax/internal/config"- "github.com/google/ax/internal/controller/task"+ "github.com/google/ax/internal/controller/executor""github.com/google/ax/internal/testagent""github.com/google/ax/proto""google.golang.org/grpc/codes"@@ -39,7 +39,7 @@ type Controller struct {inFlightExecutionsMu sync.MutexinFlightExecutions map[string]struct{}registry *Registry- eventLog task.EventLog+ eventLog executor.EventLogplannerBuilder PlannerBuilder}@@ -48,7 +48,7 @@ type PlannerBuilder func(ctx context.Context, r *Registry) (agent.Agent, error)// Config configures the controller.type Config struct {- EventLogBuilder task.EventLogBuilder+ EventLogBuilder executor.EventLogBuilderPlannerBuilder PlannerBuilder// TODO(jbd): Add CompacterBuilder.HealthCheck config.HealthCheckConfig@@ -98,7 +98,7 @@ func (d *Controller) Exec(ctx context.Context, incoming *proto.AgentMessage, handefer cleanup()if inFlight {- return fmt.Errorf("task %q is already in flight", incoming.ExecId)+ return fmt.Errorf("execution %q is already in flight", incoming.ExecId)}planner, err := d.plannerBuilder(ctx, d.registry)@@ -124,7 +124,7 @@ func (d *Controller) Exec(ctx context.Context, incoming *proto.AgentMessage, hanif start.AgentId == "" {start.AgentId = plannerAgentID}- e := task.DefaultExecutor(d.eventLog, registry)+ e := executor.DefaultExecutor(d.eventLog, registry)return e.Exec(ctx, incoming.ExecId, start, handler)}diff --git a/internal/controller/task/eventlog.go b/internal/controller/executor/eventlog.gosimilarity index 98%rename from internal/controller/task/eventlog.gorename to internal/controller/executor/eventlog.goindex 380c918..9fb5c17 100644--- a/internal/controller/task/eventlog.go+++ b/internal/controller/executor/eventlog.go@@ -12,7 +12,7 @@// See the License for the specific language governing permissions and// limitations under the License.-package task+package executorimport ("context"diff --git a/internal/controller/task/task.go b/internal/controller/executor/executor.gosimilarity index 94%rename from internal/controller/task/task.gorename to internal/controller/executor/executor.goindex 1f5014a..260cd70 100644--- a/internal/controller/task/task.go+++ b/internal/controller/executor/executor.go@@ -12,7 +12,7 @@// See the License for the specific language governing permissions and// limitations under the License.-package task+package executorimport ("context"@@ -25,7 +25,7 @@ import (type EventLogBuilder func() (EventLog, error)-type taskExecutor struct {+type defaultExecutor struct {id stringeventLog EventLogregistry map[string]agent.Agent@@ -39,14 +39,14 @@ func newExecID(parent, child string) string {}func DefaultExecutor(eventLog EventLog, registry map[string]agent.Agent) agent.Executor {- return &taskExecutor{+ return &defaultExecutor{id: "",eventLog: eventLog,registry: registry,}}-func (tm *taskExecutor) Exec(ctx context.Context, execID string, start *proto.AgentStart, o agent.OutputHandler) error {+func (tm *defaultExecutor) Exec(ctx context.Context, execID string, start *proto.AgentStart, o agent.OutputHandler) error {execID = newExecID(tm.id, execID)a, ok := tm.registry[start.AgentId]if !ok {@@ -64,7 +64,7 @@ func (tm *taskExecutor) Exec(ctx context.Context, execID string, start *proto.Agreturn tm.exec(ctx, execID, start, tm.eventLog, a, allInputs, o)}-func (tm *taskExecutor) exec(+func (tm *defaultExecutor) exec(ctx context.Context,execID string,start *proto.AgentStart,@@ -72,7 +72,7 @@ func (tm *taskExecutor) exec(a agent.Agent,allInputs []*proto.Content,o agent.OutputHandler) error {- child := &taskExecutor{+ child := &defaultExecutor{id: execID,eventLog: tm.eventLog,registry: tm.registry,diff --git a/internal/controller/task/task_test.go b/internal/controller/executor/executor_test.gosimilarity index 99%rename from internal/controller/task/task_test.gorename to internal/controller/executor/executor_test.goindex b747035..5a74a7d 100644--- a/internal/controller/task/task_test.go+++ b/internal/controller/executor/executor_test.go@@ -12,7 +12,7 @@// See the License for the specific language governing permissions and// limitations under the License.-package task+package executorimport ("context"diff --git a/internal/controller/task/sqlite.go b/internal/controller/executor/sqlite.gosimilarity index 99%rename from internal/controller/task/sqlite.gorename to internal/controller/executor/sqlite.goindex 254c698..88ad3d2 100644--- a/internal/controller/task/sqlite.go+++ b/internal/controller/executor/sqlite.go@@ -12,7 +12,7 @@// See the License for the specific language governing permissions and// limitations under the License.-package task+package executorimport ("context"diff --git a/internal/controller/task/sqlite_test.go b/internal/controller/executor/sqlite_test.gosimilarity index 99%rename from internal/controller/task/sqlite_test.gorename to internal/controller/executor/sqlite_test.goindex 8c19c5c..4c3aa08 100644--- a/internal/controller/task/sqlite_test.go+++ b/internal/controller/executor/sqlite_test.go@@ -12,7 +12,7 @@// See the License for the specific language governing permissions and// limitations under the License.-package task+package executorimport ("context"diff --git a/internal/controller/task/util.go b/internal/controller/executor/util.gosimilarity index 98%rename from internal/controller/task/util.gorename to internal/controller/executor/util.goindex 055f9c7..8c80600 100644--- a/internal/controller/task/util.go+++ b/internal/controller/executor/util.go@@ -12,7 +12,7 @@// See the License for the specific language governing permissions and// limitations under the License.-package task+package executorimport ("context"