kerykeion 5.0.0a12__py3-none-any.whl → 5.0.0b1__py3-none-any.whl

kerykeion/settings/kr.config.json

@@ -87,6 +87,15 @@
             "perspective_type": "Perspective",
             "location": "Location",
             "day_of_week": "Day of Week",
+            "weekdays": {
+                "Monday": "Monday",
+                "Tuesday": "Tuesday",
+                "Wednesday": "Wednesday",
+                "Thursday": "Thursday",
+                "Friday": "Friday",
+                "Saturday": "Saturday",
+                "Sunday": "Sunday"
+            },
             "elements": "Elements",
             "qualities": "Qualities",
             "cardinal": "Cardinal",
@@ -108,12 +117,12 @@
                 "Medium_Coeli": "Mc",
                 "Descendant": "Dsc",
                 "Imum_Coeli": "Ic",
-                "True_Node": "N. Node (T)",
-                "Mean_Node": "N. Node (M)",
+                "True_North_Lunar_Node": "N. Node (T)",
+                "Mean_North_Lunar_Node": "N. Node (M)",
                 "Chiron": "Chiron",
                 "Mean_Lilith": "Lilith",
-                "True_South_Node": "S. Node (T)",
-                "Mean_South_Node": "S. Node (M)",
+                "True_South_Lunar_Node": "S. Node (T)",
+                "Mean_South_Lunar_Node": "S. Node (M)",
                 "True_Lilith": "Lilith (T)",
                 "Earth": "Earth",
                 "Pholus": "Pholus",
@@ -225,6 +234,15 @@
             "perspective_type": "Perspective",
             "location": "Lieu",
             "day_of_week": "Jour de la semaine",
+            "weekdays": {
+                "Monday": "Lundi",
+                "Tuesday": "Mardi",
+                "Wednesday": "Mercredi",
+                "Thursday": "Jeudi",
+                "Friday": "Vendredi",
+                "Saturday": "Samedi",
+                "Sunday": "Dimanche"
+            },
             "elements": "Éléments",
             "qualities": "Qualités",
             "cardinal": "Cardinal",
@@ -246,10 +264,10 @@
                 "Medium_Coeli": "Mc",
                 "Descendant": "Dsc",
                 "Imum_Coeli": "Ic",
-                "True_Node": "Nœud N. (V)",
-                "Mean_Node": "Nœud N. (M)",
-                "True_South_Node": "Nœud S. (V)",
-                "Mean_South_Node": "Nœud S. (M)",
+                "True_North_Lunar_Node": "Nœud N. (V)",
+                "Mean_North_Lunar_Node": "Nœud N. (M)",
+                "True_South_Lunar_Node": "Nœud S. (V)",
+                "Mean_South_Lunar_Node": "Nœud S. (M)",
                 "Chiron": "Chiron",
                 "Mean_Lilith": "Lilith",
                 "True_Lilith": "Lilith (V)",
@@ -363,6 +381,15 @@
             "perspective_type": "Perspectiva",
             "location": "Localização",
             "day_of_week": "Dia da semana",
+            "weekdays": {
+                "Monday": "Segunda",
+                "Tuesday": "Terça",
+                "Wednesday": "Quarta",
+                "Thursday": "Quinta",
+                "Friday": "Sexta",
+                "Saturday": "Sábado",
+                "Sunday": "Domingo"
+            },
             "elements": "Elementos",
             "qualities": "Qualidades",
             "cardinal": "Cardinal",
@@ -384,10 +411,10 @@
                 "Medium_Coeli": "Mc",
                 "Descendant": "Dsc",
                 "Imum_Coeli": "Ic",
-                "True_Node": "Nodo N. (V)",
-                "Mean_Node": "Nodo N. (M)",
-                "True_South_Node": "Nodo S. (V)",
-                "Mean_South_Node": "Nodo S. (M)",
+                "True_North_Lunar_Node": "Nodo N. (V)",
+                "Mean_North_Lunar_Node": "Nodo N. (M)",
+                "True_South_Lunar_Node": "Nodo S. (V)",
+                "Mean_South_Lunar_Node": "Nodo S. (M)",
                 "Chiron": "Quíron",
                 "Mean_Lilith": "Lilith",
                 "True_Lilith": "Lilith (V)",
