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

kerykeion/__init__.py

@@ -25,11 +25,12 @@ from .house_comparison.house_comparison_factory import HouseComparisonFactory
 from .planetary_return_factory import PlanetaryReturnFactory, PlanetReturnModel
 from .relationship_score_factory import RelationshipScoreFactory
 from .report import ReportGenerator
-from .settings import KerykeionSettingsModel, get_settings
+from .settings import KerykeionSettingsModel
 from .transits_time_range_factory import TransitsTimeRangeFactory
 from .backword import (
     AstrologicalSubject,  # Legacy wrapper
     KerykeionChartSVG,    # Legacy wrapper
+    NatalAspects,         # Legacy wrapper
     SynastryAspects,      # Legacy wrapper
 )
 
@@ -53,10 +54,10 @@ __all__ = [
     "RelationshipScoreFactory",
     "ReportGenerator",
     "KerykeionSettingsModel",
-    "get_settings",
     "TransitsTimeRangeFactory",
     # Legacy (v4) exported names for backward compatibility
     "AstrologicalSubject",
     "KerykeionChartSVG",
+    "NatalAspects",
     "SynastryAspects",
 ]

kerykeion/aspects/aspects_factory.py

@@ -21,9 +21,11 @@ from kerykeion.schemas.kr_models import (
     SynastryAspectsModel
 )
 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
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_ASPECTS
+from kerykeion.settings.chart_defaults import (
+    DEFAULT_CELESTIAL_POINTS_SETTINGS,
+    DEFAULT_CHART_ASPECTS_SETTINGS,
+)
 from kerykeion.utilities import find_common_active_points
 
 # Axes constants for orb filtering
@@ -70,6 +72,7 @@ class AspectsFactory:
         *,
         active_points: Optional[List[AstrologicalPoint]] = None,
         active_aspects: Optional[List[ActiveAspect]] = None,
+        axis_orb_limit: Optional[float] = None,
     ) -> SingleChartAspectsModel:
         """
         Create aspects analysis for a single astrological chart.
@@ -87,6 +90,7 @@ class AspectsFactory:
         Kwargs:
             active_points: List of points to include in calculations
             active_aspects: List of aspects with their orb settings
+            axis_orb_limit: Optional orb threshold applied to chart axes; when None, no special axis filter
 
         Returns:
             SingleChartAspectsModel containing all calculated aspects data
@@ -99,8 +103,6 @@ class AspectsFactory:
         # Initialize settings and configurations
         celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
         aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
-        axes_orbit_settings = DEFAULT_AXIS_ORBIT
-
         # Set active aspects with default fallback
         active_aspects_resolved = active_aspects if active_aspects is not None else DEFAULT_ACTIVE_ASPECTS
 
@@ -114,8 +116,12 @@ class AspectsFactory:
             )
 
         return AspectsFactory._create_single_chart_aspects_model(
-            subject, active_points_resolved, active_aspects_resolved,
-            aspects_settings, axes_orbit_settings, celestial_points
+            subject,
+            active_points_resolved,
+            active_aspects_resolved,
+            aspects_settings,
+            axis_orb_limit,
+            celestial_points,
         )
 
     @staticmethod
@@ -125,6 +131,7 @@ class AspectsFactory:
         *,
         active_points: Optional[List[AstrologicalPoint]] = None,
         active_aspects: Optional[List[ActiveAspect]] = None,
+        axis_orb_limit: Optional[float] = None,
     ) -> DualChartAspectsModel:
         """
         Create aspects analysis between two astrological charts.
@@ -145,6 +152,7 @@ class AspectsFactory:
                           If None, uses common points between both subjects.
             active_aspects: Optional list of aspect types with their orb settings.
                            If None, uses default aspect configuration.
+            axis_orb_limit: Optional orb threshold for chart axes (applied to single chart calculations only)
 
         Returns:
             DualChartAspectsModel: Complete model containing all calculated aspects data,
@@ -159,8 +167,6 @@ class AspectsFactory:
         # Initialize settings and configurations
         celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
         aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
