kerykeion 5.1.0__tar.gz → 5.1.1__tar.gz

{kerykeion-5.1.0 → kerykeion-5.1.1}/PKG-INFO

@@ -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 → kerykeion-5.1.1}/README.md

@@ -1296,7 +1296,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 → kerykeion-5.1.1}/examples/planetary_return.py

@@ -44,7 +44,7 @@ def main() -> None:
 
     print("Solar return cast for:", solar_return.iso_formatted_local_datetime)
     print("Return location:", solar_return.city, solar_return.nation)
-    print("Total aspects:", len(chart_data.aspects.aspects))
+    print("Total aspects:", len(chart_data.aspects))
 
 
 if __name__ == "__main__":

{kerykeion-5.1.0 → kerykeion-5.1.1}/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-5.1.0 → kerykeion-5.1.1}/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-5.1.0 → kerykeion-5.1.1}/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-5.1.0 → kerykeion-5.1.1}/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 → kerykeion-5.1.1}/pyproject.toml

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

{kerykeion-5.1.0 → kerykeion-5.1.1}/site-docs/aspects.md

@@ -911,8 +911,8 @@ def generate_consultation_report(person, report_type="comprehensive"):
 
     if report_type == "comprehensive":
         strongest = sorted(chart_aspects.aspects, key=lambda aspect: abs(aspect.orbit))[:5]
-            for aspect in strongest:
-                print(f"  {aspect.p1_name} {aspect.aspect} {aspect.p2_name} (orb {aspect.orbit:+.2f}°)")
+        for aspect in strongest:
+            print(f"  {aspect.p1_name} {aspect.aspect} {aspect.p2_name} (orb {aspect.orbit:+.2f}°)")
 
     return chart_aspects
 
@@ -977,13 +977,13 @@ def comparative_study(subjects_list, study_focus="general"):
         print(f"Processing subject {i}/{len(subjects_list)}: {subject.name}")
         chart_aspects = AspectsFactory.single_chart_aspects(subject)
         stats = statistical_aspects_analysis(chart_aspects.aspects)
-            result = {
-                "name": subject.name,
-                "birth_year": subject.year,
-                "sun_sign": subject.sun.sign,
-                "aspects": len(chart_aspects.aspects),
-                "stats": stats,
-            }
+        result = {
+            "name": subject.name,
+            "birth_year": subject.year,
+            "sun_sign": subject.sun.sign,
+            "aspects": len(chart_aspects.aspects),
+            "stats": stats,
+        }
         all_results.append(result)
 
     print()

{kerykeion-5.1.0 → kerykeion-5.1.1}/site-docs/chart_data_factory.md

@@ -148,7 +148,7 @@ print(f"Model Type: {type(chart_data).__name__}")  # SingleChartDataModel
 print(f"Chart Type: {chart_data.chart_type}")      # Natal
 print(f"Subject: {chart_data.subject.name}")       # John Doe
 print(f"Active Points: {len(chart_data.active_points)}")
-print(f"Aspects: {len(chart_data.aspects.aspects)}")
+print(f"Aspects: {len(chart_data.aspects)}")
 
 # Element distribution analysis
 elements = chart_data.element_distribution
@@ -204,7 +204,7 @@ print(f"Model Type: {type(synastry_data).__name__}")  # DualChartDataModel
 print(f"Chart Type: {synastry_data.chart_type}")      # Synastry
 print(f"First Subject: {synastry_data.first_subject.name}")   # Person 1
 print(f"Second Subject: {synastry_data.second_subject.name}") # Person 2
-print(f"Inter-chart Aspects: {len(synastry_data.aspects.aspects)}")
+print(f"Inter-chart Aspects: {len(synastry_data.aspects)}")
 
 # Relationship compatibility analysis
 if synastry_data.relationship_score:
@@ -256,12 +256,12 @@ transit_data = ChartDataFactory.create_transit_chart_data(
 )
 
 print(f"Transit Time: {transit_data.second_subject.iso_formatted_local_datetime}")
-print(f"Active Transits: {len(transit_data.aspects.aspects)}")
+print(f"Active Transits: {len(transit_data.aspects)}")
 
 # Analyze major transits
 major_aspects = ["conjunction", "opposition", "trine", "square", "sextile"]
 major_transits = [
-    aspect for aspect in transit_data.aspects.aspects
+    aspect for aspect in transit_data.aspects
     if aspect.aspect in major_aspects
 ]
 
@@ -308,7 +308,7 @@ second_subject = composite_subject_model.second_subject
 print(f"Composite Chart Name: {composite_subject_model.name}")
 print(f"Members: {first_subject.name} & {second_subject.name}")
 print(f"Chart Type: {composite_chart.chart_type}")
