kerykeion 4.14.2__py3-none-any.whl → 4.18.0__py3-none-any.whl

kerykeion/__init__.py

@@ -9,7 +9,8 @@ This is part of Kerykeion (C) 2024 Giacomo Battaglia
 from .astrological_subject import AstrologicalSubject
 from .charts.kerykeion_chart_svg import KerykeionChartSVG
 from .kr_types import *
-from .relationship_score import RelationshipScore
+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

kerykeion/aspects/aspects_utils.py

@@ -8,144 +8,56 @@ 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.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsAspectModel
 
 
-def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, int], point_two: Union[float, int]):
-    """
-    Utility function.
-    It calculates the aspects between the 2 points.
-    Args: first point, second point.
+def get_aspect_from_two_points(
+    aspects_settings: Union[list[KerykeionSettingsAspectModel], list[dict]],
+    point_one: Union[float, int],
+    point_two: Union[float, int],
+):
     """
+    Utility function to calculate the aspects between two points.
+
+    Args:
+        aspects_settings (dict): Dictionary containing aspect settings.
+        point_one (Union[float, int]): First point.
+        point_two (Union[float, int]): Second point.
 
+    Returns:
+        dict: Dictionary containing the aspect details.
+    """
     distance = abs(difdeg2n(point_one, point_two))
     diff = abs(point_one - point_two)
 
-    if int(distance) <= aspects_settings[0]["orb"]:
-        name = aspects_settings[0]["name"]
-        aspect_degrees = aspects_settings[0]["degree"]
-        verdict = True
-        aid = 0
-
-    elif (
-        (aspects_settings[1]["degree"] - aspects_settings[1]["orb"])
-        <= int(distance)
-        <= (aspects_settings[1]["degree"] + aspects_settings[1]["orb"])
-    ):
-        name = aspects_settings[1]["name"]
-        aspect_degrees = aspects_settings[1]["degree"]
-        verdict = True
-        aid = 1
-
-    elif (
-        (aspects_settings[2]["degree"] - aspects_settings[2]["orb"])
-        <= int(distance)
-        <= (aspects_settings[2]["degree"] + aspects_settings[2]["orb"])
-    ):
-        name = aspects_settings[2]["name"]
-        aspect_degrees = aspects_settings[2]["degree"]
-        verdict = True
-        aid = 2
-
-    elif (
-        (aspects_settings[3]["degree"] - aspects_settings[3]["orb"])
-        <= int(distance)
-        <= (aspects_settings[3]["degree"] + aspects_settings[3]["orb"])
-    ):
-        name = aspects_settings[3]["name"]
-        aspect_degrees = aspects_settings[3]["degree"]
-        verdict = True
-        aid = 3
-
-    elif (
-        (aspects_settings[4]["degree"] - aspects_settings[4]["orb"])
-        <= int(distance)
-        <= (aspects_settings[4]["degree"] + aspects_settings[4]["orb"])
-    ):
-        name = aspects_settings[4]["name"]
-        aspect_degrees = aspects_settings[4]["degree"]
-        verdict = True
-        aid = 4
-
-    elif (
-        (aspects_settings[5]["degree"] - aspects_settings[5]["orb"])
-        <= int(distance)
-        <= (aspects_settings[5]["degree"] + aspects_settings[5]["orb"])
-    ):
-        name = aspects_settings[5]["name"]
-        aspect_degrees = aspects_settings[5]["degree"]
-        verdict = True
-        aid = 5
-
-    elif (
-        (aspects_settings[6]["degree"] - aspects_settings[6]["orb"])
-        <= int(distance)
-        <= (aspects_settings[6]["degree"] + aspects_settings[6]["orb"])
-    ):
-        name = aspects_settings[6]["name"]
-        aspect_degrees = aspects_settings[6]["degree"]
-        verdict = True
-        aid = 6
-
-    elif (
-        (aspects_settings[7]["degree"] - aspects_settings[7]["orb"])
-        <= int(distance)
-        <= (aspects_settings[7]["degree"] + aspects_settings[7]["orb"])
-    ):
-        name = aspects_settings[7]["name"]
-        aspect_degrees = aspects_settings[7]["degree"]
-        verdict = True
-        aid = 7
-
-    elif (
-        (aspects_settings[8]["degree"] - aspects_settings[8]["orb"])
-        <= int(distance)
-        <= (aspects_settings[8]["degree"] + aspects_settings[8]["orb"])
-    ):
-        name = aspects_settings[8]["name"]
-        aspect_degrees = aspects_settings[8]["degree"]
-        verdict = True
-        aid = 8
-
-    elif (
-        (aspects_settings[9]["degree"] - aspects_settings[9]["orb"])
-        <= int(distance)
-        <= (aspects_settings[9]["degree"] + aspects_settings[9]["orb"])
-    ):
-        name = aspects_settings[9]["name"]
-        aspect_degrees = aspects_settings[9]["degree"]
-        verdict = True
-        aid = 9
-
-    elif (
-        (aspects_settings[10]["degree"] - aspects_settings[10]["orb"])
-        <= int(distance)
-        <= (aspects_settings[10]["degree"] + aspects_settings[10]["orb"])
-    ):
-        name = aspects_settings[10]["name"]
-        aspect_degrees = aspects_settings[10]["degree"]
-        verdict = True
-        aid = 10
+    for aid, aspect in enumerate(aspects_settings):
+        aspect_degree = aspect["degree"] # type: ignore
+        aspect_orb = aspect["orb"] # type: ignore
 
+        if (aspect_degree - aspect_orb) <= int(distance) <= (aspect_degree + aspect_orb):
+            name = aspect["name"] # type: ignore
+            aspect_degrees = aspect_degree
+            verdict = True
+            break
     else:
         verdict = False
         name = None
-        distance = 0
         aspect_degrees = 0
-        aid = None
-
+        aid = None # type: ignore
 
     return {
-        "verdict": verdict, 
+        "verdict": verdict,
         "name": name,
         "orbit": distance - aspect_degrees,
         "distance": distance - aspect_degrees,
         "aspect_degrees": aspect_degrees,
         "aid": aid,
-        "diff": diff
+        "diff": diff,
     }
 
 
-def planet_id_decoder(planets_settings: dict, name: str):
+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
     the correct id for the planet.
@@ -156,8 +68,12 @@ def planet_id_decoder(planets_settings: dict, name: str):
             result = planet["id"]
             return result
 
+    raise ValueError(f"Planet {name} not found in the settings")
+
 
-def get_active_points_list(subject: AstrologicalSubject, settings: Union[KerykeionSettingsModel, dict]) -> list:
+def get_active_points_list(
+    subject: Union[AstrologicalSubject, AstrologicalSubjectModel], settings: Union[KerykeionSettingsModel, dict]
+) -> list:
     """
     Given an astrological subject and the settings, return a list of the active points.
     Args:

