kerykeion 4.0.7__py3-none-any.whl → 4.1.1__py3-none-any.whl

kerykeion/astrological_subject.py

@@ -21,6 +21,7 @@ from kerykeion.utilities import get_number_from_name, calculate_position
 from pathlib import Path
 from typing import Union, Literal
 
+DEFAULT_GEONAMES_USERNAME = "century.boy"
 
 logger = getLogger(__name__)
 basicConfig(
@@ -131,7 +132,7 @@ class AstrologicalSubject:
         lng: Union[int, float] = 0,
         lat: Union[int, float] = 0,
         tz_str: str = "",
-        geonames_username: str = "century.boy",
+        geonames_username: Union[str, None] = None,
         zodiac_type: ZodiacType = "Tropic",
         online: bool = True,
     ) -> None:
@@ -144,7 +145,6 @@ class AstrologicalSubject:
             )
         )
 
-
         self.name = name
         self.year = year
         self.month = month
@@ -156,10 +156,31 @@ class AstrologicalSubject:
         self.lng = lng
         self.lat = lat
         self.tz_str = tz_str
-        self._geonames_username = geonames_username
         self.zodiac_type = zodiac_type
         self.online = online
         self.json_dir = Path.home()
+        self.geonames_username = geonames_username
+
+        # This message is set to encourage the user to set a custom geonames username
+        if geonames_username is None and online:
+            logger.info(
+                "\n"
+                "********" + \
+                "\n" + \
+                "NO GEONAMES USERNAME SET!" + \
+                "\n" + \
+                "Using the default geonames username is not recommended, please set a custom one!" + \
+                "\n" + \
+                "You can get one for free here:" + \
+                "\n" + \
+                "https://www.geonames.org/login" + \
+                "\n" + \
+                "Keep in mind that the default username is limited to 2000 requests per hour and is shared with everyone else using this library." + \
+                "\n" + \
+                "********"
+            )
+
+            self.geonames_username = DEFAULT_GEONAMES_USERNAME
 
         if not self.city:
             self.city = "London"
@@ -197,7 +218,7 @@ class AstrologicalSubject:
         geonames = FetchGeonames(
             self.city,
             self.nation,
-            username=self._geonames_username,
+            username=self.geonames_username,
         )
         self.city_data: dict[str, str] = geonames.get_serialized_data()
 
@@ -243,7 +264,50 @@ class AstrologicalSubject:
         self.julian_day = float(swe.julday(self.utc.year, self.utc.month, self.utc.day, self.utc_time))
 
     def _houses(self) -> None:
-        """Calculate positions and store them in dictionaries"""
+        """
+        Calculate positions and store them in dictionaries
+
+        https://www.astro.com/faq/fq_fh_owhouse_e.htm
+        https://github.com/jwmatthys/pd-swisseph/blob/master/swehouse.c#L685
+        hsys = letter code for house system;
+            A  equal
+            E  equal
+            B  Alcabitius
+            C  Campanus
+            D  equal (MC)
+            F  Carter "Poli-Equatorial"
+            G  36 Gauquelin sectors
+            H  horizon / azimut
+            I  Sunshine solution Treindl
+            i  Sunshine solution Makransky
+            K  Koch
+            L  Pullen SD "sinusoidal delta", ex Neo-Porphyry
+            M  Morinus
+            N  equal/1=Aries
+            O  Porphyry
+            P  Placidus
+            Q  Pullen SR "sinusoidal ratio"
+            R  Regiomontanus
+            S  Sripati
+            T  Polich/Page ("topocentric")
+            U  Krusinski-Pisa-Goelzer
+            V  equal Vehlow
+            W  equal, whole sign
+            X  axial rotation system/ Meridian houses
+            Y  APC houses
+        """
+
+        if self.zodiac_type == "Sidereal":
+            self.houses_degree_ut = swe.houses_ex(
+                tjdut=self.julian_day, lat=self.lat, lon=self.lng, hsys=str.encode('P'), flags=swe.FLG_SIDEREAL
+            )[0]
+        elif self.zodiac_type == "Tropic":
+            self.houses_degree_ut = swe.houses(
+                tjdut=self.julian_day, lat=self.lat, lon=self.lng, hsys=str.encode('P')
+            )[0]
+        else:
+            raise KerykeionException("Zodiac type not recognized! Please use 'Tropic' or 'Sidereal'")
+
         point_type: Literal["Planet", "House"] = "House"
         # creates the list of the house in 360°
         self.houses_degree_ut = swe.houses(self.julian_day, self.lat, self.lng)[0]

