kerykeion 5.0.0a4__py3-none-any.whl → 5.0.0a6__py3-none-any.whl

kerykeion/charts/kerykeion_chart_svg.py

@@ -245,7 +245,6 @@ class KerykeionChartSVG:
         home_directory = Path.home()
         self.new_settings_file = new_settings_file
         self.chart_language = chart_language
-        self.active_points = active_points
         self.active_aspects = active_aspects
         self.chart_type = chart_type
         self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
@@ -254,16 +253,16 @@ class KerykeionChartSVG:
         self.aspects_settings = aspects_settings
 
         if not active_points:
-            active_points = first_obj.active_points
+            self.active_points = first_obj.active_points
         else:
-            active_points = find_common_active_points(
+            self.active_points = find_common_active_points(
                 active_points,
                 first_obj.active_points
             )
 
         if second_obj:
-            active_points = find_common_active_points(
-                active_points,
+            self.active_points = find_common_active_points(
+                self.active_points,
                 second_obj.active_points
             )
 
@@ -285,7 +284,7 @@ class KerykeionChartSVG:
         # Configure available planets
         self.available_planets_setting = []
         for body in self.planets_settings:
-            if body["name"] in active_points:
+            if body["name"] in self.active_points:
                 body["is_active"] = True
                 self.available_planets_setting.append(body)
 
@@ -310,7 +309,7 @@ class KerykeionChartSVG:
             natal_aspects_instance = NatalAspects(
                 self.first_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = natal_aspects_instance.relevant_aspects
@@ -342,7 +341,7 @@ class KerykeionChartSVG:
                 raise KerykeionException("First object must be a CompositeSubjectModel instance.")
 
             # Calculate aspects
-            self.aspects_list = NatalAspects(self.first_obj, new_settings_file=self.new_settings_file, active_points=active_points).relevant_aspects
+            self.aspects_list = NatalAspects(self.first_obj, new_settings_file=self.new_settings_file, active_points=self.active_points).relevant_aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -377,15 +376,13 @@ class KerykeionChartSVG:
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             # Secondary subject available points
-            self.t_available_kerykeion_celestial_points = []
-            for body in available_celestial_points_names:
-                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+            self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -424,15 +421,13 @@ class KerykeionChartSVG:
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             # Secondary subject available points
-            self.t_available_kerykeion_celestial_points = []
-            for body in available_celestial_points_names:
-                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+            self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -467,15 +462,13 @@ class KerykeionChartSVG:
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             # Secondary subject available points
-            self.t_available_kerykeion_celestial_points = []
-            for body in available_celestial_points_names:
-                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+            self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -502,7 +495,7 @@ class KerykeionChartSVG:
             natal_aspects_instance = NatalAspects(
                 self.first_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = natal_aspects_instance.relevant_aspects
@@ -830,12 +823,22 @@ class KerykeionChartSVG:
 
             template_dict["bottom_left_0"] = zodiac_info
             template_dict["bottom_left_1"] = f"{self.language_settings.get('domification', 'Domification')}: {self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)}"
-            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+
+            # Lunar phase information (optional)
+            if self.first_obj.lunar_phase is not None:
+                template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
+                template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+            else:
+                template_dict["bottom_left_2"] = ""
+                template_dict["bottom_left_3"] = ""
+
             template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
 
             # Moon phase section calculations
-            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            if self.first_obj.lunar_phase is not None:
+                template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            else:
+                template_dict["makeLunarPhase"] = ""
 
             # Houses and planet drawing
             template_dict["makeMainHousesGrid"] = draw_main_house_grid(
@@ -971,7 +974,10 @@ class KerykeionChartSVG:
             template_dict["bottom_left_4"] = ""
 
             # Moon phase section calculations
-            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            if self.first_obj.lunar_phase is not None:
+                template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            else:
+                template_dict["makeLunarPhase"] = ""
 
             # Houses and planet drawing
             template_dict["makeMainHousesGrid"] = draw_main_house_grid(
@@ -1108,12 +1114,22 @@ class KerykeionChartSVG:
 
             template_dict["bottom_left_0"] = zodiac_info
             template_dict["bottom_left_1"] = f"{self.language_settings.get('domification', 'Domification')}: {self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)}"
-            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.second_obj.lunar_phase.get("moon_phase", "")}' # type: ignore
-            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.second_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+
+            # Lunar phase information from second object (Transit) (optional)
+            if self.second_obj is not None and hasattr(self.second_obj, 'lunar_phase') and self.second_obj.lunar_phase is not None:
+                template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.second_obj.lunar_phase.get("moon_phase", "")}' # type: ignore
+                template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.second_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.second_obj.lunar_phase.moon_phase_name)}'
+            else:
+                template_dict["bottom_left_2"] = ""
+                template_dict["bottom_left_3"] = ""
+
             template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.second_obj.perspective_type.lower().replace(" ", "_"), self.second_obj.perspective_type)}' # type: ignore
 
