kerykeion 4.0.7__py3-none-any.whl → 4.1.1__py3-none-any.whl

kerykeion/__init__.py

@@ -68,7 +68,7 @@
     >>> second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma")
 
     >>> name = SynastryAspects(first, second)
-    >>> aspect_list = name.get_relevant_aspects()
+    >>> aspect_list = name.relevant_aspects
     >>> print(aspect_list[0])
 
     Generating kerykeion object for Jack...
@@ -105,4 +105,4 @@ from .kr_types import *
 from .relationship_score import RelationshipScore
 from .aspects import SynastryAspects, NatalAspects
 from .report import Report
-from .settings import KerykeionSettingsModel, get_settings_dict
+from .settings import KerykeionSettingsModel, get_settings

kerykeion/aspects/aspects_utils.py

@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+"""
+    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+"""
+# TODO: Better documentation and unit tests
+
+from swisseph import difdeg2n
+from typing import Union
+
+
+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.
+    """
+
+    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"]
+        color = aspects_settings[0]["color"]
+        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"]
+        color = aspects_settings[1]["color"]
+        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"]
+        color = aspects_settings[2]["color"]
+        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"]
+        color = aspects_settings[3]["color"]
+        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"]
+        color = aspects_settings[4]["color"]
+        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"]
+        color = aspects_settings[5]["color"]
+        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"]
+        color = aspects_settings[6]["color"]
+        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"]
+        color = aspects_settings[7]["color"]
+        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"]
+        color = aspects_settings[8]["color"]
+        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"]
+        color = aspects_settings[9]["color"]
+        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"]
+        color = aspects_settings[10]["color"]
+        verdict = True
+        aid = 10
+
+    else:
+        verdict = False
+        name = None
+        distance = 0
+        aspect_degrees = 0
+        color = None
+        aid = None
+
+    return (
+        verdict,
+        name,
+        distance - aspect_degrees,
+        aspect_degrees,
+        color,
+        aid,
+        diff,
+    )
+
+
+def planet_id_decoder(planets_settings: dict, name: str):
+    """
+    Check if the name of the planet is the same in the settings and return
+    the correct id for the planet.
+    """
+    str_name = str(name)
+    for planet in planets_settings:
+        if planet["name"] == str_name:
+            result = planet["id"]
+            return result
+
+
+def filter_by_settings(planets_settings: dict, init_point_list: list):
+    """
+    Creates a list of all the desired
+    points filtering by the settings.
+    """
+
+    set_points_name = []
+    for p in planets_settings:
+        if p["is_active"]:
+            set_points_name.append(p["name"])
+
+    point_list = []
+    for l in init_point_list:
+        if l["name"] in set_points_name:
+            point_list.append(l)
+
+    return point_list

kerykeion/aspects/natal_aspects.py

@@ -3,227 +3,58 @@
     This is part of Kerykeion (C) 2023 Giacomo Battaglia
 """
 
-import json
 from pathlib import Path
 from kerykeion import AstrologicalSubject
-from swisseph import difdeg2n
+from logging import getLogger, basicConfig
 from typing import Union
-from kerykeion.settings.kerykeion_settings import get_settings_dict
+from kerykeion.settings.kerykeion_settings import get_settings
+from dataclasses import dataclass
+from kerykeion.aspects.aspects_utils import filter_by_settings, planet_id_decoder, get_aspect_from_two_points
 
+logger = getLogger(__name__)
+basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level="INFO")
 
+
+@dataclass
 class NatalAspects:
     """
     Generates an object with all the aspects of a birthcart.
     """
 
-    def __init__(self, kr_object: AstrologicalSubject, new_settings_file: Union[Path, None] = None):
-        self.user = kr_object
-        self.new_settings_file = new_settings_file
-        self._parse_json_settings()
-
-        self.init_point_list = self.user.planets_list + self.user.houses_list
+    user: AstrologicalSubject
+    new_settings_file: Union[Path, None] = None
+    _all_aspects: Union[list, None] = None
+    _relevant_aspects: Union[list, None] = None
 
