kerykeion 4.24.1__tar.gz → 4.24.2__tar.gz

{kerykeion-4.24.1 → kerykeion-4.24.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.24.1
+Version: 4.24.2
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/aspects/aspects_utils.py

@@ -46,7 +46,6 @@ def get_aspect_from_two_points(
         verdict = False
         name = None
         aspect_degrees = 0
-        aid = None # type: ignore
 
     return {
         "verdict": verdict,
@@ -54,7 +53,6 @@ def get_aspect_from_two_points(
         "orbit": distance - aspect_degrees,
         "distance": distance - aspect_degrees,
         "aspect_degrees": aspect_degrees,
-        "aid": aid,
         "diff": diff,
     }
 

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/aspects/natal_aspects.py

@@ -55,8 +55,18 @@ class NatalAspects:
 
         active_points_list = get_active_points_list(self.user, self.settings, self.active_points)
 
-        self.all_aspects_list = []
+        # ---> TODO: Clean this up
+        filtered_settings = []
+        for a in self.aspects_settings:
+            for aspect in self.active_aspects:
+                if a["name"] == aspect["name"]:
+                    a["orb"] = aspect["orb"]  # Assign the aspect's orb
+                    filtered_settings.append(a)
+                    break  # Exit the inner loop once a match is found
+        self.aspects_settings = filtered_settings
+        # <--- TODO: Clean this up
 
+        self.all_aspects_list = []
         for first in range(len(active_points_list)):
             # Generates the aspects list without repetitions
             for second in range(first + 1, len(active_points_list)):
@@ -84,7 +94,6 @@ class NatalAspects:
                 name = aspect["name"]
                 orbit = aspect["orbit"]
                 aspect_degrees = aspect["aspect_degrees"]
-                aid = aspect["aid"]
                 diff = aspect["diff"]
 
                 if verdict == True:
@@ -96,11 +105,9 @@ class NatalAspects:
                         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)
 
@@ -119,16 +126,12 @@ class NatalAspects:
         logging.debug("Relevant aspects not already calculated, calculating now...")
         self.all_aspects
 
-        aspects_filtered = []
-        for a in self.all_aspects_list:
-            if a["aspect"] in [aspect["name"] for aspect in self.active_aspects]:
-                aspects_filtered.append(a)
-
         axes_list = AXES_LIST
         counter = 0
 
         # Remove aspects where the orbits exceed the maximum orb thresholds specified in the settings
         # (specified usually in kr.config.json file)
+        aspects_filtered = self.all_aspects
         aspects_list_subtract = []
         for a in aspects_filtered:
             counter += 1

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/aspects/synastry_aspects.py

@@ -64,8 +64,17 @@ class SynastryAspects(NatalAspects):
         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)
 
-        self.all_aspects_list = []
+        # ---> TODO: Clean this up
+        filtered_settings = []
+        for a in self.aspects_settings:
+            for aspect in self.active_aspects:
+                if a["name"] == aspect["name"]:
+                    a["orb"] = aspect["orb"]  # Assign the aspect's orb
+                    filtered_settings.append(a)
+        self.aspects_settings = filtered_settings
+        # <--- TODO: Clean this up
 
+        self.all_aspects_list = []
         for first in range(len(first_active_points_list)):
             # Generates the aspects list whitout repetitions
             for second in range(len(second_active_points_list)):
@@ -79,7 +88,6 @@ class SynastryAspects(NatalAspects):
                 name = aspect["name"]
                 orbit = aspect["orbit"]
                 aspect_degrees = aspect["aspect_degrees"]
-                aid = aspect["aid"]
                 diff = aspect["diff"]
 
                 if verdict == True:
@@ -91,11 +99,9 @@ class SynastryAspects(NatalAspects):
                         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)
 

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/charts/charts_utils.py

