Add chatID to logs

Author: ibuildthecloud

pkg/monitor/display.go

@@ -131,17 +131,20 @@ func (d *display) Event(event runner.Event) {
 		d.livePrinter.end()
 		if event.ChatRequest == nil {
 			log = log.Fields(
+				"chatID", event.ChatTransactionID,
 				"response", toJSON(event.ChatResponse),
 				"cached", event.ChatResponseCached,
 			)
 		} else {
 			log.Infof("openai request sent [%s]", callName)
 			log = log.Fields(
+				"chatID", event.ChatTransactionID,
 				"request", toJSON(event.ChatRequest),
 			)
 		}
 		log.Debugf("messages")
 		currentCall.Messages = append(currentCall.Messages, message{
+			ChatID:   event.ChatTransactionID,
 			Request:  event.ChatRequest,
 			Response: event.ChatResponse,
 			Cached:   event.ChatResponseCached,
@@ -260,9 +263,10 @@ type dump struct {
 }
 
 type message struct {
-	Request  any  `json:"request,omitempty"`
-	Response any  `json:"response,omitempty"`
-	Cached   bool `json:"cached,omitempty"`
+	ChatID   string `json:"chatID,omitempty"`
+	Request  any    `json:"request,omitempty"`
+	Response any    `json:"response,omitempty"`
+	Cached   bool   `json:"cached,omitempty"`
 }
 
 type call struct {

pkg/openai/client.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"sort"
 	"strings"
+	"sync/atomic"
 
 	"github.com/acorn-io/gptscript/pkg/cache"
 	"github.com/acorn-io/gptscript/pkg/hash"
@@ -27,11 +28,14 @@ const (
 )
 
 var (
-	key = os.Getenv("OPENAI_API_KEY")
-	url = os.Getenv("OPENAI_URL")
+	key           = os.Getenv("OPENAI_API_KEY")
+	url           = os.Getenv("OPENAI_URL")
+	transactionID int64
 )
 
 type Client struct {
+	url   string
+	key   string
 	c     *openai.Client
 	cache *cache.Client
 }
@@ -107,7 +111,11 @@ func (c *Client) ListModules(ctx context.Context) (result []string, _ error) {
 }
 
 func (c *Client) cacheKey(request openai.ChatCompletionRequest) string {
-	return hash.Encode(request)
+	return hash.Encode(map[string]any{
+		"url":     c.url,
+		"key":     c.key,
+		"request": request,
+	})
 }
 
 func (c *Client) seed(request openai.ChatCompletionRequest) int {
@@ -231,11 +239,12 @@ func toMessages(ctx context.Context, cache *cache.Client, request types.Completi
 }
 
 type Status struct {
-	Request         any
-	Response        any
-	Cached          bool
-	Chunks          any
-	PartialResponse *types.CompletionMessage
+	OpenAITransactionID string
+	Request             any
+	Response            any
+	Cached              bool
+	Chunks              any
+	PartialResponse     *types.CompletionMessage
 }
 
 func (c *Client) Call(ctx context.Context, messageRequest types.CompletionRequest, status chan<- Status) (*types.CompletionMessage, error) {
@@ -281,8 +290,10 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 		}
 	}
 
+	id := fmt.Sprint(atomic.AddInt64(&transactionID, 1))
 	status <- Status{
-		Request: request,
+		OpenAITransactionID: id,
+		Request:             request,
 	}
 
 	var cacheResponse bool
@@ -291,7 +302,7 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 	if err != nil {
 		return nil, err
 	} else if !ok {
-		response, err = c.call(ctx, request, status)
+		response, err = c.call(ctx, request, id, status)
 		if err != nil {
 			return nil, err
 		}
@@ -305,9 +316,10 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 	}
 
 	status <- Status{
-		Chunks:   response,
-		Response: result,
-		Cached:   cacheResponse,
+		OpenAITransactionID: id,
+		Chunks:              response,
+		Response:            result,
+		Cached:              cacheResponse,
 	}
 
 	return &result, nil
@@ -391,7 +403,7 @@ func (c *Client) store(ctx context.Context, key string, responses []openai.ChatC
 	return c.cache.Store(ctx, key, buf.Bytes())
 }
 
-func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest, partial chan<- Status) (responses []openai.ChatCompletionStreamResponse, _ error) {
+func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest, transactionID string, partial chan<- Status) (responses []openai.ChatCompletionStreamResponse, _ error) {
 	cacheKey := c.cacheKey(request)
 	request.Stream = true
 
@@ -404,6 +416,7 @@ func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest,
 	}
 
 	partial <- Status{
+		OpenAITransactionID: transactionID,
 		PartialResponse: &types.CompletionMessage{
 			Role:    types.CompletionMessageRoleTypeAssistant,
 			Content: types.Text(msg + "Waiting for model response...\n"),
@@ -429,7 +442,8 @@ func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest,
 		if partial != nil {
 			partialMessage = appendMessage(partialMessage, response)
 			partial <- Status{
-				PartialResponse: &partialMessage,
+				OpenAITransactionID: transactionID,
+				PartialResponse:     &partialMessage,
 			}
 		}
 		responses = append(responses, response)

pkg/runner/runner.go

@@ -87,6 +87,7 @@ type Event struct {
 	CallContext        *engine.Context
 	ToolResults        int
 	Type               EventType
+	ChatTransactionID  string
 	ChatRequest        any
 	ChatResponse       any
 	ChatResponseCached bool
@@ -166,16 +167,18 @@ func streamProgress(callCtx *engine.Context, monitor Monitor) (chan openai.Statu
 		for status := range progress {
 			if message := status.PartialResponse; message != nil {
 				monitor.Event(Event{
-					Time:        time.Now(),
-					CallContext: callCtx,
-					Type:        EventTypeCallProgress,
-					Content:     message.String(),
+					Time:              time.Now(),
+					CallContext:       callCtx,
+					Type:              EventTypeCallProgress,
+					ChatTransactionID: status.OpenAITransactionID,
+					Content:           message.String(),
 				})
 			} else {
 				monitor.Event(Event{
 					Time:               time.Now(),
 					CallContext:        callCtx,
 					Type:               EventTypeChat,
+					ChatTransactionID:  status.OpenAITransactionID,
 					ChatRequest:        status.Request,
 					ChatResponse:       status.Response,
 					ChatResponseCached: status.Cached,