-    def _parse_json_settings(self):
-        # Load settings file
+    def __post_init__(self):
+        settings = get_settings(self.new_settings_file)
 
-        settings = get_settings_dict(
-            self.new_settings_file,
-        )
+        self.init_point_list = self.user.planets_list + self.user.houses_list
 
         self.planets_settings = settings["celestial_points"]
         self.aspects_settings = settings["aspects"]
         self.axes_orbit_settings = settings["general_settings"]["axes_orbit"]
 
-    def asp_calc(self, point_one, point_two):
-        """
-        Utility function.
-        It calculates the aspects between the 2 points.
-        Args: first point, second point.
-        """
-
-        distance = abs(difdeg2n(point_one, point_two))
-        diff = abs(point_one - point_two)
-
-        if int(distance) <= self.aspects_settings[0]["orb"]:
-            name = self.aspects_settings[0]["name"]
-            aspect_degrees = self.aspects_settings[0]["degree"]
-            color = self.aspects_settings[0]["color"]
-            verdict = True
-            aid = 0
-
-        elif (
-            (self.aspects_settings[1]["degree"] - self.aspects_settings[1]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[1]["degree"] + self.aspects_settings[1]["orb"])
-        ):
-            name = self.aspects_settings[1]["name"]
-            aspect_degrees = self.aspects_settings[1]["degree"]
-            color = self.aspects_settings[1]["color"]
-            verdict = True
-            aid = 1
-
-        elif (
-            (self.aspects_settings[2]["degree"] - self.aspects_settings[2]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[2]["degree"] + self.aspects_settings[2]["orb"])
-        ):
-            name = self.aspects_settings[2]["name"]
-            aspect_degrees = self.aspects_settings[2]["degree"]
-            color = self.aspects_settings[2]["color"]
-            verdict = True
-            aid = 2
-
-        elif (
-            (self.aspects_settings[3]["degree"] - self.aspects_settings[3]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[3]["degree"] + self.aspects_settings[3]["orb"])
-        ):
-            name = self.aspects_settings[3]["name"]
-            aspect_degrees = self.aspects_settings[3]["degree"]
-            color = self.aspects_settings[3]["color"]
-            verdict = True
-            aid = 3
-
-        elif (
-            (self.aspects_settings[4]["degree"] - self.aspects_settings[4]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[4]["degree"] + self.aspects_settings[4]["orb"])
-        ):
-            name = self.aspects_settings[4]["name"]
-            aspect_degrees = self.aspects_settings[4]["degree"]
-            color = self.aspects_settings[4]["color"]
-            verdict = True
-            aid = 4
-
-        elif (
-            (self.aspects_settings[5]["degree"] - self.aspects_settings[5]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[5]["degree"] + self.aspects_settings[5]["orb"])
-        ):
-            name = self.aspects_settings[5]["name"]
-            aspect_degrees = self.aspects_settings[5]["degree"]
-            color = self.aspects_settings[5]["color"]
-            verdict = True
-            aid = 5
-
-        elif (
-            (self.aspects_settings[6]["degree"] - self.aspects_settings[6]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[6]["degree"] + self.aspects_settings[6]["orb"])
-        ):
-            name = self.aspects_settings[6]["name"]
-            aspect_degrees = self.aspects_settings[6]["degree"]
-            color = self.aspects_settings[6]["color"]
-            verdict = True
-            aid = 6
-
-        elif (
-            (self.aspects_settings[7]["degree"] - self.aspects_settings[7]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[7]["degree"] + self.aspects_settings[7]["orb"])
-        ):
-            name = self.aspects_settings[7]["name"]
-            aspect_degrees = self.aspects_settings[7]["degree"]
-            color = self.aspects_settings[7]["color"]
-            verdict = True
-            aid = 7
-
-        elif (
-            (self.aspects_settings[8]["degree"] - self.aspects_settings[8]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[8]["degree"] + self.aspects_settings[8]["orb"])
-        ):
-            name = self.aspects_settings[8]["name"]
-            aspect_degrees = self.aspects_settings[8]["degree"]
-            color = self.aspects_settings[8]["color"]
-            verdict = True
-            aid = 8
-
-        elif (
-            (self.aspects_settings[9]["degree"] - self.aspects_settings[9]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[9]["degree"] + self.aspects_settings[9]["orb"])
-        ):
-            name = self.aspects_settings[9]["name"]
-            aspect_degrees = self.aspects_settings[9]["degree"]
-            color = self.aspects_settings[9]["color"]
-            verdict = True
-            aid = 9
-
-        elif (
-            (self.aspects_settings[10]["degree"] - self.aspects_settings[10]["orb"])
-            <= int(distance)
-            <= (self.aspects_settings[10]["degree"] + self.aspects_settings[10]["orb"])
-        ):
-            name = self.aspects_settings[10]["name"]
-            aspect_degrees = self.aspects_settings[10]["degree"]
-            color = self.aspects_settings[10]["color"]
-            verdict = True
-            aid = 10
-
-        else:
-            verdict = False
-            name = None
-            distance = 0
-            aspect_degrees = 0
-            color = None
-            aid = None
-
-        return (
-            verdict,
-            name,
-            distance - aspect_degrees,
-            aspect_degrees,
-            color,
-            aid,
-            diff,
-        )
-
-    def p_id_decoder(self, name):
-        """
-        Check if the name of the planet is the same in the settings and return
-        the correct id for the planet.
-        """
-        str_name = str(name)
-        for planet in self.planets_settings:
-            if planet["name"] == str_name:
-                result = planet["id"]
-                return result
-
-    def filter_by_settings(self, init_point_list):
-        """
-        Creates a list of all the desired
-        points filtering by the settings.
-        """
-
-        set_points_name = []
-        for p in self.planets_settings:
-            if p["is_active"]:
-                set_points_name.append(p["name"])
-
-        point_list = []
-        for l in init_point_list:
-            if l["name"] in set_points_name:
-                point_list.append(l)
-
-        return point_list
-
-    def get_all_aspects(self):
+    @property
+    def all_aspects(self):
         """
         Return all the aspects of the points in the natal chart in a dictionary,
         first all the individual aspects of each planet, second the aspects
-        whitout repetitions.
+        without repetitions.
         """
 
