kerykeion 4.12.3__py3-none-any.whl → 4.14.2__py3-none-any.whl

kerykeion/__init__.py

@@ -14,3 +14,4 @@ from .aspects import SynastryAspects, NatalAspects
 from .report import Report
 from .settings import KerykeionSettingsModel, get_settings
 from .enums import Planets, Aspects, Signs
+from .ephemeris_data import EphemerisDataFactory

kerykeion/aspects/aspects_utils.py

@@ -131,17 +131,18 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
         name = None
         distance = 0
         aspect_degrees = 0
-        color = None
         aid = None
 
-    return (
-        verdict,
-        name,
-        distance - aspect_degrees,
-        aspect_degrees,
-        aid,
-        diff,
-    )
+
+    return {
+        "verdict": verdict, 
+        "name": name,
+        "orbit": distance - aspect_degrees,
+        "distance": distance - aspect_degrees,
+        "aspect_degrees": aspect_degrees,
+        "aid": aid,
+        "diff": diff
+    }
 
 
 def planet_id_decoder(planets_settings: dict, name: str):

kerykeion/aspects/natal_aspects.py

@@ -52,10 +52,18 @@ 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)):
-                verdict, name, orbit, aspect_degrees, aid, diff = get_aspect_from_two_points(
+                aspect = get_aspect_from_two_points(
                     self.aspects_settings, active_points_list[first]["abs_pos"], active_points_list[second]["abs_pos"]
                 )
 
+                verdict = aspect["verdict"]
+                name = aspect["name"]
+                orbit = aspect["orbit"]
+                aspect_degrees = aspect["aspect_degrees"]
+                aid = aspect["aid"]
+                diff = aspect["diff"]
+                
+
                 if verdict == True:
                     d_asp = {
                         "p1_name": active_points_list[first]["name"],

kerykeion/aspects/synastry_aspects.py

@@ -60,12 +60,20 @@ class SynastryAspects(NatalAspects):
         for first in range(len(first_active_points_list)):
             # Generates the aspects list whitout repetitions
             for second in range(len(second_active_points_list)):
-                verdict, name, orbit, aspect_degrees, aid, diff = get_aspect_from_two_points(
+                aspect = get_aspect_from_two_points(
                     self.aspects_settings,
                     first_active_points_list[first]["abs_pos"],
                     second_active_points_list[second]["abs_pos"],
                 )
 
+                verdict = aspect["verdict"]
+                name = aspect["name"]
+                orbit = aspect["orbit"]
+                aspect_degrees = aspect["aspect_degrees"]
+                aid = aspect["aid"]
+                diff = aspect["diff"]
+
+
                 if verdict == True:
                     d_asp = {
                         "p1_name": first_active_points_list[first]["name"],
@@ -96,7 +104,7 @@ if __name__ == "__main__":
     setup_logging(level="debug")
 
     john = AstrologicalSubject("John", 1940, 10, 9, 18, 30, "Liverpool")
-    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 18, 30, "Tokyo")
+    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 18, 30, "Tokyo", "JP")
 
     synastry_aspects = SynastryAspects(john, yoko)
 

kerykeion/astrological_subject.py

@@ -6,6 +6,7 @@
 import pytz
 import swisseph as swe
 import logging
+import warnings
 
 from datetime import datetime
 from functools import cached_property
@@ -75,8 +76,7 @@ class AstrologicalSubject:
         You can get one for free here: https://www.geonames.org/login
     - online (bool, optional): Sets if you want to use the online mode, which fetches the timezone and coordinates from geonames.
         If you already have the coordinates and timezone, set this to False. Defaults to True.
-    - disable_chiron (bool, optional): Disables the calculation of Chiron. Defaults to False.
-        Chiron calculation can create some issues with the Swiss Ephemeris when the date is too far in the past.
+    - disable_chiron: Deprecated, use disable_chiron_and_lilith instead.
     - sidereal_mode (SiderealMode, optional): Also known as Ayanamsa. 
         The mode to use for the sidereal zodiac, according to the Swiss Ephemeris.
         Defaults to "FAGAN_BRADLEY".
@@ -87,6 +87,11 @@ class AstrologicalSubject:
     - perspective_type (PerspectiveType, optional): The perspective to use for the calculation of the chart.
         Defaults to "Apparent Geocentric".
         Available perspectives are visible in the PerspectiveType Literal.
+    - is_dst (Union[None, bool], optional): Specify if the time is in DST. Defaults to None.
+        By default (None), the library will try to guess if the time is in DST or not and raise an AmbiguousTimeError
+        if it can't guess. If you know the time is in DST, set this to True, if you know it's not, set it to False.
+    - disable_chiron_and_lilith (bool, optional): boolean representing if Chiron and Lilith should be disabled. Default is False.
+        Chiron calculation can create some issues with the Swiss Ephemeris when the date is too far in the past.
     """
 
     # Defined by the user
@@ -96,18 +101,19 @@ class AstrologicalSubject:
     day: int
     hour: int
     minute: int
-    city: str
-    nation: str
-    lng: Union[int, float]
-    lat: Union[int, float]
-    tz_str: str
-    geonames_username: str
+    city: Union[str, None]
+    nation: Union[str, None]
+    lng: Union[int, float, None]
+    lat: Union[int, float, None]
+    tz_str: Union[str, None]
+    geonames_username: Union[str, None]
     online: bool
     zodiac_type: ZodiacType
-    sidereal_mode: SiderealMode
+    sidereal_mode: Union[SiderealMode, None]
     houses_system_identifier: HousesSystemIdentifier
     houses_system_name: str
     perspective_type: PerspectiveType
+    is_dst: Union[None, bool]
 
     # Generated internally
     city_data: dict[str, str]
@@ -130,6 +136,7 @@ class AstrologicalSubject:
     true_node: KerykeionPointModel
     mean_node: KerykeionPointModel
     chiron: Union[KerykeionPointModel, None]
+    mean_lilit: Union[KerykeionPointModel, None]
 
     # Houses
     first_house: KerykeionPointModel
@@ -151,6 +158,10 @@ class AstrologicalSubject:
     planets_degrees_ut: list[float]
     houses_degree_ut: list[float]
 
+    # Enable or disable features
+    disable_chiron: bool # Deprecated
+    disable_chiron_and_lilith: bool
+
     def __init__(
         self,
         name="Now",
@@ -167,13 +178,29 @@ class AstrologicalSubject:
         geonames_username: Union[str, None] = None,
         zodiac_type: ZodiacType = DEFAULT_ZODIAC_TYPE,
         online: bool = True,
-        disable_chiron: bool = False,
+        disable_chiron: Union[None, bool] = None,
         sidereal_mode: Union[SiderealMode, None] = None,
         houses_system_identifier: HousesSystemIdentifier = DEFAULT_HOUSES_SYSTEM_IDENTIFIER,
-        perspective_type: PerspectiveType = DEFAULT_PERSPECTIVE_TYPE
+        perspective_type: PerspectiveType = DEFAULT_PERSPECTIVE_TYPE,
+        is_dst: Union[None, bool] = None,
+        disable_chiron_and_lilith: bool = False
     ) -> None:
         logging.debug("Starting Kerykeion")
 
+        # Deprecation warnings --->
+        if disable_chiron is not None:
+            warnings.warn(
+                "The 'disable_chiron' argument is deprecated and will be removed in a future version. "
+                "Please use 'disable_chiron' instead.",
+                DeprecationWarning
+            )
+            
+            if disable_chiron_and_lilith:
+                raise ValueError("Cannot specify both 'disable_chiron' and 'disable_chiron_and_lilith'. Use 'disable_chiron_and_lilith' only.")
+        
+            self.disable_chiron_and_lilith = disable_chiron
+        # <--- Deprecation warnings
+
         self.name = name
         self.year = year
         self.month = month
@@ -193,6 +220,8 @@ class AstrologicalSubject:
         self.sidereal_mode = sidereal_mode
         self.houses_system_identifier = houses_system_identifier
         self.perspective_type = perspective_type
+        self.is_dst = is_dst
+        self.disable_chiron_and_lilith = disable_chiron_and_lilith
 
         #---------------#
         # General setup #
@@ -200,9 +229,7 @@ class AstrologicalSubject:
 
         # This message is set to encourage the user to set a custom geonames username
         if geonames_username is None and online:
-            logging.warning(
-
-            )
+            logging.warning(GEONAMES_DEFAULT_USERNAME_WARNING)
 
             self.geonames_username = DEFAULT_GEONAMES_USERNAME
 
@@ -214,11 +241,11 @@ class AstrologicalSubject:
             self.nation = "GB"
             logging.info("No nation specified, using GB as default")
 
-        if not self.lat:
+        if not self.lat and not self.online:
             self.lat = 51.5074
             logging.info("No latitude specified, using London as default")
 
-        if not self.lng:
+        if not self.lng and not self.online:
             self.lng = 0
             logging.info("No longitude specified, using London as default")
 
@@ -246,6 +273,8 @@ class AstrologicalSubject:
         elif self.perspective_type == "Topocentric":
             self._iflag += swe.FLG_TOPOCTR
             # geopos_is_set, for topocentric
+            if (self.online) and (not self.tz_str) and (not self.lat) and (not self.lng):
+                self._fetch_and_set_tz_and_coordinates_from_geonames()
             swe.set_topo(self.lng, self.lat, 0)
         # <--- Chart Perspective check and setup
 
@@ -281,17 +310,22 @@ class AstrologicalSubject:
         #------------------------#
         # Start the calculations #
         #------------------------#
-        
-        check_and_adjust_polar_latitude(self.lat, self.lng)
 
         # UTC, julian day and local time setup --->
-        if (self.online) and (not self.tz_str):
-            self._fetch_tz_from_geonames()
+        if (self.online) and (not self.tz_str) and (not self.lat) and (not self.lng):
+            self._fetch_and_set_tz_and_coordinates_from_geonames()
+        
+        self.lat = check_and_adjust_polar_latitude(self.lat)
 
         # Local time to UTC
         local_time = pytz.timezone(self.tz_str)
         naive_datetime = datetime(self.year, self.month, self.day, self.hour, self.minute, 0)
-        local_datetime = local_time.localize(naive_datetime, is_dst=None)
+
+        try:
+            local_datetime = local_time.localize(naive_datetime, is_dst=self.is_dst)
+        except pytz.exceptions.AmbiguousTimeError:
+            raise KerykeionException("Ambiguous time! Please specify if the time is in DST or not with the is_dst argument.")
+
         utc_object = local_datetime.astimezone(pytz.utc)
         self.iso_formatted_utc_datetime = utc_object.isoformat()
 
@@ -325,7 +359,7 @@ class AstrologicalSubject:
     def get(self, item, default=None):
         return getattr(self, item, default)
 
-    def _fetch_tz_from_geonames(self) -> None:
+    def _fetch_and_set_tz_and_coordinates_from_geonames(self) -> None:
         """Gets the nearest time zone for the calculation"""
         logging.info("Fetching timezone/coordinates from geonames")
 
@@ -349,8 +383,6 @@ class AstrologicalSubject:
         self.lat = float(self.city_data["lat"])
         self.tz_str = self.city_data["timezonestr"]
 
-        check_and_adjust_polar_latitude(self.lat, self.lng)
-
     def _houses(self) -> None:
         """
         Calculate positions and store them in dictionaries
@@ -447,11 +479,6 @@ class AstrologicalSubject:
         pluto_deg = swe.calc(self.julian_day, 9, self._iflag)[0][0]
         mean_node_deg = swe.calc(self.julian_day, 10, self._iflag)[0][0]
         true_node_deg = swe.calc(self.julian_day, 11, self._iflag)[0][0]
-        
-        if not self.disable_chiron:
-            chiron_deg = swe.calc(self.julian_day, 15, self._iflag)[0][0]
-        else:
-            chiron_deg = 0
 
         self.planets_degrees_ut = [
             sun_deg,
@@ -468,9 +495,18 @@ class AstrologicalSubject:
             true_node_deg,
         ]
         
-        if not self.disable_chiron:
+        if not self.disable_chiron_and_lilith:
+            chiron_deg = swe.calc(self.julian_day, 15, self._iflag)[0][0]
             self.planets_degrees_ut.append(chiron_deg)
 
+            mean_lilith_deg = swe.calc(self.julian_day, 12, self._iflag)[0][0]
+            self.planets_degrees_ut.append(mean_lilith_deg)
+
+        else:
+            self.chiron = None
+            self.mean_lilith = None
+
+
     def _planets(self) -> None:
         """Defines body positon in signs and information and
         stores them in dictionaries"""
@@ -490,10 +526,14 @@ class AstrologicalSubject:
         self.mean_node = calculate_position(self.planets_degrees_ut[10], "Mean_Node", point_type=point_type)
         self.true_node = calculate_position(self.planets_degrees_ut[11], "True_Node", point_type=point_type)
         
-        if not self.disable_chiron:
+        if not self.disable_chiron_and_lilith:
             self.chiron = calculate_position(self.planets_degrees_ut[12], "Chiron", point_type=point_type)
+            self.mean_lilith = calculate_position(self.planets_degrees_ut[13], "Mean_Lilith", point_type=point_type)
+
         else:
             self.chiron = None
+            self.mean_lilith = None
+
 
     def _planets_in_houses(self) -> None:
         """Calculates the house of the planet and updates
@@ -512,11 +552,6 @@ class AstrologicalSubject:
         self.mean_node.house = get_planet_house(self.planets_degrees_ut[10], self.houses_degree_ut)
         self.true_node.house = get_planet_house(self.planets_degrees_ut[11], self.houses_degree_ut)
 
-        if not self.disable_chiron:
-            self.chiron.house = get_planet_house(self.planets_degrees_ut[12], self.houses_degree_ut)
-        else:
-            self.chiron = None
-
         self.planets_list = [
             self.sun,
             self.moon,
@@ -532,9 +567,17 @@ class AstrologicalSubject:
             self.true_node,
         ]
         
-        if not self.disable_chiron:
+        if not self.disable_chiron_and_lilith:
+            self.chiron.house = get_planet_house(self.planets_degrees_ut[12], self.houses_degree_ut)
             self.planets_list.append(self.chiron)
 
+            self.mean_lilith.house = get_planet_house(self.planets_degrees_ut[13], self.houses_degree_ut)
+            self.planets_list.append(self.mean_lilith)
+
+        else:
+            self.chiron = None
+            self.mean_lilith = None
+
         # Check in retrograde or not:
         planets_ret = []
         for planet in self.planets_list:
@@ -698,7 +741,7 @@ class AstrologicalSubject:
         lat: Union[int, float] = 51.5074,
         geonames_username: str = DEFAULT_GEONAMES_USERNAME,
         zodiac_type: ZodiacType = DEFAULT_ZODIAC_TYPE,
-        disable_chiron: bool = False,
+        disable_chiron_and_lilith: bool = False,
         sidereal_mode: Union[SiderealMode, None] = None,
         houses_system_identifier: HousesSystemIdentifier = DEFAULT_HOUSES_SYSTEM_IDENTIFIER,
         perspective_type: PerspectiveType = DEFAULT_PERSPECTIVE_TYPE
@@ -721,7 +764,7 @@ class AstrologicalSubject:
         - geonames_username (str, optional): The username for the geonames API. Note: Change this to your own username to avoid rate limits!
             You can get one for free here: https://www.geonames.org/login
         - zodiac_type (ZodiacType, optional): The zodiac type to use. Defaults to "Tropic".
-        - disable_chiron (bool, optional): Disables the calculation of Chiron. Defaults to False.
+        - disable_chiron_and_lilith: boolean representing if Chiron and Lilith should be disabled. Default is False.
             Chiron calculation can create some issues with the Swiss Ephemeris when the date is too far in the past.
         - sidereal_mode (SiderealMode, optional): Also known as Ayanamsa.
             The mode to use for the sidereal zodiac, according to the Swiss Ephemeris.
@@ -767,10 +810,10 @@ class AstrologicalSubject:
             online=False,
             geonames_username=geonames_username,
             zodiac_type=zodiac_type,
-            disable_chiron=disable_chiron,
             sidereal_mode=sidereal_mode,
             houses_system_identifier=houses_system_identifier,
-            perspective_type=perspective_type
+            perspective_type=perspective_type,
+            disable_chiron_and_lilith=disable_chiron_and_lilith
         )
 
         return subject
@@ -812,4 +855,8 @@ if __name__ == "__main__":
     print(johnny.json(dump=True, indent=2))
 
     # With Topocentric Perspective
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", perspective_type="Topocentric")
+    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", perspective_type="Topocentric")
+
+    # Test Mean Lilith
+    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", disable_chiron_and_lilith=True)
+    print(johnny.mean_lilith)