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

kerykeion/aspects/aspects_factory.py

@@ -98,7 +98,7 @@ class AspectsFactory:
         Example:
             >>> johnny = AstrologicalSubjectFactory.from_birth_data("Johnny", 1963, 6, 9, 0, 0, "Owensboro", "US")
             >>> chart_aspects = AspectsFactory.single_chart_aspects(johnny)
-            >>> print(f"Found {len(chart_aspects.relevant_aspects)} relevant aspects")
+            >>> print(f"Found {len(chart_aspects.aspects)} aspects")
         """
         # Initialize settings and configurations
         celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
@@ -162,7 +162,7 @@ class AspectsFactory:
             >>> john = AstrologicalSubjectFactory.from_birth_data("John", 1990, 1, 1, 12, 0, "London", "GB")
             >>> jane = AstrologicalSubjectFactory.from_birth_data("Jane", 1992, 6, 15, 14, 30, "Paris", "FR")
             >>> synastry = AspectsFactory.dual_chart_aspects(john, jane)
-            >>> print(f"Found {len(synastry.relevant_aspects)} relevant aspects")
+            >>> print(f"Found {len(synastry.aspects)} aspects")
         """
         # Initialize settings and configurations
         celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
@@ -208,12 +208,12 @@ class AspectsFactory:
         Create the complete single chart aspects model with all calculations.
 
         Returns:
-            SingleChartAspectsModel containing all aspects data
+            SingleChartAspectsModel containing filtered aspects data
         """
         all_aspects = AspectsFactory._calculate_single_chart_aspects(
             subject, active_points_resolved, active_aspects_resolved, aspects_settings, celestial_points
         )
-        relevant_aspects = AspectsFactory._filter_relevant_aspects(
+        filtered_aspects = AspectsFactory._filter_relevant_aspects(
             all_aspects,
             axis_orb_limit,
             apply_axis_orb_filter=axis_orb_limit is not None,
@@ -221,8 +221,7 @@ class AspectsFactory:
 
         return SingleChartAspectsModel(
             subject=subject,
-            all_aspects=all_aspects,
-            relevant_aspects=relevant_aspects,
+            aspects=filtered_aspects,
             active_points=active_points_resolved,
             active_aspects=active_aspects_resolved,
         )
@@ -250,13 +249,13 @@ class AspectsFactory:
             celestial_points: Celestial points configuration
 
         Returns:
-            DualChartAspectsModel: Complete model containing all aspects data
+            DualChartAspectsModel: Complete model containing filtered aspects data
         """
         all_aspects = AspectsFactory._calculate_dual_chart_aspects(
             first_subject, second_subject, active_points_resolved, active_aspects_resolved,
             aspects_settings, celestial_points
         )
