kerykeion 5.0.0a8__tar.gz → 5.0.0a9__tar.gz

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerykeion
-Version: 5.0.0a8
+Version: 5.0.0a9
 Summary: A python library for astrology.
 Project-URL: Homepage, https://www.kerykeion.net/
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/kerykeion/charts/charts_utils.py

@@ -430,6 +430,21 @@ def draw_first_circle(
         )
 
 
+def draw_background_circle(r: Union[int, float], stroke_color: str, fill_color: str) -> str:
+    """
+    Draws the background circle.
+
+    Args:
+        - r (Union[int, float]): The value of r.
+        - stroke_color (str): The color of the stroke.
+        - fill_color (str): The color of the fill.
+
+    Returns:
+        str: The SVG path of the background circle.
+    """
+    return f'<circle cx="{r}" cy="{r}" r="{r}" style="fill: {fill_color}; stroke: {stroke_color}; stroke-width: 1px;" />'
+
+
 def draw_second_circle(
     r: Union[int, float], stroke_color: str, fill_color: str, chart_type: ChartType, c2: Union[int, float, None] = None
 ) -> str:

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/kerykeion/charts/kerykeion_chart_svg.py

@@ -42,6 +42,7 @@ from kerykeion.charts.charts_utils import (
     draw_transit_ring_degree_steps,
     draw_degree_ring,
     draw_transit_ring,
+    draw_background_circle,
     draw_first_circle,
     draw_house_comparison_grid,
     draw_second_circle,
@@ -176,6 +177,7 @@ class KerykeionChartSVG:
     chart_language: KerykeionChartLanguage
     active_points: List[AstrologicalPoint]
     active_aspects: List[ActiveAspect]
+    transparent_background: bool
 
     # Internal properties
     fire: float
@@ -210,6 +212,7 @@ class KerykeionChartSVG:
         active_points: Optional[list[AstrologicalPoint]] = None,
         active_aspects: list[ActiveAspect]= DEFAULT_ACTIVE_ASPECTS,
         *,
+        transparent_background: bool = False,
         colors_settings: dict = DEFAULT_CHART_COLORS,
         celestial_points_settings: list[dict] = DEFAULT_CELESTIAL_POINTS_SETTINGS,
         aspects_settings: list[dict] = DEFAULT_CHART_ASPECTS_SETTINGS,
@@ -238,6 +241,8 @@ class KerykeionChartSVG:
                 Celestial points to include in the chart visualization.
             active_aspects (List[ActiveAspect], optional):
                 Aspects to calculate, each defined by name and orb.
+            transparent_background (bool, optional):
+                Whether to use a transparent background instead of the theme color. Defaults to False.
         """
         # --------------------
         # COMMON INITIALIZATION
@@ -248,6 +253,7 @@ class KerykeionChartSVG:
         self.active_aspects = active_aspects
         self.chart_type = chart_type
         self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
+        self.transparent_background = transparent_background
         self.chart_colors_settings = colors_settings
         self.planets_settings = celestial_points_settings
         self.aspects_settings = aspects_settings
@@ -708,6 +714,12 @@ class KerykeionChartSVG:
         template_dict["paper_color_0"] = self.chart_colors_settings["paper_0"]
         template_dict["paper_color_1"] = self.chart_colors_settings["paper_1"]
 
+        # Set background color based on transparent_background setting
+        if self.transparent_background:
+            template_dict["background_color"] = "transparent"
+        else:
+            template_dict["background_color"] = self.chart_colors_settings["paper_1"]
+
         # Set planet colors
         for planet in self.planets_settings:
             planet_id = planet["id"]
@@ -769,6 +781,11 @@ class KerykeionChartSVG:
                 self.first_obj.seventh_house.abs_pos,
                 self.chart_colors_settings["paper_0"],
             )
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_radix_ring_2"],
@@ -894,6 +911,11 @@ class KerykeionChartSVG:
                 self.first_obj.seventh_house.abs_pos,
                 self.chart_colors_settings["paper_0"],
             )
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_radix_ring_2"],
@@ -1054,6 +1076,11 @@ class KerykeionChartSVG:
                 self.chart_colors_settings["zodiac_transit_ring_3"],
             )
             template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_transit_ring_2"],
@@ -1224,6 +1251,11 @@ class KerykeionChartSVG:
                 self.chart_colors_settings["zodiac_transit_ring_3"],
             )
             template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_transit_ring_2"],
@@ -1365,6 +1397,11 @@ class KerykeionChartSVG:
                 self.chart_colors_settings["zodiac_transit_ring_3"],
             )
             template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_transit_ring_2"],
@@ -1547,6 +1584,11 @@ class KerykeionChartSVG:
                 self.first_obj.seventh_house.abs_pos,
                 self.chart_colors_settings["paper_0"],
             )
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_radix_ring_2"],

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/kerykeion/charts/templates/aspect_grid_only.xml

@@ -7,7 +7,7 @@
     height="100%"
     viewBox="28 20 255 250"
     preserveAspectRatio="xMidYMid"
-    style="background-color: $paper_color_1"
+    style="background-color: $background_color"
 >
 
     <!-- Colors -->

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/kerykeion/charts/templates/chart.xml

@@ -7,7 +7,7 @@
     height="100%"
     viewBox="$viewbox"
     preserveAspectRatio="xMidYMid"
-    style="background-color: $paper_color_1"
+    style="background-color: $background_color"
 >
     <title>$stringTitle</title>
 
@@ -60,6 +60,12 @@
 
         <!-- Full Wheel -->
         <g kr:node="Full_Wheel" transform="translate(100,50)">
+
+            <!-- Background Circle -->
+            <g kr:node='Background_Circle'>
+                $background_circle
+            </g>
+
             <!-- Zodiac -->
             <g kr:node="Zodiac">
                 $makeZodiac

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/kerykeion/charts/templates/wheel_only.xml

@@ -5,9 +5,9 @@
     xmlns:kr="https://www.kerykeion.net/"
     width="100%"
     height="100%"
-    viewBox="40 40 500 500"
+    viewBox="85 40 500 500"
     preserveAspectRatio="xMidYMid"
-    style="background-color: $paper_color_1"
+    style="background-color: $background_color"
 >
     <title>$stringTitle | Kerykeion</title>
 
@@ -21,6 +21,12 @@
 
         <!-- Full Wheel -->
         <g kr:node="Full_Wheel" transform="translate(100,50)">
+
+            <!-- Background Circle -->
+            <g kr:node='Background_Circle'>
+                $background_circle
+            </g>
+
             <!-- Zodiac -->
             <g kr:node="Zodiac">
                 $makeZodiac

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/kerykeion/kr_types/chart_types.py

@@ -4,6 +4,7 @@ from typing_extensions import TypedDict
 class ChartTemplateDictionary(TypedDict):
     transitRing: str
     degreeRing: str
+    background_circle: str
     first_circle: str
     second_circle: str
     third_circle: str
@@ -31,6 +32,8 @@ class ChartTemplateDictionary(TypedDict):
     paper_color_0: str
     # Background color of the chart
     paper_color_1: str
+    # Dynamic background color (can be transparent or theme color)
+    background_color: str
 
     # Planets colors, from 0 to 16 (0 is the Sun)
     planets_color_0: str

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kerykeion"
-version = "5.0.0a8"
+version = "5.0.0a9"
 authors = [
     { name = "Giacomo Battaglia", email = "kerykeion.astrology@gmail.com" }
 ]

{kerykeion-5.0.0a8 → kerykeion-5.0.0a9}/tests/charts/generate_test_charts.py

@@ -230,6 +230,13 @@ composite_subject_model = composite_subject_factory.get_midpoint_composite_subje
 composite_chart = KerykeionChartSVG(composite_subject_model, "Composite")
 composite_chart.makeSVG()
 
+## TO IMPLEMENT (Or check)
+
 # Solar Return Chart
 
 # Single Solar Return Chart
+
+## Transparent Background
+transparent_background_subject = AstrologicalSubjectFactory.from_birth_data("John Lennon - Transparent Background", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+transparent_background_chart = KerykeionChartSVG(transparent_background_subject, transparent_background=True)
+transparent_background_chart.makeSVG()