kerykeion 4.24.3__py3-none-any.whl → 4.24.4__py3-none-any.whl

kerykeion/astrological_subject.py

@@ -194,13 +194,13 @@ class AstrologicalSubject:
         lat: Union[int, float, None] = None,
         tz_str: Union[str, None] = None,
         geonames_username: Union[str, None] = None,
-        zodiac_type: ZodiacType = DEFAULT_ZODIAC_TYPE,
+        zodiac_type: Union[ZodiacType, None] = DEFAULT_ZODIAC_TYPE,
         online: bool = True,
         disable_chiron: Union[None, bool] = None, # Deprecated
         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,
+        houses_system_identifier: Union[HousesSystemIdentifier, None] = DEFAULT_HOUSES_SYSTEM_IDENTIFIER,
+        perspective_type: Union[PerspectiveType, None] = DEFAULT_PERSPECTIVE_TYPE,
+        cache_expire_after_days: Union[int, None] = DEFAULT_GEONAMES_CACHE_EXPIRE_AFTER_DAYS,
         is_dst: Union[None, bool] = None,
         disable_chiron_and_lilith: bool = False
     ) -> None:
@@ -226,13 +226,10 @@ class AstrologicalSubject:
         self.day = day
         self.hour = hour
         self.minute = minute
-        self.zodiac_type = zodiac_type
         self.online = online
         self.json_dir = Path.home()
         self.disable_chiron = disable_chiron
         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
@@ -282,6 +279,30 @@ class AstrologicalSubject:
         else:
             self.tz_str = tz_str # type: ignore
 
+        # Zodiac type
+        if not zodiac_type:
+            self.zodiac_type = DEFAULT_ZODIAC_TYPE
+        else:
+            self.zodiac_type = zodiac_type
+
+        # Perspective type
+        if not perspective_type:
+            self.perspective_type = DEFAULT_PERSPECTIVE_TYPE
+        else:
+            self.perspective_type = perspective_type
+
+        # Houses system identifier
+        if not houses_system_identifier:
+            self.houses_system_identifier = DEFAULT_HOUSES_SYSTEM_IDENTIFIER
+        else:
+            self.houses_system_identifier = houses_system_identifier
+
+        # Cache expire after days
+        if not cache_expire_after_days:
+            self.cache_expire_after_days = DEFAULT_GEONAMES_CACHE_EXPIRE_AFTER_DAYS
+        else:
+            self.cache_expire_after_days = cache_expire_after_days
+
         #-----------------------#
         # Swiss Ephemeris setup #
         #-----------------------#
@@ -469,7 +490,7 @@ class AstrologicalSubject:
             _ascmc = ascmc
 
         else:
-            raise KerykeionException("Not a valid zodiac type: ", self.zodiac_type)
+            raise KerykeionException("Not a valid zodiac type: " + self.zodiac_type)
 
         point_type: PointType = "House"
 
@@ -854,42 +875,5 @@ if __name__ == "__main__":
     setup_logging(level="debug")
 
     # With Chiron enabled
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
+    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", zodiac_type=None)
     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)
-
-    # With Sidereal Zodiac
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
-    print(johnny.json(dump=True, indent=2))
-
-    # With Morinus Houses
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", houses_system_identifier="M")
-    print(johnny.json(dump=True, indent=2))
-
-    # With True Geocentric Perspective
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", perspective_type="True Geocentric")
-    print(johnny.json(dump=True, indent=2))
-
-    # With Heliocentric Perspective
-    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", perspective_type="Heliocentric")
-    print(johnny.json(dump=True, indent=2))
-
-    # With Topocentric Perspective
-    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)
-
-    # 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, sidereal_mode="FAGAN_BRADLEY", zodiac_type="Sidereal")
-    print(johnny.json(dump=True, indent=2))

{kerykeion-4.24.3.dist-info → kerykeion-4.24.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.24.3
+Version: 4.24.4
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0

{kerykeion-4.24.3.dist-info → kerykeion-4.24.4.dist-info}/RECORD

@@ -4,7 +4,7 @@ kerykeion/aspects/__init__.py,sha256=9kx_Rx1NJx5SM7nDCSbI79S1neZ3c-q2NvQr-S6A9PY
 kerykeion/aspects/aspects_utils.py,sha256=Ej-E7Uvfi8x_ydP9dOhzhCp2uSpvX67T_VXuOjEKdoQ,3071
 kerykeion/aspects/natal_aspects.py,sha256=LHSorTAMLry-0KJWRZ0QQCBiRbuYnZkoIEFVwaAG-e0,6585
 kerykeion/aspects/synastry_aspects.py,sha256=5vU8yJgAGRyVBoKvRpsg-0AcQg-imOzH91tvDM_RUNQ,5044
-kerykeion/astrological_subject.py,sha256=OWBpAKP0aavvqNWg_c1dTbGVkd6BM7XMzgIMOVo683A,39157
+kerykeion/astrological_subject.py,sha256=pzy9Fipg-ywCk5bZoGoA8bhs4M2r2JZBWoC3ZxHQrQ8,38245
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
 kerykeion/charts/charts_utils.py,sha256=D2eaZHSFfmszvAlQbeaOEYskaOFP5XbjV3xlBBPOAno,42141
 kerykeion/charts/draw_planets.py,sha256=Uty3zpWYMQZvvK7ZHhlmynCHeL8DIN3qL2ifnBXVciM,17393
@@ -36,8 +36,8 @@ kerykeion/settings/kr.config.json,sha256=01xm7VOmGxMa86VM8VL8giYmnDTkfo2aE9qjIfI
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
 kerykeion/utilities.py,sha256=vuEDWs5Htl2zi6_3flLvlAsFC9YT9LaOQDpRirFf3Cg,11160
-kerykeion-4.24.3.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.24.3.dist-info/METADATA,sha256=eRfWFqR8jMWtxOzR0iOyTEzqgld9JvQAk0EHWZiYHhI,17722
-kerykeion-4.24.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-kerykeion-4.24.3.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.24.3.dist-info/RECORD,,
+kerykeion-4.24.4.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.24.4.dist-info/METADATA,sha256=sWa2MZc6dkVRRRX9Y7asg1jwhXOgcju2cWegRtOMaXw,17722
+kerykeion-4.24.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+kerykeion-4.24.4.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.24.4.dist-info/RECORD,,