kerykeion/aspects/natal_aspects.py

@@ -11,6 +11,8 @@ from kerykeion.settings.kerykeion_settings import get_settings
 from dataclasses import dataclass
 from functools import cached_property
 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
+from kerykeion.kr_types.settings_models import KerykeionSettingsModel
 
 
 AXES_LIST = [
@@ -27,15 +29,15 @@ class NatalAspects:
     Generates an object with all the aspects of a birthcart.
     """
 
-    user: AstrologicalSubject
-    new_settings_file: Union[Path, None] = None
+    user: Union[AstrologicalSubject, AstrologicalSubjectModel]
+    new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
 
     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.celestial_points = self.settings.celestial_points
+        self.aspects_settings = self.settings.aspects
+        self.axes_orbit_settings = self.settings.general_settings.axes_orbit
 
     @cached_property
     def all_aspects(self):
@@ -53,7 +55,8 @@ class NatalAspects:
             # Generates the aspects list without repetitions
             for second in range(first + 1, len(active_points_list)):
                 aspect = get_aspect_from_two_points(
-                    self.aspects_settings, active_points_list[first]["abs_pos"], active_points_list[second]["abs_pos"]
+                    self.aspects_settings, active_points_list[first]["abs_pos"], 
+                    active_points_list[second]["abs_pos"]
                 )
 
                 verdict = aspect["verdict"]
@@ -62,27 +65,23 @@ class NatalAspects:
                 aspect_degrees = aspect["aspect_degrees"]
                 aid = aspect["aid"]
                 diff = aspect["diff"]
-                
 
                 if verdict == True:
-                    d_asp = {
-                        "p1_name": active_points_list[first]["name"],
-                        "p1_abs_pos": active_points_list[first]["abs_pos"],
-                        "p2_name": active_points_list[second]["name"],
-                        "p2_abs_pos": active_points_list[second]["abs_pos"],
-                        "aspect": name,
-                        "orbit": orbit,
-                        "aspect_degrees": aspect_degrees,
-                        "aid": aid,
-                        "diff": diff,
-                        "p1": planet_id_decoder(self.celestial_points, active_points_list[first]["name"]),
-                        "p2": planet_id_decoder(
-                            self.celestial_points,
-                            active_points_list[second]["name"],
-                        ),
-                    }
-
-                    self.all_aspects_list.append(d_asp)
+                    aspect_model = AspectModel(
+                        p1_name=active_points_list[first]["name"],
+                        p1_abs_pos=active_points_list[first]["abs_pos"],
+                        p2_name=active_points_list[second]["name"],
+                        p2_abs_pos=active_points_list[second]["abs_pos"],
+                        aspect=name,
+                        orbit=orbit,
+                        aspect_degrees=aspect_degrees,
+                        aid=aid,
+                        diff=diff,
+                        p1=planet_id_decoder(self.celestial_points, active_points_list[first]["name"]),
+                        p2=planet_id_decoder(self.celestial_points, active_points_list[second]["name"]),
+                        is_major=self.aspects_settings[aid]["is_major"],
+                    )
+                    self.all_aspects_list.append(aspect_model)
 
         return self.all_aspects_list
 
@@ -93,6 +92,7 @@ class NatalAspects:
         the most important are hardcoded.
         Set the list with set_points and creating a list with the names
         or the numbers of the houses.
+        The relevant aspects are the ones that are set as active ("is_active") in the settings.
         """
 
         logging.debug("Relevant aspects not already calculated, calculating now...")
@@ -127,6 +127,7 @@ class NatalAspects:
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
+
     setup_logging(level="debug")
 
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")

kerykeion/aspects/synastry_aspects.py

@@ -11,6 +11,9 @@ from functools import cached_property
 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
+from kerykeion.kr_types.settings_models import KerykeionSettingsModel
+from typing import Union
 
 
 class SynastryAspects(NatalAspects):
@@ -20,9 +23,9 @@ class SynastryAspects(NatalAspects):
 
     def __init__(
         self,
-        kr_object_one: AstrologicalSubject,
-        kr_object_two: AstrologicalSubject,
-        new_settings_file: Union[Path, None] = None,
+        kr_object_one: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None,
     ):
         # Subjects
         self.first_user = kr_object_one
@@ -32,9 +35,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 = self.settings.celestial_points
+        self.aspects_settings = self.settings.aspects
+        self.axes_orbit_settings = self.settings.general_settings.axes_orbit
 
         # Private variables of the aspects
         self._all_aspects: Union[list, None] = None
@@ -73,34 +76,29 @@ class SynastryAspects(NatalAspects):
                 aid = aspect["aid"]
                 diff = aspect["diff"]
 
-
                 if verdict == True:
-                    d_asp = {
-                        "p1_name": first_active_points_list[first]["name"],
-                        "p1_abs_pos": first_active_points_list[first]["abs_pos"],
-                        "p2_name": second_active_points_list[second]["name"],
-                        "p2_abs_pos": second_active_points_list[second]["abs_pos"],
-                        "aspect": name,
-                        "orbit": orbit,
-                        "aspect_degrees": aspect_degrees,
-                        "aid": aid,
-                        "diff": diff,
-                        "p1": planet_id_decoder(
-                            self.settings.celestial_points, first_active_points_list[first]["name"]
-                        ),
-                        "p2": planet_id_decoder(
-                            self.settings.celestial_points,
-                            second_active_points_list[second]["name"],
-                        ),
-                    }
-
-                    self.all_aspects_list.append(d_asp)
+                    aspect_model = AspectModel(
+                        p1_name=first_active_points_list[first]["name"],
+                        p1_abs_pos=first_active_points_list[first]["abs_pos"],
+                        p2_name=second_active_points_list[second]["name"],
+                        p2_abs_pos=second_active_points_list[second]["abs_pos"],
+                        aspect=name,
+                        orbit=orbit,
+                        aspect_degrees=aspect_degrees,
+                        aid=aid,
+                        diff=diff,
+                        p1=planet_id_decoder(self.celestial_points, first_active_points_list[first]["name"]),
+                        p2=planet_id_decoder(self.celestial_points, second_active_points_list[second]["name"]),
+                        is_major=self.aspects_settings[aid]["is_major"],
+                    )
+                    self.all_aspects_list.append(aspect_model)
 
         return self.all_aspects_list
 
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
+
     setup_logging(level="debug")
 
     john = AstrologicalSubject("John", 1940, 10, 9, 18, 30, "Liverpool")