Rename chatID to completionID

Author: ibuildthecloud

pkg/monitor/display.go

@@ -131,23 +131,23 @@ func (d *display) Event(event runner.Event) {
 		d.livePrinter.end()
 		if event.ChatRequest == nil {
 			log = log.Fields(
-				"chatID", event.ChatTransactionID,
+				"completionID", event.ChatCompletionID,
 				"response", toJSON(event.ChatResponse),
 				"cached", event.ChatResponseCached,
 			)
 		} else {
 			log.Infof("openai request sent [%s]", callName)
 			log = log.Fields(
-				"chatID", event.ChatTransactionID,
+				"completionID", event.ChatCompletionID,
 				"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,
+			CompletionID: event.ChatCompletionID,
+			Request:      event.ChatRequest,
+			Response:     event.ChatResponse,
+			Cached:       event.ChatResponseCached,
 		})
 	case runner.EventTypeCallFinish:
 		d.livePrinter.end()
@@ -263,10 +263,10 @@ type dump struct {
 }
 
 type message struct {
-	ChatID   string `json:"chatID,omitempty"`
-	Request  any    `json:"request,omitempty"`
-	Response any    `json:"response,omitempty"`
-	Cached   bool   `json:"cached,omitempty"`
+	CompletionID string `json:"completionID,omitempty"`
+	Request      any    `json:"request,omitempty"`
+	Response     any    `json:"response,omitempty"`
+	Cached       bool   `json:"cached,omitempty"`
 }
 
 type call struct {

pkg/openai/client.go

@@ -28,9 +28,9 @@ const (
 )
 
 var (
-	key           = os.Getenv("OPENAI_API_KEY")
-	url           = os.Getenv("OPENAI_URL")
-	transactionID int64
+	key          = os.Getenv("OPENAI_API_KEY")
+	url          = os.Getenv("OPENAI_URL")
+	completionID int64
 )
 
 type Client struct {
@@ -239,12 +239,12 @@ func toMessages(ctx context.Context, cache *cache.Client, request types.Completi
 }
 
 type Status struct {
-	OpenAITransactionID string
-	Request             any
-	Response            any
-	Cached              bool
-	Chunks              any
-	PartialResponse     *types.CompletionMessage
+	CompletionID    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) {
@@ -290,10 +290,10 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 		}
 	}
 
-	id := fmt.Sprint(atomic.AddInt64(&transactionID, 1))
+	id := fmt.Sprint(atomic.AddInt64(&completionID, 1))
 	status <- Status{
-		OpenAITransactionID: id,
-		Request:             request,
+		CompletionID: id,
+		Request:      request,
 	}
 
 	var cacheResponse bool
@@ -316,10 +316,10 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 	}
 
 	status <- Status{
-		OpenAITransactionID: id,
-		Chunks:              response,
-		Response:            result,
-		Cached:              cacheResponse,
+		CompletionID: id,
+		Chunks:       response,
+		Response:     result,
+		Cached:       cacheResponse,
 	}
 
 	return &result, nil
@@ -416,7 +416,7 @@ func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest,
 	}
 
 	partial <- Status{
-		OpenAITransactionID: transactionID,
+		CompletionID: transactionID,
 		PartialResponse: &types.CompletionMessage{
 			Role:    types.CompletionMessageRoleTypeAssistant,
 			Content: types.Text(msg + "Waiting for model response...\n"),
@@ -442,8 +442,8 @@ func (c *Client) call(ctx context.Context, request openai.ChatCompletionRequest,
 		if partial != nil {
 			partialMessage = appendMessage(partialMessage, response)
 			partial <- Status{
-				OpenAITransactionID: transactionID,
-				PartialResponse:     &partialMessage,
+				CompletionID:    transactionID,
+				PartialResponse: &partialMessage,
 			}
 		}
 		responses = append(responses, response)

pkg/runner/runner.go

@@ -87,7 +87,7 @@ type Event struct {
 	CallContext        *engine.Context
 	ToolResults        int
 	Type               EventType
-	ChatTransactionID  string
+	ChatCompletionID   string
 	ChatRequest        any
 	ChatResponse       any
 	ChatResponseCached bool
@@ -167,18 +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,
-					ChatTransactionID: status.OpenAITransactionID,
-					Content:           message.String(),
+					Time:             time.Now(),
+					CallContext:      callCtx,
+					Type:             EventTypeCallProgress,
+					ChatCompletionID: status.CompletionID,
+					Content:          message.String(),
 				})
 			} else {
 				monitor.Event(Event{
 					Time:               time.Now(),
 					CallContext:        callCtx,
 					Type:               EventTypeChat,
-					ChatTransactionID:  status.OpenAITransactionID,
+					ChatCompletionID:   status.CompletionID,
 					ChatRequest:        status.Request,
 					ChatResponse:       status.Response,
 					ChatResponseCached: status.Cached,