Files
Jyotisha/scripts/annual_service/api.py
T
ClaudeandClaude Opus 5.5 a8548673f6
Independent Staging Quality Gate / validate-frontend (push) Successful in 4m58s
Independent Staging Quality Gate / validate-python (push) Successful in 5m41s
Independent Staging Quality Gate / publish (push) Successful in 2m40s
feat(annual): read each phase per domain and per track, and use the user's declared birth range (BUG-1650)
Astrologer ruling 2026-11-06 (two rounds) on the annual defaults:
- no 2/2/1 weighted lean and no tie rule; mahadashas are background;
  Vimshottari and Narayana are read per domain; a lord enters a domain only
  through houses it owns or occupies (same rule for benefics and malefics);
  the Narayana sign only marks a theme as active; summaries never reach past
  the judged domains (部分领域可判断); 平稳 is not produced, a repeat of the
  previous phase reads 延续前一阶段的主题
- phases are never merged in the calculation; today splits the running one;
  timeline rows merge only by reading_group and keep inner dates
- windows need one shared domain; ranking by sources, date certainty and
  conflict; sky events must touch a report domain; Jupiter / Saturn
  Parashari sign aspects (5/7/9, 3/7/10, same sign apart) to each domain's
  natal objects, as relations only
- no confirmed/unconfirmed switch (product: same method for everyone): the
  range the user declared at intake is sampled and every change bisected to
  the minute, through natal chart, vargas, special points, dasha dates, solar
  return, year chart and Mudda / Patyayini; windows keep the whole range the
  dates can fall in, never a "core date"
- year-chart factors in four layers (relation, Tajika connection, limits,
  Panchavargiya capability), never a verdict; Rath method version stamped and
  unresolved branches give no direction; maraka recorded, never scored

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DbBXoyn7Hj3LCW3BUs5bZ8
2026-11-06 14:14:41 +08:00

171 lines
7.3 KiB
Python

