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

kerykeion-5.0.0b1.dist-info/RECORD

@@ -0,0 +1,58 @@
+kerykeion/__init__.py,sha256=gxAmthMletKqFDIFCSKNLKs5frs9JI2j9koiy2FIviE,1934
+kerykeion/astrological_subject_factory.py,sha256=KaNuPSgVOgAva9z83fTuCpvIfEm3hsJro-z_mFPU1Q4,94604
+kerykeion/backword.py,sha256=1meyJZXGy5eFKMQ0jiFDaUSkKCdzSHvew2Sy9cQ7AmE,29066
+kerykeion/chart_data_factory.py,sha256=5JI5GW9ZqFyKc4gs53TiGffQFaEVwGS8yY9dmEKpsy8,21055
+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=H05FHjW27r_hJeHWRhIBPvlmc264dMdOEibkgh__iU4,11098
+kerykeion/report.py,sha256=Bv8OOl-HG87pm7RM_SzhblTfvdc_n2C91PkJi7iHAXo,31513
+kerykeion/transits_time_range_factory.py,sha256=p76TxPTRlN9bzF1z_rroJVdpVpb52aM8Lp6jFScTCVg,13354
+kerykeion/utilities.py,sha256=LKljXx0HSjlT5pspvG4VIY1po_xG1dLGNNfEWg0G5Fs,24391
+kerykeion/aspects/__init__.py,sha256=csJmxvLdBu-bHuW676f3dpY__Qyc6LwRyrpWVTh3n1A,287
+kerykeion/aspects/aspects_factory.py,sha256=kli4YUhAQtnidD4icrmD6EeGnZ_jylDqOsXVkIMvQB4,23487
+kerykeion/aspects/aspects_utils.py,sha256=xIeu6cFsdX_Fbo_c2WPF4hga9YJLWGG5pwCqHX9Z4pU,5809
+kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
+kerykeion/charts/chart_drawer.py,sha256=igzRogHJ3arKSa0EXiXhI03LnGnWsHLuM-gO0sdCHj4,108083
+kerykeion/charts/charts_utils.py,sha256=4R2pAa47-TcM7eYxXGri98u5sPJhl6YmmgdQTUUXGi8,64847
+kerykeion/charts/draw_planets.py,sha256=tIj3FeLLomVSbCaZUxfw_qBEB3pxi4EIEhqaeTgTyTY,29061
+kerykeion/charts/templates/aspect_grid_only.xml,sha256=mSiSDnPmyysG7NzCQLhr1QxWafMNOGZ1R6_ABFaM7Jk,79706
+kerykeion/charts/templates/chart.xml,sha256=Cp8ZBOBrQAafk-H2_HHuxD3Cz7EZ4_l-DJ6_Y5oGAjk,84792
+kerykeion/charts/templates/wheel_only.xml,sha256=NjhkExEZTE_le7002k7ewcCS4FoQij6H07jb5D9HVac,81047
+kerykeion/charts/themes/classic.css,sha256=xvBiI4DtY5fMaA7ilxGl26VEDY1VzkOTWm1XOs9n-ec,5158
+kerykeion/charts/themes/dark-high-contrast.css,sha256=EbmK9sM_ksJ5Fx36cb91nSvSsqC6mzjkRXCpwNTHfCE,8260
+kerykeion/charts/themes/dark.css,sha256=gub44WABpHseNNaWu4lVmtvDthgrRCvEVaobcd-UrMY,8335
+kerykeion/charts/themes/light.css,sha256=WEX_uKPArTjignVwvuAHqqWIbNiCheQ9Y7MgK0HJjAM,8344
+kerykeion/charts/themes/strawberry.css,sha256=pFrST9xDRiej-YXh7P_snOr46DUcKjw--5d2MrlashY,9001
+kerykeion/house_comparison/__init__.py,sha256=dnSVpx_pKylYUeaTGxHsSlN15HqQS6eJHpDQOrIvrpY,107
+kerykeion/house_comparison/house_comparison_factory.py,sha256=YkA7itvkyIcKEf8Ffi53on-gGhsHi_Oeu9Gm4N9aHQs,4588
+kerykeion/house_comparison/house_comparison_utils.py,sha256=vzME6Aw5njCXu6BmPLuhgfEVDI00qfQI7MPH-YujO1g,5071
+kerykeion/schemas/__init__.py,sha256=CU1I1JanyY-0-Uq7oCHQT6wmmkOgfP0zZwHtCvF0W0g,2215
+kerykeion/schemas/chart_template_model.py,sha256=0JJ13jQ6UHvZPlg_6NH57GuL7Z0yXrd8VIWDBQvBnOE,8125
+kerykeion/schemas/kerykeion_exception.py,sha256=vTYdwj_mL-Q-MqHJvEzzBXxQ5YI2kAwUC6ImoWxMKXc,454
+kerykeion/schemas/kr_literals.py,sha256=_GrBO9s0lfNDAk4oE4pf7DF7HEgAGTgklvlAn0SePuo,5119
+kerykeion/schemas/kr_models.py,sha256=C8Xo4uPxMfCUbKOBopKrbI8bSZzWVXImYsOJEZIlBjQ,22159
+kerykeion/schemas/settings_models.py,sha256=NlOW9T7T5kD5Dzna1UOdb7XPQeQnzMOu0y4-ApERxPw,17619
+kerykeion/settings/__init__.py,sha256=NYCwcvEfn9qJ498fv1H_Gix8e-crJ3CruV13A-e2CnI,134
+kerykeion/settings/config_constants.py,sha256=mLpWtL46iXFp0pYDaVtKRBzGbl3rZKj3XxjIM88DYRQ,3790
+kerykeion/settings/kerykeion_settings.py,sha256=jesmjfeDU6t-aNyXmzqfMGHBEATk7tenWkQT8cox-FY,2954
+kerykeion/settings/kr.config.json,sha256=Ap_EE98RT957AXNmj2LWr1fmVMf9NO2_jCpAthHPmHs,62094
+kerykeion/settings/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kerykeion/settings/legacy/legacy_celestial_points_settings.py,sha256=RsGmX10cO1jw2W3IwK1OBnzzgaI3nUiFIYHeoYtjapw,6942
+kerykeion/settings/legacy/legacy_chart_aspects_settings.py,sha256=tO4tgPgPP07_wu9f8SXyJQ9WrTh3iWz4YvBS2axCGU8,1650
+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/sweph/sefstars.txt,sha256=GLDcr75bckB3PauiwDijJfWz_EFj9h4Kf06Sq9T1F8Y,136618
+kerykeion/sweph/ast136/s136108s.se1,sha256=eSDfBurMBVnawSnZZgwHUrwqeAZYlKPLH1NNtq0ep7I,19489
+kerykeion/sweph/ast136/s136199s.se1,sha256=eNBaQGxAmnqeAgE_C-cpsX4BTgPYR4_H9HRkI9QHMPA,14514
+kerykeion/sweph/ast136/s136472s.se1,sha256=TjBnDMtPWdBzbOHn9Mju5C2i-Kfg1dT7kQaeVuGOoi8,19454
+kerykeion/sweph/ast28/se28978s.se1,sha256=nU2Qp-ELc_tzFnRc1QT6uVueWXEipvhYDgfQRX1TAC4,16227
+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.0.0b1.dist-info/METADATA,sha256=RNXJbBmkMbDOdmp3tlKu2KPy_b0iYzlJ_t3g9ZGJnck,40219
+kerykeion-5.0.0b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kerykeion-5.0.0b1.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.0.0b1.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)}")