kerykeion/charts/kerykeion_chart_svg.py

@@ -7,7 +7,7 @@
 import pytz
 
 from datetime import datetime
-from kerykeion.settings.kerykeion_settings import get_settings_dict
+from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.synastry_aspects import SynastryAspects
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
@@ -127,7 +127,7 @@ class KerykeionChartSVG:
 
         if self.chart_type == "Natal" or self.chart_type == "ExternalNatal":
             natal_aspects_instance = NatalAspects(self.user, new_settings_file=self.new_settings_file)
-            self.aspects_list = natal_aspects_instance.get_relevant_aspects()
+            self.aspects_list = natal_aspects_instance.relevant_aspects
 
         # TODO: If not second should exit
         if self.chart_type == "Transit" or self.chart_type == "Synastry":
@@ -279,7 +279,7 @@ class KerykeionChartSVG:
         """
         Parse the settings file.
         """
-        settings = get_settings_dict(settings_file)
+        settings = get_settings(settings_file)
 
         language = settings["general_settings"]["language"]
         self.language_settings = settings["language_settings"].get(language, "EN")
@@ -1080,7 +1080,7 @@ class KerykeionChartSVG:
     def _makeAspectsTransit(self, r, ar):
         out = ""
 
-        self.aspects_list = SynastryAspects(self.user, self.t_user, new_settings_file=self.new_settings_file).get_relevant_aspects()
+        self.aspects_list = SynastryAspects(self.user, self.t_user, new_settings_file=self.new_settings_file).relevant_aspects
 
         for element in self.aspects_list:
             out += self._drawAspect(

kerykeion/relationship_score.py

@@ -59,7 +59,7 @@ class RelationshipScore:
         self.relevant_default_aspects = []
         self.__all_synastry_aspects = SynastryAspects(
             first_subject, second_subject, new_settings_file=new_settings_file
-        ).get_all_aspects()
+        ).all_aspects
 
         # Calculates all at initialization
         self._get_all()

kerykeion/settings/__init__.py

@@ -1 +1 @@
-from .kerykeion_settings import KerykeionSettingsModel, get_settings_dict
+from .kerykeion_settings import KerykeionSettingsModel, get_settings

kerykeion/settings/kerykeion_settings.py

@@ -17,7 +17,7 @@ basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level
 
 
 
