Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2dbd3410e9 | |||
| ca458fd741 | |||
| b013831492 | |||
| d14a77360a | |||
| a8c3072e62 | |||
| 93932246f3 | |||
| 8d579de34a | |||
| db3d1e5117 | |||
| 4a86d34f5a | |||
| fb317172ff | |||
| f6323cac10 | |||
| 243d02d55b | |||
| 166b438f83 | |||
| 41d7ca491d | |||
| 6acd3546fb | |||
| 82809665ff | |||
| 0e74566a78 | |||
| cea6907f84 | |||
| dabbaef9dd | |||
| a81ae698a3 | |||
| eef67d37b5 | |||
| 94c3023d3a | |||
| e4f6a16c9c | |||
| 413c46b5dd | |||
| 340b3058e4 | |||
| 376a4bfded | |||
| 3195d9b003 |
@@ -1,31 +1,56 @@
|
|||||||
.PHONY: help up down sample reindex migrate sql dev-data dev-logic dev-presentation
|
.PHONY: help install up down sample reindex migrate sql test clean-cache \
|
||||||
|
dev-data dev-logic dev-presentation
|
||||||
|
|
||||||
|
# Autodetekcja narzędzia compose: nowe "docker compose" albo stare "docker-compose".
|
||||||
|
COMPOSE := $(shell if docker compose version >/dev/null 2>&1; then echo "docker compose"; \
|
||||||
|
elif command -v docker-compose >/dev/null 2>&1; then echo "docker-compose"; fi)
|
||||||
|
|
||||||
|
# Python aktywnego środowiska (venv). Nadpisz: make install PY=python3.12
|
||||||
|
PY ?= python
|
||||||
|
|
||||||
help:
|
help:
|
||||||
@echo "up - uruchom wszystkie 3 warstwy (docker compose)"
|
@echo "install - zainstaluj zależności WSZYSTKICH warstw do aktywnego venv"
|
||||||
@echo "down - zatrzymaj"
|
|
||||||
@echo "sample - wygeneruj przykładowe pliki .xlsx"
|
@echo "sample - wygeneruj przykładowe pliki .xlsx"
|
||||||
|
@echo "dev-data - uruchom warstwę danych lokalnie (:8002)"
|
||||||
|
@echo "dev-logic - uruchom warstwę logiczną lokalnie (:8001)"
|
||||||
|
@echo "dev-presentation - uruchom warstwę prezentacji lokalnie (:8000)"
|
||||||
|
@echo "test - testy warstwy logicznej (silnik efemeryd)"
|
||||||
|
@echo "clean-cache - wyczyść regenerowalny cache warstwy danych"
|
||||||
@echo "reindex - zbuduj cache + indeks warstwy bazodanowej"
|
@echo "reindex - zbuduj cache + indeks warstwy bazodanowej"
|
||||||
@echo "migrate - ETL: Excel -> SQL"
|
@echo "migrate - ETL: Excel -> SQL"
|
||||||
@echo "sql - uruchom z warstwą SQL (DATA_PROVIDER=sql)"
|
@echo "up / down - uruchom / zatrzymaj cały stos (Docker; wykryto: $(COMPOSE))"
|
||||||
@echo "dev-* - uruchom pojedynczą warstwę lokalnie (bez dockera)"
|
@echo "sql - Docker z warstwą SQL (DATA_PROVIDER=sql)"
|
||||||
|
@echo ""
|
||||||
|
@echo "Szybki start lokalny (bez Dockera), w 3 terminalach:"
|
||||||
|
@echo " make install"
|
||||||
|
@echo " make sample # opcjonalnie: dane przykładowe"
|
||||||
|
@echo " make dev-data # terminal 1"
|
||||||
|
@echo " make dev-logic # terminal 2"
|
||||||
|
@echo " make dev-presentation # terminal 3 -> http://localhost:8000"
|
||||||
|
|
||||||
up:
|
# --- instalacja zależności do aktywnego środowiska ---
|
||||||
docker compose up --build
|
install:
|
||||||
|
$(PY) -m pip install \
|
||||||
down:
|
-r services/data/requirements.txt \
|
||||||
docker compose down
|
-r services/logic/requirements.txt \
|
||||||
|
-r services/presentation/requirements.txt
|
||||||
|
@echo "OK. Zależności warstw zainstalowane. (Silnik AGPL 'engine-swisseph' instaluje się osobno.)"
|
||||||
|
|
||||||
sample:
|
sample:
|
||||||
cd services/data && python scripts/make_sample_data.py
|
cd services/data && $(PY) scripts/make_sample_data.py
|
||||||
|
|
||||||
reindex:
|
reindex:
|
||||||
cd services/data && python -m app.ingest.build_index
|
cd services/data && $(PY) -m app.ingest.build_index
|
||||||
|
|
||||||
migrate:
|
migrate:
|
||||||
cd services/data && python -m app.ingest.to_sql
|
cd services/data && $(PY) -m app.ingest.to_sql
|
||||||
|
|
||||||
sql:
|
test:
|
||||||
DATA_PROVIDER=sql docker compose up --build
|
cd services/logic && PYTHONPATH=. $(PY) -m pytest tests -q
|
||||||
|
|
||||||
|
clean-cache:
|
||||||
|
rm -rf services/data/.cache/* services/logic/.ephemeris/* 2>/dev/null || true
|
||||||
|
@echo "Cache wyczyszczony."
|
||||||
|
|
||||||
# --- lokalny dev (3 osobne terminale) ---
|
# --- lokalny dev (3 osobne terminale) ---
|
||||||
dev-data:
|
dev-data:
|
||||||
@@ -36,3 +61,20 @@ dev-logic:
|
|||||||
|
|
||||||
dev-presentation:
|
dev-presentation:
|
||||||
cd services/presentation && LOGIC_URL=http://localhost:8001 uvicorn app.main:app --reload --port 8000
|
cd services/presentation && LOGIC_URL=http://localhost:8001 uvicorn app.main:app --reload --port 8000
|
||||||
|
|
||||||
|
# --- Docker (opcjonalnie) ---
|
||||||
|
up:
|
||||||
|
@if [ -z "$(COMPOSE)" ]; then \
|
||||||
|
echo "Nie znaleziono Docker Compose (ani 'docker compose', ani 'docker-compose')."; \
|
||||||
|
echo "Użyj trybu lokalnego: make install, potem dev-data / dev-logic / dev-presentation."; \
|
||||||
|
exit 1; \
|
||||||
|
fi
|
||||||
|
$(COMPOSE) up --build
|
||||||
|
|
||||||
|
down:
|
||||||
|
@if [ -z "$(COMPOSE)" ]; then echo "Brak Docker Compose."; exit 1; fi
|
||||||
|
$(COMPOSE) down
|
||||||
|
|
||||||
|
sql:
|
||||||
|
@if [ -z "$(COMPOSE)" ]; then echo "Brak Docker Compose."; exit 1; fi
|
||||||
|
DATA_PROVIDER=sql $(COMPOSE) up --build
|
||||||
|
|||||||
@@ -28,13 +28,20 @@ make up # zbuduj i uruchom 3 warstwy
|
|||||||
# otwórz http://localhost:8000
|
# otwórz http://localhost:8000
|
||||||
```
|
```
|
||||||
|
|
||||||
## Szybki start (lokalnie, 3 terminale)
|
## Szybki start (lokalnie, bez Dockera — zalecane)
|
||||||
|
```bash
|
||||||
|
python -m venv .env && source .env/bin/activate # venv (jednorazowo)
|
||||||
|
make install # zależności WSZYSTKICH warstw
|
||||||
|
make sample # opcjonalnie: dane przykładowe
|
||||||
|
```
|
||||||
|
Potem w 3 osobnych terminalach (w każdym `source .env/bin/activate`):
|
||||||
```bash
|
```bash
|
||||||
cd services/data && pip install -r requirements.txt && python scripts/make_sample_data.py
|
|
||||||
make dev-data # terminal 1 -> :8002
|
make dev-data # terminal 1 -> :8002
|
||||||
make dev-logic # terminal 2 -> :8001
|
make dev-logic # terminal 2 -> :8001
|
||||||
make dev-presentation # terminal 3 -> :8000
|
make dev-presentation # terminal 3 -> :8000 -> http://localhost:8000
|
||||||
```
|
```
|
||||||
|
> `make install` instaluje zależności wszystkich trzech warstw do aktywnego venv.
|
||||||
|
> Testy silnika: `make test`. Wyczyszczenie cache: `make clean-cache`.
|
||||||
|
|
||||||
## Modułowość — dowód
|
## Modułowość — dowód
|
||||||
- Wymień prezentację (np. na SPA/React) → reszta bez zmian, kontrakt `/api/query` stały.
|
- Wymień prezentację (np. na SPA/React) → reszta bez zmian, kontrakt `/api/query` stały.
|
||||||
|
|||||||
+7
-2
@@ -31,5 +31,10 @@ class FrameCache:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
def put(self, fp: str, sheet: str, frame: pd.DataFrame) -> None:
|
def put(self, fp: str, sheet: str, frame: pd.DataFrame) -> None:
|
||||||
# astype(str) na kolumnach object zapewnia stabilny zapis Parquet
|
# Kolumny z heterogenicznych plików Excela bywają mieszane (int + str +
|
||||||
frame.to_parquet(self._path(fp, sheet), index=False)
|
# NaN w jednej kolumnie) — pyarrow tego nie zapisze. Warstwa danych i tak
|
||||||
|
# operuje na tekście (wyszukiwanie po .astype(str)), więc zapisujemy ramkę
|
||||||
|
# jako string (brak wartości -> pusty tekst). Gwarantuje to stabilny zapis
|
||||||
|
# Parquet niezależnie od zawartości pliku źródłowego.
|
||||||
|
safe = frame.astype("string").fillna("")
|
||||||
|
safe.to_parquet(self._path(fp, sheet), index=False)
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class SearchQuery(BaseModel):
|
|||||||
key: str = Field(..., description="Pole/kolumna kanoniczna, po której szukamy, np. 'name'.")
|
key: str = Field(..., description="Pole/kolumna kanoniczna, po której szukamy, np. 'name'.")
|
||||||
value: str = Field(..., description="Szukana wartość.")
|
value: str = Field(..., description="Szukana wartość.")
|
||||||
exact: bool = Field(False, description="Dopasowanie dokładne vs. zawieranie (contains).")
|
exact: bool = Field(False, description="Dopasowanie dokładne vs. zawieranie (contains).")
|
||||||
limit: int = Field(50, ge=1, le=1000)
|
limit: int = Field(50, ge=1, le=50000)
|
||||||
fields: list[str] | None = Field(
|
fields: list[str] | None = Field(
|
||||||
None, description="Lista pól kanonicznych do zwrócenia; None = wszystkie."
|
None, description="Lista pól kanonicznych do zwrócenia; None = wszystkie."
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -82,7 +82,10 @@ class ExcelDataProvider(DataProvider):
|
|||||||
|
|
||||||
def warmup(self) -> None:
|
def warmup(self) -> None:
|
||||||
for path in self._excel_files():
|
for path in self._excel_files():
|
||||||
|
try:
|
||||||
self._ensure_indexed(path)
|
self._ensure_indexed(path)
|
||||||
|
except Exception as e: # jeden uszkodzony plik nie może zablokować startu
|
||||||
|
print(f"[data] pominięto plik przy indeksowaniu: {path} — {e}")
|
||||||
|
|
||||||
def _excel_files(self) -> list[str]:
|
def _excel_files(self) -> list[str]:
|
||||||
base = Path(self.s.excel_dir)
|
base = Path(self.s.excel_dir)
|
||||||
@@ -112,7 +115,9 @@ class ExcelDataProvider(DataProvider):
|
|||||||
if query.exact:
|
if query.exact:
|
||||||
mask = col.str.lower() == query.value.lower()
|
mask = col.str.lower() == query.value.lower()
|
||||||
else:
|
else:
|
||||||
mask = col.str.lower().str.contains(query.value.lower(), na=False)
|
# regex=False: wartości sygnifikatorów zawierają znaki [ + itd.,
|
||||||
|
# które są metaznakami regex — szukamy dosłownie.
|
||||||
|
mask = col.str.lower().str.contains(query.value.lower(), na=False, regex=False)
|
||||||
matched = frame[mask]
|
matched = frame[mask]
|
||||||
if query.fields:
|
if query.fields:
|
||||||
keep = [c for c in query.fields if c in matched.columns]
|
keep = [c for c in query.fields if c in matched.columns]
|
||||||
|
|||||||
@@ -29,8 +29,14 @@ _PLANETS = {
|
|||||||
"Sun": swe.SUN, "Moon": swe.MOON, "Mercury": swe.MERCURY, "Venus": swe.VENUS,
|
"Sun": swe.SUN, "Moon": swe.MOON, "Mercury": swe.MERCURY, "Venus": swe.VENUS,
|
||||||
"Mars": swe.MARS, "Jupiter": swe.JUPITER, "Saturn": swe.SATURN,
|
"Mars": swe.MARS, "Jupiter": swe.JUPITER, "Saturn": swe.SATURN,
|
||||||
"Uranus": swe.URANUS, "Neptune": swe.NEPTUNE, "Pluto": swe.PLUTO,
|
"Uranus": swe.URANUS, "Neptune": swe.NEPTUNE, "Pluto": swe.PLUTO,
|
||||||
|
# punkty wirtualne — mean, jak w silniku własnym (parzystość LOG-28)
|
||||||
|
"North Node": swe.MEAN_NODE, "Lilith": swe.MEAN_APOG,
|
||||||
|
# "South Node" obsługiwany pochodnie w /positions: NN + 180°
|
||||||
}
|
}
|
||||||
DEFAULT_OBJECTS = list(_PLANETS)
|
DEFAULT_OBJECTS = [
|
||||||
|
"Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn",
|
||||||
|
"Uranus", "Neptune", "Pluto", "North Node", "South Node", "Lilith",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
class PositionsRequest(BaseModel):
|
class PositionsRequest(BaseModel):
|
||||||
@@ -48,8 +54,11 @@ def positions(req: PositionsRequest) -> dict:
|
|||||||
|
|
||||||
rows = []
|
rows = []
|
||||||
for name in (req.objects or DEFAULT_OBJECTS):
|
for name in (req.objects or DEFAULT_OBJECTS):
|
||||||
xx, _retflag = swe.calc_ut(jd, _PLANETS[name], _FLAGS)
|
lookup = "North Node" if name == "South Node" else name
|
||||||
|
xx, _retflag = swe.calc_ut(jd, _PLANETS[lookup], _FLAGS)
|
||||||
lon, lat, _dist, lon_speed = xx[0], xx[1], xx[2], xx[3]
|
lon, lat, _dist, lon_speed = xx[0], xx[1], xx[2], xx[3]
|
||||||
|
if name == "South Node":
|
||||||
|
lon, lat = lon + 180.0, -lat
|
||||||
rows.append({
|
rows.append({
|
||||||
"name": name,
|
"name": name,
|
||||||
"longitude": lon % 360.0,
|
"longitude": lon % 360.0,
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ i nie w bazie.
|
|||||||
|
|
||||||
## API
|
## API
|
||||||
- `POST /api/query` → `QueryRequest` → `QueryResponse`
|
- `POST /api/query` → `QueryRequest` → `QueryResponse`
|
||||||
- `POST /chart/positions` → `{when_utc, lat, lon, objects?}` → pozycje obiektów (LOG-01)
|
- `POST /chart/positions` → `{when_utc, lat, lon, house_system?}` → pełny horoskop: pozycje (LOG-01) + osie i domy (LOG-05) + aspekty główne z applying/separating (LOG-06) + opcjonalnie stacje planet (`stations:true`, LOG-03). Obiekty: 10 planet + mean NN/SN/Lilith (LOG-02). `house_system`: `whole_sign` (dom.) / `equal` / `porphyry`.
|
||||||
|
- `POST /chart/report` → `{when_utc, lat, lon, limit?}` → wynik obliczeń wyszukany w bazie: fasety sygnifikatorów **w znaku / w domu / w aspekcie**, z rozwinięciem skrótów, odsiewaniem duplikatów (ten sam sygnifikator i opis), rankingiem siły (LOG-21) oraz opcją group (grupowanie identycznych opisów)
|
||||||
|
- `POST /chart/profections` → `{when_utc, lat, lon, start_age?, count?}` → profekcje roczne: wiek, profektowany Asc, Władca Roku (+MC/Su/Mo) (LOG-10)
|
||||||
|
- `POST /chart/return` → `{when_utc, lat, lon, kind, around?}` → Solar/Lunar Return: moment powrotu + pełny horoskop na ten moment (LOG-12)
|
||||||
|
- `POST /chart/timeline` → `{when_utc, lat, lon, from_date, to_date, techniques?}` → zbiorcza oś czasu: profekcje + Solar Return + dyrekcje solar-arc, posortowane (technique | significator | start | exact | end) (LOG-14)
|
||||||
- `POST /chart/compare` → jak wyżej → raport różnic dwóch silników (LOG-26; wymaga silnika B)
|
- `POST /chart/compare` → jak wyżej → raport różnic dwóch silników (LOG-26; wymaga silnika B)
|
||||||
- `GET /health` (sprawdza też warstwę bazodanową)
|
- `GET /health` (sprawdza też warstwę bazodanową)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
"""Rozwijanie skrótów sygnifikatorów do postaci czytelnej (na bazie SIGNIFICATORS KEY).
|
||||||
|
|
||||||
|
W bazie zapis jest skrótowy z prefiksem `[` (np. `[Su in [Tau`, `[Sa [conj [Su in 6th H.`).
|
||||||
|
Ten moduł zamienia go na tekst czytelny: „Sun in Taurus", „Saturn conjunction Sun
|
||||||
|
in 6th house". Słownik pochodzi z pliku SIGNIFICATORS KEY (mały, stabilny — wpięty
|
||||||
|
jako built-in; można rozszerzać).
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
|
# skrót (bez nawiasu) -> pełna nazwa
|
||||||
|
ABBREVIATIONS: dict[str, str] = {
|
||||||
|
# znaki zodiaku
|
||||||
|
"Ari": "Aries", "Tau": "Taurus", "Gem": "Gemini", "Can": "Cancer",
|
||||||
|
"Leo": "Leo", "Vir": "Virgo", "Lib": "Libra", "Sco": "Scorpio",
|
||||||
|
"Sag": "Sagittarius", "Cap": "Capricorn", "Aqu": "Aquarius", "Pis": "Pisces",
|
||||||
|
# planety klasyczne + światła
|
||||||
|
"Su": "Sun", "Mo": "Moon", "Me": "Mercury", "Ve": "Venus",
|
||||||
|
"Ma": "Mars", "Ju": "Jupiter", "Sa": "Saturn",
|
||||||
|
# planety nowożytne
|
||||||
|
"Ur": "Uranus", "Ne": "Neptune", "Pl": "Pluto",
|
||||||
|
# węzły i punkty
|
||||||
|
"NN": "North Node", "SN": "South Node", "Lilith": "Lilith", "Chiron": "Chiron",
|
||||||
|
# osie
|
||||||
|
"Asc": "Ascendant", "Dsc": "Descendant", "MC": "Midheaven", "IC": "Imum Coeli",
|
||||||
|
# aspekty
|
||||||
|
"conj": "conjunction", "sex": "sextile", "sq": "square", "tri": "trine",
|
||||||
|
"opp": "opposition", "semisex": "semisextile", "semisq": "semisquare",
|
||||||
|
"sesquisq": "sesquisquare", "quincunx": "quincunx", "asp": "aspect",
|
||||||
|
# domy jako tokeny [h1..[h12
|
||||||
|
**{f"h{i}": f"{i}th house" for i in range(1, 13)},
|
||||||
|
# ruch
|
||||||
|
"Rx": "retrograde", "R": "retrograde",
|
||||||
|
}
|
||||||
|
# poprawki nieregularnych liczebników domów
|
||||||
|
ABBREVIATIONS.update({"h1": "1st house", "h2": "2nd house", "h3": "3rd house"})
|
||||||
|
|
||||||
|
# rozwinięcia słów spoza składni `[`
|
||||||
|
_WORDS = {
|
||||||
|
"affl.": "afflicted",
|
||||||
|
"P. Dec.": "parallel of declination",
|
||||||
|
"espec.": "especially",
|
||||||
|
}
|
||||||
|
|
||||||
|
_TOKEN = re.compile(r"\[([A-Za-z]+)")
|
||||||
|
_HOUSE = re.compile(r"(\d+(?:st|nd|rd|th))\s*H\.", re.IGNORECASE)
|
||||||
|
|
||||||
|
|
||||||
|
def expand(text: str) -> str:
|
||||||
|
"""Zamienia skróty na pełne nazwy; nieznane tokeny zostawia bez nawiasu."""
|
||||||
|
if not text:
|
||||||
|
return text
|
||||||
|
out = _TOKEN.sub(lambda m: ABBREVIATIONS.get(m.group(1), m.group(1)), text)
|
||||||
|
out = _HOUSE.sub(lambda m: f"{m.group(1)} house", out)
|
||||||
|
for k, v in _WORDS.items():
|
||||||
|
out = out.replace(k, v)
|
||||||
|
return out
|
||||||
@@ -16,9 +16,16 @@ class DataClient:
|
|||||||
def __init__(self, base_url: str | None = None) -> None:
|
def __init__(self, base_url: str | None = None) -> None:
|
||||||
self.base_url = (base_url or settings.data_url).rstrip("/")
|
self.base_url = (base_url or settings.data_url).rstrip("/")
|
||||||
|
|
||||||
def search(self, key: str, value: str, exact: bool, limit: int) -> dict[str, Any]:
|
def search(
|
||||||
payload = {"key": key, "value": value, "exact": exact, "limit": limit}
|
self,
|
||||||
with httpx.Client(timeout=settings.http_timeout) as client:
|
key: str,
|
||||||
|
value: str,
|
||||||
|
exact: bool,
|
||||||
|
limit: int,
|
||||||
|
fields: list[str] | None = None,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
payload = {"key": key, "value": value, "exact": exact, "limit": limit, "fields": fields}
|
||||||
|
with httpx.Client(timeout=max(settings.http_timeout, 30.0)) as client:
|
||||||
r = client.post(f"{self.base_url}/search", json=payload)
|
r = client.post(f"{self.base_url}/search", json=payload)
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
"""Aspekty — kąty między obiektami (LOG-06, wersja: aspekty główne).
|
||||||
|
|
||||||
|
Czysta matematyka na policzonych długościach ekliptycznych. Dla każdej pary
|
||||||
|
obiektów sprawdzamy, czy ich separacja kątowa mieści się w orbie któregoś z
|
||||||
|
aspektów głównych. Applying/separating (aplikacja/separacja) — na później.
|
||||||
|
|
||||||
|
Tokeny bazy (z SIGNIFICATORS KEY): [conj, [sex, [sq, [tri, [opp.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
MAJOR = {
|
||||||
|
"conjunction": 0.0,
|
||||||
|
"sextile": 60.0,
|
||||||
|
"square": 90.0,
|
||||||
|
"trine": 120.0,
|
||||||
|
"opposition": 180.0,
|
||||||
|
}
|
||||||
|
DB_TOKEN = {
|
||||||
|
"conjunction": "[conj", "sextile": "[sex", "square": "[sq",
|
||||||
|
"trine": "[tri", "opposition": "[opp",
|
||||||
|
}
|
||||||
|
PL_NAME = {
|
||||||
|
"conjunction": "koniunkcja", "sextile": "sekstyl", "square": "kwadratura",
|
||||||
|
"trine": "trygon", "opposition": "opozycja",
|
||||||
|
}
|
||||||
|
LUMINARIES = {"Sun", "Moon"}
|
||||||
|
DEFAULT_ORB = 8.0
|
||||||
|
LUMINARY_BONUS = 2.0
|
||||||
|
|
||||||
|
|
||||||
|
def separation(a: float, b: float) -> float:
|
||||||
|
"""Najmniejsza separacja kątowa [0,180]."""
|
||||||
|
d = abs(a - b) % 360.0
|
||||||
|
return min(d, 360.0 - d)
|
||||||
|
|
||||||
|
|
||||||
|
def _is_applying(la: float, lb: float, sa: float, sb: float, angle: float, dt: float = 0.01) -> bool | None:
|
||||||
|
"""Czy aspekt aplikuje (dokładność 0° dopiero nastąpi)?
|
||||||
|
|
||||||
|
Porównujemy odchyłkę od dokładnego kąta teraz i po małym kroku czasu
|
||||||
|
(pozycje przesunięte o prędkość·dt). Malejąca odchyłka = applying.
|
||||||
|
dt celowo małe (0,01 doby), by szybki Księżyc nie „przeskoczył" dokładności.
|
||||||
|
Zwraca None, gdy brak prędkości (nie da się rozstrzygnąć).
|
||||||
|
"""
|
||||||
|
if sa is None or sb is None:
|
||||||
|
return None
|
||||||
|
dev_now = abs(separation(la, lb) - angle)
|
||||||
|
dev_next = abs(separation(la + sa * dt, lb + sb * dt) - angle)
|
||||||
|
return dev_next < dev_now
|
||||||
|
|
||||||
|
|
||||||
|
def find_aspects(
|
||||||
|
positions: list[dict], orb: float = DEFAULT_ORB, luminary_bonus: float = LUMINARY_BONUS
|
||||||
|
) -> list[dict]:
|
||||||
|
"""positions: dicty z 'name', 'decimal' (długość) i opcjonalnie 'speed' (°/dobę).
|
||||||
|
|
||||||
|
Zwraca listę aspektów głównych; gdy znane są prędkości, każdy aspekt ma
|
||||||
|
applying (bool) i skrót 'as': 'A'/'S' (aplikacyjny/separacyjny).
|
||||||
|
"""
|
||||||
|
out: list[dict] = []
|
||||||
|
n = len(positions)
|
||||||
|
for i in range(n):
|
||||||
|
for j in range(i + 1, n):
|
||||||
|
a, b = positions[i], positions[j]
|
||||||
|
la, lb = a.get("decimal"), b.get("decimal")
|
||||||
|
if la is None or lb is None:
|
||||||
|
continue
|
||||||
|
sep = separation(float(la), float(lb))
|
||||||
|
allowed = orb + (luminary_bonus if (a["name"] in LUMINARIES or b["name"] in LUMINARIES) else 0.0)
|
||||||
|
for asp, angle in MAJOR.items():
|
||||||
|
dev = abs(sep - angle)
|
||||||
|
if dev <= allowed:
|
||||||
|
applying = _is_applying(
|
||||||
|
float(la), float(lb), a.get("speed"), b.get("speed"), angle
|
||||||
|
)
|
||||||
|
row = {
|
||||||
|
"obj1": a["name"], "obj2": b["name"],
|
||||||
|
"aspect": asp, "orb": round(dev, 2), "allowed": round(allowed, 2),
|
||||||
|
}
|
||||||
|
if applying is not None:
|
||||||
|
row["applying"] = applying
|
||||||
|
row["as"] = "A" if applying else "S"
|
||||||
|
out.append(row)
|
||||||
|
break # jedna para = jeden aspekt
|
||||||
|
return out
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
"""Złożenie pełnego horoskopu: pozycje + osie + domy (LOG-01 + LOG-05).
|
||||||
|
|
||||||
|
Silnik-agnostyczne: potrzebuje tylko `positions()` oraz (dla osi/domów)
|
||||||
|
`sidereal()`. Jeśli silnik nie umie policzyć czasu gwiazdowego, zwraca same
|
||||||
|
pozycje.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from app.engine import houses as H
|
||||||
|
from app.engine.base import EphemerisEngine
|
||||||
|
from app.engine.formats import SIGNS, in_sign, norm360, sign_index
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
|
||||||
|
|
||||||
|
def _fmt(name: str, lon: float) -> dict:
|
||||||
|
return {
|
||||||
|
"name": name,
|
||||||
|
"sign": SIGNS[sign_index(lon)],
|
||||||
|
"in_sign": in_sign(lon),
|
||||||
|
"decimal": round(norm360(lon), 6),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def build_chart(engine: EphemerisEngine, moment: ChartMoment, house_system: str = H.WHOLE_SIGN) -> dict:
|
||||||
|
from app.engine.aspects import find_aspects
|
||||||
|
|
||||||
|
positions = engine.positions(moment)
|
||||||
|
result: dict = {"engine": engine.name, "positions": [p.as_dict() for p in positions]}
|
||||||
|
result["aspects"] = find_aspects(result["positions"]) # aspekty (LOG-06)
|
||||||
|
|
||||||
|
if not hasattr(engine, "sidereal"):
|
||||||
|
return result
|
||||||
|
|
||||||
|
ramc, eps = engine.sidereal(moment)
|
||||||
|
asc = H.compute_asc(ramc, eps, moment.lat)
|
||||||
|
mc = H.compute_mc(ramc, eps)
|
||||||
|
system = house_system if house_system in H.SYSTEMS else H.WHOLE_SIGN
|
||||||
|
cusp_list = H.cusps(asc, mc, system)
|
||||||
|
|
||||||
|
result["house_system"] = system
|
||||||
|
result["angles"] = {
|
||||||
|
"Asc": _fmt("Asc", asc),
|
||||||
|
"MC": _fmt("MC", mc),
|
||||||
|
"Dsc": _fmt("Dsc", norm360(asc + 180.0)),
|
||||||
|
"IC": _fmt("IC", norm360(mc + 180.0)),
|
||||||
|
}
|
||||||
|
result["cusps"] = [
|
||||||
|
{"house": i + 1, "sign": SIGNS[sign_index(c)], "in_sign": in_sign(c)}
|
||||||
|
for i, c in enumerate(cusp_list)
|
||||||
|
]
|
||||||
|
for pdict, obj in zip(result["positions"], positions):
|
||||||
|
pdict["house"] = H.assign_house(obj.longitude, cusp_list)
|
||||||
|
return result
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
"""Osie i domy — czysta matematyka sferyczna (LOG-05).
|
||||||
|
|
||||||
|
Bezstanowe funkcje: z lokalnego czasu gwiazdowego (RAMC), nachylenia ekliptyki
|
||||||
|
(ε) i szerokości geograficznej (φ) wyliczają Ascendent i MC, a stąd cusps domów
|
||||||
|
dla prostych systemów (Whole Sign, Equal, Porphyry). Niezależne od silnika —
|
||||||
|
silnik dostarcza tylko RAMC i ε.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import math
|
||||||
|
|
||||||
|
from app.engine.formats import SIGN_ABBR, norm360, sign_index # noqa: F401
|
||||||
|
|
||||||
|
WHOLE_SIGN = "whole_sign"
|
||||||
|
EQUAL = "equal"
|
||||||
|
PORPHYRY = "porphyry"
|
||||||
|
SYSTEMS = (WHOLE_SIGN, EQUAL, PORPHYRY)
|
||||||
|
|
||||||
|
|
||||||
|
def mean_obliquity(tt_jd: float) -> float:
|
||||||
|
"""Średnie nachylenie ekliptyki [°] dla daty (Julian TT). Wystarcza do domów."""
|
||||||
|
t = (tt_jd - 2451545.0) / 36525.0
|
||||||
|
arcsec = 84381.448 - 46.8150 * t - 0.00059 * t * t + 0.001813 * t ** 3
|
||||||
|
return arcsec / 3600.0
|
||||||
|
|
||||||
|
|
||||||
|
def compute_mc(ramc_deg: float, eps_deg: float) -> float:
|
||||||
|
r, e = math.radians(ramc_deg), math.radians(eps_deg)
|
||||||
|
mc = math.atan2(math.sin(r), math.cos(r) * math.cos(e))
|
||||||
|
return norm360(math.degrees(mc))
|
||||||
|
|
||||||
|
|
||||||
|
def compute_asc(ramc_deg: float, eps_deg: float, lat_deg: float) -> float:
|
||||||
|
r, e, phi = math.radians(ramc_deg), math.radians(eps_deg), math.radians(lat_deg)
|
||||||
|
asc = math.atan2(
|
||||||
|
math.cos(r),
|
||||||
|
-(math.sin(r) * math.cos(e) + math.tan(phi) * math.sin(e)),
|
||||||
|
)
|
||||||
|
return norm360(math.degrees(asc))
|
||||||
|
|
||||||
|
|
||||||
|
def _trisect(a: float, b: float) -> tuple[float, float]:
|
||||||
|
"""Dwa punkty dzielące łuk a→b (w kierunku zodiaku) na trzy równe części."""
|
||||||
|
span = (b - a) % 360.0
|
||||||
|
return norm360(a + span / 3.0), norm360(a + 2.0 * span / 3.0)
|
||||||
|
|
||||||
|
|
||||||
|
def cusps(asc: float, mc: float, system: str) -> list[float]:
|
||||||
|
"""Zwraca 12 cusps (długości) domów 1..12."""
|
||||||
|
if system == WHOLE_SIGN:
|
||||||
|
start = sign_index(asc) * 30.0
|
||||||
|
return [norm360(start + 30.0 * i) for i in range(12)]
|
||||||
|
if system == EQUAL:
|
||||||
|
return [norm360(asc + 30.0 * i) for i in range(12)]
|
||||||
|
if system == PORPHYRY:
|
||||||
|
dsc, ic = norm360(asc + 180.0), norm360(mc + 180.0)
|
||||||
|
c = [0.0] * 12
|
||||||
|
c[0], c[3], c[6], c[9] = asc, ic, dsc, mc
|
||||||
|
c[1], c[2] = _trisect(asc, ic) # domy 2,3
|
||||||
|
c[4], c[5] = _trisect(ic, dsc) # domy 5,6
|
||||||
|
c[7], c[8] = _trisect(dsc, mc) # domy 8,9
|
||||||
|
c[10], c[11] = _trisect(mc, asc) # domy 11,12
|
||||||
|
return c
|
||||||
|
raise ValueError(f"nieznany system domów: {system}")
|
||||||
|
|
||||||
|
|
||||||
|
def assign_house(lon: float, cusp_list: list[float]) -> int:
|
||||||
|
"""Numer domu (1..12), w którym leży dana długość ekliptyczna."""
|
||||||
|
lon = norm360(lon)
|
||||||
|
for i in range(12):
|
||||||
|
start = cusp_list[i]
|
||||||
|
end = cusp_list[(i + 1) % 12]
|
||||||
|
span = (end - start) % 360.0
|
||||||
|
offset = (lon - start) % 360.0
|
||||||
|
if offset < span:
|
||||||
|
return i + 1
|
||||||
|
return 12
|
||||||
@@ -13,10 +13,12 @@ from typing import Any
|
|||||||
|
|
||||||
from app.engine import formats
|
from app.engine import formats
|
||||||
|
|
||||||
# kanoniczny zestaw i kolejność obiektów (LOG-02: światła + 7 klasycznych + 3 nowożytne)
|
# kanoniczny zestaw i kolejność obiektów (LOG-02: światła + 7 klasycznych +
|
||||||
|
# 3 nowożytne + punkty wirtualne: węzły mean i mean Lilith)
|
||||||
DEFAULT_OBJECTS = [
|
DEFAULT_OBJECTS = [
|
||||||
"Sun", "Moon", "Mercury", "Venus", "Mars",
|
"Sun", "Moon", "Mercury", "Venus", "Mars",
|
||||||
"Jupiter", "Saturn", "Uranus", "Neptune", "Pluto",
|
"Jupiter", "Saturn", "Uranus", "Neptune", "Pluto",
|
||||||
|
"North Node", "South Node", "Lilith",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
"""Punkty wirtualne liczone analitycznie (LOG-02): mean Node i mean Lilith.
|
||||||
|
|
||||||
|
Wzory Meeusa (Astronomical Algorithms) w stuleciach juliańskich od J2000 (TT):
|
||||||
|
- Ω — średni węzeł wstępujący orbity Księżyca (mean ascending node). Porusza się
|
||||||
|
zawsze wstecz (~−0,053°/dobę) — stąd węzły są wiecznie Rx.
|
||||||
|
- średnie perygeum orbity Księżyca; mean Lilith (Black Moon) = średnie APOGEUM
|
||||||
|
= perygeum + 180° (~+0,111°/dobę).
|
||||||
|
|
||||||
|
Wersje TRUE (oskulacyjne) — osobny, późniejszy krok (notatki: mean to
|
||||||
|
historyczny standard i domyślne ustawienie programów).
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from app.engine.formats import norm360
|
||||||
|
|
||||||
|
_DAYS_PER_CENTURY = 36525.0
|
||||||
|
|
||||||
|
|
||||||
|
def _t(tt_jd: float) -> float:
|
||||||
|
return (tt_jd - 2451545.0) / _DAYS_PER_CENTURY
|
||||||
|
|
||||||
|
|
||||||
|
def mean_lunar_node(tt_jd: float) -> float:
|
||||||
|
"""Długość ekliptyczna średniego Węzła Północnego (Ω) [°]."""
|
||||||
|
t = _t(tt_jd)
|
||||||
|
omega = (125.0445479 - 1934.1362891 * t + 0.0020754 * t * t
|
||||||
|
+ t ** 3 / 467441.0 - t ** 4 / 60616000.0)
|
||||||
|
return norm360(omega)
|
||||||
|
|
||||||
|
|
||||||
|
def mean_lilith(tt_jd: float) -> float:
|
||||||
|
"""Długość ekliptyczna mean Lilith (średnie apogeum Księżyca) [°]."""
|
||||||
|
t = _t(tt_jd)
|
||||||
|
perigee = (83.3532465 + 4069.0137287 * t - 0.0103200 * t * t
|
||||||
|
- t ** 3 / 80053.0 + t ** 4 / 18999000.0)
|
||||||
|
return norm360(perigee + 180.0)
|
||||||
|
|
||||||
|
|
||||||
|
def point_speed(fn, tt_jd: float, dt_days: float = 0.1) -> float:
|
||||||
|
"""Prędkość [°/dobę] punktu analitycznego — różnica po małym kroku."""
|
||||||
|
a = fn(tt_jd)
|
||||||
|
b = fn(tt_jd + dt_days)
|
||||||
|
return (((b - a + 180.0) % 360.0) - 180.0) / dt_days
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
"""Profekcje roczne (LOG-10) — hellenistyczna technika time-lord.
|
||||||
|
|
||||||
|
Zasada (Whole Sign): co każde urodziny profektowany Ascendent przeskakuje o jeden
|
||||||
|
znak do przodu (wiek mod 12). Władca Roku (Lord of Year) = władca domicylowy
|
||||||
|
znaku profektowanego Asc. Profektować można każdy punkt natalny (MC, Słońce…) —
|
||||||
|
wszystkie przeskakują o tyle samo znaków.
|
||||||
|
|
||||||
|
Referencja: tabela profekcji w notes3 (astro-seek) dla horoskopu 30.04.1984
|
||||||
|
(wiek 0: Can/Moon, 1: Leo/Sun, …, 42: Cap/Saturn).
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from app.engine.formats import SIGNS, sign_index
|
||||||
|
|
||||||
|
# władcy domicylowi (tradycyjni) — zgodni z tabelą referencyjną notes3
|
||||||
|
DOMICILE_RULERS = {
|
||||||
|
"Aries": "Mars", "Taurus": "Venus", "Gemini": "Mercury", "Cancer": "Moon",
|
||||||
|
"Leo": "Sun", "Virgo": "Mercury", "Libra": "Venus", "Scorpio": "Mars",
|
||||||
|
"Sagittarius": "Jupiter", "Capricorn": "Saturn", "Aquarius": "Saturn",
|
||||||
|
"Pisces": "Jupiter",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def age_at(birth_utc: datetime, when_utc: datetime) -> int:
|
||||||
|
"""Pełne lata między urodzeniem a danym momentem (wiek profekcyjny)."""
|
||||||
|
age = when_utc.year - birth_utc.year
|
||||||
|
if (when_utc.month, when_utc.day) < (birth_utc.month, birth_utc.day):
|
||||||
|
age -= 1
|
||||||
|
return max(age, 0)
|
||||||
|
|
||||||
|
|
||||||
|
def profected_sign(natal_lon: float, age: int) -> str:
|
||||||
|
"""Znak, do którego profektował punkt natalny po `age` latach."""
|
||||||
|
return SIGNS[(sign_index(natal_lon) + age) % 12]
|
||||||
|
|
||||||
|
|
||||||
|
def profection_rows(
|
||||||
|
natal_points: dict[str, float],
|
||||||
|
birth_utc: datetime,
|
||||||
|
start_age: int,
|
||||||
|
count: int,
|
||||||
|
) -> list[dict]:
|
||||||
|
"""Tabela profekcji dla zakresu lat życia.
|
||||||
|
|
||||||
|
natal_points: nazwa -> natalna długość ekliptyczna (musi zawierać 'Asc').
|
||||||
|
Każdy wiersz: wiek, data początku roku profekcyjnego (urodziny), znak
|
||||||
|
profektowanego Asc, Władca Roku oraz profekcje pozostałych punktów.
|
||||||
|
"""
|
||||||
|
def _birthday(year: int) -> datetime:
|
||||||
|
try:
|
||||||
|
return birth_utc.replace(year=year)
|
||||||
|
except ValueError: # 29 lutego w roku nieprzestępnym
|
||||||
|
return birth_utc.replace(year=year, day=28)
|
||||||
|
|
||||||
|
rows: list[dict] = []
|
||||||
|
for age in range(start_age, start_age + count):
|
||||||
|
asc_sign = profected_sign(natal_points["Asc"], age)
|
||||||
|
row = {
|
||||||
|
"age": age,
|
||||||
|
"from": _birthday(birth_utc.year + age).strftime("%Y-%m-%d"),
|
||||||
|
"profected_asc": asc_sign,
|
||||||
|
"lord_of_year": DOMICILE_RULERS[asc_sign],
|
||||||
|
}
|
||||||
|
for name, lon in natal_points.items():
|
||||||
|
if name != "Asc":
|
||||||
|
row[name] = profected_sign(lon, age)
|
||||||
|
rows.append(row)
|
||||||
|
return rows
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
"""Solar / Lunar Return (LOG-12) — moment powrotu do pozycji natalnej.
|
||||||
|
|
||||||
|
Solar Return (solariusz): moment, w którym Słońce wraca dokładnie do natalnej
|
||||||
|
długości ekliptycznej (raz na rok, w okolicy urodzin). Lunar Return: to samo
|
||||||
|
dla Księżyca (raz na ~27,3 dnia). Dwa warianty użycia (osobny horoskop vs
|
||||||
|
tranzyt do natalu) obsługujemy zwracając pełny horoskop na znaleziony moment —
|
||||||
|
interpretacja pozostaje po stronie technik wyżej.
|
||||||
|
|
||||||
|
Metoda: podpisana różnica długości Δ = lon − natal (zawinięta do ±180°) rośnie
|
||||||
|
monotonicznie i przechodzi przez 0 dokładnie w momencie powrotu. Skan dobowy
|
||||||
|
wykrywa przejście −→+ (skok +180→−180 to artefakt zawinięcia — pomijany,
|
||||||
|
warunek d_hi − d_lo < 180), potem bisekcja do ~sekundy.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
|
||||||
|
# szerokość okna skanu wokół `around` [dni]: solar kotwiczymy przy urodzinach,
|
||||||
|
# lunar musi objąć cały okres syderyczny Księżyca (27,3 d)
|
||||||
|
SCAN_WINDOW = {"solar": 6.0, "lunar": 15.0}
|
||||||
|
|
||||||
|
|
||||||
|
def _lon_delta(engine, body: str, natal_lon: float, when: datetime) -> float:
|
||||||
|
m = ChartMoment(when_utc=when)
|
||||||
|
lon = engine.positions(m, [body])[0].longitude
|
||||||
|
return ((lon - natal_lon + 180.0) % 360.0) - 180.0
|
||||||
|
|
||||||
|
|
||||||
|
def find_return(
|
||||||
|
engine, kind: str, natal_moment: ChartMoment, around: datetime
|
||||||
|
) -> datetime | None:
|
||||||
|
"""Moment powrotu (kind: 'solar'/'lunar') najbliższy dacie `around`."""
|
||||||
|
body = "Sun" if kind == "solar" else "Moon"
|
||||||
|
natal_lon = engine.positions(natal_moment, [body])[0].longitude
|
||||||
|
if around.tzinfo is None:
|
||||||
|
around = around.replace(tzinfo=timezone.utc)
|
||||||
|
|
||||||
|
window = SCAN_WINDOW[kind]
|
||||||
|
step = timedelta(days=1.0)
|
||||||
|
t = around - timedelta(days=window)
|
||||||
|
end = around + timedelta(days=window)
|
||||||
|
|
||||||
|
candidates: list[datetime] = []
|
||||||
|
d_prev = _lon_delta(engine, body, natal_lon, t)
|
||||||
|
while t < end:
|
||||||
|
t_next = t + step
|
||||||
|
d_next = _lon_delta(engine, body, natal_lon, t_next)
|
||||||
|
# prawdziwe przejście przez zero: − -> + bez skoku zawinięcia
|
||||||
|
if d_prev < 0 <= d_next and (d_next - d_prev) < 180.0:
|
||||||
|
lo, hi, d_lo = t, t_next, d_prev
|
||||||
|
for _ in range(40): # bisekcja do ułamka sekundy
|
||||||
|
mid = lo + (hi - lo) / 2
|
||||||
|
if (_lon_delta(engine, body, natal_lon, mid) < 0) == (d_lo < 0):
|
||||||
|
lo = mid
|
||||||
|
else:
|
||||||
|
hi = mid
|
||||||
|
candidates.append(lo + (hi - lo) / 2)
|
||||||
|
t, d_prev = t_next, d_next
|
||||||
|
|
||||||
|
if not candidates:
|
||||||
|
return None
|
||||||
|
return min(candidates, key=lambda c: abs(c - around))
|
||||||
@@ -60,6 +60,27 @@ class SkyfieldEngine(EphemerisEngine):
|
|||||||
lat, lon, _dist = astrometric.ecliptic_latlon(epoch="date")
|
lat, lon, _dist = astrometric.ecliptic_latlon(epoch="date")
|
||||||
return lon.degrees, lat.degrees
|
return lon.degrees, lat.degrees
|
||||||
|
|
||||||
|
def _virtual_point(self, name: str, tt_jd: float) -> ObjectPosition:
|
||||||
|
"""Punkty analityczne (LOG-02): mean Node (NN/SN) i mean Lilith.
|
||||||
|
|
||||||
|
Liczone wzorami Meeusa, nie z jądra JPL. SN = NN + 180° (ta sama prędkość).
|
||||||
|
Punkty leżą na ekliptyce (latitude = 0).
|
||||||
|
"""
|
||||||
|
from app.engine.points import mean_lilith, mean_lunar_node, point_speed
|
||||||
|
|
||||||
|
if name in ("North Node", "South Node"):
|
||||||
|
lon = mean_lunar_node(tt_jd)
|
||||||
|
if name == "South Node":
|
||||||
|
lon = norm360(lon + 180.0)
|
||||||
|
speed = point_speed(mean_lunar_node, tt_jd)
|
||||||
|
else: # Lilith
|
||||||
|
lon = mean_lilith(tt_jd)
|
||||||
|
speed = point_speed(mean_lilith, tt_jd)
|
||||||
|
return ObjectPosition(
|
||||||
|
name=name, longitude=float(lon), latitude=0.0,
|
||||||
|
speed=float(speed), retrograde=bool(speed < 0),
|
||||||
|
)
|
||||||
|
|
||||||
def positions(
|
def positions(
|
||||||
self, moment: ChartMoment, objects: list[str] | None = None
|
self, moment: ChartMoment, objects: list[str] | None = None
|
||||||
) -> list[ObjectPosition]:
|
) -> list[ObjectPosition]:
|
||||||
@@ -70,6 +91,9 @@ class SkyfieldEngine(EphemerisEngine):
|
|||||||
|
|
||||||
out: list[ObjectPosition] = []
|
out: list[ObjectPosition] = []
|
||||||
for name in names:
|
for name in names:
|
||||||
|
if name not in _TARGETS: # punkt wirtualny (NN/SN/Lilith)
|
||||||
|
out.append(self._virtual_point(name, t.tt))
|
||||||
|
continue
|
||||||
target = self.eph[_TARGETS[name]]
|
target = self.eph[_TARGETS[name]]
|
||||||
lon, lat = self._ecliptic_lon_lat(target, t)
|
lon, lat = self._ecliptic_lon_lat(target, t)
|
||||||
lon2, _ = self._ecliptic_lon_lat(target, t2)
|
lon2, _ = self._ecliptic_lon_lat(target, t2)
|
||||||
@@ -88,5 +112,17 @@ class SkyfieldEngine(EphemerisEngine):
|
|||||||
)
|
)
|
||||||
return out
|
return out
|
||||||
|
|
||||||
|
def sidereal(self, moment: ChartMoment) -> tuple[float, float]:
|
||||||
|
"""(RAMC, ε) w stopniach — lokalny apparent sidereal time i nachylenie ekliptyki.
|
||||||
|
|
||||||
|
Materiał wejściowy do osi i domów (LOG-05). RAMC = GAST·15 + długość geo.
|
||||||
|
"""
|
||||||
|
from app.engine.houses import mean_obliquity
|
||||||
|
|
||||||
|
t = self.ts.from_datetime(moment.when_utc)
|
||||||
|
ramc = norm360(t.gast * 15.0 + moment.lon)
|
||||||
|
eps = mean_obliquity(t.tt)
|
||||||
|
return ramc, eps
|
||||||
|
|
||||||
def health(self) -> dict:
|
def health(self) -> dict:
|
||||||
return {"engine": self.name, "status": "ok", "kernel": self.kernel}
|
return {"engine": self.name, "status": "ok", "kernel": self.kernel}
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
"""Wykrywanie stacji planet (LOG-03): poprzednia/następna stacja, SD/SR, flaga <7 dni.
|
||||||
|
|
||||||
|
Stacja ścisła = moment, w którym prędkość zodiakalna przechodzi przez zero.
|
||||||
|
Metoda: próbki prędkości co 1 dzień w oknie ± SEARCH_DAYS → zmiana znaku →
|
||||||
|
bisekcja do dokładności ~1 minuty. Klasyfikacja: prędkość przed<0 i po>0 → SD
|
||||||
|
(stationary direct), odwrotnie → SR (stationary retrograde).
|
||||||
|
|
||||||
|
Pomijamy Słońce/Księżyc (nigdy Rx) i punkty mean (NN/SN/Lilith — ruch jednostajny).
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
|
from app.engine.formats import in_sign
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
|
||||||
|
# obiekty bez stacji
|
||||||
|
NO_STATIONS = {"Sun", "Moon", "North Node", "South Node", "Lilith"}
|
||||||
|
|
||||||
|
# Okno musi pokryć najdłuższą przerwę między stacjami (Mars/Wenus: ~700 dni),
|
||||||
|
# a krok skanu musi być krótszy niż najkrótsza retrogradacja (Merkury ~21 dni).
|
||||||
|
SEARCH_DAYS = 800 # okno poszukiwań w każdą stronę
|
||||||
|
SCAN_STEP_DAYS = 4.0 # krok zgrubnego skanu (potem bisekcja)
|
||||||
|
STATION_SOON_DAYS = 7.0 # próg flagi "stacja blisko" (konfigurowalny, notes2)
|
||||||
|
|
||||||
|
|
||||||
|
def _speed_fn(engine, name: str):
|
||||||
|
"""Zwraca funkcję: dni_od_momentu_bazowego -> prędkość [°/dobę]."""
|
||||||
|
def speed(base_moment: ChartMoment, offset_days: float) -> float:
|
||||||
|
m = ChartMoment(
|
||||||
|
when_utc=base_moment.when_utc + timedelta(days=offset_days),
|
||||||
|
lat=base_moment.lat, lon=base_moment.lon,
|
||||||
|
)
|
||||||
|
return engine.positions(m, [name])[0].speed
|
||||||
|
return speed
|
||||||
|
|
||||||
|
|
||||||
|
def _bisect_zero(speed, moment: ChartMoment, lo: float, hi: float, iters: int = 20) -> float:
|
||||||
|
"""Bisekcja miejsca zerowego prędkości między dniami lo i hi."""
|
||||||
|
s_lo = speed(moment, lo)
|
||||||
|
for _ in range(iters):
|
||||||
|
mid = (lo + hi) / 2.0
|
||||||
|
s_mid = speed(moment, mid)
|
||||||
|
if (s_lo < 0) == (s_mid < 0):
|
||||||
|
lo, s_lo = mid, s_mid
|
||||||
|
else:
|
||||||
|
hi = mid
|
||||||
|
return (lo + hi) / 2.0
|
||||||
|
|
||||||
|
|
||||||
|
def _station_info(engine, moment: ChartMoment, name: str, day: float, speed) -> dict:
|
||||||
|
"""Opis stacji w danym dniu (offset od momentu bazowego)."""
|
||||||
|
before = speed(moment, day - 0.5)
|
||||||
|
kind = "SD" if before < 0 else "SR"
|
||||||
|
when = moment.when_utc + timedelta(days=day)
|
||||||
|
m = ChartMoment(when_utc=when, lat=moment.lat, lon=moment.lon)
|
||||||
|
lon = engine.positions(m, [name])[0].longitude
|
||||||
|
return {
|
||||||
|
"type": kind,
|
||||||
|
"date": when.strftime("%Y-%m-%d %H:%M"),
|
||||||
|
"days": round(day, 1), # ujemne = w przeszłości
|
||||||
|
"degree": in_sign(lon),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def find_stations(engine, moment: ChartMoment, name: str, step_days: float = SCAN_STEP_DAYS) -> dict | None:
|
||||||
|
"""Poprzednia i następna stacja obiektu względem momentu horoskopu."""
|
||||||
|
if name in NO_STATIONS:
|
||||||
|
return None
|
||||||
|
speed = _speed_fn(engine, name)
|
||||||
|
|
||||||
|
prev_day = next_day = None
|
||||||
|
# w przeszłość
|
||||||
|
s_right = speed(moment, 0.0)
|
||||||
|
d = 0.0
|
||||||
|
while d > -SEARCH_DAYS:
|
||||||
|
s_left = speed(moment, d - step_days)
|
||||||
|
if (s_left < 0) != (s_right < 0):
|
||||||
|
prev_day = _bisect_zero(speed, moment, d - step_days, d)
|
||||||
|
break
|
||||||
|
d, s_right = d - step_days, s_left
|
||||||
|
# w przyszłość
|
||||||
|
s_left = speed(moment, 0.0)
|
||||||
|
d = 0.0
|
||||||
|
while d < SEARCH_DAYS:
|
||||||
|
s_right = speed(moment, d + step_days)
|
||||||
|
if (s_left < 0) != (s_right < 0):
|
||||||
|
next_day = _bisect_zero(speed, moment, d, d + step_days)
|
||||||
|
break
|
||||||
|
d, s_left = d + step_days, s_right
|
||||||
|
|
||||||
|
result: dict = {}
|
||||||
|
if prev_day is not None:
|
||||||
|
result["prev"] = _station_info(engine, moment, name, prev_day, speed)
|
||||||
|
if next_day is not None:
|
||||||
|
result["next"] = _station_info(engine, moment, name, next_day, speed)
|
||||||
|
result["station_soon"] = any(
|
||||||
|
abs(x["days"]) < STATION_SOON_DAYS for x in result.values() if isinstance(x, dict)
|
||||||
|
)
|
||||||
|
return result or None
|
||||||
@@ -0,0 +1,131 @@
|
|||||||
|
"""Zbiorcza tabela dat z technik (LOG-14).
|
||||||
|
|
||||||
|
Spina w jedną, posortowaną oś czasu daty z kilku technik:
|
||||||
|
- profekcje roczne (LOG-10) — rok życia,
|
||||||
|
- Solar Return (LOG-12) — moment powrotu Słońca,
|
||||||
|
- dyrekcje solar-arc — daty dokładnych aspektów kierowanych planet do punktów
|
||||||
|
natalnych (wzorzec z notes3: „Profection planet | Aspect | Birth planet |
|
||||||
|
Exact Date"). Klucz łuku konfigurowalny; domyślnie Naiboda (0°59'08"/rok).
|
||||||
|
|
||||||
|
Każdy wiersz ma kształt z notes2: technique | significator | start | exact | end.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import date, datetime, timedelta, timezone
|
||||||
|
|
||||||
|
from app.engine.aspects import MAJOR, PL_NAME
|
||||||
|
from app.engine.profections import DOMICILE_RULERS, profected_sign
|
||||||
|
from app.engine.returns import find_return
|
||||||
|
|
||||||
|
NAIBOD_KEY = 0.9856472 # °/rok (0°59'08") — domyślny klucz solar-arc
|
||||||
|
DAYS_PER_YEAR = 365.2422
|
||||||
|
DIRECTED = ["Sun", "Moon", "Mercury", "Venus", "Mars",
|
||||||
|
"Jupiter", "Saturn", "Uranus", "Neptune", "Pluto"]
|
||||||
|
|
||||||
|
|
||||||
|
def _add_years(birth: datetime, years: float) -> datetime:
|
||||||
|
return birth + timedelta(days=years * DAYS_PER_YEAR)
|
||||||
|
|
||||||
|
|
||||||
|
def _row(technique, significator, start, exact, end) -> dict:
|
||||||
|
def iso(x):
|
||||||
|
return x.date().isoformat() if isinstance(x, datetime) else x
|
||||||
|
return {"technique": technique, "significator": significator,
|
||||||
|
"start": iso(start), "exact": iso(exact), "end": iso(end)}
|
||||||
|
|
||||||
|
|
||||||
|
def solar_arc_directions(
|
||||||
|
natal: dict[str, float], birth: datetime, lo: datetime, hi: datetime,
|
||||||
|
key: float = NAIBOD_KEY, orb_years: float = 1.0,
|
||||||
|
) -> list[dict]:
|
||||||
|
"""Daty dyrekcji solar-arc w oknie [lo, hi].
|
||||||
|
|
||||||
|
natal: nazwa punktu -> długość natalna (planety + Asc/MC). Kierowane są planety
|
||||||
|
(DIRECTED), celem każdy punkt natalny. Aspekt dokładny gdy łuk = odległość
|
||||||
|
kątowa (mod 360). Wiek = łuk/klucz; data = urodziny + wiek.
|
||||||
|
"""
|
||||||
|
out: list[dict] = []
|
||||||
|
lo_age = (lo - birth).days / DAYS_PER_YEAR - orb_years
|
||||||
|
hi_age = (hi - birth).days / DAYS_PER_YEAR + orb_years
|
||||||
|
for p in DIRECTED:
|
||||||
|
if p not in natal:
|
||||||
|
continue
|
||||||
|
for q, q_lon in natal.items():
|
||||||
|
for asp, angle in MAJOR.items():
|
||||||
|
for target in ({angle, (360.0 - angle) % 360.0}):
|
||||||
|
arc = (q_lon + target - natal[p]) % 360.0
|
||||||
|
age = arc / key
|
||||||
|
if not (lo_age <= age <= hi_age) or (p == q and arc < 1e-6):
|
||||||
|
continue
|
||||||
|
exact = _add_years(birth, age)
|
||||||
|
out.append(_row(
|
||||||
|
"solar_arc",
|
||||||
|
f"dyr. {p} {PL_NAME[asp]} {q}",
|
||||||
|
_add_years(birth, age - orb_years),
|
||||||
|
exact,
|
||||||
|
_add_years(birth, age + orb_years),
|
||||||
|
))
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def profection_events(natal_asc: float, birth: datetime, lo: datetime, hi: datetime) -> list[dict]:
|
||||||
|
"""Lata profekcyjne (LOG-10) nachodzące na okno."""
|
||||||
|
out: list[dict] = []
|
||||||
|
for age in range((lo.year - birth.year) - 1, (hi.year - birth.year) + 1):
|
||||||
|
if age < 0:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
start = birth.replace(year=birth.year + age)
|
||||||
|
end = birth.replace(year=birth.year + age + 1)
|
||||||
|
except ValueError: # 29 lutego
|
||||||
|
start = birth.replace(year=birth.year + age, day=28)
|
||||||
|
end = birth.replace(year=birth.year + age + 1, day=28)
|
||||||
|
if end < lo or start > hi:
|
||||||
|
continue
|
||||||
|
sign = profected_sign(natal_asc, age)
|
||||||
|
out.append(_row(
|
||||||
|
"profection", f"Władca Roku: {DOMICILE_RULERS[sign]} (Asc {sign}, wiek {age})",
|
||||||
|
start, start, end,
|
||||||
|
))
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def solar_return_events(engine, natal_moment, birth: datetime, lo: datetime, hi: datetime) -> list[dict]:
|
||||||
|
"""Solariusze w oknie (LOG-12) — jeden na rok."""
|
||||||
|
out: list[dict] = []
|
||||||
|
for year in range(lo.year, hi.year + 1):
|
||||||
|
try:
|
||||||
|
around = birth.replace(year=year)
|
||||||
|
except ValueError:
|
||||||
|
around = birth.replace(year=year, day=28)
|
||||||
|
hit = find_return(engine, "solar", natal_moment, around)
|
||||||
|
if hit and lo <= hit <= hi:
|
||||||
|
out.append(_row("solar_return", "Solar Return", hit, hit, _add_years(hit, 1)))
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def _as_dt(d) -> datetime:
|
||||||
|
if isinstance(d, datetime):
|
||||||
|
return d if d.tzinfo else d.replace(tzinfo=timezone.utc)
|
||||||
|
if isinstance(d, date):
|
||||||
|
return datetime(d.year, d.month, d.day, tzinfo=timezone.utc)
|
||||||
|
return datetime.fromisoformat(str(d)).replace(tzinfo=timezone.utc)
|
||||||
|
|
||||||
|
|
||||||
|
def build_timeline(
|
||||||
|
engine, natal_moment, natal_points: dict[str, float],
|
||||||
|
from_d, to_d, techniques: list[str] | None = None,
|
||||||
|
) -> list[dict]:
|
||||||
|
"""Scala wybrane techniki w jedną oś czasu, posortowaną po dacie dokładnej."""
|
||||||
|
lo, hi = _as_dt(from_d), _as_dt(to_d)
|
||||||
|
birth = natal_moment.when_utc
|
||||||
|
want = set(techniques or ["profection", "solar_return", "solar_arc"])
|
||||||
|
events: list[dict] = []
|
||||||
|
if "profection" in want:
|
||||||
|
events += profection_events(natal_points["Asc"], birth, lo, hi)
|
||||||
|
if "solar_return" in want:
|
||||||
|
events += solar_return_events(engine, natal_moment, birth, lo, hi)
|
||||||
|
if "solar_arc" in want:
|
||||||
|
events += solar_arc_directions(natal_points, birth, lo, hi)
|
||||||
|
events.sort(key=lambda e: e["exact"])
|
||||||
|
return events
|
||||||
+126
-3
@@ -37,6 +37,8 @@ class PositionsRequest(BaseModel):
|
|||||||
lat: float = 0.0
|
lat: float = 0.0
|
||||||
lon: float = 0.0
|
lon: float = 0.0
|
||||||
objects: list[str] | None = None
|
objects: list[str] | None = None
|
||||||
|
house_system: str = "whole_sign" # whole_sign | equal | porphyry
|
||||||
|
stations: bool = False # licz stacje (LOG-03; wolniejsze — root-findy)
|
||||||
|
|
||||||
|
|
||||||
@app.post("/api/query", response_model=QueryResponse)
|
@app.post("/api/query", response_model=QueryResponse)
|
||||||
@@ -49,13 +51,22 @@ def query(req: QueryRequest) -> QueryResponse:
|
|||||||
|
|
||||||
@app.post("/chart/positions")
|
@app.post("/chart/positions")
|
||||||
def chart_positions(req: PositionsRequest) -> dict:
|
def chart_positions(req: PositionsRequest) -> dict:
|
||||||
"""Pozycje obiektów dla danego momentu (LOG-01), liczone aktywnym silnikiem."""
|
"""Pełny horoskop: pozycje (LOG-01) + osie i domy (LOG-05) + aspekty (LOG-06);
|
||||||
|
opcjonalnie stacje planet (LOG-03, stations=true)."""
|
||||||
|
from app.engine.chart import build_chart
|
||||||
from app.engine.models import ChartMoment
|
from app.engine.models import ChartMoment
|
||||||
|
|
||||||
engine = get_engine()
|
engine = get_engine()
|
||||||
moment = ChartMoment(when_utc=req.when_utc, lat=req.lat, lon=req.lon)
|
moment = ChartMoment(when_utc=req.when_utc, lat=req.lat, lon=req.lon)
|
||||||
positions = engine.positions(moment, req.objects)
|
chart = build_chart(engine, moment, req.house_system)
|
||||||
return {"engine": engine.name, "positions": [p.as_dict() for p in positions]}
|
if req.stations:
|
||||||
|
from app.engine.stations import find_stations
|
||||||
|
|
||||||
|
for p in chart["positions"]:
|
||||||
|
st = find_stations(engine, moment, p["name"])
|
||||||
|
if st:
|
||||||
|
p["stations"] = st
|
||||||
|
return chart
|
||||||
|
|
||||||
|
|
||||||
@app.post("/chart/compare")
|
@app.post("/chart/compare")
|
||||||
@@ -77,6 +88,118 @@ def chart_compare(req: PositionsRequest) -> dict:
|
|||||||
return report.summary()
|
return report.summary()
|
||||||
|
|
||||||
|
|
||||||
|
class ReportRequest(BaseModel):
|
||||||
|
when_utc: datetime
|
||||||
|
lat: float = 0.0
|
||||||
|
lon: float = 0.0
|
||||||
|
limit: int = 5000
|
||||||
|
group: bool = False # grupowanie identycznych opisów
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/chart/report")
|
||||||
|
def chart_report(req: ReportRequest) -> dict:
|
||||||
|
"""Wynik obliczeń szukany w bazie: z pozycji + domów + aspektów generuje
|
||||||
|
sygnifikatory (fasety znak/dom/aspekt) i pyta warstwę danych o interpretacje."""
|
||||||
|
from app.engine.chart import build_chart
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
from app.significators import build_report
|
||||||
|
|
||||||
|
engine = get_engine()
|
||||||
|
moment = ChartMoment(when_utc=req.when_utc, lat=req.lat, lon=req.lon)
|
||||||
|
chart = build_chart(engine, moment) # pozycje z domami + aspekty
|
||||||
|
try:
|
||||||
|
report = build_report(
|
||||||
|
chart["positions"], DataClient(),
|
||||||
|
aspects=chart.get("aspects"), per_object_limit=req.limit, group=req.group,
|
||||||
|
)
|
||||||
|
except httpx.HTTPError as e:
|
||||||
|
return {"engine": engine.name, "objects": [], "data_error": f"Warstwa danych niedostępna: {e}"}
|
||||||
|
return {"engine": engine.name, **report}
|
||||||
|
|
||||||
|
|
||||||
|
class ProfectionsRequest(BaseModel):
|
||||||
|
when_utc: datetime # moment urodzenia (UTC)
|
||||||
|
lat: float = 0.0
|
||||||
|
lon: float = 0.0
|
||||||
|
start_age: int = 0
|
||||||
|
count: int = 13 # domyślnie pełny cykl 12 lat + rok startowy
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/chart/profections")
|
||||||
|
def chart_profections(req: ProfectionsRequest) -> dict:
|
||||||
|
"""Profekcje roczne (LOG-10): wiek, profektowany Asc, Władca Roku (+MC/Su/Mo)."""
|
||||||
|
from app.engine import houses as H
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
from app.engine.profections import profection_rows
|
||||||
|
|
||||||
|
engine = get_engine()
|
||||||
|
natal = ChartMoment(when_utc=req.when_utc, lat=req.lat, lon=req.lon)
|
||||||
|
ramc, eps = engine.sidereal(natal)
|
||||||
|
points = {
|
||||||
|
"Asc": H.compute_asc(ramc, eps, natal.lat),
|
||||||
|
"MC": H.compute_mc(ramc, eps),
|
||||||
|
}
|
||||||
|
for p in engine.positions(natal, ["Sun", "Moon"]):
|
||||||
|
points[p.name] = p.longitude
|
||||||
|
rows = profection_rows(points, req.when_utc, req.start_age, req.count)
|
||||||
|
return {"engine": engine.name, "rows": rows}
|
||||||
|
|
||||||
|
|
||||||
|
class ReturnRequest(BaseModel):
|
||||||
|
when_utc: datetime # moment urodzenia (UTC)
|
||||||
|
lat: float = 0.0
|
||||||
|
lon: float = 0.0
|
||||||
|
kind: str = "solar" # solar | lunar
|
||||||
|
around: datetime | None = None # data, wokół której szukać powrotu
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/chart/return")
|
||||||
|
def chart_return(req: ReturnRequest) -> dict:
|
||||||
|
"""Solar/Lunar Return (LOG-12): moment powrotu + pełny horoskop na ten moment."""
|
||||||
|
from app.engine.chart import build_chart
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
from app.engine.returns import find_return
|
||||||
|
|
||||||
|
if req.kind not in ("solar", "lunar"):
|
||||||
|
raise HTTPException(status_code=422, detail="kind: solar albo lunar")
|
||||||
|
engine = get_engine()
|
||||||
|
natal = ChartMoment(when_utc=req.when_utc, lat=req.lat, lon=req.lon)
|
||||||
|
around = req.around or req.when_utc
|
||||||
|
hit = find_return(engine, req.kind, natal, around)
|
||||||
|
if hit is None:
|
||||||
|
raise HTTPException(status_code=404, detail="nie znaleziono powrotu w oknie skanu")
|
||||||
|
chart = build_chart(engine, ChartMoment(when_utc=hit, lat=req.lat, lon=req.lon))
|
||||||
|
return {"engine": engine.name, "kind": req.kind,
|
||||||
|
"return_utc": hit.isoformat(), **chart}
|
||||||
|
|
||||||
|
|
||||||
|
class TimelineRequest(BaseModel):
|
||||||
|
when_utc: datetime # moment urodzenia (UTC)
|
||||||
|
lat: float = 0.0
|
||||||
|
lon: float = 0.0
|
||||||
|
from_date: str # zakres: YYYY-MM-DD
|
||||||
|
to_date: str
|
||||||
|
techniques: list[str] | None = None # profection | solar_return | solar_arc
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/chart/timeline")
|
||||||
|
def chart_timeline(req: TimelineRequest) -> dict:
|
||||||
|
"""Zbiorcza oś czasu z technik (LOG-14): technique | significator | start | exact | end."""
|
||||||
|
from app.engine import houses as H
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
from app.engine.timeline import build_timeline
|
||||||
|
|
||||||
|
engine = get_engine()
|
||||||
|
natal = ChartMoment(when_utc=req.when_utc, lat=req.lat, lon=req.lon)
|
||||||
|
ramc, eps = engine.sidereal(natal)
|
||||||
|
points = {"Asc": H.compute_asc(ramc, eps, natal.lat), "MC": H.compute_mc(ramc, eps)}
|
||||||
|
for p in engine.positions(natal):
|
||||||
|
points[p.name] = p.longitude
|
||||||
|
events = build_timeline(engine, natal, points, req.from_date, req.to_date, req.techniques)
|
||||||
|
return {"engine": engine.name, "from": req.from_date, "to": req.to_date,
|
||||||
|
"count": len(events), "events": events}
|
||||||
|
|
||||||
|
|
||||||
@app.get("/health")
|
@app.get("/health")
|
||||||
def health() -> dict:
|
def health() -> dict:
|
||||||
info = {"status": "ok", "layer": "logic"}
|
info = {"status": "ok", "layer": "logic"}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
"""Punktacja siły trafień — do rankingowania faset (zalążek LOG-21).
|
||||||
|
|
||||||
|
v1 liczy siłę z sygnałów OBLICZALNYCH:
|
||||||
|
- typ fasety (aspekt zwykle mocniejszy od znaku/domu),
|
||||||
|
- rodzaj aspektu (koniunkcja/opozycja mocniejsze od sekstyla),
|
||||||
|
- ciasnota orbu (im bliżej dokładności, tym mocniej).
|
||||||
|
|
||||||
|
Wszystko konfigurowalne. HOOK NA PRZYSZŁOŚĆ: gdy w SIGNIFICATORS KEY zostaną
|
||||||
|
wypełnione kolumny `countas*`/`level*`, można je tu domieszać per sygnifikator.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
# bazowe wagi faset (łatwe do strojenia)
|
||||||
|
FACET_BASE = {"sign": 5.0, "house": 5.0, "aspect": 6.0}
|
||||||
|
|
||||||
|
# względna siła aspektów głównych
|
||||||
|
ASPECT_WEIGHT = {
|
||||||
|
"conjunction": 1.0, "opposition": 0.95, "square": 0.85,
|
||||||
|
"trine": 0.85, "sextile": 0.65,
|
||||||
|
}
|
||||||
|
# aspekt aplikacyjny (A) jest silniejszy niż separacyjny (S) — notes3
|
||||||
|
APPLYING_BONUS = 1.15
|
||||||
|
|
||||||
|
|
||||||
|
def score_facet(facet: dict) -> float:
|
||||||
|
"""Siła fasety w skali ~0–12. Deterministyczna, konfigurowalna."""
|
||||||
|
base = FACET_BASE.get(facet.get("type"), 1.0)
|
||||||
|
if facet.get("type") == "aspect":
|
||||||
|
weight = ASPECT_WEIGHT.get(facet.get("aspect"), 0.7)
|
||||||
|
orb = facet.get("orb")
|
||||||
|
allowed = facet.get("allowed") or 10.0
|
||||||
|
tight = max(0.0, 1.0 - orb / allowed) if orb is not None and allowed else 0.0
|
||||||
|
score = base * weight * (1.0 + tight)
|
||||||
|
if facet.get("applying"):
|
||||||
|
score *= APPLYING_BONUS
|
||||||
|
return round(score, 2)
|
||||||
|
return round(base, 2)
|
||||||
@@ -0,0 +1,197 @@
|
|||||||
|
"""Most: policzony horoskop → tokeny sygnifikatorów → wyszukiwanie w bazie.
|
||||||
|
|
||||||
|
Zalążek LOG-15/16: z pozycji obiektów (wraz z domami) generujemy tokeny w składni
|
||||||
|
bazy i wyszukujemy pasujące rekordy. Dla każdego obiektu tworzymy kilka **faset**:
|
||||||
|
- „w znaku" — planeta + token znaku (`[Su` + `[Tau`)
|
||||||
|
- „w domu" — planeta + token domu (`[Su` + `11th H.`)
|
||||||
|
Aspekty (`[conj`,`[sq`,`[opp`) wymagają policzenia aspektów (LOG-06) — na później.
|
||||||
|
|
||||||
|
Format skrótów odczytany z realnej bazy: planety `[Su`,`[Mo`,…; znaki
|
||||||
|
`[Ari`,`[Tau`,…; domy `12th H.`; np. `[Sa [conj [Su in 6th H.`.
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Any, Protocol
|
||||||
|
|
||||||
|
from app.abbreviations import expand
|
||||||
|
from app.engine.formats import SIGN_ABBR, SIGNS
|
||||||
|
from app.scoring import score_facet
|
||||||
|
|
||||||
|
PLANET_ABBR = {
|
||||||
|
"Sun": "Su", "Moon": "Mo", "Mercury": "Me", "Venus": "Ve", "Mars": "Ma",
|
||||||
|
"Jupiter": "Ju", "Saturn": "Sa", "Uranus": "Ur", "Neptune": "Ne", "Pluto": "Pl",
|
||||||
|
# punkty wirtualne — tokeny wg SIGNIFICATORS KEY ([NN, [SN, [Lilith)
|
||||||
|
"North Node": "NN", "South Node": "SN", "Lilith": "Lilith",
|
||||||
|
}
|
||||||
|
SIGN_TO_ABBR = dict(zip(SIGNS, SIGN_ABBR))
|
||||||
|
|
||||||
|
|
||||||
|
class DataSource(Protocol):
|
||||||
|
def search(
|
||||||
|
self, key: str, value: str, exact: bool, limit: int, fields: list[str] | None = None
|
||||||
|
) -> dict[str, Any]: ...
|
||||||
|
|
||||||
|
|
||||||
|
def _effect(row: dict) -> str:
|
||||||
|
for col in ("actioneffect", "topicresult", "bodypart"):
|
||||||
|
v = row.get(col)
|
||||||
|
if v and str(v).strip().lower() not in ("", "nan"):
|
||||||
|
return str(v).strip()
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
def _is_noise(sig: str, effect: str) -> bool:
|
||||||
|
s = sig.strip().lower()
|
||||||
|
e = effect.strip().lower()
|
||||||
|
return (
|
||||||
|
e in ("", "nan", "x", "x?", "?", "-") # efekt pusty/zastępczy
|
||||||
|
or s.startswith("significator") # wiersz-legenda/nagłówek
|
||||||
|
or "header" in s
|
||||||
|
or s.startswith("*") # *MARKER / *header
|
||||||
|
or s in ("x", "x?", "nan") # znacznik „pomiń rekord"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _ordinal(n: int) -> str:
|
||||||
|
if 10 <= n % 100 <= 20:
|
||||||
|
suffix = "th"
|
||||||
|
else:
|
||||||
|
suffix = {1: "st", 2: "nd", 3: "rd"}.get(n % 10, "th")
|
||||||
|
return f"{n}{suffix}"
|
||||||
|
|
||||||
|
|
||||||
|
def _norm(s: str) -> str:
|
||||||
|
"""Normalizacja do porównań duplikatów: bez skrajnych spacji, jedna spacja, lower."""
|
||||||
|
return " ".join(str(s).strip().lower().split())
|
||||||
|
|
||||||
|
|
||||||
|
def _facet_samples(rows: list[dict], tokens: list[str]) -> list[dict]:
|
||||||
|
"""Rekordy, których sygnifikator zawiera WSZYSTKIE tokeny — bez szumu i bez duplikatów.
|
||||||
|
|
||||||
|
Duplikat = ten sam sygnifikator ORAZ ten sam opis (po normalizacji). Dedup
|
||||||
|
działa na zagregowanym wyniku, więc odsiewa też powtórki między wieloma bazami.
|
||||||
|
"""
|
||||||
|
toks = [t.lower() for t in tokens if t]
|
||||||
|
out: list[dict] = []
|
||||||
|
seen: set[tuple[str, str]] = set()
|
||||||
|
for r in rows:
|
||||||
|
sig = str(r.get("significator") or "").strip()
|
||||||
|
low = sig.lower()
|
||||||
|
if not all(t in low for t in toks):
|
||||||
|
continue
|
||||||
|
eff = _effect(r)
|
||||||
|
if _is_noise(sig, eff):
|
||||||
|
continue
|
||||||
|
key = (_norm(sig), _norm(eff))
|
||||||
|
if key in seen:
|
||||||
|
continue
|
||||||
|
seen.add(key)
|
||||||
|
out.append({"significator": sig, "expanded": expand(sig), "effect": eff})
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def _group_by_effect(samples: list[dict]) -> list[dict]:
|
||||||
|
"""Grupuje próbki po opisie: ten sam efekt = jedna grupa z listą sygnifikatorów."""
|
||||||
|
groups: dict[str, dict] = {}
|
||||||
|
order: list[str] = []
|
||||||
|
for s in samples:
|
||||||
|
key = _norm(s["effect"])
|
||||||
|
g = groups.get(key)
|
||||||
|
if g is None:
|
||||||
|
g = {"effect": s["effect"], "count": 0, "significators": []}
|
||||||
|
groups[key] = g
|
||||||
|
order.append(key)
|
||||||
|
g["count"] += 1
|
||||||
|
g["significators"].append(s["expanded"])
|
||||||
|
result = [groups[k] for k in order]
|
||||||
|
result.sort(key=lambda g: g["count"], reverse=True)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def build_report(
|
||||||
|
positions: list[dict],
|
||||||
|
data: DataSource,
|
||||||
|
aspects: list[dict] | None = None,
|
||||||
|
per_object_limit: int = 5000,
|
||||||
|
group: bool = False,
|
||||||
|
) -> dict:
|
||||||
|
"""positions: pozycje z build_chart (name, sign, direction, house).
|
||||||
|
|
||||||
|
Dla każdego obiektu fasety: „w znaku", „w domu" oraz „w aspekcie" (dla każdego
|
||||||
|
aspektu głównego z listy `aspects`, jeśli w bazie są dopasowania). Duplikaty
|
||||||
|
(ten sam sygnifikator i opis) są odsiewane wewnątrz każdej fasety.
|
||||||
|
"""
|
||||||
|
from app.engine.aspects import DB_TOKEN as ASP_TOKEN, PL_NAME as ASP_NAME
|
||||||
|
|
||||||
|
items: list[dict] = []
|
||||||
|
provider = None
|
||||||
|
for p in positions:
|
||||||
|
name = p.get("name")
|
||||||
|
if name not in PLANET_ABBR:
|
||||||
|
continue
|
||||||
|
planet_tok = "[" + PLANET_ABBR[name]
|
||||||
|
raw = data.search(
|
||||||
|
key="significator",
|
||||||
|
value=planet_tok,
|
||||||
|
exact=False,
|
||||||
|
limit=per_object_limit,
|
||||||
|
fields=["significator", "actioneffect", "topicresult", "bodypart"],
|
||||||
|
)
|
||||||
|
provider = raw.get("provider", provider)
|
||||||
|
rows = raw.get("rows", [])
|
||||||
|
|
||||||
|
facets: list[dict] = []
|
||||||
|
sign = p.get("sign")
|
||||||
|
sign_tok = "[" + SIGN_TO_ABBR.get(sign, "")
|
||||||
|
sign_samples = _facet_samples(rows, [sign_tok])
|
||||||
|
facets.append({
|
||||||
|
"type": "sign", "label": f"w znaku {sign}", "token": sign_tok,
|
||||||
|
"count": len(sign_samples), "samples": sign_samples,
|
||||||
|
})
|
||||||
|
|
||||||
|
house = p.get("house")
|
||||||
|
if house:
|
||||||
|
ordn = _ordinal(int(house))
|
||||||
|
house_samples = _facet_samples(rows, [f"{ordn} h"]) # matcuje '12th H.'
|
||||||
|
facets.append({
|
||||||
|
"type": "house", "label": f"w {ordn} domu", "token": f"{ordn} H.",
|
||||||
|
"count": len(house_samples), "samples": house_samples,
|
||||||
|
})
|
||||||
|
|
||||||
|
for asp in (aspects or []):
|
||||||
|
if name not in (asp.get("obj1"), asp.get("obj2")):
|
||||||
|
continue
|
||||||
|
other = asp["obj2"] if asp["obj1"] == name else asp["obj1"]
|
||||||
|
asp_tok = ASP_TOKEN.get(asp["aspect"])
|
||||||
|
if other not in PLANET_ABBR or not asp_tok:
|
||||||
|
continue
|
||||||
|
other_tok = "[" + PLANET_ABBR[other]
|
||||||
|
asp_samples = _facet_samples(rows, [asp_tok, other_tok])
|
||||||
|
if not asp_samples: # pokazujemy tylko aspekty z trafieniami
|
||||||
|
continue
|
||||||
|
as_suffix = f" ({asp['as']})" if asp.get("as") else ""
|
||||||
|
facets.append({
|
||||||
|
"type": "aspect", "label": f"{ASP_NAME[asp['aspect']]} z {other}{as_suffix}",
|
||||||
|
"token": f"{asp_tok} + {other_tok}",
|
||||||
|
"aspect": asp["aspect"], "orb": asp.get("orb"), "allowed": asp.get("allowed"),
|
||||||
|
"applying": asp.get("applying"),
|
||||||
|
"count": len(asp_samples), "samples": asp_samples,
|
||||||
|
})
|
||||||
|
|
||||||
|
# punktacja siły (LOG-21), opcjonalne grupowanie po opisie, ranking faset
|
||||||
|
for f in facets:
|
||||||
|
f["score"] = score_facet(f)
|
||||||
|
if group:
|
||||||
|
f["groups"] = _group_by_effect(f["samples"])
|
||||||
|
facets.sort(key=lambda f: f["score"], reverse=True)
|
||||||
|
|
||||||
|
items.append({
|
||||||
|
"object": name,
|
||||||
|
"sign": sign,
|
||||||
|
"house": house,
|
||||||
|
"direction": p.get("direction"),
|
||||||
|
"planet_token": planet_tok,
|
||||||
|
"planet_total": raw.get("total", 0),
|
||||||
|
"facets": facets,
|
||||||
|
})
|
||||||
|
return {"provider": provider, "objects": items}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
"""Testy rozwijania skrótów sygnifikatorów."""
|
||||||
|
from app.abbreviations import expand
|
||||||
|
|
||||||
|
|
||||||
|
def test_planet_in_sign():
|
||||||
|
assert expand("[Su in [Tau") == "Sun in Taurus"
|
||||||
|
|
||||||
|
|
||||||
|
def test_aspect_and_house():
|
||||||
|
assert expand("[Sa [conj [Su in 6th H.") == "Saturn conjunction Sun in 6th house"
|
||||||
|
|
||||||
|
|
||||||
|
def test_affliction_word_and_house():
|
||||||
|
assert expand("[Ne affl. in the 7th H.") == "Neptune afflicted in the 7th house"
|
||||||
|
|
||||||
|
|
||||||
|
def test_unknown_token_kept_without_bracket():
|
||||||
|
assert expand("[Xyz rising") == "Xyz rising"
|
||||||
|
|
||||||
|
|
||||||
|
def test_empty_passthrough():
|
||||||
|
assert expand("") == ""
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
"""Testy aspektów (LOG-06) — czysta matematyka."""
|
||||||
|
from app.engine.aspects import find_aspects, separation
|
||||||
|
|
||||||
|
|
||||||
|
def test_separation_wraparound():
|
||||||
|
assert separation(10, 350) == 20
|
||||||
|
assert separation(0, 180) == 180
|
||||||
|
assert separation(0, 90) == 90
|
||||||
|
|
||||||
|
|
||||||
|
def test_conjunction_and_opposition():
|
||||||
|
pos = [
|
||||||
|
{"name": "Sun", "decimal": 10.0},
|
||||||
|
{"name": "Moon", "decimal": 12.0}, # 2° od Słońca -> koniunkcja
|
||||||
|
{"name": "Mars", "decimal": 190.0}, # 180° od Słońca -> opozycja
|
||||||
|
]
|
||||||
|
pairs = {(a["obj1"], a["obj2"], a["aspect"]) for a in find_aspects(pos)}
|
||||||
|
assert ("Sun", "Moon", "conjunction") in pairs
|
||||||
|
assert ("Sun", "Mars", "opposition") in pairs
|
||||||
|
|
||||||
|
|
||||||
|
def test_orb_limit_excludes_wide():
|
||||||
|
pos = [{"name": "Mercury", "decimal": 0.0}, {"name": "Venus", "decimal": 100.0}]
|
||||||
|
assert find_aspects(pos, orb=8.0, luminary_bonus=0.0) == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_luminary_bonus_widens_orb():
|
||||||
|
# 99.5° -> 9.5° od kwadratury; z bonusem luminarza (8+2) mieści się
|
||||||
|
pos = [{"name": "Sun", "decimal": 0.0}, {"name": "Saturn", "decimal": 99.5}]
|
||||||
|
assert any(a["aspect"] == "square" for a in find_aspects(pos))
|
||||||
|
|
||||||
|
|
||||||
|
def test_one_aspect_per_pair():
|
||||||
|
pos = [{"name": "Sun", "decimal": 0.0}, {"name": "Moon", "decimal": 2.0}]
|
||||||
|
assert len(find_aspects(pos)) == 1
|
||||||
|
|
||||||
|
|
||||||
|
def test_applying_when_faster_body_catches_up():
|
||||||
|
# Księżyc 5° za Słońcem, szybszy -> koniunkcja aplikacyjna
|
||||||
|
pos = [
|
||||||
|
{"name": "Sun", "decimal": 40.0, "speed": 0.96},
|
||||||
|
{"name": "Moon", "decimal": 35.0, "speed": 13.0},
|
||||||
|
]
|
||||||
|
a = find_aspects(pos)[0]
|
||||||
|
assert a["applying"] is True and a["as"] == "A"
|
||||||
|
|
||||||
|
|
||||||
|
def test_separating_when_moving_apart():
|
||||||
|
# Księżyc 5° przed Słońcem i szybszy -> koniunkcja separacyjna
|
||||||
|
pos = [
|
||||||
|
{"name": "Sun", "decimal": 40.0, "speed": 0.96},
|
||||||
|
{"name": "Moon", "decimal": 45.0, "speed": 13.0},
|
||||||
|
]
|
||||||
|
a = find_aspects(pos)[0]
|
||||||
|
assert a["applying"] is False and a["as"] == "S"
|
||||||
|
|
||||||
|
|
||||||
|
def test_no_as_flag_without_speeds():
|
||||||
|
pos = [{"name": "Sun", "decimal": 0.0}, {"name": "Moon", "decimal": 2.0}]
|
||||||
|
assert "as" not in find_aspects(pos)[0]
|
||||||
|
|
||||||
|
|
||||||
|
# Referencja A/S z notes3 (astro-seek) dla horoskopu 30.04.1984 07:35 UT, Warszawa.
|
||||||
|
REFERENCE_AS = {
|
||||||
|
("Sun", "Moon", "conjunction"): "A",
|
||||||
|
("Sun", "Jupiter", "trine"): "A",
|
||||||
|
("Sun", "Saturn", "opposition"): "A",
|
||||||
|
("Sun", "Neptune", "trine"): "S",
|
||||||
|
("Sun", "Pluto", "opposition"): "S",
|
||||||
|
("Moon", "Mercury", "conjunction"): "S",
|
||||||
|
("Moon", "Venus", "conjunction"): "S",
|
||||||
|
("Moon", "Neptune", "trine"): "A",
|
||||||
|
("Moon", "Pluto", "opposition"): "S",
|
||||||
|
("Mercury", "Venus", "conjunction"): "S",
|
||||||
|
("Mercury", "Neptune", "trine"): "S",
|
||||||
|
("Mercury", "Pluto", "opposition"): "S",
|
||||||
|
("Venus", "Neptune", "trine"): "A",
|
||||||
|
("Venus", "Pluto", "opposition"): "A",
|
||||||
|
("Jupiter", "Saturn", "sextile"): "A",
|
||||||
|
("Neptune", "Pluto", "sextile"): "S",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_applying_separating_matches_astroseek_reference(own_engine, reference_moment):
|
||||||
|
from app.engine.chart import build_chart
|
||||||
|
|
||||||
|
chart = build_chart(own_engine, reference_moment)
|
||||||
|
got = {(a["obj1"], a["obj2"], a["aspect"]): a.get("as") for a in chart["aspects"]}
|
||||||
|
mismatches = {k: (got.get(k), v) for k, v in REFERENCE_AS.items() if got.get(k) != v}
|
||||||
|
assert not mismatches, f"rozbieżności A/S vs astro-seek: {mismatches}"
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
"""Integracja: pełny horoskop (pozycje + osie + domy) przez silnik (LOG-01+LOG-05).
|
||||||
|
|
||||||
|
Waliduje względem astro.com dla horoskopu referencyjnego.
|
||||||
|
"""
|
||||||
|
from app.engine.chart import build_chart
|
||||||
|
|
||||||
|
|
||||||
|
def test_chart_angles_match_reference(own_engine, reference_moment):
|
||||||
|
chart = build_chart(own_engine, reference_moment, "whole_sign")
|
||||||
|
assert chart["angles"]["Asc"]["sign"] == "Cancer"
|
||||||
|
assert chart["angles"]["MC"]["sign"] == "Pisces"
|
||||||
|
|
||||||
|
|
||||||
|
def test_chart_house_assignments_match_reference(own_engine, reference_moment):
|
||||||
|
chart = build_chart(own_engine, reference_moment, "whole_sign")
|
||||||
|
by = {p["name"]: p for p in chart["positions"]}
|
||||||
|
expected = {"Sun": 11, "Moon": 11, "Mercury": 10, "Venus": 10, "Mars": 5,
|
||||||
|
"Jupiter": 7, "Saturn": 5, "Uranus": 6, "Neptune": 7, "Pluto": 5}
|
||||||
|
for name, house in expected.items():
|
||||||
|
assert by[name]["house"] == house, f"{name}: dom {by[name]['house']} != {house}"
|
||||||
|
|
||||||
|
|
||||||
|
def test_house_systems_available(own_engine, reference_moment):
|
||||||
|
for system in ("whole_sign", "equal", "porphyry"):
|
||||||
|
chart = build_chart(own_engine, reference_moment, system)
|
||||||
|
assert chart["house_system"] == system
|
||||||
|
assert len(chart["cusps"]) == 12
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
"""Testy osi i domów — czysta matematyka (LOG-05, bez efemeryd)."""
|
||||||
|
from app.engine import houses as H
|
||||||
|
|
||||||
|
# RAMC i ε policzone Skyfieldem dla horoskopu referencyjnego (30.04.1984, Warszawa)
|
||||||
|
RAMC, EPS, LAT = 353.1968, 23.44133, 52.2333
|
||||||
|
|
||||||
|
|
||||||
|
def _near(a, b, tol=0.05):
|
||||||
|
return abs(((a - b + 180) % 360) - 180) < tol
|
||||||
|
|
||||||
|
|
||||||
|
def test_asc_mc_match_reference():
|
||||||
|
asc = H.compute_asc(RAMC, EPS, LAT)
|
||||||
|
mc = H.compute_mc(RAMC, EPS)
|
||||||
|
assert _near(asc, 112.18) # Cancer 22°10' (astro.com)
|
||||||
|
assert _near(mc, 352.59) # Pisces 22°35'
|
||||||
|
|
||||||
|
|
||||||
|
def test_whole_sign_starts_on_sign_boundary():
|
||||||
|
cusps = H.cusps(112.18, 352.59, H.WHOLE_SIGN)
|
||||||
|
assert cusps[0] == 90.0 # dom 1 = 0° Raka
|
||||||
|
assert cusps[1] == 120.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_equal_cusps_are_30_apart_from_asc():
|
||||||
|
cusps = H.cusps(112.18, 352.59, H.EQUAL)
|
||||||
|
assert abs(cusps[0] - 112.18) < 1e-9
|
||||||
|
assert abs(cusps[1] - 142.18) < 1e-9
|
||||||
|
|
||||||
|
|
||||||
|
def test_porphyry_angles_on_cusps():
|
||||||
|
cusps = H.cusps(112.18, 352.59, H.PORPHYRY)
|
||||||
|
assert abs(cusps[0] - 112.18) < 1e-9 # Asc = dom 1
|
||||||
|
assert abs(cusps[9] - 352.59) < 1e-9 # MC = dom 10
|
||||||
|
assert abs(cusps[6] - (112.18 + 180) % 360) < 1e-9 # Dsc = dom 7
|
||||||
|
|
||||||
|
|
||||||
|
def test_assign_house_whole_sign():
|
||||||
|
cusps = H.cusps(112.18, 352.59, H.WHOLE_SIGN) # dom 1 = Rak (90–120°)
|
||||||
|
assert H.assign_house(100.0, cusps) == 1 # w Raku
|
||||||
|
assert H.assign_house(40.0, cusps) == 11 # Byk -> 11. dom
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
"""Testy punktów wirtualnych (LOG-02): mean Node, mean Lilith.
|
||||||
|
|
||||||
|
Referencje dla 30.04.1984 07:35 UT:
|
||||||
|
- astro-seek (notes3): North Node (M) = Gem 8°09'24" = 68.1567°
|
||||||
|
- wyrocznia swisseph (MEAN_NODE / MEAN_APOG, tryb Moshiera):
|
||||||
|
NN = 68.1569°, Lilith = 345.6840°
|
||||||
|
"""
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from app.engine.formats import norm360
|
||||||
|
|
||||||
|
|
||||||
|
def _delta_arcmin(a: float, b: float) -> float:
|
||||||
|
return abs(((a - b + 180.0) % 360.0) - 180.0) * 60.0
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(scope="module")
|
||||||
|
def by_name(own_engine, reference_moment):
|
||||||
|
return {p.name: p for p in own_engine.positions(reference_moment)}
|
||||||
|
|
||||||
|
|
||||||
|
def test_mean_node_matches_references(by_name):
|
||||||
|
nn = by_name["North Node"]
|
||||||
|
assert _delta_arcmin(nn.longitude, 68.1567) < 2.0 # astro-seek
|
||||||
|
assert _delta_arcmin(nn.longitude, 68.1569) < 2.0 # swisseph
|
||||||
|
assert nn.sign == "Gemini"
|
||||||
|
|
||||||
|
|
||||||
|
def test_nodes_always_retrograde_and_opposed(by_name):
|
||||||
|
nn, sn = by_name["North Node"], by_name["South Node"]
|
||||||
|
assert nn.retrograde and sn.retrograde # mean node zawsze Rx
|
||||||
|
assert _delta_arcmin(sn.longitude, norm360(nn.longitude + 180.0)) < 0.01
|
||||||
|
assert abs(nn.speed - sn.speed) < 1e-9 # ta sama prędkość
|
||||||
|
|
||||||
|
|
||||||
|
def test_mean_lilith_matches_swisseph(by_name):
|
||||||
|
li = by_name["Lilith"]
|
||||||
|
assert _delta_arcmin(li.longitude, 345.6840) < 3.0 # wyrocznia swisseph
|
||||||
|
assert li.sign == "Pisces"
|
||||||
|
assert li.speed > 0 and not li.retrograde # mean Lilith zawsze direct
|
||||||
|
|
||||||
|
|
||||||
|
def test_points_join_houses_and_chart(own_engine, reference_moment):
|
||||||
|
from app.engine.chart import build_chart
|
||||||
|
|
||||||
|
chart = build_chart(own_engine, reference_moment)
|
||||||
|
by = {p["name"]: p for p in chart["positions"]}
|
||||||
|
# NN w Gem -> 12. dom Whole Sign (Asc w Raku); zgodnie z tabelą astro-seek w notes3
|
||||||
|
assert by["North Node"]["house"] == 12
|
||||||
|
assert by["Lilith"]["house"] == 9 # Pis -> 9. dom
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
"""Profekcje (LOG-10) — walidacja względem tabeli astro-seek z notes3."""
|
||||||
|
import datetime as dt
|
||||||
|
|
||||||
|
from app.engine.profections import DOMICILE_RULERS, age_at, profected_sign, profection_rows
|
||||||
|
|
||||||
|
BIRTH = dt.datetime(1984, 4, 30, 7, 35, tzinfo=dt.timezone.utc)
|
||||||
|
NATAL = {"Asc": 112.18, "MC": 352.59, "Sun": 40.14, "Moon": 30.55}
|
||||||
|
|
||||||
|
# wiek -> (profektowany Asc, Władca Roku) — tabela referencyjna notes3
|
||||||
|
REFERENCE = {
|
||||||
|
0: ("Cancer", "Moon"), 1: ("Leo", "Sun"), 2: ("Virgo", "Mercury"),
|
||||||
|
3: ("Libra", "Venus"), 4: ("Scorpio", "Mars"), 5: ("Sagittarius", "Jupiter"),
|
||||||
|
6: ("Capricorn", "Saturn"), 7: ("Aquarius", "Saturn"), 8: ("Pisces", "Jupiter"),
|
||||||
|
9: ("Aries", "Mars"), 10: ("Taurus", "Venus"), 11: ("Gemini", "Mercury"),
|
||||||
|
12: ("Cancer", "Moon"), 40: ("Scorpio", "Mars"), 41: ("Sagittarius", "Jupiter"),
|
||||||
|
42: ("Capricorn", "Saturn"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_profections_match_astroseek_table():
|
||||||
|
rows = {r["age"]: r for r in profection_rows(NATAL, BIRTH, 0, 43)}
|
||||||
|
for age, (asc, lord) in REFERENCE.items():
|
||||||
|
assert rows[age]["profected_asc"] == asc, f"wiek {age}"
|
||||||
|
assert rows[age]["lord_of_year"] == lord, f"wiek {age}"
|
||||||
|
|
||||||
|
|
||||||
|
def test_profected_secondary_points_match_reference():
|
||||||
|
rows = {r["age"]: r for r in profection_rows(NATAL, BIRTH, 0, 3)}
|
||||||
|
# notes3: wiek 0 -> MC Pis, Sun Tau, Moon Tau; wiek 1 -> MC Ari, Sun Gem
|
||||||
|
assert rows[0]["MC"] == "Pisces" and rows[0]["Sun"] == "Taurus"
|
||||||
|
assert rows[1]["MC"] == "Aries" and rows[1]["Sun"] == "Gemini"
|
||||||
|
|
||||||
|
|
||||||
|
def test_from_dates_are_birthdays():
|
||||||
|
rows = profection_rows(NATAL, BIRTH, 40, 3)
|
||||||
|
assert [r["from"] for r in rows] == ["2024-04-30", "2025-04-30", "2026-04-30"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_age_at_boundaries():
|
||||||
|
assert age_at(BIRTH, dt.datetime(2026, 4, 29, tzinfo=dt.timezone.utc)) == 41
|
||||||
|
assert age_at(BIRTH, dt.datetime(2026, 4, 30, tzinfo=dt.timezone.utc)) == 42
|
||||||
|
|
||||||
|
|
||||||
|
def test_rulers_cover_all_signs():
|
||||||
|
assert len(DOMICILE_RULERS) == 12
|
||||||
|
assert profected_sign(112.18, 12) == "Cancer" # pełny cykl wraca
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
"""Solar / Lunar Return (LOG-12) — samospójność i sensowność dat."""
|
||||||
|
import datetime as dt
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
from app.engine.returns import find_return
|
||||||
|
|
||||||
|
|
||||||
|
def _lon(engine, body, when):
|
||||||
|
return engine.positions(ChartMoment(when_utc=when), [body])[0].longitude
|
||||||
|
|
||||||
|
|
||||||
|
def _delta_arcmin(a, b):
|
||||||
|
return abs(((a - b + 180.0) % 360.0) - 180.0) * 60.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_solar_return_hits_natal_sun(own_engine, reference_moment):
|
||||||
|
natal_sun = _lon(own_engine, "Sun", reference_moment.when_utc)
|
||||||
|
# solariusz na 42. urodziny (2026)
|
||||||
|
hit = find_return(own_engine, "solar", reference_moment,
|
||||||
|
dt.datetime(2026, 4, 30, tzinfo=dt.timezone.utc))
|
||||||
|
assert hit is not None
|
||||||
|
assert _delta_arcmin(_lon(own_engine, "Sun", hit), natal_sun) < 0.5
|
||||||
|
assert hit.month == 4 and hit.year == 2026 # w okolicy urodzin
|
||||||
|
|
||||||
|
|
||||||
|
def test_lunar_return_hits_natal_moon(own_engine, reference_moment):
|
||||||
|
natal_moon = _lon(own_engine, "Moon", reference_moment.when_utc)
|
||||||
|
hit = find_return(own_engine, "lunar", reference_moment,
|
||||||
|
dt.datetime(1984, 5, 27, tzinfo=dt.timezone.utc))
|
||||||
|
assert hit is not None
|
||||||
|
assert _delta_arcmin(_lon(own_engine, "Moon", hit), natal_moon) < 2.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_solar_return_near_birth_is_close_to_birth(own_engine, reference_moment):
|
||||||
|
# powrót szukany wokół samych urodzin = ~moment urodzenia
|
||||||
|
hit = find_return(own_engine, "solar", reference_moment, reference_moment.when_utc)
|
||||||
|
assert hit is not None
|
||||||
|
assert abs(hit - reference_moment.when_utc) < dt.timedelta(days=1)
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
"""Testy punktacji siły faset (LOG-21)."""
|
||||||
|
from app.scoring import score_facet
|
||||||
|
|
||||||
|
|
||||||
|
def test_sign_and_house_base():
|
||||||
|
assert score_facet({"type": "sign"}) == 5.0
|
||||||
|
assert score_facet({"type": "house"}) == 5.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_tighter_aspect_scores_higher():
|
||||||
|
tight = score_facet({"type": "aspect", "aspect": "conjunction", "orb": 0.0, "allowed": 10.0})
|
||||||
|
loose = score_facet({"type": "aspect", "aspect": "conjunction", "orb": 9.0, "allowed": 10.0})
|
||||||
|
assert tight > loose
|
||||||
|
assert tight == 12.0 # 6.0 * 1.0 * (1 + 1)
|
||||||
|
|
||||||
|
|
||||||
|
def test_conjunction_beats_sextile_at_same_orb():
|
||||||
|
conj = score_facet({"type": "aspect", "aspect": "conjunction", "orb": 2.0, "allowed": 10.0})
|
||||||
|
sext = score_facet({"type": "aspect", "aspect": "sextile", "orb": 2.0, "allowed": 10.0})
|
||||||
|
assert conj > sext
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
"""Testy mostu obliczenia → sygnifikatory → wyszukiwanie (bez efemeryd/HTTP)."""
|
||||||
|
from app.engine.models import DEFAULT_OBJECTS
|
||||||
|
from app.significators import PLANET_ABBR, _ordinal, build_report
|
||||||
|
|
||||||
|
|
||||||
|
class FakeData:
|
||||||
|
def __init__(self, rows_by_value: dict) -> None:
|
||||||
|
self.rows_by_value = rows_by_value
|
||||||
|
|
||||||
|
def search(self, key, value, exact, limit, fields=None) -> dict:
|
||||||
|
rows = self.rows_by_value.get(value, [])
|
||||||
|
return {"provider": "fake", "total": len(rows), "rows": rows}
|
||||||
|
|
||||||
|
|
||||||
|
def test_sign_and_house_facets():
|
||||||
|
positions = [{"name": "Sun", "sign": "Taurus", "direction": "D", "house": 11}]
|
||||||
|
data = FakeData({"[Su": [
|
||||||
|
{"significator": "[Su in [Tau", "actioneffect": "efekt znak"}, # faseta znak
|
||||||
|
{"significator": "[Su in 11th H.", "actioneffect": "efekt dom"}, # faseta dom
|
||||||
|
{"significator": "[Su in [Vir", "actioneffect": "inny"}, # żadna
|
||||||
|
{"significator": "[Su in [Tau", "actioneffect": "nan"}, # szum
|
||||||
|
]})
|
||||||
|
item = build_report(positions, data)["objects"][0]
|
||||||
|
assert item["object"] == "Sun" and item["house"] == 11
|
||||||
|
facets = {f["type"]: f for f in item["facets"]}
|
||||||
|
assert facets["sign"]["count"] == 1
|
||||||
|
assert facets["sign"]["samples"][0]["effect"] == "efekt znak"
|
||||||
|
assert facets["sign"]["samples"][0]["expanded"] == "Sun in Taurus" # rozwinięcie skrótu
|
||||||
|
assert facets["house"]["count"] == 1
|
||||||
|
assert facets["house"]["token"] == "11th H."
|
||||||
|
assert facets["house"]["samples"][0]["effect"] == "efekt dom"
|
||||||
|
|
||||||
|
|
||||||
|
def test_no_house_facet_when_house_missing():
|
||||||
|
positions = [{"name": "Mars", "sign": "Scorpio", "direction": "Rx"}]
|
||||||
|
data = FakeData({"[Ma": [{"significator": "[Ma in [Sco", "actioneffect": "eff"}]})
|
||||||
|
types = [f["type"] for f in build_report(positions, data)["objects"][0]["facets"]]
|
||||||
|
assert "sign" in types and "house" not in types
|
||||||
|
|
||||||
|
|
||||||
|
def test_dedup_by_significator_and_effect():
|
||||||
|
positions = [{"name": "Moon", "sign": "Taurus", "direction": "D", "house": 11}]
|
||||||
|
data = FakeData({"[Mo": [
|
||||||
|
{"significator": "[Mo in 11th H.", "actioneffect": "efekt"},
|
||||||
|
{"significator": "[Mo in 11th H.", "actioneffect": "efekt"}, # duplikat (sig+opis)
|
||||||
|
{"significator": "[Mo in 11th H.", "actioneffect": "inny efekt"}, # ten sam sig, inny opis
|
||||||
|
]})
|
||||||
|
facets = {f["type"]: f for f in build_report(positions, data)["objects"][0]["facets"]}
|
||||||
|
assert facets["house"]["count"] == 2 # duplikat odsiany, różny opis zostaje
|
||||||
|
|
||||||
|
|
||||||
|
def test_aspect_facet():
|
||||||
|
positions = [
|
||||||
|
{"name": "Sun", "sign": "Taurus", "direction": "D", "house": 11},
|
||||||
|
{"name": "Moon", "sign": "Taurus", "direction": "D", "house": 11},
|
||||||
|
]
|
||||||
|
aspects = [{"obj1": "Sun", "obj2": "Moon", "aspect": "conjunction", "orb": 2.0}]
|
||||||
|
data = FakeData({"[Su": [{"significator": "[Su [conj [Mo", "actioneffect": "złączeni"}]})
|
||||||
|
sun = build_report(positions, data, aspects=aspects)["objects"][0]
|
||||||
|
asp = [f for f in sun["facets"] if f["type"] == "aspect"]
|
||||||
|
assert asp and asp[0]["count"] == 1 and "Moon" in asp[0]["label"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_grouping_by_effect():
|
||||||
|
positions = [{"name": "Mars", "sign": "Scorpio", "direction": "Rx", "house": 5}]
|
||||||
|
data = FakeData({"[Ma": [
|
||||||
|
{"significator": "[Ma in 5th H.", "actioneffect": "miscarriage"},
|
||||||
|
{"significator": "[Sa in 5th H.", "actioneffect": "miscarriage"}, # inny sig, ten sam opis
|
||||||
|
{"significator": "[Ma in 5th H.", "actioneffect": "fever"},
|
||||||
|
]})
|
||||||
|
house = [f for f in build_report(positions, data, group=True)["objects"][0]["facets"]
|
||||||
|
if f["type"] == "house"][0]
|
||||||
|
groups = {g["effect"]: g for g in house["groups"]}
|
||||||
|
assert groups["miscarriage"]["count"] == 2
|
||||||
|
assert len(groups["miscarriage"]["significators"]) == 2
|
||||||
|
assert "score" in house
|
||||||
|
|
||||||
|
|
||||||
|
def test_facets_carry_score():
|
||||||
|
positions = [{"name": "Sun", "sign": "Taurus", "direction": "D", "house": 11}]
|
||||||
|
data = FakeData({"[Su": [{"significator": "[Su in [Tau", "actioneffect": "e"}]})
|
||||||
|
facets = build_report(positions, data)["objects"][0]["facets"]
|
||||||
|
assert all("score" in f for f in facets)
|
||||||
|
|
||||||
|
|
||||||
|
def test_ordinal():
|
||||||
|
assert _ordinal(1) == "1st" and _ordinal(2) == "2nd" and _ordinal(3) == "3rd"
|
||||||
|
assert _ordinal(4) == "4th" and _ordinal(11) == "11th" and _ordinal(12) == "12th"
|
||||||
|
|
||||||
|
|
||||||
|
def test_planet_abbr_covers_all_default_objects():
|
||||||
|
for o in DEFAULT_OBJECTS:
|
||||||
|
assert o in PLANET_ABBR
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
"""Testy wykrywania stacji (LOG-03).
|
||||||
|
|
||||||
|
Fakt historyczny: Mars w horoskopie referencyjnym (30.04.1984) jest w środku
|
||||||
|
retrogradacji — stacja SR ~5.04.1984 (ok. 25 dni wstecz), stacja SD ~19.06.1984
|
||||||
|
(ok. 50 dni w przód). Testy sprawdzają strukturę, klasyfikację SD/SR, przedziały
|
||||||
|
dat i samospójność (prędkość w znalezionym momencie ~0).
|
||||||
|
"""
|
||||||
|
import datetime as dt
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from app.engine.models import ChartMoment
|
||||||
|
from app.engine.stations import STATION_SOON_DAYS, find_stations
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(scope="module")
|
||||||
|
def mars_stations(own_engine, reference_moment):
|
||||||
|
return find_stations(own_engine, reference_moment, "Mars")
|
||||||
|
|
||||||
|
|
||||||
|
def test_no_stations_for_sun_moon_and_points(own_engine, reference_moment):
|
||||||
|
for name in ("Sun", "Moon", "North Node", "South Node", "Lilith"):
|
||||||
|
assert find_stations(own_engine, reference_moment, name) is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_mars_prev_is_sr_next_is_sd(mars_stations):
|
||||||
|
assert mars_stations["prev"]["type"] == "SR" # wszedł w retrogradację
|
||||||
|
assert mars_stations["next"]["type"] == "SD" # wróci do ruchu prostego
|
||||||
|
|
||||||
|
|
||||||
|
def test_mars_station_windows_match_history(mars_stations):
|
||||||
|
# SR ~5.04.1984 -> ok. -25 dni; SD ~19/20.06.1984 -> ok. +50 dni
|
||||||
|
assert -35 < mars_stations["prev"]["days"] < -15
|
||||||
|
assert 40 < mars_stations["next"]["days"] < 60
|
||||||
|
assert mars_stations["prev"]["date"].startswith("1984-04")
|
||||||
|
assert mars_stations["next"]["date"].startswith("1984-06")
|
||||||
|
|
||||||
|
|
||||||
|
def test_station_speed_is_near_zero(own_engine, reference_moment, mars_stations):
|
||||||
|
"""Samospójność: w znalezionym momencie stacji prędkość Marsa ~0."""
|
||||||
|
for key in ("prev", "next"):
|
||||||
|
when = dt.datetime.strptime(mars_stations[key]["date"], "%Y-%m-%d %H:%M").replace(
|
||||||
|
tzinfo=dt.timezone.utc
|
||||||
|
)
|
||||||
|
m = ChartMoment(when_utc=when, lat=reference_moment.lat, lon=reference_moment.lon)
|
||||||
|
speed = own_engine.positions(m, ["Mars"])[0].speed
|
||||||
|
assert abs(speed) < 0.01, f"{key}: speed={speed}"
|
||||||
|
|
||||||
|
|
||||||
|
def test_station_soon_flag_consistent(mars_stations):
|
||||||
|
expected = any(
|
||||||
|
abs(mars_stations[k]["days"]) < STATION_SOON_DAYS
|
||||||
|
for k in ("prev", "next") if k in mars_stations
|
||||||
|
)
|
||||||
|
assert mars_stations["station_soon"] == expected
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
"""Zbiorcza oś czasu z technik (LOG-14)."""
|
||||||
|
import datetime as dt
|
||||||
|
|
||||||
|
from app.engine.timeline import (
|
||||||
|
NAIBOD_KEY,
|
||||||
|
build_timeline,
|
||||||
|
profection_events,
|
||||||
|
solar_arc_directions,
|
||||||
|
)
|
||||||
|
|
||||||
|
BIRTH = dt.datetime(1984, 4, 30, 7, 35, tzinfo=dt.timezone.utc)
|
||||||
|
# natalne długości (z horoskopu referencyjnego)
|
||||||
|
NATAL = {
|
||||||
|
"Asc": 112.18, "MC": 352.59, "Sun": 40.14, "Moon": 30.55, "Mercury": 27.38,
|
||||||
|
"Venus": 27.68, "Mars": 234.54, "Jupiter": 282.96, "Saturn": 223.31,
|
||||||
|
"Uranus": 252.81, "Neptune": 271.22, "Pluto": 210.48,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _win(y0, y1):
|
||||||
|
return (dt.datetime(y0, 1, 1, tzinfo=dt.timezone.utc),
|
||||||
|
dt.datetime(y1, 12, 31, tzinfo=dt.timezone.utc))
|
||||||
|
|
||||||
|
|
||||||
|
def test_profection_events_in_window():
|
||||||
|
lo, hi = _win(2024, 2026)
|
||||||
|
rows = profection_events(NATAL["Asc"], BIRTH, lo, hi)
|
||||||
|
# rok profekcyjny wiek 42 zaczyna się 30.04.2026 -> Asc Capricorn
|
||||||
|
ages = [r["significator"] for r in rows]
|
||||||
|
assert any("Asc Capricorn" in a and "wiek 42" in a for a in ages)
|
||||||
|
|
||||||
|
|
||||||
|
def test_solar_arc_exact_matches_arc_over_key():
|
||||||
|
lo, hi = _win(2020, 2030)
|
||||||
|
rows = solar_arc_directions(NATAL, BIRTH, lo, hi, key=NAIBOD_KEY)
|
||||||
|
assert rows, "brak dyrekcji w oknie"
|
||||||
|
# dla każdej dyrekcji: łuk = (wiek * klucz), a data = urodziny + wiek -> spójne
|
||||||
|
for r in rows[:5]:
|
||||||
|
exact = dt.date.fromisoformat(r["exact"])
|
||||||
|
age_years = (dt.datetime(exact.year, exact.month, exact.day, tzinfo=dt.timezone.utc)
|
||||||
|
- BIRTH).days / 365.2422
|
||||||
|
assert 36 <= age_years <= 47 # okno 2020-2030 = wiek ~36-46
|
||||||
|
assert r["technique"] == "solar_arc" and "dyr." in r["significator"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_directed_sun_conjunct_natal_mc_date():
|
||||||
|
# Sun natal 40.14 -> MC natal 352.59: łuk koniunkcji = (352.59-40.14)%360 = 312.45
|
||||||
|
# to > lifespan przy Naibod (~317 lat) -> NIE powinno być w oknie życia
|
||||||
|
lo, hi = _win(1984, 2084)
|
||||||
|
rows = solar_arc_directions(NATAL, BIRTH, lo, hi)
|
||||||
|
sun_mc = [r for r in rows if r["significator"] == "dyr. Sun koniunkcja MC"]
|
||||||
|
assert not sun_mc # łuk 312° = poza życiem
|
||||||
|
|
||||||
|
|
||||||
|
def test_build_timeline_sorted_and_merged():
|
||||||
|
events = build_timeline(_FakeEngine(), _FakeNatal(), NATAL,
|
||||||
|
"2025-01-01", "2027-01-01",
|
||||||
|
techniques=["profection", "solar_arc"])
|
||||||
|
assert events
|
||||||
|
dates = [e["exact"] for e in events]
|
||||||
|
assert dates == sorted(dates) # posortowane po dacie dokładnej
|
||||||
|
techs = {e["technique"] for e in events}
|
||||||
|
assert "profection" in techs and "solar_arc" in techs
|
||||||
|
|
||||||
|
|
||||||
|
class _FakeNatal:
|
||||||
|
when_utc = BIRTH
|
||||||
|
|
||||||
|
|
||||||
|
class _FakeEngine:
|
||||||
|
"""Silnik-atrapa — build_timeline z solar_return by go użył, tu go pomijamy."""
|
||||||
@@ -5,12 +5,21 @@ przekazuje dane z formularza do warstwy logicznej i renderuje opracowane wyniki.
|
|||||||
Brak logiki biznesowej i dostępu do danych.
|
Brak logiki biznesowej i dostępu do danych.
|
||||||
|
|
||||||
## Trasy
|
## Trasy
|
||||||
- `GET /` — strona z formularzem
|
- `GET /` — **Horoskop**: formularz danych momentu (data, godzina, strefa, opcjonalnie lokalizacja)
|
||||||
- `POST /` — wysłanie formularza → warstwa logiczna → render wyników
|
- `POST /` — liczy pozycje obiektów (woła logic `/chart/positions`) i renderuje czytelną tabelę
|
||||||
|
- `GET /significators`, `POST /significators` — wyszukiwarka w bazach interpretacji (warstwa danych)
|
||||||
- `GET /health`
|
- `GET /health`
|
||||||
|
|
||||||
|
Strona „Horoskop" to widok do **ręcznego testowania**: podstawowe dane wejściowe →
|
||||||
|
to, co policzyła warstwa logiczna (znak, pozycja w znaku, absolutna, kierunek, prędkość).
|
||||||
|
Przycisk „Tu i teraz" uzupełnia bieżącą datę/godzinę i strefę przeglądarki.
|
||||||
|
|
||||||
## Zależności w dół
|
## Zależności w dół
|
||||||
Zna wyłącznie `LOGIC_URL` (adres warstwy logicznej).
|
Zna wyłącznie `LOGIC_URL` (adres warstwy logicznej) i jej kontrakty `/chart/positions`
|
||||||
|
oraz `/api/query`. Nie wie nic o silniku ani bazach.
|
||||||
|
|
||||||
|
> Uwaga: pełne liczenie pozycji wymaga warstwy logicznej z silnikiem efemeryd
|
||||||
|
> (gałąź `feat/logic-engine`). Bez niego strona „Horoskop" pokaże czytelny komunikat.
|
||||||
|
|
||||||
## Uruchomienie
|
## Uruchomienie
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"""Klient HTTP do warstwy logicznej.
|
"""Klient HTTP do warstwy logicznej.
|
||||||
|
|
||||||
Jedyny punkt styku prezentacji w dół. Przekazuje dane z formularza i odbiera
|
Jedyny punkt styku prezentacji w dół. Przekazuje dane z formularza i odbiera
|
||||||
opracowane wyniki. Prezentacja nie sięga bezpośrednio do bazy.
|
opracowane wyniki. Prezentacja nie sięga bezpośrednio do bazy ani do silnika.
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
@@ -22,3 +22,37 @@ class LogicClient:
|
|||||||
r = client.post(f"{self.base_url}/api/query", json=payload)
|
r = client.post(f"{self.base_url}/api/query", json=payload)
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
|
def positions(
|
||||||
|
self,
|
||||||
|
when_utc_iso: str,
|
||||||
|
lat: float,
|
||||||
|
lon: float,
|
||||||
|
objects: list[str] | None = None,
|
||||||
|
house_system: str = "whole_sign",
|
||||||
|
stations: bool = False,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Pełny horoskop dla danego momentu — woła logic /chart/positions."""
|
||||||
|
payload = {
|
||||||
|
"when_utc": when_utc_iso,
|
||||||
|
"lat": lat,
|
||||||
|
"lon": lon,
|
||||||
|
"objects": objects,
|
||||||
|
"house_system": house_system,
|
||||||
|
"stations": stations,
|
||||||
|
}
|
||||||
|
# stacje wymagają root-findów — dłuższy timeout
|
||||||
|
with httpx.Client(timeout=max(settings.http_timeout, 60.0) if stations else settings.http_timeout) as client:
|
||||||
|
r = client.post(f"{self.base_url}/chart/positions", json=payload)
|
||||||
|
r.raise_for_status()
|
||||||
|
return r.json()
|
||||||
|
|
||||||
|
def report(
|
||||||
|
self, when_utc_iso: str, lat: float, lon: float, limit: int = 5000, group: bool = False
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Sygnifikatory z obliczeń szukane w bazie — woła logic /chart/report."""
|
||||||
|
payload = {"when_utc": when_utc_iso, "lat": lat, "lon": lon, "limit": limit, "group": group}
|
||||||
|
with httpx.Client(timeout=max(settings.http_timeout, 30.0)) as client:
|
||||||
|
r = client.post(f"{self.base_url}/chart/report", json=payload)
|
||||||
|
r.raise_for_status()
|
||||||
|
return r.json()
|
||||||
|
|||||||
@@ -2,9 +2,15 @@
|
|||||||
|
|
||||||
W dół: przekazuje dane z formularza do warstwy logicznej i odbiera opracowane
|
W dół: przekazuje dane z formularza do warstwy logicznej i odbiera opracowane
|
||||||
wyniki. Nie zawiera logiki biznesowej ani dostępu do danych — tylko UI.
|
wyniki. Nie zawiera logiki biznesowej ani dostępu do danych — tylko UI.
|
||||||
|
|
||||||
|
Strona główna „/" = wprowadzenie danych horoskopu i podgląd policzonych pozycji
|
||||||
|
(do ręcznego testowania aplikacji). Wyszukiwarka sygnifikatorów przeniesiona pod
|
||||||
|
„/significators".
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
from fastapi import FastAPI, Form, Request
|
from fastapi import FastAPI, Form, Request
|
||||||
from fastapi.responses import HTMLResponse
|
from fastapi.responses import HTMLResponse
|
||||||
@@ -19,13 +25,68 @@ templates = Jinja2Templates(directory="app/templates")
|
|||||||
logic = LogicClient()
|
logic = LogicClient()
|
||||||
|
|
||||||
|
|
||||||
|
def _build_utc(date: str, time: str, tz_offset: float) -> tuple[str, str]:
|
||||||
|
"""Z lokalnej daty/godziny + przesunięcia strefy → moment UTC.
|
||||||
|
|
||||||
|
Zwraca (iso_utc, etykieta_czytelna). UTC = czas lokalny − offset.
|
||||||
|
"""
|
||||||
|
local = datetime.fromisoformat(f"{date}T{time}")
|
||||||
|
utc = (local - timedelta(hours=tz_offset)).replace(tzinfo=timezone.utc)
|
||||||
|
label = utc.strftime("%Y-%m-%d %H:%M UTC")
|
||||||
|
return utc.isoformat(), label
|
||||||
|
|
||||||
|
|
||||||
|
def _logic_error(e: Exception) -> str:
|
||||||
|
if isinstance(e, httpx.HTTPStatusError) and e.response.status_code == 404:
|
||||||
|
return (
|
||||||
|
"Warstwa logiczna działa, ale nie ma endpointu /chart/positions. "
|
||||||
|
"Uruchom warstwę logiczną z silnikiem efemeryd (gałąź feat/logic-engine)."
|
||||||
|
)
|
||||||
|
return f"Warstwa logiczna niedostępna: {e}"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------- Horoskop: pozycje (strona główna) ----------------
|
||||||
@app.get("/", response_class=HTMLResponse)
|
@app.get("/", response_class=HTMLResponse)
|
||||||
def index(request: Request):
|
def chart_form(request: Request):
|
||||||
return templates.TemplateResponse(request, "index.html", {"result": None, "form": {}})
|
return templates.TemplateResponse(request, "chart.html", {"result": None, "form": {}})
|
||||||
|
|
||||||
|
|
||||||
@app.post("/", response_class=HTMLResponse)
|
@app.post("/", response_class=HTMLResponse)
|
||||||
def search(
|
def chart_compute(
|
||||||
|
request: Request,
|
||||||
|
date: str = Form(...),
|
||||||
|
time: str = Form(...),
|
||||||
|
tz_offset: float = Form(0.0),
|
||||||
|
lat: float = Form(0.0),
|
||||||
|
lon: float = Form(0.0),
|
||||||
|
house_system: str = Form("whole_sign"),
|
||||||
|
stations: bool = Form(False),
|
||||||
|
):
|
||||||
|
form = {"date": date, "time": time, "tz_offset": tz_offset,
|
||||||
|
"lat": lat, "lon": lon, "house_system": house_system, "stations": stations}
|
||||||
|
ctx: dict = {"form": form, "result": None, "error": None, "moment": None}
|
||||||
|
try:
|
||||||
|
iso_utc, label = _build_utc(date, time, tz_offset)
|
||||||
|
ctx["moment"] = label
|
||||||
|
ctx["result"] = logic.positions(
|
||||||
|
when_utc_iso=iso_utc, lat=lat, lon=lon,
|
||||||
|
house_system=house_system, stations=stations,
|
||||||
|
)
|
||||||
|
except (httpx.HTTPError,) as e:
|
||||||
|
ctx["error"] = _logic_error(e)
|
||||||
|
except ValueError as e:
|
||||||
|
ctx["error"] = f"Niepoprawne dane wejściowe: {e}"
|
||||||
|
return templates.TemplateResponse(request, "chart.html", ctx)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------- Sygnifikatory (wyszukiwarka w bazach) ----------------
|
||||||
|
@app.get("/significators", response_class=HTMLResponse)
|
||||||
|
def significators_form(request: Request):
|
||||||
|
return templates.TemplateResponse(request, "significators.html", {"result": None, "form": {}})
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/significators", response_class=HTMLResponse)
|
||||||
|
def significators_search(
|
||||||
request: Request,
|
request: Request,
|
||||||
query: str = Form(...),
|
query: str = Form(...),
|
||||||
field: str = Form("name"),
|
field: str = Form("name"),
|
||||||
@@ -37,8 +98,38 @@ def search(
|
|||||||
try:
|
try:
|
||||||
ctx["result"] = logic.query(query=query, field=field, exact=exact, limit=limit)
|
ctx["result"] = logic.query(query=query, field=field, exact=exact, limit=limit)
|
||||||
except httpx.HTTPError as e:
|
except httpx.HTTPError as e:
|
||||||
ctx["error"] = f"Warstwa logiczna niedostępna: {e}"
|
ctx["error"] = _logic_error(e)
|
||||||
return templates.TemplateResponse(request, "index.html", ctx)
|
return templates.TemplateResponse(request, "significators.html", ctx)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------- Interpretacje (wynik obliczeń szukany w bazie) ----------------
|
||||||
|
@app.get("/interpret", response_class=HTMLResponse)
|
||||||
|
def interpret_form(request: Request):
|
||||||
|
return templates.TemplateResponse(request, "interpret.html", {"result": None, "form": {}})
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/interpret", response_class=HTMLResponse)
|
||||||
|
def interpret_run(
|
||||||
|
request: Request,
|
||||||
|
date: str = Form(...),
|
||||||
|
time: str = Form(...),
|
||||||
|
tz_offset: float = Form(0.0),
|
||||||
|
lat: float = Form(0.0),
|
||||||
|
lon: float = Form(0.0),
|
||||||
|
group: bool = Form(False),
|
||||||
|
):
|
||||||
|
form = {"date": date, "time": time, "tz_offset": tz_offset,
|
||||||
|
"lat": lat, "lon": lon, "group": group}
|
||||||
|
ctx: dict = {"form": form, "result": None, "error": None, "moment": None}
|
||||||
|
try:
|
||||||
|
iso_utc, label = _build_utc(date, time, tz_offset)
|
||||||
|
ctx["moment"] = label
|
||||||
|
ctx["result"] = logic.report(when_utc_iso=iso_utc, lat=lat, lon=lon, group=group)
|
||||||
|
except httpx.HTTPError as e:
|
||||||
|
ctx["error"] = _logic_error(e)
|
||||||
|
except ValueError as e:
|
||||||
|
ctx["error"] = f"Niepoprawne dane wejściowe: {e}"
|
||||||
|
return templates.TemplateResponse(request, "interpret.html", ctx)
|
||||||
|
|
||||||
|
|
||||||
@app.get("/health")
|
@app.get("/health")
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
// „Tu i teraz": uzupełnia datę/godzinę/strefę z przeglądarki oraz — jeśli to
|
||||||
|
// możliwe — lokalizację (lat/lon).
|
||||||
|
//
|
||||||
|
// UWAGA: geolokalizacja przeglądarki działa tylko w "secure context"
|
||||||
|
// (https:// lub localhost). Na http://<ip> przeglądarka NIE pyta o zgodę,
|
||||||
|
// tylko po cichu odmawia — dlatego pokazujemy jawny komunikat w #geoNote.
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const btn = document.getElementById('nowBtn');
|
||||||
|
if (!btn) return;
|
||||||
|
|
||||||
|
const note = document.getElementById('geoNote');
|
||||||
|
const say = msg => { if (note) note.textContent = msg; };
|
||||||
|
|
||||||
|
btn.addEventListener('click', function () {
|
||||||
|
const d = new Date();
|
||||||
|
const pad = n => String(n).padStart(2, '0');
|
||||||
|
document.querySelector('input[name=date]').value =
|
||||||
|
d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate());
|
||||||
|
document.querySelector('input[name=time]').value = pad(d.getHours()) + ':' + pad(d.getMinutes());
|
||||||
|
document.querySelector('input[name=tz_offset]').value = (-d.getTimezoneOffset() / 60);
|
||||||
|
|
||||||
|
if (!('geolocation' in navigator)) {
|
||||||
|
say('Ta przeglądarka nie udostępnia geolokalizacji — wpisz lat/lon ręcznie.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!window.isSecureContext) {
|
||||||
|
say('Lokalizacja z przeglądarki wymaga HTTPS lub localhost (otwarto przez http://) — wpisz lat/lon ręcznie.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
say('Pobieram lokalizację…');
|
||||||
|
navigator.geolocation.getCurrentPosition(
|
||||||
|
function (pos) {
|
||||||
|
document.querySelector('input[name=lat]').value = pos.coords.latitude.toFixed(4);
|
||||||
|
document.querySelector('input[name=lon]').value = pos.coords.longitude.toFixed(4);
|
||||||
|
say('Lokalizacja pobrana ✓');
|
||||||
|
},
|
||||||
|
function (err) {
|
||||||
|
say('Nie udało się pobrać lokalizacji: ' + (err && err.message ? err.message : 'odmowa dostępu'));
|
||||||
|
},
|
||||||
|
{ timeout: 8000 }
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -15,6 +15,23 @@ body {
|
|||||||
main { width: 100%; max-width: 880px; }
|
main { width: 100%; max-width: 880px; }
|
||||||
h1 { margin: 0; font-size: 2rem; letter-spacing: .5px; }
|
h1 { margin: 0; font-size: 2rem; letter-spacing: .5px; }
|
||||||
.sub { color: var(--muted); margin: .25rem 0 2rem; }
|
.sub { color: var(--muted); margin: .25rem 0 2rem; }
|
||||||
|
|
||||||
|
.topbar { display: flex; align-items: baseline; justify-content: space-between; gap: 1rem; flex-wrap: wrap; margin-bottom: .25rem; }
|
||||||
|
.topbar nav { display: flex; gap: .25rem; }
|
||||||
|
.topbar nav a { color: var(--muted); text-decoration: none; padding: .4rem .8rem; border-radius: 8px; border: 1px solid transparent; }
|
||||||
|
.topbar nav a:hover { color: var(--ink); }
|
||||||
|
.topbar nav a.active { color: #fff; background: var(--panel); border-color: var(--line); }
|
||||||
|
.foot { color: var(--muted); font-size: .8rem; margin-top: 2.5rem; opacity: .7; }
|
||||||
|
|
||||||
|
.grid { display: flex; gap: .6rem; flex-wrap: wrap; }
|
||||||
|
.grid label { display: flex; flex-direction: column; gap: .25rem; color: var(--muted); font-size: .85rem; flex: 1; min-width: 9rem; }
|
||||||
|
.grid input { width: 100%; }
|
||||||
|
.loc { margin-top: .8rem; }
|
||||||
|
.loc summary { color: var(--muted); cursor: pointer; font-size: .85rem; margin-bottom: .6rem; }
|
||||||
|
.actions { display: flex; gap: .5rem; margin-top: 1rem; }
|
||||||
|
button.ghost { background: transparent; color: var(--accent); border: 1px solid var(--line); }
|
||||||
|
.mono { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: .92em; }
|
||||||
|
td.retro { color: #ff9b6a; font-weight: 600; }
|
||||||
form { background: var(--panel); border: 1px solid var(--line); border-radius: 12px; padding: 1.25rem; }
|
form { background: var(--panel); border: 1px solid var(--line); border-radius: 12px; padding: 1.25rem; }
|
||||||
.row { display: flex; gap: .5rem; }
|
.row { display: flex; gap: .5rem; }
|
||||||
.row input[type=text] { flex: 1; }
|
.row input[type=text] { flex: 1; }
|
||||||
@@ -33,3 +50,17 @@ table { width: 100%; border-collapse: collapse; margin-top: .5rem; background: v
|
|||||||
th, td { text-align: left; padding: .6rem .8rem; border-bottom: 1px solid var(--line); }
|
th, td { text-align: left; padding: .6rem .8rem; border-bottom: 1px solid var(--line); }
|
||||||
th { color: var(--accent); font-size: .8rem; text-transform: uppercase; letter-spacing: .5px; }
|
th { color: var(--accent); font-size: .8rem; text-transform: uppercase; letter-spacing: .5px; }
|
||||||
tr:last-child td { border-bottom: none; }
|
tr:last-child td { border-bottom: none; }
|
||||||
|
|
||||||
|
.muted { color: var(--muted); }
|
||||||
|
.small { font-size: .85rem; }
|
||||||
|
.nowrap { white-space: nowrap; }
|
||||||
|
.sig-item { margin-top: 1.25rem; }
|
||||||
|
.sig-head { padding: .5rem 0; }
|
||||||
|
.samples { margin-top: .3rem; }
|
||||||
|
.samples td { font-size: .92rem; vertical-align: top; }
|
||||||
|
.samples td.nowrap { color: var(--accent); padding-right: 1rem; }
|
||||||
|
.facet { margin: .4rem 0 .6rem 1rem; }
|
||||||
|
.facet-head { color: var(--ink); font-size: .9rem; }
|
||||||
|
.badge { display: inline-block; font-size: .72rem; padding: .05rem .4rem; border-radius: 6px;
|
||||||
|
background: #2a2d4a; color: var(--accent); margin-left: .3rem; }
|
||||||
|
.samples td.sig { color: var(--accent); padding-right: 1rem; cursor: help; }
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="pl">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>astrololo · {% block title %}{% endblock %}</title>
|
||||||
|
<link rel="stylesheet" href="/static/styles.css">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<main>
|
||||||
|
<header class="topbar">
|
||||||
|
<h1>astrololo</h1>
|
||||||
|
<nav>
|
||||||
|
<a href="/" class="{% block nav_chart %}{% endblock %}">Horoskop</a>
|
||||||
|
<a href="/interpret" class="{% block nav_interp %}{% endblock %}">Interpretacje</a>
|
||||||
|
<a href="/significators" class="{% block nav_sig %}{% endblock %}">Sygnifikatory</a>
|
||||||
|
</nav>
|
||||||
|
</header>
|
||||||
|
{% block content %}{% endblock %}
|
||||||
|
<footer class="foot">
|
||||||
|
prezentacja → logika → dane · widok testowy
|
||||||
|
</footer>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% block title %}Horoskop{% endblock %}
|
||||||
|
{% block nav_chart %}active{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<p class="sub">Wpisz dane momentu i miejsca — program policzy pozycje obiektów, osie i domy (silnik efemeryd warstwy logicznej).</p>
|
||||||
|
|
||||||
|
<form method="post" action="/">
|
||||||
|
<div class="grid">
|
||||||
|
<label>Data
|
||||||
|
<input type="date" name="date" value="{{ form.date or '' }}" required>
|
||||||
|
</label>
|
||||||
|
<label>Godzina (lokalna)
|
||||||
|
<input type="time" name="time" value="{{ form.time or '' }}" required>
|
||||||
|
</label>
|
||||||
|
<label>Strefa (offset h)
|
||||||
|
<input type="number" name="tz_offset" step="0.25" value="{{ form.tz_offset if form.tz_offset is not none else 0 }}">
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="grid">
|
||||||
|
<label>Szerokość (lat, + N)
|
||||||
|
<input type="number" name="lat" step="0.0001" value="{{ form.lat if form.lat is not none else 0 }}">
|
||||||
|
</label>
|
||||||
|
<label>Długość (lon, + E)
|
||||||
|
<input type="number" name="lon" step="0.0001" value="{{ form.lon if form.lon is not none else 0 }}">
|
||||||
|
</label>
|
||||||
|
<label>System domów
|
||||||
|
<select name="house_system">
|
||||||
|
{% set hs = form.house_system or 'whole_sign' %}
|
||||||
|
<option value="whole_sign" {{ 'selected' if hs == 'whole_sign' else '' }}>Whole Sign</option>
|
||||||
|
<option value="equal" {{ 'selected' if hs == 'equal' else '' }}>Equal</option>
|
||||||
|
<option value="porphyry" {{ 'selected' if hs == 'porphyry' else '' }}>Porphyry</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="opts">
|
||||||
|
<label><input type="checkbox" name="stations" value="true" {{ 'checked' if form.stations else '' }}>
|
||||||
|
licz stacje planet (wolniejsze)</label>
|
||||||
|
</div>
|
||||||
|
<div class="actions">
|
||||||
|
<button type="button" id="nowBtn" class="ghost">Tu i teraz</button>
|
||||||
|
<button type="submit">Policz horoskop</button>
|
||||||
|
<span id="geoNote" class="muted small"></span>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{% if error %}
|
||||||
|
<div class="error">{{ error }}</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if result %}
|
||||||
|
<div class="meta">
|
||||||
|
Silnik: <strong>{{ result.engine }}</strong> ·
|
||||||
|
obiektów: {{ result.positions | length }}
|
||||||
|
{% if result.house_system %}· domy: {{ result.house_system }}{% endif %}
|
||||||
|
{% if moment %}· moment: {{ moment }}{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if result.angles %}
|
||||||
|
<table class="angles">
|
||||||
|
<thead><tr><th>Oś</th><th>Znak</th><th>W znaku</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
{% for key in ["Asc", "MC", "Dsc", "IC"] %}
|
||||||
|
{% set a = result.angles[key] %}
|
||||||
|
<tr><td>{{ a.name }}</td><td>{{ a.sign }}</td><td class="mono">{{ a.in_sign }}</td></tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Obiekt</th><th>Znak</th><th>W znaku</th><th>Dom</th><th>Kier.</th><th>Prędkość °/d</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for p in result.positions %}
|
||||||
|
<tr>
|
||||||
|
<td>{{ p.name }}</td>
|
||||||
|
<td>{{ p.sign }}</td>
|
||||||
|
<td class="mono">{{ p.in_sign }}</td>
|
||||||
|
<td>{{ p.house if p.house is defined else '—' }}</td>
|
||||||
|
<td class="{{ 'retro' if p.direction == 'Rx' else '' }}">{{ p.direction }}</td>
|
||||||
|
<td class="mono">{{ '%+.4f' | format(p.speed) }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
{% set with_stations = result.positions | selectattr('stations', 'defined') | list %}
|
||||||
|
{% if with_stations %}
|
||||||
|
<div class="meta">Stacje planet (poprzednia / następna; <span class="badge">blisko</span> = mniej niż 7 dni)</div>
|
||||||
|
<table class="angles">
|
||||||
|
<thead><tr><th>Planeta</th><th>Poprzednia</th><th>Następna</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
{% for p in with_stations %}
|
||||||
|
<tr>
|
||||||
|
<td>{{ p.name }}{% if p.stations.station_soon %} <span class="badge">blisko</span>{% endif %}</td>
|
||||||
|
<td class="mono">{% if p.stations.prev %}{{ p.stations.prev.type }} · {{ p.stations.prev.date }} · {{ p.stations.prev.degree }} ({{ p.stations.prev.days }} d){% else %}—{% endif %}</td>
|
||||||
|
<td class="mono">{% if p.stations.next %}{{ p.stations.next.type }} · {{ p.stations.next.date }} · {{ p.stations.next.degree }} (+{{ p.stations.next.days }} d){% else %}—{% endif %}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if result.aspects %}
|
||||||
|
<div class="meta">Aspekty główne ({{ result.aspects | length }})</div>
|
||||||
|
<table class="angles">
|
||||||
|
<thead><tr><th>Obiekt 1</th><th>Aspekt</th><th>Obiekt 2</th><th>Orb</th><th title="A = aplikacyjny (dokładność nastąpi), S = separacyjny (już minęła)">A/S</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
{% for a in result.aspects %}
|
||||||
|
<tr><td>{{ a.obj1 }}</td><td>{{ a.aspect }}</td><td>{{ a.obj2 }}</td><td class="mono">{{ '%.2f'|format(a.orb) }}°</td><td>{{ a['as'] if a['as'] is defined else '—' }}</td></tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if result.cusps %}
|
||||||
|
<details class="loc">
|
||||||
|
<summary>Cusps domów ({{ result.house_system }})</summary>
|
||||||
|
<table>
|
||||||
|
<thead><tr><th>Dom</th><th>Znak</th><th>Cusp</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
{% for c in result.cusps %}
|
||||||
|
<tr><td>{{ c.house }}</td><td>{{ c.sign }}</td><td class="mono">{{ c.in_sign }}</td></tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</details>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<script src="/static/now.js"></script>
|
||||||
|
{% endblock %}
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="pl">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<title>astrololo</title>
|
|
||||||
<link rel="stylesheet" href="/static/styles.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<main>
|
|
||||||
<h1>astrololo</h1>
|
|
||||||
<p class="sub">Warstwa prezentacji → logiczna → bazodanowa</p>
|
|
||||||
|
|
||||||
<form method="post" action="/">
|
|
||||||
<div class="row">
|
|
||||||
<input type="text" name="query" placeholder="Szukana fraza…"
|
|
||||||
value="{{ form.query or '' }}" autofocus required>
|
|
||||||
<select name="field">
|
|
||||||
{% for f in ["name", "id", "symbol", "category", "value"] %}
|
|
||||||
<option value="{{ f }}" {{ 'selected' if form.field == f else '' }}>{{ f }}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
<button type="submit">Szukaj</button>
|
|
||||||
</div>
|
|
||||||
<div class="opts">
|
|
||||||
<label><input type="checkbox" name="exact" value="true"
|
|
||||||
{{ 'checked' if form.exact else '' }}> dokładne</label>
|
|
||||||
<label>limit
|
|
||||||
<input type="number" name="limit" min="1" max="200" value="{{ form.limit or 25 }}">
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
{% if error %}
|
|
||||||
<div class="error">{{ error }}</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if result %}
|
|
||||||
<div class="meta">
|
|
||||||
Znaleziono <strong>{{ result.count }}</strong> ·
|
|
||||||
provider: {{ result.meta.data_provider }} ·
|
|
||||||
cache: {{ result.meta.data_cache }} ·
|
|
||||||
{{ result.meta.data_elapsed_ms }} ms
|
|
||||||
</div>
|
|
||||||
{% if result.results %}
|
|
||||||
<table>
|
|
||||||
<thead>
|
|
||||||
<tr>{% for col in result.results[0].keys() %}<th>{{ col }}</th>{% endfor %}</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{% for row in result.results %}
|
|
||||||
<tr>{% for v in row.values() %}<td>{{ v }}</td>{% endfor %}</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
{% else %}
|
|
||||||
<p class="empty">Brak wyników.</p>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</main>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% block title %}Interpretacje{% endblock %}
|
||||||
|
{% block nav_interp %}active{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<p class="sub">Program policzy horoskop i wyszuka w bazie interpretacje pasujące do obliczeń (pierwsza wersja: planeta w swoim znaku).</p>
|
||||||
|
|
||||||
|
<form method="post" action="/interpret">
|
||||||
|
<div class="grid">
|
||||||
|
<label>Data
|
||||||
|
<input type="date" name="date" value="{{ form.date or '' }}" required>
|
||||||
|
</label>
|
||||||
|
<label>Godzina (lokalna)
|
||||||
|
<input type="time" name="time" value="{{ form.time or '' }}" required>
|
||||||
|
</label>
|
||||||
|
<label>Strefa (offset h)
|
||||||
|
<input type="number" name="tz_offset" step="0.25" value="{{ form.tz_offset if form.tz_offset is not none else 0 }}">
|
||||||
|
</label>
|
||||||
|
<label>Szerokość (lat)
|
||||||
|
<input type="number" name="lat" step="0.0001" value="{{ form.lat if form.lat is not none else 0 }}">
|
||||||
|
</label>
|
||||||
|
<label>Długość (lon)
|
||||||
|
<input type="number" name="lon" step="0.0001" value="{{ form.lon if form.lon is not none else 0 }}">
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="opts">
|
||||||
|
<label><input type="checkbox" name="group" value="true" {{ 'checked' if form.group else '' }}> grupuj identyczne opisy</label>
|
||||||
|
</div>
|
||||||
|
<div class="actions">
|
||||||
|
<button type="button" id="nowBtn" class="ghost">Tu i teraz</button>
|
||||||
|
<button type="submit">Szukaj interpretacji</button>
|
||||||
|
<span id="geoNote" class="muted small"></span>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{% if error %}<div class="error">{{ error }}</div>{% endif %}
|
||||||
|
|
||||||
|
{% if result %}
|
||||||
|
{% if result.data_error %}
|
||||||
|
<div class="error">{{ result.data_error }}</div>
|
||||||
|
{% endif %}
|
||||||
|
<div class="meta">
|
||||||
|
Silnik: <strong>{{ result.engine }}</strong>
|
||||||
|
{% if result.provider %}· baza: {{ result.provider }}{% endif %}
|
||||||
|
{% if moment %}· moment: {{ moment }}{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% for o in result.objects %}
|
||||||
|
<div class="sig-item">
|
||||||
|
<div class="sig-head">
|
||||||
|
<strong>{{ o.object }}</strong> w <strong>{{ o.sign }}</strong>{% if o.house %}, {{ o.house }}. dom{% endif %}
|
||||||
|
<span class="{{ 'retro' if o.direction == 'Rx' else '' }}">{{ o.direction }}</span>
|
||||||
|
<span class="muted small">(planeta {{ o.planet_token }}: {{ o.planet_total }} rekordów)</span>
|
||||||
|
</div>
|
||||||
|
{% for f in o.facets %}
|
||||||
|
<div class="facet">
|
||||||
|
<div class="facet-head">{{ f.label }} — <strong>{{ f.count }}</strong> dopasowań
|
||||||
|
<span class="badge" title="siła (LOG-21)">siła {{ f.score }}</span>
|
||||||
|
<span class="muted small">[{{ f.token }}]</span></div>
|
||||||
|
{% if f.groups %}
|
||||||
|
<table class="samples">
|
||||||
|
<tbody>
|
||||||
|
{% for g in f.groups %}
|
||||||
|
<tr>
|
||||||
|
<td>{{ g.effect }}{% if g.count > 1 %} <span class="badge">×{{ g.count }}</span>{% endif %}</td>
|
||||||
|
<td class="sig small">{{ g.significators | join('; ') }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% elif f.samples %}
|
||||||
|
<table class="samples">
|
||||||
|
<tbody>
|
||||||
|
{% for s in f.samples %}
|
||||||
|
<tr><td class="sig nowrap" title="{{ s.significator }}">{{ s.expanded }}</td><td>{{ s.effect }}</td></tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<script src="/static/now.js"></script>
|
||||||
|
{% endblock %}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% block title %}Sygnifikatory{% endblock %}
|
||||||
|
{% block nav_sig %}active{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<p class="sub">Wyszukiwanie w bazach interpretacji (warstwa danych). Wymaga wgranych baz.</p>
|
||||||
|
|
||||||
|
<form method="post" action="/significators">
|
||||||
|
<div class="row">
|
||||||
|
<input type="text" name="query" placeholder="Szukana fraza…"
|
||||||
|
value="{{ form.query or '' }}" autofocus required>
|
||||||
|
<select name="field">
|
||||||
|
{% for f in ["name", "id", "symbol", "category", "value"] %}
|
||||||
|
<option value="{{ f }}" {{ 'selected' if form.field == f else '' }}>{{ f }}</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
<button type="submit">Szukaj</button>
|
||||||
|
</div>
|
||||||
|
<div class="opts">
|
||||||
|
<label><input type="checkbox" name="exact" value="true"
|
||||||
|
{{ 'checked' if form.exact else '' }}> dokładne</label>
|
||||||
|
<label>limit
|
||||||
|
<input type="number" name="limit" min="1" max="200" value="{{ form.limit or 25 }}">
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{% if error %}
|
||||||
|
<div class="error">{{ error }}</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if result %}
|
||||||
|
<div class="meta">
|
||||||
|
Znaleziono <strong>{{ result.count }}</strong> ·
|
||||||
|
provider: {{ result.meta.data_provider }} ·
|
||||||
|
cache: {{ result.meta.data_cache }} ·
|
||||||
|
{{ result.meta.data_elapsed_ms }} ms
|
||||||
|
</div>
|
||||||
|
{% if result.results %}
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>{% for col in result.results[0].keys() %}<th>{{ col }}</th>{% endfor %}</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for row in result.results %}
|
||||||
|
<tr>{% for v in row.values() %}<td>{{ v }}</td>{% endfor %}</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% else %}
|
||||||
|
<p class="empty">Brak wyników.</p>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
Reference in New Issue
Block a user