kerykeion/aspects/synastry_aspects_factory.py

@@ -1,275 +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, SynastryAspectsModel
-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.kr_types.kr_literals import AstrologicalPoint
-from kerykeion.utilities import find_common_active_points
-
-
-# Axes constants for orb filtering
-AXES_LIST = [
-    "Ascendant",
-    "Medium_Coeli",
-    "Descendant",
-    "Imum_Coeli",
-]
-
-
-class SynastryAspectsFactory:
-    """
-    Factory class for creating synastry aspects analysis between two astrological subjects.
-
-    This factory calculates all astrological aspects (angular relationships) between 
-    planets and points in two different charts. It's primarily used for relationship 
-    compatibility analysis, transit calculations, and comparative astrology.
-
-    The factory provides both comprehensive aspect lists and filtered relevant aspects
-    based on orb settings and chart axes considerations.
-
-    Key Features:
-        - Calculates all aspects between two subjects
-        - Filters aspects based on orb thresholds
-        - Applies stricter orb limits for chart axes (ASC, MC, DSC, IC)
-        - Supports multiple subject types (natal, composite, planetary returns)
-
-    Example:
-        >>> 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 = SynastryAspectsFactory.from_subjects(john, jane)
-        >>> print(f"Found {len(synastry.relevant_aspects)} relevant aspects")
-    """
-
-    @staticmethod
-    def from_subjects(
-        first_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        second_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        *,
-        active_points: Optional[List[AstrologicalPoint]] = None,
-        active_aspects: Optional[List[ActiveAspect]] = None,
-    ) -> SynastryAspectsModel:
-        """
-        Create synastry aspects analysis between two astrological subjects.
-
-        This method calculates all astrological aspects (angular relationships)
-        between planets and points in two different birth charts, commonly used
-        for relationship compatibility analysis.
-
-        Args:
-            first_subject: The first astrological subject (person, composite chart, or planetary return)
-            second_subject: The second astrological subject to compare with the first
-            active_points: Optional list of celestial points to include in calculations.
-                          If None, uses common points between both subjects.
-            active_aspects: Optional list of aspect types with their orb settings.
-                           If None, uses default aspect configuration.
-
-        Returns:
-            SynastryAspectsModel: Complete model containing all calculated aspects data,
-                                 including both comprehensive and filtered relevant aspects.
-
-        Example:
-            >>> 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 = SynastryAspectsFactory.from_subjects(john, jane)
-            >>> print(f"Found {len(synastry.relevant_aspects)} relevant aspects")
-        """
-        # 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 - find common points between both subjects
-        if active_points is None:
-            active_points_resolved = first_subject.active_points
-        else:
-            active_points_resolved = find_common_active_points(
-                first_subject.active_points,
-                active_points,
-            )
-
-        # Further filter with second subject's active points
-        active_points_resolved = find_common_active_points(
-            second_subject.active_points,
-            active_points_resolved,
-        )
-
-        return SynastryAspectsFactory._create_synastry_aspects_model(
-            first_subject, second_subject, active_points_resolved, active_aspects_resolved,
-            aspects_settings, axes_orbit_settings, celestial_points
-        )
-
-    @staticmethod
-    def _create_synastry_aspects_model(
-        first_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        second_subject: 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]
-    ) -> SynastryAspectsModel:
-        """
-        Create the complete synastry aspects model with all calculations.
-
-        Args:
-            first_subject: First astrological subject
-            second_subject: Second astrological subject  
-            active_points_resolved: Resolved list of active celestial points
-            active_aspects_resolved: Resolved list of active aspects with orbs
-            aspects_settings: Chart aspect configuration settings
-            axes_orbit_settings: Orb threshold for chart axes
-            celestial_points: Celestial points configuration
-
-        Returns:
-            SynastryAspectsModel: Complete model containing all aspects data
-        """
-        all_aspects = SynastryAspectsFactory._calculate_all_aspects(
-            first_subject, second_subject, active_points_resolved, active_aspects_resolved,
-            aspects_settings, celestial_points
-        )
-        relevant_aspects = SynastryAspectsFactory._filter_relevant_aspects(all_aspects, axes_orbit_settings)
-
-        return SynastryAspectsModel(
-            first_subject=first_subject,
-            second_subject=second_subject,
-            all_aspects=all_aspects,
-            relevant_aspects=relevant_aspects,
-            active_points=active_points_resolved,
-            active_aspects=active_aspects_resolved,
-        )
-
-    @staticmethod
-    def _calculate_all_aspects(
-        first_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        second_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
-        active_points: List[AstrologicalPoint],
-        active_aspects: List[ActiveAspect],
-        aspects_settings: List[dict],
-        celestial_points: List[dict]
-    ) -> List[AspectModel]:
-        """
-        Calculate all synastry aspects between two subjects.
-
-        This method performs comprehensive aspect calculations between all active points
-        of both subjects, applying the specified orb settings and creating detailed
-        aspect models with planet IDs and positional information.
-
-        Args:
-            first_subject: First astrological subject
-            second_subject: Second astrological subject
-            active_points: List of celestial points to include in calculations
-            active_aspects: List of aspect types with their orb settings
-            aspects_settings: Base aspect configuration settings
-            celestial_points: Celestial points configuration with IDs
-
-        Returns:
-            List[AspectModel]: Complete list of all calculated aspect instances
-        """
-        # Get active points lists for both subjects
-        first_active_points_list = get_active_points_list(first_subject, active_points)
-        second_active_points_list = get_active_points_list(second_subject, active_points)
-
-        # Create a lookup dictionary for planet IDs to optimize performance
-        planet_id_lookup = {planet["name"]: planet["id"] for planet in celestial_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
-
-        all_aspects_list = []
-        for first in range(len(first_active_points_list)):
-            # Generate aspects list between all points of first and second subjects
-            for second in range(len(second_active_points_list)):
-                aspect = get_aspect_from_two_points(
-                    filtered_settings,
-                    first_active_points_list[first]["abs_pos"],
-                    second_active_points_list[second]["abs_pos"],
-                )
-
-                if aspect["verdict"]:
-                    first_name = first_active_points_list[first]["name"]
-                    second_name = second_active_points_list[second]["name"]
-                    
-                    # Get planet IDs using lookup dictionary for better performance
-                    first_planet_id = planet_id_lookup.get(first_name, 0)
-                    second_planet_id = planet_id_lookup.get(second_name, 0)
-
-                    aspect_model = AspectModel(
-                        p1_name=first_name,
-                        p1_owner=first_subject.name,
-                        p1_abs_pos=first_active_points_list[first]["abs_pos"],
-                        p2_name=second_name,
-                        p2_owner=second_subject.name,
-                        p2_abs_pos=second_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 comprehensive criteria.
-
-        This method consolidates all filtering logic including axes checks and orb thresholds
-        for synastry aspects in 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 synastry 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")
-
-    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")
-
-    # Create synastry aspects analysis using the factory
-    synastry_aspects_model = SynastryAspectsFactory.from_subjects(john, yoko)
-    print(f"All synastry aspects: {len(synastry_aspects_model.all_aspects)}")
-    print(f"Relevant synastry aspects: {len(synastry_aspects_model.relevant_aspects)}")

kerykeion/house_comparison/house_comparison_models.py

@@ -1,38 +0,0 @@
-from kerykeion.kr_types import SubscriptableBaseModel
-from typing import Optional
-
-
-class PointInHouseModel(SubscriptableBaseModel):
-    """Represents a point from one chart positioned in a house from another chart"""
-
-    point_name: str
-    """Name of the celestial point"""
-    point_degree: float
-    """Degree of the celestial point"""
-    point_sign: str
-    """Sign of the celestial point"""
-    point_owner_name: str
-    """Name of the owner of the celestial point"""
-    point_owner_house_number: Optional[int]
-    """House number of the point of the owner of the celestial point"""
-    point_owner_house_name: Optional[str]
-    """House name of the point of the owner of the celestial point"""
-    projected_house_number: int
-    """Number of the house where the point is projected"""
-    projected_house_name: str
-    """Name of the house where the point is projected"""
-    projected_house_owner_name: str
-    """Name of the owner of the house where the point is projected"""
-
-
-class HouseComparisonModel(SubscriptableBaseModel):
-    """Pydantic model for comparing points in houses between two astrological subjects"""
-
-    first_subject_name: str
-    """Name of the first subject"""
-    second_subject_name: str
-    """Name of the second subject"""
-    first_points_in_second_houses: list[PointInHouseModel]
-    """List of points from the first subject in the houses of the second subject"""
-    second_points_in_first_houses: list[PointInHouseModel]
-    """List of points from the second subject in the houses of the first subject"""