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

kerykeion/__init__.py

@@ -8,31 +8,55 @@ This is part of Kerykeion (C) 2025 Giacomo Battaglia
 # Local
 from .aspects import AspectsFactory
 from .astrological_subject_factory import AstrologicalSubjectFactory
-from .charts.kerykeion_chart_svg import KerykeionChartSVG
+from .chart_data_factory import ChartDataFactory
+from .schemas import KerykeionException
+from .schemas.kr_models import (
+    ChartDataModel,
+    SingleChartDataModel,
+    DualChartDataModel,
+    ElementDistributionModel,
+    QualityDistributionModel,
+    HouseComparisonModel,
+)
+from .charts.chart_drawer import ChartDrawer
 from .composite_subject_factory import CompositeSubjectFactory
 from .ephemeris_data_factory import EphemerisDataFactory
 from .house_comparison.house_comparison_factory import HouseComparisonFactory
-from .house_comparison.house_comparison_models import HouseComparisonModel
-from .kr_types import *
 from .planetary_return_factory import PlanetaryReturnFactory, PlanetReturnModel
 from .relationship_score_factory import RelationshipScoreFactory
-from .report import Report
+from .report import ReportGenerator
 from .settings import KerykeionSettingsModel, get_settings
 from .transits_time_range_factory import TransitsTimeRangeFactory
+from .backword import (
+    AstrologicalSubject,  # Legacy wrapper
+    KerykeionChartSVG,    # Legacy wrapper
+    SynastryAspects,      # Legacy wrapper
+)
 
 __all__ = [
     "AspectsFactory",
     "AstrologicalSubjectFactory",
-    "KerykeionChartSVG",
+    "ChartDataFactory",
+    "ChartDataModel",
+    "SingleChartDataModel",
+    "DualChartDataModel",
+    "ElementDistributionModel",
+    "QualityDistributionModel",
+    "ChartDrawer",
     "CompositeSubjectFactory",
     "EphemerisDataFactory",
     "HouseComparisonFactory",
     "HouseComparisonModel",
+    "KerykeionException",
     "PlanetaryReturnFactory",
     "PlanetReturnModel",
     "RelationshipScoreFactory",
-    "Report",
+    "ReportGenerator",
     "KerykeionSettingsModel",
     "get_settings",
     "TransitsTimeRangeFactory",
+    # Legacy (v4) exported names for backward compatibility
+    "AstrologicalSubject",
+    "KerykeionChartSVG",
+    "SynastryAspects",
 ]

kerykeion/aspects/aspects_factory.py

@@ -7,20 +7,20 @@ import logging
 from typing import Union, List, Optional
 
 from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
-from kerykeion.aspects.aspects_utils import get_aspect_from_two_points, get_active_points_list
-from kerykeion.kr_types.kr_models import (
-    AstrologicalSubjectModel, 
-    AspectModel, 
-    ActiveAspect, 
-    CompositeSubjectModel, 
-    PlanetReturnModel, 
+from kerykeion.aspects.aspects_utils import get_aspect_from_two_points, get_active_points_list, calculate_aspect_movement
+from kerykeion.schemas.kr_models import (
+    AstrologicalSubjectModel,
+    AspectModel,
+    ActiveAspect,
+    CompositeSubjectModel,
+    PlanetReturnModel,
     SingleChartAspectsModel,
     DualChartAspectsModel,
     # Legacy aliases for backward compatibility
     NatalAspectsModel,
     SynastryAspectsModel
 )
-from kerykeion.kr_types.kr_literals import AstrologicalPoint
+from kerykeion.schemas.kr_literals import AstrologicalPoint
 from kerykeion.settings.config_constants import DEFAULT_ACTIVE_ASPECTS, DEFAULT_AXIS_ORBIT
 from kerykeion.settings.legacy.legacy_celestial_points_settings import DEFAULT_CELESTIAL_POINTS_SETTINGS
 from kerykeion.settings.legacy.legacy_chart_aspects_settings import DEFAULT_CHART_ASPECTS_SETTINGS
@@ -39,8 +39,8 @@ class AspectsFactory:
     """
     Unified factory class for creating both single chart and dual chart aspects analysis.
 
-    This factory provides methods to calculate all aspects within a single chart or 
-    between two charts. It consolidates the common functionality between different 
+    This factory provides methods to calculate all aspects within a single chart or
+    between two charts. It consolidates the common functionality between different
     types of aspect calculations while providing specialized methods for each type.
 
     The factory provides both comprehensive and filtered aspect lists based on orb settings
@@ -57,7 +57,7 @@ class AspectsFactory:
         >>> # For single chart aspects (natal, returns, etc.)
         >>> johnny = AstrologicalSubjectFactory.from_birth_data("Johnny", 1963, 6, 9, 0, 0, "Owensboro", "US")
         >>> single_chart_aspects = AspectsFactory.single_chart_aspects(johnny)
-        >>> 
+        >>>
         >>> # For dual chart aspects (synastry, comparisons, etc.)
         >>> john = AstrologicalSubjectFactory.from_birth_data("John", 1990, 1, 1, 12, 0, "London", "GB")
         >>> jane = AstrologicalSubjectFactory.from_birth_data("Jane", 1992, 6, 15, 14, 30, "Paris", "FR")
@@ -77,7 +77,7 @@ class AspectsFactory:
         This method calculates all astrological aspects (angular relationships)
         within a single chart. Can be used for any type of chart including:
         - Natal charts
-        - Planetary return charts  
+        - Planetary return charts
         - Composite charts
         - Any other single chart type
 
@@ -227,7 +227,7 @@ class AspectsFactory:
 
         Args:
             first_subject: First astrological subject
-            second_subject: Second astrological subject  
+            second_subject: Second astrological subject
             active_points_resolved: Resolved list of active celestial points
             active_aspects_resolved: Resolved list of active aspects with orbs
             aspects_settings: Chart aspect configuration settings
@@ -284,10 +284,10 @@ class AspectsFactory:
             ("Descendant", "Ascendant"),
             ("Medium_Coeli", "Imum_Coeli"),
             ("Imum_Coeli", "Medium_Coeli"),
-            ("True_Node", "True_South_Node"),
-            ("Mean_Node", "Mean_South_Node"),
-            ("True_South_Node", "True_Node"),
-            ("Mean_South_Node", "Mean_Node"),
+            ("True_North_Lunar_Node", "True_South_Lunar_Node"),
+            ("Mean_North_Lunar_Node", "Mean_South_Lunar_Node"),
+            ("True_South_Lunar_Node", "True_North_Lunar_Node"),
+            ("Mean_South_Lunar_Node", "Mean_North_Lunar_Node"),
         }
 
         all_aspects_list = []
@@ -313,6 +313,13 @@ class AspectsFactory:
                     first_planet_id = planet_id_lookup.get(first_name, 0)
                     second_planet_id = planet_id_lookup.get(second_name, 0)
 
+                    # Calculate aspect movement (applying/separating/exact)
+                    aspect_movement = calculate_aspect_movement(
+                        active_points_list[first]["abs_pos"],
+                        active_points_list[second]["abs_pos"],
+                        aspect["aspect_degrees"]
+                    )
+
                     aspect_model = AspectModel(
                         p1_name=first_name,
                         p1_owner=subject.name,
@@ -326,6 +333,7 @@ class AspectsFactory:
                         diff=aspect["diff"],
                         p1=first_planet_id,
                         p2=second_planet_id,
+                        aspect_movement=aspect_movement,
                     )
                     all_aspects_list.append(aspect_model)
 
@@ -382,11 +390,18 @@ class AspectsFactory:
                 if aspect["verdict"]:
                     first_name = first_active_points_list[first]["name"]
                     second_name = second_active_points_list[second]["name"]
-                    
+
                     # Get planet IDs using lookup dictionary for better performance
                     first_planet_id = planet_id_lookup.get(first_name, 0)
                     second_planet_id = planet_id_lookup.get(second_name, 0)
 
+                    # Calculate aspect movement (applying/separating/exact)
+                    aspect_movement = calculate_aspect_movement(
+                        first_active_points_list[first]["abs_pos"],
+                        second_active_points_list[second]["abs_pos"],
+                        aspect["aspect_degrees"]
+                    )
+
                     aspect_model = AspectModel(
                         p1_name=first_name,
                         p1_owner=first_subject.name,
@@ -400,6 +415,7 @@ class AspectsFactory:
                         diff=aspect["diff"],
                         p1=first_planet_id,
                         p2=second_planet_id,
+                        aspect_movement=aspect_movement,
                     )
                     all_aspects_list.append(aspect_model)
 
@@ -407,18 +423,18 @@ class AspectsFactory:
 
     @staticmethod
     def _update_aspect_settings(
-        aspects_settings: List[dict], 
+        aspects_settings: List[dict],
         active_aspects: List[ActiveAspect]
     ) -> List[dict]:
         """
         Update aspects settings with active aspects orbs.
-        
+
         This is a common utility method used by both single chart and dual chart calculations.
-        
+
         Args:
             aspects_settings: Base aspect settings
             active_aspects: Active aspects with their orb configurations
-            
+
         Returns:
             List of filtered and updated aspect settings
         """
@@ -472,7 +488,7 @@ class AspectsFactory:
     ) -> NatalAspectsModel:
         """
         Legacy method - use single_chart_aspects() instead.
-        
+
         ⚠️  DEPRECATION WARNING ⚠️
         This method is deprecated. Use AspectsFactory.single_chart_aspects() instead.
         """
@@ -488,7 +504,7 @@ class AspectsFactory:
     ) -> SynastryAspectsModel:
         """
         Legacy method - use dual_chart_aspects() instead.
-        
+
         ⚠️  DEPRECATION WARNING ⚠️
         This method is deprecated. Use AspectsFactory.dual_chart_aspects() instead.
         """

kerykeion/aspects/aspects_utils.py

@@ -5,15 +5,13 @@
 # TODO: Better documentation and unit tests
 
 from swisseph import difdeg2n
-from typing import Union, TYPE_CHECKING
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel
-from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel
+from typing import Union
+from kerykeion.schemas.kr_models import AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel
+from kerykeion.schemas.kr_literals import AspectMovementType
+from kerykeion.schemas.settings_models import KerykeionSettingsCelestialPointModel
 from kerykeion.settings.legacy.legacy_celestial_points_settings import DEFAULT_CELESTIAL_POINTS_SETTINGS
 
 
-if TYPE_CHECKING:
-    pass
-
 def get_aspect_from_two_points(
     aspects_settings: Union[list[dict], list[dict]],
     point_one: Union[float, int],
@@ -58,6 +56,77 @@ def get_aspect_from_two_points(
     }
 
 
+def calculate_aspect_movement(
+    point_one_abs_pos: float,
+    point_two_abs_pos: float,
+    aspect_degrees: int,
+    exact_orb_threshold: float = 0.05
+) -> AspectMovementType:
+    """
+    Calculate whether an aspect is applying, separating, or exact.
+
+    An aspect is:
+    - "Exact": When the orb is very tight (default < 0.17°)
+    - "Applying": When the faster planet is moving toward the exact aspect
+    - "Separating": When the faster planet is moving away from the exact aspect
+
+    For simplicity, we assume the first planet (p1) is faster than the second (p2).
+    This is generally true for:
+    - Moon vs outer planets
+    - Inner planets vs outer planets
+    - Transits (transiting planet vs natal planet)
+
+    Args:
+        point_one_abs_pos: Absolute position of first point (0-360°)
+        point_two_abs_pos: Absolute position of second point (0-360°)
+        aspect_degrees: The exact degree of the aspect (0, 60, 90, 120, 180, etc.)
+        exact_orb_threshold: Maximum orb to consider aspect "exact" (default 0.17°)
+
+    Returns:
+        "Applying", "Separating", or "Exact"
+
+    Example:
+        >>> # Moon at 45° applying to Sun at 50° (conjunction at 0°/360°)
+        >>> calculate_aspect_movement(45, 50, 0)
+        'Applying'
+        >>> # Moon at 55° separating from Sun at 50° (conjunction)
+        >>> calculate_aspect_movement(55, 50, 0)
+        'Separating'
+    """
+
+    # Calculate the angular distance
+    distance = abs(difdeg2n(point_one_abs_pos, point_two_abs_pos))
+    orbit = abs(distance - aspect_degrees)
+
+    # Check if aspect is exact (within tight orb)
+    if orbit <= exact_orb_threshold:
+        return "Exact"
+
+    # Calculate if p1 is ahead or behind p2 relative to the aspect
+    # We need to determine the direction of movement
+    diff = difdeg2n(point_one_abs_pos, point_two_abs_pos)
+
+    # For conjunction (0°) or opposition (180°)
+    if aspect_degrees == 0 or aspect_degrees == 360:
+        # If p1 is behind p2 (negative diff), it's applying
+        # If p1 is ahead of p2 (positive diff), it's separating
+        return "Applying" if diff < 0 else "Separating"
+
+    elif aspect_degrees == 180:
+        # For opposition, the logic is reversed
+        return "Applying" if abs(diff) < 180 else "Separating"
+
+    else:
+        # For other aspects (60°, 90°, 120°, 150°)
+        # Check if the distance is increasing or decreasing
+        # If distance < aspect_degrees and diff < 0: applying
+        # If distance > aspect_degrees or diff > 0: separating
+        if abs(diff) < aspect_degrees:
+            return "Applying" if diff < 0 else "Separating"
+        else:
+            return "Separating" if diff > 0 else "Applying"
+
+
 def planet_id_decoder(planets_settings: list[KerykeionSettingsCelestialPointModel], name: str) -> int:
     """
     Check if the name of the planet is the same in the settings and return