Skip to content

Commit 8fcf6d2

Browse files
StrongMonkeyStrongMonkey
committed
Chore: Add ability to save state message from each gptscript call
Signed-off-by: Daishan Peng <[email protected]>
1 parent 969450b commit 8fcf6d2

File tree

5 files changed

+60
-0
lines changed

5 files changed

+60
-0
lines changed

‎go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ require (
1818
github.com/stretchr/testify v1.8.4
1919
golang.org/x/sync v0.6.0
2020
golang.org/x/term v0.16.0
21+
google.golang.org/appengine v1.6.7
2122
)
2223

2324
require (
@@ -26,6 +27,7 @@ require (
2627
github.com/davecgh/go-spew v1.1.1 // indirect
2728
github.com/fatih/color v1.16.0 // indirect
2829
github.com/go-logr/logr v1.4.1 // indirect
30+
github.com/golang/protobuf v1.5.3 // indirect
2931
github.com/google/go-cmp v0.6.0 // indirect
3032
github.com/google/go-containerregistry v0.16.1 // indirect
3133
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
@@ -50,6 +52,7 @@ require (
5052
golang.org/x/net v0.20.0 // indirect
5153
golang.org/x/sys v0.16.0 // indirect
5254
golang.org/x/tools v0.17.0 // indirect
55+
google.golang.org/protobuf v1.31.0 // indirect
5356
gopkg.in/yaml.v3 v3.0.1 // indirect
5457
k8s.io/klog/v2 v2.110.1 // indirect
5558
mvdan.cc/gofumpt v0.6.0 // indirect

‎go.sum

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
2626
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2727
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
2828
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
29+
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
30+
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
31+
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
32+
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
2933
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
34+
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
3035
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
3136
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
3237
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -118,6 +123,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
118123
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
119124
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
120125
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
126+
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
121127
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
122128
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
123129
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -152,6 +158,7 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
152158
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
153159
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
154160
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
161+
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
155162
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
156163
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
157164
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
@@ -165,6 +172,12 @@ golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
165172
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
166173
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
167174
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
175+
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
176+
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
177+
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
178+
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
179+
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
180+
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
168181
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
169182
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
170183
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎pkg/runner/runner.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@ package runner
22

33
import (
44
"context"
5+
"encoding/json"
6+
"fmt"
7+
"os"
8+
"path/filepath"
59
"sync"
610
"time"
711

812
"github.com/gptscript-ai/gptscript/pkg/engine"
913
"github.com/gptscript-ai/gptscript/pkg/types"
1014
"golang.org/x/sync/errgroup"
15+
"google.golang.org/appengine/log"
1116
)
1217

1318
type MonitorFactory interface {
@@ -115,6 +120,9 @@ func (r *Runner) call(callCtx engine.Context, monitor Monitor, env []string, inp
115120
Type: EventTypeCallFinish,
116121
Content: *result.Result,
117122
})
123+
if err := recordStateMessage(result.State); err != nil {
124+
log.Warningf(callCtx.Ctx, "Failed to record state message: %v", err)
125+
}
118126
return *result.Result, nil
119127
}
120128

@@ -218,3 +226,24 @@ func (r *Runner) subCalls(callCtx engine.Context, monitor Monitor, env []string,
218226

219227
return
220228
}
229+
230+
// recordStateMessage record the final state of the openai request and fetch messages and tools for analysis purpose
231+
// The name follows `gptscript-state-${hostname}-${unixtimestamp}`
232+
func recordStateMessage(state *engine.State) error {
233+
if state == nil {
234+
return nil
235+
}
236+
tmpdir := os.TempDir()
237+
data, err := json.Marshal(state)
238+
if err != nil {
239+
return err
240+
}
241+
242+
hostname, err := os.Hostname()
243+
if err != nil {
244+
return err
245+
}
246+
247+
filename := filepath.Join(tmpdir, fmt.Sprintf("gptscript-state-%v-%v", hostname, time.Now().Unix()))
248+
return os.WriteFile(filename, data, 0444)
249+
}

‎scripts/upload-s3.gpt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Tools: sys.exec, upload-s3
2+
3+
Find all files starts with `gptscript-state` in $TMPDIR, and upload the file to s3 bucket `gptscript-state`. Only find file from top-level folder.
4+
Use filename to identify the file that is only uploaded within last week.
5+
6+
---
7+
name: upload-s3
8+
description: upload all the file to s3 bucket
9+
args: input: args to provide for aws s3 command
10+
11+
aws s3 ${input}
12+

‎scripts/upload-s3.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
find $TMPDIR -maxdepth 1 -type f -name 'gptscript-state*' -mtime -7 | xargs -I{} aws s3 cp {} s3://gptscript-state/

0 commit comments

Comments
 (0)