-        axes_orbit_settings = DEFAULT_AXIS_ORBIT
-
         # Set active aspects with default fallback
         active_aspects_resolved = active_aspects if active_aspects is not None else DEFAULT_ACTIVE_ASPECTS
 
@@ -180,8 +186,13 @@ class AspectsFactory:
         )
 
         return AspectsFactory._create_dual_chart_aspects_model(
-            first_subject, second_subject, active_points_resolved, active_aspects_resolved,
-            aspects_settings, axes_orbit_settings, celestial_points
+            first_subject,
+            second_subject,
+            active_points_resolved,
+            active_aspects_resolved,
+            aspects_settings,
+            axis_orb_limit,
+            celestial_points,
         )
 
     @staticmethod
@@ -190,7 +201,7 @@ class AspectsFactory:
         active_points_resolved: List[AstrologicalPoint],
         active_aspects_resolved: List[ActiveAspect],
         aspects_settings: List[dict],
-        axes_orbit_settings: float,
+        axis_orb_limit: Optional[float],
         celestial_points: List[dict]
     ) -> SingleChartAspectsModel:
         """
@@ -202,7 +213,11 @@ class AspectsFactory:
         all_aspects = AspectsFactory._calculate_single_chart_aspects(
             subject, active_points_resolved, active_aspects_resolved, aspects_settings, celestial_points
         )
-        relevant_aspects = AspectsFactory._filter_relevant_aspects(all_aspects, axes_orbit_settings)
+        relevant_aspects = AspectsFactory._filter_relevant_aspects(
+            all_aspects,
+            axis_orb_limit,
+            apply_axis_orb_filter=axis_orb_limit is not None,
+        )
 
         return SingleChartAspectsModel(
             subject=subject,
@@ -219,7 +234,7 @@ class AspectsFactory:
         active_points_resolved: List[AstrologicalPoint],
         active_aspects_resolved: List[ActiveAspect],
         aspects_settings: List[dict],
-        axes_orbit_settings: float,
+        axis_orb_limit: Optional[float],
         celestial_points: List[dict]
     ) -> DualChartAspectsModel:
         """
@@ -231,7 +246,7 @@ class AspectsFactory:
             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
-            axes_orbit_settings: Orb threshold for chart axes
+            axis_orb_limit: Orb threshold for chart axes
             celestial_points: Celestial points configuration
 
         Returns:
@@ -241,7 +256,11 @@ class AspectsFactory:
             first_subject, second_subject, active_points_resolved, active_aspects_resolved,
             aspects_settings, celestial_points
         )
