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

kerykeion/transits_time_range_factory.py

@@ -22,9 +22,9 @@ Classes:
 
 Dependencies:
     - kerykeion.AstrologicalSubjectFactory: For creating astrological subjects
-    - kerykeion.aspects.SynastryAspectsFactory: For calculating angular relationships
+    - 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 SynastryAspectsFactory
+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,
@@ -227,13 +227,13 @@ class TransitsTimeRangeFactory:
         See Also:
             TransitMomentModel: Individual transit moment structure
             TransitsTimeRangeModel: Complete transit dataset structure
-            SynastryAspectsFactory: Underlying aspect calculation engine
+            AspectsFactory: Underlying aspect calculation engine
         """
         transit_moments = []
 
         for ephemeris_point in self.ephemeris_data_points:
             # Calculate aspects between transit positions and natal chart
-            aspects = SynastryAspectsFactory.from_subjects(
+            aspects = AspectsFactory.dual_chart_aspects(
                 ephemeris_point,
                 self.natal_chart,
                 active_points=self.active_points,

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