kerykeion 4.18.5__tar.gz → 4.19.0__tar.gz

{kerykeion-4.18.5 → kerykeion-4.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.18.5
+Version: 4.19.0
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
@@ -218,23 +218,25 @@ Returns:
 +----------+------+-------------+-----------+----------+
 | 8/6/1977 | 8:45 | Atlanta, US | -84.38798 | 33.749   |
 +----------+------+-------------+-----------+----------+
-+-----------+------+-------+------+----------------+
-| Planet    | Sign | Pos.  | Ret. | House          |
-+-----------+------+-------+------+----------------+
-| Sun       | Gem  | 17.6  | -    | Twelfth_House  |
-| Moon      | Pis  | 16.43 | -    | Ninth_House    |
-| Mercury   | Tau  | 26.29 | -    | Eleventh_House |
-| Venus     | Tau  | 2.03  | -    | Tenth_House    |
-| Mars      | Tau  | 1.79  | -    | Tenth_House    |
-| Jupiter   | Gem  | 14.61 | -    | Eleventh_House |
-| Saturn    | Leo  | 12.8  | -    | Second_House   |
-| Uranus    | Sco  | 8.27  | R    | Fourth_House   |
-| Neptune   | Sag  | 14.69 | R    | Fifth_House    |
-| Pluto     | Lib  | 11.45 | R    | Fourth_House   |
-| Mean_Node | Lib  | 21.49 | R    | Fourth_House   |
-| True_Node | Lib  | 22.82 | R    | Fourth_House   |
-| Chiron    | Tau  | 4.17  | -    | Tenth_House    |
-+-----------+------+-------+------+----------------+
++-----------------+------+-------+------+----------------+
+| Planet          | Sign | Pos.  | Ret. | House          |
++-----------------+------+-------+------+----------------+
+| Sun             | Gem  | 17.6  | -    | Twelfth_House  |
+| Moon            | Pis  | 16.43 | -    | Ninth_House    |
+| Mercury         | Tau  | 26.29 | -    | Eleventh_House |
+| Venus           | Tau  | 2.03  | -    | Tenth_House    |
+| Mars            | Tau  | 1.79  | -    | Tenth_House    |
+| Jupiter         | Gem  | 14.61 | -    | Eleventh_House |
+| Saturn          | Leo  | 12.8  | -    | Second_House   |
+| Uranus          | Sco  | 8.27  | R    | Fourth_House   |
+| Neptune         | Sag  | 14.69 | R    | Fifth_House    |
+| Pluto           | Lib  | 11.45 | R    | Fourth_House   |
+| Mean_Node       | Lib  | 21.49 | R    | Fourth_House   |
+| True_Node       | Lib  | 22.82 | R    | Fourth_House   |
+| Mean_South_Node | Ari  | 21.49 | R    | Tenth_House    |
+| True_South_Node | Ari  | 22.82 | R    | Tenth_House    |
+| Chiron          | Tau  | 4.17  | -    | Tenth_House    |
++-----------------+------+-------+------+----------------+
 +----------------+------+----------+
 | House          | Sign | Position |
 +----------------+------+----------+
@@ -366,6 +368,34 @@ subject = AstrologicalSubject.get_from_iso_utc_time(
     "Johnny Depp", "1963-06-09T05:00:00Z", "Owensboro", "US", online=True)
 ```
 
+## Lunar Nodes (Rahu & Ketu)
+
+The following are present:
+
+- True North Lunar Node: Simply referred to as "true_node" (without the term "north") for backward compatibility.
+- True South Lunar Node: Referred to as "true_south_node."
+- Mean North Lunar Node: Referred to as "mean_node" (without the term "north") for backward compatibility.
+- Mean South Lunar Node: Referred to as "mean_south_node."
+
+In instances of the AstrologicalSubject class, all of them are active by default.
+
+In instances of the classes used to generate aspects and SVG charts, only the mean nodes are active. To activate the true nodes, you need to edit the configuration file (kr.config.json).
+Example:
+
+```json
+...
+    {
+      "id": 19,
+      "name": "True_South_Node",
+      "color": "var(--kerykeion-chart-color-true-node)",
+      "is_active": true, // Set to true to activate the true node
+      "element_points": 0,
+      "related_zodiac_signs": [],
+      "label": "True_South_Node"
+    }
+...
+```
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

{kerykeion-4.18.5 → kerykeion-4.19.0}/README.md

@@ -181,23 +181,25 @@ Returns:
 +----------+------+-------------+-----------+----------+
 | 8/6/1977 | 8:45 | Atlanta, US | -84.38798 | 33.749   |
 +----------+------+-------------+-----------+----------+
-+-----------+------+-------+------+----------------+
-| Planet    | Sign | Pos.  | Ret. | House          |
-+-----------+------+-------+------+----------------+
-| Sun       | Gem  | 17.6  | -    | Twelfth_House  |
-| Moon      | Pis  | 16.43 | -    | Ninth_House    |
-| Mercury   | Tau  | 26.29 | -    | Eleventh_House |
-| Venus     | Tau  | 2.03  | -    | Tenth_House    |
-| Mars      | Tau  | 1.79  | -    | Tenth_House    |
-| Jupiter   | Gem  | 14.61 | -    | Eleventh_House |
-| Saturn    | Leo  | 12.8  | -    | Second_House   |
-| Uranus    | Sco  | 8.27  | R    | Fourth_House   |
-| Neptune   | Sag  | 14.69 | R    | Fifth_House    |
-| Pluto     | Lib  | 11.45 | R    | Fourth_House   |
-| Mean_Node | Lib  | 21.49 | R    | Fourth_House   |
-| True_Node | Lib  | 22.82 | R    | Fourth_House   |
-| Chiron    | Tau  | 4.17  | -    | Tenth_House    |
-+-----------+------+-------+------+----------------+
++-----------------+------+-------+------+----------------+
+| Planet          | Sign | Pos.  | Ret. | House          |
++-----------------+------+-------+------+----------------+
+| Sun             | Gem  | 17.6  | -    | Twelfth_House  |
+| Moon            | Pis  | 16.43 | -    | Ninth_House    |
+| Mercury         | Tau  | 26.29 | -    | Eleventh_House |
+| Venus           | Tau  | 2.03  | -    | Tenth_House    |
+| Mars            | Tau  | 1.79  | -    | Tenth_House    |
+| Jupiter         | Gem  | 14.61 | -    | Eleventh_House |
+| Saturn          | Leo  | 12.8  | -    | Second_House   |
+| Uranus          | Sco  | 8.27  | R    | Fourth_House   |
+| Neptune         | Sag  | 14.69 | R    | Fifth_House    |
+| Pluto           | Lib  | 11.45 | R    | Fourth_House   |
+| Mean_Node       | Lib  | 21.49 | R    | Fourth_House   |
+| True_Node       | Lib  | 22.82 | R    | Fourth_House   |
+| Mean_South_Node | Ari  | 21.49 | R    | Tenth_House    |
+| True_South_Node | Ari  | 22.82 | R    | Tenth_House    |
+| Chiron          | Tau  | 4.17  | -    | Tenth_House    |
++-----------------+------+-------+------+----------------+
 +----------------+------+----------+
 | House          | Sign | Position |
 +----------------+------+----------+
@@ -329,6 +331,34 @@ subject = AstrologicalSubject.get_from_iso_utc_time(
     "Johnny Depp", "1963-06-09T05:00:00Z", "Owensboro", "US", online=True)
 ```
 
+## Lunar Nodes (Rahu & Ketu)
+
+The following are present:
+
+- True North Lunar Node: Simply referred to as "true_node" (without the term "north") for backward compatibility.
+- True South Lunar Node: Referred to as "true_south_node."
+- Mean North Lunar Node: Referred to as "mean_node" (without the term "north") for backward compatibility.
+- Mean South Lunar Node: Referred to as "mean_south_node."
+
+In instances of the AstrologicalSubject class, all of them are active by default.
+
+In instances of the classes used to generate aspects and SVG charts, only the mean nodes are active. To activate the true nodes, you need to edit the configuration file (kr.config.json).
+Example:
+
+```json
+...
+    {
+      "id": 19,
+      "name": "True_South_Node",
+      "color": "var(--kerykeion-chart-color-true-node)",
+      "is_active": true, // Set to true to activate the true node
+      "element_points": 0,
+      "related_zodiac_signs": [],
+      "label": "True_South_Node"
+    }
+...
+```
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

{kerykeion-4.18.5 → kerykeion-4.19.0}/kerykeion/aspects/natal_aspects.py

@@ -54,8 +54,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)):
+                # South Node and North Node are always in opposition
+                nodes_pairs = {
+                    ("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:
+                    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"]
                 )
 
@@ -132,12 +142,12 @@ if __name__ == "__main__":
 
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
 
-    # All aspects
+    # All aspects as a list of dictionaries
     aspects = NatalAspects(johnny)
-    print(aspects.all_aspects)
+    print([a.model_dump() for a in aspects.all_aspects])
 
     print("\n")
 
-    # Relevant aspects
+    # Relevant aspects as a list of dictionaries
     aspects = NatalAspects(johnny)
-    print(aspects.relevant_aspects)
+    print([a.model_dump() for a in aspects.relevant_aspects])

{kerykeion-4.18.5 → kerykeion-4.19.0}/kerykeion/aspects/synastry_aspects.py

@@ -101,13 +101,10 @@ 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", "JP")
+    john = AstrologicalSubject("John", 1940, 10, 9, 10, 30, "Liverpool", "GB")
+    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 10, 30, "Tokyo", "JP")
 
     synastry_aspects = SynastryAspects(john, yoko)
 