-        relevant_aspects = AspectsFactory._filter_relevant_aspects(
+        filtered_aspects = AspectsFactory._filter_relevant_aspects(
             all_aspects,
             axis_orb_limit,
             apply_axis_orb_filter=False,
@@ -265,8 +264,7 @@ class AspectsFactory:
         return DualChartAspectsModel(
             first_subject=first_subject,
             second_subject=second_subject,
-            all_aspects=all_aspects,
-            relevant_aspects=relevant_aspects,
+            aspects=filtered_aspects,
             active_points=active_points_resolved,
             active_aspects=active_aspects_resolved,
         )
@@ -560,10 +558,11 @@ if __name__ == "__main__":
     # Test single chart aspects (replaces natal aspects)
     johnny = AstrologicalSubjectFactory.from_birth_data("Johnny Depp", 1963, 6, 9, 0, 0, city="Owensboro", nation="US")
     single_chart_aspects = AspectsFactory.single_chart_aspects(johnny)
-    print(f"Single chart aspects - All: {len(single_chart_aspects.all_aspects)}, Relevant: {len(single_chart_aspects.relevant_aspects)}")
+    print(f"Single chart aspects: {len(single_chart_aspects.aspects)}")
 
     # Test dual chart aspects (replaces synastry aspects)
     john = AstrologicalSubjectFactory.from_birth_data("John", 1940, 10, 9, 10, 30, "Liverpool", "GB")
     yoko = AstrologicalSubjectFactory.from_birth_data("Yoko", 1933, 2, 18, 10, 30, "Tokyo", "JP")
     dual_chart_aspects = AspectsFactory.dual_chart_aspects(john, yoko)
-    print(f"Dual chart aspects - All: {len(dual_chart_aspects.all_aspects)}, Relevant: {len(dual_chart_aspects.relevant_aspects)}")
+    print(f"Dual chart aspects: {len(dual_chart_aspects.aspects)}")
+

kerykeion/backword.py

@@ -676,14 +676,16 @@ class NatalAspects:
 
     @cached_property
     def all_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._all_aspects_cache is None:
-            self._all_aspects_cache = list(self._build_aspects_model().all_aspects)
+            self._all_aspects_cache = list(self._build_aspects_model().aspects)
         return self._all_aspects_cache
 
     @cached_property
     def relevant_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._relevant_aspects_cache is None:
-            self._relevant_aspects_cache = list(self._build_aspects_model().relevant_aspects)
+            self._relevant_aspects_cache = list(self._build_aspects_model().aspects)
         return self._relevant_aspects_cache
 
 # ---------------------------------------------------------------------------
@@ -748,14 +750,16 @@ class SynastryAspects:
 
     @cached_property
     def all_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._all_aspects_cache is None:
-            self._all_aspects_cache = list(self._build_dual_model().all_aspects)
+            self._all_aspects_cache = list(self._build_dual_model().aspects)
         return self._all_aspects_cache
 
     @cached_property
     def relevant_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._relevant_aspects_cache is None:
-            self._relevant_aspects_cache = list(self._build_dual_model().relevant_aspects)
+            self._relevant_aspects_cache = list(self._build_dual_model().aspects)
         return self._relevant_aspects_cache
 
     def get_relevant_aspects(self):

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.relevant_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.relevant_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.relevant_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.relevant_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.relevant_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.relevant_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.relevant_aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT

kerykeion/relationship_score_factory.py

@@ -117,7 +117,7 @@ class RelationshipScoreFactory:
             self.first_subject,
             self.second_subject,
             axis_orb_limit=axis_orb_limit,
-        ).all_aspects
+        ).aspects
 
     def _evaluate_destiny_sign(self):
         """

kerykeion/report.py

@@ -510,15 +510,14 @@ class ReportGenerator:
         if not self._chart_data or not getattr(self._chart_data, "aspects", None):
             return ""
 
-        aspects_model = self._chart_data.aspects
-        relevant_aspects = list(getattr(aspects_model, "relevant_aspects", []))
+        aspects_list = list(self._chart_data.aspects)
 
-        if not relevant_aspects:
+        if not aspects_list:
             return "No aspects data available."
 
-        total_aspects = len(relevant_aspects)
+        total_aspects = len(aspects_list)
         if max_aspects is not None:
-            relevant_aspects = relevant_aspects[:max_aspects]
+            aspects_list = aspects_list[:max_aspects]
 
         is_dual = isinstance(self._chart_data, DualChartDataModel)
         if is_dual:
@@ -527,7 +526,7 @@ class ReportGenerator:
             table_header = ["Point 1", "Aspect", "Point 2", "Orb", "Movement"]
 
         aspects_table: List[List[str]] = [table_header]
-        for aspect in relevant_aspects:
+        for aspect in aspects_list:
             aspect_name = str(aspect.aspect)
             symbol = ASPECT_SYMBOLS.get(aspect_name.lower(), aspect_name)
             movement_symbol = MOVEMENT_SYMBOLS.get(aspect.aspect_movement, "")
@@ -552,7 +551,7 @@ class ReportGenerator:
                     movement,
                 ])
 
-        suffix = f" (showing {len(relevant_aspects)} of {total_aspects})" if max_aspects is not None else ""
+        suffix = f" (showing {len(aspects_list)} of {total_aspects})" if max_aspects is not None else ""
         title = f"Aspects{suffix}"
         return AsciiTable(aspects_table, title=title).table
 

kerykeion/schemas/kr_models.py

@@ -353,12 +353,11 @@ class SingleChartAspectsModel(SubscriptableBaseModel):
     - Composite charts
     - Any other single chart type
 
-    Contains both all calculated aspects and the filtered relevant aspects
-    for the astrological subject.
+    Contains the filtered and relevant aspects for the astrological subject
+    based on configured orb settings.
     """
     subject: Union["AstrologicalSubjectModel", "CompositeSubjectModel", "PlanetReturnModel"] = Field(description="The astrological subject for which aspects were calculated.")
-    all_aspects: List[AspectModel] = Field(description="Complete list of all calculated aspects within the chart.")
-    relevant_aspects: List[AspectModel] = Field(description="Filtered list of relevant aspects based on orb settings.")
+    aspects: List[AspectModel] = Field(description="List of calculated aspects within the chart, filtered based on orb settings.")
     active_points: List[AstrologicalPoint] = Field(description="List of active points used in the calculation.")
     active_aspects: List["ActiveAspect"] = Field(description="List of active aspects with their orb settings.")
 
@@ -373,13 +372,12 @@ class DualChartAspectsModel(SubscriptableBaseModel):
     - Composite vs natal comparisons
     - Any other dual chart comparison
 
-    Contains both all calculated aspects and the filtered relevant aspects
-    between the two charts.
+    Contains the filtered and relevant aspects between the two charts
+    based on configured orb settings.
     """
     first_subject: Union["AstrologicalSubjectModel", "CompositeSubjectModel", "PlanetReturnModel"] = Field(description="The first astrological subject.")
     second_subject: Union["AstrologicalSubjectModel", "CompositeSubjectModel", "PlanetReturnModel"] = Field(description="The second astrological subject.")
-    all_aspects: List[AspectModel] = Field(description="Complete list of all calculated aspects between the two charts.")
-    relevant_aspects: List[AspectModel] = Field(description="Filtered list of relevant aspects based on orb settings.")
+    aspects: List[AspectModel] = Field(description="List of calculated aspects between the two charts, filtered based on orb settings.")
     active_points: List[AstrologicalPoint] = Field(description="List of active points used in the calculation.")
     active_aspects: List["ActiveAspect"] = Field(description="List of active aspects with their orb settings.")
 
@@ -538,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"
@@ -584,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/transits_time_range_factory.py

@@ -247,7 +247,7 @@ class TransitsTimeRangeFactory:
                 active_points=self.active_points,
                 active_aspects=self.active_aspects,
                 axis_orb_limit=self.axis_orb_limit,
-            ).relevant_aspects
+            ).aspects
 
             # Create a transit moment for this point in time
             transit_moments.append(