kerykeion 4.26.1__py3-none-any.whl → 5.0.0a1__py3-none-any.whl

kerykeion/__init__.py

@@ -6,15 +6,18 @@ This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 # Local
-from .astrological_subject import AstrologicalSubject
+from .aspects import SynastryAspects, NatalAspects
+from .astrological_subject_factory import AstrologicalSubjectFactory
 from .charts.kerykeion_chart_svg import KerykeionChartSVG
+from .composite_subject_factory import CompositeSubjectFactory
+from .enums import Planets, Aspects, Signs
+from .ephemeris_data 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.relationship_score import RelationshipScore
 from .relationship_score.relationship_score_factory import RelationshipScoreFactory
-from .aspects import SynastryAspects, NatalAspects
 from .report import Report
 from .settings import KerykeionSettingsModel, get_settings
-from .enums import Planets, Aspects, Signs
-from .ephemeris_data import EphemerisDataFactory
-from .composite_subject_factory import CompositeSubjectFactory
 from .transits_time_range import TransitsTimeRangeFactory

kerykeion/aspects/aspects_utils.py

@@ -4,17 +4,20 @@
 """
 # TODO: Better documentation and unit tests
 
-from kerykeion import AstrologicalSubject
 from kerykeion.settings import KerykeionSettingsModel
 from swisseph import difdeg2n
-from typing import Union
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
-from kerykeion.kr_types.kr_literals import Planet, AxialCusps
-from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsAspectModel
+from typing import Union, TYPE_CHECKING
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel
+from kerykeion.kr_types.kr_literals import AstrologicalPoint
+from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel
+from kerykeion.settings.legacy.legacy_celestial_points_settings import DEFAULT_CELESTIAL_POINTS_SETTINGS
 
 
+if TYPE_CHECKING:
+    from kerykeion import AstrologicalSubjectFactory
+
 def get_aspect_from_two_points(
-    aspects_settings: Union[list[KerykeionSettingsAspectModel], list[dict]],
+    aspects_settings: Union[list[dict], list[dict]],
     point_one: Union[float, int],
     point_two: Union[float, int],
 ):
@@ -72,7 +75,10 @@ def planet_id_decoder(planets_settings: list[KerykeionSettingsCelestialPointMode
 
 
 def get_active_points_list(
-    subject: Union[AstrologicalSubject, AstrologicalSubjectModel], settings: Union[KerykeionSettingsModel, dict], active_points: list = []
+    subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
+    active_points: list = [],
+    *,
+    celestial_points: list[dict] = DEFAULT_CELESTIAL_POINTS_SETTINGS,
 ) -> list:
     """
     Given an astrological subject and the settings, return a list of the active points.
@@ -84,7 +90,7 @@ def get_active_points_list(
         list: List of the active points.
     """
     point_list = []
-    for planet in settings["celestial_points"]:
+    for planet in celestial_points:
         if planet["name"] in active_points:
             point_list.append(subject[planet["name"].lower()])
 

kerykeion/aspects/natal_aspects.py

@@ -3,20 +3,21 @@
     This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
-from pathlib import Path
-from kerykeion import AstrologicalSubject
-from kerykeion.kr_types import CompositeSubjectModel
 import logging
-from typing import Union, List
-from kerykeion.settings.kerykeion_settings import get_settings
 from dataclasses import dataclass, field
 from functools import cached_property
+from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
+from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points, get_active_points_list
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect
-from kerykeion.kr_types.kr_literals import AxialCusps, Planet
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect, CompositeSubjectModel, PlanetReturnModel
+from kerykeion.kr_types.kr_literals import AstrologicalPoint
 from kerykeion.kr_types.settings_models import KerykeionSettingsModel
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
-
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, 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.utilities import find_common_active_points
+from pathlib import Path
+from typing import Union, List, Optional
 
 
 AXES_LIST = [
@@ -33,18 +34,26 @@ class NatalAspects:
     Generates an object with all the aspects of a birthcart.
     """
 
-    user: Union[AstrologicalSubject, AstrologicalSubjectModel, CompositeSubjectModel]
+    user: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel]
     new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
-    active_points: List[Union[AxialCusps, Planet]] = field(default_factory=lambda: DEFAULT_ACTIVE_POINTS)
+    active_points: Optional[List[AstrologicalPoint]] = field(default_factory=lambda: None)
     active_aspects: List[ActiveAspect] = field(default_factory=lambda: DEFAULT_ACTIVE_ASPECTS)
 
     def __post_init__(self):
         self.settings = get_settings(self.new_settings_file)
 
-        self.celestial_points = self.settings.celestial_points
-        self.aspects_settings = self.settings.aspects
-        self.axes_orbit_settings = self.settings.general_settings.axes_orbit
-        self.active_points = self.active_points
+        self.celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
+        self.aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
+        self.axes_orbit_settings =  DEFAULT_AXIS_ORBIT
+
+        if not self.active_points:
+            self.active_points = self.user.active_points
+        else:
+            self.active_points = find_common_active_points(
+                self.user.active_points,
+                self.active_points,
+            )
+
 
     @cached_property
     def all_aspects(self):
