Skip to content

refactor: update MessageId handling to remove prefix #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Junyi-99 merged 1 commit into from
Jan 26, 2026
Merged

refactor: update MessageId handling to remove prefix #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/services/toolkit/client/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func appendAssistantTextResponse(openaiChatHistory *responses.ResponseNewParamsI
}
openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, response)
*inappChatHistory = append(*inappChatHistory, chatv1.Message{
MessageId: "openai_" + item.ID,
MessageId: item.ID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_Assistant{
Assistant: &chatv1.MessageTypeAssistant{
Expand Down
3 changes: 1 addition & 2 deletions internal/services/toolkit/client/utils_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ It is used to append assistant responses to both OpenAI and in-app chat historie
*/
import (
"context"
"fmt"
"paperdebugger/internal/libs/cfg"
"paperdebugger/internal/libs/db"
"paperdebugger/internal/libs/logger"
Expand Down Expand Up @@ -39,7 +38,7 @@ func appendAssistantTextResponseV2(openaiChatHistory *OpenAIChatHistory, inappCh
})

*inappChatHistory = append(*inappChatHistory, chatv2.Message{
MessageId: fmt.Sprintf("openai_%s", contentId),
MessageId: contentId,
Payload: &chatv2.MessagePayload{
MessageType: &chatv2.MessagePayload_Assistant{
Assistant: &chatv2.MessageTypeAssistant{
Expand Down
16 changes: 8 additions & 8 deletions internal/services/toolkit/handler/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (h *StreamHandlerV1) HandleAddedItem(chunk responses.ResponseStreamEventUni
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
StreamPartBegin: &chatv1.StreamPartBegin{
MessageId: "openai_" + chunk.Item.ID,
MessageId: chunk.Item.ID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_Assistant{
Assistant: &chatv1.MessageTypeAssistant{},
Expand All @@ -77,7 +77,7 @@ func (h *StreamHandlerV1) HandleAddedItem(chunk responses.ResponseStreamEventUni
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
StreamPartBegin: &chatv1.StreamPartBegin{
MessageId: "openai_" + chunk.Item.ID,
MessageId: chunk.Item.ID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_ToolCallPrepareArguments{
ToolCallPrepareArguments: &chatv1.MessageTypeToolCallPrepareArguments{
Expand All @@ -101,7 +101,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
StreamPartEnd: &chatv1.StreamPartEnd{
MessageId: "openai_" + item.ID,
MessageId: item.ID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_Assistant{
Assistant: &chatv1.MessageTypeAssistant{
Expand All @@ -116,7 +116,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
StreamPartEnd: &chatv1.StreamPartEnd{
MessageId: "openai_" + item.ID,
MessageId: item.ID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_ToolCallPrepareArguments{
ToolCallPrepareArguments: &chatv1.MessageTypeToolCallPrepareArguments{
Expand All @@ -132,7 +132,7 @@ func (h *StreamHandlerV1) HandleDoneItem(chunk responses.ResponseStreamEventUnio
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
StreamPartEnd: &chatv1.StreamPartEnd{
MessageId: "openai_" + item.ID,
MessageId: item.ID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_Unknown{
Unknown: &chatv1.MessageTypeUnknown{
Expand All @@ -153,7 +153,7 @@ func (h *StreamHandlerV1) HandleTextDelta(chunk responses.ResponseStreamEventUni
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_MessageChunk{
MessageChunk: &chatv1.MessageChunk{
MessageId: "openai_" + chunk.ItemID,
MessageId: chunk.ItemID,
Delta: chunk.Delta,
},
},
Expand Down Expand Up @@ -194,7 +194,7 @@ func (h *StreamHandlerV1) SendToolCallBegin(toolCall responses.ResponseFunctionT
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartBegin{
StreamPartBegin: &chatv1.StreamPartBegin{
MessageId: "openai_" + toolCall.CallID,
MessageId: toolCall.CallID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_ToolCall{
ToolCall: &chatv1.MessageTypeToolCall{
Expand All @@ -215,7 +215,7 @@ func (h *StreamHandlerV1) SendToolCallEnd(toolCall responses.ResponseFunctionToo
h.callbackStream.Send(&chatv1.CreateConversationMessageStreamResponse{
ResponsePayload: &chatv1.CreateConversationMessageStreamResponse_StreamPartEnd{
StreamPartEnd: &chatv1.StreamPartEnd{
MessageId: "openai_" + toolCall.CallID,
MessageId: toolCall.CallID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_ToolCall{
ToolCall: &chatv1.MessageTypeToolCall{
Expand Down
4 changes: 2 additions & 2 deletions internal/services/toolkit/handler/toolcall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (h *ToolCallHandler) HandleToolCalls(ctx context.Context, outputs []respons
// If there was an error, append an error output to OpenAI chat history and in-app chat history.
openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, responses.ResponseInputItemParamOfFunctionCallOutput(toolCall.CallID, "Error: "+err.Error()))
inappChatHistory = append(inappChatHistory, chatv1.Message{
MessageId: "openai_" + toolCall.CallID,
MessageId: toolCall.CallID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_ToolCall{
ToolCall: &chatv1.MessageTypeToolCall{
Expand All @@ -83,7 +83,7 @@ func (h *ToolCallHandler) HandleToolCalls(ctx context.Context, outputs []respons
// On success, append the result to both OpenAI and in-app chat histories.
openaiChatHistory.OfInputItemList = append(openaiChatHistory.OfInputItemList, responses.ResponseInputItemParamOfFunctionCallOutput(toolCall.CallID, result))
inappChatHistory = append(inappChatHistory, chatv1.Message{
MessageId: "openai_" + toolCall.CallID,
MessageId: toolCall.CallID,
Payload: &chatv1.MessagePayload{
MessageType: &chatv1.MessagePayload_ToolCall{
ToolCall: &chatv1.MessageTypeToolCall{
Expand Down