feat(upstream): merge a6f47abd engine, MCP, and orchestrator
Three-way-merge calculation modules and pl9-export into the product fork while keeping commercial API routes, Raman ayanamsa, and the consultation contract as a keypath superset. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -28,6 +28,16 @@ try:
|
||||
except ImportError: # pragma: no cover - package import path
|
||||
from scripts.consultation_domain_registry import CANONICAL_DOMAINS, normalize_domain
|
||||
|
||||
try:
|
||||
from report_language_contract import build_report_language_contract_audit
|
||||
except Exception: # pragma: no cover - module is research-only and not vendored
|
||||
try:
|
||||
from scripts.report_language_contract import build_report_language_contract_audit
|
||||
except Exception:
|
||||
def build_report_language_contract_audit(rendered):
|
||||
return {"status": "blocked", "reason": "report_language_contract_module_absent"}
|
||||
|
||||
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# 核心枚举与常量
|
||||
@@ -1134,6 +1144,22 @@ def render_reader_report(reader_report: Dict[str, Any]) -> Dict[str, Any]:
|
||||
thematic_narrative = reader_report.get("thematic_narrative")
|
||||
supplied_appendix = reader_report.get("evidence_appendix")
|
||||
evidence_appendix = dict(supplied_appendix) if isinstance(supplied_appendix, dict) else {}
|
||||
dasha_boundary_packets = reader_report.get("dasha_boundary_packets")
|
||||
ashtottari_packet = reader_report.get("ashtottari_report_boundary_packet")
|
||||
startrack_language_bridge = reader_report.get("startrack_language_bridge")
|
||||
if (isinstance(dasha_boundary_packets, dict) and dasha_boundary_packets) or (isinstance(ashtottari_packet, dict) and ashtottari_packet):
|
||||
reference_parity = evidence_appendix.get("reference_parity")
|
||||
reference_parity = dict(reference_parity) if isinstance(reference_parity, dict) else {}
|
||||
if isinstance(dasha_boundary_packets, dict) and dasha_boundary_packets:
|
||||
reference_parity.setdefault("dasha_boundary_packets", dasha_boundary_packets)
|
||||
if isinstance(ashtottari_packet, dict) and ashtottari_packet:
|
||||
reference_parity.setdefault("ashtottari_pl9_boundary_packet", ashtottari_packet)
|
||||
evidence_appendix["reference_parity"] = reference_parity
|
||||
if isinstance(startrack_language_bridge, dict) and startrack_language_bridge:
|
||||
language_bridge = evidence_appendix.get("language_bridge")
|
||||
language_bridge = dict(language_bridge) if isinstance(language_bridge, dict) else {}
|
||||
language_bridge.setdefault("startrack_language_bridge", startrack_language_bridge)
|
||||
evidence_appendix["language_bridge"] = language_bridge
|
||||
presentation_mode = reader_report.get("presentation_mode")
|
||||
if not presentation_mode and isinstance(executive_summary, dict):
|
||||
presentation_mode = executive_summary.get("presentation_mode")
|
||||
@@ -1152,6 +1178,13 @@ def render_reader_report(reader_report: Dict[str, Any]) -> Dict[str, Any]:
|
||||
"evidence_appendix": evidence_appendix,
|
||||
}
|
||||
rendered.update(extensions)
|
||||
language_bridge = rendered["evidence_appendix"].get("language_bridge")
|
||||
language_bridge = dict(language_bridge) if isinstance(language_bridge, dict) else {}
|
||||
language_bridge.setdefault(
|
||||
"report_language_contract_audit",
|
||||
build_report_language_contract_audit(rendered),
|
||||
)
|
||||
rendered["evidence_appendix"]["language_bridge"] = language_bridge
|
||||
return rendered
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user