Require consent and review for autosquash

[onechat] / view_layout.go

diff --git a/view_layout.go b/view_layout.go
index 0d4e7560581a5d554932bf46280f344aa5b0d75b..a88c8fdb1bdf0c2f7f3accce0de78948936e6fd0 100644 (file)
--- a/view_layout.go
+++ b/view_layout.go
@@ -14,6 +14,30 @@ import (
 // agent.
 const viewLayoutFileName = "layout.json"
 
 // agent.
 const viewLayoutFileName = "layout.json"
 

+// ViewLayout splits the view of a turn request into user messages that only
+// grow between batches. The view goes out as the same messages as in the
+// request before, while their lines give the same text, and the new lines
+// follow as one new message. So the end of the view of each earlier turn stays
+// a message end. Stable message boundaries let the model reuse the unchanged
+// view prefix from its prompt cache instead of invalidating it when new lines
+// arrive.
+//
+// The first message starts with "<chat>\n". The closing tag goes into the state
+// message after the view, so that no view message changes when lines come. The
+// layout keeps the line count and a hash of the text of each message in
+// layout.json, so it outlives a restart.
+type ViewLayout struct {
+       path     string
+       Messages []ViewLayoutMessage `json:"messages"`
+}
+
+// ViewLayoutMessage is one view message: its number of lines and the hash of
+// its text.
+type ViewLayoutMessage struct {
+       Lines int    `json:"lines"`
+       Hash  string `json:"hash"`
+}
+

 // loadViewLayout reads the layout at path. A missing file gives an empty
 // layout.
 func loadViewLayout(path string) (*ViewLayout, error) {
 // loadViewLayout reads the layout at path. A missing file gives an empty
 // layout.
 func loadViewLayout(path string) (*ViewLayout, error) {


@@ -38,29 +62,15 @@ func loadViewLayout(path string) (*ViewLayout, error) {
        return layout, nil
 }
 
        return layout, nil
 }
 

-// ViewLayout splits the view of a turn request into user messages that only
-// grow between batches. The view goes out as the same messages as in the
-// request before, while their lines give the same text, and the new lines
-// follow as one new message. So the end of the view of each earlier turn stays
-// a message end. On the ChatGPT backend, the first request of a turn with this
-// layout read the view of the turn before from the prompt cache in each of 10
-// turns, and with the view in one message it missed once in 5.
-//
-// The first message starts with "<chat>\n". The closing tag goes into the
-// state message after the view, so that no view message changes when lines
-// come. The layout keeps the line count and a hash of the text of each message
-// in layout.json, so it outlives a restart.
-type ViewLayout struct {
-       path     string
-       Messages []ViewLayoutMessage `json:"messages"`
-}
-

 // Split returns the view messages for lines and saves the layout. It keeps the
 // Split returns the view messages for lines and saves the layout. It keeps the

-// earlier messages up to the first one whose text differs, and puts the rest
-// of the lines into one new message.
+// earlier messages up to the first one whose text differs, and puts the rest of
+// the lines into one new message.

 func (l *ViewLayout) Split(lines []string) ([]string, error) {
 func (l *ViewLayout) Split(lines []string) ([]string, error) {

-       var texts []string
-       var kept []ViewLayoutMessage
+       var (
+               texts []string
+               kept  []ViewLayoutMessage
+       )
+

        start := 0
        for _, message := range l.Messages {
                if start+message.Lines > len(lines) {
        start := 0
        for _, message := range l.Messages {
                if start+message.Lines > len(lines) {


@@ -100,13 +110,6 @@ func (l *ViewLayout) Split(lines []string) ([]string, error) {
        return texts, nil
 }
 
        return texts, nil
 }
 

-// ViewLayoutMessage is one view message: its number of lines and the hash of
-// its text.
-type ViewLayoutMessage struct {
-       Lines int    `json:"lines"`
-       Hash  string `json:"hash"`
-}
-

 // viewMessage returns the text of a view message with lines. The first one
 // opens the chat.
 func viewMessage(first bool, lines []string) string {
 // viewMessage returns the text of a view message with lines. The first one
 // opens the chat.
 func viewMessage(first bool, lines []string) string {