Compare commits
2 Commits
62c42341c4
...
0735834931
| Author | SHA1 | Date |
|---|---|---|
|
|
0735834931 | |
|
|
0f9c1e2bc9 |
|
|
@ -202,11 +202,13 @@ class LLMService:
|
||||||
2. column 是问题代码在该行中的起始列位置
|
2. column 是问题代码在该行中的起始列位置
|
||||||
3. code_snippet 应该包含问题代码及其上下文,去掉"行号|"前缀
|
3. code_snippet 应该包含问题代码及其上下文,去掉"行号|"前缀
|
||||||
4. 如果代码片段包含多行,必须使用 \\n 表示换行符
|
4. 如果代码片段包含多行,必须使用 \\n 表示换行符
|
||||||
|
5. 禁止在 code_snippet 中输出大量的重复空白、多余空行或过长的无关代码。如果涉及此类问题,请使用 "[...]" 进行省略展示。单次 code_snippet 的行数建议不超过 10 行。
|
||||||
|
|
||||||
【严格禁止】:
|
【严格禁止】:
|
||||||
- 禁止在任何字段中使用英文,所有内容必须是简体中文
|
- 禁止在任何字段中使用英文,所有内容必须是简体中文
|
||||||
- 禁止在JSON字符串值中使用真实换行符,必须用\\n转义
|
- 禁止在JSON字符串值中使用真实换行符,必须用\\n转义
|
||||||
- 禁止输出markdown代码块标记(如```json)
|
- 禁止输出markdown代码块标记(如```json)
|
||||||
|
- 禁止输出重复的、冗余的长代码块
|
||||||
|
|
||||||
⚠️ 重要提醒:line字段必须从代码左侧的行号标注中读取,不要猜测或填0!"""
|
⚠️ 重要提醒:line字段必须从代码左侧的行号标注中读取,不要猜测或填0!"""
|
||||||
else:
|
else:
|
||||||
|
|
@ -253,11 +255,13 @@ Note:
|
||||||
2. 'column' is the starting column position
|
2. 'column' is the starting column position
|
||||||
3. 'code_snippet' should include the problematic code with context, remove "lineNumber|" prefix
|
3. 'code_snippet' should include the problematic code with context, remove "lineNumber|" prefix
|
||||||
4. Use \\n for newlines in code snippets
|
4. Use \\n for newlines in code snippets
|
||||||
|
5. DO NOT output massive amounts of empty lines, repeated spaces, or excessively long code in 'code_snippet'. Use "[...]" to indicate truncation if necessary. Keep the snippet under 10 lines.
|
||||||
|
|
||||||
【STRICTLY PROHIBITED】:
|
【STRICTLY PROHIBITED】:
|
||||||
- NO Chinese characters in any field - English ONLY
|
- NO Chinese characters in any field - English ONLY
|
||||||
- NO real newline characters in JSON string values
|
- NO real newline characters in JSON string values (must use \\n)
|
||||||
- NO markdown code block markers
|
- NO markdown code block markers
|
||||||
|
- NO redundant long code blocks
|
||||||
|
|
||||||
⚠️ CRITICAL: Read line numbers from the "lineNumber|" prefix. Do NOT guess or use 0!"""
|
⚠️ CRITICAL: Read line numbers from the "lineNumber|" prefix. Do NOT guess or use 0!"""
|
||||||
|
|
||||||
|
|
@ -851,7 +855,9 @@ Please analyze the following code:
|
||||||
1. 必须只输出纯JSON对象
|
1. 必须只输出纯JSON对象
|
||||||
2. 禁止在JSON前后添加任何文字、说明、markdown标记
|
2. 禁止在JSON前后添加任何文字、说明、markdown标记
|
||||||
3. 所有文本字段(title, description, suggestion等)必须使用中文输出
|
3. 所有文本字段(title, description, suggestion等)必须使用中文输出
|
||||||
4. 输出格式必须符合以下 JSON Schema:
|
4. code_snippet 字段禁止输出大量的重复空白、多余空行或过长的无关代码。如果涉及此类问题,请使用 "[...]" 进行省略展示。单次 code_snippet 的行数建议不超过 10 行。
|
||||||
|
5. 禁止在JSON字符串值中使用真实换行符,必须用\\n转义
|
||||||
|
6. 输出格式必须严格符合以下 JSON Schema:
|
||||||
|
|
||||||
{schema}
|
{schema}
|
||||||
{rules_prompt}"""
|
{rules_prompt}"""
|
||||||
|
|
@ -862,7 +868,9 @@ Please analyze the following code:
|
||||||
1. Must output pure JSON object only
|
1. Must output pure JSON object only
|
||||||
2. Do not add any text, explanation, or markdown markers before or after JSON
|
2. Do not add any text, explanation, or markdown markers before or after JSON
|
||||||
3. All text fields (title, description, suggestion, etc.) must be in English
|
3. All text fields (title, description, suggestion, etc.) must be in English
|
||||||
4. Output format must conform to the following JSON Schema:
|
4. DO NOT output massive amounts of empty lines, repeated spaces, or excessively long code in 'code_snippet'. Use "[...]" for truncation. Keep it under 10 lines.
|
||||||
|
5. NO real newline characters in JSON string values (must use \\n)
|
||||||
|
6. Output format must strictly conform to the following JSON Schema:
|
||||||
|
|
||||||
{schema}
|
{schema}
|
||||||
{rules_prompt}"""
|
{rules_prompt}"""
|
||||||
|
|
|
||||||
|
|
@ -599,6 +599,9 @@ async def scan_repo_task(task_id: str, db_session_factory, user_config: dict = N
|
||||||
if len(content) > settings.MAX_FILE_SIZE_BYTES:
|
if len(content) > settings.MAX_FILE_SIZE_BYTES:
|
||||||
return {"type": "skip", "reason": "too_large", "path": f_path}
|
return {"type": "skip", "reason": "too_large", "path": f_path}
|
||||||
|
|
||||||
|
if task_control.is_cancelled(task_id):
|
||||||
|
return None
|
||||||
|
|
||||||
# 4.2 LLM 分析
|
# 4.2 LLM 分析
|
||||||
language = get_language_from_path(f_path)
|
language = get_language_from_path(f_path)
|
||||||
scan_config = (user_config or {}).get('scan_config', {})
|
scan_config = (user_config or {}).get('scan_config', {})
|
||||||
|
|
@ -622,6 +625,9 @@ async def scan_repo_task(task_id: str, db_session_factory, user_config: dict = N
|
||||||
"language": language,
|
"language": language,
|
||||||
"analysis": analysis_result
|
"analysis": analysis_result
|
||||||
}
|
}
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
# 捕获取消异常,不再重试
|
||||||
|
return None
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
if attempt < MAX_RETRIES - 1:
|
if attempt < MAX_RETRIES - 1:
|
||||||
wait_time = (attempt + 1) * 2
|
wait_time = (attempt + 1) * 2
|
||||||
|
|
@ -638,16 +644,22 @@ async def scan_repo_task(task_id: str, db_session_factory, user_config: dict = N
|
||||||
last_error = str(e)
|
last_error = str(e)
|
||||||
return {"type": "error", "path": f_path, "error": str(e)}
|
return {"type": "error", "path": f_path, "error": str(e)}
|
||||||
|
|
||||||
# 创建所有分析任务
|
# 创建所有分析任务对象以便跟踪
|
||||||
analysis_tasks = [analyze_single_file(f) for f in files]
|
task_objects = [asyncio.create_task(analyze_single_file(f)) for f in files]
|
||||||
|
|
||||||
|
try:
|
||||||
# 使用 as_completed 处理结果,这样可以实时更新进度且安全使用当前 db session
|
# 使用 as_completed 处理结果,这样可以实时更新进度且安全使用当前 db session
|
||||||
for future in asyncio.as_completed(analysis_tasks):
|
for future in asyncio.as_completed(task_objects):
|
||||||
if task_control.is_cancelled(task_id):
|
if task_control.is_cancelled(task_id):
|
||||||
# 停止处理后续完成的任务
|
# 停止处理后续完成的任务
|
||||||
|
print(f"🛑 任务 {task_id} 检测到取消信号,停止主循环")
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
res = await future
|
||||||
|
except asyncio.CancelledError:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
res = await future
|
|
||||||
if not res: continue
|
if not res: continue
|
||||||
|
|
||||||
if res["type"] == "skip":
|
if res["type"] == "skip":
|
||||||
|
|
@ -712,6 +724,18 @@ async def scan_repo_task(task_id: str, db_session_factory, user_config: dict = N
|
||||||
if consecutive_failures >= MAX_CONSECUTIVE_FAILURES:
|
if consecutive_failures >= MAX_CONSECUTIVE_FAILURES:
|
||||||
print(f"❌ 任务 {task_id}: 连续失败 {consecutive_failures} 次,停止分析")
|
print(f"❌ 任务 {task_id}: 连续失败 {consecutive_failures} 次,停止分析")
|
||||||
break
|
break
|
||||||
|
finally:
|
||||||
|
# 无论正常结束、中途 break 还是发生异常,都确保取消所有未完成的任务
|
||||||
|
pending_count = 0
|
||||||
|
for t in task_objects:
|
||||||
|
if not t.done():
|
||||||
|
t.cancel()
|
||||||
|
pending_count += 1
|
||||||
|
|
||||||
|
if pending_count > 0:
|
||||||
|
print(f"🧹 任务 {task_id}: 已清理 {pending_count} 个后台待处理或执行中的任务")
|
||||||
|
# 等待一下让取消逻辑执行完毕,但不阻塞太久
|
||||||
|
await asyncio.gather(*task_objects, return_exceptions=True)
|
||||||
|
|
||||||
# 5. 完成任务
|
# 5. 完成任务
|
||||||
avg_quality_score = sum(quality_scores) / len(quality_scores) if quality_scores else 100.0
|
avg_quality_score = sum(quality_scores) / len(quality_scores) if quality_scores else 100.0
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
deny 111.194.138.35;# 封禁攻击的ip
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ export interface UseAgentStreamOptions extends StreamOptions {
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UseAgentStreamReturn extends AgentStreamState {
|
export interface UseAgentStreamReturn extends AgentStreamState {
|
||||||
connect: () => void;
|
connect: (overrideAfterSequence?: number) => void;
|
||||||
disconnect: () => void;
|
disconnect: () => void;
|
||||||
isConnected: boolean;
|
isConnected: boolean;
|
||||||
clearEvents: () => void;
|
clearEvents: () => void;
|
||||||
|
|
@ -98,7 +98,7 @@ export function useAgentStream(
|
||||||
afterSequenceRef.current = afterSequence;
|
afterSequenceRef.current = afterSequence;
|
||||||
|
|
||||||
// 连接
|
// 连接
|
||||||
const connect = useCallback(() => {
|
const connect = useCallback((overrideAfterSequence?: number) => {
|
||||||
if (!taskId) return;
|
if (!taskId) return;
|
||||||
|
|
||||||
// 断开现有连接
|
// 断开现有连接
|
||||||
|
|
@ -118,8 +118,8 @@ export function useAgentStream(
|
||||||
setError(null);
|
setError(null);
|
||||||
thinkingBufferRef.current = [];
|
thinkingBufferRef.current = [];
|
||||||
|
|
||||||
// 🔥 使用 ref 获取最新的 afterSequence 值
|
// 🔥 使用 ref 获取最新的 afterSequence 值,或者使用覆盖值
|
||||||
const currentAfterSequence = afterSequenceRef.current;
|
const currentAfterSequence = overrideAfterSequence !== undefined ? overrideAfterSequence : afterSequenceRef.current;
|
||||||
console.log(`[useAgentStream] Creating handler with afterSequence=${currentAfterSequence}`);
|
console.log(`[useAgentStream] Creating handler with afterSequence=${currentAfterSequence}`);
|
||||||
|
|
||||||
// 创建新的 handler
|
// 创建新的 handler
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ function agentAuditReducer(state: AgentAuditState, action: AgentAuditAction): Ag
|
||||||
if (newFinding.id && existingIds.has(newFinding.id)) {
|
if (newFinding.id && existingIds.has(newFinding.id)) {
|
||||||
return state; // 已存在,不添加
|
return state; // 已存在,不添加
|
||||||
}
|
}
|
||||||
return { ...state, findings: [...state.findings, newFinding] };
|
return { ...state, findings: [...state.findings, newFinding as AgentFinding] };
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'SET_AGENT_TREE':
|
case 'SET_AGENT_TREE':
|
||||||
|
|
@ -99,7 +99,7 @@ function agentAuditReducer(state: AgentAuditState, action: AgentAuditAction): Ag
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'UPDATE_OR_ADD_PROGRESS_LOG': {
|
case 'UPDATE_OR_ADD_PROGRESS_LOG': {
|
||||||
const { progressKey, title, agentName } = action.payload;
|
const { progressKey, title, agentName, time } = action.payload;
|
||||||
// 查找是否已存在相同 progressKey 的进度日志
|
// 查找是否已存在相同 progressKey 的进度日志
|
||||||
const existingIndex = state.logs.findIndex(
|
const existingIndex = state.logs.findIndex(
|
||||||
log => log.type === 'progress' && log.progressKey === progressKey
|
log => log.type === 'progress' && log.progressKey === progressKey
|
||||||
|
|
@ -111,7 +111,7 @@ function agentAuditReducer(state: AgentAuditState, action: AgentAuditAction): Ag
|
||||||
updatedLogs[existingIndex] = {
|
updatedLogs[existingIndex] = {
|
||||||
...updatedLogs[existingIndex],
|
...updatedLogs[existingIndex],
|
||||||
title,
|
title,
|
||||||
time: new Date().toLocaleTimeString('en-US', { hour12: false }),
|
time: time || new Date().toLocaleTimeString('en-US', { hour12: false }),
|
||||||
};
|
};
|
||||||
return { ...state, logs: updatedLogs };
|
return { ...state, logs: updatedLogs };
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -121,6 +121,7 @@ function agentAuditReducer(state: AgentAuditState, action: AgentAuditAction): Ag
|
||||||
title,
|
title,
|
||||||
progressKey,
|
progressKey,
|
||||||
agentName,
|
agentName,
|
||||||
|
time,
|
||||||
});
|
});
|
||||||
return { ...state, logs: [...state.logs, newLog] };
|
return { ...state, logs: [...state.logs, newLog] };
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -146,19 +146,26 @@ function AgentAuditPageContent() {
|
||||||
}, [loadAgentTree]);
|
}, [loadAgentTree]);
|
||||||
|
|
||||||
// 🔥 NEW: 加载历史事件并转换为日志项
|
// 🔥 NEW: 加载历史事件并转换为日志项
|
||||||
const loadHistoricalEvents = useCallback(async () => {
|
const loadHistoricalEvents = useCallback(async (isIncremental = false) => {
|
||||||
if (!taskId) return 0;
|
if (!taskId) return 0;
|
||||||
|
|
||||||
// 🔥 防止重复加载历史事件
|
// 🔥 如果不是增量加载,且已经加载过历史事件,则跳过
|
||||||
if (hasLoadedHistoricalEventsRef.current) {
|
if (!isIncremental && hasLoadedHistoricalEventsRef.current) {
|
||||||
console.log('[AgentAudit] Historical events already loaded, skipping');
|
console.log('[AgentAudit] Historical events already loaded, skipping');
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 标记已尝试加载(初次加载时)
|
||||||
|
if (!isIncremental) {
|
||||||
hasLoadedHistoricalEventsRef.current = true;
|
hasLoadedHistoricalEventsRef.current = true;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
console.log(`[AgentAudit] Fetching historical events for task ${taskId}...`);
|
console.log(`[AgentAudit] Fetching ${isIncremental ? 'incremental' : 'initial'} events for task ${taskId}, after_sequence: ${isIncremental ? lastEventSequenceRef.current : 0}...`);
|
||||||
const events = await getAgentEvents(taskId, { limit: 500 });
|
const events = await getAgentEvents(taskId, {
|
||||||
|
limit: 500,
|
||||||
|
after_sequence: isIncremental ? lastEventSequenceRef.current : 0
|
||||||
|
});
|
||||||
console.log(`[AgentAudit] Received ${events.length} events from API`);
|
console.log(`[AgentAudit] Received ${events.length} events from API`);
|
||||||
|
|
||||||
if (events.length === 0) {
|
if (events.length === 0) {
|
||||||
|
|
@ -606,6 +613,7 @@ function AgentAuditPageContent() {
|
||||||
line_start: finding.line_start as number,
|
line_start: finding.line_start as number,
|
||||||
description: finding.description as string,
|
description: finding.description as string,
|
||||||
is_verified: (finding.is_verified as boolean) || false,
|
is_verified: (finding.is_verified as boolean) || false,
|
||||||
|
task_id: taskId || '',
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -722,6 +730,33 @@ function AgentAuditPageContent() {
|
||||||
}
|
}
|
||||||
}, [logs, isAutoScroll]);
|
}, [logs, isAutoScroll]);
|
||||||
|
|
||||||
|
// 🔥 Visibility Change Handler - 处理离开页面后返回时的同步
|
||||||
|
useEffect(() => {
|
||||||
|
const handleVisibilityChange = async () => {
|
||||||
|
if (document.visibilityState === 'visible' && taskId) {
|
||||||
|
console.log('[AgentAudit] Tab became visible, checking for updates...');
|
||||||
|
|
||||||
|
// 1. 刷新任务状态
|
||||||
|
const updatedTask = await getAgentTask(taskId);
|
||||||
|
setTask(updatedTask);
|
||||||
|
|
||||||
|
// 2. 无论什么状态,都增量加载错过的事件
|
||||||
|
await loadHistoricalEvents(true);
|
||||||
|
|
||||||
|
if (updatedTask.status === 'running') {
|
||||||
|
// 3. 强制重新连接流,确保使用最新的 sequence 且不是僵尸连接
|
||||||
|
console.log('[AgentAudit] Reconnecting stream on visibility change, last sequence:', lastEventSequenceRef.current);
|
||||||
|
connectStream(lastEventSequenceRef.current);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener('visibilitychange', handleVisibilityChange);
|
||||||
|
return () => {
|
||||||
|
document.removeEventListener('visibilitychange', handleVisibilityChange);
|
||||||
|
};
|
||||||
|
}, [taskId, loadHistoricalEvents, isConnected, connectStream, setTask]);
|
||||||
|
|
||||||
// ============ Handlers ============
|
// ============ Handlers ============
|
||||||
|
|
||||||
const handleAgentSelect = useCallback((agentId: string) => {
|
const handleAgentSelect = useCallback((agentId: string) => {
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ export type AgentAuditAction =
|
||||||
| { type: 'SET_LOGS'; payload: LogItem[] }
|
| { type: 'SET_LOGS'; payload: LogItem[] }
|
||||||
| { type: 'ADD_LOG'; payload: Omit<LogItem, 'id' | 'time'> & { id?: string; time?: string } }
|
| { type: 'ADD_LOG'; payload: Omit<LogItem, 'id' | 'time'> & { id?: string; time?: string } }
|
||||||
| { type: 'UPDATE_LOG'; payload: { id: string; updates: Partial<LogItem> } }
|
| { type: 'UPDATE_LOG'; payload: { id: string; updates: Partial<LogItem> } }
|
||||||
| { type: 'UPDATE_OR_ADD_PROGRESS_LOG'; payload: { progressKey: string; title: string; agentName?: string } }
|
| { type: 'UPDATE_OR_ADD_PROGRESS_LOG'; payload: { progressKey: string; title: string; agentName?: string; time?: string } }
|
||||||
| { type: 'COMPLETE_TOOL_LOG'; payload: { toolName: string; output: string; duration: number } }
|
| { type: 'COMPLETE_TOOL_LOG'; payload: { toolName: string; output: string; duration: number } }
|
||||||
| { type: 'REMOVE_LOG'; payload: string }
|
| { type: 'REMOVE_LOG'; payload: string }
|
||||||
| { type: 'SELECT_AGENT'; payload: string | null }
|
| { type: 'SELECT_AGENT'; payload: string | null }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue