kerykeion 4.9.0__tar.gz → 4.10.0__tar.gz

{kerykeion-4.9.0 → kerykeion-4.10.0}/PKG-INFO

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

{kerykeion-4.9.0 → kerykeion-4.10.0}/kerykeion/astrological_subject.py

@@ -15,7 +15,8 @@ from kerykeion.kr_types import (
     AstrologicalSubjectModel,
     LunarPhaseModel,
     KerykeionPointModel,
-    PointType
+    PointType,
+    SiderealMode
 )
 from kerykeion.utilities import (
     get_number_from_name, 
@@ -28,6 +29,7 @@ from pathlib import Path
 from typing import Union
 
 DEFAULT_GEONAMES_USERNAME = "century.boy"
+DEFAULT_SIDEREAL_MODE = "FAGAN_BRADLEY"
 
 
 class AstrologicalSubject:
@@ -59,6 +61,10 @@ class AstrologicalSubject:
         _ 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.
+    - 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.
     """
 
     # Defined by the user
@@ -77,6 +83,7 @@ class AstrologicalSubject:
     geonames_username: str
     online: bool
     zodiac_type: ZodiacType
+    sidereal_mode: SiderealMode
 
     # Generated internally
     city_data: dict[str, str]
@@ -140,16 +147,16 @@ class AstrologicalSubject:
         zodiac_type: ZodiacType = "Tropic",
         online: bool = True,
         utc_datetime: Union[datetime, None] = None,
-        disable_chiron: bool = False
+        disable_chiron: bool = False,
+        sidereal_mode: Union[SiderealMode, None] = None
     ) -> None:
         logging.debug("Starting Kerykeion")
 
         # We set the swisseph path to the current directory
-        swe.set_ephe_path(
-            str(
-                Path(__file__).parent.absolute() / "sweph"
-            )
-        )
+        swe.set_ephe_path(str(Path(__file__).parent.absolute() / "sweph"))
+        
+        # Flags for the Swiss Ephemeris
+        self._iflag = swe.FLG_SWIEPH + swe.FLG_SPEED
 
         self.name = name
         self.year = year
@@ -168,6 +175,22 @@ class AstrologicalSubject:
         self.geonames_username = geonames_username
         self.utc_datetime = utc_datetime
         self.disable_chiron = disable_chiron
+        self.sidereal_mode = sidereal_mode
+
+        # Sidereal mode check and setup --->
+        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":
+            self._iflag += swe.FLG_SIDEREAL
+            mode = "SIDM_" + sidereal_mode
+            swe.set_sid_mode(getattr(swe, mode))
+            logging.debug(f"Using sidereal mode: {mode}")
+        # <--- Sidereal mode check and setup
 
         # This message is set to encourage the user to set a custom geonames username
         if geonames_username is None and online:
@@ -207,9 +230,7 @@ class AstrologicalSubject:
             logging.info("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!"
-            )
+            raise KerykeionException("You need to set the coordinates and timezone if you want to use the offline mode!")
 
         self._check_if_poles()
 
@@ -328,12 +349,9 @@ class AstrologicalSubject:
             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: PointType = "House"
-        # creates the list of the house in 360°
-        self.houses_degree_ut = swe.houses(self.julian_day, self.lat, self.lng)[0]
+
         # stores the house in singular dictionaries.
         self.first_house = calculate_position(self.houses_degree_ut[0], "First_House", point_type=point_type)
         self.second_house = calculate_position(self.houses_degree_ut[1], "Second_House", point_type=point_type)
@@ -365,12 +383,6 @@ class AstrologicalSubject:
 
     def _planets_degrees_lister(self):
         """Sidereal or tropic mode."""
-        self._iflag = swe.FLG_SWIEPH + swe.FLG_SPEED
-
-        if self.zodiac_type == "Sidereal":
-            self._iflag += swe.FLG_SIDEREAL
-            mode = "SIDM_FAGAN_BRADLEY"
-            swe.set_sid_mode(getattr(swe, mode))
 
         # Calculates the position of the planets and stores it in a list.
         sun_deg = swe.calc(self.julian_day, 0, self._iflag)[0][0]
@@ -578,7 +590,6 @@ class AstrologicalSubject:
 
         KrData = AstrologicalSubjectModel(**self.__dict__)
         json_string = KrData.model_dump_json(exclude_none=True)
-        print(json_string)
 
         if dump:
             if destination_folder:
@@ -621,3 +632,6 @@ if __name__ == "__main__":
 
     print('\n')
     print(johnny.chiron)
+
+    # With Sidereal Zodiac
+    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", zodiac_type="Sidereal", sidereal_mode="FAGAN_BRADLEY")

{kerykeion-4.9.0 → kerykeion-4.10.0}/kerykeion/charts/kerykeion_chart_svg.py

@@ -45,9 +45,9 @@ class KerykeionChartSVG:
         - first_obj: First kerykeion object
         - chart_type: Natal, ExternalNatal, Transit, Synastry (Default: Type="Natal").
         - second_obj: Second kerykeion object (Not required if type is Natal)
-        - new_output_directory: Set the output directory (default: output_directory)
-        - lang: language settings (default: "EN")
-        - new_settings_file: Set the settings file (default: kr.config.json)
+        - new_output_directory: Set the output directory (default: home directory).
+        - new_settings_file: Set the settings file (default: kr.config.json).
+            In the settings file you can set the language, colors, planets, aspects, etc.
     """
     
     # Constants
@@ -218,7 +218,6 @@ class KerykeionChartSVG:
                 self.t_houses_sign_graph.append(h["sign_num"])
 
         # screen size
-        
         self.height = self._DEFAULT_HEIGHT
         if self.chart_type == "Synastry" or self.chart_type == "Transit":
             self.width = self._DEFAULT_FULL_WIDTH
@@ -1159,7 +1158,6 @@ class KerykeionChartSVG:
         svgHeight = "100%"
         svgWidth = "100%"
         rotate = "0"
-        translate = "0"
         
         # To increase the size of the chart, change the viewbox
         if self.chart_type == "Natal" or self.chart_type == "ExternalNatal":
@@ -1218,6 +1216,7 @@ class KerykeionChartSVG:
         td["svgHeight"] = str(svgHeight)
         td["viewbox"] = viewbox
 
+        # Chart Title
         if self.chart_type == "Synastry":
             td["stringTitle"] = f"{self.user.name} {self.language_settings['and_word']} {self.t_user.name}"
 
@@ -1227,17 +1226,24 @@ class KerykeionChartSVG:
         else:
             td["stringTitle"] = self.user.name
 
-        # Tipo di carta
+        # Chart Name
         if self.chart_type == "Synastry" or self.chart_type == "Transit":
             td["stringName"] = f"{self.user.name}:"
         else:
             td["stringName"] = f'{self.language_settings["info"]}:'
 
-        # bottom left
-        td["bottomLeft1"] = ""
-        td["bottomLeft2"] = ""
-        td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.user.lunar_phase.get("moon_phase", "")}'
-        td["bottomLeft4"] = ""
+        # Bottom Left Corner
+        if self.chart_type == "Natal" or self.chart_type == "ExternalNatal" or self.chart_type == "Synastry":
+            td["bottomLeft1"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.user.lunar_phase.moon_phase_name}'
+            td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.user.lunar_phase.get("moon_phase", "")}'
+            td["bottomLeft4"] = ""
+
+        else:
+            td["bottomLeft1"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
+            td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.t_user.lunar_phase.get("moon_phase", "")}'
+            td["bottomLeft4"] = ""
 
         # lunar phase
         deg = self.user.lunar_phase["degrees_between_s_m"]
@@ -1348,7 +1354,6 @@ class KerykeionChartSVG:
         # config
         td["cfgZoom"] = str(self.zoom)
         td["cfgRotate"] = rotate
-        td["cfgTranslate"] = translate
 
         # ---
         # Drawing Functions
@@ -1401,7 +1406,7 @@ class KerykeionChartSVG:
         if not (self.template):
             self.template = self.makeTemplate(minify)
 
-        self.chartname = self.output_directory / f"{self.user.name}{self.chart_type}Chart.svg"
+        self.chartname = self.output_directory / f"{self.user.name} - {self.chart_type} Chart.svg"
 
         with open(self.chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(self.template)
@@ -1426,9 +1431,28 @@ if __name__ == "__main__":
 
     # Synastry Chart
     synastry_chart = KerykeionChartSVG(first, "Synastry", second)
-    synastry_chart.makeSVG(minify=True)
+    synastry_chart.makeSVG()
 
     # Transits Chart
     transits_chart = KerykeionChartSVG(first, "Transit", second)
-    transits_chart.makeSVG(minify=True)
-
+    transits_chart.makeSVG()
+    
+    # Sidereal Birth Chart (Lahiri)
+    sidereal_subject = AstrologicalSubject("John Lennon Lahiri", 1940, 10, 9, 10, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
+    sidereal_chart = KerykeionChartSVG(sidereal_subject)
+    sidereal_chart.makeSVG()
+
+    # Sidereal Birth Chart (Fagan-Bradley)
+    sidereal_subject = AstrologicalSubject("John Lennon Fagan-Bradley", 1940, 10, 9, 10, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="FAGAN_BRADLEY")
+    sidereal_chart = KerykeionChartSVG(sidereal_subject)
+    sidereal_chart.makeSVG()
+
+    # Sidereal Birth Chart (DeLuce)
+    sidereal_subject = AstrologicalSubject("John Lennon DeLuce", 1940, 10, 9, 10, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="DELUCE")
+    sidereal_chart = KerykeionChartSVG(sidereal_subject)
+    sidereal_chart.makeSVG()
+
+    # Sidereal Birth Chart (J2000)
+    sidereal_subject = AstrologicalSubject("John Lennon J2000", 1940, 10, 9, 10, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="J2000")
+    sidereal_chart = KerykeionChartSVG(sidereal_subject)
+    sidereal_chart.makeSVG()