v6.1.6: Add five-system dasha convergence

2026-06-07 20:16:47 +08:00
parent 067b400625
commit 57e426515d
8 changed files with 402 additions and 196 deletions
@@ -217,17 +217,26 @@ def calculate_kalachakra_dasha(birth_info: dict) -> dict:
    starting_lord = major_periods[0]["lord"] if major_periods else None
    starting_rashi = major_periods[0]["rashi"] if major_periods else None

-    # Determine current period
+    # Determine current period. Kalachakra cycles through the generated Rashi-year
+    # sequence repeatedly; older natives should still return a current period.
    now = datetime.now()
    current_period = None
+    age_years = max((now - birth_dt).days / 365.25, 0)
+    current_in_cycle = age_years % total_cycle if total_cycle else age_years
+    cumulative = 0.0
    for p in major_periods:
-        p_start = datetime.fromisoformat(p["start_date"])
-        p_end = datetime.fromisoformat(p["end_date"])
-        if p_start <= now < p_end:
+        years = p["years"]
+        if cumulative <= current_in_cycle < cumulative + years:
+            cycle_start = birth_dt + timedelta(days=(age_years - current_in_cycle + cumulative) * 365.25)
+            cycle_end = cycle_start + timedelta(days=years * 365.25)
            current_period = p.copy()
-            current_period["elapsed_years"] = (now - p_start).days / 365.25
-            current_period["remaining_years"] = (p_end - now).days / 365.25
+            current_period["start_date"] = cycle_start.isoformat()
+            current_period["end_date"] = cycle_end.isoformat()
+            current_period["elapsed_years"] = (now - cycle_start).days / 365.25
+            current_period["remaining_years"] = (cycle_end - now).days / 365.25
+            current_period["cycle_number"] = int(age_years // total_cycle) + 1 if total_cycle else 1
            break
+        cumulative += years

    return {
        "mode": mode,