kerykeion 4.4.1__py3-none-any.whl → 4.5.0__py3-none-any.whl

kerykeion/__init__.py

@@ -106,3 +106,4 @@ from .relationship_score import RelationshipScore
 from .aspects import SynastryAspects, NatalAspects
 from .report import Report
 from .settings import KerykeionSettingsModel, get_settings
+from .enums import Planets, Aspects, Signs

kerykeion/astrological_subject.py

@@ -51,6 +51,8 @@ class AstrologicalSubject:
     - utc_datetime (datetime, optional): An alternative way of constructing the object, 
         if you know the UTC datetime but do not have easy access to e.g. timezone identifier
         _ Defaults to None.
+    - 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.
     """
 
     # Defined by the user
@@ -91,7 +93,7 @@ class AstrologicalSubject:
     pluto: KerykeionPointModel
     true_node: KerykeionPointModel
     mean_node: KerykeionPointModel
-    chiron: KerykeionPointModel
+    chiron: KerykeionPointModel | None
 
     # Houses
     first_house: KerykeionPointModel
@@ -123,15 +125,16 @@ class AstrologicalSubject:
         day: int = now.day,
         hour: int = now.hour,
         minute: int = now.minute,
-        city: str = "",
-        nation: str = "",
-        lng: Union[int, float] = 0,
-        lat: Union[int, float] = 0,
-        tz_str: str = "",
+        city: Union[str, None] = None,
+        nation: Union[str, None] = None,
+        lng: Union[int, float, None] = None,
+        lat: Union[int, float, None] = None,
+        tz_str: Union[str, None] = None,
         geonames_username: Union[str, None] = None,
         zodiac_type: ZodiacType = "Tropic",
         online: bool = True,
         utc_datetime: Union[datetime, None] = None,
+        disable_chiron: bool = False
     ) -> None:
         logging.debug("Starting Kerykeion")
 
@@ -158,6 +161,7 @@ class AstrologicalSubject:
         self.json_dir = Path.home()
         self.geonames_username = geonames_username
         self.utc_datetime = utc_datetime
+        self.disable_chiron = disable_chiron
 
         # This message is set to encourage the user to set a custom geonames username
         if geonames_username is None and online:
@@ -188,7 +192,15 @@ class AstrologicalSubject:
             self.nation = "GB"
             logging.warning("No nation specified, using GB as default")
 
-        if (not self.online) and (not lng or not lat or not tz_str):
+        if not self.lat:
+            self.lat = 51.5074
+            logging.warning("No latitude specified, using London as default")
+
+        if not self.lng:
+            self.lng = 0
+            logging.warning("No longitude specified, using London as default")
+
+        if (not self.online) and (not tz_str):
             raise KerykeionException(
                 "You need to set the coordinates and timezone if you want to use the offline mode!"
             )
@@ -219,7 +231,7 @@ class AstrologicalSubject:
 
     def _fetch_tz_from_geonames(self) -> None:
         """Gets the nearest time zone for the calculation"""
-        logging.debug("Conneting to Geonames...")
+        logging.info("Fetching timezone/coordinates from geonames")
 
         geonames = FetchGeonames(
             self.city,
@@ -247,7 +259,7 @@ class AstrologicalSubject:
         """Converts local time to utc time."""
 
         # If the coordinates are not set, get them from geonames.
-        if (self.online) and (not self.tz_str or not self.lng or not self.lat):
+        if (self.online) and (not self.tz_str):
             self._fetch_tz_from_geonames()
 
         # If UTC datetime is provided, then use it directly
@@ -367,7 +379,11 @@ 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]
-        chiron_deg = swe.calc(self.julian_day, 15, 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,
@@ -382,8 +398,10 @@ class AstrologicalSubject:
             pluto_deg,
             mean_node_deg,
             true_node_deg,
-            chiron_deg,
         ]
+        
+        if not self.disable_chiron:
+            self.planets_degrees_ut.append(chiron_deg)
 
     def _planets(self) -> None:
         """Defines body positon in signs and information and
@@ -403,7 +421,11 @@ class AstrologicalSubject:
         self.pluto = calculate_position(self.planets_degrees_ut[9], "Pluto", point_type=point_type)
         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)