-        relevant_aspects = AspectsFactory._filter_relevant_aspects(all_aspects, axes_orbit_settings)
+        relevant_aspects = AspectsFactory._filter_relevant_aspects(
+            all_aspects,
+            axis_orb_limit,
+            apply_axis_orb_filter=False,
+        )
 
         return DualChartAspectsModel(
             first_subject=first_subject,
@@ -449,7 +468,12 @@ class AspectsFactory:
         return filtered_settings
 
     @staticmethod
-    def _filter_relevant_aspects(all_aspects: List[AspectModel], axes_orbit_settings: float) -> List[AspectModel]:
+    def _filter_relevant_aspects(
+        all_aspects: List[AspectModel],
+        axis_orb_limit: Optional[float],
+        *,
+        apply_axis_orb_filter: bool,
+    ) -> List[AspectModel]:
         """
         Filter aspects based on orb thresholds for axes and comprehensive criteria.
 
@@ -458,7 +482,8 @@ class AspectsFactory:
 
         Args:
             all_aspects: Complete list of calculated aspects
-            axes_orbit_settings: Orb threshold for axes aspects
+            axis_orb_limit: Optional orb threshold for axes aspects
+            apply_axis_orb_filter: Whether to apply the axis-specific orb filtering logic
 
         Returns:
             Filtered list of relevant aspects
@@ -467,11 +492,14 @@ class AspectsFactory:
 
         relevant_aspects = []
 
+        if not apply_axis_orb_filter or axis_orb_limit is None:
+            return list(all_aspects)
+
         for aspect in all_aspects:
             # Check if aspect involves any of the chart axes and apply stricter orb limits
             aspect_involves_axes = (aspect.p1_name in AXES_LIST or aspect.p2_name in AXES_LIST)
 
-            if aspect_involves_axes and abs(aspect.orbit) >= axes_orbit_settings:
+            if aspect_involves_axes and abs(aspect.orbit) >= axis_orb_limit:
                 continue
 
             relevant_aspects.append(aspect)
@@ -485,6 +513,7 @@ class AspectsFactory:
         *,
         active_points: Optional[List[AstrologicalPoint]] = None,
         active_aspects: Optional[List[ActiveAspect]] = None,
+        axis_orb_limit: Optional[float] = None,
     ) -> NatalAspectsModel:
         """
         Legacy method - use single_chart_aspects() instead.
@@ -492,7 +521,12 @@ class AspectsFactory:
         ⚠️  DEPRECATION WARNING ⚠️
         This method is deprecated. Use AspectsFactory.single_chart_aspects() instead.
         """
-        return AspectsFactory.single_chart_aspects(subject, active_points=active_points, active_aspects=active_aspects)
+        return AspectsFactory.single_chart_aspects(
+            subject,
+            active_points=active_points,
+            active_aspects=active_aspects,
+            axis_orb_limit=axis_orb_limit,
+        )
 
     @staticmethod
     def synastry_aspects(
@@ -501,6 +535,7 @@ class AspectsFactory:
         *,
         active_points: Optional[List[AstrologicalPoint]] = None,
         active_aspects: Optional[List[ActiveAspect]] = None,
+        axis_orb_limit: Optional[float] = None,
     ) -> SynastryAspectsModel:
         """
         Legacy method - use dual_chart_aspects() instead.
@@ -509,7 +544,11 @@ class AspectsFactory:
         This method is deprecated. Use AspectsFactory.dual_chart_aspects() instead.
         """
         return AspectsFactory.dual_chart_aspects(
-            first_subject, second_subject, active_points=active_points, active_aspects=active_aspects
+            first_subject,
+            second_subject,
+            active_points=active_points,
+            active_aspects=active_aspects,
+            axis_orb_limit=axis_orb_limit,
         )
 
 

kerykeion/aspects/aspects_utils.py

@@ -9,7 +9,7 @@ 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
+from kerykeion.settings.chart_defaults import DEFAULT_CELESTIAL_POINTS_SETTINGS
 
 
 def get_aspect_from_two_points(

kerykeion/backword.py

@@ -25,7 +25,7 @@ Note: This file name is intentionally spelled 'backword.py' per user request.
 """
 from __future__ import annotations
 
-from typing import Any, Iterable, List, Optional, Sequence, Union, Literal, cast
+from typing import Any, Iterable, List, Mapping, Optional, Sequence, Union, Literal, cast
 import logging
 import warnings
 from datetime import datetime
@@ -51,7 +51,6 @@ from .schemas.kr_literals import (
 )
 from .schemas import ZodiacType, SiderealMode, HousesSystemIdentifier, PerspectiveType
 from pathlib import Path
-from .settings import KerykeionSettingsModel, get_settings
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -394,15 +393,25 @@ class KerykeionChartSVG:
         chart_type: ChartType = "Natal",
         second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None] = None,
         new_output_directory: Union[str, None] = None,
-        new_settings_file: Union[Path, None, KerykeionSettingsModel, dict] = None,  # retained for signature compatibility (unused)
+        new_settings_file: Union[Path, None, dict] = None,  # retained for signature compatibility (unused)
         theme: Union[KerykeionChartTheme, None] = "classic",
         double_chart_aspect_grid_type: Literal["list", "table"] = "list",
         chart_language: KerykeionChartLanguage = "EN",
         active_points: List[AstrologicalPoint] = DEFAULT_ACTIVE_POINTS,  # type: ignore[assignment]
         active_aspects: Optional[List[ActiveAspect]] = None,