"""HTTP-facing entry points for the annual package and report facts.
``scripts/jyotish_api_server.py`` registers these thinly (like
``chart_view_points.api``): it loads this module, calls a function with the
JSON body and maps ``AnnualServiceInputError`` to HTTP 400. Request parsing
lives here, not on the handler class.
"""
from __future__ import annotations
from datetime import datetime
from typing import Any
from zoneinfo import ZoneInfo
try: # scripts/ on sys.path (API server, tests)
from annual_service import package as _package
from annual_service import report_facts as _facts
except ImportError: # pragma: no cover - repository-root import
from scripts.annual_service import package as _package
from scripts.annual_service import report_facts as _facts
class AnnualServiceInputError(ValueError):
"""Bad request input; the API maps it to HTTP 400."""
def _number(body: dict[str, Any], key: str, low: float, high: float, *, default: float | None = None,
aliases: tuple[str, ...] = ()) -> float:
value = body.get(key)
for alias in aliases:
if value is None:
value = body.get(alias)
if value is None or value == "":
if default is None:
raise AnnualServiceInputError(f"{key} is required")
return float(default)
if isinstance(value, bool):
raise AnnualServiceInputError(f"{key} must be a number")
try:
number = float(value)
except (TypeError, ValueError) as exc:
raise AnnualServiceInputError(f"{key} must be a number") from exc
if not low <= number <= high:
raise AnnualServiceInputError(f"{key} must be between {low:g} and {high:g}")
return number
def _ayanamsa(body: dict[str, Any]) -> str:
try:
from ayanamsa_utils import DEFAULT_AYANAMSA_NAME, UnsupportedAyanamsaError, normalize_ayanamsa_name
except ImportError: # pragma: no cover
from scripts.ayanamsa_utils import DEFAULT_AYANAMSA_NAME, UnsupportedAyanamsaError, normalize_ayanamsa_name
raw = body.get("ayanamsa") or body.get("ayanamsa_name") or body.get("ayanamsa_policy")
if raw in (None, ""):
return DEFAULT_AYANAMSA_NAME
try:
return normalize_ayanamsa_name(raw)
except UnsupportedAyanamsaError as exc:
raise AnnualServiceInputError(str(exc)) from exc
def _node_mode(body: dict[str, Any]) -> str:
raw = body.get("node_mode", body.get("nodeMode"))
if raw in (None, ""):
return "mean"
if not isinstance(raw, str) or raw.strip().lower() not in {"mean", "true"}:
raise AnnualServiceInputError("node_mode must be mean or true")
return raw.strip().lower()
def _timezone_id(body: dict[str, Any]) -> str | None:
for key in ("timezone_id", "timezone"):
value = body.get(key)
if isinstance(value, str) and "/" in value:
try:
ZoneInfo(value.strip())
except Exception as exc: # noqa: BLE001 - an unknown IANA name is a bad request
raise AnnualServiceInputError(f"{key} is not a known IANA timezone") from exc
return value.strip()
return None
def _birth(body: dict[str, Any]) -> dict[str, Any]:
if not isinstance(body, dict):
raise AnnualServiceInputError("JSON body must be an object")
year = int(_number(body, "year", 1800, 2400))
month = int(_number(body, "month", 1, 12))
day = int(_number(body, "day", 1, 31))
hour = int(_number(body, "hour", 0, 23))
minute = int(_number(body, "minute", 0, 59))
second = int(_number(body, "second", 0, 59, default=0, aliases=("birth_second",)))
try:
local = datetime(year, month, day, hour, minute, second)
except ValueError as exc:
raise AnnualServiceInputError("Invalid birth date") from exc
lat = _number(body, "lat", -90, 90, aliases=("birth_lat",))
lon = _number(body, "lon", -180, 180, aliases=("birth_lon",))
if body.get("tz") not in (None, ""):
tz = _number(body, "tz", -14, 14)
else:
try:
from domain_calculation_service import infer_timezone_offset
except ImportError: # pragma: no cover
from scripts.domain_calculation_service import infer_timezone_offset
try:
tz = float(infer_timezone_offset(lat=lat, lon=lon, local_datetime=local))
except ValueError as exc:
raise AnnualServiceInputError(str(exc)) from exc
return {"year": year, "month": month, "day": day, "hour": hour, "minute": minute, "second": second,
"lat": lat, "lon": lon, "tz": tz, "timezone_id": _timezone_id(body)}
def _request(body: dict[str, Any]) -> dict[str, Any]:
birth = _birth(body)
try:
return _package.normalize_request(
birth=birth,
ayanamsa=_ayanamsa(body),
node_mode=_node_mode(body),
report_range=body.get("report_range"),
observation_date=body.get("observation_date") or body.get("today"),
return_location=body.get("return_location"),
)
except _package.AnnualPackageInputError as exc:
raise AnnualServiceInputError(str(exc)) from exc
def compute_annual_package(body: dict[str, Any]) -> dict[str, Any]:
"""`/api/annual` with mode=package, and `/api/annual/package`."""
request = _request(body)
detail = body.get("detail") or "full"
if detail not in ("full", "slim"):
raise AnnualServiceInputError("detail must be full or slim")
package = _package.build_annual_package(request, detail=detail)
return {
"success": True,
"endpoint": "annual",
"mode": "package",
"annual_package_version": package["annual_package_version"],
"package": package,
}
def _birth_window(raw: Any) -> dict[str, Any]:
if raw is None:
return {"known": False}
if not isinstance(raw, dict) or not isinstance(raw.get("known"), bool):
raise AnnualServiceInputError("birth_window must be an object with known true or false")
for key in ("source", "precision", "rectification"):
if raw.get(key) is not None and not isinstance(raw.get(key), str):
raise AnnualServiceInputError(f"birth_window.{key} must be a string")
if not raw["known"]:
return {key: raw.get(key) for key in ("known", "source", "precision", "rectification")}
out = {key: raw.get(key) for key in ("known", "source", "precision", "rectification")}
for key in ("before_minutes", "after_minutes"):
value = raw.get(key)
if not isinstance(value, int) or isinstance(value, bool) or not 0 <= value <= 1440:
raise AnnualServiceInputError(f"birth_window.{key} must be whole minutes 0-1440")
out[key] = value
return out
def compute_annual_report_facts(body: dict[str, Any]) -> dict[str, Any]:
"""`/api/annual/report_facts`: the annual report writer's only input (#153)."""
request = _request(body)
# 原值:必填 birth_time_confirmed(是 / 否),没确认就放宽 14 天、停用 D10/D11/D24
# 新值:birth_window,用户建档时填的误差范围(相对报告所用时间的前后分钟);没填 = known false
# 原因:占星师 2026-11-06 第 11 条;产品 2026-11-06「误差就用用户初始化选择的」(BUG-1650)
facts = _facts.build_annual_report_facts(request, birth_window=_birth_window(body.get("birth_window")))
return {"success": True, "endpoint": "annual_report_facts", "facts": facts}