-def get_settings_dict(new_settings_file: Union[Path, None] = None) -> KerykeionSettingsModel:
+def get_settings(new_settings_file: Union[Path, None] = None) -> KerykeionSettingsModel:
     """
     This function is used to get the settings dict from the settings file.
     If no settings file is passed as argument, or the file is not found, it will fallback to:
@@ -71,4 +71,4 @@ def merge_settings(settings: KerykeionSettingsModel, new_settings: Dict) -> Kery
 
 
 if __name__ == "__main__":
-    print(get_settings_dict())
+    print(get_settings())

{kerykeion-4.0.7.dist-info → kerykeion-4.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.0.7
+Version: 4.1.1
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0

{kerykeion-4.0.7.dist-info → kerykeion-4.1.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion/__init__.py,sha256=b01JNmaaRWjA9seRjAA59Cduy1dNVJ0iU2oUFw5qZiw,3885
+kerykeion/__init__.py,sha256=UpftP5JxYSfeRAAmXbRas1XGw4V6dNA-FllcFbKlCbo,3874
 kerykeion/aspects/__init__.py,sha256=KAGLkC41PRsRqiV6Ii38HIME-rfTrefiKOOzC5d7Ub0,292
-kerykeion/aspects/natal_aspects.py,sha256=W5AhNGAXqaBmhQOJghxqYWbETT3NHXLpGdDfqe1gj9E,10436
-kerykeion/aspects/synastry_aspects.py,sha256=DBEV-gT5gRuN8Rl6YNamjkvGQMvjehKL8qgTo75O9XI,2862
-kerykeion/astrological_subject.py,sha256=cIZiPnuNYSiSOOEAdOiSqxQbJXKDa-8jV8T7oDfRDe0,21222
+kerykeion/aspects/aspects_utils.py,sha256=TIYh-4xgRWb-5ZPSlhCGHdyPyP8hSTvUsPlt9HML1JQ,5521
+kerykeion/aspects/natal_aspects.py,sha256=BMDuruu4b0Gy2bv0UivFlHDtsBS9Eoe20QIICMQerNY,4907
+kerykeion/aspects/synastry_aspects.py,sha256=lbffXrySvICCVtsXjOtyjQphoDO3HoCmAmFGnp8JMck,3583
+kerykeion/astrological_subject.py,sha256=LsVKt1VEIl-JksNzu0wBF2KWesu7tqlpvnGZAFYSNs8,23682
 kerykeion/charts/__init__.py,sha256=3WzR2n9dr6MDzjTbEQOYpXSFlhfMfga5YWNsPawdbRw,127
 kerykeion/charts/charts_utils.py,sha256=qQMXu5XZCCjvyqL62fzh4JnKLzd_G6u9pcMk6f1DpIc,3197
-kerykeion/charts/kerykeion_chart_svg.py,sha256=mTqsisYjj_oEhJibwMgUSOCE4vvC_tXTWBLt9rIFOgo,66349
+kerykeion/charts/kerykeion_chart_svg.py,sha256=DTD1rXc9jm6GLPPsbsTNXbFThy8sQ4Zu-zBTAjT4iwg,66327
 kerykeion/charts/templates/chart.xml,sha256=ZrkqJV3Du8vG1w8kVkM1wI-IiZNVDLDuS6dRtPz7wVo,69874
 kerykeion/fetch_geonames.py,sha256=6tgjrwBMyjbA6YNZ4rcESyYSn0FDyi1xL2gkFuy9o6k,4774
 kerykeion/kr_types/__init__.py,sha256=Zua2Kz_g6jphfUmtzSk3oDxFfHOrqeGjSoomVAtaqIg,199
@@ -15,16 +15,15 @@ kerykeion/kr_types/kerykeion_exception.py,sha256=CtdpOaGTox_LBGB0Ji_qtcwbgYAqBJ8
 kerykeion/kr_types/kr_literals.py,sha256=hbgeq5yPuyLv9zXp7shBeEsMHOd8UQBBUa_HQnBQu7w,1034
 kerykeion/kr_types/kr_models.py,sha256=pnUwYC3EqxPN3brmWjBUqYT_9Blxcqc--VqUoi6wfOs,3971
 kerykeion/kr_types/settings_models.py,sha256=mUOee75TXbjOUgfr0gqGcqtx3KK3ScsPgLIEjEED9cs,12900
-kerykeion/relationship_score.py,sha256=bzM97kFjjDbc-grXhWG2PDkodu6dAFYZis3bO7qaR-A,6916
+kerykeion/relationship_score.py,sha256=xx69Sz8HDIXgsYd3eyn41E2p1HNqJoSxvaK9hzHTH-k,6910
 kerykeion/report.py,sha256=se2ZSDKjk2v2eaMWqBFaYPhcqyGP-RlQbr6uA-9-Mz0,2481
-kerykeion/settings/__init__.py,sha256=adj8WE0Svgce770ZAhF0B4BhH4liQfTkPDQC6aL39a8,74
-kerykeion/settings/kerykeion_settings.py,sha256=6e7GszUft0dl9VCnUNNlcSz5EXrA5QHh0FGd_oRqJIo,2416
+kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
+kerykeion/settings/kerykeion_settings.py,sha256=_EO6izQRXaKvTBx0B_YhuhQcCHV7jpvb5nOtZZ77loY,2406
 kerykeion/settings/kr.config.json,sha256=AtRKIRqstmtoCBqhMviXHjqYBzVL8qdCEyHsl3fLFqQ,12282
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
 kerykeion/utilities.py,sha256=l2IuKGP687USF5uzRHJFrNmvzHMSFzZEWliWSIHUjlU,5707
-kerykeion-4.0.7.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.0.7.dist-info/METADATA,sha256=AxCcMRHGx0MvshBda37_g0XME_-yrLxeF0a2bAuFqcY,9409
-kerykeion-4.0.7.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-kerykeion-4.0.7.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.0.7.dist-info/RECORD,,
+kerykeion-4.1.1.dist-info/METADATA,sha256=jqrolNmt4Dnu_yubV_kVhhN-Iq0_1MaaXlrdX4aDJPk,9409
+kerykeion-4.1.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+kerykeion-4.1.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.1.1.dist-info/RECORD,,