kerykeion 4.23.0__tar.gz → 4.24.0__tar.gz

{kerykeion-4.23.0 → kerykeion-4.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.23.0
+Version: 4.24.0
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Software Development

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/aspects/aspects_utils.py

@@ -33,6 +33,7 @@ def get_aspect_from_two_points(
     diff = abs(point_one - point_two)
 
     for aid, aspect in enumerate(aspects_settings):
+        # TODO: Remove the "degree" element EVERYWHERE!
         aspect_degree = aspect["degree"] # type: ignore
         aspect_orb = aspect["orb"] # type: ignore
 

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/aspects/natal_aspects.py

@@ -11,10 +11,10 @@ from kerykeion.settings.kerykeion_settings import get_settings
 from dataclasses import dataclass, field
 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.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect
 from kerykeion.kr_types.kr_literals import AxialCusps, Planet
 from kerykeion.kr_types.settings_models import KerykeionSettingsModel
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
 
 
 
@@ -35,6 +35,7 @@ class NatalAspects:
     user: Union[AstrologicalSubject, AstrologicalSubjectModel]
     new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
     active_points: List[Union[AxialCusps, Planet]] = field(default_factory=lambda: DEFAULT_ACTIVE_POINTS)
+    active_aspects: List[ActiveAspect] = field(default_factory=lambda: DEFAULT_ACTIVE_ASPECTS)
 
     def __post_init__(self):
         self.settings = get_settings(self.new_settings_file)
@@ -112,17 +113,15 @@ 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.
+        The relevant aspects are the ones that are set as looping in the available_aspects list.
         """
 
         logging.debug("Relevant aspects not already calculated, calculating now...")
         self.all_aspects
 
         aspects_filtered = []
-
-        # Only pick aspects for which the is_active setting (specified usually in kr.config.json file) is true.
         for a in self.all_aspects_list:
-            if self.aspects_settings[a["aid"]]["is_active"] == True:
+            if a["aspect"] in [aspect["name"] for aspect in self.active_aspects]:
                 aspects_filtered.append(a)
 
         axes_list = AXES_LIST

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/aspects/synastry_aspects.py

@@ -11,11 +11,11 @@ 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.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect
 from kerykeion.kr_types.settings_models import KerykeionSettingsModel
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
+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
+from typing import Union, List
 
 
 class SynastryAspects(NatalAspects):
@@ -29,6 +29,7 @@ class SynastryAspects(NatalAspects):
         kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
         new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None,
         active_points: list[Union[AxialCusps, Planet]] = DEFAULT_ACTIVE_POINTS,
+        active_aspects: List[ActiveAspect] = DEFAULT_ACTIVE_ASPECTS,
     ):
         # Subjects
         self.first_user = kr_object_one
@@ -42,6 +43,7 @@ class SynastryAspects(NatalAspects):
         self.aspects_settings = self.settings.aspects
         self.axes_orbit_settings = self.settings.general_settings.axes_orbit
         self.active_points = active_points
+        self.active_aspects = active_aspects
 
         # Private variables of the aspects
         self._all_aspects: Union[list, None] = None

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/charts/charts_utils.py

@@ -742,6 +742,7 @@ def draw_transit_aspect_list(
         inner_path += f'<use transform="scale(0.4)" x="0" y="3" xlink:href="#{celestial_point_language[aspects_list[i]["p1"]]["name"]}" />'
 
         # 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"]}" />'
 
         # second planet symbol

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/charts/kerykeion_chart_svg.py

@@ -12,7 +12,7 @@ from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.synastry_aspects import SynastryAspects
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
-from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointModel, Sign
+from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointModel, Sign, ActiveAspect
 from kerykeion.kr_types import ChartTemplateDictionary
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsModel
@@ -39,7 +39,7 @@ from kerykeion.charts.charts_utils import (
 )
 from kerykeion.charts.draw_planets import draw_planets # type: ignore
 from kerykeion.utilities import get_houses_list
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
 from pathlib import Path
 from scour.scour import scourString
 from string import Template
@@ -64,6 +64,15 @@ class KerykeionChartSVG:
         - chart_language: Set the language for the chart (default: EN).
         - active_points: Set the active points for the chart (default: DEFAULT_ACTIVE_POINTS). Example:
             ["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "True_Node", "True_South_Node", "Ascendant", "Medium_Coeli", "Descendant", "Imum_Coeli"]
+        - active_aspects: Set the active aspects for the chart (default: DEFAULT_ACTIVE_ASPECTS). Example:
+            [
+                {"name": "conjunction", "orb": 10},
+                {"name": "opposition", "orb": 10},
+                {"name": "trine", "orb": 8},
+                {"name": "sextile", "orb": 6},
+                {"name": "square", "orb": 5},
+                {"name": "quintile", "orb": 1},
+            ]
     """
 
     # Constants
@@ -84,6 +93,12 @@ class KerykeionChartSVG:
     new_output_directory: Union[Path, None]
     new_settings_file: Union[Path, None, KerykeionSettingsModel, dict]
     output_directory: Path
+    new_settings_file: Union[Path, None, KerykeionSettingsModel, dict]
+    theme: Union[KerykeionChartTheme, None]
+    double_chart_aspect_grid_type: Literal["list", "table"]
+    chart_language: KerykeionChartLanguage
+    active_points: List[Union[Planet, AxialCusps]]
+    active_aspects: List[ActiveAspect]
 
     # Internal properties
     fire: float
@@ -117,11 +132,13 @@ class KerykeionChartSVG:
         double_chart_aspect_grid_type: Literal["list", "table"] = "list",
         chart_language: KerykeionChartLanguage = "EN",
         active_points: List[Union[Planet, AxialCusps]] = DEFAULT_ACTIVE_POINTS,
+        active_aspects: List[ActiveAspect] = DEFAULT_ACTIVE_ASPECTS,
     ):
-        # Directories:
         home_directory = Path.home()
         self.new_settings_file = new_settings_file
         self.chart_language = chart_language
+        self.active_points = active_points
+        self.active_aspects = active_aspects
 
         if new_output_directory:
             self.output_directory = Path(new_output_directory)
@@ -154,7 +171,11 @@ class KerykeionChartSVG:
 
         # Makes the sign number list.
         if self.chart_type == "Natal" or self.chart_type == "ExternalNatal":
-            natal_aspects_instance = NatalAspects(self.user, new_settings_file=self.new_settings_file, active_points=active_points)
+            natal_aspects_instance = NatalAspects(
+                self.user, new_settings_file=self.new_settings_file,
+                active_points=active_points,
+                active_aspects=active_aspects,
+            )
             self.aspects_list = natal_aspects_instance.relevant_aspects
 
         if self.chart_type == "Transit" or self.chart_type == "Synastry":
@@ -165,7 +186,13 @@ class KerykeionChartSVG:
             self.t_user = second_obj
 
             # Aspects
-            self.aspects_list = SynastryAspects(self.user, self.t_user, new_settings_file=self.new_settings_file, active_points=active_points).relevant_aspects
+            synastry_aspects_instance = SynastryAspects(
+                self.user, self.t_user,
+                new_settings_file=self.new_settings_file,
+                active_points=active_points,
+                active_aspects=active_aspects,
+            )
+            self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             self.t_available_kerykeion_celestial_points = []
             for body in available_celestial_points_names:

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/kr_types/kr_literals.py

@@ -105,11 +105,29 @@ Usually the standard is "Apparent Geocentric"
 
 
 SignsEmoji = Literal["♈️", "♉️", "♊️", "♋️", "♌️", "♍️", "♎️", "♏️", "♐️", "♑️", "♒️", "♓️"]
-
+"""Literal type for Zodiac Signs Emoji"""
 
 KerykeionChartTheme = Literal["light", "dark", "dark-high-contrast", "classic"]
+"""Literal type for Kerykeion Chart Themes"""
 
 
 KerykeionChartLanguage = Literal["EN", "FR", "PT", "IT", "CN", "ES", "RU", "TR", "DE", "HI"]
+"""Literal type for Kerykeion Chart Languages"""
 
 RelationshipScoreDescription = Literal["Minimal", "Medium", "Important", "Very Important", "Exceptional", "Rare Exceptional"]
+"""Literal type for Relationship Score Description"""
+
+AspectName = Literal[
+    "conjunction",
+    "semi-sextile",
+    "semi-square",
+    "sextile",
+    "quintile",
+    "square",
+    "trine",
+    "sesquiquadrate",
+    "biquintile",
+    "quincunx",
+    "opposition"
+]
+"""Literal type for all the available aspects names"""

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/kr_types/kr_models.py

@@ -4,8 +4,9 @@
 """
 
 
-from typing import Union, Optional
+from typing import Union, Optional, TypedDict
 from pydantic import BaseModel
+from kerykeion.kr_types.kr_literals import AspectName
 
 from kerykeion.kr_types import (
     AxialCusps,
@@ -196,3 +197,8 @@ class RelationshipScoreModel(SubscriptableBaseModel):
     is_destiny_sign: bool
     aspects: list[RelationshipScoreAspectModel]
     subjects: list[AstrologicalSubjectModel]
+
+
+class ActiveAspect(TypedDict):
+    name: AspectName
+    orb: int

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/kr_types/settings_models.py

@@ -78,7 +78,6 @@ 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_active: bool = Field(title="Aspect is Active", description="Is the aspect active?")
     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")

kerykeion-4.24.0/kerykeion/settings/config_constants.py

@@ -0,0 +1,47 @@
+from kerykeion.kr_types.kr_literals import Planet, AxialCusps, AspectName
+from kerykeion.kr_types.kr_models import ActiveAspect
+from typing import List, Union
+
+DEFAULT_ACTIVE_POINTS: List[Union[Planet, AxialCusps]] = [
+    "Sun",
+    "Moon",
+    "Mercury",
+    "Venus",
+    "Mars",
+    "Jupiter",
+    "Saturn",
+    "Uranus",
+    "Neptune",
+    "Pluto",
+    "Mean_Node",
+    # "True_Node",
+    "Chiron",
+    "Ascendant",
+    "Medium_Coeli",
+    # "Descendant",
+    # "Imum_Coeli",
+    "Mean_Lilith",
+    "Mean_South_Node",
+    # "True_South_Node"
+]
+"""
+Default list of active points in the charts or aspects calculations.
+"""
+
+DEFAULT_ACTIVE_ASPECTS: List[ActiveAspect] = [
+    {"name": "conjunction", "orb": 10},
+    {"name": "opposition", "orb": 10},
+    {"name": "trine", "orb": 8},
+    {"name": "sextile", "orb": 6},
+    {"name": "square", "orb": 5},
+    {"name": "quintile", "orb": 1},
+    # {"name": "semi-sextile", "orb": 1},
+    # {"name": "semi-square", "orb": 1},
+    # {"name": "sesquiquadrate", "orb": 1},
+    # {"name": "biquintile", "orb": 1},
+    # {"name": "quincunx", "orb": 1},
+]
+"""
+Default list of active aspects in the aspects calculations.
+The full list of aspects is available in the `kr_types.kr_literals.AspectName` literal.
+"""

{kerykeion-4.23.0 → kerykeion-4.24.0}/kerykeion/settings/kr.config.json

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

{kerykeion-4.23.0 → kerykeion-4.24.0}/pyproject.toml

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

kerykeion-4.23.0/kerykeion/settings/config_constants.py

@@ -1,28 +0,0 @@
-from kerykeion.kr_types.kr_literals import Planet, AxialCusps
-from typing import List, Union
-
-DEFAULT_ACTIVE_POINTS: List[Union[Planet, AxialCusps]] = [
-    "Sun",
-    "Moon",
-    "Mercury",
-    "Venus",
-    "Mars",
-    "Jupiter",
-    "Saturn",
-    "Uranus",
-    "Neptune",
-    "Pluto",
-    "Mean_Node",
-    # "True_Node",
-    "Chiron",
-    "Ascendant",
-    "Medium_Coeli",
-    # "Descendant",
-    # "Imum_Coeli",
-    "Mean_Lilith",
-    "Mean_South_Node",
-    # "True_South_Node"
-]
-"""
-Default list of active points in the charts or aspects calculations.
-"""