-print(f"Aspects: {len(composite_chart.aspects.aspects)}")
+print(f"Aspects: {len(composite_chart.aspects)}")
 
 average_latitude = (first_subject.lat + second_subject.lat) / 2
 average_longitude = (first_subject.lng + second_subject.lng) / 2
@@ -356,7 +356,7 @@ chart_data = ChartDataFactory.create_natal_chart_data(
 )
 
 print(f"Active Points: {len(chart_data.active_points)}")
-print(f"Calculated Aspects: {len(chart_data.aspects.aspects)}")
+print(f"Calculated Aspects: {len(chart_data.aspects)}")
 ```
 
 ### Custom Aspect Configuration
@@ -390,7 +390,7 @@ chart_data = ChartDataFactory.create_natal_chart_data(
 )
 
 print(f"Configured Aspects: {len(chart_data.active_aspects)}")
-print(f"Found Aspects: {len(chart_data.aspects.aspects)}")
+print(f"Found Aspects: {len(chart_data.aspects)}")
 ```
 
 ### Selective Analysis Features
@@ -423,7 +423,7 @@ synastry_data = ChartDataFactory.create_synastry_chart_data(
     active_points=["Sun", "Moon", "Venus", "Mars"],
 )
 
-print(f"Love-focused aspects: {len(synastry_data.aspects.aspects)}")
+print(f"Love-focused aspects: {len(synastry_data.aspects)}")
 ```
 
 ## Programming Integration Examples
@@ -492,8 +492,8 @@ def process_natal_chart(birth_data: BirthData) -> Dict[str, Any]:
         },
         "analysis": {
             "aspects": {
-                "total": len(chart_data.aspects.aspects),
-                "relevant": len(chart_data.aspects.aspects),
+                "total": len(chart_data.aspects),
+                "relevant": len(chart_data.aspects),
                 "list": [
                     {
                         "from": aspect.p1_name,
@@ -502,7 +502,7 @@ def process_natal_chart(birth_data: BirthData) -> Dict[str, Any]:
                         "orb": round(aspect.orbit, 2),
                         "exact_degrees": aspect.aspect_degrees
                     }
-                    for aspect in chart_data.aspects.aspects
+                    for aspect in chart_data.aspects
                 ]
             },
             "elements": {
@@ -544,7 +544,7 @@ def analyze_relationship_compatibility(person1: BirthData, person2: BirthData) -
         "compatibility": {
             "score": synastry_data.relationship_score.score_value if synastry_data.relationship_score else None,
             "description": synastry_data.relationship_score.score_description if synastry_data.relationship_score else None,
-            "aspects_count": len(synastry_data.aspects.aspects)
+            "aspects_count": len(synastry_data.aspects)
         },
         "key_aspects": [
             {
@@ -554,7 +554,7 @@ def analyze_relationship_compatibility(person1: BirthData, person2: BirthData) -
                 "orb": round(aspect.orbit, 2),
                 "strength": "strong" if aspect.orbit < 3 else "moderate" if aspect.orbit < 6 else "weak"
             }
-            for aspect in synastry_data.aspects.aspects[:10]
+            for aspect in synastry_data.aspects[:10]
         ],
         "house_overlays": {
             "person1_in_person2": len(synastry_data.house_comparison.first_points_in_second_houses) if synastry_data.house_comparison else 0,
@@ -626,7 +626,7 @@ def process_multiple_charts(birth_data_list: List[BirthData]) -> List[Dict[str,
                 "cardinal_percentage": chart_data.quality_distribution.cardinal_percentage,
                 "fixed_percentage": chart_data.quality_distribution.fixed_percentage,
                 "mutable_percentage": chart_data.quality_distribution.mutable_percentage,
-                "aspect_count": len(chart_data.aspects.aspects),
+                "aspect_count": len(chart_data.aspects),
             }
 
             results.append(result)
@@ -808,7 +808,7 @@ subject = AstrologicalSubjectFactory.from_birth_data(
 )
 chart_data = ChartDataFactory.create_natal_chart_data(subject)
 
-aspects = chart_data.aspects.aspects
+aspects = chart_data.aspects
 
 # Count aspect types
 aspect_counts = {}
@@ -860,7 +860,7 @@ chart_data = ChartDataFactory.create_natal_chart_data(
 )
 
 print(f"Active Points: {len(chart_data.active_points)}")
-print(f"Calculated Aspects: {len(chart_data.aspects.aspects)}")
+print(f"Calculated Aspects: {len(chart_data.aspects)}")
 ```
 
 ### Aspect Configuration Optimization
@@ -904,7 +904,7 @@ chart_data = ChartDataFactory.create_natal_chart_data(
 )
 
 print(f"Configured {len(chart_data.active_aspects)} active aspect types")
