kerykeion 5.1.0__py3-none-any.whl → 5.1.1__py3-none-any.whl

kerykeion/chart_data_factory.py

@@ -159,10 +159,10 @@ class ChartDataFactory:
             )
 
         # Calculate aspects based on chart type
-        aspects: Union[SingleChartAspectsModel, DualChartAspectsModel]
+        aspects_model: Union[SingleChartAspectsModel, DualChartAspectsModel]
         if chart_type in ["Natal", "Composite", "SingleReturnChart"]:
             # Single chart aspects
-            aspects = AspectsFactory.single_chart_aspects(
+            aspects_model = AspectsFactory.single_chart_aspects(
                 first_subject,
                 active_points=effective_active_points,
                 active_aspects=active_aspects,
@@ -172,7 +172,7 @@ class ChartDataFactory:
             # Dual chart aspects - second_subject is guaranteed to exist here due to validation above
             if second_subject is None:
                 raise KerykeionException(f"Second subject is required for {chart_type} charts.")
-            aspects = AspectsFactory.dual_chart_aspects(
+            aspects_model = AspectsFactory.dual_chart_aspects(
                 first_subject,
                 second_subject,
                 active_points=effective_active_points,
@@ -301,7 +301,7 @@ class ChartDataFactory:
             return SingleChartDataModel(
                 chart_type=cast(Literal["Natal", "Composite", "SingleReturnChart"], chart_type),
                 subject=first_subject,
-                aspects=cast(SingleChartAspectsModel, aspects),
+                aspects=cast(SingleChartAspectsModel, aspects_model).aspects,
                 element_distribution=element_distribution,
                 quality_distribution=quality_distribution,
                 active_points=effective_active_points,
@@ -315,7 +315,7 @@ class ChartDataFactory:
                 chart_type=cast(Literal["Transit", "Synastry", "DualReturnChart"], chart_type),
                 first_subject=first_subject,
                 second_subject=second_subject,
-                aspects=cast(DualChartAspectsModel, aspects),
+                aspects=cast(DualChartAspectsModel, aspects_model).aspects,
                 house_comparison=house_comparison,
                 relationship_score=relationship_score,
                 element_distribution=element_distribution,
@@ -542,8 +542,11 @@ if __name__ == "__main__":
 
     print(f"Chart Type: {natal_data.chart_type}")
     print(f"Active Points: {len(natal_data.active_points)}")
-    print(f"Aspects: {len(natal_data.aspects.aspects)}")
+    print(f"Aspects: {len(natal_data.aspects)}")
     print(f"Fire: {natal_data.element_distribution.fire_percentage}%")
     print(f"Earth: {natal_data.element_distribution.earth_percentage}%")
     print(f"Air: {natal_data.element_distribution.air_percentage}%")
     print(f"Water: {natal_data.element_distribution.water_percentage}%")
+
+    print("\n---\n")
+    print(natal_data.model_dump_json(indent=4))

kerykeion/charts/chart_drawer.py

@@ -343,7 +343,7 @@ class ChartDrawer:
             # --- NATAL CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -366,7 +366,7 @@ class ChartDrawer:
             # --- COMPOSITE CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -384,7 +384,7 @@ class ChartDrawer:
             # --- TRANSIT CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -405,7 +405,7 @@ class ChartDrawer:
             # --- SYNASTRY CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -423,7 +423,7 @@ class ChartDrawer:
             # --- RETURN CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -441,7 +441,7 @@ class ChartDrawer:
             # --- SINGLE WHEEL RETURN CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT

kerykeion/report.py

@@ -510,8 +510,7 @@ class ReportGenerator:
         if not self._chart_data or not getattr(self._chart_data, "aspects", None):
             return ""
 
-        aspects_model = self._chart_data.aspects
-        aspects_list = list(getattr(aspects_model, "aspects", []))
+        aspects_list = list(self._chart_data.aspects)
 
         if not aspects_list:
             return "No aspects data available."

kerykeion/schemas/kr_models.py

@@ -536,7 +536,7 @@ class SingleChartDataModel(SubscriptableBaseModel):
     subject: Union["AstrologicalSubjectModel", "CompositeSubjectModel", "PlanetReturnModel"]
 
     # Internal aspects analysis
-    aspects: "SingleChartAspectsModel"
+    aspects: List[AspectModel]
 
     # Element and quality distributions
     element_distribution: "ElementDistributionModel"
@@ -582,7 +582,7 @@ class DualChartDataModel(SubscriptableBaseModel):
     second_subject: Union["AstrologicalSubjectModel", "PlanetReturnModel"]
 
     # Inter-chart aspects analysis
-    aspects: "DualChartAspectsModel"
+    aspects: List[AspectModel]
 
     # House comparison analysis
     house_comparison: Optional["HouseComparisonModel"] = None

{kerykeion-5.1.0.dist-info → kerykeion-5.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerykeion
-Version: 5.1.0
+Version: 5.1.1
 Summary: A Python library for astrological calculations, including natal charts, houses, planetary aspects, and SVG chart generation.
 Project-URL: Homepage, https://www.kerykeion.net/
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion
@@ -1336,7 +1336,7 @@ All data structures are now strongly typed Pydantic models:
 
 -   **`AstrologicalSubjectModel`**: Subject data with full validation
 -   **`ChartDataModel`**: Enriched chart data with elements, qualities, aspects
--   **`SingleChartAspectsModel` / `DualChartAspectsModel`**: Typed aspect collections
+-   **`AspectModel` list**: Raw aspect entries directly on `ChartDataModel.aspects`
 -   **`PlanetReturnModel`**: Planetary return data
 -   **`ElementDistributionModel`**: Element statistics (fire, earth, air, water)
 -   **`QualityDistributionModel`**: Quality statistics (cardinal, fixed, mutable)

{kerykeion-5.1.0.dist-info → kerykeion-5.1.1.dist-info}/RECORD

@@ -1,20 +1,20 @@
 kerykeion/__init__.py,sha256=7gI_kWXhsmEK4SvNV6CkRmI0yjA3r7EO8UfQc_44UZU,1963
 kerykeion/astrological_subject_factory.py,sha256=KaNuPSgVOgAva9z83fTuCpvIfEm3hsJro-z_mFPU1Q4,94604
 kerykeion/backword.py,sha256=zqsFWE0xI7vwXnFT2vngufFaJueI3qCIDCVgG-alzCM,32860
-kerykeion/chart_data_factory.py,sha256=dHPovXgWR_LxeyjVp4_g02wGB7QDPqL_xh7-XCi_Lv0,25015
+kerykeion/chart_data_factory.py,sha256=gtAlZs_IjPMUJUitLjkRFCESmAj-wEOlYdCPQ2b8XwA,25123
 kerykeion/composite_subject_factory.py,sha256=eUtjThDlYr6SQsEi02_CgO1kEMUMYgQGzR5rX91GEwY,17120
 kerykeion/ephemeris_data_factory.py,sha256=uwEhVqqkB56HbxKueMAvSAbEKkYTJ9GH3mVLDNxIQnc,20358
 kerykeion/fetch_geonames.py,sha256=SPI4fSvD59C-IVpaoeOHuD7_kjGbTLo2fypO2x57-p4,5432
 kerykeion/planetary_return_factory.py,sha256=bIVPqa2gs7hYHi8aaMfVr4U99xWZk3LmYqZI9KG6ACo,37572
 kerykeion/relationship_score_factory.py,sha256=pVrsRlFs__bfVe8K3cOirsnRtdBOW2DbnKqPa7jCWF0,11396
-kerykeion/report.py,sha256=0JfbvIvHkLUjtbfgTeHuhVWR6jId1UU6IA2r_O7NKV4,31476
+kerykeion/report.py,sha256=MK5_E_DkG09kEdFMueyQ45J_6JJg3QvkYSA0tywehx4,31414
 kerykeion/transits_time_range_factory.py,sha256=YRSFVa2MIZFQMPbEL2njKd-P7p431zoAsINrddZz5Yw,13934
 kerykeion/utilities.py,sha256=LKljXx0HSjlT5pspvG4VIY1po_xG1dLGNNfEWg0G5Fs,24391
 kerykeion/aspects/__init__.py,sha256=csJmxvLdBu-bHuW676f3dpY__Qyc6LwRyrpWVTh3n1A,287
 kerykeion/aspects/aspects_factory.py,sha256=XCuOOpo0ZW7sihYT2f50bLVpebEk19b9EtEjXonwte0,24156
 kerykeion/aspects/aspects_utils.py,sha256=00-MMLEGChpceab8sHKB1_qg6EG4ycTG2u2vYZcyLmQ,5784
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
-kerykeion/charts/chart_drawer.py,sha256=tfE7QoaB0_CoFEBFlLyUDm9aYTVoCKo9DxUzHxOpqFU,122288
+kerykeion/charts/chart_drawer.py,sha256=VCk2s6kUT2AhNWhVdepuhp2_6qHk3Fiq0d4EMq0pvZQ,122240
 kerykeion/charts/charts_utils.py,sha256=JzPnbZJnH4lrIENb5saRtbHn_GbyaElXVBwKdyP90Dg,70110
 kerykeion/charts/draw_planets.py,sha256=tIj3FeLLomVSbCaZUxfw_qBEB3pxi4EIEhqaeTgTyTY,29061
 kerykeion/charts/templates/aspect_grid_only.xml,sha256=v3QtNMjk-kBdUTfB0r6thg--Ta_tNFdRQCzdk5PAycY,86429
@@ -39,7 +39,7 @@ kerykeion/schemas/__init__.py,sha256=EcwbnoYPKLq3m7n5s2cEZ8UyWpxdmHXbvM23hLNBNBI
 kerykeion/schemas/chart_template_model.py,sha256=fQ_EZ8ccOgNd4gXu5KilF1dUH9B2RVCDLHc09YkYLyY,8978
 kerykeion/schemas/kerykeion_exception.py,sha256=vTYdwj_mL-Q-MqHJvEzzBXxQ5YI2kAwUC6ImoWxMKXc,454
 kerykeion/schemas/kr_literals.py,sha256=p0lm598ut0GyeT-sRzWNcp5BFk9-FdYme4XjEUFJ3cA,5656
-kerykeion/schemas/kr_models.py,sha256=osrUyT8K8ShhsPJownujtks9U2M0DZAQv6b7mF-GEXQ,21959
+kerykeion/schemas/kr_models.py,sha256=e1PQxUqC437IWIVKrOi71NVR5bEV7KGhF_JAaxs9zN0,21945
 kerykeion/schemas/settings_models.py,sha256=NlOW9T7T5kD5Dzna1UOdb7XPQeQnzMOu0y4-ApERxPw,17619
 kerykeion/settings/__init__.py,sha256=IJUqkYTpvmbKecVeCbsiL1qU_4xWc78u4OrvN_T3ZAI,624
 kerykeion/settings/chart_defaults.py,sha256=TSm2hXCxym3I7XpIqIMBLWM253Z0dCGbhPi2MpWbD_0,12490
@@ -57,7 +57,7 @@ kerykeion/sweph/ast28/se28978s.se1,sha256=nU2Qp-ELc_tzFnRc1QT6uVueWXEipvhYDgfQRX
 kerykeion/sweph/ast50/se50000s.se1,sha256=9jTrPlIrZMOBWC9cNgwzcfz0KBHdXFZoY9-NZ_HtECo,15748
 kerykeion/sweph/ast90/se90377s.se1,sha256=bto2x4LtBv8b1ej1XhVFYq-kfHO9cczbKV9U1f9UVu4,10288
 kerykeion/sweph/ast90/se90482s.se1,sha256=uHxz6bP4K8zgtQFrlWFwxrYfmqm5kXxsg6OYhAIUbAA,16173
-kerykeion-5.1.0.dist-info/METADATA,sha256=dn3Vl-7eaFCNN54IoT58fM9WJZ6PsJvfwcRs-S3xThI,61447
-kerykeion-5.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kerykeion-5.1.0.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-5.1.0.dist-info/RECORD,,
+kerykeion-5.1.1.dist-info/METADATA,sha256=Ec1Bzr2pPHj_k2Y_1QpZVIE0bHRRHFmJgQCvK3FgFpg,61445
+kerykeion-5.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kerykeion-5.1.1.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.1.1.dist-info/RECORD,,