kerykeion 4.19.0__tar.gz → 4.21.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.19.0
+Version: 4.21.0
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Software Development
@@ -396,6 +397,21 @@ Example:
 ...
 ```
 
+In the charts, by default, the mean nodes (M) are displayed, while the true nodes are not displayed. 
+To display them, you need to edit the configuration file (kr.config.json).
+
+## JSON Support
+
+The astrological subject, which is the base of data used in the library, can be easily serialized to JSON with the `json` method.
+
+```python
+from kerykeion import AstrologicalSubject
+
+johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
+
+print(johnny.json(dump=False, indent=2))
+```
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

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

@@ -359,6 +359,21 @@ Example:
 ...
 ```
 
+In the charts, by default, the mean nodes (M) are displayed, while the true nodes are not displayed. 
+To display them, you need to edit the configuration file (kr.config.json).
+
+## JSON Support
+
+The astrological subject, which is the base of data used in the library, can be easily serialized to JSON with the `json` method.
+
+```python
+from kerykeion import AstrologicalSubject
+
+johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
+
+print(johnny.json(dump=False, indent=2))
+```
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-This is part of Kerykeion (C) 2024 Giacomo Battaglia
+This is part of Kerykeion (C) 2025 Giacomo Battaglia
 
 .. include:: ../README.md
 """

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/aspects/__init__.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-This is part of Kerykeion (C) 2024 Giacomo Battaglia
+This is part of Kerykeion (C) 2025 Giacomo Battaglia
 
-The aspects module contains the classes and functions for calculating 
+The aspects module contains the classes and functions for calculating
  aspects between planets and points in a chart.
 """
 

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/aspects/aspects_utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 # TODO: Better documentation and unit tests
 

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 from pathlib import Path

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 from kerykeion import AstrologicalSubject

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 import pytz
@@ -40,6 +40,7 @@ DEFAULT_SIDEREAL_MODE: SiderealMode = "FAGAN_BRADLEY"
 DEFAULT_HOUSES_SYSTEM_IDENTIFIER: HousesSystemIdentifier = "P"
 DEFAULT_ZODIAC_TYPE: ZodiacType = "Tropic"
 DEFAULT_PERSPECTIVE_TYPE: PerspectiveType = "Apparent Geocentric"
+DEFAULT_GEONAMES_CACHE_EXPIRE_AFTER_DAYS = 30
 GEONAMES_DEFAULT_USERNAME_WARNING = (
     "\n********\n"
     "NO GEONAMES USERNAME SET!\n"
@@ -89,6 +90,7 @@ 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.
+    - cache_expire_after_days (int, optional): The number of days after which the geonames cache will expire. Defaults to 30.
     - 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.
@@ -187,6 +189,7 @@ class AstrologicalSubject:
         sidereal_mode: Union[SiderealMode, None] = None,
         houses_system_identifier: HousesSystemIdentifier = DEFAULT_HOUSES_SYSTEM_IDENTIFIER,
         perspective_type: PerspectiveType = DEFAULT_PERSPECTIVE_TYPE,
+        cache_expire_after_days: int = DEFAULT_GEONAMES_CACHE_EXPIRE_AFTER_DAYS,
         is_dst: Union[None, bool] = None,
         disable_chiron_and_lilith: bool = False
     ) -> None:
@@ -219,6 +222,7 @@ class AstrologicalSubject:
         self.sidereal_mode = sidereal_mode
         self.houses_system_identifier = houses_system_identifier
         self.perspective_type = perspective_type
+        self.cache_expire_after_days = cache_expire_after_days
         self.is_dst = is_dst
         self.disable_chiron_and_lilith = disable_chiron_and_lilith
 
@@ -227,7 +231,7 @@ class AstrologicalSubject:
         #---------------#
 
         # Geonames username
-        if geonames_username is None and online:
+        if geonames_username is None and online and (not lat or not lng or not tz_str):
             logging.warning(GEONAMES_DEFAULT_USERNAME_WARNING)
             self.geonames_username = DEFAULT_GEONAMES_USERNAME
         else:
@@ -381,6 +385,7 @@ class AstrologicalSubject:
             self.city,
             self.nation,
             username=self.geonames_username,
+            cache_expire_after_days=self.cache_expire_after_days
         )
         self.city_data: dict[str, str] = geonames.get_serialized_data()
 
