kerykeion 4.22.0rc1__tar.gz → 4.23.0__tar.gz

{kerykeion-4.22.0rc1 → kerykeion-4.23.0}/PKG-INFO

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

{kerykeion-4.22.0rc1 → kerykeion-4.23.0}/kerykeion/aspects/aspects_utils.py

@@ -9,6 +9,7 @@ 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.kr_literals import Planet, AxialCusps
 from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsAspectModel
 
 
@@ -72,7 +73,7 @@ def planet_id_decoder(planets_settings: list[KerykeionSettingsCelestialPointMode
 
 
 def get_active_points_list(
-    subject: Union[AstrologicalSubject, AstrologicalSubjectModel], settings: Union[KerykeionSettingsModel, dict]
+    subject: Union[AstrologicalSubject, AstrologicalSubjectModel], settings: Union[KerykeionSettingsModel, dict], active_points: list = []
 ) -> list:
     """
     Given an astrological subject and the settings, return a list of the active points.
@@ -85,7 +86,7 @@ def get_active_points_list(
     """
     point_list = []
     for planet in settings["celestial_points"]:
-        if planet["is_active"] == True:
+        if planet["name"] in active_points:
             point_list.append(subject[planet["name"].lower()])
 
     return point_list

{kerykeion-4.22.0rc1 → kerykeion-4.23.0}/kerykeion/aspects/natal_aspects.py

@@ -6,13 +6,16 @@
 from pathlib import Path
 from kerykeion import AstrologicalSubject
 import logging
-from typing import Union
+from typing import Union, List
 from kerykeion.settings.kerykeion_settings import get_settings
-from dataclasses import dataclass
+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_literals import AxialCusps, Planet
 from kerykeion.kr_types.settings_models import KerykeionSettingsModel
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
+
 
 
 AXES_LIST = [
@@ -31,6 +34,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)
 
     def __post_init__(self):
         self.settings = get_settings(self.new_settings_file)
@@ -38,6 +42,7 @@ class NatalAspects:
         self.celestial_points = self.settings.celestial_points
         self.aspects_settings = self.settings.aspects
         self.axes_orbit_settings = self.settings.general_settings.axes_orbit
+        self.active_points = self.active_points
 
     @cached_property
     def all_aspects(self):
@@ -47,7 +52,7 @@ class NatalAspects:
         without repetitions.
         """
 
-        active_points_list = get_active_points_list(self.user, self.settings)
+        active_points_list = get_active_points_list(self.user, self.settings, self.active_points)
 
         self.all_aspects_list = []
 

{kerykeion-4.22.0rc1 → kerykeion-4.23.0}/kerykeion/aspects/synastry_aspects.py

@@ -13,6 +13,8 @@ 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 kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
+from kerykeion.kr_types.kr_literals import AxialCusps, Planet
 from typing import Union
 
 
@@ -26,6 +28,7 @@ class SynastryAspects(NatalAspects):
         kr_object_one: Union[AstrologicalSubject, AstrologicalSubjectModel],
         kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
         new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None,
+        active_points: list[Union[AxialCusps, Planet]] = DEFAULT_ACTIVE_POINTS,
     ):
         # Subjects
         self.first_user = kr_object_one
@@ -38,6 +41,7 @@ class SynastryAspects(NatalAspects):
         self.celestial_points = self.settings.celestial_points
         self.aspects_settings = self.settings.aspects
         self.axes_orbit_settings = self.settings.general_settings.axes_orbit
+        self.active_points = active_points
 
         # Private variables of the aspects
         self._all_aspects: Union[list, None] = None
@@ -55,8 +59,8 @@ class SynastryAspects(NatalAspects):
             return self._all_aspects
 
         # 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)
+        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 = []
 

{kerykeion-4.22.0rc1 → kerykeion-4.23.0}/kerykeion/charts/kerykeion_chart_svg.py

@@ -16,7 +16,7 @@ from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointMode
 from kerykeion.kr_types import ChartTemplateDictionary
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsModel
-from kerykeion.kr_types.kr_literals import KerykeionChartTheme, KerykeionChartLanguage
+from kerykeion.kr_types.kr_literals import KerykeionChartTheme, KerykeionChartLanguage, AxialCusps, Planet
 from kerykeion.charts.charts_utils import (
     draw_zodiac_slice,
     convert_latitude_coordinate_to_string,
@@ -39,13 +39,13 @@ 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 pathlib import Path
 from scour.scour import scourString
 from string import Template
 from typing import Union, List, Literal
 from datetime import datetime
 
-
 class KerykeionChartSVG:
     """
     Creates the instance that can generate the chart with the
@@ -62,6 +62,8 @@ class KerykeionChartSVG:
             That's useful if you want to use your own CSS file customizing the value of the default theme variables.
         - double_chart_aspect_grid_type: Set the type of the aspect grid for the double chart (transit or synastry). (Default: list.)
         - 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"]
     """
 
     # Constants
@@ -114,6 +116,7 @@ class KerykeionChartSVG:
         theme: Union[KerykeionChartTheme, None] = "classic",
         double_chart_aspect_grid_type: Literal["list", "table"] = "list",
         chart_language: KerykeionChartLanguage = "EN",
+        active_points: List[Union[Planet, AxialCusps]] = DEFAULT_ACTIVE_POINTS,
     ):
         # Directories:
         home_directory = Path.home()
@@ -133,8 +136,10 @@ class KerykeionChartSVG:
 
         self.available_planets_setting = []
         for body in self.planets_settings:
-            if body['is_active'] == False:
+            if body["name"] not in active_points:
                 continue
+            else:
+                body["is_active"] = True
 
             self.available_planets_setting.append(body)
 
@@ -149,7 +154,7 @@ 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)
+            natal_aspects_instance = NatalAspects(self.user, new_settings_file=self.new_settings_file, active_points=active_points)
             self.aspects_list = natal_aspects_instance.relevant_aspects
 
         if self.chart_type == "Transit" or self.chart_type == "Synastry":
@@ -160,7 +165,7 @@ class KerykeionChartSVG:
             self.t_user = second_obj
 
             # Aspects
-            self.aspects_list = SynastryAspects(self.user, self.t_user, new_settings_file=self.new_settings_file).relevant_aspects
+            self.aspects_list = SynastryAspects(self.user, self.t_user, new_settings_file=self.new_settings_file, active_points=active_points).relevant_aspects
 
             self.t_available_kerykeion_celestial_points = []
             for body in available_celestial_points_names:
@@ -633,8 +638,7 @@ class KerykeionChartSVG:
         with open(chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(self.template)
 
-        logging.info(f"SVG Generated Correctly in: {chartname}")
-
+        print(f"SVG Generated Correctly in: {chartname}")
     def makeWheelOnlyTemplate(self, minify: bool = False):
         """Creates the template for the SVG file with only the wheel"""
 
@@ -661,8 +665,7 @@ class KerykeionChartSVG:
         with open(chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(template)
 
-        logging.info(f"SVG Generated Correctly in: {chartname}")
-
+        print(f"SVG Generated Correctly in: {chartname}")
     def makeAspectGridOnlyTemplate(self, minify: bool = False):
         """Creates the template for the SVG file with only the aspect grid"""
 
@@ -695,8 +698,7 @@ class KerykeionChartSVG:
         with open(chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(template)
 
-        logging.info(f"SVG Generated Correctly in: {chartname}")
-
+        print(f"SVG Generated Correctly in: {chartname}")
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging

{kerykeion-4.22.0rc1 → kerykeion-4.23.0}/kerykeion/kr_types/settings_models.py

@@ -5,7 +5,7 @@
 
 
 from pydantic import Field
-from typing import List
+from typing import List, Optional
 from kerykeion.kr_types.kr_models import SubscriptableBaseModel
 
 
@@ -17,10 +17,10 @@ class KerykeionSettingsCelestialPointModel(SubscriptableBaseModel):
     id: int = Field(title="Celestial Point ID", description="Celestial Point ID according to Pyswisseph")
     name: str = Field(title="Celestial Point Name", description="Celestial Point Name")
     color: str = Field(title="Celestial Point Color", description="Celestial Point Color, used in the chart")
-    is_active: bool = Field(title="Celestial Point is Active", description="Indicates if the celestial point is active in the chart")
     element_points: int = Field(title="Celestial Point Element Points", description="Element Points given to the celestial point")
     related_zodiac_signs: List[int] = Field(title="Celestial Point Related Zodiac Signs", description="Zodiac Signs related to the celestial point")
     label: str = Field(title="Celestial Point Label", description="The name of the celestial point in the chart, it can be different from the name")
+    is_active: Optional[bool] = Field(title="Celestial Point is Active", description="Indicates if the celestial point is active in the chart", default=None)
 
 
 # Chart Colors Settings

kerykeion-4.23.0/kerykeion/settings/config_constants.py

@@ -0,0 +1,28 @@
+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.
+"""

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

@@ -536,7 +536,6 @@
       "id": 0,
       "name": "Sun",
       "color": "var(--kerykeion-chart-color-sun)",
-      "is_active": true,
       "element_points": 40,
       "related_zodiac_signs": ["4"],
       "label": "Sun"
@@ -545,7 +544,6 @@
       "id": 1,
       "name": "Moon",
       "color": "var(--kerykeion-chart-color-moon)",
-      "is_active": true,
       "element_points": 40,
       "related_zodiac_signs": ["3"],
       "label": "Moon"
@@ -554,7 +552,6 @@
       "id": 2,
       "name": "Mercury",
       "color": "var(--kerykeion-chart-color-mercury)",
-      "is_active": true,
       "element_points": 15,
       "related_zodiac_signs": ["2", "5"],
       "label": "Mercury"
@@ -563,7 +560,6 @@
       "id": 3,
       "name": "Venus",
       "color": "var(--kerykeion-chart-color-venus)",
-      "is_active": true,
       "element_points": 15,
       "related_zodiac_signs": ["1", "6"],
       "label": "Venus"
@@ -572,7 +568,6 @@
       "id": 4,
       "name": "Mars",
       "color": "var(--kerykeion-chart-color-mars)",
-      "is_active": true,
       "element_points": 15,
       "related_zodiac_signs": ["0"],
       "label": "Mars"
@@ -581,7 +576,6 @@
       "id": 5,
       "name": "Jupiter",
       "color": "var(--kerykeion-chart-color-jupiter)",
-      "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["8"],
       "label": "Jupiter"
@@ -590,7 +584,6 @@
       "id": 6,
       "name": "Saturn",
       "color": "var(--kerykeion-chart-color-saturn)",
-      "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["9"],
       "label": "Saturn"
@@ -599,7 +592,6 @@
       "id": 7,
       "name": "Uranus",
       "color": "var(--kerykeion-chart-color-uranus)",
-      "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["10"],
       "label": "Uranus"
@@ -608,7 +600,6 @@
       "id": 8,
       "name": "Neptune",
       "color": "var(--kerykeion-chart-color-neptune)",
-      "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["11"],
       "label": "Neptune"
@@ -617,7 +608,6 @@
       "id": 9,
       "name": "Pluto",
       "color": "var(--kerykeion-chart-color-pluto)",
-      "is_active": true,
       "element_points": 10,
       "related_zodiac_signs": ["7"],
       "label": "Pluto"
@@ -626,7 +616,6 @@
       "id": 10,
       "name": "Mean_Node",
       "color": "var(--kerykeion-chart-color-mean-node)",
-      "is_active": true,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "Mean_Node"
@@ -635,7 +624,6 @@
       "id": 11,
       "name": "True_Node",
       "color": "var(--kerykeion-chart-color-true-node)",
-      "is_active": false,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "True_Node"
@@ -644,7 +632,6 @@
       "id": 12,
       "name": "Chiron",
       "color": "var(--kerykeion-chart-color-chiron)",
-      "is_active": true,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "Chiron"
@@ -653,7 +640,6 @@
       "id": 13,
       "name": "Ascendant",
       "color": "var(--kerykeion-chart-color-first-house)",
-      "is_active": true,
       "element_points": 40,
       "related_zodiac_signs": [],
       "label": "Asc"
@@ -662,7 +648,6 @@
       "id": 14,
       "name": "Medium_Coeli",
       "color": "var(--kerykeion-chart-color-tenth-house)",
-      "is_active": true,
       "element_points": 20,
       "related_zodiac_signs": [],
       "label": "Mc"
@@ -671,7 +656,6 @@
       "id": 15,
       "name": "Descendant",
       "color": "var(--kerykeion-chart-color-seventh-house)",
-      "is_active": false,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "Dsc"
@@ -680,7 +664,6 @@
       "id": 16,
       "name": "Imum_Coeli",
       "color": "var(--kerykeion-chart-color-fourth-house)",
-      "is_active": false,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "Ic"
@@ -689,7 +672,6 @@
       "id": 17,
       "name": "Mean_Lilith",
       "color": "var(--kerykeion-chart-color-mean-lilith)",
-      "is_active": true,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "Mean_Lilith"
@@ -698,7 +680,6 @@
       "id": 18,
       "name": "Mean_South_Node",
       "color": "var(--kerykeion-chart-color-mean-node)",
-      "is_active": true,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "Mean_South_Node"
@@ -707,7 +688,6 @@
       "id": 19,
       "name": "True_South_Node",
       "color": "var(--kerykeion-chart-color-true-node)",
-      "is_active": false,
       "element_points": 0,
       "related_zodiac_signs": [],
       "label": "True_South_Node"

{kerykeion-4.22.0rc1 → kerykeion-4.23.0}/pyproject.toml

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