-            # Moon phase section calculations
-            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            # Moon phase section calculations - use first_obj for visualization
+            if self.first_obj.lunar_phase is not None:
+                template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            else:
+                template_dict["makeLunarPhase"] = ""
 
             # Houses and planet drawing
             template_dict["makeMainHousesGrid"] = draw_main_house_grid(
@@ -1386,7 +1402,7 @@ class KerykeionChartSVG:
             template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
 
             # Chart title
-            if self.second_obj.return_type == "Solar":
+            if self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Solar":
                 template_dict["stringTitle"] = f"{self.first_obj.name} - {self.language_settings.get('solar_return', 'Solar Return')}"
             else:
                 template_dict["stringTitle"] = f"{self.first_obj.name} - {self.language_settings.get('lunar_return', 'Lunar Return')}"
@@ -1401,7 +1417,7 @@ class KerykeionChartSVG:
             return_latitude_string = convert_latitude_coordinate_to_string(self.second_obj.lat, self.language_settings["north"], self.language_settings["south"]) # type: ignore
             return_longitude_string = convert_longitude_coordinate_to_string(self.second_obj.lng, self.language_settings["east"], self.language_settings["west"]) # type: ignore
 
-            if self.second_obj.return_type == "Solar":
+            if self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Solar":
                 template_dict["top_left_0"] = f"{self.language_settings.get('solar_return', 'Solar Return')}:"
             else:
                 template_dict["top_left_0"] = f"{self.language_settings.get('lunar_return', 'Lunar Return')}:"
@@ -1421,12 +1437,22 @@ class KerykeionChartSVG:
 
             template_dict["bottom_left_0"] = zodiac_info
             template_dict["bottom_left_1"] = f"{self.language_settings.get('domification', 'Domification')}: {self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)}"
-            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+
+            # Lunar phase information (optional)
+            if self.first_obj.lunar_phase is not None:
+                template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
+                template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+            else:
+                template_dict["bottom_left_2"] = ""
+                template_dict["bottom_left_3"] = ""
+
             template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
 
             # Moon phase section calculations
-            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            if self.first_obj.lunar_phase is not None:
+                template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            else:
+                template_dict["makeLunarPhase"] = ""
 
             # Houses and planet drawing
             template_dict["makeMainHousesGrid"] = draw_main_house_grid(
@@ -1468,7 +1494,7 @@ class KerykeionChartSVG:
             )
 
             # Planet grid
-            if self.second_obj.return_type == "Solar":
+            if self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Solar":
                 first_return_grid_title = f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})"
                 second_return_grid_title = f"{self.language_settings.get('solar_return', 'Solar Return')} ({self.language_settings.get('outer_wheel', 'Outer Wheel')})"
             else:
@@ -1488,7 +1514,7 @@ class KerykeionChartSVG:
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
-                celestial_point_language=self.language_settings["celestial_points"]
+                celestial_point_language=self.language_settings["celestial_points"],
             )
 
             house_comparison_factory = HouseComparisonFactory(
@@ -1564,7 +1590,7 @@ class KerykeionChartSVG:
             template_dict["top_left_3"] = f"{self.language_settings['latitude']}: {latitude_string}"
             template_dict["top_left_4"] = f"{self.language_settings['longitude']}: {longitude_string}"
 
-            if self.first_obj.return_type == "Solar":
+            if hasattr(self.first_obj, 'return_type') and self.first_obj.return_type == "Solar":
                 template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.language_settings.get('solar_return', 'Solar Return')}"
             else:
                 template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.language_settings.get('lunar_return', 'Lunar Return')}"
@@ -1579,12 +1605,22 @@ class KerykeionChartSVG:
 
             template_dict["bottom_left_0"] = zodiac_info
             template_dict["bottom_left_1"] = f"{self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
-            template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+
+            # Lunar phase information (optional)
+            if self.first_obj.lunar_phase is not None:
+                template_dict["bottom_left_2"] = f'{self.language_settings.get("lunation_day", "Lunation Day")}: {self.first_obj.lunar_phase.get("moon_phase", "")}'
+                template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.first_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.first_obj.lunar_phase.moon_phase_name)}'
+            else:
+                template_dict["bottom_left_2"] = ""
+                template_dict["bottom_left_3"] = ""
+
             template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
 
             # Moon phase section calculations