-        self.chiron = calculate_position(self.planets_degrees_ut[12], "Chiron", point_type=point_type)
+        
+        if not self.disable_chiron:
+            self.chiron = calculate_position(self.planets_degrees_ut[12], "Chiron", point_type=point_type)
+        else:
+            self.chiron = None
 
     def _planets_in_houses(self) -> None:
         """Calculates the house of the planet and updates
@@ -464,7 +486,11 @@ class AstrologicalSubject:
         self.pluto = for_every_planet(self.pluto, self.planets_degrees_ut[9])
         self.mean_node = for_every_planet(self.mean_node, self.planets_degrees_ut[10])
         self.true_node = for_every_planet(self.true_node, self.planets_degrees_ut[11])
-        self.chiron = for_every_planet(self.chiron, self.planets_degrees_ut[12])
+
+        if not self.disable_chiron:
+            self.chiron = for_every_planet(self.chiron, self.planets_degrees_ut[12])
+        else:
+            self.chiron = None
 
         self.planets_list = [
             self.sun,
@@ -479,8 +505,10 @@ class AstrologicalSubject:
             self.pluto,
             self.mean_node,
             self.true_node,
-            self.chiron
         ]
+        
+        if not self.disable_chiron:
+            self.planets_list.append(self.chiron)
 
         # Check in retrograde or not:
         planets_ret = []
@@ -635,10 +663,19 @@ class AstrologicalSubject:
 if __name__ == "__main__":
     import json
     from kerykeion.utilities import setup_logging
-    setup_logging(level="debug")
 
+    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)))
 
     print('\n')
     print(johnny.chiron)
+
+    # With Chiron disabled
+    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", disable_chiron=True)
+    print(json.loads(johnny.json(dump=True)))
+
+    print('\n')
+    print(johnny.chiron)

kerykeion/enums.py

@@ -0,0 +1,50 @@
+from enum import Enum
+
+
+class Planets(Enum):
+    SUN = "Sun"
+    MOON = "Moon"
+    MERCURY = "Mercury"
+    VENUS = "Venus"
+    MARS = "Mars"
+    JUPITER = "Jupiter"
+    SATURN = "Saturn"
+    URANUS = "Uranus"
+    NEPTUNE = "Neptune"
+    PLUTO = "Pluto"
+    CHIRON = "Chiron"
+    TRUE_NODE = "True_Node"
+    MEAN_NODE = "Mean_Node"
+
+
+class Aspects(Enum):
+    CONJUNCTION = "Conjunction"
+    SEXTILE = "Sextile"
+    SEMI_SEXTILE = "Semi-Sextile"
+    SQUARE = "Square"
+    TRINE = "Trine"
+    OPPOSITION = "Opposition"
+    QUINCUNX = "Quincunx"
+    NONE = None
+    QUINTILE = "Quintile"
+    BIQUINTILE = "Biquintile"
+    OCTILE = "Octile"
+    TRIOCTILE = "Trioctile"
+    DECILE = "Decile"
+    TRIDECILE = "Tridecile"
+    SESQUIQUADRATE = "Sesquiquadrate"
+
+
+class Signs(Enum):
+    ARI = "Ari"
+    TAU = "Tau"
+    GEM = "Gem"
+    CAN = "Can"
+    LEO = "Leo"
+    VIR = "Vir"
+    LIB = "Lib"
+    SCO = "Sco"
+    SAG = "Sag"
+    CAP = "Cap"
+    AQU = "Aqu"
+    PIS = "Pis"

kerykeion/kr_types/kr_models.py

@@ -136,7 +136,7 @@ class AstrologicalSubjectModel(BaseModel):
     uranus: KerykeionPointModel
     neptune: KerykeionPointModel
     pluto: KerykeionPointModel
-    chiron: KerykeionPointModel
+    chiron: KerykeionPointModel | None
 
     # Houses
     first_house: KerykeionPointModel

kerykeion/utilities.py

@@ -203,15 +203,20 @@ def calculate_position(
 
     return KerykeionPointModel(**dictionary)
 
+
 def setup_logging(level: str) -> None:
-    """Setup logging for testing.
-    
+    """
+    Setup logging for testing.
+
     Args:
-        level: Log level as a string, options: debug, info, warning, error"""
-    logopt: dict[str, int]  = {"debug": logging.DEBUG, 
-                               "info": logging.INFO, 
-                               "warning": logging.WARNING , 
-                               "error": logging.ERROR}
-    format: str             = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-    loglevel: int           = logopt.get(level, logging.INFO)
-    logging.basicConfig(format=format, level=loglevel)
+        level: Log level as a string, options: debug, info, warning, error
+    """
+    logopt: dict[str, int] = {
+        "debug": logging.DEBUG,
+        "info": logging.INFO,
+        "warning": logging.WARNING,
+        "error": logging.ERROR,
+    }
+    format: str = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    loglevel: int = logopt.get(level, logging.INFO)
+    logging.basicConfig(format=format, level=loglevel)

{kerykeion-4.4.1.dist-info → kerykeion-4.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.4.1
+Version: 4.5.0
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3
 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 :: Only
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Software Development

{kerykeion-4.4.1.dist-info → kerykeion-4.5.0.dist-info}/RECORD

@@ -1,20 +1,21 @@
 LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion/__init__.py,sha256=UpftP5JxYSfeRAAmXbRas1XGw4V6dNA-FllcFbKlCbo,3874
+kerykeion/__init__.py,sha256=PCtgM8o1R8Poo4RoISq23jLP-74LYWoShnK4bm81Yks,3917
 kerykeion/aspects/__init__.py,sha256=8uOTYtcMwyDBbDjIoz8wvWtdcgdU-86yQeM3EVLwnIA,293
 kerykeion/aspects/aspects_utils.py,sha256=10ozUZ4ZhMJ8e_wOZ02hoW9mHJm_d7bq4QXKG90CeNc,5832
 kerykeion/aspects/natal_aspects.py,sha256=k3L6wLec7l7BF1jKULN8rNlQNOhINnfPN6x8MixoMMo,4507
 kerykeion/aspects/synastry_aspects.py,sha256=rM_of6GU-ZQL1A6JaLsG59MTaAeWx29MWRf9te9hHeg,3993
-kerykeion/astrological_subject.py,sha256=4yfd55Ege35ajxbZkphO2oPAl9kBM2P6LMlRMkVoLpA,24414
+kerykeion/astrological_subject.py,sha256=KWHvnqqDW4D4n4z4nysWighpYft6_G_K3PI7iwMp2gg,25672
 kerykeion/charts/__init__.py,sha256=3WzR2n9dr6MDzjTbEQOYpXSFlhfMfga5YWNsPawdbRw,127
 kerykeion/charts/charts_utils.py,sha256=qQMXu5XZCCjvyqL62fzh4JnKLzd_G6u9pcMk6f1DpIc,3197
 kerykeion/charts/kerykeion_chart_svg.py,sha256=-5kclHKKL8kya2lFFnw5pZiygck82lAFBSI-eyse8lk,65295
 kerykeion/charts/templates/chart.xml,sha256=ZrkqJV3Du8vG1w8kVkM1wI-IiZNVDLDuS6dRtPz7wVo,69874
+kerykeion/enums.py,sha256=Ben9GLYkPucpYY2ZDpURzUbNCc9jzK2MuaffkgiXFdQ,965
 kerykeion/fetch_geonames.py,sha256=NwiRzl-OlA2yoEtgHEvdgWeed42cpcONmOhb9s-DAOY,4444
 kerykeion/kr_types/__init__.py,sha256=-vRe-jixD6n8d7vsLSwbbvU4c2RXOoVvv0pjbX-9eiY,205
 kerykeion/kr_types/chart_types.py,sha256=PvdOEqzZZBrJxFKQqAC0KcnfIY4T4I2i6CeLQhvVbe8,1945
 kerykeion/kr_types/kerykeion_exception.py,sha256=CtdpOaGTox_LBGB0Ji_qtcwbgYAqBJ8AfDXbeaiAkM0,314
 kerykeion/kr_types/kr_literals.py,sha256=hbgeq5yPuyLv9zXp7shBeEsMHOd8UQBBUa_HQnBQu7w,1034
-kerykeion/kr_types/kr_models.py,sha256=susG_mDnWpY4G_j1yVpgRpfSb196MLhiyigEYoRUAIY,4093
+kerykeion/kr_types/kr_models.py,sha256=g0-m17JetNpNgniyk5cxLtN23ho-zb5Y-HbHtGUX5Q4,4100
 kerykeion/kr_types/settings_models.py,sha256=4dOTAy6UgevF9dGPnBLIp4Aw5FBEygifnjDO8kALmdw,12737
 kerykeion/relationship_score.py,sha256=IPO8IH9J6GOYuuAfn01d0KamY1xSIjl391Zvk5F434Y,6794
 kerykeion/report.py,sha256=kS5avIN119pJVapYjZOvabg77nEcA8sSrOuXbRifABk,2565
@@ -23,9 +24,9 @@ kerykeion/settings/kerykeion_settings.py,sha256=vZCpWpTHVD3ItERWzsVW3syhgchJbWaP
 kerykeion/settings/kr.config.json,sha256=1Yhv9RGHom5U9e-JZZRWVfT2Ubllz2WrckdwadDWfyg,12282
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
-kerykeion/utilities.py,sha256=8cLY36PrjPjF4trGMIiHrFeH82mxUXYG6DlyfkNY8oM,6280
-kerykeion-4.4.1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.4.1.dist-info/METADATA,sha256=A9nBI48aU-SQwzBTkiUEHKsfBChPuJDbZjIfSIF7u0A,10260
-kerykeion-4.4.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-kerykeion-4.4.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.4.1.dist-info/RECORD,,
+kerykeion/utilities.py,sha256=LOug1qgHoR12hNvL2hqdRWTnTHst4BdzY6u1dl3PfL0,6207
+kerykeion-4.5.0.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.5.0.dist-info/METADATA,sha256=0S62iUPPD6Y_yb_EhoChnwXj7uJFXzx08EJAuhT7l9U,10311
+kerykeion-4.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.5.0.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.5.0.dist-info/RECORD,,

{kerykeion-4.4.1.dist-info → kerykeion-4.5.0.dist-info}/WHEEL

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