-    # All aspects
-    print(synastry_aspects.all_aspects)
-
-    # Relevant aspects
-    print(synastry_aspects.relevant_aspects)
+    # All aspects as a list of dictionaries
+    print([aspect.dict() for aspect in synastry_aspects.all_aspects])

{kerykeion-4.18.5 → kerykeion-4.19.0}/kerykeion/astrological_subject.py

@@ -25,8 +25,8 @@ from kerykeion.kr_types import (
     Houses
 )
 from kerykeion.utilities import (
-    get_number_from_name, 
-    get_kerykeion_point_from_degree, 
+    get_number_from_name,
+    get_kerykeion_point_from_degree,
     get_planet_house,
     get_moon_emoji_from_phase_int,
     get_moon_phase_name_from_phase_int,
@@ -79,7 +79,7 @@ class AstrologicalSubject:
     - 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: Deprecated, use disable_chiron_and_lilith instead.
-    - sidereal_mode (SiderealMode, optional): Also known as Ayanamsa. 
+    - 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".
         Available modes are visible in the SiderealMode Literal.
@@ -139,6 +139,8 @@ class AstrologicalSubject:
     mean_node: KerykeionPointModel
     chiron: Union[KerykeionPointModel, None]
     mean_lilith: Union[KerykeionPointModel, None]
+    true_south_node: KerykeionPointModel
+    mean_south_node: KerykeionPointModel
 
     # Houses
     first_house: KerykeionPointModel
@@ -197,10 +199,10 @@ class AstrologicalSubject:
                 "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
 
@@ -251,7 +253,7 @@ class AstrologicalSubject:
             logging.info("No latitude specified, using London as default")
         else:
             self.lat = lat # type: ignore
- 
+
         # Longitude
         if not lng and not self.online:
             self.lng = 0
@@ -278,7 +280,7 @@ class AstrologicalSubject:
         # Chart Perspective check and setup --->
         if self.perspective_type not in get_args(PerspectiveType):
             raise KerykeionException(f"\n* ERROR: '{self.perspective_type}' is NOT a valid chart perspective! Available perspectives are: *" + "\n" + str(get_args(PerspectiveType)))
-        
+
         if self.perspective_type == "True Geocentric":
             self._iflag += swe.FLG_TRUEPOS
         elif self.perspective_type == "Heliocentric":
@@ -304,14 +306,14 @@ class AstrologicalSubject:
 
         if self.sidereal_mode and self.zodiac_type == "Tropic":
             raise KerykeionException("You can't set a sidereal mode with a Tropic zodiac type!")
-        
+
         if self.zodiac_type == "Sidereal" and not self.sidereal_mode:
             self.sidereal_mode = DEFAULT_SIDEREAL_MODE
             logging.info("No sidereal mode set, using default FAGAN_BRADLEY")
 
         if self.zodiac_type == "Sidereal":
             # Check if the sidereal mode is valid
-            
+
             if not self.sidereal_mode or not self.sidereal_mode in get_args(SiderealMode):
                 raise KerykeionException(f"\n* ERROR: '{self.sidereal_mode}' is NOT a valid sidereal mode! Available modes are: *" + "\n" + str(get_args(SiderealMode)))
 
@@ -328,7 +330,7 @@ class AstrologicalSubject:
         # UTC, julian day and local time setup --->
         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
@@ -496,6 +498,10 @@ 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]
+        # 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
 
         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)
