kerykeion 4.16.1__tar.gz → 4.16.3__tar.gz

{kerykeion-4.16.1 → kerykeion-4.16.3}/PKG-INFO

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

{kerykeion-4.16.1 → kerykeion-4.16.3}/kerykeion/charts/charts_utils.py

@@ -514,54 +514,63 @@ def draw_third_circle(
         return f'<circle cx="{radius}" cy="{radius}" r="{radius - c3}" style="fill: {fill_color}; fill-opacity:.8; stroke: {stroke_color}; stroke-width: 1px" />'
 
 
-def draw_aspect_grid(stroke_color: str, available_planets_list: list, aspects_list: list) -> str:
+def draw_aspect_grid(
+        stroke_color: str, 
+        available_planets: list, 
+        aspects: list,
+        x_start: int = 380,
+        y_start: int = 468,
+    ) -> str:
     """
-    Draws the aspect grid.
+    Draws the aspect grid for the given planets and aspects.
 
     Args:
-        - stroke_color (str): The color of the stroke.
-        - available_planets_list (list): List of all the planets, they will be actually filtered to so if they have
-            the "is_active" key set to True inside the function to have the correct list of just the active planets.
-        - aspects_list (list): List of aspects.
+        stroke_color (str): The color of the stroke.
+        available_planets (list): List of all planets. Only planets with "is_active" set to True will be used.
+        aspects (list): List of aspects.
+        x_start (int): The x-coordinate starting point.
+        y_start (int): The y-coordinate starting point.
 
+    Returns:
+        str: SVG string representing the aspect grid.
     """
-
-    out = ""
+    svg_output = ""
     style = f"stroke:{stroke_color}; stroke-width: 1px; stroke-opacity:.6; fill:none"
-    xindent = 380
-    yindent = 468
-    box = 14
-    counter = 0
-
-    actual_planets = []
-    for planet in available_planets_list:
-        if planet.is_active:
-            actual_planets.append(planet)
-
-    first_iteration_revers_planets = actual_planets[::-1]
-    for index, a in enumerate(first_iteration_revers_planets):
-        counter += 1
-        out += f'<rect x="{xindent}" y="{yindent}" width="{box}" height="{box}" style="{style}"/>'
-        out += f'<use transform="scale(0.4)" x="{(xindent+2)*2.5}" y="{(yindent+1)*2.5}" xlink:href="#{a["name"]}" />'
-
-        xindent = xindent + box
-        yindent = yindent - box
-
-        xorb = xindent
-        yorb = yindent + box
-
-        second_iteration_revers_planets = first_iteration_revers_planets[index + 1 :]
-        for b in second_iteration_revers_planets:
-            out += f'<rect x="{xorb}" y="{yorb}" width="{box}" height="{box}" style="{style}"/>'
-            xorb = xorb + box
-
-            for aspect in aspects_list:
-                if (aspect["p1"] == a["id"] and aspect["p2"] == b["id"]) or (
-                    aspect["p1"] == b["id"] and aspect["p2"] == a["id"]
+    box_size = 14
+
+    # Filter active planets
+    active_planets = [planet for planet in available_planets if planet.is_active]
+
+    # Reverse the list of active planets for the first iteration
+    reversed_planets = active_planets[::-1]
+
+    for index, planet_a in enumerate(reversed_planets):
+        # Draw the grid box for the planet
+        svg_output += f'<rect x="{x_start}" y="{y_start}" width="{box_size}" height="{box_size}" style="{style}"/>'
+        svg_output += f'<use transform="scale(0.4)" x="{(x_start + 2) * 2.5}" y="{(y_start + 1) * 2.5}" xlink:href="#{planet_a["name"]}" />'
+
+        # Update the starting coordinates for the next box
+        x_start += box_size
+        y_start -= box_size
+
+        # Coordinates for the aspect symbols
+        x_aspect = x_start
+        y_aspect = y_start + box_size
+
+        # Iterate over the remaining planets
+        for planet_b in reversed_planets[index + 1:]:
+            # Draw the grid box for the aspect
+            svg_output += f'<rect x="{x_aspect}" y="{y_aspect}" width="{box_size}" height="{box_size}" style="{style}"/>'
+            x_aspect += box_size
+
+            # Check for aspects between the planets
+            for aspect in aspects:
+                if (aspect["p1"] == planet_a["id"] and aspect["p2"] == planet_b["id"]) or (
+                    aspect["p1"] == planet_b["id"] and aspect["p2"] == planet_a["id"]
                 ):
-                    out += f'<use  x="{xorb-box+1}" y="{yorb+1}" xlink:href="#orb{aspect["aspect_degrees"]}" />'
+                    svg_output += f'<use  x="{x_aspect - box_size + 1}" y="{y_aspect + 1}" xlink:href="#orb{aspect["aspect_degrees"]}" />'
 
-    return out
+    return svg_output
 
 
 def draw_houses_cusps_and_text_number(
@@ -678,7 +687,7 @@ def draw_houses_cusps_and_text_number(
     return path
 
 
-def draw_aspect_transit_grid(
+def draw_transit_aspect_list(
     grid_title: str,
     aspects_list: Union[list[AspectModel], list[dict]],
     celestial_point_language: Union[KerykeionLanguageCelestialPointModel, dict],
@@ -752,7 +761,7 @@ def draw_aspect_transit_grid(
         inner_path += f"</g>"
         line = line + 14
 
-    out = f'<g style="transform: translate(47%, 61%) scale({scale})">'
+    out = f'<g style="transform: translate(47%, 59%) scale({scale})">'
     out += f'<text y="-15" x="0" style="fill: var(--kerykeion-chart-color-paper-0); font-size: 14px;">{grid_title}:</text>'
     out += inner_path
     out += "</g>"
@@ -995,4 +1004,80 @@ def draw_planet_grid(
             second_line_height += offset_between_lines
 
     svg_output += end_of_line
+    return svg_output
+
+
+def draw_transit_aspect_grid(
+        stroke_color: str, 
+        available_planets: list, 
+        aspects: list,
+        x_indent: int = 50,
+        y_indent: int = 250,
+        box_size: int = 14
+    ) -> str:
+    """
+    Draws the aspect grid for the given planets and aspects. The default args value are specific for a stand alone
+    aspect grid.
+
+    Args:
+        stroke_color (str): The color of the stroke.
+        available_planets (list): List of all planets. Only planets with "is_active" set to True will be used.
+        aspects (list): List of aspects.
+        x_indent (int): The initial x-coordinate starting point.
+        y_indent (int): The initial y-coordinate starting point.
+
+    Returns:
+        str: SVG string representing the aspect grid.
+    """
+    svg_output = ""
+    style = f"stroke:{stroke_color}; stroke-width: 1px; stroke-opacity:.6; fill:none"
+    x_start = x_indent
+    y_start = y_indent
+
+    # Filter active planets
+    active_planets = [planet for planet in available_planets if planet.is_active]
+
+    # Reverse the list of active planets for the first iteration
+    reversed_planets = active_planets[::-1]
+    for index, planet_a in enumerate(reversed_planets):
+        # Draw the grid box for the planet
+        svg_output += f'<rect x="{x_start}" y="{y_start}" width="{box_size}" height="{box_size}" style="{style}"/>'
+        svg_output += f'<use transform="scale(0.4)" x="{(x_start + 2) * 2.5}" y="{(y_start + 1) * 2.5}" xlink:href="#{planet_a["name"]}" />'
+        x_start += box_size
+
+    x_start = x_indent - box_size
+    y_start = y_indent - box_size
+
+    for index, planet_a in enumerate(reversed_planets):
+        # Draw the grid box for the planet
+        svg_output += f'<rect x="{x_start}" y="{y_start}" width="{box_size}" height="{box_size}" style="{style}"/>'
+        svg_output += f'<use transform="scale(0.4)" x="{(x_start + 2) * 2.5}" y="{(y_start + 1) * 2.5}" xlink:href="#{planet_a["name"]}" />'
+        y_start -= box_size
+
+    x_start = x_indent
+    y_start = y_indent
+    y_start = y_start - box_size
+
+    for index, planet_a in enumerate(reversed_planets):
+        # Draw the grid box for the planet
+        svg_output += f'<rect x="{x_start}" y="{y_start}" width="{box_size}" height="{box_size}" style="{style}"/>'
+
+        # Update the starting coordinates for the next box
+        y_start -= box_size
+
+        # Coordinates for the aspect symbols
+        x_aspect = x_start
+        y_aspect = y_start + box_size
+
+        # Iterate over the remaining planets
+        for planet_b in reversed_planets:
+            # Draw the grid box for the aspect
+            svg_output += f'<rect x="{x_aspect}" y="{y_aspect}" width="{box_size}" height="{box_size}" style="{style}"/>'
+            x_aspect += box_size
+
+            # Check for aspects between the planets
+            for aspect in aspects:
+                if (aspect["p1"] == planet_a["id"] and aspect["p2"] == planet_b["id"]):
+                    svg_output += f'<use  x="{x_aspect - box_size + 1}" y="{y_aspect + 1}" xlink:href="#orb{aspect["aspect_degrees"]}" />'
+
     return svg_output

{kerykeion-4.16.1 → kerykeion-4.16.3}/kerykeion/charts/kerykeion_chart_svg.py

@@ -30,7 +30,8 @@ from kerykeion.charts.charts_utils import (
     draw_third_circle,
     draw_aspect_grid,
     draw_houses_cusps_and_text_number,
-    draw_aspect_transit_grid,
+    draw_transit_aspect_list,
+    draw_transit_aspect_grid,
     draw_moon_phase,
     draw_house_grid,
     draw_planet_grid,
@@ -106,6 +107,7 @@ class KerykeionChartSVG:
         new_output_directory: Union[str, None] = None,
         new_settings_file: Union[Path, None] = None,
         theme: Union[KerykeionChartTheme, None] = "classic",
+        double_chart_aspect_grid_type: Literal["list", "table"] = "list"
     ):
         # Directories:
         self.homedir = Path.home()
@@ -157,6 +159,9 @@ class KerykeionChartSVG:
             for body in available_celestial_points_names:
                 self.t_available_kerykeion_celestial_points.append(self.t_user.get(body))
 
+        # Double chart aspect grid type
+        self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
+
         # screen size
         self.height = self._DEFAULT_HEIGHT
         if self.chart_type == "Synastry" or self.chart_type == "Transit":
@@ -367,7 +372,11 @@ class KerykeionChartSVG:
             template_dict["first_circle"] = draw_first_circle(self.main_radius, self.chart_colors_settings["zodiac_transit_ring_2"], self.chart_type)
             template_dict["second_circle"] = draw_second_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_1'], self.chart_colors_settings['paper_1'], self.chart_type)
             template_dict['third_circle'] = draw_third_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_0'], self.chart_colors_settings['paper_1'], self.chart_type, self.third_circle_radius)
-            template_dict["makeAspectGrid"] = draw_aspect_transit_grid(self.language_settings["aspects"], self.aspects_list, self.planets_settings, self.aspects_settings)
+
+            if self.double_chart_aspect_grid_type == "list":
+                template_dict["makeAspectGrid"] = draw_transit_aspect_list(self.language_settings["aspects"], self.aspects_list, self.planets_settings, self.aspects_settings)
+            else:
+                template_dict["makeAspectGrid"] = draw_transit_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list, 550, 450)
 
             template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
         else:
@@ -574,7 +583,7 @@ class KerykeionChartSVG:
         td = self._create_template_dictionary()
 
         DATA_DIR = Path(__file__).parent
-        xml_svg = DATA_DIR / "templates/chart.xml"
+        xml_svg = DATA_DIR / "templates" / "chart.xml"
         
         # read template
         with open(xml_svg, "r", encoding="utf-8", errors="ignore") as f:
@@ -595,7 +604,7 @@ class KerykeionChartSVG:
         return template
 
     def makeSVG(self, minify: bool = False):
-        """Prints out the SVG file in the specifide folder"""
+        """Prints out the SVG file in the specified folder"""
 
         if not hasattr(self, "template"):
             self.template = self.makeTemplate(minify)
@@ -607,6 +616,70 @@ class KerykeionChartSVG:
 
         logging.info(f"SVG Generated Correctly in: {self.chartname}")
 
+    def makeWheelOnlyTemplate(self, minify: bool = False):
+        """Creates the template for the SVG file with only the wheel"""
+    
+        with open(Path(__file__).parent / "templates" / "wheel_only.xml", "r", encoding="utf-8", errors="ignore") as f:
+            template = f.read()
+
+        template_dict = self._create_template_dictionary()
+        template = Template(template).substitute(template_dict)
+        
+        if minify:
+            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t","").replace("    ", "").replace("  ", "")
+            
+        else:
+            template = template.replace('"', "'")
+
+        return template
+
+    def makeWheelOnlySVG(self, minify: bool = False):
+        """Prints out the SVG file in the specified folder with only the wheel"""
+
+        template = self.makeWheelOnlyTemplate(minify)
+
+        self.chartname = self.output_directory / f"{self.user.name} - {self.chart_type} Chart - Wheel Only.svg"
+
+        with open(self.chartname, "w", encoding="utf-8", errors="ignore") as output_file:
+            output_file.write(template)
+
+        logging.info(f"SVG Generated Correctly in: {self.chartname}")
+
+    def makeAspectGridOnlyTemplate(self, minify: bool = False):
+        """Creates the template for the SVG file with only the aspect grid"""
+    
+        with open(Path(__file__).parent / "templates" / "aspect_grid_only.xml", "r", encoding="utf-8", errors="ignore") as f:
+            template = f.read()
+
+        template_dict = self._create_template_dictionary()
+
+        if self.chart_type in ["Transit", "Synastry"]:
+            aspects_grid = draw_transit_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list)
+        else:
+            aspects_grid = draw_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list, x_start=50, y_start=250)
+
+        template = Template(template).substitute({**template_dict, "makeAspectGrid": aspects_grid})
+        
+        if minify:
+            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t","").replace("    ", "").replace("  ", "")
+            
+        else:
+            template = template.replace('"', "'")
+
+        return template
+
+    def makeAspectGridOnlySVG(self, minify: bool = False):
+        """Prints out the SVG file in the specified folder with only the aspect grid"""
+
+        template = self.makeAspectGridOnlyTemplate(minify)
+
+        self.chartname = self.output_directory / f"{self.user.name} - {self.chart_type} Chart - Aspect Grid Only.svg"
+
+        with open(self.chartname, "w", encoding="utf-8", errors="ignore") as output_file:
+            output_file.write(template)
+
+        logging.info(f"SVG Generated Correctly in: {self.chartname}")
+
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
@@ -697,4 +770,79 @@ if __name__ == "__main__":
     # Light Theme Natal Chart
     light_theme_subject = AstrologicalSubject("John Lennon - Light Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
     light_theme_natal_chart = KerykeionChartSVG(light_theme_subject, theme="light")
-    light_theme_natal_chart.makeSVG()
+    light_theme_natal_chart.makeSVG()
+
+    # Dark Theme External Natal Chart
+    dark_theme_external_subject = AstrologicalSubject("John Lennon - Dark Theme External", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    dark_theme_external_chart = KerykeionChartSVG(dark_theme_external_subject, "ExternalNatal", second, theme="dark")
+    dark_theme_external_chart.makeSVG()
+
+    # Dark Theme Synastry Chart
+    dark_theme_synastry_subject = AstrologicalSubject("John Lennon - DTS", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    dark_theme_synastry_chart = KerykeionChartSVG(dark_theme_synastry_subject, "Synastry", second, theme="dark")
+    dark_theme_synastry_chart.makeSVG()
+
+    # Wheel Natal Only Chart
+    wheel_only_subject = AstrologicalSubject("John Lennon - Wheel Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    wheel_only_chart = KerykeionChartSVG(wheel_only_subject)
+    wheel_only_chart.makeWheelOnlySVG()
+
+    # Wheel External Natal Only Chart
+    wheel_external_subject = AstrologicalSubject("John Lennon - Wheel External Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    wheel_external_chart = KerykeionChartSVG(wheel_external_subject, "ExternalNatal", second)
+    wheel_external_chart.makeWheelOnlySVG()
+
+    # Wheel Synastry Only Chart
+    wheel_synastry_subject = AstrologicalSubject("John Lennon - Wheel Synastry Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    wheel_synastry_chart = KerykeionChartSVG(wheel_synastry_subject, "Synastry", second)
+    wheel_synastry_chart.makeWheelOnlySVG()
+
+    # Wheel Transit Only Chart
+    wheel_transit_subject = AstrologicalSubject("John Lennon - Wheel Transit Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    wheel_transit_chart = KerykeionChartSVG(wheel_transit_subject, "Transit", second)
+    wheel_transit_chart.makeWheelOnlySVG()
+
+    # Wheel Sidereal Birth Chart (Lahiri) Dark Theme
+    sidereal_dark_subject = AstrologicalSubject("John Lennon Lahiri - Dark Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
+    sidereal_dark_chart = KerykeionChartSVG(sidereal_dark_subject, theme="dark")
+    sidereal_dark_chart.makeWheelOnlySVG()
+
+    # Wheel Sidereal Birth Chart (Fagan-Bradley) Light Theme
+    sidereal_light_subject = AstrologicalSubject("John Lennon Fagan-Bradley - Light Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="FAGAN_BRADLEY")
+    sidereal_light_chart = KerykeionChartSVG(sidereal_light_subject, theme="light")
+    sidereal_light_chart.makeWheelOnlySVG()
+
+    # Aspect Grid Only Natal Chart
+    aspect_grid_only_subject = AstrologicalSubject("John Lennon - Aspect Grid Only", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    aspect_grid_only_chart = KerykeionChartSVG(aspect_grid_only_subject)
+    aspect_grid_only_chart.makeAspectGridOnlySVG()
+
+    # Aspect Grid Only Dark Theme Natal Chart
+    aspect_grid_dark_subject = AstrologicalSubject("John Lennon - Aspect Grid Dark Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    aspect_grid_dark_chart = KerykeionChartSVG(aspect_grid_dark_subject, theme="dark")
+    aspect_grid_dark_chart.makeAspectGridOnlySVG()
+
+    # Aspect Grid Only Light Theme Natal Chart
+    aspect_grid_light_subject = AstrologicalSubject("John Lennon - Aspect Grid Light Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    aspect_grid_light_chart = KerykeionChartSVG(aspect_grid_light_subject, theme="light")
+    aspect_grid_light_chart.makeAspectGridOnlySVG()
+
+    # Synastry Chart Aspect Grid Only
+    aspect_grid_synastry_subject = AstrologicalSubject("John Lennon - Aspect Grid Synastry", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    aspect_grid_synastry_chart = KerykeionChartSVG(aspect_grid_synastry_subject, "Synastry", second)
+    aspect_grid_synastry_chart.makeAspectGridOnlySVG()
+
+    # Transit Chart Aspect Grid Only
+    aspect_grid_transit_subject = AstrologicalSubject("John Lennon - Aspect Grid Transit", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    aspect_grid_transit_chart = KerykeionChartSVG(aspect_grid_transit_subject, "Transit", second)
+    aspect_grid_transit_chart.makeAspectGridOnlySVG()
+
+    # Synastry Chart Aspect Grid Only Dark Theme
+    aspect_grid_dark_synastry_subject = AstrologicalSubject("John Lennon - Aspect Grid Dark Synastry", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    aspect_grid_dark_synastry_chart = KerykeionChartSVG(aspect_grid_dark_synastry_subject, "Synastry", second, theme="dark")
+    aspect_grid_dark_synastry_chart.makeAspectGridOnlySVG()
+
+    # Transit Chart With draw_transit_aspect_grid table
+    transit_chart_with_table_grid_subject = AstrologicalSubject("John Lennon - TCWTG", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    transit_chart_with_table_grid = KerykeionChartSVG(transit_chart_with_table_grid_subject, "Transit", second, double_chart_aspect_grid_type="table", theme="dark")
+    transit_chart_with_table_grid.makeSVG()