kerykeion 4.2.1__tar.gz → 4.2.2__tar.gz

{kerykeion-4.2.1 → kerykeion-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.2.1
+Version: 4.2.2
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0

{kerykeion-4.2.1 → kerykeion-4.2.2}/kerykeion/aspects/__init__.py

@@ -8,4 +8,4 @@ The aspects module contains the classes and functions for calculating
 
 
 from .synastry_aspects import SynastryAspects
-from .natal_aspects import NatalAspects
+from .natal_aspects import NatalAspects

{kerykeion-4.2.1 → kerykeion-4.2.2}/kerykeion/aspects/aspects_utils.py

@@ -163,23 +163,4 @@ def planet_id_decoder(planets_settings: dict, name: str):
     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
+            return result

{kerykeion-4.2.1 → kerykeion-4.2.2}/kerykeion/aspects/natal_aspects.py

@@ -9,11 +9,18 @@ from logging import getLogger, basicConfig
 from typing import Union
 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
+from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points
+from kerykeion.utilities import get_active_points_list
 
 logger = getLogger(__name__)
 basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level="INFO")
 
+AXES_LIST = [
+    "First_House",
+    "Tenth_House",
+    "Seventh_House",
+    "Fourth_House",
+]
 
 @dataclass
 class NatalAspects:
@@ -27,13 +34,11 @@ class NatalAspects:
     _relevant_aspects: Union[list, None] = None
 
     def __post_init__(self):
-        settings = get_settings(self.new_settings_file)
+        self.settings = get_settings(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"]
+        self.celestial_points = self.settings["celestial_points"]
+        self.aspects_settings = self.settings["aspects"]
+        self.axes_orbit_settings = self.settings["general_settings"]["axes_orbit"]
 
     @property
     def all_aspects(self):
@@ -46,33 +51,36 @@ class NatalAspects:
         if self._all_aspects is not None:
             return self._all_aspects
 
-        point_list = filter_by_settings(self.planets_settings, self.init_point_list)
+        active_points_list = get_active_points_list(self.user, self.settings)
 
         self.all_aspects_list = []
 
-        for first in range(len(point_list)):
+        for first in range(len(active_points_list)):
             # Generates the aspects list without repetitions
-            for second in range(first + 1, len(point_list)):
+            for second in range(first + 1, len(active_points_list)):
                 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"]
+                    self.aspects_settings, active_points_list[first]["abs_pos"], active_points_list[second]["abs_pos"]
                 )
 
                 if verdict == True:
                     d_asp = {
-                        "p1_name": point_list[first]["name"],
-                        "p1_abs_pos": point_list[first]["abs_pos"],
-                        "p2_name": point_list[second]["name"],
-                        "p2_abs_pos": point_list[second]["abs_pos"],
+                        "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,
                         "color": color,
                         "aid": aid,
                         "diff": diff,
-                        "p1": planet_id_decoder(self.planets_settings, point_list[first]["name"]),
+                        "p1": planet_id_decoder(
+                            self.celestial_points,
+                            active_points_list[first]["name"]
+                        ),
                         "p2": planet_id_decoder(
-                            self.planets_settings,
-                            point_list[second]["name"],
+                            self.celestial_points,
+                            active_points_list[second]["name"],
                         ),
                     }
 
@@ -101,12 +109,7 @@ class NatalAspects:
             if self.aspects_settings[a["aid"]]["is_active"] == True:
                 aspects_filtered.append(a)
 
-        axes_list = [
-            "First_House",
-            "Tenth_House",
-            "Seventh_House",
-            "Fourth_House",
-        ]
+        axes_list = AXES_LIST
         counter = 0
 
         aspects_list_subtract = []

{kerykeion-4.2.1 → kerykeion-4.2.2}/kerykeion/aspects/synastry_aspects.py

@@ -9,7 +9,8 @@ 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
+from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points
+from kerykeion.utilities import get_active_points_list
 
 
 class SynastryAspects(NatalAspects):
@@ -23,22 +24,24 @@ class SynastryAspects(NatalAspects):
         kr_object_two: AstrologicalSubject,
         new_settings_file: Union[Path, None] = None,
     ):
+        # Subjects
         self.first_user = kr_object_one
         self.second_user = kr_object_two
-
+        
+        # Settings
         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.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
-
+        # Private variables of the aspects
         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):
@@ -50,36 +53,39 @@ class SynastryAspects(NatalAspects):
 
         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)
+        
+        # Celestial Points Lists
+        first_active_points_list = get_active_points_list(self.first_user, self.settings)
+        second_active_points_list = get_active_points_list(self.second_user, self.settings)
 
         self.all_aspects_list = []
 
-        for first in range(len(f_1)):
+        for first in range(len(first_active_points_list)):
             # Generates the aspects list whitout repetitions
-            for second in range(len(f_2)):
+            for second in range(len(second_active_points_list)):
                 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"]
+                    self.aspects_settings, first_active_points_list[first]["abs_pos"], second_active_points_list[second]["abs_pos"]
                 )
 
                 if verdict == True:
                     d_asp = {
-                        "p1_name": f_1[first]["name"],
-                        "p1_abs_pos": f_1[first]["abs_pos"],
-                        "p2_name": f_2[second]["name"],
-                        "p2_abs_pos": f_2[second]["abs_pos"],
+                        "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,
                         "color": color,
                         "aid": aid,
                         "diff": diff,
-                        "p1": planet_id_decoder(self.planets_settings, f_1[first]["name"]),
+                        "p1": planet_id_decoder(
+                            self.settings.celestial_points,
+                            first_active_points_list[first]["name"]
+                        ),
                         "p2": planet_id_decoder(
-                            self.planets_settings,
-                            f_2[second]["name"],
+                            self.settings.celestial_points,
+                            second_active_points_list[second]["name"],
                         ),
                     }
 

{kerykeion-4.2.1 → kerykeion-4.2.2}/kerykeion/utilities.py

@@ -1,5 +1,4 @@
-from kerykeion.kr_types import KerykeionPointModel, KerykeionException
-from pathlib import Path
+from kerykeion.kr_types import KerykeionPointModel, KerykeionException, KerykeionSettingsModel, AstrologicalSubjectModel
 from typing import Union, Literal
 from logging import getLogger
 
@@ -206,3 +205,19 @@ def calculate_position(
 
     return KerykeionPointModel(**dictionary)
 
+def get_active_points_list(subject: AstrologicalSubjectModel, settings: Union[KerykeionSettingsModel, dict]) -> list:
+    """
+    Given an astrological subject and the settings, return a list of the active points.
+    Args:
+        subject (AstrologicalSubject): The astrological subject to get the active points from.
+        settings (Union[KerykeionSettingsModel, dict]): Settings model o dictionary.
+
+    Returns:
+        list: List of the active points.
+    """
+    point_list = []
+    for planet in settings["celestial_points"]:
+        if planet["is_active"] == True:
+            point_list.append(subject[planet["name"].lower()])
+
+    return point_list

{kerykeion-4.2.1 → kerykeion-4.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kerykeion"
-version = "4.2.1"
+version = "4.2.2"
 authors = ["Giacomo Battaglia <battaglia.giacomo@yahoo.it>"]
 description = "A python library for astrology."
 license = "AGPL-3.0"
@@ -29,6 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development",