From ec71609343b4e2c027947630879d7fc4f900efe8 Mon Sep 17 00:00:00 2001 From: lyun Date: Fri, 23 Oct 2026 21:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=8C=89=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=AB=A0=E8=8A=82=E6=95=B4=E5=90=88=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E4=B8=8E=E5=AE=8C=E6=95=B4=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ai/nao-quality/agent/prompts/system.md | 8 + .../AnalysisVisualSnapshotAccess.java | 106 +++++- .../AnalysisVisualSnapshotAccessTest.java | 96 ++++- scripts/analysis_visuals.py | 357 ++++++++++++++---- scripts/nao_evidence_report.py | 44 ++- web/src/AiMarkdown.tsx | 25 +- web/src/AnalysisLegacyResults.tsx | 43 +++ web/src/AnalysisNarrative.tsx | 63 ++++ web/src/AnalysisReportExport.tsx | 99 ++--- web/src/AnalysisReportNarrative.tsx | 34 ++ web/src/AnalysisReportVisuals.tsx | 60 +-- web/src/AnalysisVisuals.tsx | 7 +- web/src/ManagementPages.tsx | 10 +- web/src/analysis-narrative.css | 66 ++++ web/src/analysisReportModel.ts | 173 +++++++++ web/src/analysisVisualPresentation.ts | 2 +- web/src/analysisVisualsModel.ts | 323 +++++++++++++--- web/src/nativeReportNarrative.ts | 55 +++ web/src/styles.d.ts | 4 + web/verification/analysis_report.test.mjs | 103 +++++ web/verification/analysis_visuals.test.mjs | 188 ++++++++- 21 files changed, 1607 insertions(+), 259 deletions(-) create mode 100644 web/src/AnalysisLegacyResults.tsx create mode 100644 web/src/AnalysisNarrative.tsx create mode 100644 web/src/AnalysisReportNarrative.tsx create mode 100644 web/src/analysis-narrative.css create mode 100644 web/src/analysisReportModel.ts create mode 100644 web/src/nativeReportNarrative.ts create mode 100644 web/src/styles.d.ts create mode 100644 web/verification/analysis_report.test.mjs diff --git a/ai/nao-quality/agent/prompts/system.md b/ai/nao-quality/agent/prompts/system.md index e418321..94d7283 100644 --- a/ai/nao-quality/agent/prompts/system.md +++ b/ai/nao-quality/agent/prompts/system.md @@ -27,6 +27,14 @@ releaseId、发布版本号、候选发布状态、Story ID/slug/version 仅作 ## 输出与收尾 +报告与聊天均按“结论—对应图表—解释—依据”的阅读关系组织内容。平台会将图表插入相应语义章节,不再在末尾统一堆放。根据本轮真实问题选择章节:整体比较、阶段变化、产业部变化、业务分组变化、正式报废类别、具体缺陷、重点产品/规格、交叉核查、下一步;不强制窄范围问答套整套章节。章节标题保留对应业务词,并用简短判断说明本节要点;图表由平台提供,正文不要写“见下图”或虚构图号。 + +整体变化先用简短摘要说清变化方向、主要阶段和优先核查线索,再展开各节。每节先写一到三句解释已确认的现象及实际含义,必要时附一张紧凑数据表,不只连续抄表、不在“重点关注”重复全部数字。阶段数学影响沿用 stageDecomposition 的服务端结果,不能把阶段自身率变化当作对综合率贡献,也不把数学拆解称现场生产根因。亮片报废下降而投入下降更多时,要明确解释合格率仍可能下降。 + +常规整体分析的重点规格优先结合报废增量、当前规模、率变化和分阶段有效投入确定核查优先级。单按合格率降幅返回的小批量、0率或阶段缺失规格,另列“极端率变化线索”,不能只因降幅大就称整体主要原因;两期分母未查清时不推断停产、退出或全批报废。用户明确只看降幅排名时保留真实排名与批量背景。不得自设未授权的最低批量阈值或忽略小批量的安全/质量异常。 + +组织、规格和具体缺陷之间的关系只写实际交叉查询已经核对的联系;没有交叉证据时保持各自范围,不把两个独立排名拼成因果链。最后只列能执行的优先核查问题,分清已确认现象与待验证原因,不编造责任人、完成期限或闭环结果。所有图文继续复用同一轮证据;不要为了报告样式重复查询、重新计算核心指标或自动生成故事。 + 工具结果足以回答后,立即用最终答复收尾,不继续写研究过程。即使有部分工具失败,也要交代已确认的结果和具体缺口,不陷入重复尝试或无限思考。不得声称工具失败时完成了对应分析。 按问题组织答案,不套用固定两张TOP表。整体变化应清楚呈现:总体与阶段判断、各产业部变化、各业务分组变化、报废大类与具体缺陷、重点产品/规格、按优先级排列的关注方向与核查行动。产业部和业务分组分别呈现,较少时逐项列出,多时可分组简述但不遗漏重要恶化与改善;不要让读者从TOP规格推测组织情况。产品、缺陷的重点之间说明已核对的联系。简短追问只回答新增问题。必要内容优先,避免重复与冗长导致截断,不以1000字限制牺牲已要求的分析角度。长规格名保留原文。TOP规格严格取工具rank=1至5,不能把其他关注规格替换进入TOP5;额外关注对象另列一句。表格最多4列,报废增量、当前重量与率可择要,投入只有在分阶段核对后再表述。每张表就近标注真实证据编号及排序口径。 diff --git a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java index 49baeb1..8776f5b 100644 --- a/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java +++ b/backend/src/main/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccess.java @@ -19,14 +19,15 @@ import tools.jackson.databind.json.JsonMapper; public final class AnalysisVisualSnapshotAccess { public static final int SCHEMA_VERSION = 1; public static final int MAX_SNAPSHOT_BYTES = 256 * 1024; - private static final int MAX_VISUALS = 3; + private static final int MAX_VISUALS = 12; private static final int MAX_CATEGORIES = 36; private static final int MAX_SERIES = 1; private static final int MAX_TEXT_BYTES = 2048; private static final Pattern SAFE_KEY = Pattern.compile("[A-Za-z0-9][A-Za-z0-9_.:-]{0,119}"); private static final Pattern SAFE_EVIDENCE_REF = Pattern.compile("[A-Za-z0-9:_-]{1,160}"); private static final Set CHART_KEYS = Set.of("id", "type", "title", "subtitle", "unit", "categories", "series", - "evidenceRefs", "requiredFields", "scope", "period", "comparisonPeriod", "stage", "metric", "coverage", "note", "originTurnId"); + "evidenceRefs", "requiredFields", "scope", "period", "comparisonPeriod", "stage", "metric", "coverage", "note", + "originTurnId", "sectionKey", "dimension"); private static final Set SCOPE_KEYS = Set.of("year", "month", "quarter", "department", "group", "product", "projectGroup", "view", "includeUnassigned", "releaseId", "extraFilters", "stage", "category", "defect"); private static final Set PERIOD_KEYS = Set.of("start", "end", "label", "granularity", "year", "month", "quarter"); @@ -122,12 +123,18 @@ public final class AnalysisVisualSnapshotAccess { String id = text(input.get("id"), 120, true); if (!SAFE_KEY.matcher(id).matches()) return null; - String type = enumText(input.get("type"), Set.of("bar", "line", "column", "area", "heatmap", "donut", "pareto")); + String type = enumText(input.get("type"), Set.of("bar", "line", "column", "area", "heatmap", "donut", "pareto", "waterfall")); String title = text(input.get("title"), 200, false); String subtitle = input.containsKey("subtitle") ? text(input.get("subtitle"), 400, false) : null; String unit = enumText(input.get("unit"), Set.of("ratio", "kg", "pp", "count")); String metric = enumText(input.get("metric"), metricNames()); String origin = text(input.get("originTurnId"), 64, true); + String sectionKey = input.containsKey("sectionKey") + ? enumText(input.get("sectionKey"), Set.of("overview", "stage", "department", "group", "product", + "category_black", "category_bright", "defect_black", "defect_bright", "trend", "composition")) : null; + String dimension = input.containsKey("dimension") + ? enumText(input.get("dimension"), Set.of("department", "group", "product", "category", "defect")) : null; + if (input.containsKey("sectionKey") && sectionKey == null || input.containsKey("dimension") && dimension == null) return null; if (turnId == null || !turnId.equals(origin)) return null; MetricSemantics semantics = semantics(metric, input.get("stage")); @@ -152,12 +159,14 @@ public final class AnalysisVisualSnapshotAccess { Map coverage = normalizeCoverage(input.get("coverage"), requiredFields, semantics.stage(), type); if (coverage == null) return null; if (!validCompositionChart(type, metric, unit, semantics, categories, series, coverage, comparisonPeriod) - || !validPeriodChart(type, metric, semantics, period, comparisonPeriod, categories, series)) return null; + || !validPeriodChart(type, metric, semantics, period, comparisonPeriod, categories, series) + || !validWaterfallChart(type, metric, unit, semantics, categories, series, coverage, period, comparisonPeriod)) return null; if (!allowedFields.contains("*") && !allowedFields.containsAll(requiredFields)) return null; Map scope = normalizeScope(input.get("scope"), visibleExtraFilterKeys, expectedScope); Object scopedStage = scope == null ? null : scope.get("stage"); if (scope == null || scopedStage != null && !"all".equals(scopedStage) && (semantics.stage() == null || !semantics.stage().equals(scopedStage))) return null; + if (!validChapterMetadata(sectionKey, dimension, type, metric, semantics, scope, period)) return null; if (semantics.sourceDefect() && !sourceDefectScopeMatches(scope, semantics.stage(), categories)) return null; String note = input.containsKey("note") ? text(input.get("note"), 500, false) : null; @@ -171,6 +180,8 @@ public final class AnalysisVisualSnapshotAccess { if (semantics.stage() != null) result.put("stage", semantics.stage()); result.put("metric", metric); result.put("coverage", coverage); if (note != null) result.put("note", note); + if (sectionKey != null) result.put("sectionKey", sectionKey); + if (dimension != null) result.put("dimension", dimension); result.put("originTurnId", turnId); return result; } @@ -219,7 +230,8 @@ public final class AnalysisVisualSnapshotAccess { "bright_headquarters_scrap", "bright_plating_scrap", "bright_material_scrap", "bright_processing_scrap", "bright_diffusion_scrap", "current_scrap_weight", "source_defect_weight").contains(metric) && decimal.signum() < 0) return null; - if ("rate_drop_pp".equals(metric) && decimal.abs().compareTo(BigDecimal.valueOf(100)) > 0) return null; + if (Set.of("rate_drop_pp", "composite_impact_pp").contains(metric) + && decimal.abs().compareTo(BigDecimal.valueOf(100)) > 0) return null; numbers.add(decimal); } } @@ -409,6 +421,86 @@ public final class AnalysisVisualSnapshotAccess { return sum.signum() > 0; } + private static boolean validWaterfallChart(String type, String metric, String unit, MetricSemantics semantics, + List> categories, + List> series, + Map coverage, + Map period, + Map comparisonPeriod) { + if (!"waterfall".equals(type)) return !"composite_impact_pp".equals(metric); + if (!"composite_impact_pp".equals(metric) || !"pp".equals(unit) || semantics.stage() != null + || !Set.of("black_good_weight", "black_total_weight", "bright_good_weight", "bright_total_weight") + .equals(semantics.requiredFields()) + || !List.of("black", "bright", "total").equals( + categories.stream().map(item -> item.get("key")).toList()) + || series.size() != 1 || comparisonPeriod == null || samePeriod(period, comparisonPeriod)) return false; + Object totalRaw = coverage.get("totalRows"), returnedRaw = coverage.get("returnedRows"); + if (!(totalRaw instanceof Number total) || !(returnedRaw instanceof Number returned) + || total.longValue() != 3 || returned.longValue() != 3 || !Boolean.FALSE.equals(coverage.get("truncated"))) return false; + Object raw = series.getFirst().get("values"); + if (!(raw instanceof List values) || values.size() != 3) return false; + BigDecimal[] points = new BigDecimal[3]; + for (int index = 0; index < values.size(); index++) { + points[index] = decimal(values.get(index)); + if (points[index] == null || points[index].abs().compareTo(BigDecimal.valueOf(100)) > 0) return false; + } + BigDecimal tolerance = new BigDecimal("0.000001"); + return points[0].add(points[1]).subtract(points[2]).abs().compareTo(tolerance) <= 0; + } + + private static boolean samePeriod(Map period, Map comparisonPeriod) { + if (period.keySet().stream().anyMatch(Set.of("start", "end", "granularity")::contains) + || comparisonPeriod.keySet().stream().anyMatch(Set.of("start", "end", "granularity")::contains)) { + return period.get("start") != null && period.get("start").equals(comparisonPeriod.get("start")) + && java.util.Objects.equals(period.get("end"), comparisonPeriod.get("end")) + && java.util.Objects.equals(period.get("granularity"), comparisonPeriod.get("granularity")); + } + return java.util.Objects.equals(period.get("year"), comparisonPeriod.get("year")) + && java.util.Objects.equals(period.get("month"), comparisonPeriod.get("month")) + && java.util.Objects.equals(period.get("quarter"), comparisonPeriod.get("quarter")); + } + + private static boolean validChapterMetadata(String section, String dimension, String type, String metric, + MetricSemantics semantics, Map scope, + Map period) { + if (section == null && dimension == null) return true; // schema-1 snapshots created before chapter metadata + boolean grouped = Set.of("bar", "column").contains(type); + boolean sourceMetric = Set.of("source_defect_weight", "source_defect_delta_weight").contains(metric) + && semantics.sourceDefect(); + if (dimension != null && section == null) { + return switch (dimension) { + case "department", "group", "product" -> grouped + && Set.of("current_scrap_weight", "scrap_delta", "rate_drop_pp").contains(metric); + case "category" -> sourceMetric && (grouped || Set.of("donut", "pareto").contains(type)); + case "defect" -> sourceMetric && grouped; + default -> false; + }; + } + return switch (section) { + case "overview" -> dimension == null && (("composite_rate".equals(metric) && Set.of("bar", "column").contains(type)) + || "composite_impact_pp".equals(metric) && "waterfall".equals(type)); + case "stage" -> dimension == null && Set.of("black_rate", "bright_rate").contains(metric) + && semantics.stage() != null && semantics.stage().equals(metric.substring(0, metric.indexOf('_'))) + && grouped; + case "department" -> "department".equals(dimension) && grouped + && Set.of("current_scrap_weight", "scrap_delta", "rate_drop_pp").contains(metric); + case "group" -> "group".equals(dimension) && grouped + && Set.of("current_scrap_weight", "scrap_delta", "rate_drop_pp").contains(metric); + case "product" -> "product".equals(dimension) && grouped + && Set.of("current_scrap_weight", "scrap_delta", "rate_drop_pp").contains(metric); + case "category_black", "category_bright" -> "category".equals(dimension) && grouped && sourceMetric + && semantics.stage().equals("category_black".equals(section) ? "black" : "bright"); + case "defect_black", "defect_bright" -> "defect".equals(dimension) && grouped && sourceMetric + && semantics.stage().equals("defect_black".equals(section) ? "black" : "bright"); + case "trend" -> dimension == null && Set.of("line", "area", "heatmap").contains(type) + && Set.of("composite_rate", "black_rate", "bright_rate", "current_scrap_weight").contains(metric) + && period.containsKey("start") && period.containsKey("end") && period.containsKey("granularity"); + case "composition" -> "category".equals(dimension) && Set.of("donut", "pareto").contains(type) + && "source_defect_weight".equals(metric) && semantics.sourceDefect(); + default -> false; + }; + } + private static boolean validPeriodChart(String type, String metric, MetricSemantics semantics, Map period, Map comparisonPeriod, List> categories, @@ -555,6 +647,8 @@ public final class AnalysisVisualSnapshotAccess { : new MetricSemantics("pp", stage, stage.equals("black") ? Set.of("black_good_weight", "black_total_weight") : Set.of("bright_good_weight", "bright_total_weight"), false); + case "composite_impact_pp" -> stage == null ? new MetricSemantics("pp", null, + Set.of("black_good_weight", "black_total_weight", "bright_good_weight", "bright_total_weight"), false) : null; case "source_defect_weight", "source_defect_delta_weight" -> stage == null ? null : new MetricSemantics("kg", stage, Set.of(), true); default -> null; @@ -564,7 +658,7 @@ public final class AnalysisVisualSnapshotAccess { private static Set metricNames() { Set result = new LinkedHashSet<>(WEIGHT_METRICS); result.addAll(Set.of("composite_rate", "black_rate", "bright_rate", "scrap_delta", "rate_drop_pp", - "current_scrap_weight", "source_defect_weight", "source_defect_delta_weight")); + "current_scrap_weight", "source_defect_weight", "source_defect_delta_weight", "composite_impact_pp")); return result; } diff --git a/backend/src/test/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccessTest.java b/backend/src/test/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccessTest.java index 03e5e4c..ba0d0c6 100644 --- a/backend/src/test/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccessTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/analysis/AnalysisVisualSnapshotAccessTest.java @@ -131,9 +131,79 @@ class AnalysisVisualSnapshotAccessTest { ((List>) wrongSeries.get("series")).getFirst().put("key", "bright_rate"); assertEquals("failed", normalize(List.of(wrongSeries), RATE_FIELDS, SCOPE).state()); - List> tooMany = new ArrayList<>(); - for (int i = 0; i < 4; i++) tooMany.add(chart("black_rate", "ratio", "black", List.of(), List.of(0.9, 0.95), "v1-" + i)); - assertEquals("failed", normalize(tooMany, RATE_FIELDS, SCOPE).state()); + List> maximum = new ArrayList<>(); + for (int i = 0; i < 12; i++) maximum.add(chart("black_rate", "ratio", "black", List.of(), List.of(0.9, 0.95), "v1-" + i)); + assertEquals("ready", normalize(maximum, RATE_FIELDS, SCOPE).state()); + maximum.add(chart("black_rate", "ratio", "black", List.of(), List.of(0.9, 0.95), "v1-overflow")); + assertEquals("failed", normalize(maximum, RATE_FIELDS, SCOPE).state()); + } + + @Test + void acceptsReconciledMathOnlyWaterfallAndRejectsForgedDecompositionShapes() { + Set allFields = Set.of("black_good_weight", "black_total_weight", "bright_good_weight", "bright_total_weight"); + Map valid = waterfallChart(); + AnalysisVisualSnapshotAccess.Snapshot accepted = normalize(List.of(valid), allFields, SCOPE); + assertEquals("ready", accepted.state()); + assertEquals("overview", accepted.visuals().getFirst().get("sectionKey")); + assertEquals(allFields, Set.copyOf((List) accepted.visuals().getFirst().get("requiredFields"))); + + Map wrongSum = waterfallChart(); + wrongSum.put("series", List.of(Map.of("key", "composite_impact_pp", "label", "影响", "values", List.of(-0.3, -0.14, -0.5)))); + Map wrongKeys = waterfallChart(); + wrongKeys.put("categories", List.of(Map.of("key", "black", "label", "黑片"), + Map.of("key", "total", "label", "总计"), Map.of("key", "bright", "label", "亮片"))); + Map missingComparisonPeriod = waterfallChart(); + missingComparisonPeriod.remove("comparisonPeriod"); + Map wrongChapter = waterfallChart(); + wrongChapter.put("sectionKey", "stage"); + Map wrongDimension = waterfallChart(); + wrongDimension.put("dimension", "product"); + Map nullPoint = waterfallChart(); + nullPoint.put("series", List.of(Map.of("key", "composite_impact_pp", "label", "影响", "values", java.util.Arrays.asList(-0.3, null, -0.44)))); + + for (Map invalid : List.of(wrongSum, wrongKeys, missingComparisonPeriod, wrongChapter, wrongDimension, nullPoint)) + assertEquals("failed", normalize(List.of(invalid), allFields, SCOPE).state()); + } + + @Test + void chapterMetadataMustMatchTheChartMeaningWhileLegacySnapshotsRemainValid() { + Map valid = chart("black_rate", "ratio", "black", List.of(), List.of(0.9, 0.95)); + valid.put("sectionKey", "stage"); + AnalysisVisualSnapshotAccess.Snapshot accepted = normalize(List.of(valid), RATE_FIELDS, SCOPE); + assertEquals("ready", accepted.state()); + assertEquals("stage", accepted.visuals().getFirst().get("sectionKey")); + + Map legacy = chart("black_rate", "ratio", "black", List.of(), List.of(0.9, 0.95)); + assertEquals("ready", normalize(List.of(legacy), RATE_FIELDS, SCOPE).state()); + + Map wrongDimension = chart("black_rate", "ratio", "black", List.of(), List.of(0.9, 0.95)); + wrongDimension.put("sectionKey", "stage"); + wrongDimension.put("dimension", "product"); + Map unknownSection = chart("black_rate", "ratio", "black", List.of(), List.of(0.9, 0.95)); + unknownSection.put("sectionKey", "root_cause"); + assertEquals("failed", normalize(List.of(wrongDimension), RATE_FIELDS, SCOPE).state()); + assertEquals("failed", normalize(List.of(unknownSection), RATE_FIELDS, SCOPE).state()); + } + + @Test + void formalCategoryAndSpecificDefectSectionsRequireMatchingStageAndDimension() { + String formalField = "black_responsibility_scrap"; + Map category = sourceDefectChart("black", formalField, List.of(formalField)); + category.put("sectionKey", "category_black"); + category.put("dimension", "category"); + assertEquals("ready", normalize(List.of(category), Set.of(formalField), SCOPE).state()); + + Map rawDetail = sourceDefectChart("black", "责废其他重量", List.of("责废其他重量")); + rawDetail.put("sectionKey", "defect_black"); + rawDetail.put("dimension", "defect"); + assertEquals("ready", normalize(List.of(rawDetail), Set.of("责废其他重量"), SCOPE).state()); + + Map wrongCategoryStage = new LinkedHashMap<>(category); + wrongCategoryStage.put("sectionKey", "category_bright"); + Map wrongDetailDimension = new LinkedHashMap<>(rawDetail); + wrongDetailDimension.put("dimension", "category"); + assertEquals("failed", normalize(List.of(wrongCategoryStage), Set.of(formalField), SCOPE).state()); + assertEquals("failed", normalize(List.of(wrongDetailDimension), Set.of("责废其他重量"), SCOPE).state()); } @Test @@ -220,6 +290,11 @@ class AnalysisVisualSnapshotAccessTest { Map pareto = categoryShareChart("pareto", keys, List.of(3.0, 2.0, 1.0)); assertEquals("ready", normalize(List.of(pareto), Set.copyOf(keys), SCOPE).state()); + Map taggedDonut = categoryShareChart("donut", keys, List.of(1.0, 2.0, 3.0)); + taggedDonut.put("sectionKey", "composition"); + taggedDonut.put("dimension", "category"); + assertEquals("ready", normalize(List.of(taggedDonut), Set.copyOf(keys), SCOPE).state()); + Map unsorted = categoryShareChart("pareto", keys, List.of(2.0, 3.0, 1.0)); Map negative = categoryShareChart("donut", keys, List.of(2.0, -1.0, 1.0)); Map missing = categoryShareChart("donut", keys, java.util.Arrays.asList(2.0, null, 1.0)); @@ -345,4 +420,19 @@ class AnalysisVisualSnapshotAccessTest { chart.put("series", List.of(Map.of("key", "source_defect_weight", "label", "来源细分重量", "values", List.of(1.25)))); return chart; } + + private static Map waterfallChart() { + Set fields = Set.of("black_good_weight", "black_total_weight", "bright_good_weight", "bright_total_weight"); + Map chart = chart("composite_impact_pp", "pp", null, List.copyOf(fields), + List.of(-0.3, -0.14, -0.44), "waterfall-v1"); + chart.put("type", "waterfall"); + chart.put("sectionKey", "overview"); + chart.put("categories", List.of(Map.of("key", "black", "label", "黑片数学影响"), + Map.of("key", "bright", "label", "亮片数学影响"), Map.of("key", "total", "label", "合计"))); + chart.put("series", List.of(Map.of("key", "composite_impact_pp", "label", "数学影响(pp)", + "values", List.of(-0.3, -0.14, -0.44)))); + chart.put("comparisonPeriod", Map.of("year", 2026, "month", 8, "label", "2026-08", "granularity", "month")); + chart.put("coverage", Map.of("totalRows", 3, "returnedRows", 3, "truncated", false)); + return chart; + } } diff --git a/scripts/analysis_visuals.py b/scripts/analysis_visuals.py index 4a03dbe..324f8dd 100644 --- a/scripts/analysis_visuals.py +++ b/scripts/analysis_visuals.py @@ -17,7 +17,7 @@ from typing import Any VISUAL_SCHEMA_VERSION = 1 -MAX_VISUALS = 3 +MAX_VISUALS = 12 MAX_BODY_BYTES = 256 * 1024 MAX_RANK_ROWS = 10 MAX_TREND_POINTS = 36 @@ -51,7 +51,7 @@ _CONTROL = re.compile(r"[\x00-\x1f\x7f]") _EXPLICIT_CHART = re.compile( r"图表|画图|绘图|可视化|趋势图|柱状图|柱形图|竖向柱|纵向柱|折线图|条形图|横条图|" r"横向柱|水平柱|面积图|面积趋势|热力图|热图|环状图|环形图|环状|环形|甜甜圈|饼图|" - r"构成|占比|排名图|柏拉图|帕累托|pareto" + r"构成|占比|排名图|柏拉图|帕累托|pareto|瀑布图|waterfall" ) _NO_CHART = re.compile(r"不画图|不要(?:绘图|图表?|可视化|配图)|不需要(?:绘图|图表?|可视化|配图)|无需(?:绘图|图表|配图)|只要(?:文字|文本)|仅需(?:文字|文本)") _HORIZONTAL_BAR = re.compile(r"横向条形图|横条图|横向柱|水平条形图|水平柱|horizontal\s+bar", re.IGNORECASE) @@ -60,6 +60,7 @@ _AREA_CHART = re.compile(r"面积图|面积趋势|area\s+chart", re.IGNORECASE) _HEATMAP_CHART = re.compile(r"热力图|热图|heat\s*map", re.IGNORECASE) _DONUT_CHART = re.compile(r"环状图|环形图|环状|环形|甜甜圈|饼图|构成|占比|donut|doughnut|pie\s+chart", re.IGNORECASE) _PARETO_CHART = re.compile(r"柏拉图|帕累托|pareto", re.IGNORECASE) +_WATERFALL_CHART = re.compile(r"瀑布图|waterfall", re.IGNORECASE) _LINE_CHART = re.compile(r"折线图|折线趋势|line\s+chart", re.IGNORECASE) _BAR_CHART = re.compile(r"条形图|bar\s+chart", re.IGNORECASE) _NEGATED_STYLE_PREFIX = re.compile(r"(?:不要|不用|无需|不需要|不画|不想要)\s*(?:使用|用|画)?\s*$") @@ -211,6 +212,18 @@ def _chart_scope(filters: dict[str, Any], release_id: str, period: dict[str, Any return clean +def _scope_caption(scope: dict[str, Any]) -> str | None: + labels = (("department", "产业部"), ("group", "业务分组"), ("product", "产品"), + ("category", "类别"), ("defect", "具体缺陷")) + parts = [] + for key, label in labels: + value = _safe_text(scope.get(key), limit=80) + if value: + parts.append(f"{label}:{value}") + caption = ",".join(parts) + return caption[:200] if caption else None + + def _period(value: Any) -> tuple[dict[str, int] | None, str | None, tuple[int, int, int] | None]: if not isinstance(value, dict): return None, None, None @@ -298,6 +311,8 @@ def _chart( metric: str, coverage: dict[str, Any], note: str | None = None, + section_key: str | None = None, + dimension: str | None = None, ) -> dict[str, Any]: chart: dict[str, Any] = { "type": chart_type, @@ -319,6 +334,11 @@ def _chart( chart["comparisonPeriod"] = comparison_period if stage in ("black", "bright"): chart["stage"] = stage + if section_key in {"overview", "stage", "department", "group", "product", "category_black", + "category_bright", "defect_black", "defect_bright", "trend", "composition"}: + chart["sectionKey"] = section_key + if dimension in {"department", "group", "product", "category", "defect"}: + chart["dimension"] = dimension if note: chart["note"] = note[:240] identity = dict(chart) @@ -388,16 +408,18 @@ def _comparison_charts(document: dict[str, Any], result: dict[str, Any], turn_id {"key": "comparison", "label": comparison_label}, {"key": "current", "label": current_label}, ] - asked_black, asked_bright = "黑片" in question, "亮片" in question - explicit_stage_only = (asked_black or asked_bright) and not re.search(r"综合|总体", question) + asked_black = bool(re.search(r"黑片.{0,8}(?:合格率|不良率|率)|(?:合格率|不良率|率).{0,8}黑片", question)) + asked_bright = bool(re.search(r"亮片.{0,8}(?:合格率|不良率|率)|(?:合格率|不良率|率).{0,8}亮片", question)) + broad_overall = bool(re.search(r"原因|整体分析|总体分析|整体|总体|不良率|综合质量", question)) + explicit_stage_only = (asked_black or asked_bright) and not re.search(r"综合|总体|整体", question) metrics: list[tuple[str, str | None, str, Any, Any, str]] = [] if not explicit_stage_only: metrics.append(("composite_rate", None, "综合合格率", comparison.get("compositeRate"), current.get("compositeRate"), "composite_rate")) stage_changes = result.get("stageRateChangesPP") requested_stages = [] - if asked_black: + if asked_black or broad_overall and not explicit_stage_only: requested_stages.append(("black", "黑片合格率", "black_rate")) - if asked_bright: + if asked_bright or broad_overall and not explicit_stage_only: requested_stages.append(("bright", "亮片合格率", "bright_rate")) for stage, label, metric in requested_stages: old_side, now_side = comparison.get(stage), current.get(stage) @@ -433,6 +455,136 @@ def _comparison_charts(document: dict[str, Any], result: dict[str, Any], turn_id stage=stage, metric=metric, coverage={"totalRows": 2, "returnedRows": 2, "truncated": False}, + section_key="overview" if metric == "composite_rate" else "stage", + )) + return charts + + +def _comparison_waterfall(document: dict[str, Any], result: dict[str, Any], turn_id: str, + question: str) -> dict[str, Any] | None: + """Use the service's balanced decomposition for math-only attribution.""" + if result.get("kind") != "quality_comparison" or not re.search( + r"原因|整体分析|总体分析|拆解|分解|归因|为什么", question): + return None + release_id = _release_id(document, result) + scope, _ = _scope(result.get("filterBinding")) + current, comparison = result.get("current"), result.get("comparison") + delta, decomposition = result.get("delta"), result.get("stageDecomposition") + if (release_id is None or scope is None or not isinstance(current, dict) + or not isinstance(comparison, dict) or not isinstance(delta, dict) + or delta.get("available") is not True or not isinstance(decomposition, dict) + or decomposition.get("status") != "available"): + return None + period, current_label, _ = _period(current.get("period")) + comparison_period, comparison_label, _ = _period(comparison.get("period")) + if (period is None or comparison_period is None or period == comparison_period + or not _scope_compatible(scope, release_id, period=period)): + return None + values = [] + for field in ("blackContributionToCompositePP", "brightContributionToCompositePP", "sumPP"): + value, valid = _finite_number(decomposition.get(field)) + if not valid or value is None or abs(value) > 100: + return None + values.append(value) + reported_delta, delta_valid = _finite_number(delta.get("percentagePoints")) + if not delta_valid or reported_delta is None or abs(reported_delta) > 100: + return None + if not math.isclose(values[0] + values[1], values[2], rel_tol=1e-10, abs_tol=1e-6): + return None + if not math.isclose(values[2], reported_delta, rel_tol=1e-10, abs_tol=1e-6): + return None + refs = [_evidence_ref(document)] if _evidence_ref(document) else [] + return _chart( + turn_id=turn_id, + chart_type="waterfall", + title="综合合格率变化的数学影响拆解", + subtitle=f"{comparison_label} → {current_label};展示两阶段对正式综合率变化的数学影响。", + unit="pp", + categories=[ + {"key": "black", "label": "黑片数学影响"}, + {"key": "bright", "label": "亮片数学影响"}, + {"key": "total", "label": "合计"}, + ], + series=[{"key": "composite_impact_pp", "label": "对综合合格率变化的数学影响(pp)", "values": values}], + evidence_refs=refs, + required_fields=["black_good_weight", "black_total_weight", "bright_good_weight", "bright_total_weight"], + scope=_chart_scope(scope, release_id, period), + period=period, + comparison_period=comparison_period, + metric="composite_impact_pp", + coverage={"totalRows": 3, "returnedRows": 3, "truncated": False}, + note="仅为正式合格率变化的数学拆解,不代表生产根因。", + section_key="overview", + ) + + +def _comparison_category_delta_charts(document: dict[str, Any], result: dict[str, Any], turn_id: str, + question: str) -> list[dict[str, Any]]: + if (result.get("kind") != "quality_comparison" + or not re.search(r"原因|整体分析|总体分析|报废类别|类别增减|正式类别", question)): + return [] + release_id = _release_id(document, result) + scope, _ = _scope(result.get("filterBinding")) + current, comparison = result.get("current"), result.get("comparison") + if release_id is None or scope is None or not isinstance(current, dict) or not isinstance(comparison, dict): + return [] + current_period, current_label, _ = _period(current.get("period")) + comparison_period, comparison_label, _ = _period(comparison.get("period")) + if (current_period is None or comparison_period is None or current_period == comparison_period + or scope.get("category") not in (None, "") or scope.get("defect") not in (None, "")): + return [] + charts: list[dict[str, Any]] = [] + for stage in ("black", "bright"): + if not _scope_compatible(scope, release_id, period=current_period, stage=stage): + continue + now_side, old_side = current.get(stage), comparison.get(stage) + if not isinstance(now_side, dict) or not isinstance(old_side, dict): + continue + now_defs, old_defs = now_side.get("defects"), old_side.get("defects") + expected = _DEFECT_FIELDS[stage] + if not isinstance(now_defs, list) or not isinstance(old_defs, list): + continue + + def read_formal(items: list[Any]) -> dict[str, float] | None: + parsed: dict[str, float] = {} + for item in items: + if not isinstance(item, dict): + return None + label = _safe_text(item.get("name"), limit=80) + field = expected.get(label) if label is not None else None + weight, valid = _valid_weight(item.get("weight")) + if field is None or not valid or weight is None or field in parsed: + return None + parsed[field] = weight + return parsed + + now_values, old_values = read_formal(now_defs), read_formal(old_defs) + if (now_values is None or old_values is None or set(now_values) != set(expected.values()) + or set(old_values) != set(expected.values()) or sum(now_values.values()) + sum(old_values.values()) <= 0): + continue + ordered = list(expected.items()) + labels, fields = [item[0] for item in ordered], [item[1] for item in ordered] + values = [now_values[field] - old_values[field] for field in fields] + stage_label = "黑片" if stage == "black" else "亮片" + charts.append(_chart( + turn_id=turn_id, + chart_type="bar", + title=f"{stage_label}正式报废类别重量增减", + subtitle=f"{comparison_label} → {current_label};按正式类别逐项相减,正负方向均保留。", + unit="kg", + categories=[{"key": field, "label": label} for field, label in zip(fields, labels)], + series=[{"key": "source_defect_delta_weight", "label": "报废重量增减(kg)", "values": values}], + evidence_refs=[_evidence_ref(document)] if _evidence_ref(document) else [], + required_fields=fields, + scope=_chart_scope(scope, release_id, current_period, view="overall", stage=stage), + period=current_period, + comparison_period=comparison_period, + stage=stage, + metric="source_defect_delta_weight", + coverage={"totalRows": len(fields), "returnedRows": len(fields), "truncated": False}, + note="展示正式报废类别各自的期间增减,不代表总体合格率贡献。", + section_key=f"category_{stage}", + dimension="category", )) return charts @@ -501,6 +653,8 @@ def _formal_donut_chart( coverage={"totalRows": count, "returnedRows": count, "truncated": False, "shareBasis": "displayed_categories"}, note="占比按本图已列类别重量合计计算,不代表正式报废总量占比。", + section_key="composition", + dimension="category", ) @@ -592,6 +746,8 @@ def _share_chart_from_top_chart(chart: dict[str, Any], document: dict[str, Any], result_chart["requiredFields"] = [category["key"] for category in categories] result_chart["coverage"] = {"totalRows": len(categories), "returnedRows": len(categories), "truncated": False, "shareBasis": "displayed_categories"} + result_chart["sectionKey"] = "composition" + result_chart["dimension"] = "category" result_chart.pop("id", None) result_chart["id"] = _visual_id(turn_id, result_chart) return result_chart @@ -718,11 +874,13 @@ def _change_chart(document: dict[str, Any], result: dict[str, Any], turn_id: str "returnedRows": len(selected), "truncated": truncated or len(selected) < len(row_info), } + scope_caption = _scope_caption(scope) return _chart( turn_id=turn_id, chart_type="bar", title=title, - subtitle=f"{comparison_label} → {current_label};按接口返回排名,展示前 {len(selected)} 项。", + subtitle=(f"范围 {scope_caption};" if scope_caption else "") + + f"{comparison_label} → {current_label};按接口返回排名,展示前 {len(selected)} 项。", unit=unit, categories=categories, series=[{"key": metric, "label": label, "values": values}], @@ -736,6 +894,8 @@ def _change_chart(document: dict[str, Any], result: dict[str, Any], turn_id: str metric=metric, coverage=coverage, note=note, + section_key={"product": "product", "group": "group", "department": "department"}[result["dimension"]], + dimension=result["dimension"], ) @@ -967,6 +1127,10 @@ def _top_chart(document: dict[str, Any], result: dict[str, Any], turn_id: str) - coverage={"totalRows": groups, "returnedRows": selected, "truncated": len(categories) < groups or len(categories) > MAX_RANK_ROWS}, note=note, + section_key=(f"category_{stage}" if dimension == "category" else + {"product": "product", "group": "group", "department": "department"}.get(dimension, "group")), + dimension=("group" if dimension == "projectGroup" else + dimension if dimension in ("product", "group", "department", "category") else None), ) @@ -1156,11 +1320,13 @@ def _fine_defect_chart(document: dict[str, Any], result: dict[str, Any], turn_id "returnedRows": len(categories), "truncated": truncated or len(categories) < len(source_rows), } + scope_caption = _scope_caption(scope) return _chart( turn_id=turn_id, chart_type="bar", title=f"{stage_label}{title}", - subtitle=(f"{comparison_label} → {period_label};" if comparison_label else f"{period_label};") + subtitle=(f"范围 {scope_caption};" if scope_caption else "") + + (f"{comparison_label} → {period_label};" if comparison_label else f"{period_label};") + "按来源字段排序,缺失增量保留为空。", unit=unit, categories=categories[:MAX_RANK_ROWS], @@ -1176,6 +1342,8 @@ def _fine_defect_chart(document: dict[str, Any], result: dict[str, Any], turn_id coverage={**coverage, "returnedRows": min(len(categories), MAX_RANK_ROWS), "truncated": coverage["truncated"] or len(categories) > MAX_RANK_ROWS}, note=note, + section_key=f"defect_{result['stage']}", + dimension="defect", ) @@ -1289,6 +1457,7 @@ def _trend_chart_from_points( stage=stage, metric=metric, coverage={"totalRows": len(expanded), "returnedRows": len(expanded), "truncated": False}, + section_key="trend", )) if re.search(r"重量|报废|废品|kg|公斤", question, re.IGNORECASE): weight_stages = [("black", "黑片报废重量"), ("bright", "亮片报废重量")] @@ -1326,6 +1495,7 @@ def _trend_chart_from_points( metric=metric, coverage={"totalRows": len(expanded), "returnedRows": len(expanded), "truncated": False}, note="黑片与亮片分开;不合并为单阶段投入分母。", + section_key="trend", )) return charts @@ -1437,6 +1607,7 @@ def _requested_chart_type(question: str) -> str | None: for pattern, chart_type in ( (_COLUMN_CHART, "column"), (_AREA_CHART, "area"), (_HEATMAP_CHART, "heatmap"), (_DONUT_CHART, "donut"), (_LINE_CHART, "line"), (_BAR_CHART, "bar"), + (_WATERFALL_CHART, "waterfall"), ): match = first_unnegated(pattern) if match: @@ -1500,52 +1671,68 @@ def _chart_end_rank(chart: dict[str, Any]) -> tuple[int, int, int]: def _candidate_priority(chart: dict[str, Any], kind: str, dimension: str | None, question: str) -> int: - wants_trend = "趋势" in question - if chart.get("type") == "line": - if re.search(r"重量|报废|废品|kg|公斤", question, re.IGNORECASE) and chart.get("metric") == "current_scrap_weight": - return 0 - if not wants_trend: - return 6 - return {"composite_rate": 0, "black_rate": 1, "bright_rate": 2}.get(chart.get("metric"), 6) - if kind == "quality_comparison": - # A stage mentioned as the scope of a defect question should not displace - # the explicitly requested product and defect charts from the three slots. - if (chart.get("metric") != "composite_rate" - and re.search(r"综合|总体", question) - and re.search(r"产品|规格", question) - and re.search(r"缺陷", question)): - return 8 - return 1 if wants_trend else (0 if chart.get("metric") == "composite_rate" else 1) - if kind == "quality_changes": - requested_dimension = None - if re.search(r"产品|规格", question): - requested_dimension = "product" - elif "分组" in question: - requested_dimension = "group" - elif re.search(r"产业部|部门", question): - requested_dimension = "department" - base = {"product": 10, "group": 20, "department": 30}.get(dimension, 40) - if requested_dimension == dimension: - base = 4 - if re.search(r"合格率|降幅|下降", question) and chart.get("metric") == "rate_drop_pp": - base -= 1 - if re.search(r"报废|增量|重量", question) and chart.get("metric") in ("scrap_delta", "current_scrap_weight"): - base -= 1 - return base + """Choose chapter-relevant views without letting incidental rankings lead.""" + metric = chart.get("metric") + section = chart.get("sectionKey") + requested_dimension = None + if re.search(r"产品|规格", question): + requested_dimension = "product" + elif "分组" in question: + requested_dimension = "group" + elif re.search(r"产业部|部门", question): + requested_dimension = "department" + broad_cause = bool(re.search(r"原因|分析|拆解|分解|归因", question)) + explicit_rate_rank = bool(re.search(r"率降幅|合格率变化排名|率下降排名|排名.*合格率", question)) + if metric == "current_scrap_weight" and re.search(r"重量|报废|废品|kg|公斤", question, re.IGNORECASE): + return 0 if "趋势" in question else 3 + scope = chart.get("scope") if isinstance(chart.get("scope"), dict) else {} + scope_specificity = sum(scope.get(key) not in (None, "", [], {}) for key in ( + "department", "group", "product", "category", "defect" + )) + + if chart.get("type") in ("donut", "pareto") or section == "composition": + return 0 + if chart.get("type") in ("line", "area", "heatmap") or section == "trend": + if "趋势" in question: + return {"composite_rate": 0, "black_rate": 1, "bright_rate": 2, + "current_scrap_weight": 3}.get(metric, 5) + return 8 + if metric == "composite_rate" and section == "overview": + return 0 + if metric == "composite_impact_pp": + return 1 if broad_cause else 5 + if section == "stage": + return 2 if broad_cause or re.search(r"黑片|亮片|阶段", question) else 6 + if metric == "rate_drop_pp": + if explicit_rate_rank: + return 2 + if broad_cause: + return {"department": 3, "group": 4}.get(section, 20) + return {"department": 7, "group": 8}.get(section, 20) + if section == "product" or kind == "quality_top" and dimension == "product": + if requested_dimension == "product": + return 3 if metric in ("scrap_delta", "current_scrap_weight") else 4 + return 4 if metric in ("scrap_delta", "current_scrap_weight") else 10 + if section == "department" or kind == "quality_top" and dimension == "department": + return 4 if metric in ("scrap_delta", "current_scrap_weight") else 6 + if section == "group" or kind == "quality_top" and dimension in ("group", "projectGroup"): + return 5 if metric in ("scrap_delta", "current_scrap_weight") else 7 + if section in ("category_black", "category_bright"): + return 5 if broad_cause or re.search(r"报废类别|类别增减|正式类别", question) else 9 + if section in ("defect_black", "defect_bright"): + # 优先阶段汇总;局部追查图保留自身筛选范围,仍可作为补充视图。 + return 6 + min(scope_specificity, 3) + (0 if broad_cause else 2) if kind == "quality_top": - requested_dimension = None - if re.search(r"产品|规格", question): - requested_dimension = "product" - elif "分组" in question: - requested_dimension = "group" - elif re.search(r"产业部|部门", question): - requested_dimension = "department" - elif "项目组" in question: - requested_dimension = "projectGroup" - return 4 if requested_dimension == dimension else 12 - if kind == "quality_fine_defects": - return 5 if re.search(r"缺陷|责废|料废|外废|加工废|镀废", question) else 15 - return 25 + return 4 if requested_dimension == dimension else 10 + return 12 + + +def _chart_selection_key(chart: dict[str, Any]) -> str: + semantic = {key: chart.get(key) for key in ( + "type", "sectionKey", "dimension", "metric", "stage", "scope", "period", "comparisonPeriod", + "categories", "series", + )} + return json.dumps(semantic, ensure_ascii=False, sort_keys=True, separators=(",", ":"), allow_nan=False) def _finalize(charts: list[dict[str, Any]], turn_id: str, *, unavailable: bool = False) -> dict[str, Any]: @@ -1581,7 +1768,7 @@ def _finalize(charts: list[dict[str, Any]], turn_id: str, *, unavailable: bool = def build_visuals(evidence: list[dict[str, Any]], question: str, turn_id: str) -> dict[str, Any]: - """Return up to three safe chart snapshots from full trusted evidence docs. + """Return up to twelve safe chart snapshots from full trusted evidence docs. The function is intentionally non-fatal: exceptions return a short error state so a caller can preserve the already completed textual analysis. @@ -1610,6 +1797,11 @@ def build_visuals(evidence: list[dict[str, Any]], question: str, turn_id: str) - dimension = result.get("dimension") if isinstance(result.get("dimension"), str) else None for chart in _comparison_charts(document, result, safe_turn_id, text_question): candidates.append((_candidate_priority(chart, kind, dimension, text_question), kind, dimension, chart)) + waterfall = _comparison_waterfall(document, result, safe_turn_id, text_question) + if waterfall is not None: + candidates.append((_candidate_priority(waterfall, kind, dimension, text_question), kind, dimension, waterfall)) + for chart in _comparison_category_delta_charts(document, result, safe_turn_id, text_question): + candidates.append((_candidate_priority(chart, kind, dimension, text_question), kind, dimension, chart)) for chart in _comparison_category_charts(document, result, safe_turn_id, text_question): candidates.append((_candidate_priority(chart, kind, dimension, text_question), kind, dimension, chart)) for chart in _metrics_category_charts(document, result, safe_turn_id, text_question): @@ -1641,31 +1833,62 @@ def build_visuals(evidence: list[dict[str, Any]], question: str, turn_id: str) - continue styled_candidates.append((priority, kind, dimension, chart)) candidates = styled_candidates - candidates.sort(key=lambda item: (item[0], tuple(-part for part in _chart_end_rank(item[3])), item[3].get("id", ""))) + stage_order = {"black": 0, "bright": 1, None: 2} + metric_order = {"composite_rate": 0, "black_rate": 1, "bright_rate": 2, + "scrap_delta": 3, "source_defect_delta_weight": 4} + def scope_depth(chart): + scope = chart.get("scope") if isinstance(chart.get("scope"), dict) else {} + return sum(scope.get(key) not in (None, "", [], {}) for key in ("department", "group", "product", "category", "defect")) + + comparisons = [chart for _, _, _, chart in candidates if chart.get("metric") == "composite_rate" and chart.get("sectionKey") == "overview"] + primary_depth = min((scope_depth(chart) for chart in comparisons), default=0) + def chapter_priority(item): + chart = item[3] + # 产品追查比较不能挤占主体分析的类别、组织和缺陷图。 + extra_scope = max(0, scope_depth(chart) - primary_depth) + section = chart.get("sectionKey", "") + penalty = 20 * extra_scope if section in ("overview", "stage") or section.startswith("category_") else 0 + return item[0] + penalty + + candidates.sort(key=lambda item: ( + chapter_priority(item), tuple(-part for part in _chart_end_rank(item[3])), + stage_order.get(item[3].get("stage"), 3), + metric_order.get(item[3].get("metric"), 10), + item[3].get("sectionKey", ""), item[3].get("id", ""), + )) + primary_chapters = [] + additional_views = [] + chapter_keys = set() + for item in candidates: + chart = item[3] + section = chart.get("sectionKey") + chapter_key = (section, chart.get("metric") if section in ("overview", "stage", "trend") else None, + chart.get("type") if section == "composition" else None, + chart.get("stage") if section == "composition" else None) + if chapter_key in chapter_keys: + additional_views.append(item) + else: + chapter_keys.add(chapter_key) + primary_chapters.append(item) + # 先覆盖各个可用章节,再分配同章不同范围的补充视图。 + candidates = primary_chapters + additional_views charts: list[dict[str, Any]] = [] selected_ids: set[str] = set() - selected_dimensions: set[str] = set() - selected_defect_stages: set[str] = set() + selected_semantics: set[str] = set() selected_share_stages: set[tuple[str, str]] = set() for _, kind, dimension, chart in candidates: chart_id = chart.get("id") if not isinstance(chart_id, str) or chart_id in selected_ids: continue + semantic_key = _chart_selection_key(chart) + if semantic_key in selected_semantics: + continue share_stage = (chart.get("type"), chart.get("stage")) if chart.get("type") in ("donut", "pareto") and share_stage in selected_share_stages: continue - if kind == "quality_changes" and dimension in selected_dimensions: - continue - if kind == "quality_fine_defects": - stage = chart.get("stage") - if stage in selected_defect_stages: - continue charts.append(chart) selected_ids.add(chart_id) - if kind == "quality_changes" and dimension: - selected_dimensions.add(dimension) - if kind == "quality_fine_defects" and chart.get("stage"): - selected_defect_stages.add(chart["stage"]) + selected_semantics.add(semantic_key) if chart.get("type") in ("donut", "pareto"): selected_share_stages.add(share_stage) if len(charts) >= MAX_VISUALS: diff --git a/scripts/nao_evidence_report.py b/scripts/nao_evidence_report.py index c351357..1cc02de 100644 --- a/scripts/nao_evidence_report.py +++ b/scripts/nao_evidence_report.py @@ -47,32 +47,39 @@ def build_report(evidence): def fact(label,text,evidence_ref,kind): row={'id':'F'+str(len(facts)+1),'kind':kind,'label':label,'text':text,'evidenceRef':evidence_ref} facts.append(row);return row - def table(title,headers,rows,evidence_ref,notice=''): + def bound_lead(entries): + return ' '.join(item['text']+'['+item['evidenceRef']+']' for item in entries) + def table(title,headers,rows,evidence_ref,notice='',lead=''): if not rows:return - sections.append('### '+title+'\n\n| '+' | '.join(headers)+' |\n| '+' | '.join(['---']*len(headers))+' |\n' + sections.append('### '+title+'\n\n'+(lead+'\n\n' if lead else '')+'| '+' | '.join(headers)+' |\n| '+' | '.join(['---']*len(headers))+' |\n' +'\n'.join('| '+' | '.join(cell(v) for v in row)+' |' for row in rows)+'\n\n['+evidence_ref+']'+(' '+notice if notice else '')) delta=(result.get('delta') or {}).get('percentagePoints') headline=f'综合合格率:{a}{shown(previous.get("compositeRate"),True)}→{b}{shown(current.get("compositeRate"),True)},{change_text(delta)}。[{ref}]' fact('综合合格率',headline.split('。[')[0]+'。',ref,'overall') rows=[['综合合格率',shown(previous.get('compositeRate'),True),shown(current.get('compositeRate'),True),shown(delta,signed=True)+' pp' if number(delta) is not None else '不可比']] + stage_leads=[] for stage,label in (('black','黑片'),('bright','亮片')): now=current.get(stage) or {};before=previous.get(stage) or {};rate_delta=(result.get('stageRateChangesPP') or {}).get(stage) rows.append([label+'合格率',shown(before.get('rate'),True),shown(now.get('rate'),True),shown(rate_delta,signed=True)+' pp' if number(rate_delta) is not None else '不可比']) - fact(label+'合格率',f'{label}合格率:{shown(before.get("rate"),True)}→{shown(now.get("rate"),True)},{change_text(rate_delta)}。',ref,'stage') + stage_fact=fact(label+'合格率',f'{label}合格率:{shown(before.get("rate"),True)}→{shown(now.get("rate"),True)},{change_text(rate_delta)}。',ref,'stage') + if all(number(value) is not None for value in (before.get('rate'),now.get('rate'),rate_delta)):stage_leads.append(stage_fact) for key,name in (('totalWeight','投入重量'),('scrapWeight','报废重量')): rows.append([label+name,shown(before.get(key)),shown(now.get(key)),shown(difference(now.get(key),before.get(key)),signed=True)]) - table('总体与阶段',['指标',a,b,'变化'],rows,ref,'重量单位:kg;率变化单位:百分点(pp)。') - rows=[] + table('总体与阶段',['指标',a,b,'变化'],rows,ref,'重量单位:kg;率变化单位:百分点(pp)。',bound_lead(stage_leads)) + rows=[];category_leads=[] for stage,label in (('black','黑片'),('bright','亮片')): + candidates=[] now=current.get(stage) or {};before=previous.get(stage) or {} old={x['name']:x.get('weight') for x in before.get('defects',[])} for item in now.get('defects',[]): name=item['name'];weight=item.get('weight');delta=difference(weight,old.get(name)) rows.append([label+'·'+name,shown(old.get(name)),shown(weight),shown(delta,signed=True)]) - fact(label+'·'+name,f'{label}{name}:{shown(old.get(name))}→{shown(weight)} kg,增减{shown(delta,signed=True)} kg。',ref,'category') + entry=fact(label+'·'+name,f'{label}{name}:{shown(old.get(name))}→{shown(weight)} kg,增减{shown(delta,signed=True)} kg。',ref,'category') + if number(delta) is not None:candidates.append((abs(number(delta)),entry)) if stage=='bright' and now.get('headquartersScrapWeight') is not None: rows.append(['亮片·本部报废',shown(before.get('headquartersScrapWeight')),shown(now.get('headquartersScrapWeight')),shown(difference(now.get('headquartersScrapWeight'),before.get('headquartersScrapWeight')),signed=True)]) - table('正式报废类别',['类别',a+'(kg)',b+'(kg)','增减(kg)'],rows,ref) + if candidates:category_leads.append(max(candidates,key=lambda item:item[0])[1]) + table('正式报废类别',['类别',a+'(kg)',b+'(kg)','增减(kg)'],rows,ref,lead=('本次已列类别的变化线索:'+bound_lead(category_leads)) if category_leads else '') for document in evidence: q=document['result'];reference=document['evidenceRef'] if q.get('kind')!='quality_changes':continue @@ -82,23 +89,26 @@ def build_report(evidence): rate_name=stage_name+'合格率' if stage_name else '综合率' weight_name=stage_name+'报废增量' if stage_name else '两阶段报废增量' if dimension in ('group','department') and same: - rows=[] + rows=[];leaders=[] for item in q.get('rows',[]): now=item.get('current') or {};before=item.get('comparison') or {};drop=number(item.get('rateDrop'));delta=-drop*100 if drop is not None else None label=str(item.get('label') or item.get('key')) rows.append([label,shown(before.get('rate'),True)+'→'+shown(now.get('rate'),True),shown(delta,signed=True) if delta is not None else '不可比',shown(item.get('scrapDelta'),signed=True)]) - fact(label,f'{label}:{rate_name}{shown(before.get("rate"),True)}→{shown(now.get("rate"),True)},{change_text(delta)};{weight_name}{shown(item.get("scrapDelta"),signed=True)} kg。',reference,'group') + entry=fact(label,f'{label}:{rate_name}{shown(before.get("rate"),True)}→{shown(now.get("rate"),True)},{change_text(delta)};{weight_name}{shown(item.get("scrapDelta"),signed=True)} kg。',reference,'group') + if drop is not None:leaders.append((drop,entry)) + lead=bound_lead([max(leaders,key=lambda item:(item[0]>0,abs(item[0])))[1]]) if leaders else '' table(stage_name+('业务分组变化' if dimension=='group' else '产业部变化'),['范围',rate_name+':比较期→本期','变化(pp)',weight_name+'(kg)'],rows,reference, - '报废重量为两阶段描述,不作为单一阶段投入。' if not stage_name else '') + '报废重量为两阶段描述,不作为单一阶段投入。' if not stage_name else '',('本次返回的组织中,'+lead) if lead else '') elif dimension=='product' and same: - rows=[] + rows=[];product_leads=[] for item in q.get('rows',[])[:5]: now=item.get('current') or {};before=item.get('comparison') or {};label=str(item.get('label') or item.get('key')) rows.append([label,shown(now.get('scrapWeight')),shown(item.get('scrapDelta'),signed=True),shown(before.get('rate'),True)+'→'+shown(now.get('rate'),True)]) - fact(label,f'{label}:{stage_name}报废{shown(before.get("scrapWeight"))}→{shown(now.get("scrapWeight"))} kg,增量{shown(item.get("scrapDelta"),signed=True)} kg;{rate_name}{shown(before.get("rate"),True)}→{shown(now.get("rate"),True)}。',reference,'product') + entry=fact(label,f'{label}:{stage_name}报废{shown(before.get("scrapWeight"))}→{shown(now.get("scrapWeight"))} kg,增量{shown(item.get("scrapDelta"),signed=True)} kg;{rate_name}{shown(before.get("rate"),True)}→{shown(now.get("rate"),True)}。',reference,'product') + product_leads.append(entry) order={'scrap_delta':'报废增量','current_scrap':'当前报废重量','rate_drop':'合格率降幅'}.get(q.get('sort'),'接口排序') table(stage_name+'重点产品(按'+order+',本次返回前5)',['规格','本期报废(kg)','增量(kg)',rate_name+':比较期→本期'],rows,reference, - f'查询共有{q.get("totalRows","未知")}个对象,本节展示所返回排名的前5项。') + f'查询共有{q.get("totalRows","未知")}个对象,本节展示所返回排名的前5项。',bound_lead(product_leads[:1])) vcm=False;cross=[] for document in evidence: q=document['result'];reference=document['evidenceRef'] @@ -113,11 +123,13 @@ def build_report(evidence): usable.sort(key=lambda row:number(row['currentWeight']),reverse=True) same=scope(q.get('filters'))==binding if same and q.get('dimension')=='defect': - rows=[] + rows=[];defect_leads=[] for item in usable[:5]: label=str(item.get('field'));rows.append([label,shown(item.get('comparisonWeight')),shown(item.get('currentWeight')),shown(item.get('deltaWeight'),signed=True) if item.get('deltaAvailable') is True else '不可比']) - fact(stage+'·'+label,f'{stage}{label}:{shown(item.get("comparisonWeight"))}→{shown(item.get("currentWeight"))} kg,增量{shown(item.get("deltaWeight"),signed=True) if item.get("deltaAvailable") is True else "不可比"}。',reference,'defect') - table(stage+'来源具体缺陷(按本期重量,前5)',['源字段',a+'(kg)',b+'(kg)','增量(kg)'],rows,reference) + entry=fact(stage+'·'+label,f'{stage}{label}:{shown(item.get("comparisonWeight"))}→{shown(item.get("currentWeight"))} kg,增量{shown(item.get("deltaWeight"),signed=True) if item.get("deltaAvailable") is True else "不可比"}。',reference,'defect') + if item.get('deltaAvailable') is True and number(item.get('deltaWeight')) is not None:defect_leads.append((abs(number(item['deltaWeight'])),entry)) + lead=bound_lead([max(defect_leads,key=lambda item:item[0])[1]]) if defect_leads else '' + table(stage+'来源具体缺陷(按本期重量,前5)',['源字段',a+'(kg)',b+'(kg)','增量(kg)'],rows,reference,lead=lead) elif usable: details=scope(q.get('filters'));label_prefix='·'.join(str(v) for k,v in details.items() if k in ('group','product')) for item in usable[:2]: diff --git a/web/src/AiMarkdown.tsx b/web/src/AiMarkdown.tsx index bd81ed1..da96961 100644 --- a/web/src/AiMarkdown.tsx +++ b/web/src/AiMarkdown.tsx @@ -1,15 +1,19 @@ import type { ReactNode } from 'react'; import { sanitizeAnalysisDisplayText } from './analysisDisplayText'; -function inlineMarkdown(value: string, keyPrefix = 'inline'): ReactNode[] { +function inlineMarkdown(value: string, keyPrefix = 'inline', evidenceLabels?: Record, evidencePrefix = ''): ReactNode[] { + const references = (part: string, key: string): ReactNode => !evidenceLabels ? part : part.split(/(\[?Q[A-F0-9]{8}\]?)/g).map((token, index) => { + const ref = token.replace(/^\[|\]$/g, ''); + return evidenceLabels[ref] ? {evidenceLabels[ref]} : token; + }); return value.split(/(\*\*.+?\*\*|`[^`]+`)/g).map((part, index) => { if (part.startsWith('**') && part.endsWith('**') && part.length >= 4) { - return {part.slice(2, -2)}; + return {references(part.slice(2, -2), `${keyPrefix}-${index}`)}; } if (part.startsWith('`') && part.endsWith('`') && part.length >= 2) { return {part.slice(1, -1)}; } - return part; + return references(part, `${keyPrefix}-${index}`); }); } @@ -33,7 +37,8 @@ function isBlockStart(lines: string[], index: number): boolean { } /** Renders the small Markdown subset used by analysis answers with React text nodes only. */ -export function AiMarkdown({ content, className }: { content: string; className?: string }) { +export function AiMarkdown({ content, className, evidenceLabels, evidencePrefix }: { content: string; className?: string; evidenceLabels?: Record; evidencePrefix?: string }) { + const inline = (value: string, key: string) => inlineMarkdown(value, key, evidenceLabels, evidencePrefix); const lines = sanitizeAnalysisDisplayText(content).replaceAll('\r\n', '\n').replaceAll('\r', '\n').split('\n'); const blocks: ReactNode[] = []; let index = 0; @@ -56,7 +61,7 @@ export function AiMarkdown({ content, className }: { content: string; className? if (heading) { const level = heading[1].length; const key = `heading-${blocks.length}`; - const children = inlineMarkdown(heading[2], key); + const children = inline(heading[2], key); if (level === 1) blocks.push(