-            template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            if self.first_obj.lunar_phase is not None:
+                template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            else:
+                template_dict["makeLunarPhase"] = ""
 
             # Houses and planet drawing
             template_dict["makeMainHousesGrid"] = draw_main_house_grid(
@@ -1687,9 +1723,9 @@ class KerykeionChartSVG:
 
         self.template = self.makeTemplate(minify, remove_css_variables)
 
-        if self.chart_type == "Return" and self.second_obj.return_type == "Lunar":
+        if self.chart_type == "Return" and self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Lunar":
             chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Lunar Return.svg"
-        elif self.chart_type == "Return" and self.second_obj.return_type == "Solar":
+        elif self.chart_type == "Return" and self.second_obj is not None and hasattr(self.second_obj, 'return_type') and self.second_obj.return_type == "Solar":
             chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart - Solar Return.svg"
         else:
             chartname = self.output_directory / f"{self.first_obj.name} - {self.chart_type} Chart.svg"
@@ -1841,6 +1877,10 @@ if __name__ == "__main__":
     from kerykeion.planetary_return_factory import PlanetaryReturnFactory
     from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 
+    ACTIVE_PLANETS: list[AstrologicalPoint] = [
+        "Sun", "Moon", "Pars_Fortunae", "Mercury", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "Chiron", "True_Node"
+    ]
+
     setup_logging(level="info")
 
     subject = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
@@ -1852,7 +1892,7 @@ if __name__ == "__main__":
         lng=-118.2437,
         lat=34.0522,
         tz_str="America/Los_Angeles",
-        altitude=0,
+        altitude=0
     )
 
     ###
@@ -1861,6 +1901,7 @@ if __name__ == "__main__":
         first_obj=subject,
         chart_language="IT",
         theme="strawberry",
+        active_points=ACTIVE_PLANETS,
     )
     birth_chart.makeSVG() # minify=True, remove_css_variables=True)
 
@@ -1875,7 +1916,7 @@ if __name__ == "__main__":
         second_obj=solar_return,
         chart_language="IT",
         theme="classic",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"],
+        active_points=ACTIVE_PLANETS,
     )
 
     solar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
@@ -1888,7 +1929,7 @@ if __name__ == "__main__":
         second_obj=solar_return,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+        active_points=ACTIVE_PLANETS,
     )
 
     single_wheel_return_chart.makeSVG() # minify=True, remove_css_variables=True)
@@ -1905,20 +1946,23 @@ if __name__ == "__main__":
         second_obj=lunar_return,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+        active_points=ACTIVE_PLANETS,
     )
     lunar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
 
     ###
     ## Transit Chart
-    transit = AstrologicalSubjectFactory.from_current_time()
+    transit = AstrologicalSubjectFactory.from_iso_utc_time(
+        "Transit",
+        "2021-10-04T18:30:00+01:00",
+    )
     transit_chart = KerykeionChartSVG(
         first_obj=subject,
         chart_type="Transit",
         second_obj=transit,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"]
+        active_points=ACTIVE_PLANETS
     )
     transit_chart.makeSVG() # minify=True, remove_css_variables=True)
 
@@ -1931,7 +1975,7 @@ if __name__ == "__main__":
         second_obj=second_subject,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+        active_points=ACTIVE_PLANETS
     )
     synastry_chart.makeSVG() # minify=True, remove_css_variables=True)
 
@@ -1944,7 +1988,7 @@ if __name__ == "__main__":
         second_obj=transit,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"],
+        active_points=ACTIVE_PLANETS,
         double_chart_aspect_grid_type="table"
     )
     transit_chart_with_grid.makeSVG() # minify=True, remove_css_variables=True)

kerykeion/charts/templates/chart.xml

@@ -370,9 +370,9 @@ OpenAstro.org -->
         <symbol id="Pars_Fortunae">
             <g transform="translate(1,2)">
                 <circle cx="11" cy="11" r="9"
-                    style="fill: none; stroke: $planets_color_21; stroke-width: 2px" />
-                <path d="M 11,2 L 11,20 M 2,11 L 20,11"
-                    style="stroke: $planets_color_21; stroke-width: 2px; fill: none;" />
+                    style="fill: none; stroke: $planets_color_36; stroke-width: 2px" />
+                <path d="M 5,5 L 17,17 M 17,5 L 5,17"
+                    style="stroke: $planets_color_36; stroke-width: 2px; fill: none;" />
             </g>
         </symbol>
 

kerykeion/charts/themes/classic.css