@@ -835,5 +840,5 @@ if __name__ == "__main__":
     print(johnny.mean_lilith)
 
     # Offline mode
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", online=False, tz_str="America/New_York", lng=-87.1111, lat=37.7711)
+    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", online=False, tz_str="America/New_York", lng=-87.1111, lat=37.7711, sidereal_mode="FAGAN_BRADLEY", zodiac_type="Sidereal")
     print(johnny.json(dump=True, indent=2))

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/charts/__init__.py

@@ -1,5 +1,5 @@
 """
-This is part of Kerykeion (C) 2024 Giacomo Battaglia
+This is part of Kerykeion (C) 2025 Giacomo Battaglia
 
 This modules contains the charts logic for the Kerykeion project.
-"""
+"""

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/charts/kerykeion_chart_svg.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 
 import logging
+import swisseph as swe
 from typing import get_args
 
 from kerykeion.settings.kerykeion_settings import get_settings
@@ -408,11 +409,19 @@ class KerykeionChartSVG:
         else:
             template_dict["stringTitle"] = self.user.name
 
-        # Set bottom left corner information
-        template_dict["bottomLeft0"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else str(self.user.zodiac_type) + ' ' + str(self.user.sidereal_mode)}"
-        template_dict["bottomLeft1"] = f"{self.user.houses_system_name}"
+        if self.user.zodiac_type == 'Tropic':
+            zodiac_info = "Tropical Zodiac"
+
+        else:
+            mode_const = "SIDM_" + self.user.sidereal_mode # type: ignore
+            mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
+            zodiac_info = f"Ayanamsa: {mode_name}"
+
+        template_dict["bottomLeft0"] = f"{self.user.houses_system_name} Houses"
+        template_dict["bottomLeft1"] = zodiac_info
+
         if self.chart_type in ["Natal", "ExternalNatal", "Synastry"]:
-            template_dict["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.user.lunar_phase.get("moon_phase", "")}'
+            template_dict["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")} {self.language_settings.get("day", "Day").lower()}: {self.user.lunar_phase.get("moon_phase", "")}'
             template_dict["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.user.lunar_phase.moon_phase_name}'
             template_dict["bottomLeft4"] = f'{self.user.perspective_type}'
         else:
@@ -905,3 +914,8 @@ if __name__ == "__main__":
     hindi_subject = AstrologicalSubject("Amitabh Bachchan", 1942, 10, 11, 4, 0, "Allahabad", "IN")
     hindi_chart = KerykeionChartSVG(hindi_subject, chart_language="HI")
     hindi_chart.makeSVG()
+
+    # Kanye West Natal Chart
+    kanye_west_subject = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
+    kanye_west_chart = KerykeionChartSVG(kanye_west_subject)
+    kanye_west_chart.makeSVG()

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/fetch_geonames.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 
 import logging
+from datetime import timedelta
 from requests import Request
 from requests_cache import CachedSession
 from typing import Union
@@ -15,9 +16,10 @@ class FetchGeonames:
     Class to handle requests to the GeoNames API
 
     Args:
-    city_name (str): Name of the city
-    country_code (str): Two letters country code
-    username (str, optional): GeoNames username, defaults to "century.boy".
+    - city_name (str): Name of the city
+    - country_code (str): Two letters country code
+    - username (str, optional): GeoNames username, defaults to "century.boy".
+    - cache_expire_after_days (int, optional): Cache expiration time in days, defaults to 30.
     """
 
     def __init__(
@@ -25,11 +27,12 @@ class FetchGeonames:
         city_name: str,
         country_code: str,
         username: str = "century.boy",
+        cache_expire_after_days=30,
     ):
         self.session = CachedSession(
             cache_name="cache/kerykeion_geonames_cache",
             backend="sqlite",
-            expire_after=86400,
+            expire_after=timedelta(days=cache_expire_after_days),
         )
 
         self.username = username

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/kr_types/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 from .kerykeion_exception import KerykeionException

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/kr_types/kerykeion_exception.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/kr_types/kr_literals.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-This is part of Kerykeion (C) 2024 Giacomo Battaglia
+This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 from typing import Literal
 

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/kr_types/kr_models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/kr_types/settings_models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/relationship_score/relationship_score.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 from kerykeion import AstrologicalSubject

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/relationship_score/relationship_score_factory.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 from kerykeion import AstrologicalSubject

{kerykeion-4.19.0 → kerykeion-4.21.0}/kerykeion/settings/kerykeion_settings.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+    This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
 

{kerykeion-4.19.0 → kerykeion-4.21.0}/pyproject.toml

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