@@ -501,6 +528,15 @@
             "perspective_type": "Prospettiva",
             "location": "Località",
             "day_of_week": "Giorno della settimana",
+            "weekdays": {
+                "Monday": "Lunedì",
+                "Tuesday": "Martedì",
+                "Wednesday": "Mercoledì",
+                "Thursday": "Giovedì",
+                "Friday": "Venerdì",
+                "Saturday": "Sabato",
+                "Sunday": "Domenica"
+            },
             "elements": "Elementi",
             "qualities": "Qualità",
             "cardinal": "Cardinale",
@@ -522,10 +558,10 @@
                 "Medium_Coeli": "Mc",
                 "Descendant": "Dsc",
                 "Imum_Coeli": "Ic",
-                "True_Node": "Nodo N. (V)",
-                "Mean_Node": "Nodo N. (M)",
-                "True_South_Node": "Nodo S. (V)",
-                "Mean_South_Node": "Nodo S. (M)",
+                "True_North_Lunar_Node": "Nodo N. (V)",
+                "Mean_North_Lunar_Node": "Nodo N. (M)",
+                "True_South_Lunar_Node": "Nodo S. (V)",
+                "Mean_South_Lunar_Node": "Nodo S. (M)",
                 "Chiron": "Chirone",
                 "Mean_Lilith": "Lilith",
                 "True_Lilith": "Lilith (V)",
@@ -639,6 +675,15 @@
             "perspective_type": "视角",
             "location": "位置",
             "day_of_week": "星期",
+            "weekdays": {
+                "Monday": "星期一",
+                "Tuesday": "星期二",
+                "Wednesday": "星期三",
+                "Thursday": "星期四",
+                "Friday": "星期五",
+                "Saturday": "星期六",
+                "Sunday": "星期日"
+            },
             "elements": "元素",
             "qualities": "性质",
             "cardinal": "本位",
@@ -660,10 +705,10 @@
                 "Medium_Coeli": "上中天",
                 "Descendant": "下降點",
                 "Imum_Coeli": "下中天",
-                "True_Node": "真北交点",
-                "Mean_Node": "平均北交点",
-                "True_South_Node": "真南交点",
-                "Mean_South_Node": "平均南交点",
+                "True_North_Lunar_Node": "真北交点",
+                "Mean_North_Lunar_Node": "平均北交点",
+                "True_South_Lunar_Node": "真南交点",
+                "Mean_South_Lunar_Node": "平均南交点",
                 "Chiron": "凱龍星",
                 "Mean_Lilith": "黑月亮",
                 "True_Lilith": "真黑月亮",
@@ -777,6 +822,15 @@
             "perspective_type": "Perspectiva",
             "location": "Ubicación",
             "day_of_week": "Día de la semana",
+            "weekdays": {
+                "Monday": "Lunes",
+                "Tuesday": "Martes",
+                "Wednesday": "Miércoles",
+                "Thursday": "Jueves",
+                "Friday": "Viernes",
+                "Saturday": "Sábado",
+                "Sunday": "Domingo"
+            },
             "elements": "Elementos",
             "qualities": "Cualidades",
             "cardinal": "Cardinal",
@@ -798,10 +852,10 @@
                 "Medium_Coeli": "Mc",
                 "Descendant": "Dsc",
                 "Imum_Coeli": "Ic",
-                "True_Node": "Nodo N. (V)",
-                "Mean_Node": "Nodo N. (M)",
-                "True_South_Node": "Nodo S. (V)",
-                "Mean_South_Node": "Nodo S. (M)",
+                "True_North_Lunar_Node": "Nodo N. (V)",
+                "Mean_North_Lunar_Node": "Nodo N. (M)",
+                "True_South_Lunar_Node": "Nodo S. (V)",
+                "Mean_South_Lunar_Node": "Nodo S. (M)",
                 "Chiron": "Quirón",
                 "Mean_Lilith": "Lilith",
                 "True_Lilith": "Lilith (V)",
