Skip to content

armgit / ax

Public Imported from GitHub
0

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

Go

Move Gemini related files into their own package (#273)

anj-sb91caa44f320
diff --git a/internal/agent/agent.go b/internal/agent/agent.go
index 99eb696..335f991 100644
--- a/internal/agent/agent.go
+++ b/internal/agent/agent.go
@@ -41,3 +41,11 @@ type Agent interface {
// Close gracefully shuts down the agent and releases resources.
Close() error
}
+
+// AgentInfo contains metadata about a registered agent.
+type AgentInfo struct {
+ ID string
+ Name string
+ Description string
+ Metadata map[string]string
+}
diff --git a/internal/cliutil/cliutil.go b/internal/cliutil/cliutil.go
index 4d16e55..baddb90 100644
--- a/internal/cliutil/cliutil.go
+++ b/internal/cliutil/cliutil.go
@@ -23,6 +23,7 @@ import (
"github.com/google/ax/internal/config"
"github.com/google/ax/internal/controller"
"github.com/google/ax/internal/controller/executor"
+ "github.com/google/ax/internal/gemini"
"github.com/google/ax/internal/experimental/antigravity"
)
@@ -53,7 +54,7 @@ func NewControllerFromConfig(ctx context.Context, cfg *config.Config) (*controll
if err != nil {
return nil, fmt.Errorf("failed to parse duration: %v", err)
}
- return controller.NewGeminiPlannerAgent(ctx, r, controller.GeminiPlannerConfig{
+ return gemini.NewGeminiPlannerAgent(ctx, r, gemini.GeminiPlannerConfig{
GeminiConfig: &config.GeminiConfig{
Model: cfg.Planner.Gemini.Model,
MaxTokens: cfg.Planner.Gemini.MaxTokens,
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
index 06d95ee..7def527 100644
--- a/internal/controller/controller.go
+++ b/internal/controller/controller.go
@@ -26,6 +26,7 @@ import (
"github.com/google/ax/internal/agent"
"github.com/google/ax/internal/controller/executor"
"github.com/google/ax/internal/experimental/testagent"
+ "github.com/google/ax/internal/gemini"
"github.com/google/ax/proto"
"github.com/google/uuid"
)
@@ -62,7 +63,7 @@ func New(ctx context.Context, config Config) (*Controller, error) {
// If no planner builder is provided, use the default Gemini planner.
if config.PlannerBuilder == nil {
config.PlannerBuilder = func(ctx context.Context, r *Registry) (agent.Agent, error) {
- return NewGeminiPlannerAgent(ctx, r, GeminiPlannerConfig{})
+ return gemini.NewGeminiPlannerAgent(ctx, r, gemini.GeminiPlannerConfig{})
}
}
@@ -174,9 +175,9 @@ func (d *Controller) Exec(ctx context.Context, req *proto.ExecRequest, handler E
if err != nil {
return fmt.Errorf("failed to create planner: %w", err)
}
- registry := d.registry.Map()
+ registry := maps.Clone(d.registry.Map())
registry[plannerAgentID] = planner
- registry["gemini"] = NewGeminiAgent()
+ registry["gemini"] = gemini.NewGeminiAgent()
// For testing only! Remove this once the project is stable.
// TODO(jbd): Remove this before the release.
diff --git a/internal/controller/registry.go b/internal/controller/registry.go
index 421ebe1..98dc093 100644
--- a/internal/controller/registry.go
+++ b/internal/controller/registry.go
@@ -24,27 +24,19 @@ import (
expagent "github.com/google/ax/internal/experimental/agent"
)
-// AgentInfo contains metadata about a registered agent.
-type AgentInfo struct {
- ID string
- Name string
- Description string
- Metadata map[string]string
-}
-
// Registry manages a collection of local and remote agents.
// It provides agent discovery, health monitoring, and load balancing.
type Registry struct {
mu sync.RWMutex
agents map[string]agent.Agent
- agentInfo map[string]*AgentInfo
+ agentInfo map[string]*agent.AgentInfo
}
// NewRegistry creates a new agent registry.
func NewRegistry() *Registry {
return &Registry{
agents: make(map[string]agent.Agent),
- agentInfo: make(map[string]*AgentInfo),
+ agentInfo: make(map[string]*agent.AgentInfo),
}
}
@@ -69,7 +61,7 @@ func (r *Registry) RegisterLocal(cfg config.LocalAgentConfig) error {
}
r.agents[cfg.ID] = cfg.Agent
- r.agentInfo[cfg.ID] = &AgentInfo{
+ r.agentInfo[cfg.ID] = &agent.AgentInfo{
ID: cfg.ID,
Name: cfg.Name,
Description: cfg.Description,
@@ -103,7 +95,7 @@ func (r *Registry) RegisterRemote(cfg config.RemoteAgentConfig) error {
}
r.agents[cfg.ID] = remoteAgent
- r.agentInfo[cfg.ID] = &AgentInfo{
+ r.agentInfo[cfg.ID] = &agent.AgentInfo{
ID: cfg.ID,
Name: cfg.Name,
Description: cfg.Description,
@@ -137,7 +129,7 @@ func (r *Registry) RegisterKubernetesSandbox(ctx context.Context, cfg config.San
}
r.agents[cfg.ID] = sandboxAgent
- r.agentInfo[cfg.ID] = &AgentInfo{
+ r.agentInfo[cfg.ID] = &agent.AgentInfo{
ID: cfg.ID,
Name: cfg.Name,
Description: cfg.Description,
@@ -177,7 +169,7 @@ func (r *Registry) RegisterColab(cfg config.ColabAgentConfig) error {
}
r.agents[cfg.ID] = colabAgent
- r.agentInfo[cfg.ID] = &AgentInfo{
+ r.agentInfo[cfg.ID] = &agent.AgentInfo{
ID: cfg.ID,
Name: cfg.Name,
Description: cfg.Description,
@@ -201,7 +193,7 @@ func (r *Registry) Get(id string) (agent.Agent, error) {
}
// GetInfo retrieves agent metadata by ID.
-func (r *Registry) GetInfo(id string) (*AgentInfo, error) {
+func (r *Registry) GetInfo(id string) (*agent.AgentInfo, error) {
r.mu.RLock()
defer r.mu.RUnlock()
diff --git a/internal/controller/gemini.go b/internal/gemini/gemini.go
similarity index 99%
rename from internal/controller/gemini.go
rename to internal/gemini/gemini.go
index 504fadc..efa0db4 100644
--- a/internal/controller/gemini.go
+++ b/internal/gemini/gemini.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package controller
+package gemini
import (
"context"
diff --git a/internal/controller/gemini_planner.go b/internal/gemini/gemini_planner.go
similarity index 96%
rename from internal/controller/gemini_planner.go
rename to internal/gemini/gemini_planner.go
index bb83f79..b412c01 100644
--- a/internal/controller/gemini_planner.go
+++ b/internal/gemini/gemini_planner.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package controller
+package gemini
import (
"context"
@@ -28,6 +28,12 @@ import (
"google.golang.org/genai"
)
+// AgentRegistry defines the interface needed by the planner to discover agents.
+type AgentRegistry interface {
+ List() []string
+ GetInfo(id string) (*agent.AgentInfo, error)
+}
+
// GeminiPlannerConfig configures the Gemini-based planner.
type GeminiPlannerConfig struct {
GeminiConfig *config.GeminiConfig
@@ -41,11 +47,11 @@ type geminiPlannerAgent struct {
client *genai.Client
bashTool Tool
skillsTool Tool
- registry *Registry
+ registry AgentRegistry
}
// NewGeminiPlannerAgent creates a new Gemini-based agent.
-func NewGeminiPlannerAgent(ctx context.Context, registry *Registry, cfg GeminiPlannerConfig) (agent.Agent, error) {
+func NewGeminiPlannerAgent(ctx context.Context, registry AgentRegistry, cfg GeminiPlannerConfig) (agent.Agent, error) {
if cfg.GeminiConfig == nil {
cfg.GeminiConfig = &config.GeminiConfig{}
}
@@ -291,7 +297,7 @@ func (p *geminiPlannerAgent) handleConfirmationAnswer(inputs []*proto.Message) (
}
// agentsToTools converts registry agents to Gemini function declarations.
-func agentsToTools(registry *Registry, nativeTools ...Tool) ([]*genai.Tool, error) {
+func agentsToTools(registry AgentRegistry, nativeTools ...Tool) ([]*genai.Tool, error) {
agents := registry.List()
var tools []*genai.Tool
diff --git a/internal/controller/gemini_planner_integration_test.go b/internal/gemini/gemini_planner_integration_test.go
similarity index 88%
rename from internal/controller/gemini_planner_integration_test.go
rename to internal/gemini/gemini_planner_integration_test.go
index e497b88..1e850f9 100644
--- a/internal/controller/gemini_planner_integration_test.go
+++ b/internal/gemini/gemini_planner_integration_test.go
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package controller
+package gemini_test
import (
"context"
@@ -22,6 +22,8 @@ import (
"testing"
"github.com/google/ax/internal/agent"
+ "github.com/google/ax/internal/controller"
+ "github.com/google/ax/internal/gemini"
"github.com/google/ax/proto"
)
@@ -32,13 +34,13 @@ func TestIntegrationGeminiPlanner(t *testing.T) {
}
ctx := context.Background()
- registry := NewRegistry()
+ registry := controller.NewRegistry()
- cfg := GeminiPlannerConfig{
+ cfg := gemini.GeminiPlannerConfig{
MaxSteps: 5,
}
- planner, err := NewGeminiPlannerAgent(ctx, registry, cfg)
+ planner, err := gemini.NewGeminiPlannerAgent(ctx, registry, cfg)
if err != nil {
t.Fatal(err)
}
diff --git a/internal/controller/gemini_planner_test.go b/internal/gemini/gemini_planner_test.go
similarity index 99%
rename from internal/controller/gemini_planner_test.go
rename to internal/gemini/gemini_planner_test.go
index ef99636..aa530ca 100644
--- a/internal/controller/gemini_planner_test.go
+++ b/internal/gemini/gemini_planner_test.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package controller
+package gemini
import (
"testing"
diff --git a/internal/controller/gemini_test.go b/internal/gemini/gemini_test.go
similarity index 99%
rename from internal/controller/gemini_test.go
rename to internal/gemini/gemini_test.go
index 6a46d97..7906fdd 100644
--- a/internal/controller/gemini_test.go
+++ b/internal/gemini/gemini_test.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package controller
+package gemini
import (
"os"