-        point_list = self.filter_by_settings(self.init_point_list)
+        if self._all_aspects is not None:
+            return self._all_aspects
+
+        point_list = filter_by_settings(self.planets_settings, self.init_point_list)
 
         self.all_aspects_list = []
 
         for first in range(len(point_list)):
-            # Generates the aspects list whitout repetitions
+            # Generates the aspects list without repetitions
             for second in range(first + 1, len(point_list)):
-                verdict, name, orbit, aspect_degrees, color, aid, diff = self.asp_calc(
-                    point_list[first]["abs_pos"], point_list[second]["abs_pos"]
+                verdict, name, orbit, aspect_degrees, color, aid, diff = get_aspect_from_two_points(
+                    self.aspects_settings, point_list[first]["abs_pos"], point_list[second]["abs_pos"]
                 )
 
                 if verdict == True:
@@ -238,8 +69,9 @@ class NatalAspects:
                         "color": color,
                         "aid": aid,
                         "diff": diff,
-                        "p1": self.p_id_decoder(point_list[first]["name"]),
-                        "p2": self.p_id_decoder(
+                        "p1": planet_id_decoder(self.planets_settings, point_list[first]["name"]),
+                        "p2": planet_id_decoder(
+                            self.planets_settings,
                             point_list[second]["name"],
                         ),
                     }
@@ -248,7 +80,8 @@ class NatalAspects:
 
         return self.all_aspects_list
 
-    def get_relevant_aspects(self):
+    @property
+    def relevant_aspects(self):
         """
         Filters the aspects list with the desired points, in this case
         the most important are hardcoded.
@@ -256,7 +89,12 @@ class NatalAspects:
         or the numbers of the houses.
         """
 
-        self.get_all_aspects()
+        if self._relevant_aspects is not None:
+            logger.debug("Relevant aspects already calculated, returning cached value")
+            return self._relevant_aspects
+
+        logger.debug("Relevant aspects not already calculated, calculating now...")
+        self.all_aspects
 
         aspects_filtered = []
         for a in self.all_aspects_list:
@@ -291,15 +129,15 @@ class NatalAspects:
 
 
 if __name__ == "__main__":
+    basicConfig(level="DEBUG", force=True)
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
 
     # All aspects
-    aspects = NatalAspects(johnny).get_all_aspects()
-    print(aspects)
+    aspects = NatalAspects(johnny)
+    print(aspects.all_aspects)
 
     print("\n")
 
     # Relevant aspects
-    aspects = NatalAspects(johnny).get_relevant_aspects()
-    print(aspects)
-
+    aspects = NatalAspects(johnny)
+    print(aspects.relevant_aspects)

kerykeion/aspects/synastry_aspects.py

@@ -8,6 +8,8 @@ from pathlib import Path
 from typing import Union
 
 from kerykeion.aspects.natal_aspects import NatalAspects
+from kerykeion.settings.kerykeion_settings import get_settings
+from kerykeion.aspects.aspects_utils import filter_by_settings, planet_id_decoder, get_aspect_from_two_points
 
 
 class SynastryAspects(NatalAspects):
@@ -25,28 +27,41 @@ class SynastryAspects(NatalAspects):
         self.second_user = kr_object_two
 
         self.new_settings_file = new_settings_file
-        self._parse_json_settings()
 
         self.first_init_point_list = self.first_user.planets_list + self.first_user.houses_list
         self.second_init_point_list = self.second_user.planets_list + self.second_user.houses_list
 
-    def get_all_aspects(self):
+        self._all_aspects: Union[list, None] = None
+        self._relevant_aspects: Union[list, None] = None
+
+        settings = get_settings(self.new_settings_file)
+
+        self.planets_settings = settings["celestial_points"]
+        self.aspects_settings = settings["aspects"]
+        self.axes_orbit_settings = settings["general_settings"]["axes_orbit"]
+
+    @property
+    def all_aspects(self):
         """
         Return all the aspects of the points in the natal chart in a dictionary,
         first all the individual aspects of each planet, second the aspects
         whiteout repetitions.
         """
 
-        f_1 = self.filter_by_settings(self.first_init_point_list)
-        f_2 = self.filter_by_settings(self.second_init_point_list)
+        if self._all_aspects is not None:
+            return self._all_aspects
+
+        f_1 = filter_by_settings(self.planets_settings, self.first_init_point_list)
+
+        f_2 = filter_by_settings(self.planets_settings, self.second_init_point_list)
 
         self.all_aspects_list = []
 
         for first in range(len(f_1)):
             # Generates the aspects list whitout repetitions
             for second in range(len(f_2)):
-                verdict, name, orbit, aspect_degrees, color, aid, diff = self.asp_calc(
-                    f_1[first]["abs_pos"], f_2[second]["abs_pos"]
+                verdict, name, orbit, aspect_degrees, color, aid, diff = get_aspect_from_two_points(
+                    self.aspects_settings, f_1[first]["abs_pos"], f_2[second]["abs_pos"]
                 )
 
                 if verdict == True:
@@ -61,8 +76,9 @@ class SynastryAspects(NatalAspects):
                         "color": color,
                         "aid": aid,
                         "diff": diff,
-                        "p1": self.p_id_decoder(f_1[first]["name"]),
-                        "p2": self.p_id_decoder(
+                        "p1": planet_id_decoder(self.planets_settings, f_1[first]["name"]),
+                        "p2": planet_id_decoder(
+                            self.planets_settings,
                             f_2[second]["name"],
                         ),
                     }
@@ -79,7 +95,7 @@ if __name__ == "__main__":
     synastry_aspects = SynastryAspects(john, yoko)
 
     # All aspects
-    print(synastry_aspects.get_all_aspects())
+    print(synastry_aspects.all_aspects)
 
     # Relevant aspects
-    print(synastry_aspects.get_relevant_aspects())
+    print(synastry_aspects.relevant_aspects)