@@ -915,6 +969,15 @@
             "perspective_type": "Перспектива",
             "location": "Местоположение",
             "day_of_week": "День недели",
+            "weekdays": {
+                "Monday": "Понедельник",
+                "Tuesday": "Вторник",
+                "Wednesday": "Среда",
+                "Thursday": "Четверг",
+                "Friday": "Пятница",
+                "Saturday": "Суббота",
+                "Sunday": "Воскресенье"
+            },
             "elements": "Стихии",
             "qualities": "Качества",
             "cardinal": "Кардинальный",
@@ -936,10 +999,10 @@
                 "Medium_Coeli": "MC",
                 "Descendant": "ДСЦ",
                 "Imum_Coeli": "IC",
-                "True_Node": "С. Узел (И)",
-                "Mean_Node": "С. Узел (С)",
-                "True_South_Node": "Ю. Узел (И)",
-                "Mean_South_Node": "Ю. Узел (С)",
+                "True_North_Lunar_Node": "С. Узел (И)",
+                "Mean_North_Lunar_Node": "С. Узел (С)",
+                "True_South_Lunar_Node": "Ю. Узел (И)",
+                "Mean_South_Lunar_Node": "Ю. Узел (С)",
                 "Chiron": "Хирон",
                 "Mean_Lilith": "Лилит",
                 "True_Lilith": "Лилит (И)",
@@ -1053,6 +1116,15 @@
             "perspective_type": "Perspektif",
             "location": "Konum",
             "day_of_week": "Haftanın günü",
+            "weekdays": {
+                "Monday": "Pazartesi",
+                "Tuesday": "Salı",
+                "Wednesday": "Çarşamba",
+                "Thursday": "Perşembe",
+                "Friday": "Cuma",
+                "Saturday": "Cumartesi",
+                "Sunday": "Pazar"
+            },
             "elements": "Elementler",
             "qualities": "Nitelikler",
             "cardinal": "Kardinal",
@@ -1074,12 +1146,12 @@
                 "Medium_Coeli": "MC",
                 "Descendant": "İK",
                 "Imum_Coeli": "IC",
-                "True_Node": "K. Düğümü (T)",
-                "Mean_Node": "K. Düğümü (M)",
+                "True_North_Lunar_Node": "K. Düğümü (T)",
+                "Mean_North_Lunar_Node": "K. Düğümü (M)",
                 "Chiron": "Kiron",
                 "Mean_Lilith": "Lilith",
-                "True_South_Node": "G. Düğümü (T)",
-                "Mean_South_Node": "G. Düğümü (M)",
+                "True_South_Lunar_Node": "G. Düğümü (T)",
+                "Mean_South_Lunar_Node": "G. Düğümü (M)",
                 "True_Lilith": "Lilith (T)",
                 "Earth": "Dünya",
                 "Pholus": "Pholus",
@@ -1191,6 +1263,15 @@
             "perspective_type": "Perspektive",
             "location": "Ort",
             "day_of_week": "Wochentag",
+            "weekdays": {
+                "Monday": "Montag",
+                "Tuesday": "Dienstag",
+                "Wednesday": "Mittwoch",
+                "Thursday": "Donnerstag",
+                "Friday": "Freitag",
+                "Saturday": "Samstag",
+                "Sunday": "Sonntag"
+            },
             "elements": "Elemente",
             "qualities": "Qualitäten",
             "cardinal": "Kardinal",
@@ -1212,10 +1293,10 @@
                 "Medium_Coeli": "MC",
                 "Descendant": "DSC",
                 "Imum_Coeli": "IC",
