Skip to content

armgit / ax

Public Imported from GitHub
0

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

Go

EventLog methods should take a context

JBD2dbaa2161b34
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
index 87fa4e6..c02a70b 100644
--- a/internal/controller/controller.go
+++ b/internal/controller/controller.go
@@ -87,7 +87,7 @@ func (d *Controller) TriggerSession(ctx context.Context, sessionID string, input
// Add new inputs to the session if provided
for _, content := range inputs {
- if _, err := existingSession.WriteContentIn(content); err != nil {
+ if _, err := existingSession.WriteContentIn(ctx, content); err != nil {
return fmt.Errorf("failed to write input content: %w", err)
}
}
diff --git a/internal/controller/loop.go b/internal/controller/loop.go
index ab93560..439e521 100644
--- a/internal/controller/loop.go
+++ b/internal/controller/loop.go
@@ -89,7 +89,7 @@ func (e *LoopExecutor) Execute(ctx context.Context, sessionID string, inputs []*
// Write input content to session
for _, content := range inputs {
- if _, err := session.WriteContentIn(content); err != nil {
+ if _, err := session.WriteContentIn(ctx, content); err != nil {
return fmt.Errorf("failed to write input content: %w", err)
}
}
@@ -189,7 +189,7 @@ func (e *LoopExecutor) executeTask(ctx context.Context, session *Session, ag age
// Define output handler to collect responses
outputHandler := func(content *proto.Content) error {
output = append(output, content)
- if _, err := session.WriteContentOut(content); err != nil {
+ if _, err := session.WriteContentOut(ctx, content); err != nil {
return fmt.Errorf("failed to write output: %w", err)
}
return nil
@@ -200,7 +200,7 @@ func (e *LoopExecutor) executeTask(ctx context.Context, session *Session, ag age
defer cancelLifecycle()
lifecycleHandler := func(event *proto.LifecycleEvent) error {
- if err := session.WriteLifecycleEvent(event); err != nil {
+ if err := session.WriteLifecycleEvent(ctx, event); err != nil {
return fmt.Errorf("failed to write lifecycle event: %w", err)
}
e.HandleLifecycleEvent(session, event)
diff --git a/internal/controller/session.go b/internal/controller/session.go
index 80e6ba4..bae80bc 100644
--- a/internal/controller/session.go
+++ b/internal/controller/session.go
@@ -1,6 +1,7 @@
package controller
import (
+ "context"
"fmt"
"sync"
"time"
@@ -46,13 +47,6 @@ func NewSessionManager(factory EventLogFactory) *SessionManager {
}
}
-// // NewSessionManagerWithFileEventLog creates a new session manager using file-based event logs.
-// // This is a convenience function for the common case of using file-based event logs.
-// func NewSessionManagerWithFileEventLog(elogFactory EventLogFactory) *SessionManager {
-
-// return NewSessionManager(factory)
-// }
-
// NewSession creates a new session with the given ID.
func (sm *SessionManager) NewSession(sessionID string) (*Session, error) {
sm.mu.Lock()
@@ -109,8 +103,8 @@ func (sm *SessionManager) LoadSessionFromCheckpoint(sessionID string, checkpoint
}
defer replayLog.Close()
- // Get all entries from the event log
- entries, err := replayLog.RetrieveEntries()
+ // TODO(jbd): Propagate the context properly.
+ entries, err := replayLog.RetrieveEntries(context.Background())
if err != nil {
return nil, fmt.Errorf("failed to get event log entries: %w", err)
}
@@ -247,14 +241,14 @@ func (sm *SessionManager) CloseAll() {
}
// WriteContentIn appends an incoming content message to the session with a new checkpoint.
-func (s *Session) WriteContentIn(content *proto.Content) (string, error) {
+func (s *Session) WriteContentIn(ctx context.Context, content *proto.Content) (string, error) {
s.mu.Lock()
defer s.mu.Unlock()
// Generate a new checkpoint UUID
checkpointID := uuid.New().String()
- if err := s.eventLog.AppendContent(eventlog.EventTypeContentIn, checkpointID, content); err != nil {
+ if err := s.eventLog.AppendContent(ctx, eventlog.EventTypeContentIn, checkpointID, content); err != nil {
return "", err
}
@@ -265,14 +259,14 @@ func (s *Session) WriteContentIn(content *proto.Content) (string, error) {
}
// WriteContentOut appends an outgoing content message to the session with a new checkpoint.
-func (s *Session) WriteContentOut(content *proto.Content) (string, error) {
+func (s *Session) WriteContentOut(ctx context.Context, content *proto.Content) (string, error) {
s.mu.Lock()
defer s.mu.Unlock()
// Generate a new checkpoint UUID
checkpointID := uuid.New().String()
- if err := s.eventLog.AppendContent(eventlog.EventTypeContentOut, checkpointID, content); err != nil {
+ if err := s.eventLog.AppendContent(ctx, eventlog.EventTypeContentOut, checkpointID, content); err != nil {
return "", err
}
@@ -283,11 +277,11 @@ func (s *Session) WriteContentOut(content *proto.Content) (string, error) {
}
// WriteLifecycleEvent appends a lifecycle event to the session.
-func (s *Session) WriteLifecycleEvent(event *proto.LifecycleEvent) error {
+func (s *Session) WriteLifecycleEvent(ctx context.Context, event *proto.LifecycleEvent) error {
s.mu.Lock()
defer s.mu.Unlock()
- if err := s.eventLog.AppendLifecycleEvent(event); err != nil {
+ if err := s.eventLog.AppendLifecycleEvent(ctx, event); err != nil {
return err
}
diff --git a/internal/eventlog/eventlog.go b/internal/eventlog/eventlog.go
index f35b599..ac885c6 100644
--- a/internal/eventlog/eventlog.go
+++ b/internal/eventlog/eventlog.go
@@ -3,6 +3,7 @@
package eventlog
import (
+ "context"
"time"
"github.com/google/gar/proto"
@@ -30,13 +31,13 @@ type Entry struct {
// It provides methods for appending events, reading entries, and managing the log lifecycle.
type EventLog interface {
// AppendContent appends a content message to the event log with a checkpoint UUID.
- AppendContent(t EventType, checkpointID string, content *proto.Content) error
+ AppendContent(ctx context.Context, t EventType, checkpointID string, content *proto.Content) error
// AppendLifecycleEvent appends a lifecycle event to the event log.
- AppendLifecycleEvent(event *proto.LifecycleEvent) error
+ AppendLifecycleEvent(ctx context.Context, event *proto.LifecycleEvent) error
// RetrieveEntries returns all entries from the event log in order.
- RetrieveEntries() ([]Entry, error)
+ RetrieveEntries(ctx context.Context) ([]Entry, error)
// Close closes the event log and releases any resources.
Close() error
diff --git a/internal/eventlog/file.go b/internal/eventlog/file.go
index de19d02..0015f53 100644
--- a/internal/eventlog/file.go
+++ b/internal/eventlog/file.go
@@ -2,6 +2,7 @@ package eventlog
import (
"bufio"
+ "context"
"encoding/json"
"fmt"
"os"
@@ -102,7 +103,7 @@ func (e *FileEventLog) Append(entryType EventType, checkpointID string, data map
}
// AppendContent writes a content message to the event log with a checkpoint UUID.
-func (e *FileEventLog) AppendContent(direction EventType, checkpointID string, content *proto.Content) error {
+func (e *FileEventLog) AppendContent(ctx context.Context, direction EventType, checkpointID string, content *proto.Content) error {
data := map[string]interface{}{
"role": content.Role,
"type": content.Type,
@@ -114,7 +115,7 @@ func (e *FileEventLog) AppendContent(direction EventType, checkpointID string, c
// AppendLifecycleEvent writes a lifecycle event to the event log.
// Lifecycle events don't have checkpoint IDs.
-func (e *FileEventLog) AppendLifecycleEvent(event *proto.LifecycleEvent) error {
+func (e *FileEventLog) AppendLifecycleEvent(ctx context.Context, event *proto.LifecycleEvent) error {
var timestampSeconds int64
var timestampNanos int32
if event.Timestamp != nil {
@@ -159,7 +160,7 @@ func (e *FileEventLog) SessionID() string {
// RetrieveEntries reads and returns all entries from the event log file.
// Returns entries in order.
-func (e *FileEventLog) RetrieveEntries() ([]Entry, error) {
+func (e *FileEventLog) RetrieveEntries(ctx context.Context) ([]Entry, error) {
e.mu.Lock()
defer e.mu.Unlock()