@@ -92,6 +92,11 @@
     --kerykeion-chart-color-fire-percentage: #ff6600;
     --kerykeion-chart-color-water-percentage: #630e73;
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-chart-color-fire-percentage);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-chart-color-earth-percentage);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-chart-color-water-percentage);
+
     /* Other */
     --kerykeion-chart-color-house-number: #f00;
 }

kerykeion/charts/themes/dark-high-contrast.css

@@ -134,6 +134,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

kerykeion/charts/themes/dark.css

@@ -135,6 +135,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

kerykeion/charts/themes/light.css

@@ -135,6 +135,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

kerykeion/charts/themes/strawberry.css

@@ -134,6 +134,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

kerykeion/kr_types/kr_models.py

@@ -100,9 +100,9 @@ class AstrologicalBaseModel(SubscriptableBaseModel):
     perspective_type: PerspectiveType
 
     # Common celestial points
-    # Main planets
-    sun: KerykeionPointModel
-    moon: KerykeionPointModel
+    # Main planets (all optional to support selective calculations)
+    sun: Optional[KerykeionPointModel] = None
+    moon: Optional[KerykeionPointModel] = None
     mercury: Optional[KerykeionPointModel] = None
     venus: Optional[KerykeionPointModel] = None
     mars: Optional[KerykeionPointModel] = None
@@ -180,8 +180,8 @@ class AstrologicalBaseModel(SubscriptableBaseModel):
     houses_names_list: List[Houses] = Field(description="Ordered list of houses names")
     active_points: List[AstrologicalPoint] = Field(description="List of active points in the chart or aspects calculations.")
 
-    # Common lunar phase data
-    lunar_phase: LunarPhaseModel = Field(description="Lunar phase model")
+    # Common lunar phase data (optional)
+    lunar_phase: Optional[LunarPhaseModel] = Field(default=None, description="Lunar phase model")
 
 
 class AstrologicalSubjectModel(AstrologicalBaseModel):

kerykeion/planetary_return_factory.py

@@ -175,6 +175,7 @@ class PlanetaryReturnFactory:
             nation=self.nation, # type: ignore
             online=False,
             altitude=self.altitude,
+            active_points=self.subject.active_points,
         )
 
         model_data = solar_return_astrological_subject.model_dump()

kerykeion/settings/kr.config.json

@@ -252,10 +252,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Regulus",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Part de Fortune",
-                "Pars_Spiritus": "Part d'Esprit",
-                "Pars_Amoris": "Part d'Amour",
-                "Pars_Fidei": "Part de Foi",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }
@@ -382,10 +382,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Régulo",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Parte da Fortuna",
-                "Pars_Spiritus": "Parte do Espírito",
-                "Pars_Amoris": "Parte do Amor",
-                "Pars_Fidei": "Parte da Fé",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }
@@ -512,10 +512,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Regolo",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Parte di Fortuna",
-                "Pars_Spiritus": "Parte dello Spirito",
-                "Pars_Amoris": "Parte dell'Amore",
-                "Pars_Fidei": "Parte della Fede",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }
@@ -772,10 +772,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Régulo",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Parte de Fortuna",
-                "Pars_Spiritus": "Parte del Espíritu",
-                "Pars_Amoris": "Parte del Amor",
-                "Pars_Fidei": "Parte de la Fe",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }

kerykeion/utilities.py

@@ -677,18 +677,15 @@ def get_house_number(house_name: Houses) -> int:
 
 def find_common_active_points(first_points: list[AstrologicalPoint], second_points: list[AstrologicalPoint]) -> list[AstrologicalPoint]:
     """
-        Find the common astrological points between those available in the subject and those requested.
+    Find only the elements that are present in both lists.
 
-        Args:
-            first_points: List of points available in the astrological subject
-            second_points: List of points requested by the user
+    Args:
+        first_points: List of astrological points
+        second_points: List of astrological points
 
-        Returns:
-            List containing only the requested points that are also available in the subject
+    Returns:
+        List of elements common to both lists (without duplicates, order not guaranteed).
     """
-    common_points: list[AstrologicalPoint]
-    common_points = [point for point in second_points if point in first_points]
-
-    ignored_points = set(second_points) - set(common_points)
+    common_points = list(set(first_points) & set(second_points))
 
     return common_points

{kerykeion-5.0.0a4.dist-info → kerykeion-5.0.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kerykeion
-Version: 5.0.0a4
+Version: 5.0.0a6
 Summary: A python library for astrology.
 License: AGPL-3.0
 Keywords: astrology,ephemeris,astrology library,birtchart,svg,zodiac,zodiac-sing,astronomical-algorithms,synastry,astrology-calculator