kerykeion 5.0.0a11__py3-none-any.whl → 5.0.0a12__py3-none-any.whl

kerykeion/transits_time_range_factory.py

@@ -22,7 +22,7 @@ Classes:
 
 Dependencies:
     - kerykeion.AstrologicalSubjectFactory: For creating astrological subjects
-    - kerykeion.aspects.SynastryAspectsFactory: For calculating angular relationships
+    - kerykeion.aspects.AspectsFactory: For calculating angular relationships
     - kerykeion.ephemeris_data_factory: For generating time-series planetary positions
     - kerykeion.kr_types: For type definitions and model structures
     - datetime: For date/time handling
@@ -59,7 +59,7 @@ from typing import Union, List
 from datetime import datetime, timedelta
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
-from kerykeion.aspects import SynastryAspectsFactory
+from kerykeion.aspects import AspectsFactory
 from kerykeion.ephemeris_data_factory import EphemerisDataFactory
 from kerykeion.kr_types.kr_literals import AstrologicalPoint
 from kerykeion.kr_types.kr_models import ActiveAspect, TransitMomentModel, TransitsTimeRangeModel
@@ -227,13 +227,13 @@ class TransitsTimeRangeFactory:
         See Also:
             TransitMomentModel: Individual transit moment structure
             TransitsTimeRangeModel: Complete transit dataset structure
