Name timeouts for the operations they limit

[onechat] / memory.go

diff --git a/memory.go b/memory.go
index bcc10951921751aad707a32f7180799e023e9a18..602b86cddf5b813027c554a23f65621298f46fc3 100644 (file)
--- a/memory.go
+++ b/memory.go
@@ -5,7 +5,7 @@ import (
        "encoding/json"
        "errors"
        "fmt"
        "encoding/json"
        "errors"
        "fmt"

-       "log"
+       "log/slog"

        "os"
        "path/filepath"
        "strings"
        "os"
        "path/filepath"
        "strings"


@@ -25,7 +25,7 @@ var (
 // openMemory opens the chat in root and starts the builds that are ready. The
 // clock gives the dates of new messages and the days of new nodes. logger gets
 // one line for each failed build. The builds stop when ctx ends or at Close.
 // openMemory opens the chat in root and starts the builds that are ready. The
 // clock gives the dates of new messages and the days of new nodes. logger gets
 // one line for each failed build. The builds stop when ctx ends or at Close.

-func openMemory(ctx context.Context, root string, clock func() time.Time, summarizer Summarizer, logger *log.Logger) (*Memory, error) {
+func openMemory(ctx context.Context, root string, clock func() time.Time, summarizer Summarizer, logger *slog.Logger) (*Memory, error) {

        log, err := openLog(ctx, root, clock)
        if err != nil {
                return nil, err
        log, err := openLog(ctx, root, clock)
        if err != nil {
                return nil, err


@@ -108,7 +108,7 @@ type Memory struct {
        cview      *View
        queue      *BuildQueue
        summarizer Summarizer
        cview      *View
        queue      *BuildQueue
        summarizer Summarizer

-       logger     *log.Logger
+       logger     *slog.Logger

        ctx        context.Context
        cancel     context.CancelFunc
        workers    sync.WaitGroup
        ctx        context.Context
        cancel     context.CancelFunc
        workers    sync.WaitGroup


@@ -125,6 +125,7 @@ func (m *Memory) Close() error {
        defer m.mutex.Unlock()
 
        var err error
        defer m.mutex.Unlock()
 
        var err error

+

        if m.syncer != nil {
                err = m.syncer.Close()
        }
        if m.syncer != nil {
                err = m.syncer.Close()
        }


@@ -148,6 +149,11 @@ func (m *Memory) AppendDated(kind, text, date string) (Message, error) {
        m.mutex.Lock()
        defer m.mutex.Unlock()
 
        m.mutex.Lock()
        defer m.mutex.Unlock()
 

+       return m.appendDated(kind, text, date)
+}
+
+// appendDated appends under the memory lock and updates the views and builds.
+func (m *Memory) appendDated(kind, text, date string) (Message, error) {

        message, err := m.log.AppendDated(kind, text, date)
        if err != nil {
                return Message{}, fmt.Errorf("append dated log message: %w", err)
        message, err := m.log.AppendDated(kind, text, date)
        if err != nil {
                return Message{}, fmt.Errorf("append dated log message: %w", err)


@@ -171,9 +177,48 @@ func (m *Memory) AppendDated(kind, text, date string) (Message, error) {
        return message, nil
 }
 
        return message, nil
 }
 

+// AppendOnce appends a queued message. prepare saves its log ID before the
+// append, under the memory lock. A saved ID permits recovery after a stop
+// between that save and the append, without a second log entry. prepare must
+// not call Memory. The caller stops delivery after a failed append.
+func (m *Memory) AppendOnce(kind, text string, id *int, prepare func(int) error) (Message, error) {
+       m.mutex.Lock()
+       defer m.mutex.Unlock()
+
+       if id != nil && *id < m.log.Len() {
+               message, err := m.log.Message(*id)
+               if err != nil {
+                       return Message{}, fmt.Errorf("read queued message: %w", err)
+               }
+
+               if message.Kind != kind || message.Text != text {
+                       return Message{}, errors.New("queued message does not match its log entry")
+               }
+
+               return message, nil
+       }
+
+       if id != nil && *id != m.log.Len() {
+               return Message{}, errors.New("queued message is beyond the log")
+       }
+
+       err := prepare(m.log.Len())
+       if err != nil {
+               return Message{}, fmt.Errorf("prepare queued message: %w", err)
+       }
+
+       message, err := m.appendDated(kind, text, "")
+       if err != nil {
+               return Message{}, fmt.Errorf("append queued message: %w", err)
+       }
+
+       return message, nil
+}
+

 // children reads the two children of the node key.
 func (m *Memory) children(key NodeKey) (Node, Node, error) {
        var children [2]Node
 // children reads the two children of the node key.
 func (m *Memory) children(key NodeKey) (Node, Node, error) {
        var children [2]Node

+

        for n := range children {
                child, built, err := m.tree.Node(key.level-1, 2*key.index+n)
                if err != nil {
        for n := range children {
                child, built, err := m.tree.Node(key.level-1, 2*key.index+n)
                if err != nil {


@@ -194,6 +239,7 @@ func (m *Memory) children(key NodeKey) (Node, Node, error) {
 func (m *Memory) Wait(ctx context.Context) error {
        for {
                m.mutex.Lock()
 func (m *Memory) Wait(ctx context.Context) error {
        for {
                m.mutex.Lock()

+

                running := m.queue.Running()
                changed := m.changed
                m.mutex.Unlock()
                running := m.queue.Running()
                changed := m.changed
                m.mutex.Unlock()


@@ -217,6 +263,7 @@ func (m *Memory) Wait(ctx context.Context) error {
 func (m *Memory) Settle(ctx context.Context) error {
        for {
                m.mutex.Lock()
 func (m *Memory) Settle(ctx context.Context) error {
        for {
                m.mutex.Lock()

+

                pending := m.chat.Pending()
                running := m.queue.Running()
                changed := m.changed
                pending := m.chat.Pending()
                running := m.queue.Running()
                changed := m.changed


@@ -243,6 +290,26 @@ func (m *Memory) Flush(ctx context.Context) error {
        return m.syncer.Flush(ctx)
 }
 
        return m.syncer.Flush(ctx)
 }
 

+// Snapshot flushes all memory writes and runs snapshot while no append or
+// summary write can change the log, indexes, tree, or views. snapshot must not
+// call Memory.
+func (m *Memory) Snapshot(ctx context.Context, snapshot func() error) error {
+       m.mutex.Lock()
+       defer m.mutex.Unlock()
+
+       err := m.Flush(ctx)
+       if err != nil {
+               return fmt.Errorf("flush memory snapshot: %w", err)
+       }
+
+       err = snapshot()
+       if err != nil {
+               return fmt.Errorf("copy memory snapshot: %w", err)
+       }
+
+       return nil
+}
+

 // ViewLines returns the lines of the chat view, each with its newline, without
 // the leaf lines of the messages in skip.
 func (m *Memory) ViewLines(skip map[int]bool) []string {
 // ViewLines returns the lines of the chat view, each with its newline, without
 // the leaf lines of the messages in skip.
 func (m *Memory) ViewLines(skip map[int]bool) []string {


@@ -295,6 +362,7 @@ func (m *Memory) load() error {
        }
 
        var file MemoryViewFile
        }
 
        var file MemoryViewFile

+

        err = json.Unmarshal(data, &file)
        if err != nil {
                return fmt.Errorf("decode view: %w", err)
        err = json.Unmarshal(data, &file)
        if err != nil {
                return fmt.Errorf("decode view: %w", err)


@@ -342,6 +410,7 @@ func (m *Memory) restoreQueue() error {
                leaf, free := freeLeaf(message)
                if !free {
                        m.queue.AddLeaf(id)
                leaf, free := freeLeaf(message)
                if !free {
                        m.queue.AddLeaf(id)

+

                        continue
                }
 
                        continue
                }
 


@@ -410,6 +479,7 @@ func (m *Memory) dispatch() {
                }
 
                m.workers.Add(1)
                }
 
                m.workers.Add(1)

+

                go m.run(key, task)
        }
 }
                go m.run(key, task)
        }
 }


@@ -508,6 +578,7 @@ func (m *Memory) settle(key NodeKey) error {
                node, free := freeMerge(left, right)
                if !free {
                        m.queue.AddMerge(parent)
                node, free := freeMerge(left, right)
                if !free {
                        m.queue.AddMerge(parent)

+

                        return nil
                }
 
                        return nil
                }
 


@@ -536,6 +607,7 @@ func (m *Memory) task(key NodeKey) (Task, error) {
                }
 
                task.Input = []string{leafSource(message)}
                }
 
                task.Input = []string{leafSource(message)}

+               task.Images = imageFiles(message.Text)

 
                return task, nil
        }
 
                return task, nil
        }


@@ -583,13 +655,14 @@ func (m *Memory) run(key NodeKey, task Task) {
        }
 
        close(m.changed)
        }
 
        close(m.changed)

+

        m.changed = make(chan struct{})
        m.dispatch()
 }
 
 // failed logs the failed build of the node key with its cause err.
 func (m *Memory) failed(key NodeKey, err error) {
        m.changed = make(chan struct{})
        m.dispatch()
 }
 
 // failed logs the failed build of the node key with its cause err.
 func (m *Memory) failed(key NodeKey, err error) {

-       m.logger.Printf("summary failed, retry at next message: node (%d, %d): %v", key.level, key.index, err)
+       m.logger.Warn("summary failed", "level", key.level, "index", key.index, "err", err)

 }
 
 // ready tells if both children of the node key are built and the node is not.
 }
 
 // ready tells if both children of the node key are built and the node is not.


@@ -659,6 +732,7 @@ func (m *Memory) buildModelLines() ([]int, error) {
        }
 
        var sizes []int
        }
 
        var sizes []int

+

        for _, key := range keys {
                var node Node
 
        for _, key := range keys {
                var node Node
 


@@ -708,12 +782,14 @@ func (m *Memory) buildBuiltByModel(key NodeKey) (bool, error) {
 
 // Task is the build of the node (Level, Index). Context is the compaction view
 // for the build. Input holds the source "kind: text" of a leaf, or the two
 
 // Task is the build of the node (Level, Index). Context is the compaction view
 // for the build. Input holds the source "kind: text" of a leaf, or the two

-// child lines of a merge with their newlines as spaces.
+// child lines of a merge with their newlines as spaces. Images holds the leaf
+// image filenames and is empty for merges.

 type Task struct {
        Level   int
        Index   int
        Context string
        Input   []string
 type Task struct {
        Level   int
        Index   int
        Context string
        Input   []string

+       Images  []string

 }
 
 // MemoryViewFile is the content of view.json.
 }
 
 // MemoryViewFile is the content of view.json.