kerykeion 5.0.0a5__py3-none-any.whl → 5.0.0a7__py3-none-any.whl

kerykeion/charts/kerykeion_chart_svg.py

@@ -823,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(
@@ -964,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(
@@ -1101,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(
@@ -1379,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')}"
@@ -1394,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')}:"
@@ -1414,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(
@@ -1461,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:
@@ -1481,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(
@@ -1557,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')}"
@@ -1572,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(
@@ -1680,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"
@@ -1835,7 +1878,7 @@ if __name__ == "__main__":
     from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 
     ACTIVE_PLANETS: list[AstrologicalPoint] = [
-        "Sun", "Moon", "Pars_Fortunae"
+        "Sun", "Moon", "Pars_Fortunae", "Mercury", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "Chiron", "True_Node"
     ]
 
     setup_logging(level="info")

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-5.0.0a5.dist-info → kerykeion-5.0.0a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kerykeion
-Version: 5.0.0a5
+Version: 5.0.0a7
 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

{kerykeion-5.0.0a5.dist-info → kerykeion-5.0.0a7.dist-info}/RECORD

@@ -4,12 +4,13 @@ kerykeion/aspects/aspects_utils.py,sha256=NgxdeKd9CAPbzFlLe-yr9RFumM0Cc0kfWEONYR
 kerykeion/aspects/natal_aspects.py,sha256=SfI3ferjtyV47fBG6q3q1aczc-GFOwN4P7WpyZTgPSA,7269
 kerykeion/aspects/synastry_aspects.py,sha256=4ZBiFrbyyXxclnyaEIBeLJQO3uQVnpsqvI5Kj3-ijuI,5979
 kerykeion/aspects/transits_time_range.py,sha256=E03BJYcNK3kO30EC96Ys2EaH-EDyZF2nj4C7_LcFrOk,1182
-kerykeion/astrological_subject_factory.py,sha256=MN4UXU0RSbFCQ6tJpLCXXhcmZSuCVBbhiDxYwdvEfKo,52341
+kerykeion/astrological_subject_factory.py,sha256=z8ehPW6_wT6fwayxAmST0oSdLMM1pAmHXuwncSF_A20,52340
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
 kerykeion/charts/charts_utils.py,sha256=GCC20W4qHQXXKdUMlt72THHJxqp6ytj4X61oLONMSt4,62450
 kerykeion/charts/draw_planets.py,sha256=dbVCA4MFs7ChZKH4w1eErBiF_mluuxAD4fouBrXs-x0,17696
-kerykeion/charts/draw_planets_v2.py,sha256=IqyTLs1salrfJguwMtEpuscXg3kqyrrAAdXuGqzl-XQ,27630
-kerykeion/charts/kerykeion_chart_svg.py,sha256=vZ2_DYzq9CmxIGDrrH_lpnlkn9rrvSjFOXjJ_QmkC9s,93386
+kerykeion/charts/draw_planets_v2.py,sha256=ft0KjngCIfYKNGlZ4cv7apX9V6uyHetIVOxbNRzEmWU,28210
+kerykeion/charts/draw_planets_v3.py,sha256=3nrpef56qBsc0hfCOGdfCOr-61C2c5aWcRSiBcQiAuo,25811
+kerykeion/charts/kerykeion_chart_svg.py,sha256=2Xhe2XvZLdoAIRxYh1MYceencbYJKxWXRoZZ30Kgra4,95638
 kerykeion/charts/templates/aspect_grid_only.xml,sha256=ZiBVeToVmCA8QxYlB_cfnsAO1NNeQAnJ_6rIYkr4F58,70091
 kerykeion/charts/templates/chart.xml,sha256=_VCtqsH7E97JUQbvx9i5OktdRLOAhlI2Znr7mEIMK8E,79839
 kerykeion/charts/templates/wheel_only.xml,sha256=hSV4FYD7qLKd93jq82B9mnGoH0PKyMRaqp3jL16T9YI,71287
@@ -30,7 +31,7 @@ kerykeion/kr_types/__init__.py,sha256=jshJOccCQcYZuoOvrILRZH6imy4RBvKpFPujlNLFyG
 kerykeion/kr_types/chart_types.py,sha256=ou9mIMNrQ7vlgWW4e209z_wMa2XZa4OGvHBr-CGk_rs,2309
 kerykeion/kr_types/kerykeion_exception.py,sha256=kE1y0K0rmuz32b4K_ZppSsZ59I2Get0ZkvOkTE5HejI,314
 kerykeion/kr_types/kr_literals.py,sha256=4kJhzm_0LERiJEJks0KgDyThueMZj_F1OK2Far5SMZc,4870
-kerykeion/kr_types/kr_models.py,sha256=ZHnE5ABCYs1oB3UvGGNs3gjaphY9A64UUsDArRTqOt4,8227
+kerykeion/kr_types/kr_models.py,sha256=ncMzW63eTkDNMSX7JaxXpCQyA1k0yEeaNeLhAHc0y_w,8345
 kerykeion/kr_types/settings_models.py,sha256=qKlcn-Go1dAhC7oMFY_saogNcRa4WvKSewyvsKZt2S0,16604
 kerykeion/planetary_return_factory.py,sha256=Y3jMHsI1epuBC4N3Mto0mubVE8BIT89dBh15eOATg2Y,11449
 kerykeion/relationship_score_factory.py,sha256=g0RL1sx_LsMlfX1XVDf-z2LrlZ_SAL_1C0kuOGhKhsA,8495
@@ -47,8 +48,8 @@ kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
 kerykeion/transits_time_range.py,sha256=iJSkXcNKJBcfrN8gN9P0xGKLsRBwJs-mMuAtPsvUqNE,5505
 kerykeion/utilities.py,sha256=mD-oPKlbpwyXv5CXOS4aS6e6u0fFYl2lf9ptUr06jxs,22217
-kerykeion-5.0.0a5.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-5.0.0a5.dist-info/METADATA,sha256=qntbCI7YjtqwKyBe8yHwGzz0AjtIC94fFQiovbY-6os,25398
-kerykeion-5.0.0a5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-kerykeion-5.0.0a5.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-5.0.0a5.dist-info/RECORD,,
+kerykeion-5.0.0a7.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.0.0a7.dist-info/METADATA,sha256=-jFq3RQ4c6jpsieT3pOR7J6i1I3ICpma5I5aBh8M5VU,25398
+kerykeion-5.0.0a7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+kerykeion-5.0.0a7.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-5.0.0a7.dist-info/RECORD,,