-                "True_Node": "Nordknoten (T)",
-                "Mean_Node": "Nordknoten (M)",
-                "True_South_Node": "Südknoten (T)",
-                "Mean_South_Node": "Südknoten (M)",
+                "True_North_Lunar_Node": "Nordknoten (T)",
+                "Mean_North_Lunar_Node": "Nordknoten (M)",
+                "True_South_Lunar_Node": "Südknoten (T)",
+                "Mean_South_Lunar_Node": "Südknoten (M)",
                 "Chiron": "Chiron",
                 "Mean_Lilith": "Lilith",
                 "True_Lilith": "Lilith (T)",
@@ -1329,6 +1410,15 @@
             "perspective_type": "दृष्टिकोण",
             "location": "स्थान",
             "day_of_week": "सप्ताह का दिन",
+            "weekdays": {
+                "Monday": "सोमवार",
+                "Tuesday": "मंगलवार",
+                "Wednesday": "बुधवार",
+                "Thursday": "गुरुवार",
+                "Friday": "शुक्रवार",
+                "Saturday": "शनिवार",
+                "Sunday": "रविवार"
+            },
             "elements": "तत्व",
             "qualities": "गुण",
             "cardinal": "चल",
@@ -1350,10 +1440,10 @@
                 "Medium_Coeli": "एमसी",
                 "Descendant": "डीएससी",
                 "Imum_Coeli": "आईसी",
-                "True_Node": "उत्तर नोड (T)",
-                "Mean_Node": "उत्तर नोड (M)",
-                "True_South_Node": "दक्षिण नोड (T)",
-                "Mean_South_Node": "दक्षिण नोड (M)",
+                "True_North_Lunar_Node": "उत्तर नोड (T)",
+                "Mean_North_Lunar_Node": "उत्तर नोड (M)",
+                "True_South_Lunar_Node": "दक्षिण नोड (T)",
+                "Mean_South_Lunar_Node": "दक्षिण नोड (M)",
                 "Chiron": "किरोन",
                 "Mean_Lilith": "लिलिथ",
                 "True_Lilith": "लिलिथ (T)",

kerykeion/settings/legacy/legacy_celestial_points_settings.py

