kerykeion 4.8.1__py3-none-any.whl → 4.12.3__py3-none-any.whl

kerykeion/charts/kerykeion_chart_svg.py

@@ -33,6 +33,7 @@ from pathlib import Path
 from scour.scour import scourString
 from string import Template
 from typing import Union, List
+from datetime import datetime
 
 
 
@@ -45,9 +46,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 +219,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
@@ -1018,7 +1018,7 @@ class KerykeionChartSVG:
         li = 10
         offset = 0
 
-        out = '<g transform="translate(500,-20)">'
+        out = '<g transform="translate(510,-20)">'
         out += '<g transform="translate(140, -15)">'
         out += f'<text text-anchor="end" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 14px;">{self.language_settings["planets_and_house"]} {self.user.name}:</text>'
         out += "</g>"
@@ -1109,7 +1109,7 @@ class KerykeionChartSVG:
         Returns:
             str: The SVG code for the grid of houses.
         """
-        out = '<g transform="translate(600,-20)">'
+        out = '<g transform="translate(610,-20)">'
 
         li = 10
         for i in range(12):
@@ -1127,8 +1127,10 @@ class KerykeionChartSVG:
         out += "</g>"
 
         if self.chart_type == "Synastry":
-            out += '<g transform="translate(840, -20)">'
+            out += '<!-- Synastry Houses -->'
+            out += '<g transform="translate(850, -20)">'
             li = 10
+
             for i in range(12):
                 if i < 9:
                     cusp = "&#160;&#160;" + str(i + 1)
@@ -1159,7 +1161,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 +1219,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 +1229,26 @@ 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["bottomLeft0"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft1"] = f"{self.user.houses_system_name}"
+            td["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.user.lunar_phase.get("moon_phase", "")}'
+            td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.user.lunar_phase.moon_phase_name}'
+            td["bottomLeft4"] = f'{self.user.perspective_type}'
+
+        else:
+            td["bottomLeft0"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft1"] = f"{self.user.houses_system_name}"
+            td["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.t_user.lunar_phase.get("moon_phase", "")}'
+            td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
+            td["bottomLeft4"] = f'{self.t_user.perspective_type}'
 
         # lunar phase
         deg = self.user.lunar_phase["degrees_between_s_m"]
@@ -1305,8 +1316,6 @@ class KerykeionChartSVG:
         else:
             td["stringLocation"] = self.location
 
-        td["stringDateTime"] = f"{self.user.year}-{self.user.month}-{self.user.day} {self.user.hour:02d}:{self.user.minute:02d}"
-
         if self.chart_type == "Synastry":
             td["stringLat"] = f"{self.t_user.name}: "
             td["stringLon"] = self.t_user.city
@@ -1348,7 +1357,6 @@ class KerykeionChartSVG:
         # config
         td["cfgZoom"] = str(self.zoom)
         td["cfgRotate"] = rotate
-        td["cfgTranslate"] = translate
 
         # ---
         # Drawing Functions
@@ -1371,6 +1379,12 @@ class KerykeionChartSVG:
         )
         td["makePlanetGrid"] = self._makePlanetGrid()
 
+        # Date time String
+        dt = datetime.fromisoformat(self.user.iso_formatted_local_datetime)
+        custom_format = dt.strftime('%Y-%-m-%-d %H:%M [%z]')  # Note the use of '-' to remove leading zeros
+        custom_format = custom_format[:-3] + ':' + custom_format[-3:]
+        td["stringDateTime"] = f"{custom_format}"
+
         return td
 
     def makeTemplate(self, minify: bool = False) -> str:
@@ -1401,7 +1415,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)
@@ -1413,7 +1427,7 @@ if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
     setup_logging(level="debug")
 
-    first = AstrologicalSubject("John Lennon", 1940, 10, 9, 10, 30, "Liverpool", "GB")
+    first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
     second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
 
     # Internal Natal Chart
@@ -1426,9 +1440,56 @@ 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, 18, 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, 18, 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, 18, 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, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="J2000")
+    sidereal_chart = KerykeionChartSVG(sidereal_subject)
+    sidereal_chart.makeSVG()
+
+    # House System Morinus
+    morinus_house_subject = AstrologicalSubject("John Lennon - House System Morinus", 1940, 10, 9, 18, 30, "Liverpool", "GB", houses_system_identifier="M")
+    morinus_house_chart = KerykeionChartSVG(morinus_house_subject)
+    morinus_house_chart.makeSVG()
+
+    ## To check all the available house systems uncomment the following code:
+    # from kerykeion.kr_types import HousesSystemIdentifier
+    # from typing import get_args
+    # for i in get_args(HousesSystemIdentifier):
+    #     alternatives_house_subject = AstrologicalSubject(f"John Lennon - House System {i}", 1940, 10, 9, 18, 30, "Liverpool", "GB", houses_system=i)
+    #     alternatives_house_chart = KerykeionChartSVG(alternatives_house_subject)
+    #     alternatives_house_chart.makeSVG()
+
+    # With True Geocentric Perspective
+    true_geocentric_subject = AstrologicalSubject("John Lennon - True Geocentric", 1940, 10, 9, 18, 30, "Liverpool", "GB", perspective_type="True Geocentric")
+    true_geocentric_chart = KerykeionChartSVG(true_geocentric_subject)
+    true_geocentric_chart.makeSVG()
+
+    # With Heliocentric Perspective
+    heliocentric_subject = AstrologicalSubject("John Lennon - Heliocentric", 1940, 10, 9, 18, 30, "Liverpool", "GB", perspective_type="Heliocentric")
+    heliocentric_chart = KerykeionChartSVG(heliocentric_subject)
+    heliocentric_chart.makeSVG()
+
+    # With Topocentric Perspective
+    topocentric_subject = AstrologicalSubject("John Lennon - Topocentric", 1940, 10, 9, 18, 30, "Liverpool", "GB", perspective_type="Topocentric")
+    topocentric_chart = KerykeionChartSVG(topocentric_subject)
+    topocentric_chart.makeSVG()