@@ -54,7 +63,7 @@ class NatalAspects:
         without repetitions.
         """
 
-        active_points_list = get_active_points_list(self.user, self.settings, self.active_points)
+        active_points_list = get_active_points_list(self.user, self.active_points)
 
         # ---> TODO: Clean this up
         filtered_settings = []
@@ -159,7 +168,7 @@ if __name__ == "__main__":
 
     setup_logging(level="debug")
 
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
+    johnny = AstrologicalSubjectFactory.from_birth_data("Johnny Depp", 1963, 6, 9, 0, 0, 0, "Owensboro", "US")
 
     # All aspects as a list of dictionaries
     aspects = NatalAspects(johnny)

kerykeion/aspects/synastry_aspects.py

@@ -3,19 +3,23 @@
     This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
-from kerykeion import AstrologicalSubject
 from pathlib import Path
 from typing import Union
 from functools import cached_property
+from typing import TYPE_CHECKING
 
+from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points, get_active_points_list
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect, CompositeSubjectModel, PlanetReturnModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsModel
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
-from kerykeion.kr_types.kr_literals import AxialCusps, Planet
-from typing import Union, List
+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.kr_types.kr_literals import AstrologicalPoint
+from kerykeion.utilities import find_common_active_points
+from typing import Union, List, Optional
 
 
 class SynastryAspects(NatalAspects):
@@ -25,10 +29,10 @@ class SynastryAspects(NatalAspects):
 
     def __init__(
         self,
-        kr_object_one: Union[AstrologicalSubject, AstrologicalSubjectModel],
-        kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        kr_object_one: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
+        kr_object_two: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
         new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None,
-        active_points: list[Union[AxialCusps, Planet]] = DEFAULT_ACTIVE_POINTS,
+        active_points: Optional[list[AstrologicalPoint]] = None,
         active_aspects: List[ActiveAspect] = DEFAULT_ACTIVE_ASPECTS,
     ):
         # Subjects
@@ -39,9 +43,9 @@ class SynastryAspects(NatalAspects):
         self.new_settings_file = new_settings_file
         self.settings = get_settings(self.new_settings_file)
 
-        self.celestial_points = self.settings.celestial_points
-        self.aspects_settings = self.settings.aspects
-        self.axes_orbit_settings = self.settings.general_settings.axes_orbit
+        self.celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
+        self.aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
+        self.axes_orbit_settings = DEFAULT_AXIS_ORBIT
         self.active_points = active_points
         self.active_aspects = active_aspects
 
@@ -49,6 +53,19 @@ class SynastryAspects(NatalAspects):
         self._all_aspects: Union[list, None] = None
         self._relevant_aspects: Union[list, None] = None
 
+        if not self.active_points:
+            self.active_points = self.first_user.active_points
+        else:
+            self.active_points = find_common_active_points(
+                self.first_user.active_points,
+                self.active_points,
+            )
+
+        self.active_points = find_common_active_points(
+            self.second_user.active_points,
+            self.active_points,
+        )
+
     @cached_property
     def all_aspects(self):
         """
@@ -61,8 +78,8 @@ class SynastryAspects(NatalAspects):
             return self._all_aspects
 
         # Celestial Points Lists
-        first_active_points_list = get_active_points_list(self.first_user, self.settings, self.active_points)
-        second_active_points_list = get_active_points_list(self.second_user, self.settings, self.active_points)
+        first_active_points_list = get_active_points_list(self.first_user, self.active_points)
+        second_active_points_list = get_active_points_list(self.second_user, self.active_points)
 
         # ---> TODO: Clean this up
         filtered_settings = []
@@ -115,8 +132,8 @@ if __name__ == "__main__":
 
     setup_logging(level="debug")
 
-    john = AstrologicalSubject("John", 1940, 10, 9, 10, 30, "Liverpool", "GB")
-    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 10, 30, "Tokyo", "JP")
+    john = AstrologicalSubjectFactory.from_birth_data("John", 1940, 10, 9, 10, 30, "Liverpool", "GB")
+    yoko = AstrologicalSubjectFactory.from_birth_data("Yoko", 1933, 2, 18, 10, 30, "Tokyo", "JP")
 
     synastry_aspects = SynastryAspects(john, yoko)
 

kerykeion/aspects/transits_time_range.py

@@ -6,8 +6,8 @@ from kerykeion import (
 )
 
 # Create a natal chart for the subject
-person = AstrologicalSubject(
-    "Johnny Depp", 1963, 6, 9, 20, 15, "Owensboro", "US"
+person = AstrologicalSubjectFactory.from_birth_data(
+    "Johnny Depp", 1963, 6, 9, 20, 15, 0, "Owensboro", "US"
 )
 
 # Define the time period for transit calculation