lisone/ds2api
1
0
Fork 0
mirror of https://github.com/CJackHwang/ds2api.git synced 2026-05-21 16:37:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: preserve full prompt text across current_input_file rewrites

Browse Source 
Keep token accounting tied to the original prompt even after the live prompt is replaced with a neutral placeholder and hidden context file.
This commit is contained in:
shern-point
2026-04-30 00:45:01 +08:00
parent 8ab028c52a
commit b96f736bd2
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/httpapi/openai/history/current_input_file.go
View File

@@ -35,6 +35,10 @@ func (s Service) ApplyCurrentInputFile(ctx context.Context, a *auth.RequestAuth,
if strings.TrimSpace(fileText) == "" { if strings.TrimSpace(fileText) == "" {
return stdReq, errors.New("current user input file produced empty transcript") return stdReq, errors.New("current user input file produced empty transcript")
} }
originalPromptTokenText := strings.TrimSpace(stdReq.PromptTokenText)
if originalPromptTokenText == "" {
originalPromptTokenText = strings.TrimSpace(stdReq.FinalPrompt)
}
result, err := s.DS.UploadFile(ctx, a, dsclient.UploadFileRequest{ result, err := s.DS.UploadFile(ctx, a, dsclient.UploadFileRequest{
Filename: currentInputFilename, Filename: currentInputFilename,
@@ -61,6 +65,7 @@ func (s Service) ApplyCurrentInputFile(ctx context.Context, a *auth.RequestAuth,
stdReq.CurrentInputFileApplied = true stdReq.CurrentInputFileApplied = true
stdReq.RefFileIDs = prependUniqueRefFileID(stdReq.RefFileIDs, fileID) stdReq.RefFileIDs = prependUniqueRefFileID(stdReq.RefFileIDs, fileID)
stdReq.FinalPrompt, stdReq.ToolNames = promptcompat.BuildOpenAIPrompt(messages, stdReq.ToolsRaw, "", stdReq.ToolChoice, stdReq.Thinking) stdReq.FinalPrompt, stdReq.ToolNames = promptcompat.BuildOpenAIPrompt(messages, stdReq.ToolsRaw, "", stdReq.ToolChoice, stdReq.Thinking)
stdReq.PromptTokenText = originalPromptTokenText
return stdReq, nil return stdReq, nil
} }