Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/flagparse/svcparams.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package flagparse

import (
"fmt"
"strings"

"github.com/spf13/pflag"

Expand Down
11 changes: 8 additions & 3 deletions internal/polling/polling.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ func WaitForTask(ctx context.Context, client *a2aclient.Client, req *a2a.GetTask
}

// Stream sends the original message and then polls the resulting task at the
// given interval, yielding task events until it reaches a terminal state.
// given interval, yielding task events until it reaches a terminal state or an
// interrupted state that needs the caller to act (input/auth-required).
func Stream(ctx context.Context, client *a2aclient.Client, original *a2a.SendMessageRequest, interval time.Duration) iter.Seq2[a2a.Event, error] {
return func(yield func(a2a.Event, error) bool) {
req := *original
Expand Down Expand Up @@ -95,7 +96,9 @@ func Stream(ctx context.Context, client *a2aclient.Client, original *a2a.SendMes
tid := prevState.ID

successiveFailures := 0
for !prevState.Status.State.Terminal() && prevState.Status.State != a2a.TaskStateInputRequired {
for !prevState.Status.State.Terminal() &&
prevState.Status.State != a2a.TaskStateInputRequired &&
prevState.Status.State != a2a.TaskStateAuthRequired {
select {
case <-ctx.Done():
yield(nil, ctx.Err())
Expand All @@ -115,7 +118,9 @@ func Stream(ctx context.Context, client *a2aclient.Client, original *a2a.SendMes
successiveFailures = 0

var events []a2a.Event
if task.Status.State.Terminal() || task.Status.State == a2a.TaskStateInputRequired {
if task.Status.State.Terminal() ||
task.Status.State == a2a.TaskStateInputRequired ||
task.Status.State == a2a.TaskStateAuthRequired {
events = append(events, task)
} else {
events = a2aevent.Recover(prevState, task)
Expand Down
18 changes: 18 additions & 0 deletions internal/polling/polling_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ func TestHandlePolling(t *testing.T) {
sendResult: &a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateInputRequired}},
wantEvents: []a2a.Event{&a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateInputRequired}}},
},
{
name: "auth-required task on send stops without polling",
sendResult: &a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateAuthRequired}},
wantEvents: []a2a.Event{&a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateAuthRequired}}},
},
{
name: "polls until completion recovering intermediate updates",
sendResult: &a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateSubmitted}},
Expand All @@ -86,6 +91,19 @@ func TestHandlePolling(t *testing.T) {
&a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateInputRequired}},
},
},
{
name: "polls until auth-required",
sendResult: &a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateSubmitted}},
getResponses: []getTaskResponse{
{task: &a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateWorking}}},
{task: &a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateAuthRequired}}},
},
wantEvents: []a2a.Event{
&a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateSubmitted}},
&a2a.TaskStatusUpdateEvent{Status: a2a.TaskStatus{State: a2a.TaskStateWorking}},
&a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateAuthRequired}},
},
},
{
name: "recovers artifact events during transition",
sendResult: &a2a.Task{Status: a2a.TaskStatus{State: a2a.TaskStateSubmitted}},
Expand Down
Loading