11

Author: kentang2017

astro/annual/adapters/qimen.py

@@ -0,0 +1,23 @@
+"""Qimen Lu Ming adapter for solar-return annual charts."""
+
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Any
+
+
+def compute_qimen_at_sr(
+    sr_local: datetime,
+    *,
+    method: int = 1,
+) -> dict[str, Any]:
+    from astro.sanshi.qimen_luming import compute_qimen_luming
+
+    return compute_qimen_luming(
+        year=sr_local.year,
+        month=sr_local.month,
+        day=sr_local.day,
+        hour=sr_local.hour,
+        minute=sr_local.minute,
+        method=method,
+    )

astro/annual/adapters/taiyi.py

@@ -0,0 +1,25 @@
+"""Taiyi adapter for solar-return annual charts."""
+
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Any
+
+
+def compute_taiyi_at_sr(
+    sr_local: datetime,
+    timezone: float,
+    gender: str,
+) -> dict[str, Any]:
+    from astro.sanshi.taiyi import compute_taiyi_chart
+
+    taiyi_gender = "male" if gender in ("male", "男", "M") else "female"
+    return compute_taiyi_chart(
+        year=sr_local.year,
+        month=sr_local.month,
+        day=sr_local.day,
+        hour=sr_local.hour,
+        minute=sr_local.minute,
+        gender=taiyi_gender,
+        timezone=timezone,
+    )

astro/annual/models.py

@@ -123,6 +123,8 @@ class AnnualFlowYear(KinAstroModel):
     liuren_chart: dict[str, Any] = Field(default_factory=dict)
     liuren_jixiong: LiurenJixiong | None = None
     liuren_lunming: dict[str, Any] = Field(default_factory=dict)
+    taiyi_chart: dict[str, Any] = Field(default_factory=dict)
+    qimen_chart: dict[str, Any] = Field(default_factory=dict)
     other_chinese_systems: dict[str, ChineseSystemSnapshot] = Field(default_factory=dict)
 
     system_scores: dict[str, float] = Field(default_factory=dict)
@@ -149,8 +151,8 @@ def _validate_range(cls, value: int, info) -> int:
         start = info.data.get("start_year")
         if start is not None and value < start:
             raise ValueError("end_year must be >= start_year")
-        if start is not None and value - start > 60:
-            raise ValueError("year range cannot exceed 60 years")
+        if start is not None and value - start > 100:
+            raise ValueError("year range cannot exceed 100 years")
         return value
 
 

astro/annual/render/__init__.py

@@ -1,6 +1,11 @@
 """Render helpers for annual solar-return timelines."""
 
+from astro.annual.render.liuren_sr_subtab import render_liuren_sr_annual_subtab
 from astro.annual.render.pdf_annual_report import generate_annual_sr_pdf
 from astro.annual.render.streamlit_timeline import render_annual_sr_timeline_panel
 
-__all__ = ["generate_annual_sr_pdf", "render_annual_sr_timeline_panel"]
+__all__ = [
+    "generate_annual_sr_pdf",
+    "render_annual_sr_timeline_panel",
+    "render_liuren_sr_annual_subtab",
+]

astro/annual/render/liuren_sr_subtab.py

