Show stored images to the user

[onechat] / tools.go

diff --git a/tools.go b/tools.go
index 96cbb97d38010e9d6e53871b7bef0c471dba5dcf..9f2905acb8b32ef61a6c96dbc3cc4365d086d4aa 100644 (file)
--- a/tools.go
+++ b/tools.go
@@ -27,9 +27,9 @@ const (
        // output, enough for toolClipCharacters/2 characters of 4 bytes.
        toolClipBytes = 4 * toolClipCharacters / 2
 
        // output, enough for toolClipCharacters/2 characters of 4 bytes.
        toolClipBytes = 4 * toolClipCharacters / 2
 

-       // toolShellWaitDelay is how long a command can keep its output open
+       // toolShellOutputTimeout is how long a command can keep its output open

        // after it ends or after its kill.
        // after it ends or after its kill.

-       toolShellWaitDelay = 2 * time.Second
+       toolShellOutputTimeout = 2 * time.Second

 )
 
 // ToolLog is the log that the tools write their calls and results to.
 )
 
 // ToolLog is the log that the tools write their calls and results to.


@@ -54,8 +54,8 @@ type ToolChat interface {
 // spawn and tell, the WhatsApp link for the WhatsApp tools, and the schedules
 // for the schedule tools. Each permanent agent has the parent-child queue. Only
 // the root has child creation and source routes. A child has neither of them
 // spawn and tell, the WhatsApp link for the WhatsApp tools, and the schedules
 // for the schedule tools. Each permanent agent has the parent-child queue. Only
 // the root has child creation and source routes. A child has neither of them

-// nor a WhatsApp link. The toolbox of a subagent has none of them, so these are
-// unknown tools there.
+// nor a WhatsApp link. Only the root can show images to the user. The toolbox
+// of a subagent has none of them, so these are unknown tools there.

 type Toolbox struct {
        log       ToolLog
        chat      ToolChat
 type Toolbox struct {
        log       ToolLog
        chat      ToolChat


@@ -69,6 +69,7 @@ type Toolbox struct {
        children  *DaemonChildren
        routes    *Routes
        images    *ImageStore
        children  *DaemonChildren
        routes    *Routes
        images    *ImageStore

+       imageShow *ImageShow

 }
 
 // Call logs the call of the tool name with its JSON arguments, makes the log
 }
 
 // Call logs the call of the tool name with its JSON arguments, makes the log


@@ -231,6 +232,16 @@ func (b *Toolbox) run(ctx context.Context, name, arguments string) string {
                case err == nil:
                        output, err = b.runs.Tell(ctx, args.Name, args.Message)
                }
                case err == nil:
                        output, err = b.runs.Tell(ctx, args.Name, args.Message)
                }

+       case "image_show":
+               var args ToolImageShowArguments
+
+               err = toolDecodeArguments(arguments, &args)
+               switch {
+               case b.imageShow == nil:
+                       err = fmt.Errorf("unknown tool %q", name)
+               case err == nil:
+                       output, err = b.imageShow.Show(ctx, args.Image, args.Caption)
+               }

        case "whatsapp_find":
                var args ToolWhatsAppFindArguments
 
        case "whatsapp_find":
                var args ToolWhatsAppFindArguments
 


@@ -379,7 +390,7 @@ func (b *Toolbox) shell(ctx context.Context, command string) string {
        cmd.Cancel = func() error {
                return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
        }
        cmd.Cancel = func() error {
                return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
        }

-       cmd.WaitDelay = toolShellWaitDelay
+       cmd.WaitDelay = toolShellOutputTimeout

 
        output := &ToolHeadTail{}
        cmd.Stdout = output
 
        output := &ToolHeadTail{}
        cmd.Stdout = output


@@ -549,6 +560,12 @@ type ToolTellArguments struct {
        Message string `json:"message"`
 }
 
        Message string `json:"message"`
 }
 

+// ToolImageShowArguments are the arguments of image_show.
+type ToolImageShowArguments struct {
+       Image   string `json:"image"`
+       Caption string `json:"caption"`
+}
+

 // ToolWhatsAppFindArguments are the arguments of whatsapp_find.
 type ToolWhatsAppFindArguments struct {
        Name string `json:"name"`
 // ToolWhatsAppFindArguments are the arguments of whatsapp_find.
 type ToolWhatsAppFindArguments struct {
        Name string `json:"name"`