-print(f"Resulting aspects: {len(chart_data.aspects.aspects)}")
+print(f"Resulting aspects: {len(chart_data.aspects)}")
 ```
 
 ### Selective Feature Loading
@@ -936,7 +936,7 @@ quick_synastry = ChartDataFactory.create_synastry_chart_data(
     active_points=["Sun", "Moon", "Venus", "Mars"],
 )
 
-print(f"Quick analysis: {len(quick_synastry.aspects.aspects)} aspects")
+print(f"Quick analysis: {len(quick_synastry.aspects)} aspects")
 ```
 
 ## Error Handling

{kerykeion-5.1.0 → kerykeion-5.1.1}/tests/test_all_active_points.py

@@ -44,8 +44,12 @@ def test_all_active_points_used_in_chart():
     assert set(chart_data.active_points).issubset(set(ALL_ACTIVE_POINTS))
     assert len(chart_data.active_points) > 0
     assert hasattr(chart_data, "aspects") and chart_data.aspects is not None
-    aspects_active = set(getattr(chart_data.aspects, "active_points", []))
-    assert aspects_active == set(chart_data.active_points)
+    assert len(chart_data.aspects) > 0
+    aspect_points = {
+        aspect.p1_name for aspect in chart_data.aspects
+    }.union({aspect.p2_name for aspect in chart_data.aspects})
+    # Aspect point names should be limited to the active set
+    assert aspect_points.issubset(set(chart_data.active_points))
 
     # ChartDrawer should reflect the same list and enable all of them
     drawer = ChartDrawer(chart_data)

{kerykeion-5.1.0 → kerykeion-5.1.1}/tests/test_chart_data_factory.py

@@ -99,7 +99,7 @@ class TestSingleChartDataModel:
 
         # Verify aspects are calculated
         assert hasattr(chart_data, 'aspects')
-        assert len(chart_data.aspects.aspects) > 0
+        assert len(chart_data.aspects) > 0
 
         # Verify element and quality distributions
         assert isinstance(chart_data.element_distribution, ElementDistributionModel)
@@ -160,7 +160,7 @@ class TestDualChartDataModel:
 
         # Verify inter-chart aspects
         assert hasattr(chart_data, 'aspects')
-        assert len(chart_data.aspects.aspects) > 0
+        assert len(chart_data.aspects) > 0
 
         # Verify synastry-specific features
         assert chart_data.house_comparison is not None
@@ -409,11 +409,11 @@ class TestAspectCalculations:
         chart_data = factory.create_chart_data("Natal", test_subject_1)
 
         # Verify aspects exist
-        assert len(chart_data.aspects.aspects) > 0
+        assert len(chart_data.aspects) > 0
 
         # For natal charts, all aspects should be internal
         # (this test assumes aspect structure allows checking)
-        aspects = chart_data.aspects.aspects
+        aspects = chart_data.aspects
         assert len(aspects) > 0
 
     def test_synastry_aspects_are_inter_chart(self, factory, test_subject_1, test_subject_2):
@@ -421,10 +421,10 @@ class TestAspectCalculations:
         chart_data = factory.create_chart_data("Synastry", test_subject_1, test_subject_2)
 
         # Verify inter-chart aspects exist
-        assert len(chart_data.aspects.aspects) > 0
+        assert len(chart_data.aspects) > 0
 
         # Synastry should have aspects between the two charts
-        aspects = chart_data.aspects.aspects
+        aspects = chart_data.aspects
         assert len(aspects) > 0
 
 
@@ -444,7 +444,7 @@ class TestPerformanceAndOptimization:
         )
 
         # Limited chart should have fewer or equal aspects
-        assert len(limited_chart.aspects.aspects) <= len(full_chart.aspects.aspects)
+        assert len(limited_chart.aspects) <= len(full_chart.aspects)
         assert len(limited_chart.active_points) <= len(full_chart.active_points)
 
     def test_selective_synastry_features(self, factory, test_subject_1, test_subject_2):
@@ -529,7 +529,7 @@ class TestDataExportAndSerialization:
                 "name": chart_data.subject.name,
                 "fire_percentage": chart_data.element_distribution.fire_percentage,
                 "earth_percentage": chart_data.element_distribution.earth_percentage,
-                "aspect_count": len(chart_data.aspects.aspects)
+                "aspect_count": len(chart_data.aspects)
             }
             results.append(result)
 
@@ -583,7 +583,7 @@ class TestEdgeCasesAndRobustness:
         assert chart_data.first_subject.name == chart_data.second_subject.name
 
         # Should have some aspects (likely many conjunctions)
-        assert len(chart_data.aspects.aspects) > 0
+        assert len(chart_data.aspects) > 0
 
 
 if __name__ == "__main__":