@@ -0,0 +1,84 @@
+"""Liuren solar-return annual sub-tab: lazy chart per virtual age (1–120)."""
+
+from __future__ import annotations
+
+from datetime import datetime
+
+import streamlit as st
+
+from astro.annual.natal_context import virtual_age
+from astro.annual.timeline import compute_sr_liuren_for_virtual_age
+from astro.models import BirthData
+from astro.sanshi.liuren import render_liuren_chart, render_lunming_report
+from core.cached_computations import _birth_sig, compute_sr_liuren_age_cached
+from ui.helpers import t
+
+MAX_VIRTUAL_AGE = 120
+
+
+def _sr_year_for_age(birth_year: int, age: int) -> int:
+    return birth_year + age - 1
+
+
+def render_liuren_sr_annual_subtab(birth: BirthData, benming_zhi: str) -> None:
+    """Render on-demand solar-return Liu Ren charts for virtual ages 1–120."""
+    st.caption(
+        "依出生地計算每年太陽回歸精確時刻，以該時刻起大六壬課式與祿命論年。"
+        "僅在您選定虛歲並按「排盤」後才計算該年，不會一次跑完 120 年。"
+    )
+
+    ages = list(range(1, MAX_VIRTUAL_AGE + 1))
+    current_age = min(max(virtual_age(birth.year, datetime.now().year), 1), MAX_VIRTUAL_AGE)
+    default_index = current_age - 1
+
+    col_age, col_btn = st.columns([4, 1])
+    with col_age:
+        selected_age = st.selectbox(
+            "虛歲",
+            options=ages,
+            index=default_index,
+            format_func=lambda age: (
+                f"虛歲 {age} 歲（SR {_sr_year_for_age(birth.year, age)} 年）"
+            ),
+            key="liuren_sr_age_select",
+        )
+    with col_btn:
+        st.write("")
+        st.write("")
+        run_chart = st.button("排盤", type="primary", key="liuren_sr_compute_btn")
+
+    sr_year = _sr_year_for_age(birth.year, selected_age)
+    birth_sig = _birth_sig(birth.to_compute_kwargs())
+    cache_slot = f"liuren_sr::{birth_sig}::{selected_age}"
+
+    if run_chart:
+        with st.spinner(t("spinner_liuren_sr_annual")):
+            flow_year = compute_sr_liuren_age_cached(birth_sig, selected_age, benming_zhi)
+            st.session_state["liuren_sr_active_slot"] = cache_slot
+            st.session_state[cache_slot] = flow_year
+
+    active_slot = st.session_state.get("liuren_sr_active_slot")
+    flow_year = st.session_state.get(cache_slot) if active_slot == cache_slot else None
+
+    if flow_year is None:
+        st.info(f"請選擇虛歲（1–{MAX_VIRTUAL_AGE}），再按「排盤」以顯示該年太陽回歸六壬盤。")
+        return
+
+    st.markdown(
+        f"**虛歲 {selected_age} 歲｜SR {sr_year} 年｜太陽回歸：** "
+        f"`{flow_year.exact_sr_datetime_local.strftime('%Y-%m-%d %H:%M:%S')}`"
+    )
+    if flow_year.sr_day_gz or flow_year.sr_hour_gz:
+        st.caption(
+            f"日干支 {flow_year.sr_day_gz or '—'}　"
+            f"時干支 {flow_year.sr_hour_gz or '—'}　"
+            f"流年 {flow_year.liunian_gz or '—'}"
+        )
+
+    if flow_year.liuren_chart:
+        render_liuren_chart(
+            flow_year.liuren_chart,
+            benming_zhi=benming_zhi,
+        )
+    if flow_year.liuren_lunming:
+        render_lunming_report(flow_year.liuren_lunming)

astro/annual/timeline.py

@@ -6,6 +6,8 @@
 from typing import Iterable
 
 from astro.annual.adapters.liuren import compute_liuren_at_sr