-            SynastryAspectsFactory: Underlying aspect calculation engine
+            AspectsFactory: Underlying aspect calculation engine
         """
         transit_moments = []
 
         for ephemeris_point in self.ephemeris_data_points:
             # Calculate aspects between transit positions and natal chart
-            aspects = SynastryAspectsFactory.from_subjects(
+            aspects = AspectsFactory.dual_chart_aspects(
                 ephemeris_point,
                 self.natal_chart,
                 active_points=self.active_points,

{kerykeion-5.0.0a11.dist-info → kerykeion-5.0.0a12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerykeion
-Version: 5.0.0a11
+Version: 5.0.0a12
 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
@@ -186,10 +186,6 @@ birth_chart_svg = KerykeionChartSVG(john)
 birth_chart_svg.makeSVG()
 ```
 
-```python
-birth_chart_svg.makeSVG()
-```
-
 The SVG file will be saved in the home directory.
 ![John Lennon Birth Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/John%20Lennon%20-%20Natal%20Chart.svg)
 
@@ -221,7 +217,7 @@ synastry_chart.makeSVG()
 ### Transit Chart
 
 ```python
-from kerykeion import AstrologicalSubjectFactory
+from kerykeion import AstrologicalSubjectFactory, KerykeionChartSVG
 
 transit = AstrologicalSubjectFactory.from_birth_data("Transit", 2025, 6, 8, 8, 45, "Atlanta", "US")
 subject = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
@@ -315,7 +311,7 @@ You can switch chart language by passing `chart_language` to the  `KerykeionChar
 ```python
 from kerykeion import AstrologicalSubjectFactory, KerykeionChartSVG
 
-first = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+birth_chart = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
 birth_chart_svg = KerykeionChartSVG(
     birth_chart,
     chart_language="IT"  # Change to Italian
@@ -342,7 +338,7 @@ To generate a minified SVG, set `minify_svg=True` in the `makeSVG()` method:
 
 ```python
 from kerykeion import AstrologicalSubjectFactory, KerykeionChartSVG
-first = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+birth_chart = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
 birth_chart_svg = KerykeionChartSVG(birth_chart)
 birth_chart_svg.makeSVG(
     minify=True
@@ -355,7 +351,7 @@ To generate an SVG without CSS variables, set `remove_css_variables=True` in the
 ```python
 from kerykeion import AstrologicalSubjectFactory, KerykeionChartSVG
 
-first = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+birth_chart = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
 birth_chart_svg = KerykeionChartSVG(birth_chart)
 birth_chart_svg.makeSVG(
     remove_css_variables=True
@@ -366,13 +362,14 @@ This will inline all styles and eliminate CSS variables, resulting in an SVG tha
 
 ### Grid Only SVG
 
-It's possible to generate a grid-only SVG, useful for creating a custom layout. To do this, use the `makeGridOnlySVG()` method:
+It's possible to generate a grid-only SVG, useful for creating a custom layout. To do this, use the `makeAspectGridOnlySVG()` method:
 
 ```python
 from kerykeion import AstrologicalSubjectFactory, KerykeionChartSVG
-birth_chart = AstrologicalSubjectFactory.from_birth_data("John Lennon - Aspect Grid Dark Synastry", 1977, 6, 8, 8, 45, "Atlanta", "US")
-aspect_grid_dark_synastry_chart = KerykeionChartSVG(aspect_grid_dark_synastry_subject, "Synastry", second, theme="dark")
-aspect_grid_dark_synastry_chart.makeAspectGridOnlySVG()
+birth_chart = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+second = AstrologicalSubjectFactory.from_birth_data("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
+aspect_grid_chart = KerykeionChartSVG(birth_chart, "Synastry", second, theme="dark")
+aspect_grid_chart.makeAspectGridOnlySVG()
 ```
 ![John Lennon Birth Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/John%20Lennon%20-%20Aspect%20Grid%20Only%20-%20Natal%20Chart%20-%20Aspect%20Grid%20Only.svg)
 
@@ -444,17 +441,47 @@ python3 your_script_name.py > file.txt
 
 ## Example: Retrieving Aspects
 
+Kerykeion provides a unified `AspectsFactory` class for calculating astrological aspects within single charts or between two charts:
+
 ```python
-from kerykeion import SynastryAspects, AstrologicalSubject
+from kerykeion import AspectsFactory, AstrologicalSubjectFactory
+
+# Create astrological subjects
+jack = AstrologicalSubjectFactory.from_birth_data("Jack", 1990, 6, 15, 15, 15, "Roma", "IT")
+jane = AstrologicalSubjectFactory.from_birth_data("Jane", 1991, 10, 25, 21, 0, "Roma", "IT")
+
+# For single chart aspects (natal, return, composite, etc.)
+single_chart_aspects = AspectsFactory.single_chart_aspects(jack)
+print(f"Found {len(single_chart_aspects)} aspects in Jack's chart")
+print(single_chart_aspects[0])
+# Output: AspectModel with details like aspect type, orb, planets involved, etc.
+
+# For dual chart aspects (synastry, transits, comparisons, etc.)
+dual_chart_aspects = AspectsFactory.dual_chart_aspects(jack, jane)
+print(f"Found {len(dual_chart_aspects)} aspects between Jack and Jane's charts")
+print(dual_chart_aspects[0])
+# Output: AspectModel with cross-chart aspect details
+
+# The factory returns structured AspectModel objects with properties like:
+# - p1_name, p2_name: Planet/point names
+# - aspect: Aspect type (conjunction, trine, square, etc.)
+# - orbit: Orb tolerance in degrees
+# - aspect_degrees: Exact degrees for the aspect (0, 60, 90, 120, 180, etc.)
+# - color: Hex color code for visualization
+```
 
-first = AstrologicalSubjectFactory.from_birth_data("Jack", 1990, 6, 15, 15, 15, "Roma", "IT")
-second = AstrologicalSubjectFactory.from_birth_data("Jane", 1991, 10, 25, 21, 0, "Roma", "IT")
+**Advanced Usage with Custom Settings:**
+
+```python
+# You can also customize aspect calculations with custom orb settings
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_ASPECTS
 
-name = SynastryAspects(first, second)
-aspect_list = name.get_relevant_aspects()
-print(aspect_list[0])
-#> {'p1_name': 'Sun', 'p1_abs_pos': 84.17867971515636, 'p2_name': 'Sun', 'p2_abs_pos': 211.90472999502984, 'aspect': 'trine', 'orbit': 7.726050279873476, 'aspect_degrees': 120, 'color': '#36d100', 'aid': 6, 'diff': 127.72605027987348, 'p1': 0, 'p2': 0}
+# Modify aspect settings if needed
+custom_aspects = DEFAULT_ACTIVE_ASPECTS.copy()
+# ... modify as needed
 
+# The factory automatically uses the configured settings for orb calculations
+# and filters aspects based on relevance and orb thresholds
 ```
 
 ## Ayanamsa (Sidereal Modes)
@@ -525,7 +552,7 @@ Here's an example of how to set the theme:
 from kerykeion import AstrologicalSubjectFactory, KerykeionChartSVG
 
 dark_theme_subject = AstrologicalSubjectFactory.from_birth_data("John Lennon - Dark Theme", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-dark_theme_natal_chart = KerykeionChartSVG(dark_high_contrast_theme_subject, theme="dark_high_contrast")
+dark_theme_natal_chart = KerykeionChartSVG(dark_theme_subject, theme="dark_high_contrast")
 dark_theme_natal_chart.makeSVG()
 ```
 
@@ -617,7 +644,7 @@ Clone the repository or download the ZIP via the GitHub interface.
 
 ## Integrating Kerykeion into Your Project
 
-If you would like to incorporate Kerykeion’s astrological features into your application, please reach out via [email](mailto:kerykeion.astrology@gmail.com?subject=Integration%20Request). Whether you need custom features, support, or specialized consulting, I am happy to discuss potential collaborations.
+If you would like to incorporate Kerykeion's astrological features into your application, please reach out via [email](mailto:kerykeion.astrology@gmail.com?subject=Integration%20Request). Whether you need custom features, support, or specialized consulting, I am happy to discuss potential collaborations.
 
 ## License
 

{kerykeion-5.0.0a11.dist-info → kerykeion-5.0.0a12.dist-info}/RECORD

@@ -1,21 +1,20 @@
-kerykeion/__init__.py,sha256=0nw7gz0b1fGUvRlNfIMOGognUd9y6cP1hXxHN2LQ_nM,1338
-kerykeion/astrological_subject_factory.py,sha256=xyWbrThNuUnjKVrglJKCNdiKlnDmJU8GiRRu8QlIlL8,83659
+kerykeion/__init__.py,sha256=WTTZBOe40IuvcINRRrsqinEkTFzaJNbPcZ8iO6F3fvw,1274
+kerykeion/astrological_subject_factory.py,sha256=TrnZ_jIphKzu7NqxlL5vp5JELzuPgxIz1KtrW7W2-5M,83655
 kerykeion/composite_subject_factory.py,sha256=sqs7CiP_3lGI9-FeRFMFL7PIXTlSUaXA9pUDI_5zPZw,17124
 kerykeion/ephemeris_data_factory.py,sha256=Iwd8KkBB-WmI8AEwrhe9ze8dicA5kvpflT_yQD9XkAY,20111
 kerykeion/fetch_geonames.py,sha256=SPI4fSvD59C-IVpaoeOHuD7_kjGbTLo2fypO2x57-p4,5432
 kerykeion/planetary_return_factory.py,sha256=7fwfjhJATFmUNJkIqgaz07sWtpwHPjHvF2oFyPGfga4,37246
-kerykeion/relationship_score_factory.py,sha256=aYpWkkcZGNpmCW8Ul5FcXh3skVFSN07WPZroL1KXDoc,11135
+kerykeion/relationship_score_factory.py,sha256=kcr0qEA4_2oQ_2g8IcrHgpVEyb9uAm4EmVWJAGsoCtg,11099
 kerykeion/report.py,sha256=dUtI70wUjOouqNE1pf0ZYFY4qme9pR7WQRbs_ExEkjM,3029
-kerykeion/transits_time_range_factory.py,sha256=n25xQeqiKGYGhBvxUJKT6Dxc7L7lw46TGBy3L8RSb_g,13419
+kerykeion/transits_time_range_factory.py,sha256=xFEdOqYINTBluwp-CKeYTJgANlPEeVw4TYMLigiC30M,13392
 kerykeion/utilities.py,sha256=MtVyZ2dbHrJPuDoPKPrkx0MrB83fxcbGtPx87piHCtQ,23471
-kerykeion/aspects/__init__.py,sha256=i1hg04VL15s-LVGOHuTWJsicv_HNwT3b2v6_-16s6A4,394
+kerykeion/aspects/__init__.py,sha256=csJmxvLdBu-bHuW676f3dpY__Qyc6LwRyrpWVTh3n1A,287
+kerykeion/aspects/aspects_factory.py,sha256=09Hm50c5J-OiMwgsoxZXWidCBgZc2gzhwz95MdHJUy4,22664
 kerykeion/aspects/aspects_utils.py,sha256=mOj2AqVGnY2vsGsezPfxI_crPJsN54p8qjpmCk5iupM,3093
-kerykeion/aspects/natal_aspects_factory.py,sha256=If-XV1_QLpQPKjka_dJjMOqhAyAIi7icwxhhOEhwzm4,9318
-kerykeion/aspects/synastry_aspects_factory.py,sha256=NpOn-h6nqKbkVpDucn8i-3lW_tqNZyUOQGNXCJ36ULU,12690
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
 kerykeion/charts/charts_utils.py,sha256=_z-lA7ibIQ5vhr1NxpzJFyPmMp-Sh1iyYxuO56DDO4w,62922
 kerykeion/charts/draw_planets.py,sha256=6S0sCAktZJa7eckb-h1voYbe0H27vL9otcJzA0dqFH0,28167
-kerykeion/charts/kerykeion_chart_svg.py,sha256=ILsSV8QDEgtraYIn60ZQVOYeNptX5IarbzZwwEitVc4,97414
+kerykeion/charts/kerykeion_chart_svg.py,sha256=pNSmGZYtFGSx17EKcdSSYunP_oKy3xLSiq_CmbGz8Fs,97285
 kerykeion/charts/templates/aspect_grid_only.xml,sha256=lBHBj5bS5klGnv7QMuFxQjhlE6VZRaOgW93akLgRjX4,70055
 kerykeion/charts/templates/chart.xml,sha256=r3a_csMqcoqeOnDA3YCD-iUxdqgRw5GV1GOf1Cp0e_E,79940
 kerykeion/charts/templates/wheel_only.xml,sha256=X2-bwmEvQnZcM5Om7JXIWZSoSmFLAm4sY31heSq5u1k,71388
@@ -25,14 +24,14 @@ kerykeion/charts/themes/dark.css,sha256=XVspznDRNMXsFzk7hY7IB7AI58alPAV_-CgV3gCK
 kerykeion/charts/themes/light.css,sha256=5eyUzhVlRjG6lPHKnprLum0HuRtPIJhMBzpGfzoTjnQ,7590
 kerykeion/charts/themes/strawberry.css,sha256=UtcfRsCT-M9OZs_SoclWGZ0jDJiWvQjHTeI4M1jf7pQ,8314
 kerykeion/house_comparison/__init__.py,sha256=6FYHyQY3nUJifZ2kEVCHB8cN3TjFA1q2yhmeRwJlias,238
-kerykeion/house_comparison/house_comparison_factory.py,sha256=Vn4_Hviy20_nsSf_vjEKZ9h-QsJDFtapM1Wydvwgx4w,3345
-kerykeion/house_comparison/house_comparison_models.py,sha256=R9EW5F3fiIKIm8qrwTxtXhNOGDpf1-Lh9hbM1uK83oE,1549
-kerykeion/house_comparison/house_comparison_utils.py,sha256=Q5pdP7hmUEB3cqE7QkOYNu_laQ1Nj83Fmn_F8YJkKik,3773
+kerykeion/house_comparison/house_comparison_factory.py,sha256=0C48isz_yb6Pz9EQoQjEzmmhqY-3fh4MGW7sTnW-IUA,4613
+kerykeion/house_comparison/house_comparison_models.py,sha256=RPzJeCFiq0GioWI6IONJEUqsK9I_Dksp5mOHNY-j1PI,2865
+kerykeion/house_comparison/house_comparison_utils.py,sha256=JzWAAtBbKO1bDBRMh-D8hWROyvFo4z2pfmc6NMIN2RU,5167
 kerykeion/kr_types/__init__.py,sha256=dePcQY5rrgtUENhqnjcVx6j7iQJPo_1rmD0bLeIO3HA,1384
 kerykeion/kr_types/chart_types.py,sha256=ofMYk7NRalSsdQcLVkpCbOb-dhdjYHEqIb_WPLtD0rM,2429
 kerykeion/kr_types/kerykeion_exception.py,sha256=vTYdwj_mL-Q-MqHJvEzzBXxQ5YI2kAwUC6ImoWxMKXc,454
 kerykeion/kr_types/kr_literals.py,sha256=4kJhzm_0LERiJEJks0KgDyThueMZj_F1OK2Far5SMZc,4870
-kerykeion/kr_types/kr_models.py,sha256=cwpmP5CMM8Bi8aYfST6tVivFe3VuZh9S4jLoDWBAWM8,13601
+kerykeion/kr_types/kr_models.py,sha256=5wG3bh7EvCD0FTYe-W2e8jNLK408f3JQQhda6DVrOnw,14180
 kerykeion/kr_types/settings_models.py,sha256=Llosnvw-6NHJMbdKltPHQDLR-Ltn7ZpWkjEbLJ2C6AY,17488
 kerykeion/settings/__init__.py,sha256=NYCwcvEfn9qJ498fv1H_Gix8e-crJ3CruV13A-e2CnI,134
 kerykeion/settings/config_constants.py,sha256=hxDZnFKWFhGrYMejDISbYT-phUk1Qqfvt-4wBG79rGA,2233
@@ -44,7 +43,8 @@ kerykeion/settings/legacy/legacy_chart_aspects_settings.py,sha256=tO4tgPgPP07_wu
 kerykeion/settings/legacy/legacy_color_settings.py,sha256=gBUmGSNvvLzRYbdVtzwTDnMwWoh4tOCyT_9Q6aQRv_s,2620
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
-kerykeion-5.0.0a11.dist-info/METADATA,sha256=bIW3d40hSJyDoA0KIacZoCko2_kd6TjNGvZ_DG82vPU,25544
-kerykeion-5.0.0a11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kerykeion-5.0.0a11.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-5.0.0a11.dist-info/RECORD,,
+kerykeion/sweph/sefstars.txt,sha256=GLDcr75bckB3PauiwDijJfWz_EFj9h4Kf06Sq9T1F8Y,136618
+kerykeion-5.0.0a12.dist-info/METADATA,sha256=uglXk2FOHWcHfjDYwJBPu-32jDEVQiC_OxRb4TP7tQE,26756
+kerykeion-5.0.0a12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kerykeion-5.0.0a12.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.0.0a12.dist-info/RECORD,,

kerykeion/aspects/natal_aspects_factory.py

@@ -1,235 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    This is part of Kerykeion (C) 2025 Giacomo Battaglia
-"""
-
-import logging
-from typing import Union, List, Optional
-
-from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
-from kerykeion.aspects.aspects_utils import get_aspect_from_two_points, get_active_points_list
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect, CompositeSubjectModel, PlanetReturnModel, NatalAspectsModel
-from kerykeion.kr_types.kr_literals import AstrologicalPoint
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_ASPECTS, DEFAULT_AXIS_ORBIT
-from kerykeion.settings.legacy.legacy_celestial_points_settings import DEFAULT_CELESTIAL_POINTS_SETTINGS
-from kerykeion.settings.legacy.legacy_chart_aspects_settings import DEFAULT_CHART_ASPECTS_SETTINGS
-from kerykeion.utilities import find_common_active_points
-
-# Axes constants for orb filtering
-AXES_LIST = [
-    "Ascendant",
-    "Medium_Coeli",
-    "Descendant",
-    "Imum_Coeli",
-]
-
-
-class NatalAspectsFactory:
-    """
-    Factory class for creating natal aspects analysis.
-
-    This factory calculates all aspects in a birth chart and provides both
-    comprehensive and filtered aspect lists based on orb settings and relevance.
-    """
-
-    @staticmethod
-    def from_subject(
-        user: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        *,
-        active_points: Optional[List[AstrologicalPoint]] = None,
-        active_aspects: Optional[List[ActiveAspect]] = None,
-    ) -> NatalAspectsModel:
-        """
-        Create natal aspects analysis from an existing astrological subject.
-
-        Args:
-            user: The astrological subject for aspect calculation
-
-        Kwargs:
-            active_points: List of points to include in calculations
-            active_aspects: List of aspects with their orb settings
-
-        Returns:
-            NatalAspectsModel containing all calculated aspects data
-        """
-        # Initialize settings and configurations
-        celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
-        aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
-        axes_orbit_settings = DEFAULT_AXIS_ORBIT
-
-        # Set active aspects with default fallback
-        active_aspects_resolved = active_aspects if active_aspects is not None else DEFAULT_ACTIVE_ASPECTS
-
-        # Determine active points to use
-        if active_points is None:
-            active_points_resolved = user.active_points
-        else:
-            active_points_resolved = find_common_active_points(
-                user.active_points,
-                active_points,
-            )
-
-        return NatalAspectsFactory._create_natal_aspects_model(
-            user, active_points_resolved, active_aspects_resolved,
-            aspects_settings, axes_orbit_settings, celestial_points
-        )
-
-    @staticmethod
-    def _create_natal_aspects_model(
-        user: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        active_points_resolved: List[AstrologicalPoint],
-        active_aspects_resolved: List[ActiveAspect],
-        aspects_settings: List[dict],
-        axes_orbit_settings: float,
-        celestial_points: List[dict]
-    ) -> NatalAspectsModel:
-        """
-        Create the complete natal aspects model with all calculations.
-
-        Returns:
-            NatalAspectsModel containing all aspects data
-        """
-        all_aspects = NatalAspectsFactory._calculate_all_aspects(
-            user, active_points_resolved, active_aspects_resolved, aspects_settings, celestial_points
-        )
-        relevant_aspects = NatalAspectsFactory._filter_relevant_aspects(all_aspects, axes_orbit_settings)
-
-        return NatalAspectsModel(
-            subject=user,
-            all_aspects=all_aspects,
-            relevant_aspects=relevant_aspects,
-            active_points=active_points_resolved,
-            active_aspects=active_aspects_resolved,
-        )
-
-    @staticmethod
-    def _calculate_all_aspects(
-        user: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        active_points: List[AstrologicalPoint],
-        active_aspects: List[ActiveAspect],
-        aspects_settings: List[dict],
-        celestial_points: List[dict]
-    ) -> List[AspectModel]:
-        """
-        Calculate all aspects between active points in the natal chart.
-
-        This method handles all aspect calculations including settings updates,
-        opposite pair filtering, and planet ID resolution in a single comprehensive method.
-
-        Returns:
-            List of all calculated AspectModel instances
-        """
-        active_points_list = get_active_points_list(user, active_points)
-
-        # Update aspects settings with active aspects orbs
-        filtered_settings = []
-        for aspect_setting in aspects_settings:
-            for active_aspect in active_aspects:
-                if aspect_setting["name"] == active_aspect["name"]:
-                    aspect_setting = aspect_setting.copy()  # Don't modify original
-                    aspect_setting["orb"] = active_aspect["orb"]
-                    filtered_settings.append(aspect_setting)
-                    break
-
-        # Define opposite pairs that should be skipped
-        opposite_pairs = {
-            ("Ascendant", "Descendant"),
-            ("Descendant", "Ascendant"),
-            ("Medium_Coeli", "Imum_Coeli"),
-            ("Imum_Coeli", "Medium_Coeli"),
-            ("True_Node", "True_South_Node"),
-            ("Mean_Node", "Mean_South_Node"),
-            ("True_South_Node", "True_Node"),
-            ("Mean_South_Node", "Mean_Node"),
-        }
-
-        all_aspects_list = []
-
-        for first in range(len(active_points_list)):
-            # Generate aspects list without repetitions
-            for second in range(first + 1, len(active_points_list)):
-                # Skip predefined opposite pairs (AC/DC, MC/IC, North/South nodes)
-                first_name = active_points_list[first]["name"]
-                second_name = active_points_list[second]["name"]
-
-                if (first_name, second_name) in opposite_pairs:
-                    continue
-
-                aspect = get_aspect_from_two_points(
-                    filtered_settings,
-                    active_points_list[first]["abs_pos"],
-                    active_points_list[second]["abs_pos"]
-                )
-
-                if aspect["verdict"]:
-                    # Get planet IDs directly from celestial points settings
-                    first_planet_id = 0
-                    second_planet_id = 0
-
-                    for planet in celestial_points:
-                        if planet["name"] == first_name:
-                            first_planet_id = planet["id"]
-                        if planet["name"] == second_name:
-                            second_planet_id = planet["id"]
-
-                    aspect_model = AspectModel(
-                        p1_name=first_name,
-                        p1_owner=user.name,
-                        p1_abs_pos=active_points_list[first]["abs_pos"],
-                        p2_name=second_name,
-                        p2_owner=user.name,
-                        p2_abs_pos=active_points_list[second]["abs_pos"],
-                        aspect=aspect["name"],
-                        orbit=aspect["orbit"],
-                        aspect_degrees=aspect["aspect_degrees"],
-                        diff=aspect["diff"],
-                        p1=first_planet_id,
-                        p2=second_planet_id,
-                    )
-                    all_aspects_list.append(aspect_model)
-
-        return all_aspects_list
-
-    @staticmethod
-    def _filter_relevant_aspects(all_aspects: List[AspectModel], axes_orbit_settings: float) -> List[AspectModel]:
-        """
-        Filter aspects based on orb thresholds for axes and other comprehensive criteria.
-
-        This method consolidates all filtering logic including axes checks and orb thresholds
-        into a single comprehensive filtering method.
-
-        Args:
-            all_aspects: Complete list of calculated aspects
-            axes_orbit_settings: Orb threshold for axes aspects
-
-        Returns:
-            Filtered list of relevant aspects
-        """
-        logging.debug("Calculating relevant aspects by filtering orbs...")
-
-        relevant_aspects = []
-
-        for aspect in all_aspects:
-            # Check if aspect involves any of the chart axes and apply stricter orb limits
-            aspect_involves_axes = (aspect.p1_name in AXES_LIST or aspect.p2_name in AXES_LIST)
-
-            if aspect_involves_axes and abs(aspect.orbit) >= axes_orbit_settings:
-                continue
-
-            relevant_aspects.append(aspect)
-
-        return relevant_aspects
-
-
-if __name__ == "__main__":
-    from kerykeion.utilities import setup_logging
-
-    setup_logging(level="debug")
-
-    # Create subject using AstrologicalSubjectFactory
-    johnny = AstrologicalSubjectFactory.from_birth_data("Johnny Depp", 1963, 6, 9, 0, 0, city="Owensboro", nation="US")
-
-    # Create aspects analysis from subject
-    natal_aspects = NatalAspectsFactory.from_subject(johnny)
-    print(f"All aspects count: {len(natal_aspects.all_aspects)}")
-    print(f"Relevant aspects count: {len(natal_aspects.relevant_aspects)}")