{children}

); else if (level === 2) blocks.push(

{children}

); else if (level === 3) blocks.push(

{children}

); @@ -73,8 +78,8 @@ export function AiMarkdown({ content, className }: { content: string; className? const body: string[][] = []; while (index < lines.length && lines[index].trim() && lines[index].includes('|')) body.push(tableCells(lines[index++])); blocks.push(
- {headers.map((cell, cellIndex) => )} - {body.map((row, rowIndex) => {headers.map((_, cellIndex) => )})} + {headers.map((cell, cellIndex) => )} + {body.map((row, rowIndex) => {headers.map((_, cellIndex) => )})}
序号{inlineMarkdown(cell, `th-${cellIndex}`)}
{rowIndex + 1}{inlineMarkdown(row[cellIndex] || '', `td-${rowIndex}-${cellIndex}`)}
序号{inline(cell, `th-${cellIndex}`)}
{rowIndex + 1}{inline(row[cellIndex] || '', `td-${rowIndex}-${cellIndex}`)}
); continue; } @@ -91,8 +96,8 @@ export function AiMarkdown({ content, className }: { content: string; className? index += 1; } blocks.push(ordered - ?
    {list.map((item, itemIndex) =>
  1. {inlineMarkdown(item, `ol-${blocks.length}-${itemIndex}`)}
  2. )}
- :
    {list.map((item, itemIndex) =>
  • {inlineMarkdown(item, `ul-${blocks.length}-${itemIndex}`)}
  • )}
); + ?
    {list.map((item, itemIndex) =>
  1. {inline(item, `ol-${blocks.length}-${itemIndex}`)}
  2. )}
+ :
    {list.map((item, itemIndex) =>
  • {inline(item, `ul-${blocks.length}-${itemIndex}`)}
  • )}
); continue; } @@ -101,7 +106,7 @@ export function AiMarkdown({ content, className }: { content: string; className? if (!paragraph.length) { index += 1; continue; } blocks.push(

{paragraph.flatMap((part, partIndex) => [ ...(partIndex ? [
] : []), - ...inlineMarkdown(part, `paragraph-${blocks.length}-${partIndex}`), + ...inline(part, `paragraph-${blocks.length}-${partIndex}`), ])}

); } diff --git a/web/src/AnalysisLegacyResults.tsx b/web/src/AnalysisLegacyResults.tsx new file mode 100644 index 0000000..a5d59af --- /dev/null +++ b/web/src/AnalysisLegacyResults.tsx @@ -0,0 +1,43 @@ +type Row = Record; +const record = (value: unknown): Row => value && typeof value === 'object' && !Array.isArray(value) ? value as Row : {}; +const rows = (value: unknown): Row[] => Array.isArray(value) ? value.map(record) : []; +const text = (value: unknown) => value === null || value === undefined || value === '' ? '—' : String(value); +const rate = (value: unknown) => typeof value === 'number' && Number.isFinite(value) ? `${(value * 100).toFixed(2)}%` : '—'; +const number = (value: unknown) => typeof value === 'number' && Number.isFinite(value) ? value.toLocaleString('zh-CN', { maximumFractionDigits: 2 }) : '—'; +const period = (value: unknown) => { const c = record(value); return c.year ? `${c.year}年${c.month ? `${c.month}月` : c.quarter ? `第${c.quarter}季度` : ''}` : ''; }; +const stageName = (value: unknown) => value === 'black' ? '黑片' : value === 'bright' ? '亮片' : ''; +const metricName = (value: unknown) => ({ BLACK_RATE: '黑片合格率', BRIGHT_RATE: '亮片合格率', COMPOSITE_RATE: '综合合格率', COMPOSITE_RATE_WITHOUT_HEADQUARTERS_SCRAP: '综合合格率(不含本部报废)', BRIGHT_RATE_WITHOUT_HEADQUARTERS_SCRAP: '亮片合格率(不含本部报废)' }[String(value)] || '合格率'); + +export function AnalysisLegacyResults({ turn }: { turn: Row }) { + const result = Object.keys(record(turn.result)).length ? record(turn.result) : turn; + const results = rows(result.results || turn.results); + const comparisons = results.filter(item => item.current && item.comparison && item.delta); + const snapshots = results.filter(item => item.summary && item.context); + const main = comparisons.length ? record(comparisons[0].current) : snapshots[0] || {}; + const summary = record(main.summary); + const black = record(summary.black); const bright = record(summary.bright); + const coverage = record(summary.coverage); + const selectedMetric = String(comparisons[0]?.metric || record(record(result.task || turn.task).conditions).metricCode || 'COMPOSITE_RATE'); + const adjusted = selectedMetric.includes('WITHOUT_HEADQUARTERS_SCRAP'); + if (!results.length) return null; + return

保存的统计数据

+ {Object.keys(summary).length > 0 &&
+
{adjusted ? '综合合格率(不含本部报废)' : '综合合格率'}{coverage.blackRows === 0 && coverage.brightRows === 0 ? '—' : rate(adjusted ? summary.compositeRateWithoutHeadquartersScrap : summary.compositeRate)}
+
黑片合格率{coverage.blackRows === 0 ? '—' : rate(black.rate)}
+
{adjusted ? '亮片合格率(不含本部报废)' : '亮片合格率'}{coverage.brightRows === 0 ? '—' : rate(adjusted ? bright.rateWithoutHeadquartersScrap : bright.rate)}
+
} + {comparisons.map((item, index) => { + const current = record(item.current), comparison = record(item.comparison), delta = record(item.delta), comparable = record(item.comparability); + const value = (side: Row) => { const s = record(side.summary); switch (item.metric) { case 'BLACK_RATE': return rate(record(s.black).rate); case 'BRIGHT_RATE': return rate(record(s.bright).rate); case 'BRIGHT_RATE_WITHOUT_HEADQUARTERS_SCRAP': return rate(record(s.bright).rateWithoutHeadquartersScrap); case 'COMPOSITE_RATE_WITHOUT_HEADQUARTERS_SCRAP': return rate(s.compositeRateWithoutHeadquartersScrap); default: return rate(s.compositeRate); } }; + return

{metricName(item.metric)} · 期间比较

序号期间正式结果
1{period(current.context)}{value(current)}
2{period(comparison.context)}{value(comparison)}
3变化(百分点){number(delta.percentagePoints)}
{comparable.comparable === false &&

{text(comparable.reason || (Array.isArray(comparable.reasons) ? comparable.reasons.join(';') : '所选期间不可比,不给出变化结论。'))}

}
; + })} + {results.filter(item => Array.isArray(item.groups)).map((item, index) => { + const available = item.available === true; + const ranked = [...rows(item.groups)].filter(row => typeof row[available ? 'impactPP' : 'scrapDelta'] === 'number').sort((a, b) => available ? Number(a.impactPP) - Number(b.impactPP) : Number(b.scrapDelta) - Number(a.scrapDelta)).slice(0, 10); + if (!ranked.length) return null; + return

{stageName(item.stage)} · 优先核查对象

{ranked.map((row, i) => )}
序号产品 / 规格当前合格率比较期合格率{available ? '影响(百分点)' : '报废增量(kg)'}
{i + 1}{text(row.label || row.key)}{rate(row.currentRate)}{rate(row.comparisonRate)}{number(available ? row.impactPP : row.scrapDelta)}
{!available &&

按报废增量列出前10项。分组无法完整回加,仅作核查线索,不能当作整体下降贡献。

}
; + })} + {results.filter(item => item.kind === 'analysis_statistics').map((item, index) =>

{stageName(item.stage)} · 历史趋势

{rows(item.trendChange).map((row, i) => )}
序号期间阶段合格率
{i + 1}{text(row.label || row.period)}{rate(row.stageRate)}
)} + {results.filter(item => Array.isArray(item.rows) && item.dimension && item.stage).map((item, index) =>

{stageName(item.stage)} · TOP核查对象

{rows(item.rows).slice(0, 10).map((row, i) => )}
序号对象报废重量(kg)占比
{i + 1}{text(row.label || row.key)}{number(row.weight)}{rate(row.share)}
)} +
; +} diff --git a/web/src/AnalysisNarrative.tsx b/web/src/AnalysisNarrative.tsx new file mode 100644 index 0000000..025a702 --- /dev/null +++ b/web/src/AnalysisNarrative.tsx @@ -0,0 +1,63 @@ +import { useMemo } from 'react'; +import { AiMarkdown } from './AiMarkdown'; +import { AnalysisVisuals } from './AnalysisVisuals'; +import { buildAnalysisNarrative, useCompactRateComparison, type NarrativeSection } from './analysisReportModel'; +import { visualPeriodSummary, visualScopeSummary, type AnalysisVisual } from './analysisVisualsModel'; +import './analysis-narrative.css'; + +function metricName(visual: AnalysisVisual): string { + return ({ composite_rate: '综合合格率', black_rate: '黑片合格率', bright_rate: '亮片合格率' } as Record)[visual.metric] || visual.series[0].label; +} + +export function RateComparisonReadout({ visual }: { visual: AnalysisVisual }) { + const [before, after] = visual.series[0].values as [number, number]; + const delta = (after - before) * 100; + const changed = Math.abs(delta) >= 0.005; + const { stage: _stage, ...businessScope } = visual.scope; + const scopeLabel = visualScopeSummary(businessScope); + return
+
{metricName(visual)}
+ {scopeLabel &&
{scopeLabel}
} +
+
{visualPeriodSummary({ ...visual, period: visual.comparisonPeriod!, comparisonPeriod: undefined })}{(before * 100).toFixed(2)}%
+ +
{visualPeriodSummary({ ...visual, comparisonPeriod: undefined })}{(after * 100).toFixed(2)}%
+
{changed ? `${delta > 0 ? '+' : ''}${delta.toFixed(2)}` : '0.00'}个百分点 · {changed ? delta < 0 ? '下降' : '上升' : '持平'}
+
+
; +} + +export function NarrativeEvidence({ model, prefix }: { model: ReturnType; prefix: string }) { + if (!model.evidence.length) return null; + return

数据依据

    {model.evidence.map(item =>
  1. {item.label}{item.context}{item.ref}
  2. )}
; +} + +/** 聊天、HTML 和图片报告共用同一套章节与图表关联。 */ +export function AnalysisNarrative({ answer, visuals, visualState, question, turnId, beforeExport }: { + answer: string; visuals: unknown; visualState?: unknown; question?: string; turnId?: string; beforeExport?: () => Promise; +}) { + const model = useMemo(() => buildAnalysisNarrative(answer, visuals, question), [answer, visuals, question]); + const prefix = `chat-${String(turnId || 'answer').replace(/[^a-zA-Z0-9_-]/g, '')}-`; + const renderText = (content: string) => ; + const compact = (visual: AnalysisVisual) => useCompactRateComparison(visual, question); + const comparisons = model.sections.flatMap(section => section.visuals).filter(compact); + const renderSection = (section: NarrativeSection) => { + const figures = section.visuals.filter(visual => !compact(visual)); + const hasFigures = figures.some(visual => visual.chartable); + const sectionComparisons = section.visuals.filter(compact); + return
+ {section.title &&

{section.title}

} + {section.narrative && renderText(section.narrative)} + {!!sectionComparisons.length &&
{sectionComparisons.map(visual => )}
} + {!!figures.length && } + {!!section.tables.length && (hasFigures || sectionComparisons.length > 0 + ?
查看本节数据与明细{section.tables.map((table, index) =>
{renderText(table)}
)}
+ : section.tables.map((table, index) =>
{renderText(table)}
))} +
; + }; + return
+ {model.sections.map(renderSection)} + {!model.sections.some(section => section.visuals.length) && } + +
; +} diff --git a/web/src/AnalysisReportExport.tsx b/web/src/AnalysisReportExport.tsx index 04b9be6..6993204 100644 --- a/web/src/AnalysisReportExport.tsx +++ b/web/src/AnalysisReportExport.tsx @@ -2,22 +2,22 @@ import { useEffect, useMemo, useRef, useState } from 'react'; import { Alert, App, Button, Modal } from 'antd'; import { DownloadOutlined } from '@ant-design/icons'; import { toPng } from 'html-to-image'; -import { AiMarkdown } from './AiMarkdown'; +import { AnalysisLegacyResults } from './AnalysisLegacyResults'; +import { AnalysisReportNarrative } from './AnalysisReportNarrative'; +import { buildAnalysisNarrative } from './analysisReportModel'; +import { integrateNativeReportNarrative } from './nativeReportNarrative'; +import narrativeCss from './analysis-narrative.css?inline'; import { analysisDisplayTextRemovalRanges, sanitizeAnalysisDisplayText } from './analysisDisplayText'; -import { ReportVisualSections, reportVisualHtml, useReportVisualImages, type ReportVisualImage } from './AnalysisReportVisuals'; +import { useReportVisualImages, type ReportVisualImage } from './AnalysisReportVisuals'; type Row = Record; const record = (value: unknown): Row => value && typeof value === 'object' && !Array.isArray(value) ? value as Row : {}; -const rows = (value: unknown): Row[] => Array.isArray(value) ? value.map(record) : []; const text = (value: unknown) => value === null || value === undefined || value === '' ? '—' : String(value); -const rate = (value: unknown) => typeof value === 'number' && Number.isFinite(value) ? `${(value * 100).toFixed(2)}%` : '—'; -const number = (value: unknown) => typeof value === 'number' && Number.isFinite(value) ? value.toLocaleString('zh-CN', { maximumFractionDigits: 2 }) : '—'; -const period = (value: unknown) => { const c = record(value); return c.year ? `${c.year}年${c.month ? `${c.month}月` : c.quarter ? `第${c.quarter}季度` : ''}` : ''; }; -const stageName = (value: unknown) => value === 'black' ? '黑片' : value === 'bright' ? '亮片' : ''; -const metricName = (value: unknown) => ({ BLACK_RATE: '黑片合格率', BRIGHT_RATE: '亮片合格率', COMPOSITE_RATE: '综合合格率', COMPOSITE_RATE_WITHOUT_HEADQUARTERS_SCRAP: '综合合格率(不含本部报废)', BRIGHT_RATE_WITHOUT_HEADQUARTERS_SCRAP: '亮片合格率(不含本部报废)' }[String(value)] || '合格率'); const escape = (value: string) => value.replaceAll('&', '&').replaceAll('<', '<').replaceAll('>', '>').replaceAll('"', '"'); const reportCss = ` +${narrativeCss} + .q-report .ai-markdown-table-wrap{height:auto!important;max-height:none!important;overflow:visible!important;border:0;border-radius:0;background:#fff;margin:10px 0 14px}.q-report .ai-markdown{color:inherit;font:inherit}.q-report .ai-markdown pre{white-space:pre-wrap;overflow-wrap:anywhere} .q-report{--surface:#fff;--blue-soft:#eef1ff;--line:#dfe5ef;--ink:#202b3c;--muted-ink:#738197;box-sizing:border-box;width:900px;padding:52px;background:#fff;color:#202b3c;font:15px/1.85 -apple-system,BlinkMacSystemFont,"PingFang SC","Microsoft YaHei",sans-serif;overflow-wrap:anywhere} .q-report *{box-sizing:border-box}.q-report header{padding-bottom:26px;border-bottom:2px solid #355f9b}.q-report .q-eyebrow{font-size:12px;letter-spacing:2px;color:#53739c}.q-report h1{font-size:27px;line-height:1.5;margin:10px 0}.q-report .q-subtitle{font-size:12px;color:#69778b}.q-report h2{font-size:18px;margin:30px 0 12px}.q-report p{margin:10px 0}.q-report .q-prose{white-space:pre-wrap}.q-report .q-kpis{display:flex;gap:12px;margin:22px 0}.q-report .q-kpi{flex:1;padding:17px 18px;background:#f2f6fb;border-radius:6px}.q-report .q-kpi span{display:block;font-size:12px;color:#66778d}.q-report .q-kpi strong{display:block;font-size:27px;font-variant-numeric:tabular-nums;color:#254f87}.q-report table{width:100%;border:1px solid #dfe5ef;border-collapse:collapse;font-size:13px;table-layout:fixed}.q-report th{background:#f2f6fb;color:#53657c;text-align:center;font-weight:650}.q-report th,.q-report td{padding:10px 12px;border:1px solid #dfe5ef;text-align:center;vertical-align:middle}.q-report tbody tr:nth-child(even){background:#f8fafd}.q-report th:first-child,.q-report td:first-child{width:62px;color:#738197;font-variant-numeric:tabular-nums}.q-report .q-note{font-size:12px;color:#69778b}.q-report footer{margin-top:34px;padding-top:16px;border-top:1px solid #dde5ef;font-size:11px;color:#738197}.q-report .q-partial{color:#996b20}@media print{body{margin:0}.q-report{width:100%;padding:20px}tr{break-inside:avoid}} @@ -25,47 +25,38 @@ const reportCss = ` function ReportDocument({ turn, stamp, visualImages }: { turn: Row; stamp: string; visualImages: ReportVisualImage[] }) { const result = Object.keys(record(turn.result)).length ? record(turn.result) : turn; - const results = rows(result.results || turn.results); - const comparisons = results.filter(item => item.current && item.comparison && item.delta); - const snapshots = results.filter(item => item.summary && item.context); - const main = comparisons.length ? record(comparisons[0].current) : snapshots[0] || {}; - const summary = record(main.summary); - const black = record(summary.black); const bright = record(summary.bright); - const coverage = record(summary.coverage); - const selectedMetric = String(comparisons[0]?.metric || record(record(result.task || turn.task).conditions).metricCode || 'COMPOSITE_RATE'); - const adjusted = selectedMetric.includes('WITHOUT_HEADQUARTERS_SCRAP'); - const answer = sanitizeAnalysisDisplayText(text(result.answer || turn.answer)); - const question = sanitizeAnalysisDisplayText(String(turn.question || '质量分析报告')); + const answer = sanitizeAnalysisDisplayText(text(result.reportMarkdown || turn.reportMarkdown || result.answer || turn.answer)); + const model = buildAnalysisNarrative(answer, result.visuals || turn.visuals, String(turn.question || '')); return
-
质量数据分析平台 · 分析报告

{question.length > 90 ? `${question.slice(0, 90)}…` : question}

{period(main.context)}{period(main.context) ? ' · ' : ''}{stamp}
+
质量数据分析平台 · 分析报告

{model.title.length > 90 ? `${model.title.slice(0, 90)}…` : model.title}

+
{[model.period, model.scope, stamp].filter(Boolean).join(' · ')}
+ {String(turn.question || '') !== model.title &&

{sanitizeAnalysisDisplayText(String(turn.question || ''))}

} +
{String(turn.status || result.status) === 'PARTIAL' &&

本次分析部分完成,以下保留已获得的结果。

} - {Object.keys(summary).length > 0 &&
-
{adjusted ? '综合合格率(不含本部报废)' : '综合合格率'}{coverage.blackRows === 0 && coverage.brightRows === 0 ? '—' : rate(adjusted ? summary.compositeRateWithoutHeadquartersScrap : summary.compositeRate)}
-
黑片合格率{coverage.blackRows === 0 ? '—' : rate(black.rate)}
-
{adjusted ? '亮片合格率(不含本部报废)' : '亮片合格率'}{coverage.brightRows === 0 ? '—' : rate(adjusted ? bright.rateWithoutHeadquartersScrap : bright.rate)}
-
} -

分析结论

- - {comparisons.map((item, index) => { - const current = record(item.current), comparison = record(item.comparison), delta = record(item.delta), comparable = record(item.comparability); - const value = (side: Row) => { const s = record(side.summary); switch (item.metric) { case 'BLACK_RATE': return rate(record(s.black).rate); case 'BRIGHT_RATE': return rate(record(s.bright).rate); case 'BRIGHT_RATE_WITHOUT_HEADQUARTERS_SCRAP': return rate(record(s.bright).rateWithoutHeadquartersScrap); case 'COMPOSITE_RATE_WITHOUT_HEADQUARTERS_SCRAP': return rate(s.compositeRateWithoutHeadquartersScrap); default: return rate(s.compositeRate); } }; - return

{metricName(item.metric)} · 期间比较

序号期间正式结果
1{period(current.context)}{value(current)}
2{period(comparison.context)}{value(comparison)}
3变化(百分点){number(delta.percentagePoints)}
{comparable.comparable === false &&

{text(comparable.reason || (Array.isArray(comparable.reasons) ? comparable.reasons.join(';') : '所选期间不可比,不给出变化结论。'))}

}
; - })} - {results.filter(item => Array.isArray(item.groups)).map((item, index) => { - const available = item.available === true; - const ranked = [...rows(item.groups)].filter(row => typeof row[available ? 'impactPP' : 'scrapDelta'] === 'number').sort((a, b) => available ? Number(a.impactPP) - Number(b.impactPP) : Number(b.scrapDelta) - Number(a.scrapDelta)).slice(0, 10); - if (!ranked.length) return null; - return

{stageName(item.stage)} · 优先核查对象

{ranked.map((row, i) => )}
序号产品 / 规格当前合格率比较期合格率{available ? '影响(百分点)' : '报废增量(kg)'}
{i + 1}{text(row.label || row.key)}{rate(row.currentRate)}{rate(row.comparisonRate)}{number(available ? row.impactPP : row.scrapDelta)}
{!available &&

按报废增量列出前10项。分组无法完整回加,仅作核查线索,不能当作整体下降贡献。

}
; - })} - {results.filter(item => item.kind === 'analysis_statistics').map((item, index) =>

{stageName(item.stage)} · 历史趋势

{rows(item.trendChange).map((row, i) => )}
序号期间阶段合格率
{i + 1}{text(row.label || row.period)}{rate(row.stageRate)}
)} - {results.filter(item => Array.isArray(item.rows) && item.dimension && item.stage).map((item, index) =>

{stageName(item.stage)} · TOP核查对象

{rows(item.rows).slice(0, 10).map((row, i) => )}
序号对象报废重量(kg)占比
{i + 1}{text(row.label || row.key)}{number(row.weight)}{rate(row.share)}
)} -
数据来源:质量数据分析平台。指标沿用正式计算口径,原因判断的依据与局限见分析结论。
+ + +
数据来源:质量数据分析平台。指标沿用正式计算口径;数据明细保留在 HTML 附录,现场原因以实际核查为准。
; } function download(href: string, name: string) { const link = document.createElement('a'); link.href = href; link.download = name; link.click(); } +/** 图片无法展开明细,生成前临时展开全部附录。 */ +async function captureReportImage(node: HTMLElement, options: NonNullable[1]> = {}) { + const details = [...node.querySelectorAll('details')].map(element => ({ element, open: element.open })); + details.forEach(({ element }) => { element.open = true; }); + try { + await node.ownerDocument.fonts?.ready; + await new Promise(resolve => requestAnimationFrame(() => resolve())); + const height = Math.max(node.scrollHeight, node.offsetHeight); + if (height > 16000) throw new Error('报告较长,请下载 HTML 查看完整图文与明细。'); + return await toPng(node, { height, backgroundColor: '#ffffff', ...options }); + } finally { + details.forEach(({ element, open }) => { element.open = open; }); + } +} + function removeDisplayMetadataFromElement(element: Element): void { const walker = element.ownerDocument.createTreeWalker(element, NodeFilter.SHOW_TEXT); const textNodes: Array<{ node: Text; start: number; end: number }> = []; @@ -220,9 +211,7 @@ export function AnalysisReportExport({ turn }: { turn: Row }) { try { await visualReport.authorize(); if (generation !== exportGeneration.current) return; - await document.fonts.ready; - if (report.scrollHeight > 16000) throw new Error('报告较长,请下载 HTML 查看完整图文。'); - const png = await toPng(report, { pixelRatio: 2, backgroundColor: '#ffffff', skipFonts: true }); + const png = await captureReportImage(report, { pixelRatio: 2, skipFonts: true }); if (generation !== exportGeneration.current) return; download(png, `${title}.png`); message.success(visualReport.failed ? '报告图片已生成,未能绘制的图表已保留数据表。' : '报告图片已生成'); @@ -258,7 +247,7 @@ export function NativeAnalysisReport({ turn, reportMarkdown, reportHtml }: { const safeHtml = useMemo(() => { const html = reportHtml?.trim() ? safeNativeHtml(reportHtml) : ''; if (!html) return ''; - return html.replace(/<\/body>/i, `${reportVisualHtml(turn, visualReport.images)}`); + return integrateNativeReportNarrative(html, turn, visualReport.images); }, [reportHtml, turn, visualReport.images]); const title = useMemo(() => { const nativeTitle = safeHtml ? new DOMParser().parseFromString(safeHtml, 'text/html').title : ''; @@ -267,13 +256,14 @@ export function NativeAnalysisReport({ turn, reportMarkdown, reportHtml }: { }, [safeHtml, reportMarkdown, turn.question]); const saveHtml = async () => { - if (!safeHtml) return; + const html = safeHtml || `${escape(title)}${fallbackNode.current?.innerHTML || ''}`; + if (!safeHtml && !fallbackNode.current) return; const generation = ++exportGeneration.current; setExporting(true); try { await visualReport.authorize(); if (generation !== exportGeneration.current) return; - const url = URL.createObjectURL(new Blob([safeHtml], { type: 'text/html;charset=utf-8' })); + const url = URL.createObjectURL(new Blob([html], { type: 'text/html;charset=utf-8' })); download(url, `${title}.html`); setTimeout(() => URL.revokeObjectURL(url), 10000); message.success(visualReport.failed ? 'HTML 已生成,未能绘制的图表已保留数据表。' : 'HTML 报告已生成'); @@ -302,18 +292,11 @@ export function NativeAnalysisReport({ turn, reportMarkdown, reportHtml }: { if (safeHtml) { const doc = iframe.current?.contentDocument; if (!doc?.body) throw new Error('原生报告尚未载入'); - await doc.fonts?.ready; - await new Promise(resolve => requestAnimationFrame(() => resolve())); - const height = Math.max(frameContentHeight(doc), frameHeight); - if (height > 16000) throw new Error('报告较长,请下载 HTML 查看完整图文。'); - png = await toPng(doc.body, { width: 900, height, pixelRatio: 1, backgroundColor: '#ffffff', fontEmbedCSS: frameFontCss(doc) }); + png = await captureReportImage(doc.body, { width: 900, pixelRatio: 1, fontEmbedCSS: frameFontCss(doc) }); } else { const report = fallbackNode.current; if (!report) throw new Error('Markdown 报告尚未载入'); - await document.fonts.ready; - const height = Math.max(report.scrollHeight, report.offsetHeight); - if (height > 16000) throw new Error('报告较长,请下载 HTML 查看完整图文。'); - png = await toPng(report, { width: 900, height, pixelRatio: 1, backgroundColor: '#ffffff', skipFonts: true }); + png = await captureReportImage(report, { width: 900, pixelRatio: 1, skipFonts: true }); } if (generation !== exportGeneration.current) return; download(png, `${title}.png`); @@ -328,7 +311,7 @@ export function NativeAnalysisReport({ turn, reportMarkdown, reportHtml }: { return <> setOpen(false)} width={980} footer={<> - + }> {visualReport.loading &&

{visualReport.progress || '正在准备报告图表…'}

} @@ -337,7 +320,7 @@ export function NativeAnalysisReport({ turn, reportMarkdown, reportHtml }: { {visualReport.authorized &&
{safeHtml ?