@@ -743,7 +743,9 @@ def draw_transit_aspect_list(
 
         # aspect symbol
         # TODO: Remove the "degree" element EVERYWHERE!
-        inner_path += f'<use  x="15" y="0" xlink:href="#orb{aspects_settings[aspects_list[i]["aid"]]["degree"]}" />'
+        aspect_name = aspects_list[i]["aspect"]
+        id_value = next((a["degree"] for a in aspects_settings if a["name"] == aspect_name), None) # type: ignore
+        inner_path += f'<use  x="15" y="0" xlink:href="#orb{id_value}" />'
 
         # second planet symbol
         inner_path += f'<g transform="translate(30,0)">'

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/charts/kerykeion_chart_svg.py

@@ -358,26 +358,31 @@ class KerykeionChartSVG:
     def _draw_all_aspects_lines(self, r, ar):
         out = ""
         for aspect in self.aspects_list:
-            out += draw_aspect_line(
-                r=r,
-                ar=ar,
-                aspect=aspect,
-                color=self.aspects_settings[aspect["aid"]]["color"],
-                seventh_house_degree_ut=self.user.seventh_house.abs_pos
-            )
-
+            aspect_name = aspect["aspect"]
+            aspect_color = next((a["color"] for a in self.aspects_settings if a["name"] == aspect_name), None)
+            if aspect_color:
+                out += draw_aspect_line(
+                    r=r,
+                    ar=ar,
+                    aspect=aspect,
+                    color=aspect_color,
+                    seventh_house_degree_ut=self.user.seventh_house.abs_pos
+                )
         return out
 
     def _draw_all_transit_aspects_lines(self, r, ar):
         out = ""
         for aspect in self.aspects_list:
-            out += draw_aspect_line(
-                r=r,
-                ar=ar,
-                aspect=aspect,
-                color=self.aspects_settings[aspect["aid"]]["color"],
-                seventh_house_degree_ut=self.user.seventh_house.abs_pos
-            )
+            aspect_name = aspect["aspect"]
+            aspect_color = next((a["color"] for a in self.aspects_settings if a["name"] == aspect_name), None)
+            if aspect_color:
+                out += draw_aspect_line(
+                    r=r,
+                    ar=ar,
+                    aspect=aspect,
+                    color=aspect_color,
+                    seventh_house_degree_ut=self.user.seventh_house.abs_pos
+                )
         return out
 
     def _create_template_dictionary(self) -> ChartTemplateDictionary:

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/kr_types/kr_models.py

@@ -170,11 +170,9 @@ class AspectModel(SubscriptableBaseModel):
     aspect: str
     orbit: float
     aspect_degrees: int
-    aid: int
     diff: float
     p1: int
     p2: int
-    is_major: bool
 
 
 class ZodiacSignModel(SubscriptableBaseModel):

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/kr_types/settings_models.py

@@ -5,7 +5,7 @@
 
 
 from pydantic import Field
-from typing import List, Optional
+from typing import List, Optional, Union
 from kerykeion.kr_types.kr_models import SubscriptableBaseModel
 
 
@@ -78,10 +78,8 @@ class KerykeionSettingsAspectModel(SubscriptableBaseModel):
 
     degree: int = Field(title="Aspect Degrees", description="The degree of the aspect")
     name: str = Field(title="Aspect Name", description="The name of the aspect")
-    is_major: bool = Field(title="Aspect is Major", description="Is the aspect major?")
-    orb: int = Field(title="Aspect Orb", description="The orb of the aspect")
     color: str = Field(title="Aspect Color", description="The color of the aspect")
-
+    orb: Optional[int] = Field(title="Aspect Orb", description="The orb of the aspect", default=None)
 
 # Language Settings
 class KerykeionLanguageCelestialPointModel(SubscriptableBaseModel):

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/relationship_score/relationship_score_factory.py

@@ -40,6 +40,8 @@ class RelationshipScoreFactory:
         ("Rare Exceptional", float("inf")),
     ]
 
+    MAJOR_ASPECTS = {"conjunction", "opposition", "square", "trine", "sextile"}
+
     def __init__(
         self,
         first_subject: Union[AstrologicalSubject, AstrologicalSubjectModel],
@@ -76,7 +78,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
             points (int): Points to add.
         """
-        if self.use_only_major_aspects and not aspect["is_major"]:
+        if self.use_only_major_aspects and aspect["aspect"] not in self.MAJOR_ASPECTS:
             return
 
         self.score_value += points

{kerykeion-4.24.1 → kerykeion-4.24.2}/kerykeion/settings/kr.config.json

@@ -446,77 +446,66 @@
       "degree": 0,
       "name": "conjunction",
       "is_major": true,
-      "orb": 10,
       "color": "var(--kerykeion-chart-color-conjunction)"
     },
     {
       "degree": 30,
       "name": "semi-sextile",
       "is_major": false,
-      "orb": 1,
       "color": "var(--kerykeion-chart-color-semi-sextile)"
     },
     {
       "degree": 45,
       "name": "semi-square",
       "is_major": false,
-      "orb": 1,
       "color": "var(--kerykeion-chart-color-semi-square)"
     },
     {
       "degree": 60,
       "name": "sextile",
       "is_major": true,
-      "orb": 6,
       "color": "var(--kerykeion-chart-color-sextile)"
     },
     {
       "degree": 72,
       "name": "quintile",
       "is_major": false,
-      "orb": 1,
       "color": "var(--kerykeion-chart-color-quintile)"
     },
     {
       "degree": 90,
       "name": "square",
       "is_major": true,
-      "orb": 5,
       "color": "var(--kerykeion-chart-color-square)"
     },
     {
       "degree": 120,
       "name": "trine",
       "is_major": true,
-      "orb": 8,
       "color": "var(--kerykeion-chart-color-trine)"
     },
     {
       "degree": 135,
       "name": "sesquiquadrate",
       "is_major": false,
-      "orb": 1,
       "color": "var(--kerykeion-chart-color-sesquiquadrate)"
     },
     {
       "degree": 144,
       "name": "biquintile",
       "is_major": false,
-      "orb": 1,
       "color": "var(--kerykeion-chart-color-biquintile)"
     },
     {
       "degree": 150,
       "name": "quincunx",
       "is_major": false,
-      "orb": 1,
       "color": "var(--kerykeion-chart-color-quincunx)"
     },
     {
       "degree": 180,
       "name": "opposition",
       "is_major": true,
-      "orb": 10,
       "color": "var(--kerykeion-chart-color-opposition)"
     }
   ],

{kerykeion-4.24.1 → kerykeion-4.24.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kerykeion"
-version = "4.24.1"
+version = "4.24.2"
 authors = ["Giacomo Battaglia <kerykeion.astrology@gmail.com>"]
 description = "A python library for astrology."
 license = "AGPL-3.0"