Skip to content

Commit 894532a

Browse files
Junyi-99Junyi-99
authored
refactor: update MessageId handling to remove prefix (#105)
1 parent d9dbc20 commit 894532a

4 files changed

Lines changed: 12 additions & 13 deletions

File tree

‎internal/services/toolkit/client/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func appendAssistantTextResponse(openaiChatHistory *responses.ResponseNewParamsI
3535
}
3636
openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, response)
3737
*inappChatHistory = append(*inappChatHistory, chatv1.Message{
38-
MessageId: "openai_" + item.ID,
38+
MessageId: item.ID,
3939
Payload: &chatv1.MessagePayload{
4040
MessageType: &chatv1.MessagePayload_Assistant{
4141
Assistant: &chatv1.MessageTypeAssistant{

‎internal/services/toolkit/client/utils_v2.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ It is used to append assistant responses to both OpenAI and in-app chat historie
77
*/
88
import (
99
"context"
10-
"fmt"
1110
"paperdebugger/internal/libs/cfg"
1211
"paperdebugger/internal/libs/db"
1312
"paperdebugger/internal/libs/logger"
@@ -39,7 +38,7 @@ func appendAssistantTextResponseV2(openaiChatHistory *OpenAIChatHistory, inappCh
3938
})
4039

4140
*inappChatHistory = append(*inappChatHistory, chatv2.Message{
42-
MessageId: fmt.Sprintf("openai_%s", contentId),
41+
MessageId: contentId,
4342
Payload: &chatv2.MessagePayload{
4443
MessageType: &chatv2.MessagePayload_Assistant{
4544
Assistant: &chatv2.MessageTypeAssistant{

‎internal/services/toolkit/handler/stream.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (h *StreamHandlerV1) HandleAddedItem(chunk responses.ResponseStreamEventUni
6464
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
6565
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
6666
StreamPartBegin: &chatv1.StreamPartBegin{
67-
MessageId: "openai_" + chunk.Item.ID,
67+
MessageId: chunk.Item.ID,
6868
Payload: &chatv1.MessagePayload{
6969
MessageType: &chatv1.MessagePayload_Assistant{
7070
Assistant: &chatv1.MessageTypeAssistant{},
@@ -77,7 +77,7 @@ func (h *StreamHandlerV1) HandleAddedItem(chunk responses.ResponseStreamEventUni
7777
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
7878
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
7979
StreamPartBegin: &chatv1.StreamPartBegin{
80-
MessageId: "openai_" + chunk.Item.ID,
80+
MessageId: chunk.Item.ID,
8181
Payload: &chatv1.MessagePayload{
8282
MessageType: &chatv1.MessagePayload_ToolCallPrepareArguments{
8383
ToolCallPrepareArguments: &chatv1.MessageTypeToolCallPrepareArguments{
@@ -101,7 +101,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
101101
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
102102
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
103103
StreamPartEnd: &chatv1.StreamPartEnd{
104-
MessageId: "openai_" + item.ID,
104+
MessageId: item.ID,
105105
Payload: &chatv1.MessagePayload{
106106
MessageType: &chatv1.MessagePayload_Assistant{
107107
Assistant: &chatv1.MessageTypeAssistant{
@@ -116,7 +116,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
116116
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
117117
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
118118
StreamPartEnd: &chatv1.StreamPartEnd{
119-
MessageId: "openai_" + item.ID,
119+
MessageId: item.ID,
120120
Payload: &chatv1.MessagePayload{
121121
MessageType: &chatv1.MessagePayload_ToolCallPrepareArguments{
122122
ToolCallPrepareArguments: &chatv1.MessageTypeToolCallPrepareArguments{
@@ -132,7 +132,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
132132
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
133133
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
134134
StreamPartEnd: &chatv1.StreamPartEnd{
135-
MessageId: "openai_" + item.ID,
135+
MessageId: item.ID,
136136
Payload: &chatv1.MessagePayload{
137137
MessageType: &chatv1.MessagePayload_Unknown{
138138
Unknown: &chatv1.MessageTypeUnknown{
@@ -153,7 +153,7 @@ func (h *StreamHandlerV1) HandleTextDelta(chunk responses.ResponseStreamEventUni
153153
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
154154
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_MessageChunk{
155155
MessageChunk: &chatv1.MessageChunk{
156-
MessageId: "openai_" + chunk.ItemID,
156+
MessageId: chunk.ItemID,
157157
Delta: chunk.Delta,
158158
},
159159
},
@@ -194,7 +194,7 @@ func (h *StreamHandlerV1) SendToolCallBegin(toolCall responses.ResponseFunctionT
194194
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
195195
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
196196
StreamPartBegin: &chatv1.StreamPartBegin{
197-
MessageId: "openai_" + toolCall.CallID,
197+
MessageId: toolCall.CallID,
198198
Payload: &chatv1.MessagePayload{
199199
MessageType: &chatv1.MessagePayload_ToolCall{
200200
ToolCall: &chatv1.MessageTypeToolCall{
@@ -215,7 +215,7 @@ func (h *StreamHandlerV1) SendToolCallEnd(toolCall responses.ResponseFunctionToo
215215
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
216216
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
217217
StreamPartEnd: &chatv1.StreamPartEnd{
218-
MessageId: "openai_" + toolCall.CallID,
218+
MessageId: toolCall.CallID,
219219
Payload: &chatv1.MessagePayload{
220220
MessageType: &chatv1.MessagePayload_ToolCall{
221221
ToolCall: &chatv1.MessageTypeToolCall{

‎internal/services/toolkit/handler/toolcall.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (h *ToolCallHandler) HandleToolCalls(ctx context.Context, outputs []respons
6868
// If there was an error, append an error output to OpenAI chat history and in-app chat history.
6969
openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, responses.ResponseInputItemParamOfFunctionCallOutput(toolCall.CallID, "Error: "+err.Error()))
7070
inappChatHistory = append(inappChatHistory, chatv1.Message{
71-
MessageId: "openai_" + toolCall.CallID,
71+
MessageId: toolCall.CallID,
7272
Payload: &chatv1.MessagePayload{
7373
MessageType: &chatv1.MessagePayload_ToolCall{
7474
ToolCall: &chatv1.MessageTypeToolCall{
@@ -83,7 +83,7 @@ func (h *ToolCallHandler) HandleToolCalls(ctx context.Context, outputs []respons
8383
// On success, append the result to both OpenAI and in-app chat histories.
8484
openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, responses.ResponseInputItemParamOfFunctionCallOutput(toolCall.CallID, result))
8585
inappChatHistory = append(inappChatHistory, chatv1.Message{
86-
MessageId: "openai_" + toolCall.CallID,
86+
MessageId: toolCall.CallID,
8787
Payload: &chatv1.MessagePayload{
8888
MessageType: &chatv1.MessagePayload_ToolCall{
8989
ToolCall: &chatv1.MessageTypeToolCall{

0 commit comments

Comments
 (0)