mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-15 00:21:58 +00:00
算子的叫法只留契约一份：contract.OP_LABELS / MODE_LABELS 是唯一来源，趋势定为「趋势判断」；engine/labels 的 ANALYSIS_OP_LABEL 直接引用 OP_LABELS、ANALYSIS_MODE_LABEL 按 MODES 从 MODE_LABELS 分到各算子（分析卡校验、应用说明、前端表单照它），phrases 去掉 OP_NAMES，「{叫法}没有做成」的判定语和算子的调用错误都用契约的叫法
This commit is contained in:
ThearchyHelios
@@ -24,8 +24,8 @@ from collections.abc import Callable, Mapping
|
||||
from datetime import date, datetime
|
||||
from typing import Any
|
||||
|
||||
from app.analysis.contract import (MODES, OPS, AnalysisRequest, AnalysisResult, CallError, Context, InputSnapshot,
|
||||
effective_settings)
|
||||
from app.analysis.contract import (MODES, OP_LABELS, OPS, AnalysisRequest, AnalysisResult, CallError, Context,
|
||||
InputSnapshot, effective_settings)
|
||||
|
||||
#: 按调用里写的名字取回输入快照；没有这个名字返回 None
|
||||
Resolver = Callable[[str], InputSnapshot | None]
|
||||
@@ -34,17 +34,15 @@ ParentResolver = Callable[[str], AnalysisResult | None]
|
||||
|
||||
|
||||
def _op_mode(request: Mapping[str, Any]) -> tuple[str, str | None]:
|
||||
from app.analysis.phrases import OP_NAMES
|
||||
|
||||
op = request.get("op")
|
||||
if op not in OPS:
|
||||
raise CallError("unknown_op", f"不认识的分析：{op}。能做的有{'、'.join(OP_NAMES[o] for o in OPS)}")
|
||||
raise CallError("unknown_op", f"不认识的分析：{op}。能做的有{'、'.join(OP_LABELS[o] for o in OPS)}")
|
||||
modes = MODES.get(op)
|
||||
mode = request.get("mode")
|
||||
if modes is None:
|
||||
return op, None
|
||||
if mode not in modes:
|
||||
raise CallError("unknown_mode", f"{OP_NAMES[op]}要写模式：{' / '.join(modes)}")
|
||||
raise CallError("unknown_mode", f"{OP_LABELS[op]}要写模式：{' / '.join(modes)}")
|
||||
return op, mode
|
||||
|
||||
|
||||
@@ -156,9 +154,10 @@ def recompute(result: AnalysisResult, load: Callable[[str], InputSnapshot | None
|
||||
|
||||
|
||||
def exhausted(settings: Mapping[str, Any]) -> CallError:
|
||||
"""本运行分析次数用完（max_calls）的调用错误：入口数着次数，到了上限交回它，不再算。"""
|
||||
"""分析次数用完（max_calls）的调用错误：上限按每个 Agent 每次执行计，入口（本节点的分析容器）数着次数，到了上限交回它，
|
||||
不再算。"""
|
||||
limit = int(effective_settings(settings)["max_calls"])
|
||||
return CallError("max_calls", f"这次运行的分析次数已经用完（最多 {limit} 次）：用已有的分析结论写，不再新做分析")
|
||||
return CallError("max_calls", f"这个 Agent 这次执行最多做 {limit} 次分析，已经用完：用已有的分析结论写，不再新做分析")
|
||||
|
||||
|
||||
def make_prober(*args: Any, **kwargs: Any) -> Any:
|
||||
|
||||
@@ -53,9 +53,10 @@ METHODS: dict[tuple[str, str | None], str] = {
|
||||
}
|
||||
#: agent 分析工具的名字（tools/builtin 里注册），一个算子一个工具：参数各自聚焦，模型少写错
|
||||
TOOL_NAMES: dict[str, str] = {op: f"analysis_{op}" for op in OPS}
|
||||
#: 算子、模式给人看的叫法：证据面板、写作目录、审计、导出、可验证报告、裁判摘录都用它（method_label 拼成一句）
|
||||
#: 算子、模式给人看的叫法，只有这一份：证据面板、写作目录、审计、导出、可验证报告、裁判摘录、分析卡的校验与表单
|
||||
#: （engine/labels 的 ANALYSIS_OP_LABEL / ANALYSIS_MODE_LABEL 引用这里）、「{叫法}没有做成」的判定语都用它（method_label 拼成一句）
|
||||
OP_LABELS: dict[str, str] = {
|
||||
"decompose": "变化拆解", "baseline": "波动基线", "trend": "趋势", "differ": "差异检验", "comparable": "可比性检查",
|
||||
"decompose": "变化拆解", "baseline": "波动基线", "trend": "趋势判断", "differ": "差异检验", "comparable": "可比性检查",
|
||||
}
|
||||
MODE_LABELS: dict[str, str] = {
|
||||
"additive": "可加", "ratio": "比率", "factor": "乘积", "rate": "比率", "mean": "均值", "rows": "逐行明细",
|
||||
@@ -154,7 +155,7 @@ LABELS: dict[str, str] = {
|
||||
"min_n": "均值比较的最小样本数",
|
||||
"min_expected": "比率比较的最小期望频数",
|
||||
"min_denominator": "比率拆解的最小分母",
|
||||
"max_calls": "一次运行最多分析几次",
|
||||
"max_calls": "Agent 每次执行最多分析几次",
|
||||
"max_drill_depth": "最多下钻几层",
|
||||
"table_top_k": "列出前几段",
|
||||
}
|
||||
@@ -303,7 +304,8 @@ class AnalysisResult(TypedDict, total=False):
|
||||
|
||||
class CallError(Exception):
|
||||
"""调用错误（细案 01 §8.1）：列不存在、列被遮罩、角色和目录度量类型冲突、同一键同一期多行、期次不在列里、乘积
|
||||
不闭合、parent 不对、下钻超深、本运行分析次数用完。不记结论，message 交回 agent（一种说法，告诉它怎么改）。"""
|
||||
不闭合、parent 不对、下钻超深、这个 Agent 这次执行的分析次数用完（max_calls 按每个 Agent 每次执行计）。不记结论，message
|
||||
交回 agent（一种说法，告诉它怎么改）。"""
|
||||
|
||||
def __init__(self, code: str, message: str) -> None:
|
||||
super().__init__(message)
|
||||
|
||||
@@ -26,11 +26,9 @@ from collections.abc import Iterable, Mapping, Sequence
|
||||
from fractions import Fraction
|
||||
from typing import Any
|
||||
|
||||
from app.analysis.contract import OP_LABELS
|
||||
from app.analysis.numbers import fixed, to_fraction
|
||||
|
||||
#: 算子的叫法：「算不了」的判定语、报错都用它
|
||||
OP_NAMES = {"decompose": "变化拆解", "baseline": "波动基线", "trend": "趋势判断", "differ": "差异检验",
|
||||
"comparable": "可比性检查"}
|
||||
#: 附带说明进判定语的先后；不在这里的（measure_unlabeled、headline_basis）只在证据面板
|
||||
PHRASE_ORDER = ("comparability", "simpson", "offset", "outlier_sensitive", "small_sample", "record_high", "record_low",
|
||||
"multiple_comparisons", "weekday_effect", "small_denominator", "null_values")
|
||||
@@ -322,7 +320,7 @@ def with_caveats(main: str, caveats: Sequence[Mapping[str, str]], *, skip: Itera
|
||||
|
||||
def refused(op: str, reason: str) -> str:
|
||||
"""算不了的判定语：{算子的叫法}没有做成：{原因}。"""
|
||||
return f"{OP_NAMES[op]}没有做成：{reason}"
|
||||
return f"{OP_LABELS[op]}没有做成：{reason}"
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
@@ -503,7 +501,7 @@ CRITERION_COMPARABLE = ("只差日期、窗口一样长、是整期、星期构
|
||||
|
||||
|
||||
__all__ = [
|
||||
"CRITERION_COMPARABLE", "EMPTY_KEY", "HEADLINE_BASIS", "KEY_JOIN", "LABEL_MAX", "MEASURE_WORDS", "OP_NAMES",
|
||||
"CRITERION_COMPARABLE", "EMPTY_KEY", "HEADLINE_BASIS", "KEY_JOIN", "LABEL_MAX", "MEASURE_WORDS",
|
||||
"PHRASE_CAVEATS", "PHRASE_ORDER", "UNVERIFIED_COMPLETE", "WEEKDAY_EFFECT", "amount", "band_text",
|
||||
"baseline_flat_phrase", "baseline_phrase", "caveat", "change", "clean_label", "comparable_phrase",
|
||||
"criterion_additive", "criterion_baseline", "criterion_differ", "criterion_factor", "criterion_ratio",
|
||||
|
||||
@@ -15,6 +15,8 @@ from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from app.analysis.contract import MODE_LABELS, MODES, OP_LABELS
|
||||
|
||||
#: 节点类型的叫法，和前端 lib/terms.ts 的 NODE_TYPE_LABEL 一致
|
||||
TYPE_LABEL: dict[str, str] = {
|
||||
"input": "输入", "output": "成果", "llm": "模型调用", "agent": "Agent",
|
||||
@@ -106,13 +108,10 @@ _FIELD_BY_TYPE: dict[str, dict[str, str]] = {
|
||||
"challenge": CHALLENGE_LABEL,
|
||||
}
|
||||
|
||||
#: 分析卡一项里的分析方法、模式的叫法（app/analysis/contract.py 的 OPS、MODES；前端分析卡的表单照这一份）
|
||||
ANALYSIS_OP_LABEL: dict[str, str] = {"decompose": "变化拆解", "baseline": "波动基线", "trend": "趋势",
|
||||
"differ": "差异检验", "comparable": "可比性检查"}
|
||||
ANALYSIS_MODE_LABEL: dict[str, dict[str, str]] = {
|
||||
"decompose": {"additive": "可加（按维度算贡献）", "ratio": "比率（拆结构与自身）", "factor": "乘积（拆因子）"},
|
||||
"differ": {"rate": "比率", "mean": "均值", "rows": "逐行的值"},
|
||||
}
|
||||
#: 分析卡一项里的分析方法、模式的叫法：只引用 app/analysis/contract.py 的 OP_LABELS / MODE_LABELS（按 MODES 分到各算子），
|
||||
#: 不另写一份；前端分析卡的表单照这一份
|
||||
ANALYSIS_OP_LABEL: dict[str, str] = OP_LABELS
|
||||
ANALYSIS_MODE_LABEL: dict[str, dict[str, str]] = {op: {m: MODE_LABELS[m] for m in modes} for op, modes in MODES.items()}
|
||||
|
||||
#: 出具契约里的键（canvas/issues.ts 的 CONTRACT_KEYS、SUB_KEYS）
|
||||
CONTRACT_KEY_LABEL: dict[str, str] = {
|
||||
|
||||
Reference in New Issue
Block a user