@@ -74,17 +74,17 @@ DEFAULT_CELESTIAL_POINTS_SETTINGS = [
     },
     {
       "id": 10,
-      "name": "Mean_Node",
+      "name": "Mean_North_Lunar_Node",
       "color": "var(--kerykeion-chart-color-mean-node)",
       "element_points": 0,
-      "label": "Mean_Node"
+      "label": "Mean_North_Lunar_Node"
     },
     {
       "id": 11,
-      "name": "True_Node",
+      "name": "True_North_Lunar_Node",
       "color": "var(--kerykeion-chart-color-true-node)",
       "element_points": 0,
-      "label": "True_Node"
+      "label": "True_North_Lunar_Node"
     },
     {
       "id": 12,
@@ -130,17 +130,17 @@ DEFAULT_CELESTIAL_POINTS_SETTINGS = [
     },
     {
       "id": 18,
-      "name": "Mean_South_Node",
+      "name": "Mean_South_Lunar_Node",
       "color": "var(--kerykeion-chart-color-mean-node)",
       "element_points": 0,
-      "label": "Mean_South_Node"
+      "label": "Mean_South_Lunar_Node"
     },
     {
       "id": 19,
-      "name": "True_South_Node",
+      "name": "True_South_Lunar_Node",
       "color": "var(--kerykeion-chart-color-true-node)",
       "element_points": 0,
-      "label": "True_South_Node"
+      "label": "True_South_Lunar_Node"
     },
     {
       "id": 20,

kerykeion/transits_time_range_factory.py

@@ -24,7 +24,7 @@ Dependencies:
     - kerykeion.AstrologicalSubjectFactory: For creating astrological subjects
     - kerykeion.aspects.AspectsFactory: For calculating angular relationships
     - kerykeion.ephemeris_data_factory: For generating time-series planetary positions
-    - kerykeion.kr_types: For type definitions and model structures
+    - kerykeion.schemas: For type definitions and model structures
     - datetime: For date/time handling
 
 Example:
@@ -57,13 +57,13 @@ License: AGPL-3.0
 
 from typing import Union, List
 from datetime import datetime, timedelta
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
+from kerykeion.schemas.kr_models import AstrologicalSubjectModel
 from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 from kerykeion.aspects import AspectsFactory
 from kerykeion.ephemeris_data_factory import EphemerisDataFactory
-from kerykeion.kr_types.kr_literals import AstrologicalPoint
-from kerykeion.kr_types.kr_models import ActiveAspect, TransitMomentModel, TransitsTimeRangeModel
-from kerykeion.kr_types.settings_models import KerykeionSettingsModel
+from kerykeion.schemas.kr_literals import AstrologicalPoint
+from kerykeion.schemas.kr_models import ActiveAspect, TransitMomentModel, TransitsTimeRangeModel
+from kerykeion.schemas.settings_models import KerykeionSettingsModel
 from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
 from pathlib import Path
 
@@ -115,8 +115,8 @@ class TransitsTimeRangeFactory:
 
         Custom configuration:
 
-        >>> from kerykeion.kr_types import AstrologicalPoint, ActiveAspect
-        >>> custom_points = [AstrologicalPoint.SUN, AstrologicalPoint.MOON]
+        >>> from kerykeion.schemas import AstrologicalPoint, ActiveAspect
+        >>> custom_points = ["Sun", "Moon"]
         >>> custom_aspects = [ActiveAspect.CONJUNCTION, ActiveAspect.OPPOSITION]
         >>> factory = TransitsTimeRangeFactory(
         ...     natal_chart, ephemeris_data,

kerykeion/utilities.py

@@ -4,7 +4,7 @@ Copyright: (C) 2025 Kerykeion Project
 License: AGPL-3.0
 """
 
-from kerykeion.kr_types import (
+from kerykeion.schemas import (
     KerykeionPointModel,
     KerykeionException,
     ZodiacSignModel,
@@ -13,16 +13,13 @@ from kerykeion.kr_types import (
     CompositeSubjectModel,
     PlanetReturnModel,
 )
-from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, AstrologicalPoint, Houses
-from typing import Union, get_args, TYPE_CHECKING
+from kerykeion.schemas.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, AstrologicalPoint, Houses
+from typing import Union, Optional, get_args
 import logging
 import math
 import re
 from datetime import datetime
 
-if TYPE_CHECKING:
-    pass
-
 
 def get_number_from_name(name: AstrologicalPoint) -> int:
     """
@@ -58,14 +55,14 @@ def get_number_from_name(name: AstrologicalPoint) -> int:
         return 8
     elif name == "Pluto":
         return 9
-    elif name == "Mean_Node":
+    elif name == "Mean_North_Lunar_Node":
         return 10
-    elif name == "True_Node":
+    elif name == "True_North_Lunar_Node":
         return 11
     # Note: Swiss ephemeris library has no constants for south nodes. We're using integers >= 1000 for them.
-    elif name == "Mean_South_Node":
+    elif name == "Mean_South_Lunar_Node":
         return 1000
-    elif name == "True_South_Node":
+    elif name == "True_South_Lunar_Node":
         return 1100
     elif name == "Chiron":
         return 15
@@ -84,7 +81,7 @@ def get_number_from_name(name: AstrologicalPoint) -> int:
 
 
 def get_kerykeion_point_from_degree(
-    degree: Union[int, float], name: Union[AstrologicalPoint, Houses], point_type: PointType
+    degree: Union[int, float], name: Union[AstrologicalPoint, Houses], point_type: PointType, speed: Optional[float] = None, declination: Optional[float] = None
 ) -> KerykeionPointModel:
     """
     Create a KerykeionPointModel from a degree position.
@@ -93,6 +90,8 @@ def get_kerykeion_point_from_degree(
         degree: The degree position (0-360, negative values are converted to positive)
         name: The name of the celestial point or house
         point_type: The type classification of the point
+        speed: The velocity/speed of the celestial point in degrees per day (optional)
+        declination: The declination of the celestial point in degrees (optional)
 
     Returns:
         A KerykeionPointModel with calculated zodiac sign, position, and properties
@@ -136,6 +135,8 @@ def get_kerykeion_point_from_degree(
         abs_pos=degree,
         emoji=zodiac_sign.emoji,
         point_type=point_type,
+        speed=speed,
+        declination=declination,
     )
 
 
@@ -416,9 +417,6 @@ def calculate_moon_phase(moon_abs_pos: float, sun_abs_pos: float) -> LunarPhaseM
     Returns:
         LunarPhaseModel containing phase data, emoji, and name
     """
-    # Initialize moon_phase and sun_phase to None in case of an error
-    moon_phase, sun_phase = None, None
-
     # Calculate the anti-clockwise degrees between the sun and moon
     degrees_between = (moon_abs_pos - sun_abs_pos) % 360
 
@@ -426,30 +424,12 @@ def calculate_moon_phase(moon_abs_pos: float, sun_abs_pos: float) -> LunarPhaseM
     step = 360.0 / 28.0
     moon_phase = int(degrees_between // step) + 1
 
-    # Define the sun phase steps
-    sunstep = [
-        0, 30, 40, 50, 60, 70, 80, 90, 120, 130, 140, 150, 160, 170, 180,
-        210, 220, 230, 240, 250, 260, 270, 300, 310, 320, 330, 340, 350
-    ]
-
-    # Calculate the sun phase (1-28) based on the degrees between the sun and moon
-    for x in range(len(sunstep)):
-        low = sunstep[x]
-        high = sunstep[x + 1] if x < len(sunstep) - 1 else 360
-        if low <= degrees_between < high:
-            sun_phase = x + 1
-            break
-
-    # Create a dictionary with the lunar phase information
-    lunar_phase_dictionary = {
-        "degrees_between_s_m": degrees_between,
-        "moon_phase": moon_phase,
-        "sun_phase": sun_phase,
-        "moon_emoji": get_moon_emoji_from_phase_int(moon_phase),
-        "moon_phase_name": get_moon_phase_name_from_phase_int(moon_phase),
-    }
-
-    return LunarPhaseModel(**lunar_phase_dictionary)
+    return LunarPhaseModel(
+        degrees_between_s_m=degrees_between,
+        moon_phase=moon_phase,
+        moon_emoji=get_moon_emoji_from_phase_int(moon_phase),
+        moon_phase_name=get_moon_phase_name_from_phase_int(moon_phase)
+    )
 
 
 def circular_sort(degrees: list[Union[int, float]]) -> list[Union[int, float]]:
@@ -751,3 +731,46 @@ def find_common_active_points(first_points: list[AstrologicalPoint], second_poin
     common_points = list(set(first_points) & set(second_points))
 
     return common_points
+
+
+def distribute_percentages_to_100(values: dict[str, float]) -> dict[str, int]:
+    """
+    Distribute percentages so they sum to exactly 100.
+
+    This function uses a largest remainder method to ensure that
+    the percentage total equals 100 even after rounding.
+
+    Args:
+        values: Dictionary with keys and their raw percentage values
+
+    Returns:
+        Dictionary with the same keys and integer percentages that sum to 100
+    """
+    if not values:
+        return {}
+
+    total = sum(values.values())
+    if total == 0:
+        return {key: 0 for key in values.keys()}
+
+    # Calculate base percentages
+    percentages = {key: value * 100 / total for key, value in values.items()}
+
+    # Get integer parts and remainders
+    integer_parts = {key: int(value) for key, value in percentages.items()}
+    remainders = {key: percentages[key] - integer_parts[key] for key in percentages.keys()}
+
+    # Calculate how many we need to add to reach 100
+    current_sum = sum(integer_parts.values())
+    needed = 100 - current_sum
+
+    # Sort by remainder (largest first) and add 1 to the largest remainders
+    sorted_by_remainder = sorted(remainders.items(), key=lambda x: x[1], reverse=True)
+
+    result = integer_parts.copy()
+    for i in range(needed):
+        if i < len(sorted_by_remainder):
+            key = sorted_by_remainder[i][0]
+            result[key] += 1
+
+    return result