chore: make context counters start with time.Now(), not 0

Author: ibuildthecloud

pkg/counter/counter.go

@@ -0,0 +1,17 @@
+package counter
+
+import (
+	"fmt"
+	"sync/atomic"
+	"time"
+)
+
+var counter = int32(time.Now().Unix())
+
+func Reset(i int32) {
+	atomic.StoreInt32(&counter, i)
+}
+
+func Next() string {
+	return fmt.Sprint(atomic.AddInt32(&counter, 1))
+}

pkg/engine/cmd.go

@@ -12,17 +12,17 @@ import (
 	"runtime"
 	"sort"
 	"strings"
-	"sync/atomic"
 
 	"github.com/google/shlex"
 	context2 "github.com/gptscript-ai/gptscript/pkg/context"
+	"github.com/gptscript-ai/gptscript/pkg/counter"
 	"github.com/gptscript-ai/gptscript/pkg/env"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 	"github.com/gptscript-ai/gptscript/pkg/version"
 )
 
 func (e *Engine) runCommand(ctx context.Context, tool types.Tool, input string, toolCategory ToolCategory) (cmdOut string, cmdErr error) {
-	id := fmt.Sprint(atomic.AddInt64(&completionID, 1))
+	id := counter.Next()
 
 	defer func() {
 		e.Progress <- types.CompletionStatus{

pkg/engine/engine.go

@@ -6,15 +6,13 @@ import (
 	"fmt"
 	"strings"
 	"sync"
-	"sync/atomic"
 
+	"github.com/gptscript-ai/gptscript/pkg/counter"
 	"github.com/gptscript-ai/gptscript/pkg/system"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 	"github.com/gptscript-ai/gptscript/pkg/version"
 )
 
-var completionID int64
-
 type Model interface {
 	Call(ctx context.Context, messageRequest types.CompletionRequest, status chan<- types.CompletionStatus) (*types.CompletionMessage, error)
 }
@@ -123,12 +121,10 @@ func (c *Context) MarshalJSON() ([]byte, error) {
 	return json.Marshal(c.GetCallContext())
 }
 
-var execID int32
-
 func NewContext(ctx context.Context, prg *types.Program) Context {
 	callCtx := Context{
 		commonContext: commonContext{
-			ID:   fmt.Sprint(atomic.AddInt32(&execID, 1)),
+			ID:   counter.Next(),
 			Tool: prg.ToolSet[prg.EntryToolID],
 		},
 		Ctx:     ctx,
@@ -144,7 +140,7 @@ func (c *Context) SubCall(ctx context.Context, toolID, callID string, toolCatego
 	}
 
 	if callID == "" {
-		callID = fmt.Sprint(atomic.AddInt32(&execID, 1))
+		callID = counter.Next()
 	}
 
 	return Context{

pkg/engine/print.go

@@ -1,15 +1,14 @@
 package engine
 
 import (
-	"fmt"
 	"strings"
-	"sync/atomic"
 
+	"github.com/gptscript-ai/gptscript/pkg/counter"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 )
 
 func (e *Engine) runEcho(tool types.Tool) (cmdOut *Return, cmdErr error) {
-	id := fmt.Sprint(atomic.AddInt64(&completionID, 1))
+	id := counter.Next()
 	out := strings.TrimPrefix(tool.Instructions, types.EchoPrefix+"\n")
 
 	e.Progress <- types.CompletionStatus{

pkg/monitor/display.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
+	"github.com/gptscript-ai/gptscript/pkg/counter"
 	"github.com/gptscript-ai/gptscript/pkg/engine"
 	"github.com/gptscript-ai/gptscript/pkg/runner"
 	"github.com/gptscript-ai/gptscript/pkg/types"
@@ -40,12 +41,11 @@ type Console struct {
 }
 
 var (
-	runID           int64
 	prettyIDCounter int64
 )
 
 func (c *Console) Start(_ context.Context, prg *types.Program, _ []string, input string) (runner.Monitor, error) {
-	id := atomic.AddInt64(&runID, 1)
+	id := counter.Next()
 	mon := newDisplay(c.dumpState, c.displayProgress, c.printMessages)
 	mon.dump.ID = fmt.Sprint(id)
 	mon.dump.Program = prg

pkg/openai/client.go

@@ -9,11 +9,11 @@ import (
 	"slices"
 	"sort"
 	"strings"
-	"sync/atomic"
 
 	"github.com/getkin/kin-openapi/openapi3"
 	openai "github.com/gptscript-ai/chat-completion-client"
 	"github.com/gptscript-ai/gptscript/pkg/cache"
+	"github.com/gptscript-ai/gptscript/pkg/counter"
 	"github.com/gptscript-ai/gptscript/pkg/hash"
 	"github.com/gptscript-ai/gptscript/pkg/system"
 	"github.com/gptscript-ai/gptscript/pkg/types"
@@ -24,10 +24,9 @@ const (
 )
 
 var (
-	key          = os.Getenv("OPENAI_API_KEY")
-	url          = os.Getenv("OPENAI_URL")
-	azureModel   = os.Getenv("OPENAI_AZURE_DEPLOYMENT")
-	completionID int64
+	key        = os.Getenv("OPENAI_API_KEY")
+	url        = os.Getenv("OPENAI_URL")
+	azureModel = os.Getenv("OPENAI_AZURE_DEPLOYMENT")
 )
 
 type Client struct {
@@ -332,7 +331,7 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 		})
 	}
 
-	id := fmt.Sprint(atomic.AddInt64(&completionID, 1))
+	id := counter.Next()
 	status <- types.CompletionStatus{
 		CompletionID: id,
 		Request:      request,