+from astro.annual.adapters.qimen import compute_qimen_at_sr
+from astro.annual.adapters.taiyi import compute_taiyi_at_sr
 from astro.annual.models import (
     AnnualFlowYear,
     ReturnLocation,
@@ -33,7 +35,7 @@
 from astro.western.western import compute_western_chart
 from astro.ziwei import compute_ziwei_chart
 
-SUPPORTED_SYSTEMS = {"western", "liuren", "ziwei", "bazi", "qizheng"}
+SUPPORTED_SYSTEMS = {"western", "liuren", "ziwei", "bazi", "qizheng", "taiyi", "qimen"}
 CAUTION_THRESHOLD = 45.0
 
 
@@ -192,10 +194,47 @@ def _compute_single_year(
         flow_year.other_chinese_systems["qizheng"] = snapshot
         flow_year.system_scores["qizheng"] = snapshot.score
 
+    if "taiyi" in include_systems:
+        gender = birth.legacy_gender or "male"
+        flow_year.taiyi_chart = compute_taiyi_at_sr(
+            sr_local,
+            return_location.timezone,
+            gender,
+        )
+
+    if "qimen" in include_systems:
+        flow_year.qimen_chart = compute_qimen_at_sr(sr_local)
+
     flow_year.integrated_interpretation = _build_integrated_summary(flow_year)
     return flow_year
 
 
+def compute_sr_liuren_for_virtual_age(
+    birth_data: BirthData,
+    virtual_age_years: int,
+    *,
+    return_location: ReturnLocation | None = None,
+    benming_zhi: str | None = None,
+    age_kind: str = "virtual",
+) -> AnnualFlowYear:
+    """Compute a single solar-return Liu Ren year for the given virtual age."""
+    if virtual_age_years < 1 or virtual_age_years > 120:
+        raise ValueError("virtual age must be between 1 and 120")
+    sr_year = birth_data.year + virtual_age_years - 1
+    timeline = compute_solar_return_flowyear_timeline(
+        birth_data,
+        sr_year,
+        sr_year,
+        return_location=return_location,
+        include_systems=["liuren"],
+        benming_zhi=benming_zhi,
+        age_kind=age_kind,
+    )
+    if not timeline.years:
+        raise ValueError(f"no solar-return year computed for virtual age {virtual_age_years}")
+    return timeline.years[0]
+
+
 def compute_solar_return_flowyear_timeline(
     birth_data: BirthData,
     start_year: int,
@@ -287,6 +326,11 @@ def compute_solar_return_flowyear_timeline(
             f"共 {len(years)} 年，大六壬平均 {avg:.1f} 分；"
             f"最高 {max(liuren_scores):.0f}，最低 {min(liuren_scores):.0f}。"
         )
+    elif years and systems <= {"liuren", "taiyi", "qimen"}:
+        trend_summary = (
+            f"共 {len(years)} 個太陽回歸時刻，"
+            f"自 {years[0].year} 至 {years[-1].year} 年（虛歲 {years[0].age}–{years[-1].age}）。"
+        )
 
     return SolarReturnTimeline(
         request=request,

astro/data/i18n_translations.json

@@ -3479,6 +3479,15 @@
     "th": "**Qimen Destiny Analysis**\n\nThis method uses the Qi Men Dun Jia chart cast at the time of birth to analyze one's destiny. The year stem's palace becomes the Life Palace, and the Five Elements relationships with other stems reveal the Six Relations (parents, siblings, children, career, spouse/wealth, health), combined with Eight Doors, Eight Gods, and pattern analysis for a comprehensive life reading.",
     "zh_cn": "**Qimen Destiny Analysis**\n\nThis method uses the Qi Men Dun Jia chart cast at the time of birth to analyze one's destiny. The year stem's palace becomes the Life Palace, and the Five Elements relationships with other stems reveal the Six Relations (parents, siblings, children, career, spouse/wealth, health), combined with Eight Doors, Eight Gods, and pattern analysis for a comprehensive life reading."
   },
+  "desc_sr_sanshi": {
+    "en": "**Sanshi Solar Return Annual Charts**\n\nFrom your birth year to the present, each year's exact solar return moment at your birth location is used to cast Da Liu Ren, Taiyi Life Method, and Qimen Destiny charts — one set of Three Formulae boards per return year.",
+    "zh": "**三式太陽回歸流年**\n\n依您輸入的出生年月日時分與出生地，逐年計算太陽回歸的精確時刻（預設於出生地觀測），並以該時刻起盤：\n\n- **大六壬**：太陽回歸課式 + 祿命論年\n- **太乙命法**：以回歸時刻排太乙命盤\n- **奇門祿命**：以回歸時刻排奇門局\n\n可一次瀏覽自出生年至今年的全部流年盤，或自訂年份區間。",
+    "ko": "**Sanshi Solar Return Annual Charts**\n\nFrom your birth year to the present, each year's exact solar return moment at your birth location is used to cast Da Liu Ren, Taiyi Life Method, and Qimen Destiny charts — one set of Three Formulae boards per return year.",
+    "ja": "**Sanshi Solar Return Annual Charts**\n\nFrom your birth year to the present, each year's exact solar return moment at your birth location is used to cast Da Liu Ren, Taiyi Life Method, and Qimen Destiny charts — one set of Three Formulae boards per return year.",
+    "vi": "**Sanshi Solar Return Annual Charts**\n\nFrom your birth year to the present, each year's exact solar return moment at your birth location is used to cast Da Liu Ren, Taiyi Life Method, and Qimen Destiny charts — one set of Three Formulae boards per return year.",
+    "th": "**Sanshi Solar Return Annual Charts**\n\nFrom your birth year to the present, each year's exact solar return moment at your birth location is used to cast Da Liu Ren, Taiyi Life Method, and Qimen Destiny charts — one set of Three Formulae boards per return year.",
+    "zh_cn": "**三式太阳回归流年**\n\n依您输入的出生年月日时分与出生地，逐年计算太阳回归的精确时刻（默认于出生地观测），并以该时刻起盘：大六壬、太乙命法、奇门禄命。可一次浏览自出生年至今年的全部流年盘。"
+  },
   "desc_rectification": {
     "en": "🔮 **Birth Chart Rectification** — Combines Primary Directions, Solar Arcs, Secondary Progressions, Annual Profections, Zodiacal Releasing, and Transits with weighted scoring to rank candidate birth times. Based on Vettius Valens' Anthology and Lilly's Christian Astrology.",
     "zh": "🔮 **出生時間校正** — 結合初級方向（Primary Directions）、太陽弧（Solar Arcs）、次進法（Secondary Progressions）、流年小限（Annual Profections）、黃道釋放（Zodiacal Releasing）及行星過境（Transits）六大技術，以加權評分算法對候選出生時間進行排名。依據 Vettius Valens《Anthology》、William Lilly《Christian Astrology》等古典文獻。",
@@ -6791,6 +6800,15 @@
     "th": "Computing Da Liu Ren chart…",
     "zh_cn": "正在计算大六壬排盤…"
   },
+  "spinner_liuren_sr_annual": {
+    "en": "Computing solar-return Liu Ren chart for selected age…",
+    "zh": "正在計算所選虛歲的太陽回歸六壬盤…",
+    "ko": "Computing solar-return Liu Ren chart for selected age…",
+    "ja": "Computing solar-return Liu Ren chart for selected age…",
+    "vi": "Computing solar-return Liu Ren chart for selected age…",
+    "th": "Computing solar-return Liu Ren chart for selected age…",
+    "zh_cn": "正在计算所选虚岁的太阳回归六壬盘…"
+  },
   "spinner_liuyao_lifetime": {
     "en": "Computing Lifetime Liu Yao hexagram…",
     "zh": "計算六爻終身卦…",
@@ -6932,6 +6950,15 @@
     "th": "Computing Qimen Destiny…",
     "zh_cn": "正在计算奇門祿命…"
   },
+  "spinner_sr_sanshi": {
+    "en": "Computing solar-return annual charts for Liu Ren, Taiyi, and Qimen…",
+    "zh": "正在計算三式太陽回歸流年盤（大六壬、太乙、奇門）…",
+    "ko": "Computing solar-return annual charts for Liu Ren, Taiyi, and Qimen…",
+    "ja": "Computing solar-return annual charts for Liu Ren, Taiyi, and Qimen…",
+    "vi": "Computing solar-return annual charts for Liu Ren, Taiyi, and Qimen…",
+    "th": "Computing solar-return annual charts for Liu Ren, Taiyi, and Qimen…",
+    "zh_cn": "正在计算三式太阳回归流年盘（大六壬、太乙、奇门）…"
+  },
   "spinner_rectification": {
     "en": "Running rectification, please wait…",
     "zh": "校正計算中，請稍候……",
@@ -7736,6 +7763,15 @@
     "th": "Qimen Dunjia destiny analysis based on birth chart",
     "zh_cn": "Qimen Dunjia destiny analysis based on birth chart"
   },
+  "sys_hint_sr_sanshi": {
+    "en": "Annual Liu Ren, Taiyi, and Qimen charts at each solar return",
+    "zh": "自出生年起，每年太陽回歸時刻起大六壬、太乙、奇門流年盤",
+    "ko": "Annual Liu Ren, Taiyi, and Qimen charts at each solar return",
+    "ja": "Annual Liu Ren, Taiyi, and Qimen charts at each solar return",
+    "vi": "Annual Liu Ren, Taiyi, and Qimen charts at each solar return",
+    "th": "Annual Liu Ren, Taiyi, and Qimen charts at each solar return",
+    "zh_cn": "自出生年起，每年太阳回归时刻起大六壬、太乙、奇门流年盘"
+  },
   "sys_hint_rectification": {
     "en": "Multi-technique classical rectification: Primary Dirs · Solar Arcs · Progressions",
     "zh": "多技術古典校正：初級方向 · 太陽弧 · 次進法 · 小限 · 黃道釋放",
@@ -8534,6 +8570,15 @@
     "th": "🔮 Qimen Destiny",
     "zh_cn": "🔮 Qimen Destiny"
   },
+  "tab_sr_sanshi": {
+    "en": "🌞 Sanshi Solar Return Years",
+    "zh": "🌞 三式太陽回歸流年",
+    "ko": "🌞 Sanshi Solar Return Years",
+    "ja": "🌞 Sanshi Solar Return Years",
+    "vi": "🌞 Sanshi Solar Return Years",
+    "th": "🌞 Sanshi Solar Return Years",
+    "zh_cn": "🌞 三式太阳回归流年"
+  },
   "tab_rectification": {
     "en": "🔮 Rectification",
     "zh": "🔮 出生時間校正",
@@ -9823,6 +9868,24 @@
     "th": "Daxian / Liunian",
     "zh_cn": "Daxian / Liunian"
   },
+  "liuren_subtab_natal": {
+    "en": "Natal Destiny",
+    "zh": "本命祿命",
+    "ko": "Natal Destiny",
+    "ja": "Natal Destiny",
+    "vi": "Natal Destiny",
+    "th": "Natal Destiny",
+    "zh_cn": "本命禄命"
+  },
+  "liuren_subtab_sr_annual": {
+    "en": "Solar Return Years",
+    "zh": "太陽回歸流年",
+    "ko": "Solar Return Years",
+    "ja": "Solar Return Years",
+    "vi": "Solar Return Years",
+    "th": "Solar Return Years",
+    "zh_cn": "太阳回归流年"
+  },
   "ziwei_subtab_natal": {
     "en": "Natal",
     "zh": "本命盤",

astro/system_registry.py

@@ -226,9 +226,14 @@ def _reg(system: System) -> System:
     desc_key="desc_liuren",
     spinner_key="spinner_liuren",
     hint_key="sys_hint_liuren",
+    sub_tabs=[
+        SubTab("liuren_subtab_natal", "natal"),
+        SubTab("liuren_subtab_sr_annual", "solar_return"),
+    ],
     tags=["六壬", "三式", "liuren", "divination", "chinese", "timekeeping"],
     maturity="core",
     accent_color=_a("cat_sanshi"),
+    supports_return=True,
     origin_culture="Chinese",
     tradition_period="Han Dynasty",
     ai_persona_key="info_liuren_prompt",
@@ -270,7 +275,6 @@ def _reg(system: System) -> System:
     ai_persona_key="info_qimen_luming_prompt",
 ))
 
-
 # ═════════════════════════════════════════════════════════════════════════════
 # cat_chinese — 中華傳統 🏮
 # ═════════════════════════════════════════════════════════════════════════════