@@ -509,6 +515,8 @@ class AstrologicalSubject:
         self.pluto = get_kerykeion_point_from_degree(pluto_deg, "Pluto", point_type=point_type)
         self.mean_node = get_kerykeion_point_from_degree(mean_node_deg, "Mean_Node", point_type=point_type)
         self.true_node = get_kerykeion_point_from_degree(true_node_deg, "True_Node", point_type=point_type)
+        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)
 
         self.sun.house = get_planet_house(sun_deg, self._houses_degree_ut)
         self.moon.house = get_planet_house(moon_deg, self._houses_degree_ut)
@@ -522,6 +530,9 @@ class AstrologicalSubject:
         self.pluto.house = get_planet_house(pluto_deg, self._houses_degree_ut)
         self.mean_node.house = get_planet_house(mean_node_deg, self._houses_degree_ut)
         self.true_node.house = get_planet_house(true_node_deg, self._houses_degree_ut)
+        self.mean_south_node.house = get_planet_house(mean_south_node_deg, self._houses_degree_ut)
+        self.true_south_node.house = get_planet_house(true_south_node_deg, self._houses_degree_ut)
+
 
         # Deprecated
         planets_list = [
@@ -537,6 +548,8 @@ class AstrologicalSubject:
             self.pluto,
             self.mean_node,
             self.true_node,
+            self.mean_south_node,
+            self.true_south_node,
         ]
 
         if not self.disable_chiron_and_lilith:
@@ -563,6 +576,14 @@ class AstrologicalSubject:
         # Check in retrograde or not:
         for planet in planets_list:
             planet_number = get_number_from_name(planet["name"])
+
+            # Swiss ephemeris library does not offer calculation of direction of south nodes.
+            # But south nodes have same direction as north nodes. We can use those to calculate direction.
+            if planet_number == 1000:   # Number of Mean South Node
+                planet_number = 10      # Number of Mean North Node
+            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:
@@ -651,7 +672,7 @@ class AstrologicalSubject:
         Returns the UTC time as a float.
         """
         dt = datetime.fromisoformat(self.iso_formatted_utc_datetime)
-        
+
         # Extract the hours, minutes, and seconds
         hours = dt.hour
         minutes = dt.minute
@@ -669,7 +690,7 @@ class AstrologicalSubject:
         Returns the local time as a float.
         """
         dt = datetime.fromisoformat(self.iso_formatted_local_datetime)
-        
+
         # Extract the hours, minutes, and seconds
         hours = dt.hour
         minutes = dt.minute
@@ -684,8 +705,8 @@ class AstrologicalSubject:
     @staticmethod
     def get_from_iso_utc_time(
         name: str,
-        iso_utc_time: str, 
-        city: str = "Greenwich", 
+        iso_utc_time: str,
+        city: str = "Greenwich",
         nation: str = "GB",
         tz_str: str = "Etc/GMT",
         online: bool = False,
@@ -697,7 +718,7 @@ class AstrologicalSubject:
         sidereal_mode: Union[SiderealMode, None] = None,
         houses_system_identifier: HousesSystemIdentifier = DEFAULT_HOUSES_SYSTEM_IDENTIFIER,
         perspective_type: PerspectiveType = DEFAULT_PERSPECTIVE_TYPE
-        
+
     ) -> "AstrologicalSubject":
         """
         Creates an AstrologicalSubject object from an iso formatted UTC time.
@@ -775,7 +796,7 @@ if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
 
     setup_logging(level="debug")
-    
+
     # With Chiron enabled
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
     print(json.loads(johnny.json(dump=True)))

{kerykeion-4.18.5 → kerykeion-4.19.0}/kerykeion/charts/charts_utils.py

@@ -34,7 +34,8 @@ def get_decoded_kerykeion_celestial_point_name(input_planet_name: str, celestial
         return celestial_point_language[input_planet_name]
 
     # Return the special house name if it exists, otherwise return an empty string
-    return special_house_names.get(input_planet_name, "")
+    decoded_special_name = special_house_names.get(input_planet_name, "")
+    return celestial_point_language[decoded_special_name]
 
 
 def decHourJoin(inH: int, inM: int, inS: int) -> float:
@@ -515,8 +516,8 @@ def draw_third_circle(
 
 
 def draw_aspect_grid(
-        stroke_color: str, 
-        available_planets: list, 
+        stroke_color: str,
+        available_planets: list,
         aspects: list,
         x_start: int = 380,
         y_start: int = 468,
@@ -705,7 +706,7 @@ def draw_transit_aspect_list(
     Returns:
     - A string containing the SVG path data for the aspect transit grid.
     """
