Check forced-disconnect test setup failures

[onechat] / chain.go

diff --git a/chain.go b/chain.go
index c4a4302472d030ee944af5d7bc33f1e96ed7d9f1..c85b2a2b0b0bc8e809c04c13cda1689e02283124 100644 (file)
--- a/chain.go
+++ b/chain.go
@@ -22,21 +22,36 @@ type ChainClient interface {
 // answer. The replies, the tool calls, and the results go to the log of tools
 // as they happen. The thoughts never do.
 //
-// Each later request begins with the whole input of the request before it,
-// then its output items, then the tool results. The output items hold the
-// reasoning with its encrypted content, because the calls do not store it. So
-// each request begins with all of the previous one and reads it from the prompt
+// Each later request begins with the whole input of the request before it, then
+// its output items, then the tool results. The output items hold the reasoning
+// with its encrypted content, because the calls do not store it. So each
+// request begins with all of the previous one and reads it from the prompt
 // cache. The messages of take join each later request after the tool results.
 type Chain struct {
        client  ChainClient
        tools   *Toolbox
        request ModelRequest
        take    func() []Message
+       images  *ImageStore
+}
+
+// ChainFunctionCall holds the fields of a function call output item.
+type ChainFunctionCall struct {
+       Type      string `json:"type"`
+       Name      string `json:"name"`
+       Arguments string `json:"arguments"`
+       CallID    string `json:"call_id"`
+}
+
+// ChainFunctionCallOutput is the input item with the result of a function call.
+type ChainFunctionCallOutput struct {
+       Type   string `json:"type"`
+       CallID string `json:"call_id"`
+       Output any    `json:"output"`
 }
 
 // Run runs the chain from input, the input of its first request, and returns
-// the text of the final answer. An error of a log write wraps
-// errChainLogWrite.
+// the text of the final answer. An error of a log write wraps errChainLogWrite.
 func (c *Chain) Run(ctx context.Context, input []any) (string, error) {
        request := c.request
        for request.Turn = "first"; ; request.Turn = "next" {
@@ -50,7 +65,7 @@ func (c *Chain) Run(ctx context.Context, input []any) (string, error) {
 
                input, text, err = c.handle(ctx, input, response)
                if err != nil {
-                       return "", err
+                       return "", fmt.Errorf("handle model response: %w", err)
                }
 
                if len(input) == 0 {
@@ -60,9 +75,9 @@ func (c *Chain) Run(ctx context.Context, input []any) (string, error) {
 }
 
 // handle logs the replies of response and runs its tool calls. It returns the
-// input of the next request: input, the output items, the tool results, and
-// the messages of take. After the final answer it returns no input, and the
-// replies of the answer as its text.
+// input of the next request: input, the output items, the tool results, and the
+// messages of take. After the final answer it returns no input, and the replies
+// of the answer as its text.
 func (c *Chain) handle(ctx context.Context, input []any, response ModelResponse) ([]any, string, error) {
        var (
                outputs []any
@@ -72,7 +87,7 @@ func (c *Chain) handle(ctx context.Context, input []any, response ModelResponse)
        for _, raw := range response.Output {
                item, err := chainInputItem(raw)
                if err != nil {
-                       return nil, "", err
+                       return nil, "", fmt.Errorf("decode chain input: %w", err)
                }
 
                input = append(input, item)
@@ -88,7 +103,7 @@ func (c *Chain) handle(ctx context.Context, input []any, response ModelResponse)
                case "message":
                        text, err := modelOutputText([]json.RawMessage{raw})
                        if err != nil {
-                               return nil, "", err
+                               return nil, "", fmt.Errorf("read response text: %w", err)
                        }
 
                        text = strings.TrimSpace(text)
@@ -122,28 +137,17 @@ func (c *Chain) handle(ctx context.Context, input []any, response ModelResponse)
 
        input = append(input, outputs...)
        for _, message := range c.take() {
-               input = append(input, modelUserMessage(message.Text))
+               item, err := imageUserMessage(c.images, message.Text)
+               if err != nil {
+                       return nil, "", fmt.Errorf("read queued images: %w", err)
+               }
+
+               input = append(input, item)
        }
 
        return input, "", nil
 }
 
-// ChainFunctionCall holds the fields of a function call output item.
-type ChainFunctionCall struct {
-       Type      string `json:"type"`
-       Name      string `json:"name"`
-       Arguments string `json:"arguments"`
-       CallID    string `json:"call_id"`
-}
-
-// ChainFunctionCallOutput is the input item with the result of a function
-// call.
-type ChainFunctionCallOutput struct {
-       Type   string `json:"type"`
-       CallID string `json:"call_id"`
-       Output string `json:"output"`
-}
-
 // chainInputItem returns an output item as an input item for the next request.
 // The calls do not store their items, so the item goes back whole, without its
 // id.