Skip to content

Remove UserInputRequests methods #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qmuntal merged 2 commits into from
Feb 5, 2026
Merged

Remove UserInputRequests methods #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6846543
remove UserInputRequests methods
qmuntal Feb 5, 2026
29ec6b5
fix samples
qmuntal Feb 5, 2026
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
5 changes: 2 additions & 3 deletions examples/getting_started/agent/step04_using_function_tools_with_approvals/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,10 @@ func main() {

var userResponses []message.Content
var approvedRequests bool
for req := range resp.UserInputRequests() {
for c := range resp.Contents() {
// Ask the user to approve each function call request.
request, ok := req.(*message.FunctionApprovalRequestContent)
request, ok := c.(*message.FunctionApprovalRequestContent)
if !ok {
demo.Panicf("unexpected request type: %T", req)
continue
}
approved := demo.UserInputRequest(request)
Expand Down
5 changes: 2 additions & 3 deletions examples/getting_started/azure_openai/step04_using_function_tools_with_approvals/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ func main() {

var userResponses []message.Content
var approvedRequests bool
for req := range resp.UserInputRequests() {
for c := range resp.Contents() {
// Ask the user to approve each function call request.
request, ok := req.(*message.FunctionApprovalRequestContent)
request, ok := c.(*message.FunctionApprovalRequestContent)
if !ok {
demo.Panicf("unexpected request type: %T", req)
continue
}
approved := demo.UserInputRequest(request)
Expand Down
14 changes: 0 additions & 14 deletions message/content.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"encoding/json"
"errors"
"fmt"
"iter"
"maps"
"reflect"
"slices"
Expand Down Expand Up @@ -92,19 +91,6 @@ func (cs Contents) Usage() UsageDetails {
return usage
}

func (cs Contents) UserInputRequests() iter.Seq[Content] {
return func(yield func(Content) bool) {
for _, c := range cs {
switch c := c.(type) {
case *FunctionApprovalRequestContent:
if !yield(c) {
return
}
}
}
}
}

// TextContent represents plain text content.
type TextContent struct {
ContentHeader
Expand Down
30 changes: 12 additions & 18 deletions message/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ func (m *Message) Usage() UsageDetails {
return m.Contents.Usage()
}

func (m Message) UserInputRequests() iter.Seq[Content] {
return m.Contents.UserInputRequests()
}

// Clone creates a shallow copy of the message.
func (m *Message) Clone() *Message {
if m == nil {
Expand Down Expand Up @@ -89,18 +85,12 @@ func (resp *Response) String() string {
return sb.String()
}

func (resp *Response) Usage() UsageDetails {
var usage UsageDetails
for _, msg := range resp.Messages {
usage.Add(msg.Usage())
}
return usage
}

func (resp *Response) UserInputRequests() iter.Seq[Content] {
// Contents returns a sequence of all the contents in the response, across all messages.
// The contents are returned in the order they were added to the response.
func (resp *Response) Contents() iter.Seq[Content] {
return func(yield func(Content) bool) {
for _, msg := range resp.Messages {
for c := range msg.UserInputRequests() {
for _, c := range msg.Contents {
if !yield(c) {
return
}
Expand All @@ -109,6 +99,14 @@ func (resp *Response) UserInputRequests() iter.Seq[Content] {
}
}

func (resp *Response) Usage() UsageDetails {
var usage UsageDetails
for _, msg := range resp.Messages {
usage.Add(msg.Usage())
}
return usage
}

func (resp *Response) Coalesce() {
for _, msg := range resp.Messages {
msg.Contents = CoalesceContents(msg.Contents)
Expand Down Expand Up @@ -214,7 +212,3 @@ func (r *ResponseUpdate) String() string {
func (m ResponseUpdate) Usage() UsageDetails {
return m.Contents.Usage()
}

func (r *ResponseUpdate) UserInputRequests() iter.Seq[Content] {
return r.Contents.UserInputRequests()
}