-    
+
     if isinstance(celestial_point_language, dict):
         celestial_point_language = KerykeionLanguageCelestialPointModel(**celestial_point_language)
 
@@ -719,26 +720,29 @@ def draw_transit_aspect_list(
     line = 0
     nl = 0
     inner_path = ""
-    scale = 1
     for i, aspect in enumerate(aspects_list):
         # Adjust the vertical position for every 12 aspects
-        if i == 12:
+        if i == 14:
             nl = 100
             line = 0
 
-        elif i == 24:
+        elif i == 28:
             nl = 200
             line = 0
 
-        elif i == 36:
+        elif i == 42:
             nl = 300
             line = 0
 
-        elif i == 48:
+        elif i == 56:
             nl = 400
+            line = 0
+
+        elif i == 70:
+            nl = 500
             # When there are more than 60 aspects, the text is moved up
-            if len(aspects_list) > 60:
-                line = -1 * (len(aspects_list) - 60) * 14
+            if len(aspects_list) > 84:
+                line = -1 * (len(aspects_list) - 84) * 14
             else:
                 line = 0
 
@@ -761,7 +765,7 @@ def draw_transit_aspect_list(
         inner_path += f"</g>"
         line = line + 14
 
-    out = f'<g style="transform: translate(47%, 59%) scale({scale})">'
+    out = f'<g style="transform: translate(43%, 50%)">'
     out += f'<text y="-15" x="0" style="fill: var(--kerykeion-chart-color-paper-0); font-size: 14px;">{grid_title}:</text>'
     out += inner_path
     out += "</g>"
@@ -863,11 +867,11 @@ def draw_house_grid(
     Returns:
     - str: The SVG code for the grid of houses.
     """
-    
+
     if chart_type in ["Synastry", "Transit"] and secondary_subject_houses_list is None:
         raise KerykeionException("secondary_houses is None")
 
-    svg_output = '<g transform="translate(610,-20)">'
+    svg_output = '<g transform="translate(650,-20)">'
 
     line_increment = 10
     for i, house in enumerate(main_subject_houses_list):
@@ -885,7 +889,7 @@ def draw_house_grid(
 
     if chart_type == "Synastry":
         svg_output += '<!-- Synastry Houses -->'
-        svg_output += '<g transform="translate(850, -20)">'
+        svg_output += '<g transform="translate(910, -20)">'
         line_increment = 10
 
         for i, house in enumerate(secondary_subject_houses_list): # type: ignore
@@ -935,8 +939,7 @@ def draw_planet_grid(
     offset_between_lines = 14
 
     svg_output = (
-        f'<g transform="translate(510,-20)">'
-        f'<g transform="translate(140, -15)">'
+        f'<g transform="translate(175, -15)">'
         f'<text text-anchor="end" style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {subject_name}:</text>'
         f'</g>'
     )
@@ -1003,13 +1006,12 @@ def draw_planet_grid(
             svg_output += end_of_line
             second_line_height += offset_between_lines
 
-    svg_output += end_of_line
     return svg_output
 
 
 def draw_transit_aspect_grid(
-        stroke_color: str, 
-        available_planets: list, 
+        stroke_color: str,
+        available_planets: list,
         aspects: list,
         x_indent: int = 50,
         y_indent: int = 250,
@@ -1080,4 +1082,4 @@ def draw_transit_aspect_grid(
                 if (aspect["p1"] == planet_a["id"] and aspect["p2"] == planet_b["id"]):
                     svg_output += f'<use  x="{x_aspect - box_size + 1}" y="{y_aspect + 1}" xlink:href="#orb{aspect["aspect_degrees"]}" />'
 
-    return svg_output
+    return svg_output