mirror of
https://github.com/alibaba/open-code-review.git
synced 2026-07-09 17:28:58 +00:00
f363702a15
Re-location LLM calls were invisible in session history and their token
consumption was unaccounted for. Refactor the code_comment handling path
to record re-location requests/responses into session JSONL, accumulate
token usage into global counters, and display them in the viewer.
Also fixes: async context cancellation risk (WithoutCancel), duplicate
telemetry recording, missing timeout enforcement, missing {existing_code}
placeholder in the re-location prompt, and renames Parse to ParseComments
for clarity.
91 lines
2.6 KiB
Go
91 lines
2.6 KiB
Go
package diff
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/open-code-review/open-code-review/internal/config/template"
|
|
"github.com/open-code-review/open-code-review/internal/llm"
|
|
"github.com/open-code-review/open-code-review/internal/model"
|
|
"github.com/open-code-review/open-code-review/internal/stdout"
|
|
)
|
|
|
|
// ReLocateComment calls the LLM to regenerate a precise existing_code snippet
|
|
// when text-based matching fails, then retries ResolveComment with the new snippet.
|
|
// Returns (success, response, requestMessages) so the caller can record session
|
|
// history and track token usage. Response and messages are nil on early exits.
|
|
func ReLocateComment(
|
|
ctx context.Context,
|
|
cm *model.LlmComment,
|
|
d *model.Diff,
|
|
client llm.LLMClient,
|
|
task *template.LlmConversation,
|
|
modelName string,
|
|
maxTokens int,
|
|
) (bool, *llm.ChatResponse, []llm.Message) {
|
|
if task == nil || len(task.Messages) == 0 {
|
|
return false, nil, nil
|
|
}
|
|
|
|
if task.Timeout > 0 {
|
|
var cancel context.CancelFunc
|
|
ctx, cancel = context.WithTimeout(ctx, time.Duration(task.Timeout)*time.Second)
|
|
defer cancel()
|
|
}
|
|
|
|
messages := make([]llm.Message, 0, len(task.Messages))
|
|
for _, m := range task.Messages {
|
|
content := m.Content
|
|
content = strings.ReplaceAll(content, "{diff}", d.Diff)
|
|
content = strings.ReplaceAll(content, "{existing_code}", cm.ExistingCode)
|
|
content = strings.ReplaceAll(content, "{suggestion_content}", cm.Content)
|
|
messages = append(messages, llm.NewTextMessage(m.Role, content))
|
|
}
|
|
|
|
resp, err := client.CompletionsWithCtx(ctx, llm.ChatRequest{
|
|
Model: modelName,
|
|
Messages: messages,
|
|
MaxTokens: maxTokens,
|
|
})
|
|
if err != nil {
|
|
fmt.Fprintf(stdout.Writer(), "[ocr] Re-location LLM call failed for %s: %v\n", cm.Path, err)
|
|
return false, nil, messages
|
|
}
|
|
|
|
code := extractCodeBlock(resp.Content())
|
|
if code == "" {
|
|
return false, resp, messages
|
|
}
|
|
|
|
original := cm.ExistingCode
|
|
cm.ExistingCode = code
|
|
if ResolveComment(cm, d) {
|
|
return true, resp, messages
|
|
}
|
|
cm.ExistingCode = original
|
|
return false, resp, messages
|
|
}
|
|
|
|
// extractCodeBlock extracts the content of the first fenced code block from text.
|
|
// Returns empty string if no code block is found.
|
|
func extractCodeBlock(text string) string {
|
|
text = strings.TrimSpace(text)
|
|
start := strings.Index(text, "```")
|
|
if start < 0 {
|
|
return ""
|
|
}
|
|
afterOpen := start + 3
|
|
// Skip optional language tag on the opening fence line.
|
|
if nl := strings.IndexByte(text[afterOpen:], '\n'); nl >= 0 {
|
|
afterOpen += nl + 1
|
|
} else {
|
|
return ""
|
|
}
|
|
end := strings.Index(text[afterOpen:], "```")
|
|
if end < 0 {
|
|
return ""
|
|
}
|
|
return strings.TrimSpace(text[afterOpen : afterOpen+end])
|
|
}
|