+        *,
+        language_pack: Optional[Mapping[str, Any]] = None,
+
     ) -> None:
         _deprecated("KerykeionChartSVG", "ChartDataFactory + ChartDrawer")
 
+        if new_settings_file is not None:
+            warnings.warn(
+                "'new_settings_file' is deprecated and ignored in Kerykeion v5. Use language_pack instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+
         if isinstance(first_obj, AstrologicalSubject):
             subject_model: Union[AstrologicalSubjectModel, CompositeSubjectModel] = first_obj.model()
         else:
@@ -419,7 +428,7 @@ class KerykeionChartSVG:
             active_aspects = list(active_aspects)
 
         self.chart_type = chart_type
-        self.new_settings_file = new_settings_file
+        self.language_pack = language_pack
         self.theme = theme  # type: ignore[assignment]
         self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
         self.chart_language = chart_language  # type: ignore[assignment]
@@ -516,10 +525,10 @@ class KerykeionChartSVG:
         self.chart_data = data
         self._chart_drawer = ChartDrawer(
             chart_data=data,
-            new_settings_file=self.new_settings_file,
             theme=cast(Optional[KerykeionChartTheme], self.theme),
             double_chart_aspect_grid_type=cast(Literal["list", "table"], self.double_chart_aspect_grid_type),
             chart_language=cast(KerykeionChartLanguage, self.chart_language),
+            language_pack=self.language_pack,
             external_view=external_view,
         )
 
@@ -607,31 +616,110 @@ class KerykeionChartSVG:
     save_aspect_grid_only_svg_file = makeAspectGridOnlySVG
     makeGridOnlySVG = makeAspectGridOnlySVG
 
+# ---------------------------------------------------------------------------
+# Legacy NatalAspects wrapper
+# ---------------------------------------------------------------------------
+class NatalAspects:
+    """Wrapper replicating the master branch NatalAspects interface.
+    
+    Replacement: AspectsFactory.single_subject_aspects(subject)
+    """
+
+    def __init__(
+        self,
+        user: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel],
+        new_settings_file: Union[Path, None, dict] = None,
+        active_points: Iterable[Union[str, AstrologicalPoint]] = DEFAULT_ACTIVE_POINTS,
+        active_aspects: Optional[List[ActiveAspect]] = None,
+        *,
+        language_pack: Optional[Mapping[str, Any]] = None,
+        axis_orb_limit: Optional[float] = None,
+    ) -> None:
+        _deprecated("NatalAspects", "AspectsFactory.single_chart_aspects")
+
+        if new_settings_file is not None:
+            warnings.warn(
+                "'new_settings_file' is deprecated and ignored in Kerykeion v5. Use language_pack instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+
+        self.user = user.model() if isinstance(user, AstrologicalSubject) else user
+        self.new_settings_file = new_settings_file
+
+        self.language_pack = language_pack
+        self.celestial_points: list[Any] = []
+        self.aspects_settings: list[Any] = []
+        self.axes_orbit_settings = axis_orb_limit
+
+        self.active_points = list(active_points)
+        self._active_points = _normalize_active_points(self.active_points)
+        if active_aspects is None:
+            active_aspects = list(DEFAULT_ACTIVE_ASPECTS)
+        else:
+            active_aspects = list(active_aspects)
+        self.active_aspects = active_aspects
+
+        self._aspects_model = None
+        self._all_aspects_cache = None
+        self._relevant_aspects_cache = None
+
+    def _build_aspects_model(self):
+        if self._aspects_model is None:
+            self._aspects_model = AspectsFactory.single_chart_aspects(
+                self.user,
+                active_points=self._active_points,
+                active_aspects=self.active_aspects,
+                axis_orb_limit=self.axes_orbit_settings,
+            )
+        return self._aspects_model
+
+    @cached_property
+    def all_aspects(self):
+        if self._all_aspects_cache is None:
+            self._all_aspects_cache = list(self._build_aspects_model().all_aspects)
+        return self._all_aspects_cache
+
+    @cached_property
+    def relevant_aspects(self):
+        if self._relevant_aspects_cache is None:
+            self._relevant_aspects_cache = list(self._build_aspects_model().relevant_aspects)
+        return self._relevant_aspects_cache
+
 # ---------------------------------------------------------------------------
 # Legacy SynastryAspects wrapper
 # ---------------------------------------------------------------------------
 class SynastryAspects:
-    """Wrapper replicating the v4 synastry aspects interface."""
+    """Wrapper replicating the master branch synastry aspects interface."""
 
     def __init__(
         self,
-        first: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel],
-        second: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel],
-        new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None,
+        kr_object_one: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        new_settings_file: Union[Path, None, dict] = None,
         active_points: Iterable[Union[str, AstrologicalPoint]] = DEFAULT_ACTIVE_POINTS,
         active_aspects: Optional[List[ActiveAspect]] = None,
