feat: 并发文件审查，可配置并行度
This commit is contained in:
+5
-2
@@ -39,9 +39,12 @@ func (h *PageHandler) Generate(c *gin.Context) {
|
||||
func (h *PageHandler) Review(c *gin.Context) {
|
||||
topN := "20"
|
||||
h.db.QueryRow(`SELECT value FROM settings WHERE key = 'review.top_n'`).Scan(&topN)
|
||||
concurrency := "5"
|
||||
h.db.QueryRow(`SELECT value FROM settings WHERE key = 'review.concurrency'`).Scan(&concurrency)
|
||||
c.HTML(http.StatusOK, "pages/review.html", gin.H{
|
||||
"ID": c.Param("id"),
|
||||
"TopN": topN,
|
||||
"ID": c.Param("id"),
|
||||
"TopN": topN,
|
||||
"Concurrency": concurrency,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
+19
-4
@@ -38,9 +38,10 @@ func (h *ReviewHandler) Review(c *gin.Context) {
|
||||
|
||||
// Parse request
|
||||
var req struct {
|
||||
Base string `json:"base" binding:"required"`
|
||||
Head string `json:"head" binding:"required"`
|
||||
TopN *int `json:"top_n"`
|
||||
Base string `json:"base" binding:"required"`
|
||||
Head string `json:"head" binding:"required"`
|
||||
TopN *int `json:"top_n"`
|
||||
Concurrency *int `json:"concurrency"`
|
||||
}
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "base and head are required"})
|
||||
@@ -61,6 +62,20 @@ func (h *ReviewHandler) Review(c *gin.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
// Determine concurrency: request value > settings default (5)
|
||||
concurrency := 5
|
||||
if req.Concurrency != nil {
|
||||
concurrency = *req.Concurrency
|
||||
} else {
|
||||
var concStr string
|
||||
h.db.QueryRow(`SELECT value FROM settings WHERE key = 'review.concurrency'`).Scan(&concStr)
|
||||
if concStr != "" {
|
||||
if n, err := strconv.Atoi(concStr); err == nil && n > 0 {
|
||||
concurrency = n
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Set SSE headers
|
||||
c.Header("Content-Type", "text/event-stream")
|
||||
c.Header("Cache-Control", "no-cache")
|
||||
@@ -84,7 +99,7 @@ func (h *ReviewHandler) Review(c *gin.Context) {
|
||||
h.db.Exec(`UPDATE repositories SET last_used = datetime('now') WHERE id = ?`, id)
|
||||
|
||||
// Run AI review
|
||||
reviewResult, err := services.GenerateReview(h.db, localPath, req.Base, req.Head, topN, sendEvent)
|
||||
reviewResult, err := services.GenerateReview(h.db, localPath, req.Base, req.Head, topN, concurrency, sendEvent)
|
||||
if err != nil {
|
||||
sendEvent("error", map[string]interface{}{"message": err.Error()})
|
||||
return
|
||||
|
||||
@@ -5,6 +5,7 @@ var DefaultSettings = map[string]string{
|
||||
"llm.api_key": "",
|
||||
"llm.model": "gpt-4o",
|
||||
"review.top_n": "20",
|
||||
"review.concurrency": "5",
|
||||
"cache.max_age_days": "7",
|
||||
"cache.max_size_mb": "5000",
|
||||
}
|
||||
|
||||
+116
-92
@@ -6,6 +6,7 @@ import (
|
||||
"fmt"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
goopenai "github.com/sashabaranov/go-openai"
|
||||
)
|
||||
@@ -57,7 +58,7 @@ func countDiffLines(patch string) int {
|
||||
// GenerateReview performs AI code review on diff files with Top-N strategy.
|
||||
// It streams events (file_start, suggestion, file_end, summary, done) via callback
|
||||
// and returns the complete ReviewResult for persistence.
|
||||
func GenerateReview(db *sql.DB, repoPath, base, head string, topN int, callback StreamCallback) (*ReviewResult, error) {
|
||||
func GenerateReview(db *sql.DB, repoPath, base, head string, topN, concurrency int, callback StreamCallback) (*ReviewResult, error) {
|
||||
// Read LLM config
|
||||
config, err := GetLLMConfig(db)
|
||||
if err != nil {
|
||||
@@ -107,27 +108,51 @@ func GenerateReview(db *sql.DB, repoPath, base, head string, topN int, callback
|
||||
})
|
||||
}
|
||||
|
||||
// Review each file
|
||||
var fileReviews []FileReview
|
||||
// Review each file concurrently (max 5 workers)
|
||||
fileReviews := make([]FileReview, reviewedFiles)
|
||||
var mu sync.Mutex
|
||||
if concurrency < 1 {
|
||||
concurrency = 1
|
||||
}
|
||||
sem := make(chan struct{}, concurrency)
|
||||
var wg sync.WaitGroup
|
||||
|
||||
// Thread-safe callback wrapper — all SSE writes go through this
|
||||
safeCallback := callback
|
||||
if callback != nil {
|
||||
safeCallback = func(event string, data interface{}) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
callback(event, data)
|
||||
}
|
||||
}
|
||||
|
||||
for i, file := range files {
|
||||
if callback != nil {
|
||||
callback("file_start", map[string]interface{}{
|
||||
"file": file.Filename,
|
||||
"index": i + 1,
|
||||
"total": reviewedFiles,
|
||||
})
|
||||
}
|
||||
wg.Add(1)
|
||||
go func(idx int, f FileDiff) {
|
||||
defer wg.Done()
|
||||
sem <- struct{}{} // acquire slot
|
||||
defer func() { <-sem }() // release slot
|
||||
|
||||
changeLines := countDiffLines(file.Patch)
|
||||
// Send file_start (order doesn't matter, frontend tracks by filename)
|
||||
if safeCallback != nil {
|
||||
safeCallback("file_start", map[string]interface{}{
|
||||
"file": f.Filename,
|
||||
"index": idx + 1,
|
||||
"total": reviewedFiles,
|
||||
})
|
||||
}
|
||||
|
||||
// Truncate per-file diff if too large
|
||||
patch := file.Patch
|
||||
if len(patch) > 30000 {
|
||||
patch = patch[:30000] + "\n\n... [diff truncated due to size]"
|
||||
}
|
||||
changeLines := countDiffLines(f.Patch)
|
||||
|
||||
// Build review prompt
|
||||
prompt := fmt.Sprintf(`你是一个资深代码审查专家。请审查以下代码变更，给出专业的 Review 意见。
|
||||
// Truncate per-file diff if too large
|
||||
patch := f.Patch
|
||||
if len(patch) > 30000 {
|
||||
patch = patch[:30000] + "\n\n... [diff truncated due to size]"
|
||||
}
|
||||
|
||||
// Build review prompt
|
||||
prompt := fmt.Sprintf(`你是一个资深代码审查专家。请审查以下代码变更，给出专业的 Review 意见。
|
||||
|
||||
## 文件: %s
|
||||
## 变更行数: +%d / -%d
|
||||
@@ -151,88 +176,87 @@ func GenerateReview(db *sql.DB, repoPath, base, head string, topN int, callback
|
||||
- info: 提示信息（最佳实践、可选优化）
|
||||
|
||||
如果代码没有问题，输出空数组 []。
|
||||
请用中文回复。`, file.Filename, changeLines/2+changeLines%2, changeLines/2, patch)
|
||||
请用中文回复。`, f.Filename, changeLines/2+changeLines%2, changeLines/2, patch)
|
||||
|
||||
messages := []goopenai.ChatCompletionMessage{
|
||||
{Role: goopenai.ChatMessageRoleUser, Content: prompt},
|
||||
}
|
||||
|
||||
// Call LLM
|
||||
fullResponse, err := ChatStream(config, messages, callback)
|
||||
if err != nil {
|
||||
// Continue with other files on error
|
||||
if callback != nil {
|
||||
callback("error", map[string]interface{}{
|
||||
"file": file.Filename,
|
||||
"message": err.Error(),
|
||||
})
|
||||
messages := []goopenai.ChatCompletionMessage{
|
||||
{Role: goopenai.ChatMessageRoleUser, Content: prompt},
|
||||
}
|
||||
fileReviews = append(fileReviews, FileReview{
|
||||
FileName: file.Filename,
|
||||
|
||||
// Call LLM
|
||||
fullResponse, err := ChatStream(config, messages, safeCallback)
|
||||
if err != nil {
|
||||
if safeCallback != nil {
|
||||
safeCallback("error", map[string]interface{}{
|
||||
"file": f.Filename,
|
||||
"message": err.Error(),
|
||||
})
|
||||
}
|
||||
fileReviews[idx] = FileReview{
|
||||
FileName: f.Filename,
|
||||
ChangeLines: changeLines,
|
||||
Suggestions: nil,
|
||||
RawReview: fmt.Sprintf("Error: %s", err.Error()),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Parse suggestions
|
||||
jsonStr := extractJSON(fullResponse)
|
||||
var suggestions []ReviewSuggestion
|
||||
if err := json.Unmarshal([]byte(jsonStr), &suggestions); err != nil {
|
||||
var single ReviewSuggestion
|
||||
if err2 := json.Unmarshal([]byte(jsonStr), &single); err2 == nil {
|
||||
suggestions = []ReviewSuggestion{single}
|
||||
} else {
|
||||
suggestions = []ReviewSuggestion{{
|
||||
Severity: "info",
|
||||
Description: fullResponse,
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// Validate severity values
|
||||
for j := range suggestions {
|
||||
switch suggestions[j].Severity {
|
||||
case "critical", "warning", "info":
|
||||
default:
|
||||
suggestions[j].Severity = "info"
|
||||
}
|
||||
}
|
||||
|
||||
// Send suggestion events
|
||||
for _, s := range suggestions {
|
||||
content := s.Description
|
||||
if s.Suggestion != "" {
|
||||
content += "\n\n**建议修改:** " + s.Suggestion
|
||||
}
|
||||
if s.CodeExample != "" {
|
||||
content += "\n\n```\n" + s.CodeExample + "\n```"
|
||||
}
|
||||
if safeCallback != nil {
|
||||
safeCallback("suggestion", map[string]interface{}{
|
||||
"file": f.Filename,
|
||||
"severity": s.Severity,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fileReviews[idx] = FileReview{
|
||||
FileName: f.Filename,
|
||||
ChangeLines: changeLines,
|
||||
Suggestions: nil,
|
||||
RawReview: fmt.Sprintf("Error: %s", err.Error()),
|
||||
})
|
||||
continue
|
||||
}
|
||||
|
||||
// Parse suggestions
|
||||
jsonStr := extractJSON(fullResponse)
|
||||
var suggestions []ReviewSuggestion
|
||||
if err := json.Unmarshal([]byte(jsonStr), &suggestions); err != nil {
|
||||
// If parsing fails, try single object
|
||||
var single ReviewSuggestion
|
||||
if err2 := json.Unmarshal([]byte(jsonStr), &single); err2 == nil {
|
||||
suggestions = []ReviewSuggestion{single}
|
||||
} else {
|
||||
// Fall back to raw text as info suggestion
|
||||
suggestions = []ReviewSuggestion{{
|
||||
Severity: "info",
|
||||
Description: fullResponse,
|
||||
}}
|
||||
Suggestions: suggestions,
|
||||
RawReview: fullResponse,
|
||||
}
|
||||
}
|
||||
|
||||
// Validate severity values
|
||||
for i := range suggestions {
|
||||
switch suggestions[i].Severity {
|
||||
case "critical", "warning", "info":
|
||||
// valid
|
||||
default:
|
||||
suggestions[i].Severity = "info"
|
||||
if safeCallback != nil {
|
||||
safeCallback("file_end", map[string]interface{}{"file": f.Filename})
|
||||
}
|
||||
}
|
||||
|
||||
// Send suggestion events
|
||||
for _, s := range suggestions {
|
||||
content := s.Description
|
||||
if s.Suggestion != "" {
|
||||
content += "\n\n**建议修改:** " + s.Suggestion
|
||||
}
|
||||
if s.CodeExample != "" {
|
||||
content += "\n\n```\n" + s.CodeExample + "\n```"
|
||||
}
|
||||
if callback != nil {
|
||||
callback("suggestion", map[string]interface{}{
|
||||
"file": file.Filename,
|
||||
"severity": s.Severity,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fileReviews = append(fileReviews, FileReview{
|
||||
FileName: file.Filename,
|
||||
ChangeLines: changeLines,
|
||||
Suggestions: suggestions,
|
||||
RawReview: fullResponse,
|
||||
})
|
||||
|
||||
if callback != nil {
|
||||
callback("file_end", map[string]interface{}{"file": file.Filename})
|
||||
}
|
||||
}(i, file)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
|
||||
// Generate summary
|
||||
var summary ReviewSummary
|
||||
if len(fileReviews) > 0 {
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<h1 class="text-2xl font-bold text-gray-900 mb-6">AI 代码审查</h1>
|
||||
|
||||
<div class="bg-white rounded-lg shadow-md p-6 mb-6">
|
||||
<div class="grid grid-cols-3 gap-4 mb-4">
|
||||
<div class="grid grid-cols-4 gap-4 mb-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Base</label>
|
||||
<select id="base-ref" class="w-full border rounded-md px-3 py-2" required>
|
||||
@@ -37,6 +37,12 @@
|
||||
placeholder="留空=全部">
|
||||
<p class="text-xs text-gray-400 mt-1">设为 0 分析全部文件</p>
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">并发分析数</label>
|
||||
<input type="number" id="concurrency" value="{{.Concurrency}}" min="1" max="20" class="w-full border rounded-md px-3 py-2"
|
||||
placeholder="默认 5">
|
||||
<p class="text-xs text-gray-400 mt-1">同时分析的文件数 (1-20)</p>
|
||||
</div>
|
||||
</div>
|
||||
<button onclick="startReview()" id="btn-review" class="w-full bg-purple-600 text-white py-2 px-4 rounded-md hover:bg-purple-700">
|
||||
开始审查
|
||||
@@ -254,10 +260,13 @@
|
||||
let completedFiles = 0;
|
||||
let currentFile = '';
|
||||
|
||||
const concurrency = document.getElementById('concurrency').value;
|
||||
|
||||
currentSSE = SSE.post(`/api/repos/${repoId}/review`, {
|
||||
base: baseRef,
|
||||
head: headRef,
|
||||
top_n: parseInt(topN) || 0,
|
||||
concurrency: parseInt(concurrency) || 5,
|
||||
}, {
|
||||
start(data) {
|
||||
totalFiles = data.total_files || 0;
|
||||
|
||||
@@ -32,11 +32,19 @@
|
||||
<!-- Review Settings -->
|
||||
<div class="bg-white rounded-lg shadow-sm border border-gray-200 p-6">
|
||||
<h2 class="text-lg font-semibold mb-4">审查配置</h2>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Top-N 文件数</label>
|
||||
<p class="text-xs text-gray-400 mb-2">大 diff 时优先分析变更最大的 N 个文件，设为 0 分析全部</p>
|
||||
<input type="number" name="review.top_n" value="{{index .Settings "review.top_n"}}" min="0"
|
||||
class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500">
|
||||
<div class="space-y-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Top-N 文件数</label>
|
||||
<p class="text-xs text-gray-400 mb-2">大 diff 时优先分析变更最大的 N 个文件，设为 0 分析全部</p>
|
||||
<input type="number" name="review.top_n" value="{{index .Settings "review.top_n"}}" min="0"
|
||||
class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500">
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">并发分析数</label>
|
||||
<p class="text-xs text-gray-400 mb-2">同时向 LLM 发送的文件评审请求数，越大越快但占用更多 API 额度</p>
|
||||
<input type="number" name="review.concurrency" value="{{index .Settings "review.concurrency"}}" min="1" max="20"
|
||||
class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Cache Settings -->
|
||||
|
||||
Reference in New Issue
Block a user