hydro-ai-helper 2.0.1 → 2.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/handlers/teachingSummaryHandler.js +57 -16
- package/dist/handlers/teachingSummaryHandler.js.map +1 -1
- package/dist/models/batchSummaryJob.js +25 -0
- package/dist/models/batchSummaryJob.js.map +1 -1
- package/dist/models/teachingSummary.js +31 -0
- package/dist/models/teachingSummary.js.map +1 -1
- package/dist/services/teachingSuggestionService.js +108 -53
- package/dist/services/teachingSuggestionService.js.map +1 -1
- package/frontend/teachingSummary/TeachingReviewPanel.tsx +65 -4
- package/frontend/teachingSummary/TeachingSummaryPanel.tsx +8 -1
- package/frontend/teachingSummary/useTeachingReview.ts +11 -1
- package/frontend/teachingSummary/useTeachingSummary.ts +9 -2
- package/package.json +1 -1
|
@@ -133,6 +133,7 @@ class TeachingSummaryHandler extends hydrooj_1.Handler {
|
|
|
133
133
|
const startTime = Date.now();
|
|
134
134
|
try {
|
|
135
135
|
await model.updateStatus(summaryId, 'generating');
|
|
136
|
+
await model.updateProgress(summaryId, 'collecting_data');
|
|
136
137
|
// Build pid list from contest
|
|
137
138
|
const pids = (tdoc.pids || [])
|
|
138
139
|
.map((p) => parseInt(String(p).replace(/^P/i, ''), 10))
|
|
@@ -150,6 +151,7 @@ class TeachingSummaryHandler extends hydrooj_1.Handler {
|
|
|
150
151
|
return { pid, title, content: (doc.content || '') };
|
|
151
152
|
});
|
|
152
153
|
// Layer 1: Analysis (with problem titles for human-readable findings)
|
|
154
|
+
await model.updateProgress(summaryId, 'analyzing');
|
|
153
155
|
const analysisService = new teachingAnalysisService_1.TeachingAnalysisService(this.ctx.db);
|
|
154
156
|
const analysisResult = await analysisService.analyze({
|
|
155
157
|
domainId,
|
|
@@ -190,27 +192,51 @@ class TeachingSummaryHandler extends hydrooj_1.Handler {
|
|
|
190
192
|
+ counts.stuck_silent + counts.disengaged;
|
|
191
193
|
const behaviorSummary = totalBehavior > 0
|
|
192
194
|
? counts : undefined;
|
|
193
|
-
// Layer 2: AI suggestions
|
|
195
|
+
// Layer 2: AI suggestions (analysis report + fill-in exercises in parallel)
|
|
196
|
+
await model.updateProgress(summaryId, 'generating_suggestion');
|
|
194
197
|
const aiClient = await (0, openaiClient_1.createOpenAIClientFromConfig)(this.ctx);
|
|
195
198
|
const suggestionService = new teachingSuggestionService_1.TeachingSuggestionService(aiClient);
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
199
|
+
// Extract related findings for fill-in candidates
|
|
200
|
+
const fillInRelatedFindings = fillInCandidatesForPrompt.length > 0
|
|
201
|
+
? analysisResult.findings
|
|
202
|
+
.filter(f => f.evidence.affectedProblems.some(pid => fillInCandidatesForPrompt.some(c => c.pid === pid)))
|
|
203
|
+
.map(f => ({
|
|
204
|
+
title: f.title,
|
|
205
|
+
errorSignature: f.evidence.metrics.errorSignature,
|
|
206
|
+
affectedCount: f.evidence.affectedStudents.length,
|
|
207
|
+
}))
|
|
208
|
+
: [];
|
|
209
|
+
const [overallResult, fillInResult] = await Promise.all([
|
|
210
|
+
suggestionService.generateOverallSuggestion({
|
|
211
|
+
contestTitle: String(tdoc.title || ''),
|
|
212
|
+
contestContent: String(tdoc.content || ''),
|
|
213
|
+
teachingFocus,
|
|
214
|
+
stats: analysisResult.stats,
|
|
215
|
+
findings: analysisResult.findings,
|
|
216
|
+
problemContexts,
|
|
217
|
+
behaviorSummary,
|
|
218
|
+
}),
|
|
219
|
+
fillInCandidatesForPrompt.length > 0
|
|
220
|
+
? suggestionService.generateFillInExercise({
|
|
221
|
+
candidates: fillInCandidatesForPrompt,
|
|
222
|
+
relatedFindings: fillInRelatedFindings,
|
|
223
|
+
})
|
|
224
|
+
: Promise.resolve(null),
|
|
225
|
+
]);
|
|
226
|
+
const combinedSuggestion = fillInResult
|
|
227
|
+
? `${overallResult.text}\n\n${fillInResult.text}`
|
|
228
|
+
: overallResult.text;
|
|
229
|
+
let totalPromptTokens = overallResult.tokenUsage.promptTokens
|
|
230
|
+
+ (fillInResult?.tokenUsage.promptTokens ?? 0);
|
|
231
|
+
let totalCompletionTokens = overallResult.tokenUsage.completionTokens
|
|
232
|
+
+ (fillInResult?.tokenUsage.completionTokens ?? 0);
|
|
208
233
|
// Deep dives for findings that need them
|
|
209
234
|
const deepDiveResults = {};
|
|
210
235
|
const problemDocMap = new Map(problemDocs.map((doc) => [doc.docId, doc]));
|
|
211
236
|
const deepDiveFindings = analysisResult.findings.filter(f => f.needsDeepDive);
|
|
212
237
|
// Batch-fetch code samples for all deep-dive findings (avoids N+1 queries)
|
|
213
238
|
if (deepDiveFindings.length > 0) {
|
|
239
|
+
await model.updateProgress(summaryId, 'deep_diving');
|
|
214
240
|
const allSampleUids = new Set();
|
|
215
241
|
const allSamplePids = new Set();
|
|
216
242
|
for (const f of deepDiveFindings) {
|
|
@@ -268,10 +294,11 @@ class TeachingSummaryHandler extends hydrooj_1.Handler {
|
|
|
268
294
|
totalCompletionTokens += deepDiveResult.tokenUsage.completionTokens;
|
|
269
295
|
}
|
|
270
296
|
// Save completed results
|
|
297
|
+
await model.updateProgress(summaryId, 'saving');
|
|
271
298
|
await model.saveResults(summaryId, {
|
|
272
299
|
stats: analysisResult.stats,
|
|
273
300
|
findings: analysisResult.findings,
|
|
274
|
-
overallSuggestion:
|
|
301
|
+
overallSuggestion: combinedSuggestion,
|
|
275
302
|
deepDiveResults,
|
|
276
303
|
tokenUsage: { promptTokens: totalPromptTokens, completionTokens: totalCompletionTokens },
|
|
277
304
|
generationTimeMs: Date.now() - startTime,
|
|
@@ -304,8 +331,12 @@ class TeachingReviewHandler extends hydrooj_1.Handler {
|
|
|
304
331
|
const page = Math.max(1, parseInt(String(rawPage || '1'), 10));
|
|
305
332
|
const limit = Math.min(50, Math.max(1, parseInt(String(rawLimit || '20'), 10)));
|
|
306
333
|
const model = this.ctx.get('teachingSummaryModel');
|
|
307
|
-
const summaries = await
|
|
308
|
-
|
|
334
|
+
const [summaries, total, feedbackStats] = await Promise.all([
|
|
335
|
+
model.findByDomain(domainId, page, limit),
|
|
336
|
+
model.countByDomain(domainId),
|
|
337
|
+
model.getFeedbackStats(domainId),
|
|
338
|
+
]);
|
|
339
|
+
this.response.body = { summaries, total, page, limit, feedbackStats };
|
|
309
340
|
this.response.type = 'application/json';
|
|
310
341
|
}
|
|
311
342
|
catch (err) {
|
|
@@ -342,6 +373,16 @@ class TeachingSummaryFeedbackHandler extends hydrooj_1.Handler {
|
|
|
342
373
|
return;
|
|
343
374
|
}
|
|
344
375
|
await model.saveFeedback(existing._id, rating, comment);
|
|
376
|
+
// Report to telemetry (fire-and-forget)
|
|
377
|
+
try {
|
|
378
|
+
const telemetryService = this.ctx.get('telemetryService');
|
|
379
|
+
telemetryService.reportFeedback({
|
|
380
|
+
type: 'other',
|
|
381
|
+
subject: `teaching_summary_${rating}`,
|
|
382
|
+
body: comment || '',
|
|
383
|
+
}).catch(() => { });
|
|
384
|
+
}
|
|
385
|
+
catch { /* telemetryService may not be available */ }
|
|
345
386
|
this.response.body = { ok: true };
|
|
346
387
|
this.response.type = 'application/json';
|
|
347
388
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teachingSummaryHandler.js","sourceRoot":"","sources":["../../src/handlers/teachingSummaryHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"teachingSummaryHandler.js","sourceRoot":"","sources":["../../src/handlers/teachingSummaryHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,8 @@ class BatchSummaryJobModel {
|
|
|
25
25
|
catch {
|
|
26
26
|
// 旧索引不存在，忽略
|
|
27
27
|
}
|
|
28
|
+
// 清理重复的活跃任务（v1 索引从未生效，可能已存入重复数据导致 v2 唯一索引创建失败）
|
|
29
|
+
await this.deduplicateActiveJobs();
|
|
28
30
|
await this.collection.createIndex({ domainId: 1, contestId: 1 }, {
|
|
29
31
|
name: 'idx_domainId_contestId_active_v2',
|
|
30
32
|
unique: true,
|
|
@@ -34,6 +36,29 @@ class BatchSummaryJobModel {
|
|
|
34
36
|
});
|
|
35
37
|
console.log('[BatchSummaryJobModel] Indexes created successfully');
|
|
36
38
|
}
|
|
39
|
+
/**
|
|
40
|
+
* 清理同一域+竞赛下的重复活跃任务，保留最新的一条，其余归档
|
|
41
|
+
*/
|
|
42
|
+
async deduplicateActiveJobs() {
|
|
43
|
+
const duplicates = await this.collection.aggregate([
|
|
44
|
+
{ $match: { status: { $in: [...exports.ACTIVE_JOB_STATUSES] } } },
|
|
45
|
+
{ $sort: { createdAt: -1 } },
|
|
46
|
+
{
|
|
47
|
+
$group: {
|
|
48
|
+
_id: { domainId: '$domainId', contestId: '$contestId' },
|
|
49
|
+
count: { $sum: 1 },
|
|
50
|
+
ids: { $push: '$_id' },
|
|
51
|
+
},
|
|
52
|
+
},
|
|
53
|
+
{ $match: { count: { $gt: 1 } } },
|
|
54
|
+
]).toArray();
|
|
55
|
+
for (const dup of duplicates) {
|
|
56
|
+
// 保留第一条（最新），其余归档
|
|
57
|
+
const toArchive = dup.ids.slice(1);
|
|
58
|
+
await this.collection.updateMany({ _id: { $in: toArchive } }, { $set: { status: 'archived' } });
|
|
59
|
+
console.log(`[BatchSummaryJobModel] Archived ${toArchive.length} duplicate active jobs for domain=${dup._id.domainId} contest=${dup._id.contestId}`);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
37
62
|
/**
|
|
38
63
|
* 创建新的批量摘要任务
|
|
39
64
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchSummaryJob.js","sourceRoot":"","sources":["../../src/models/batchSummaryJob.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"batchSummaryJob.js","sourceRoot":"","sources":["../../src/models/batchSummaryJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,30 @@ class TeachingSummaryModel {
|
|
|
73
73
|
.limit(limit)
|
|
74
74
|
.toArray();
|
|
75
75
|
}
|
|
76
|
+
/**
|
|
77
|
+
* 统计指定域的教学总结数量
|
|
78
|
+
*/
|
|
79
|
+
async countByDomain(domainId) {
|
|
80
|
+
return this.collection.countDocuments({ domainId });
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* 统计指定域的反馈数据（up / down 各多少）
|
|
84
|
+
*/
|
|
85
|
+
async getFeedbackStats(domainId) {
|
|
86
|
+
const results = await this.collection.aggregate([
|
|
87
|
+
{ $match: { domainId, 'feedback.rating': { $exists: true } } },
|
|
88
|
+
{ $group: { _id: '$feedback.rating', count: { $sum: 1 } } },
|
|
89
|
+
]).toArray();
|
|
90
|
+
let up = 0;
|
|
91
|
+
let down = 0;
|
|
92
|
+
for (const r of results) {
|
|
93
|
+
if (r._id === 'up')
|
|
94
|
+
up = r.count;
|
|
95
|
+
else if (r._id === 'down')
|
|
96
|
+
down = r.count;
|
|
97
|
+
}
|
|
98
|
+
return { up, down };
|
|
99
|
+
}
|
|
76
100
|
/**
|
|
77
101
|
* 更新总结状态
|
|
78
102
|
*/
|
|
@@ -80,6 +104,13 @@ class TeachingSummaryModel {
|
|
|
80
104
|
const _id = (0, ensureObjectId_1.ensureObjectId)(id);
|
|
81
105
|
await this.collection.updateOne({ _id }, { $set: { status } });
|
|
82
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* 更新生成进度阶段
|
|
109
|
+
*/
|
|
110
|
+
async updateProgress(id, phase) {
|
|
111
|
+
const _id = (0, ensureObjectId_1.ensureObjectId)(id);
|
|
112
|
+
await this.collection.updateOne({ _id }, { $set: { progressPhase: phase } });
|
|
113
|
+
}
|
|
83
114
|
/**
|
|
84
115
|
* 保存分析结果并将状态设置为 completed
|
|
85
116
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teachingSummary.js","sourceRoot":"","sources":["../../src/models/teachingSummary.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH,4DAAyD;
|
|
1
|
+
{"version":3,"file":"teachingSummary.js","sourceRoot":"","sources":["../../src/models/teachingSummary.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH,4DAAyD;AA+FzD,MAAa,oBAAoB;IAG/B,YAAY,EAAM;QAChB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAkB,uBAAuB,CAAC,CAAC;IAC5E,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAC/B,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAC9B,EAAE,IAAI,EAAE,wBAAwB,EAAE,CACnC,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAC/B,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAC7B,EAAE,IAAI,EAAE,wBAAwB,EAAE,CACnC,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACrE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,MAQZ;QACC,MAAM,GAAG,GAAiC;YACxC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE;gBACL,aAAa,EAAE,CAAC;gBAChB,oBAAoB,EAAE,CAAC;gBACvB,WAAW,EAAE,CAAC;gBACd,YAAY,EAAE,CAAC;aAChB;YACD,QAAQ,EAAE,EAAE;YACZ,iBAAiB,EAAE,EAAE;YACrB,eAAe,EAAE,EAAE;YACnB,UAAU,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE;YACpD,gBAAgB,EAAE,CAAC;SACpB,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAsB,CAAC,CAAC;QACvE,OAAO,MAAM,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ,CAAC,EAAyB;QACtC,MAAM,GAAG,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CACjB,QAAgB,EAChB,SAAuB;QAEvB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAC5B,EAAE,QAAQ,EAAE,SAAS,EAAE,EACvB,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAC5B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAChB,QAAgB,EAChB,IAAY,EACZ,KAAa;QAEb,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAChC,OAAO,IAAI,CAAC,UAAU;aACnB,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;aAClB,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;aACvB,IAAI,CAAC,IAAI,CAAC;aACV,KAAK,CAAC,KAAK,CAAC;aACZ,OAAO,EAAE,CAAC;IACf,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,QAAgB;QAClC,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QACrC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAiC;YAC9E,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;YAC9D,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;SAC5D,CAAC,CAAC,OAAO,EAAE,CAAC;QACb,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,GAAG,KAAK,IAAI;gBAAE,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC;iBAC5B,IAAI,CAAC,CAAC,GAAG,KAAK,MAAM;gBAAE,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC;QAC5C,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAChB,EAAyB,EACzB,MAAiC;QAEjC,MAAM,GAAG,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACjE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAClB,EAAyB,EACzB,KAAuC;QAEvC,MAAM,GAAG,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CACf,EAAyB,EACzB,IAOC;QAED,MAAM,GAAG,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAC7B,EAAE,GAAG,EAAE,EACP;YACE,IAAI,EAAE;gBACJ,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,EAAE;gBAC3C,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;aACxC;SACF,CACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAChB,EAAyB,EACzB,MAAqB,EACrB,OAAgB;QAEhB,MAAM,GAAG,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAgC,EAAE,MAAM,EAAE,CAAC;QACzD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;QAC7B,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU,CAAC,EAAyB;QACxC,MAAM,GAAG,GAAG,IAAA,+BAAc,EAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3C,CAAC;CACF;AAzMD,oDAyMC"}
|
|
@@ -7,22 +7,22 @@
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.TeachingSuggestionService = void 0;
|
|
9
9
|
exports.buildMainPrompt = buildMainPrompt;
|
|
10
|
+
exports.buildFillInPrompt = buildFillInPrompt;
|
|
10
11
|
exports.buildDeepDivePrompt = buildDeepDivePrompt;
|
|
11
12
|
// ─── 提示词模板 ──────────────────────────────────────────
|
|
12
|
-
const MAIN_SYSTEM_PROMPT = `你是一位教龄15
|
|
13
|
+
const MAIN_SYSTEM_PROMPT = `你是一位教龄15年的编程课教师，同时负责教学教研。你将根据规则引擎提供的【带有具体错误诊断和题目信息的】课堂分析数据，为授课教师生成清晰直观的问题发现报告和教学参考素材。
|
|
13
14
|
|
|
14
15
|
【核心约束】
|
|
15
|
-
-
|
|
16
|
-
-
|
|
17
|
-
-
|
|
18
|
-
-
|
|
16
|
+
- 每条发现必须清晰呈现"错误是什么/影响多大/根因在哪"，用数据和具体例子说话
|
|
17
|
+
- P0 发现必须锚定在数据中的具体题目、具体错误模式上
|
|
18
|
+
- P1 建议必须锚定具体行为证据（提交次数、AI提问记录等），如有关联题目则引用，不得强行编造错误模式
|
|
19
|
+
- 当某章节主要依据 "low" confidence 数据时，在该章节标题下方加注一次"⚠️ 数据有限，以下建议仅供参考"
|
|
19
20
|
- 当数据标注为 "insufficient_data" 时，跳过该维度不做建议
|
|
20
21
|
- 必须基于给定数据说话，严禁捏造数据或比例
|
|
21
22
|
|
|
22
23
|
【优先级框架】
|
|
23
24
|
P0 — 全局知识缺陷：>20%学生犯同一类错误（有具体错误签名和测试点信息）
|
|
24
|
-
P1 —
|
|
25
|
-
P2 — 个体干预：按行为模式分类（持续努力型 / 受挫放弃型 / 沉默挣扎型 / 未参与型）
|
|
25
|
+
P1 — 个体干预：按行为模式分类（持续努力型 / 受挫放弃型 / 沉默挣扎型 / 未参与型）
|
|
26
26
|
|
|
27
27
|
【可推荐的教学干预方法】
|
|
28
28
|
- Parsons Problems（帕森斯题目）：让学生排列代码块而非从零写，减少语法负担
|
|
@@ -31,20 +31,22 @@ P2 — 个体干预：按行为模式分类（持续努力型 / 受挫放弃型
|
|
|
31
31
|
- Socratic Questioning（苏格拉底式提问）：用问题引导学生自行发现错误
|
|
32
32
|
- Code Fill-in-the-Blank（代码挖空练习）：基于学生AC代码，挖空错误高发位置让学生重做巩固
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
-
|
|
36
|
-
-
|
|
37
|
-
-
|
|
34
|
+
选择干预方法时参考：
|
|
35
|
+
- 语法负担高、代码结构混乱 → Parsons Problems
|
|
36
|
+
- 解题步骤断裂、不会建模 → Worked Examples
|
|
37
|
+
- 多数人有同一概念误解 → Peer Instruction
|
|
38
|
+
- 个体差一点能自行发现错误 → Socratic Questioning
|
|
39
|
+
- 已有 AC 代码且错误位置集中 → Code Fill-in-the-Blank
|
|
38
40
|
|
|
39
41
|
【边缘情况处理】
|
|
40
42
|
| 条件 | 行动 |
|
|
41
43
|
|---|---|
|
|
42
|
-
| 全班 AC 率 > 90% 且无 commonError |
|
|
44
|
+
| 全班 AC 率 > 90% 且无 commonError | 在 p0_action_plan 章节输出"全班表现优秀"并列出可进一步挑战的方向：时空复杂度优化、进阶变式题等 |
|
|
43
45
|
| AI 使用数据为 0（全班未使用 AI） | 聚焦于提交记录分析，不做 AI 有效性对比 |
|
|
44
46
|
|
|
45
47
|
【质量示例】
|
|
46
|
-
- 坏例子（禁止）："加强对边界条件的练习" / "进行个别辅导" / "注意数组越界问题"
|
|
47
|
-
- 好例子（要求）："
|
|
48
|
+
- 坏例子（禁止）："加强对边界条件的练习" / "进行个别辅导" / "注意数组越界问题" / "建议教师在课上演示正确写法"
|
|
49
|
+
- 好例子（要求）："35%的学生（10人）在T2中将循环条件写成 i<=n 而非 i<n，导致testcase #3 (n=0) 时数组越界。根因：未区分'元素个数'与'最大下标'的概念差异" / "错误集中在边界条件判断，错误签名 off_by_one，影响题目 P101、P103"
|
|
48
50
|
|
|
49
51
|
【输出章节定义】
|
|
50
52
|
你的报告可能包含以下章节。每次请求的 user prompt 末尾会给出 output_sections 列表，只输出该列表中指定的章节，未指定的章节不得出现在输出中。
|
|
@@ -53,40 +55,66 @@ P2 — 个体干预：按行为模式分类（持续努力型 / 受挫放弃型
|
|
|
53
55
|
### 📊 一句话诊断
|
|
54
56
|
{一句话点明核心教学问题，引用具体数据}
|
|
55
57
|
|
|
56
|
-
■ p0_action_plan — P0
|
|
57
|
-
### 🚨
|
|
58
|
+
■ p0_action_plan — P0全局错误发现报告
|
|
59
|
+
### 🚨 问题发现报告
|
|
60
|
+
（按影响人数从高到低排列，每个P0问题独立一节）
|
|
61
|
+
|
|
58
62
|
#### [P0] {问题名称} — 影响 {N}人/{百分比}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
63
|
+
|
|
64
|
+
**📌 错误模式**：{一句话概括错误模式，引用错误签名}
|
|
65
|
+
|
|
66
|
+
**🔍 具体表现**：
|
|
67
|
+
- 错误签名：\`{errorSignature}\`，出现在测试点 {testcaseIds}
|
|
68
|
+
- 典型错误代码：\`{学生代码中的关键错误行}\`
|
|
69
|
+
- 学生常见误解："{学生认为的逻辑}" → 实际应为："{正确逻辑}"
|
|
70
|
+
|
|
71
|
+
**📊 数据全景**：
|
|
72
|
+
| 维度 | 数据 |
|
|
73
|
+
|---|---|
|
|
74
|
+
| 受影响学生数 | {N}人（占参与人数{百分比}） |
|
|
75
|
+
| 涉及题目 | {pid列表} |
|
|
76
|
+
| 错误集中度 | {该错误是分散在多题还是集中在某题} |
|
|
77
|
+
|
|
78
|
+
**🧠 根因定位**：{用1-2句话说明知识盲点或认知误区，不要给出教学行动指令}
|
|
79
|
+
|
|
80
|
+
**💡 可选干预方向**：{从【可推荐的教学干预方法】中选择1-2个适合的方法名称，仅列出方法名，不展开具体步骤}
|
|
81
|
+
|
|
82
|
+
■ p1_behavior_intervention — P1个体干预建议
|
|
83
|
+
#### [P1] 个体干预建议
|
|
84
|
+
（仅输出 count > 0 的行为模式，跳过人数为 0 或数据缺失的类别）
|
|
69
85
|
| 行为模式 | 人数 | 建议动作 |
|
|
70
86
|
|---|---|---|
|
|
71
|
-
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
87
|
+
| {行为模式名称} | N | {具体建议} |`;
|
|
88
|
+
const FILL_IN_SYSTEM_PROMPT = `你是一位编程教学专家，擅长设计代码挖空练习。你将基于学生的 AC 代码和已识别的错误模式，生成带有注释的挖空练习。
|
|
89
|
+
|
|
90
|
+
【核心约束】
|
|
91
|
+
- 每题挖2-4个空，优先选择：错误高发位、关键逻辑判断位、边界条件位
|
|
92
|
+
- 避免挖空简单的 I/O 语句或变量声明
|
|
93
|
+
- 如果题目是填空形式（is_fill_in_problem=true），挖空位置必须避开题目模板代码
|
|
94
|
+
- 输出完整代码，在挖空位置用注释占位符替换，保持原始缩进
|
|
95
|
+
- 占位符根据语言使用对应注释风格：C/C++/Java 用 /* [空n] _____ (提示: ...) */，Python 用 # [空n] _____ (提示: ...)
|
|
96
|
+
- 必须基于给定数据说话，严禁捏造错误模式
|
|
97
|
+
|
|
98
|
+
【注释要求】
|
|
99
|
+
- 代码中每个关键行或逻辑块旁必须添加行尾注释，解释该行/块的作用
|
|
100
|
+
- 注释应帮助学生理解代码整体逻辑，而非仅标注语法
|
|
101
|
+
|
|
102
|
+
【输出格式】
|
|
103
|
+
对每道题输出以下结构：
|
|
75
104
|
|
|
76
|
-
■ fill_in_exercise — 课后巩固代码挖空
|
|
77
105
|
#### 📝 课后巩固：代码挖空练习
|
|
78
|
-
|
|
79
|
-
{
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
106
|
+
**题目**：{pid}. {title}
|
|
107
|
+
**练习目的**：{根据错误模式说明本练习针对什么知识盲点}
|
|
108
|
+
|
|
109
|
+
##### 练习代码（可直接复制到试卷）
|
|
110
|
+
\`\`\`{language}
|
|
111
|
+
{完整 AC 代码，挖空位置用注释占位符替换，每个关键行添加行尾注释}
|
|
112
|
+
\`\`\`
|
|
113
|
+
|
|
114
|
+
##### 建议挖空点说明
|
|
115
|
+
| 空号 | 位置描述 | 参考答案 | 挖空理由 |
|
|
116
|
+
|---|---|---|---|
|
|
117
|
+
| [空1] | {位置描述} | \`{被挖空的原始代码}\` | {关联学生的哪个错误模式} |`;
|
|
90
118
|
const DEEP_DIVE_SYSTEM_PROMPT = `你是一位擅长认知诊断的编程教育专家。分析特定题目的异常数据、代码切片和AI交互日志，为教师提供深度微观诊断和课堂干预素材。
|
|
91
119
|
|
|
92
120
|
【分析维度：布卢姆认知层级】
|
|
@@ -154,17 +182,9 @@ function buildMainPrompt(input) {
|
|
|
154
182
|
disengaged: { label: '未参与型', count: input.behaviorSummary.disengaged },
|
|
155
183
|
}, null, 2)}`
|
|
156
184
|
: '';
|
|
157
|
-
const hasFillIn = !!(input.fillInCandidates?.length);
|
|
158
|
-
const fillInSection = hasFillIn
|
|
159
|
-
? `\n## 代码挖空候选（需要LLM生成挖空位置）\n${input.fillInCandidates
|
|
160
|
-
.map(c => `### ${c.pid}. ${c.title}\n- 语言: ${c.lang}\n- 填空题: ${c.isFillInProblem ? '是（避开模板代码）' : '否'}\n\`\`\`${c.lang}\n${c.code}\n\`\`\``)
|
|
161
|
-
.join('\n\n')}`
|
|
162
|
-
: '';
|
|
163
185
|
const outputSections = ['diagnosis', 'p0_action_plan'];
|
|
164
186
|
if (hasBehavior)
|
|
165
|
-
outputSections.push('
|
|
166
|
-
if (hasFillIn)
|
|
167
|
-
outputSections.push('fill_in_exercise');
|
|
187
|
+
outputSections.push('p1_behavior_intervention');
|
|
168
188
|
const userPrompt = `## 教学上下文
|
|
169
189
|
竞赛标题：${contestTitle}
|
|
170
190
|
${contextSection}
|
|
@@ -177,7 +197,7 @@ ${contextSection}
|
|
|
177
197
|
${problemSection}
|
|
178
198
|
|
|
179
199
|
## 规则引擎发现（JSON）
|
|
180
|
-
${JSON.stringify(strippedFindings, null, 2)}${behaviorSection}
|
|
200
|
+
${JSON.stringify(strippedFindings, null, 2)}${behaviorSection}
|
|
181
201
|
|
|
182
202
|
---
|
|
183
203
|
output_sections: ${JSON.stringify(outputSections)}
|
|
@@ -187,6 +207,27 @@ output_sections: ${JSON.stringify(outputSections)}
|
|
|
187
207
|
user: userPrompt,
|
|
188
208
|
};
|
|
189
209
|
}
|
|
210
|
+
/**
|
|
211
|
+
* 构建代码挖空练习提示词
|
|
212
|
+
*/
|
|
213
|
+
function buildFillInPrompt(input) {
|
|
214
|
+
const candidateSection = input.candidates
|
|
215
|
+
.map(c => `### ${c.pid}. ${c.title}\n- 语言: ${c.lang}\n- 填空题: ${c.isFillInProblem ? '是（避开模板代码）' : '否'}\n\`\`\`${c.lang}\n${c.code}\n\`\`\``)
|
|
216
|
+
.join('\n\n');
|
|
217
|
+
const findingsSection = input.relatedFindings.length > 0
|
|
218
|
+
? `\n## 相关错误模式\n${input.relatedFindings
|
|
219
|
+
.map(f => `- **${f.title}**${f.errorSignature ? `（签名: ${f.errorSignature}）` : ''} — 影响 ${f.affectedCount} 人`)
|
|
220
|
+
.join('\n')}`
|
|
221
|
+
: '';
|
|
222
|
+
const userPrompt = `## AC 代码候选\n${candidateSection}${findingsSection}
|
|
223
|
+
|
|
224
|
+
---
|
|
225
|
+
请为上方每道题生成带注释的挖空练习和建议挖空点说明表格。`;
|
|
226
|
+
return {
|
|
227
|
+
system: FILL_IN_SYSTEM_PROMPT,
|
|
228
|
+
user: userPrompt,
|
|
229
|
+
};
|
|
230
|
+
}
|
|
190
231
|
/**
|
|
191
232
|
* 构建深度分析提示词（认知诊断）
|
|
192
233
|
*/
|
|
@@ -236,6 +277,20 @@ class TeachingSuggestionService {
|
|
|
236
277
|
},
|
|
237
278
|
};
|
|
238
279
|
}
|
|
280
|
+
/**
|
|
281
|
+
* 生成代码挖空练习（独立调用，可与主建议并行）
|
|
282
|
+
*/
|
|
283
|
+
async generateFillInExercise(input) {
|
|
284
|
+
const { system, user } = buildFillInPrompt(input);
|
|
285
|
+
const result = await this.aiClient.chat([{ role: 'user', content: user }], system);
|
|
286
|
+
return {
|
|
287
|
+
text: result.content,
|
|
288
|
+
tokenUsage: {
|
|
289
|
+
promptTokens: result.usage?.promptTokens ?? result.usage?.prompt_tokens ?? 0,
|
|
290
|
+
completionTokens: result.usage?.completionTokens ?? result.usage?.completion_tokens ?? 0,
|
|
291
|
+
},
|
|
292
|
+
};
|
|
293
|
+
}
|
|
239
294
|
/**
|
|
240
295
|
* 生成单项发现的深度认知诊断
|
|
241
296
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teachingSuggestionService.js","sourceRoot":"","sources":["../../src/services/teachingSuggestionService.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;
|
|
1
|
+
{"version":3,"file":"teachingSuggestionService.js","sourceRoot":"","sources":["../../src/services/teachingSuggestionService.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AA+MH,0CA6DC;AAKD,8CAoBC;AAKD,kDAiCC;AAvUD,uDAAuD;AAEvD,MAAM,kBAAkB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA0ED,CAAC;AAE3B,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mDA6BqB,CAAC;AAEpD,MAAM,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;uDAsBuB,CAAC;AAsDxD,wDAAwD;AAExD;;GAEG;AACH,SAAS,YAAY,CAAC,QAA2B;IAC/C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;QAChC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,sBAAsB,EAAE,GAAG,QAAQ,CAAC;QAClE,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,sBAAsB,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wDAAwD;AAExD;;GAEG;AACH,SAAgB,eAAe,CAAC,KAAsB;IACpD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAE/E,MAAM,UAAU,GAAG,CAAC,cAAc,IAAI,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;WAC9D,CAAC,aAAa,IAAI,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAEpD,MAAM,cAAc,GAAG,UAAU;QAC/B,CAAC,CAAC;YACE,cAAc,CAAC,CAAC,CAAC,WAAW,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE;YACjD,aAAa,CAAC,CAAC,CAAC,QAAQ,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE;SAC7C,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAC9B,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,KAAK,CAAC,eAAe,EAAE,MAAM;QAClD,CAAC,CAAC,cAAc,KAAK,CAAC,eAAe;aAChC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;aAChE,IAAI,CAAC,MAAM,CAAC,EAAE;QACnB,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe;WACpC,CAAC,KAAK,CAAC,eAAe,CAAC,kBAAkB;cACxC,KAAK,CAAC,eAAe,CAAC,eAAe;cACrC,KAAK,CAAC,eAAe,CAAC,YAAY;cAClC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAE5C,MAAM,eAAe,GAAG,WAAW;QACjC,CAAC,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC;YAChD,kBAAkB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,eAAgB,CAAC,kBAAkB,EAAE;YACxF,eAAe,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,eAAgB,CAAC,eAAe,EAAE;YAClF,YAAY,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,eAAgB,CAAC,YAAY,EAAE;YAC5E,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,eAAgB,CAAC,UAAU,EAAE;SACxE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;QACf,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,cAAc,GAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACjE,IAAI,WAAW;QAAE,cAAc,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG;OACd,YAAY;EACjB,cAAc;;;SAGP,KAAK,CAAC,aAAa;UAClB,KAAK,CAAC,oBAAoB;eACrB,KAAK,CAAC,WAAW;SACvB,KAAK,CAAC,YAAY;EACzB,cAAc;;;EAGd,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,eAAe;;;mBAG1C,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;gCACjB,CAAC;IAE/B,OAAO;QACL,MAAM,EAAE,kBAAkB;QAC1B,IAAI,EAAE,UAAU;KACjB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAAC,KAAwB;IACxD,MAAM,gBAAgB,GAAG,KAAK,CAAC,UAAU;SACtC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,UAAU,CAAC;SAC1I,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;QACtD,CAAC,CAAC,gBAAgB,KAAK,CAAC,eAAe;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,aAAa,IAAI,CAAC;aAC5G,IAAI,CAAC,IAAI,CAAC,EAAE;QACjB,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GAAG,eAAe,gBAAgB,GAAG,eAAe;;;6BAGzC,CAAC;IAE5B,OAAO;QACL,MAAM,EAAE,qBAAqB;QAC7B,IAAI,EAAE,UAAU;KACjB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CACjC,OAAwB,EACxB,cAAsB;IAEtB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACzD,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;IAE1E,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM;QACvC,CAAC,CAAC,eAAe,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAChG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,mBAAmB,GAAG,OAAO,EAAE,aAAa,EAAE,MAAM;QACxD,CAAC,CAAC,iBAAiB,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACzF,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GAAG;EACnB,cAAc;;;OAGT,KAAK;OACL,SAAS;SACP,QAAQ;WACN,gBAAgB,CAAC,MAAM,SAAS,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;SACtH,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;;;EAGlC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;EAChC,WAAW,GAAG,mBAAmB,EAAE,CAAC;IAEpC,OAAO;QACL,MAAM,EAAE,uBAAuB;QAC/B,IAAI,EAAE,UAAU;KACjB,CAAC;AACJ,CAAC;AAED,yDAAyD;AAEzD,MAAa,yBAAyB;IAGpC,YAAY,QAAa;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,yBAAyB,CAAC,KAAsB;QACpD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACrC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EACjC,MAAM,CACP,CAAC;QACF,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,OAAO;YACpB,UAAU,EAAE;gBACV,YAAY,EAAE,MAAM,CAAC,KAAK,EAAE,YAAY,IAAI,MAAM,CAAC,KAAK,EAAE,aAAa,IAAI,CAAC;gBAC5E,gBAAgB,EAAE,MAAM,CAAC,KAAK,EAAE,gBAAgB,IAAI,MAAM,CAAC,KAAK,EAAE,iBAAiB,IAAI,CAAC;aACzF;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,sBAAsB,CAAC,KAAwB;QACnD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACrC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EACjC,MAAM,CACP,CAAC;QACF,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,OAAO;YACpB,UAAU,EAAE;gBACV,YAAY,EAAE,MAAM,CAAC,KAAK,EAAE,YAAY,IAAI,MAAM,CAAC,KAAK,EAAE,aAAa,IAAI,CAAC;gBAC5E,gBAAgB,EAAE,MAAM,CAAC,KAAK,EAAE,gBAAgB,IAAI,MAAM,CAAC,KAAK,EAAE,iBAAiB,IAAI,CAAC;aACzF;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CACpB,OAAwB,EACxB,cAAsB;QAEtB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACrC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EACjC,MAAM,CACP,CAAC;QACF,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,OAAO;YACpB,UAAU,EAAE;gBACV,YAAY,EAAE,MAAM,CAAC,KAAK,EAAE,YAAY,IAAI,MAAM,CAAC,KAAK,EAAE,aAAa,IAAI,CAAC;gBAC5E,gBAAgB,EAAE,MAAM,CAAC,KAAK,EAAE,gBAAgB,IAAI,MAAM,CAAC,KAAK,EAAE,iBAAiB,IAAI,CAAC;aACzF;SACF,CAAC;IACJ,CAAC;CACF;AA/DD,8DA+DC"}
|
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
cardStyle, getButtonStyle, getPaginationButtonStyle,
|
|
12
12
|
} from '../utils/styles';
|
|
13
13
|
import { TeachingSummary } from './useTeachingSummary';
|
|
14
|
-
import { useTeachingReview } from './useTeachingReview';
|
|
14
|
+
import { useTeachingReview, FeedbackStats } from './useTeachingReview';
|
|
15
15
|
|
|
16
16
|
// ─── Constants ────────────────────────────────────────────────────────────────
|
|
17
17
|
|
|
@@ -122,8 +122,24 @@ const SummaryCard: React.FC<SummaryCardProps> = ({ summary }) => {
|
|
|
122
122
|
</div>
|
|
123
123
|
)}
|
|
124
124
|
|
|
125
|
-
<div style={{
|
|
126
|
-
|
|
125
|
+
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: SPACING.sm }}>
|
|
126
|
+
{summary.feedback ? (
|
|
127
|
+
<span style={{
|
|
128
|
+
display: 'inline-flex', alignItems: 'center', gap: '4px',
|
|
129
|
+
fontSize: '12px',
|
|
130
|
+
color: summary.feedback.rating === 'up' ? '#16A34A' : '#DC2626',
|
|
131
|
+
}}>
|
|
132
|
+
{summary.feedback.rating === 'up' ? '\u{1F44D}' : '\u{1F44E}'}
|
|
133
|
+
{summary.feedback.rating === 'up' ? '有帮助' : '没帮助'}
|
|
134
|
+
</span>
|
|
135
|
+
) : (
|
|
136
|
+
<span style={{ fontSize: '12px', color: COLORS.textMuted }}>
|
|
137
|
+
未评价
|
|
138
|
+
</span>
|
|
139
|
+
)}
|
|
140
|
+
<span style={{ fontSize: '12px', color: COLORS.primary }}>
|
|
141
|
+
查看详细分析 →
|
|
142
|
+
</span>
|
|
127
143
|
</div>
|
|
128
144
|
</div>
|
|
129
145
|
);
|
|
@@ -181,8 +197,50 @@ interface TeachingReviewPanelProps {
|
|
|
181
197
|
domainId: string;
|
|
182
198
|
}
|
|
183
199
|
|
|
200
|
+
// ─── Feedback stats bar ──────────────────────────────────────────────────────
|
|
201
|
+
|
|
202
|
+
const FeedbackStatsBar: React.FC<{ stats: FeedbackStats }> = ({ stats }) => {
|
|
203
|
+
const total = stats.up + stats.down;
|
|
204
|
+
if (total === 0) return null;
|
|
205
|
+
|
|
206
|
+
const upPct = Math.round((stats.up / total) * 100);
|
|
207
|
+
|
|
208
|
+
return (
|
|
209
|
+
<div style={{
|
|
210
|
+
display: 'flex', alignItems: 'center', gap: SPACING.base,
|
|
211
|
+
padding: `${SPACING.sm} ${SPACING.base}`,
|
|
212
|
+
backgroundColor: '#F8FAFC',
|
|
213
|
+
borderRadius: RADIUS.md,
|
|
214
|
+
marginBottom: SPACING.lg,
|
|
215
|
+
fontSize: '13px',
|
|
216
|
+
}}>
|
|
217
|
+
<span style={{ color: COLORS.textSecondary, fontWeight: 500 }}>教学总结反馈</span>
|
|
218
|
+
<span style={{ display: 'inline-flex', alignItems: 'center', gap: '4px', color: '#16A34A' }}>
|
|
219
|
+
{'\u{1F44D}'} {stats.up}
|
|
220
|
+
</span>
|
|
221
|
+
<span style={{ display: 'inline-flex', alignItems: 'center', gap: '4px', color: '#DC2626' }}>
|
|
222
|
+
{'\u{1F44E}'} {stats.down}
|
|
223
|
+
</span>
|
|
224
|
+
{/* Progress bar */}
|
|
225
|
+
<div style={{
|
|
226
|
+
flex: 1, height: '6px', backgroundColor: '#FEE2E2',
|
|
227
|
+
borderRadius: '3px', overflow: 'hidden', minWidth: '60px',
|
|
228
|
+
}}>
|
|
229
|
+
<div style={{
|
|
230
|
+
width: `${upPct}%`, height: '100%',
|
|
231
|
+
backgroundColor: '#16A34A', borderRadius: '3px',
|
|
232
|
+
transition: 'width 300ms ease',
|
|
233
|
+
}} />
|
|
234
|
+
</div>
|
|
235
|
+
<span style={{ color: COLORS.textMuted, fontSize: '12px' }}>
|
|
236
|
+
{upPct}% 好评
|
|
237
|
+
</span>
|
|
238
|
+
</div>
|
|
239
|
+
);
|
|
240
|
+
};
|
|
241
|
+
|
|
184
242
|
export const TeachingReviewPanel: React.FC<TeachingReviewPanelProps> = ({ domainId }) => {
|
|
185
|
-
const { summaries, total, page, loading, fetchList } = useTeachingReview(domainId);
|
|
243
|
+
const { summaries, total, page, loading, feedbackStats, fetchList } = useTeachingReview(domainId);
|
|
186
244
|
|
|
187
245
|
useEffect(() => {
|
|
188
246
|
fetchList(1);
|
|
@@ -215,6 +273,9 @@ export const TeachingReviewPanel: React.FC<TeachingReviewPanelProps> = ({ domain
|
|
|
215
273
|
</button>
|
|
216
274
|
</div>
|
|
217
275
|
|
|
276
|
+
{/* Feedback stats */}
|
|
277
|
+
{!loading && <FeedbackStatsBar stats={feedbackStats} />}
|
|
278
|
+
|
|
218
279
|
{/* Loading state */}
|
|
219
280
|
{loading && (
|
|
220
281
|
<div style={{ textAlign: 'center', padding: SPACING.xl, color: COLORS.textMuted }}>
|
|
@@ -41,6 +41,11 @@ const I18N_FALLBACK: Record<string, string> = {
|
|
|
41
41
|
ai_helper_teaching_summary_failed: '生成失败，请重试',
|
|
42
42
|
ai_helper_teaching_summary_empty: '暂无教学总结，点击上方按钮生成',
|
|
43
43
|
ai_helper_teaching_summary_generating_notice: '正在分析学生学习数据，请稍候...',
|
|
44
|
+
ai_helper_teaching_summary_phase_collecting_data: '正在收集学生提交记录和对话数据...',
|
|
45
|
+
ai_helper_teaching_summary_phase_analyzing: '正在分析错误模式和学习行为...',
|
|
46
|
+
ai_helper_teaching_summary_phase_generating_suggestion: 'AI 正在生成教学建议...',
|
|
47
|
+
ai_helper_teaching_summary_phase_deep_diving: '正在对重点问题进行深度诊断...',
|
|
48
|
+
ai_helper_teaching_summary_phase_saving: '正在保存分析结果...',
|
|
44
49
|
};
|
|
45
50
|
|
|
46
51
|
function t(key: string): string {
|
|
@@ -437,7 +442,9 @@ export const TeachingSummaryPanel: React.FC<TeachingSummaryPanelProps> = ({ doma
|
|
|
437
442
|
}} />
|
|
438
443
|
<style>{`@keyframes spin { from { transform: rotate(0deg); } to { transform: rotate(360deg); } }`}</style>
|
|
439
444
|
<div style={{ color: COLORS.textMuted, fontSize: '14px' }}>
|
|
440
|
-
{t(
|
|
445
|
+
{t(summary.progressPhase
|
|
446
|
+
? `ai_helper_teaching_summary_phase_${summary.progressPhase}`
|
|
447
|
+
: 'ai_helper_teaching_summary_generating_notice')}
|
|
441
448
|
</div>
|
|
442
449
|
</div>
|
|
443
450
|
);
|
|
@@ -7,11 +7,17 @@ import { buildReviewUrl, TeachingSummary } from './useTeachingSummary';
|
|
|
7
7
|
|
|
8
8
|
// ─── Return type ──────────────────────────────────────────────────────────────
|
|
9
9
|
|
|
10
|
+
export interface FeedbackStats {
|
|
11
|
+
up: number;
|
|
12
|
+
down: number;
|
|
13
|
+
}
|
|
14
|
+
|
|
10
15
|
export interface UseTeachingReviewReturn {
|
|
11
16
|
summaries: TeachingSummary[];
|
|
12
17
|
total: number;
|
|
13
18
|
page: number;
|
|
14
19
|
loading: boolean;
|
|
20
|
+
feedbackStats: FeedbackStats;
|
|
15
21
|
fetchList: (page: number) => Promise<void>;
|
|
16
22
|
}
|
|
17
23
|
|
|
@@ -24,6 +30,7 @@ export function useTeachingReview(domainId: string): UseTeachingReviewReturn {
|
|
|
24
30
|
const [total, setTotal] = useState(0);
|
|
25
31
|
const [page, setPage] = useState(1);
|
|
26
32
|
const [loading, setLoading] = useState(false);
|
|
33
|
+
const [feedbackStats, setFeedbackStats] = useState<FeedbackStats>({ up: 0, down: 0 });
|
|
27
34
|
|
|
28
35
|
const fetchList = useCallback(async (targetPage: number) => {
|
|
29
36
|
setLoading(true);
|
|
@@ -39,6 +46,9 @@ export function useTeachingReview(domainId: string): UseTeachingReviewReturn {
|
|
|
39
46
|
setSummaries(data.summaries ?? []);
|
|
40
47
|
setTotal(data.total ?? 0);
|
|
41
48
|
setPage(targetPage);
|
|
49
|
+
if (data.feedbackStats) {
|
|
50
|
+
setFeedbackStats(data.feedbackStats);
|
|
51
|
+
}
|
|
42
52
|
} catch {
|
|
43
53
|
// ignore transient errors
|
|
44
54
|
} finally {
|
|
@@ -46,5 +56,5 @@ export function useTeachingReview(domainId: string): UseTeachingReviewReturn {
|
|
|
46
56
|
}
|
|
47
57
|
}, [domainId]);
|
|
48
58
|
|
|
49
|
-
return { summaries, total, page, loading, fetchList };
|
|
59
|
+
return { summaries, total, page, loading, feedbackStats, fetchList };
|
|
50
60
|
}
|
|
@@ -35,6 +35,7 @@ export interface TeachingSummary {
|
|
|
35
35
|
createdAt: string;
|
|
36
36
|
dataSnapshotAt: string;
|
|
37
37
|
status: 'pending' | 'generating' | 'completed' | 'failed';
|
|
38
|
+
progressPhase?: 'collecting_data' | 'analyzing' | 'generating_suggestion' | 'deep_diving' | 'saving';
|
|
38
39
|
stats: {
|
|
39
40
|
totalStudents: number;
|
|
40
41
|
participatedStudents: number;
|
|
@@ -118,13 +119,19 @@ export function useTeachingSummary(domainId: string, contestId: string): UseTeac
|
|
|
118
119
|
return;
|
|
119
120
|
}
|
|
120
121
|
const data = await res.json();
|
|
121
|
-
|
|
122
|
+
const fetched: TeachingSummary | null = data.summary ?? null;
|
|
123
|
+
setSummary(fetched);
|
|
124
|
+
|
|
125
|
+
// Auto-start polling if generation is in progress (e.g. after page refresh)
|
|
126
|
+
if (fetched && (fetched.status === 'pending' || fetched.status === 'generating')) {
|
|
127
|
+
startPolling();
|
|
128
|
+
}
|
|
122
129
|
} catch (err) {
|
|
123
130
|
setError(err instanceof Error ? err.message : 'Unknown error');
|
|
124
131
|
} finally {
|
|
125
132
|
setLoading(false);
|
|
126
133
|
}
|
|
127
|
-
}, [domainId, contestId]);
|
|
134
|
+
}, [domainId, contestId, startPolling]);
|
|
128
135
|
|
|
129
136
|
const startPolling = useCallback(() => {
|
|
130
137
|
stopPolling();
|