+        *,
+        language_pack: Optional[Mapping[str, Any]] = None,
+        axis_orb_limit: Optional[float] = None,
     ) -> None:
         _deprecated("SynastryAspects", "AspectsFactory.dual_chart_aspects")
 
-        self.first_user = first.model() if isinstance(first, AstrologicalSubject) else first
-        self.second_user = second.model() if isinstance(second, AstrologicalSubject) else second
+        if new_settings_file is not None:
+            warnings.warn(
+                "'new_settings_file' is deprecated and ignored in Kerykeion v5. Use language_pack instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
 
+        self.first_user = kr_object_one.model() if isinstance(kr_object_one, AstrologicalSubject) else kr_object_one
+        self.second_user = kr_object_two.model() if isinstance(kr_object_two, AstrologicalSubject) else kr_object_two
         self.new_settings_file = new_settings_file
-        self.settings = get_settings(new_settings_file)
-        self.celestial_points = getattr(self.settings, "celestial_points", [])
-        self.aspects_settings = getattr(self.settings, "aspects", [])
-        general_settings = getattr(self.settings, "general_settings", None)
-        self.axes_orbit_settings = getattr(general_settings, "axes_orbit", None)
+
+        self.language_pack = language_pack
+        self.celestial_points: list[Any] = []
+        self.aspects_settings: list[Any] = []
+        self.axes_orbit_settings = axis_orb_limit
 
         self.active_points = list(active_points)
         self._active_points = _normalize_active_points(self.active_points)
@@ -644,6 +732,8 @@ class SynastryAspects:
         self._dual_model = None
         self._all_aspects_cache = None
         self._relevant_aspects_cache = None
+        self._all_aspects: Union[list, None] = None
+        self._relevant_aspects: Union[list, None] = None
 
     def _build_dual_model(self):
         if self._dual_model is None:
@@ -652,22 +742,24 @@ class SynastryAspects:
                 self.second_user,
                 active_points=self._active_points,
                 active_aspects=self.active_aspects,
+                axis_orb_limit=self.axes_orbit_settings,
             )
         return self._dual_model
 
-    @property
+    @cached_property
     def all_aspects(self):
         if self._all_aspects_cache is None:
             self._all_aspects_cache = list(self._build_dual_model().all_aspects)
         return self._all_aspects_cache
 
-    @property
+    @cached_property
     def relevant_aspects(self):
         if self._relevant_aspects_cache is None:
             self._relevant_aspects_cache = list(self._build_dual_model().relevant_aspects)
         return self._relevant_aspects_cache
 
     def get_relevant_aspects(self):
+        """Legacy method for compatibility with master branch."""
         return self.relevant_aspects
 
 # ---------------------------------------------------------------------------
@@ -676,5 +768,6 @@ class SynastryAspects:
 __all__ = [
     "AstrologicalSubject",
     "KerykeionChartSVG",
+    "NatalAspects",
     "SynastryAspects",
 ]