kerykeion 4.21.0__py3-none-any.whl → 4.22.0__py3-none-any.whl

kerykeion/aspects/natal_aspects.py

@@ -16,10 +16,10 @@ from kerykeion.kr_types.settings_models import KerykeionSettingsModel
 
 
 AXES_LIST = [
-    "First_House",
-    "Tenth_House",
-    "Seventh_House",
-    "Fourth_House",
+    "Ascendant",
+    "Medium_Coeli",
+    "Descendant",
+    "Imum_Coeli",
 ]
 
 
@@ -54,18 +54,23 @@ class NatalAspects:
         for first in range(len(active_points_list)):
             # Generates the aspects list without repetitions
             for second in range(first + 1, len(active_points_list)):
-                # South Node and North Node are always in opposition
-                nodes_pairs = {
+                # AC/DC, MC/IC and North/South nodes are always in opposition
+                opposite_pairs = {
+                    ("Ascendant", "Descendant"),
+                    ("Descendant", "Ascendant"),
+                    ("Medium_Coeli", "Imum_Coeli"),
+                    ("Imum_Coeli", "Medium_Coeli"),
                     ("True_Node", "True_South_Node"),
                     ("Mean_Node", "Mean_South_Node"),
                     ("True_South_Node", "True_Node"),
                     ("Mean_South_Node", "Mean_Node"),
                 }
-                if (active_points_list[first]["name"], active_points_list[second]["name"]) in nodes_pairs:
+                if (active_points_list[first]["name"], active_points_list[second]["name"]) in opposite_pairs:
                     continue
 
                 aspect = get_aspect_from_two_points(
-                    self.aspects_settings, active_points_list[first]["abs_pos"],
+                    self.aspects_settings,
+                    active_points_list[first]["abs_pos"],
                     active_points_list[second]["abs_pos"]
                 )
 
@@ -109,6 +114,8 @@ class NatalAspects:
         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:
                 aspects_filtered.append(a)
@@ -116,6 +123,8 @@ class NatalAspects:
         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_list_subtract = []
         for a in aspects_filtered:
             counter += 1
@@ -144,7 +153,7 @@ if __name__ == "__main__":
 
     # All aspects as a list of dictionaries
     aspects = NatalAspects(johnny)
-    print([a.model_dump() for a in aspects.all_aspects])
+    #print([a.model_dump() for a in aspects.all_aspects])
 
     print("\n")
 

kerykeion/astrological_subject.py

@@ -8,7 +8,9 @@ import swisseph as swe
 import logging
 import warnings
 
+import math
 from datetime import datetime
+
 from functools import cached_property
 from kerykeion.fetch_geonames import FetchGeonames
 from kerykeion.kr_types import (
@@ -22,7 +24,8 @@ from kerykeion.kr_types import (
     HousesSystemIdentifier,
     PerspectiveType,
     Planet,
-    Houses
+    Houses,
+    AxialCusps,
 )
 from kerykeion.utilities import (
     get_number_from_name,
@@ -144,6 +147,12 @@ class AstrologicalSubject:
     true_south_node: KerykeionPointModel
     mean_south_node: KerykeionPointModel
 
+    # Axes
+    asc: KerykeionPointModel
+    dsc: KerykeionPointModel
+    mc: KerykeionPointModel
+    ic: KerykeionPointModel
+
     # Houses
     first_house: KerykeionPointModel
     second_house: KerykeionPointModel
@@ -161,13 +170,15 @@ class AstrologicalSubject:
     # Lists
     _houses_list: list[KerykeionPointModel]
     _houses_degree_ut: list[float]
+    planets_names_list: list[Planet]
+    houses_names_list: list[Houses]
+    axial_cusps_names_list: list[AxialCusps]
 
     # Enable or disable features
     disable_chiron: Union[None, bool]
     disable_chiron_and_lilith: bool
 
-    planets_names_list: list[Planet]
-    houses_names_list: list[Houses]
+    lunar_phase: LunarPhaseModel
 
     def __init__(
         self,
@@ -436,20 +447,29 @@ class AstrologicalSubject:
             Y  APC houses
         """
 
+        _ascmc = (-1.0, -1.0)
+
         if self.zodiac_type == "Sidereal":
-            self._houses_degree_ut = swe.houses_ex(
+            cusps, ascmc = swe.houses_ex(
                 tjdut=self.julian_day,
                 lat=self.lat, lon=self.lng,
                 hsys=str.encode(self.houses_system_identifier),
                 flags=swe.FLG_SIDEREAL
-            )[0]
+            )
+            self._houses_degree_ut = cusps
+            _ascmc = ascmc
 
         elif self.zodiac_type == "Tropic":
-            self._houses_degree_ut = swe.houses(
+            cusps, ascmc = swe.houses(
                 tjdut=self.julian_day, lat=self.lat,
                 lon=self.lng,
                 hsys=str.encode(self.houses_system_identifier)
-            )[0]
+            )
+            self._houses_degree_ut = cusps
+            _ascmc = ascmc
+
+        else:
+            raise KerykeionException("Not a valid zodiac type: ", self.zodiac_type)
 
         point_type: PointType = "House"
 
@@ -485,6 +505,19 @@ class AstrologicalSubject:
             self.twelfth_house,
         ]
 
+        # AxialCusps
+        point_type: PointType = "AxialCusps"
+
+        # Calculate ascendant and medium coeli
+        self.ascendant = get_kerykeion_point_from_degree(_ascmc[0], "Ascendant", point_type=point_type)
+        self.medium_coeli = get_kerykeion_point_from_degree(_ascmc[1], "Medium_Coeli", point_type=point_type)
+        # For descendant and imum coeli there exist no Swiss Ephemeris library calculation function,
+        # but they are simply opposite the the ascendant and medium coeli
+        dsc_deg = math.fmod(_ascmc[0] + 180, 360)
+        ic_deg = math.fmod(_ascmc[1] + 180, 360)
+        self.descendant = get_kerykeion_point_from_degree(dsc_deg, "Descendant", point_type=point_type)
+        self.imum_coeli = get_kerykeion_point_from_degree(ic_deg, "Imum_Coeli", point_type=point_type)
+
     def _initialize_planets(self) -> None:
         """Defines body positon in signs and information and
         stores them in dictionaries"""
@@ -505,8 +538,10 @@ class AstrologicalSubject:
         true_node_deg = swe.calc(self.julian_day, 11, self._iflag)[0][0]
         # For south nodes there exist no Swiss Ephemeris library calculation function,
         # but they are simply opposite the north node.
-        mean_south_node_deg = (mean_node_deg + 180) % 360
-        true_south_node_deg = (true_node_deg + 180) % 360
+        mean_south_node_deg = math.fmod(mean_node_deg + 180, 360)
+        true_south_node_deg = math.fmod(true_node_deg + 180, 360)
+
+        # AC/DC axis and MC/IC axis were already calculated previously...
 
         self.sun = get_kerykeion_point_from_degree(sun_deg, "Sun", point_type=point_type)
         self.moon = get_kerykeion_point_from_degree(moon_deg, "Moon", point_type=point_type)
@@ -523,6 +558,13 @@ class AstrologicalSubject:
         self.mean_south_node = get_kerykeion_point_from_degree(mean_south_node_deg, "Mean_South_Node", point_type=point_type)
         self.true_south_node = get_kerykeion_point_from_degree(true_south_node_deg, "True_South_Node", point_type=point_type)
 
+        # Note that in whole-sign house systems ac/dc or mc/ic axes may not align with house cusps.
+        # Therefore, for the axes we need to calculate house positions explicitly too.
+        self.ascendant.house = get_planet_house(self.ascendant.abs_pos, self._houses_degree_ut)
+        self.descendant.house = get_planet_house(self.descendant.abs_pos, self._houses_degree_ut)
+        self.medium_coeli.house = get_planet_house(self.medium_coeli.abs_pos, self._houses_degree_ut)
+        self.imum_coeli.house = get_planet_house(self.imum_coeli.abs_pos, self._houses_degree_ut)
+
         self.sun.house = get_planet_house(sun_deg, self._houses_degree_ut)
         self.moon.house = get_planet_house(moon_deg, self._houses_degree_ut)
         self.mercury.house = get_planet_house(mercury_deg, self._houses_degree_ut)
@@ -577,6 +619,9 @@ class AstrologicalSubject:
 
         # FIXME: Update after removing planets_list
         self.planets_names_list = [planet["name"] for planet in planets_list]
+        self.axial_cusps_names_list = [
+            axis["name"] for axis in [self.ascendant, self.descendant, self.medium_coeli, self.imum_coeli]
+        ]
 
         # Check in retrograde or not:
         for planet in planets_list:
@@ -589,11 +634,17 @@ class AstrologicalSubject:
             elif planet_number == 1100: # Number of True South Node
                 planet_number = 11      # Number of True North Node
 
+
             if swe.calc(self.julian_day, planet_number, self._iflag)[0][3] < 0:
                 planet["retrograde"] = True
             else:
                 planet["retrograde"] = False
 
+        # AC/DC and MC/IC axes are never retrograde. For consistency, set them to be not retrograde.
+        self.ascendant.retrograde = False
+        self.descendant.retrograde = False
+        self.medium_coeli.retrograde = False
+        self.imum_coeli.retrograde = False
 
     def _initialize_moon_phase(self) -> None:
         """

kerykeion/charts/charts_utils.py

@@ -18,13 +18,6 @@ def get_decoded_kerykeion_celestial_point_name(input_planet_name: str, celestial
         str: The decoded celestial point name.
     """
 
-    # Dictionary for special house names
-    special_house_names = {
-        "First_House": "Asc",
-        "Seventh_House": "Dsc",
-        "Tenth_House": "Mc",
-        "Fourth_House": "Ic"
-    }
 
     # Get the language model keys
     language_keys = celestial_point_language.model_dump().keys()
@@ -32,11 +25,8 @@ def get_decoded_kerykeion_celestial_point_name(input_planet_name: str, celestial
     # Check if the input planet name exists in the language model
     if input_planet_name in language_keys:
         return celestial_point_language[input_planet_name]
-
-    # Return the special house name if it exists, otherwise return an empty string
-    decoded_special_name = special_house_names.get(input_planet_name, "")
-    return celestial_point_language[decoded_special_name]
-
+    else:
+        raise KerykeionException(f"Celestial point {input_planet_name} not found in language model.")
 
 def decHourJoin(inH: int, inM: int, inS: int) -> float:
     """Join hour, minutes, seconds, timezone integer to hour float.

kerykeion/charts/kerykeion_chart_svg.py

@@ -88,7 +88,6 @@ class KerykeionChartSVG:
     earth: float
     air: float
     water: float
-    main_radius: float
     first_circle_radius: float
     second_circle_radius: float
     third_circle_radius: float
@@ -634,8 +633,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"""
 
@@ -662,8 +660,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"""
 
@@ -696,8 +693,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/charts/templates/aspect_grid_only.xml

@@ -176,16 +176,16 @@ OpenAstro.org -->
                     style="fill: $planets_color_16;" />
             </g>
         </symbol>
-        <symbol id="First_House">
+        <symbol id="Ascendant">
             <text y="20" style="font-size: 22px; fill: $planets_color_12">As</text>
         </symbol>
-        <symbol id="Tenth_House">
+        <symbol id="Medium_Coeli">
             <text y="20" style="font-size: 20px; fill: $planets_color_13">Mc</text>
         </symbol>
-        <symbol id="Seventh_House">
+        <symbol id="Descendant">
             <text y="20" style="font-size: 22px; fill: $planets_color_14">Ds</text>
         </symbol>
-        <symbol id="Fourth_House">
+        <symbol id="Imum_Coeli">
             <text y="20" style="font-size: 22px; fill: $planets_color_15">Ic</text>
         </symbol>
         <!-- Zodiac -->

kerykeion/charts/templates/chart.xml

@@ -273,16 +273,16 @@ OpenAstro.org -->
                     style="fill: $planets_color_16;" />
             </g>
         </symbol>
-        <symbol id="First_House">
+        <symbol id="Ascendant">
             <text y="20" style="font-size: 22px; fill: $planets_color_12">As</text>
         </symbol>
-        <symbol id="Tenth_House">
+        <symbol id="Medium_Coeli">
             <text y="20" style="font-size: 20px; fill: $planets_color_13">Mc</text>
         </symbol>
-        <symbol id="Seventh_House">
+        <symbol id="Descendant">
             <text y="20" style="font-size: 22px; fill: $planets_color_14">Ds</text>
         </symbol>
-        <symbol id="Fourth_House">
+        <symbol id="Imum_Coeli">
             <text y="20" style="font-size: 22px; fill: $planets_color_15">Ic</text>
         </symbol>
         <!-- Zodiac -->

kerykeion/charts/templates/wheel_only.xml

@@ -223,16 +223,16 @@
               style="fill: $planets_color_16;" />
           </g>
         </symbol>
-        <symbol id="First_House">
+        <symbol id="Ascendant">
             <text y="20" style="font-size: 22px; fill: $planets_color_12">As</text>
         </symbol>
-        <symbol id="Tenth_House">
+        <symbol id="Medium_Coeli">
             <text y="20" style="font-size: 20px; fill: $planets_color_13">Mc</text>
         </symbol>
-        <symbol id="Seventh_House">
+        <symbol id="Descendant">
             <text y="20" style="font-size: 22px; fill: $planets_color_14">Ds</text>
         </symbol>
-        <symbol id="Fourth_House">
+        <symbol id="Imum_Coeli">
             <text y="20" style="font-size: 22px; fill: $planets_color_15">Ic</text>
         </symbol>
             <!-- Zodiac -->

kerykeion/enums.py

@@ -18,6 +18,10 @@ class Planets(Enum):
     TRUE_SOUTH_NODE = "True_South_Node"
     MEAN_SOUTH_NODE = "Mean_South_Node"
     MEAN_LILITH = "Mean_Lilith"
+    ASCENDANT = "Ascendant"
+    DESCENDANT = "Descendant"
+    MEDIUM_COELI = "Medium_Coeli"
+    IMUM_COELI = "Imum_Coeli"
 
 
 class Aspects(Enum):

kerykeion/ephemeris_data.py

@@ -1,5 +1,5 @@
 from kerykeion import AstrologicalSubject
-from kerykeion.utilities import get_houses_list, get_available_planets_list
+from kerykeion.utilities import get_houses_list, get_available_astrological_points_list
 from kerykeion.astrological_subject import DEFAULT_HOUSES_SYSTEM_IDENTIFIER, DEFAULT_PERSPECTIVE_TYPE, DEFAULT_ZODIAC_TYPE
 from kerykeion.kr_types import EphemerisDictModel
 from kerykeion.kr_types import SiderealMode, HousesSystemIdentifier, PerspectiveType, ZodiacType
@@ -142,7 +142,7 @@ class EphemerisDataFactory:
             )
 
             houses_list = get_houses_list(subject)
-            available_planets = get_available_planets_list(subject)
+            available_planets = get_available_astrological_points_list(subject)
 
             ephemeris_data_list.append({"date": date.isoformat(), "planets": available_planets, "houses": houses_list})
 

kerykeion/kr_types/kr_literals.py

@@ -28,6 +28,9 @@ HouseNumbers = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
 Planet = Literal["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "Mean_Node", "True_Node", "Mean_South_Node", "True_South_Node", "Chiron", "Mean_Lilith"]
 """Literal type for Planets"""
 
+AxialCusps = Literal["Ascendant", "Medium_Coeli", "Descendant", "Imum_Coeli"]
+"""Literal type for Axial Cusps"""
+
 
 Element = Literal["Air", "Fire", "Earth", "Water"]
 """Literal type for Elements"""
@@ -41,7 +44,7 @@ ChartType = Literal["Natal", "ExternalNatal", "Synastry", "Transit"]
 """Literal type for Chart Types"""
 
 
-PointType = Literal["Planet", "House"]
+PointType = Literal["Planet", "House", "AxialCusps"]
 """Literal type for Point Types"""
 
 

kerykeion/kr_types/kr_models.py

@@ -8,6 +8,7 @@ from typing import Union, Optional
 from pydantic import BaseModel
 
 from kerykeion.kr_types import (
+    AxialCusps,
     LunarPhaseEmoji,
     LunarPhaseName,
     Planet,
@@ -57,7 +58,7 @@ class KerykeionPointModel(SubscriptableBaseModel):
     Kerykeion Point Model
     """
 
-    name: Union[Planet, Houses]
+    name: Union[Planet, Houses, AxialCusps]
     quality: Quality
     element: Element
     sign: Sign
@@ -97,6 +98,7 @@ class AstrologicalSubjectModel(SubscriptableBaseModel):
     local_time: float
     # <-- Deprecated properties
 
+
     # Planets
     sun: KerykeionPointModel
     moon: KerykeionPointModel
@@ -109,6 +111,12 @@ class AstrologicalSubjectModel(SubscriptableBaseModel):
     neptune: KerykeionPointModel
     pluto: KerykeionPointModel
 
+    # Axes
+    ascendant: KerykeionPointModel
+    descendant: KerykeionPointModel
+    medium_coeli: KerykeionPointModel
+    imum_coeli: KerykeionPointModel
+
     # Optional Planets:
     chiron: Union[KerykeionPointModel, None]
     mean_lilith: Union[KerykeionPointModel, None]
@@ -133,15 +141,18 @@ class AstrologicalSubjectModel(SubscriptableBaseModel):
     mean_south_node: KerykeionPointModel
     true_south_node: KerykeionPointModel
 
-    lunar_phase: LunarPhaseModel
-    """Lunar phase model"""
-
     planets_names_list: list[Planet]
     """Ordered list of available planets names"""
 
+    axial_cusps_names_list: list[AxialCusps]
+    """Ordered list of available axes names"""
+
     houses_names_list: list[Houses]
     """Ordered list of houses names"""
 
+    lunar_phase: LunarPhaseModel
+    """Lunar phase model"""
+
 
 class EphemerisDictModel(SubscriptableBaseModel):
     date: str

kerykeion/kr_types/settings_models.py

@@ -104,10 +104,10 @@ class KerykeionLanguageCelestialPointModel(SubscriptableBaseModel):
     True_Node: str = Field(title="True Node", description="The name of True Node in the chart, in the language")
     Mean_Node: str = Field(title="Mean Node", description="The name of Mean Node in the chart, in the language")
     Chiron: str = Field(title="Chiron", description="The name of Chiron in the chart, in the language")
-    Asc: str = Field(title="Ascendant", description="The name of Ascendant in the chart, in the language")
-    Mc: str = Field(title="Medium Coeli", description="The name of Medium Coeli in the chart, in the language")
-    Dsc: str = Field(title="Descendant", description="The name of Descendant in the chart, in the language")
-    Ic: str = Field(title="Imum Coeli", description="The name of Imum Coeli in the chart, in the language")
+    Ascendant: str = Field(title="Ascendant", description="The name of Ascendant in the chart, in the language")
+    Descendant: str = Field(title="Descendant", description="The name of Descendant in the chart, in the language")
+    Medium_Coeli: str = Field(title="Medium Coeli", description="The name of Medium Coeli in the chart, in the language")
+    Imum_Coeli: str = Field(title="Imum Coeli", description="The name of Imum Coeli in the chart, in the language")
     Mean_Lilith: str = Field(title="Mean Lilith", description="The name of Mean Lilith in the chart, in the language")
     True_South_Node: str = Field(title="True South Node", description="The name of True South Node in the chart, in the language")
     Mean_South_Node: str = Field(title="Mean South Node", description="The name of Mean South Node in the chart, in the language")

kerykeion/relationship_score/relationship_score_factory.py

@@ -148,7 +148,7 @@ class RelationshipScoreFactory:
         Args:
             aspect (dict): Aspect information.
         """
-        if {aspect["p1_name"], aspect["p2_name"]} == {"Sun", "First_House"}:
+        if {aspect["p1_name"], aspect["p2_name"]} == {"Sun", "Ascendant"}:
             points = 4
             self._evaluate_aspect(aspect, points)
 
@@ -160,7 +160,7 @@ class RelationshipScoreFactory:
         Args:
             aspect (dict): Aspect information.
         """
-        if {aspect["p1_name"], aspect["p2_name"]} == {"Moon", "First_House"}:
+        if {aspect["p1_name"], aspect["p2_name"]} == {"Moon", "Ascendant"}:
             points = 4
             self._evaluate_aspect(aspect, points)
 

kerykeion/report.py

@@ -1,6 +1,6 @@
 from kerykeion import AstrologicalSubject
-from terminaltables import AsciiTable
-from kerykeion.utilities import get_houses_list, get_available_planets_list
+from simple_ascii_tables import AsciiTable
+from kerykeion.utilities import get_houses_list, get_available_astrological_points_list
 from typing import Union
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 
@@ -54,7 +54,7 @@ class Report:
                 ("R" if planet.retrograde else "-"),
                 planet.house,
             ]
-            for planet in get_available_planets_list(self.instance)
+            for planet in get_available_astrological_points_list(self.instance)
         ]
 
         self.planets_table = AsciiTable(planets_data).table

kerykeion/settings/kr.config.json

@@ -32,10 +32,10 @@
         "Uranus": "Uranus",
         "Neptune": "Neptune",
         "Pluto": "Pluto",
-        "Asc": "Asc",
-        "Mc": "Mc",
-        "Dsc": "Dsc",
-        "Ic": "Ic",
+        "Ascendant": "Asc",
+        "Medium_Coeli": "Mc",
+        "Descendant": "Dsc",
+        "Imum_Coeli": "Ic",
         "True_Node": "N. Node (T)",
         "Mean_Node": "N. Node (M)",
         "Chiron": "Chiron",
@@ -76,10 +76,10 @@
         "Uranus": "Uranus",
         "Neptune": "Neptune",
         "Pluto": "Pluton",
-        "Asc": "Asc",
-        "Mc": "Mc",
-        "Dsc": "Dsc",
-        "Ic": "Ic",
+        "Ascendant": "Asc",
+        "Medium_Coeli": "Mc",
+        "Descendant": "Dsc",
+        "Imum_Coeli": "Ic",
         "True_Node": "Nœud N. (V)",
         "Mean_Node": "Nœud N. (M)",
         "True_South_Node": "Nœud S. (V)",
@@ -120,10 +120,10 @@
         "Uranus": "Urano",
         "Neptune": "Netuno",
         "Pluto": "Plutão",
-        "Asc": "Asc",
-        "Mc": "Mc",
-        "Dsc": "Dsc",
-        "Ic": "Ic",
+        "Ascendant": "Asc",
+        "Medium_Coeli": "Mc",
+        "Descendant": "Dsc",
+        "Imum_Coeli": "Ic",
         "True_Node": "Nodo N. (V)",
         "Mean_Node": "Nodo N. (M)",
         "True_South_Node": "Nodo S. (V)",
@@ -164,10 +164,10 @@
         "Uranus": "Urano",
         "Neptune": "Nettuno",
         "Pluto": "Plutone",
-        "Asc": "Asc",
-        "Mc": "Mc",
-        "Dsc": "Dsc",
-        "Ic": "Ic",
+        "Ascendant": "Asc",
+        "Medium_Coeli": "Mc",
+        "Descendant": "Dsc",
+        "Imum_Coeli": "Ic",
         "True_Node": "Nodo N. (V)",
         "Mean_Node": "Nodo N. (M)",
         "True_South_Node": "Nodo S. (V)",
@@ -208,10 +208,10 @@
         "Uranus": "天王星",
         "Neptune": "海王星",
         "Pluto": "冥王星",
-        "Asc": "上升點",
-        "Mc": "上中天",
-        "Dsc": "下降點",
-        "Ic": "下中天",
+        "Ascendant": "上升點",
+        "Medium_Coeli": "上中天",
+        "Descendant": "下降點",
+        "Imum_Coeli": "下中天",
         "True_Node": "真北交点",
         "Mean_Node": "平均北交点",
         "True_South_Node": "真南交点",
@@ -252,10 +252,10 @@
         "Uranus": "Urano",
         "Neptune": "Neptuno",
         "Pluto": "Plutón",
-        "Asc": "Asc",
-        "Mc": "Mc",
-        "Dsc": "Dsc",
-        "Ic": "Ic",
+        "Ascendant": "Asc",
+        "Medium_Coeli": "Mc",
+        "Descendant": "Dsc",
+        "Imum_Coeli": "Ic",
         "True_Node": "Nodo N. (V)",
         "Mean_Node": "Nodo N. (M)",
         "True_South_Node": "Nodo S. (V)",
@@ -296,10 +296,10 @@
         "Uranus": "Уран",
         "Neptune": "Нептун",
         "Pluto": "Плутон",
-        "Asc": "Асц",
-        "Mc": "MC",
-        "Dsc": "ДСЦ",
-        "Ic": "IC",
+        "Ascendant": "Асц",
+        "Medium_Coeli": "MC",
+        "Descendant": "ДСЦ",
+        "Imum_Coeli": "IC",
         "True_Node": "С. Узел (И)",
         "Mean_Node": "С. Узел (С)",
         "True_South_Node": "Ю. Узел (И)",
@@ -340,10 +340,10 @@
         "Uranus": "Uranüs",
         "Neptune": "Neptün",
         "Pluto": "Plüton",
-        "Asc": "Yükselen",
-        "Mc": "MC",
-        "Dsc": "İK",
-        "Ic": "IC",
+        "Ascendant": "Yükselen",
+        "Medium_Coeli": "MC",
+        "Descendant": "İK",
+        "Imum_Coeli": "IC",
         "True_Node": "K. Düğümü (T)",
         "Mean_Node": "K. Düğümü (M)",
         "Chiron": "Kirony",
@@ -384,10 +384,10 @@
         "Uranus": "Uranus",
         "Neptune": "Neptun",
         "Pluto": "Pluto",
-        "Asc": "Asz",
-        "Mc": "MC",
-        "Dsc": "DSC",
-        "Ic": "IC",
+        "Ascendant": "Asz",
+        "Medium_Coeli": "MC",
+        "Descendant": "DSC",
+        "Imum_Coeli": "IC",
         "True_Node": "Nordknoten (T)",
         "Mean_Node": "Nordknoten (M)",
         "True_South_Node": "Südknoten (T)",
@@ -428,10 +428,10 @@
         "Uranus": "यूरेनस",
         "Neptune": "नेपच्यून",
         "Pluto": "प्लूटो",
-        "Asc": "आस",
-        "Mc": "एमसी",
-        "Dsc": "डीएससी",
-        "Ic": "आईसी",
+        "Ascendant": "आस",
+        "Medium_Coeli": "एमसी",
+        "Descendant": "डीएससी",
+        "Imum_Coeli": "आईसी",
         "True_Node": "उत्तर नोड (T)",
         "Mean_Node": "उत्तर नोड (M)",
         "Chiron": "किरोन",
@@ -651,7 +651,7 @@
     },
     {
       "id": 13,
-      "name": "First_House",
+      "name": "Ascendant",
       "color": "var(--kerykeion-chart-color-first-house)",
       "is_active": true,
       "element_points": 40,
@@ -660,7 +660,7 @@
     },
     {
       "id": 14,
-      "name": "Tenth_House",
+      "name": "Medium_Coeli",
       "color": "var(--kerykeion-chart-color-tenth-house)",
       "is_active": true,
       "element_points": 20,
@@ -669,7 +669,7 @@
     },
     {
       "id": 15,
-      "name": "Seventh_House",
+      "name": "Descendant",
       "color": "var(--kerykeion-chart-color-seventh-house)",
       "is_active": false,
       "element_points": 0,
@@ -678,7 +678,7 @@
     },
     {
       "id": 16,
-      "name": "Fourth_House",
+      "name": "Imum_Coeli",
       "color": "var(--kerykeion-chart-color-fourth-house)",
       "is_active": false,
       "element_points": 0,

kerykeion/utilities.py

@@ -1,5 +1,5 @@
 from kerykeion.kr_types import KerykeionPointModel, KerykeionException, ZodiacSignModel, AstrologicalSubjectModel
-from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, Planet, Houses
+from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, Planet, Houses, AxialCusps
 from typing import Union, get_args, TYPE_CHECKING
 import logging
 import math
@@ -44,12 +44,20 @@ def get_number_from_name(name: Planet) -> int:
         return 15
     elif name == "Mean_Lilith":
         return 12
+    elif name == "Ascendant": # TODO: Is this needed?
+        return 9900
+    elif name == "Descendant": # TODO: Is this needed?
+        return 9901
+    elif name == "Medium_Coeli": # TODO: Is this needed?
+        return 9902
+    elif name == "Imum_Coeli": # TODO: Is this needed?
+        return 9903
     else:
         raise KerykeionException(f"Error in getting number from name! Name: {name}")
 
 
 def get_kerykeion_point_from_degree(
-    degree: Union[int, float], name: Union[Planet, Houses], point_type: PointType
+    degree: Union[int, float], name: Union[Planet, Houses, AxialCusps], point_type: PointType
 ) -> KerykeionPointModel:
     """
     Returns a KerykeionPointModel object based on the given degree.
@@ -118,29 +126,57 @@ def setup_logging(level: str) -> None:
     loglevel: int = logging_options.get(level, logging.INFO)
     logging.basicConfig(format=format, level=loglevel)
 
-def check_if_point_between(
-    start_point: Union[int, float], end_point: Union[int, float], evaluated_point: Union[int, float]
+
+def is_point_between(
+    start_point: Union[int, float],
+    end_point: Union[int, float],
+    evaluated_point: Union[int, float]
 ) -> bool:
     """
-    Finds if a point is between two other in a circle.
+    Determines if a point is between two others on a circle, with additional rules:
+    - If evaluated_point == start_point, it is considered between.
+    - If evaluated_point == end_point, it is NOT considered between.
+    - The range between start_point and end_point must not exceed 180°.
 
     Args:
-        - start_point: The first point
-        - end_point: The second point
-        - point: The point to check if it is between start_point and end_point
+        - start_point: The first point on the circle.
+        - end_point: The second point on the circle.
+        - evaluated_point: The point to check.
 
     Returns:
-        - True if point is between start_point and end_point, False otherwise
+        - True if evaluated_point is between start_point and end_point, False otherwise.
     """
 
-    p1_p2 = math.fmod(end_point - start_point + 360, 360)
-    p1_p3 = math.fmod(evaluated_point - start_point + 360, 360)
+    # Normalize angles to [0, 360)
+    start_point = start_point % 360
+    end_point = end_point % 360
+    evaluated_point = evaluated_point % 360
+
+    # Compute angular difference
+    angular_difference = math.fmod(end_point - start_point + 360, 360)
 
-    if (p1_p2 <= 180) != (p1_p3 > p1_p2):
+    # Ensure the range is not greater than 180°. Otherwise, it is not truly defined what
+    # being located in between two points on a circle actually means.
+    if angular_difference > 180:
+        raise KerykeionException(f"The angle between start and end point is not allowed to exceed 180°, yet is: {angular_difference}")
+
+    # Handle explicitly when evaluated_point == start_point. Note: It may happen for mathematical
+    # reasons that evaluated_point and start_point deviate very slightly from each other, but
+    # should really be same value. This case is captured later below by the term 0 <= p1_p3.
+    if evaluated_point == start_point:
         return True
-    else:
+
+    # Handle explicitly when evaluated_point == end_point
+    if evaluated_point == end_point:
         return False
 
+    # Compute angular differences for evaluation
+    p1_p3 = math.fmod(evaluated_point - start_point + 360, 360)
+
+    # Check if point lies in the interval
+    return (0 <= p1_p3) and (p1_p3 < angular_difference)
+
+
 
 def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut_list: list) -> Houses:
     """
@@ -163,7 +199,8 @@ def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut
     for i in range(len(house_names)):
         start_degree = houses_degree_ut_list[i]
         end_degree = houses_degree_ut_list[(i + 1) % len(houses_degree_ut_list)]
-        if check_if_point_between(start_degree, end_degree, planet_position_degree):
+
+        if is_point_between(start_degree, end_degree, planet_position_degree):
             return house_names[i]
 
     # If no house is found, raise an error
@@ -268,7 +305,7 @@ def get_houses_list(subject: Union["AstrologicalSubject", AstrologicalSubjectMod
     return houses_absolute_position_list
 
 
-def get_available_planets_list(subject: Union["AstrologicalSubject", AstrologicalSubjectModel]) -> list[KerykeionPointModel]:
+def get_available_astrological_points_list(subject: Union["AstrologicalSubject", AstrologicalSubjectModel]) -> list[KerykeionPointModel]:
     """
     Return the names of the planets in the order of the planets.
     The names can be used to access the planets from the AstrologicalSubject object with the __getitem__ method or the [] operator.
@@ -277,4 +314,7 @@ def get_available_planets_list(subject: Union["AstrologicalSubject", Astrologica
     for planet in subject.planets_names_list:
             planets_absolute_position_list.append(subject[planet.lower()])
 
+    for axis in subject.axial_cusps_names_list:
+        planets_absolute_position_list.append(subject[axis.lower()])
+
     return planets_absolute_position_list

{kerykeion-4.21.0.dist-info → kerykeion-4.22.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.21.0
+Version: 4.22.0
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
@@ -19,7 +19,6 @@ 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
@@ -28,11 +27,11 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Dist: pydantic (>=2.5,<3.0)
 Requires-Dist: pyswisseph (>=2.10.3.1,<3.0.0.0)
-Requires-Dist: pytz (>=2022.7,<2023.0)
+Requires-Dist: pytz (>=2024.2,<2025.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: requests-cache (>=1.2.1,<2.0.0)
 Requires-Dist: scour (>=0.38.2,<0.39.0)
-Requires-Dist: terminaltables (>=3.1.10,<4.0.0)
+Requires-Dist: simple-ascii-tables (>=1.0.0,<2.0.0)
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion
 Description-Content-Type: text/markdown
 

{kerykeion-4.21.0.dist-info → kerykeion-4.22.0.dist-info}/RECORD

@@ -2,41 +2,41 @@ LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
 kerykeion/__init__.py,sha256=XtKNBNSVsQ-PAbnJfNUcw-femdF4NgQqohMtM0cRH18,639
 kerykeion/aspects/__init__.py,sha256=9kx_Rx1NJx5SM7nDCSbI79S1neZ3c-q2NvQr-S6A9PY,292
 kerykeion/aspects/aspects_utils.py,sha256=XyjQvvdrN6-L8QqpecV-mCG9Wb8I9G0S1ZvzXIsQSCk,2977
-kerykeion/aspects/natal_aspects.py,sha256=I5HyT9BHUR0r5xlbCj-EYLxvsRWLVi59Jynlpq04-cY,5548
+kerykeion/aspects/natal_aspects.py,sha256=zTB5wIp0B3XdqtM5ktWpD2rw8ITTlR2wpXBOdPwSZmI,6048
 kerykeion/aspects/synastry_aspects.py,sha256=HtXSVPkiDQmbkqnI7k9IOhCgON59VZXjflqWJdugwyI,4327
-kerykeion/astrological_subject.py,sha256=KalMYAY4s-1eaV5-L9YsgJRAZah4MnTwSelQPuRkOQ4,36764
+kerykeion/astrological_subject.py,sha256=OWBpAKP0aavvqNWg_c1dTbGVkd6BM7XMzgIMOVo683A,39157
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
-kerykeion/charts/charts_utils.py,sha256=Qql2Z_9xPaxQUaH6AOs8F9maYMqpG9DejYY0LKQT4_U,42265
+kerykeion/charts/charts_utils.py,sha256=HjCmBa9TCoAmH5Z20W8BRnQICN3qZOjQcSQ20sLLz7M,41965
 kerykeion/charts/draw_planets.py,sha256=Uty3zpWYMQZvvK7ZHhlmynCHeL8DIN3qL2ifnBXVciM,17393
-kerykeion/charts/kerykeion_chart_svg.py,sha256=1k3TDnngStieOKxY69aaHdjJCrh9wr8FBzT5o6BepRs,43918
-kerykeion/charts/templates/aspect_grid_only.xml,sha256=qXR4agGqI7GB_4z8LTSa9Hpgu1ldM9ZDRKGpviBM6a8,70097
-kerykeion/charts/templates/chart.xml,sha256=4CJtMrPFYzgSC0hRjYd2ve53IZ5MKjfcRT8GUI0v_Fo,73767
-kerykeion/charts/templates/wheel_only.xml,sha256=wna68vE2OtpwBBtpJteNRwYcyqqF0-SicXsR1PpCjtU,71310
+kerykeion/charts/kerykeion_chart_svg.py,sha256=FglYPyeZZUSdWj1CAia1iXveRpKatVlmOfLkvbZu0YE,43871
+kerykeion/charts/templates/aspect_grid_only.xml,sha256=ZiBVeToVmCA8QxYlB_cfnsAO1NNeQAnJ_6rIYkr4F58,70091
+kerykeion/charts/templates/chart.xml,sha256=rUO7kL3z1RZuFjFBwA88xIF2KQFuGOcHQ5Kcw-K4hLY,73761
+kerykeion/charts/templates/wheel_only.xml,sha256=E0JCxcnjTjxuaomw7PQEc_3xRVErj1y2hIOGTrShuhc,71304
 kerykeion/charts/themes/classic.css,sha256=-b6XllAZmqUDjBwDtIkfzfI3Wtc8AImuGMpfAQ_2wa0,3552
 kerykeion/charts/themes/dark-high-contrast.css,sha256=9tdyFC-4Ytnv4lrVwKnOjZJ0YNgbRrP_HNnfJRlnbn0,6099
 kerykeion/charts/themes/dark.css,sha256=ml2lnzQVuS5DhCdoeUrDmMv9kB1nNceRt7hHbOHSbjM,6099
 kerykeion/charts/themes/light.css,sha256=ALf5U8tQsb6ky0N9R7ZLOHDrfKEXNM-sBR3JIRxFrCI,6092
-kerykeion/enums.py,sha256=gzB_GDDLGurQI24L0Ga0xpL3DoU6E4ld-gC2xMeLmC8,1077
-kerykeion/ephemeris_data.py,sha256=g52P0jc1Roo8udXW04BOtIBTaOh3Rcp8_ZDw2MJNn_k,8072
+kerykeion/enums.py,sha256=nPXgP_ocsRnRno5H-yunZy3fp-hLZ9aYRaUb-2gBdvw,1199
+kerykeion/ephemeris_data.py,sha256=Cd5TK5nTkFHYU6bkLKjZRfiU4_6AgsWGcwBDrBHKrQk,8096
 kerykeion/fetch_geonames.py,sha256=e66Nh6yq9A4VjnuvVSiV1TW1IkJ9m3Q2LKPWrkOGgO0,4764
 kerykeion/kr_types/__init__.py,sha256=jshJOccCQcYZuoOvrILRZH6imy4RBvKpFPujlNLFyGE,295
 kerykeion/kr_types/chart_types.py,sha256=OlDvjCra7acaBT--B_gqsqOcAwbuKCXmQQyDTDNfy4o,1983
 kerykeion/kr_types/kerykeion_exception.py,sha256=kE1y0K0rmuz32b4K_ZppSsZ59I2Get0ZkvOkTE5HejI,314
-kerykeion/kr_types/kr_literals.py,sha256=LW5OED0FgDNq5PPHW3_zVot4esz1Y8hCM2nJbgIQDF4,3638
-kerykeion/kr_types/kr_models.py,sha256=3zRhQ17sWDPN1t5k-GV8VT7Hr2K7mYV8tec6VqMZWig,4314
-kerykeion/kr_types/settings_models.py,sha256=oG0fbN9aXzdeBWRKXxy15TFXMR3bU2Be0Ze-wfZi59w,11863
+kerykeion/kr_types/kr_literals.py,sha256=hnbKFC0Wu_ee1VjpXd1GJaE_tC6ALjhbuo7PEW51yQc,3766
+kerykeion/kr_types/kr_models.py,sha256=53VnGY8ie35crNemMusf8iasACHRrM1ZVc0kuZggCes,4593
+kerykeion/kr_types/settings_models.py,sha256=VJ9rt4WzO4xTQRxFrX-9da44-SE2V0v2AH4CI4ygJc4,11894
 kerykeion/relationship_score/__init__.py,sha256=cLaEBQXQBfyRkv0OaS3ceLROzvWcvKXWiRq0PS6LDjY,114
 kerykeion/relationship_score/relationship_score.py,sha256=lJkSbHw9nOUaPMrPxqcGhnVQIwAgI52K8BQzXXswb6A,6504
-kerykeion/relationship_score/relationship_score_factory.py,sha256=9iqKHyMS9u9mSc8Ub1CHTDfifxBE40qs7PgbtGt7Gxc,10865
-kerykeion/report.py,sha256=QEZfadIxmqIugoLHMW0KBhOqCwTywGSDDfpX4NJD6qg,2785
+kerykeion/relationship_score/relationship_score_factory.py,sha256=P_swvpip5luODeByv_qaP1c5IpUqWTqSlEumDJjal7I,10861
+kerykeion/report.py,sha256=snqnrJzb89q2ixL74qS9ksvzNSh_WXtZ_haBOIvHYeY,2814
 kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
 kerykeion/settings/kerykeion_settings.py,sha256=WZyiC4uwpjnTmoDGWORYLIk9rIpJ3EuLdjFw6eUuylo,2554
-kerykeion/settings/kr.config.json,sha256=635bN5jmcj_MzSiGFohuCzRYIUXY0lDMc0ng5f_Egus,21694
+kerykeion/settings/kr.config.json,sha256=TbHMfGX0hXgjLS92RmScjhL1Qq8CUcdyXp1IJVVrJrc,21998
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
-kerykeion/utilities.py,sha256=4b1QgUR3Z1iFel4FHPPp5Qe2EbPCGQukMqCaW0Y_K6s,9417
-kerykeion-4.21.0.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.21.0.dist-info/METADATA,sha256=OZyrGRaT8amESSi7HEXrgKpV0Yrd0TWEvNihdmPV_tE,17667
-kerykeion-4.21.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-kerykeion-4.21.0.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.21.0.dist-info/RECORD,,
+kerykeion/utilities.py,sha256=vuEDWs5Htl2zi6_3flLvlAsFC9YT9LaOQDpRirFf3Cg,11160
+kerykeion-4.22.0.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.22.0.dist-info/METADATA,sha256=7EuN8mUmEb_lpxs4jR4n2alO5vtbgms-2W2dxcW_PoA,17620
+kerykeion-4.22.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.22.0.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.22.0.dist-info/RECORD,,

{kerykeion-4.21.0.dist-info → kerykeion-4.22.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any