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

kerykeion/utilities.py

@@ -1,3 +1,9 @@
+"""
+Author: Giacomo Battaglia
+Copyright: (C) 2025 Kerykeion Project
+License: AGPL-3.0
+"""
+
 from kerykeion.kr_types import (
     KerykeionPointModel,
     KerykeionException,
@@ -15,11 +21,22 @@ import re
 from datetime import datetime
 
 if TYPE_CHECKING:
-    from kerykeion import AstrologicalSubjectFactory
+    pass
 
 
 def get_number_from_name(name: AstrologicalPoint) -> int:
-    """Utility function, gets planet id from the name."""
+    """
+    Convert an astrological point name to its corresponding numerical identifier.
+
+    Args:
+        name: The name of the astrological point
+
+    Returns:
+        The numerical identifier used in Swiss Ephemeris calculations
+
+    Raises:
+        KerykeionException: If the name is not recognized
+    """
 
     if name == "Sun":
         return 0
@@ -70,18 +87,18 @@ def get_kerykeion_point_from_degree(
     degree: Union[int, float], name: Union[AstrologicalPoint, Houses], point_type: PointType
 ) -> KerykeionPointModel:
     """
-    Returns a KerykeionPointModel object based on the given degree.
+    Create a KerykeionPointModel from a degree position.
 
     Args:
-        degree (Union[int, float]): The degree of the celestial point.
-        name (str): The name of the celestial point.
-        point_type (PointType): The type of the celestial point.
-
-    Raises:
-        KerykeionException: If the degree is not within the valid range (0-360).
+        degree: The degree position (0-360, negative values are converted to positive)
+        name: The name of the celestial point or house
+        point_type: The type classification of the point
 
     Returns:
-        KerykeionPointModel: The model representing the celestial point.
+        A KerykeionPointModel with calculated zodiac sign, position, and properties
+
+    Raises:
+        KerykeionException: If the degree is >= 360 after normalization
     """
     # If - single degree is given, convert it to a positive degree
     if degree < 0:
@@ -124,10 +141,10 @@ def get_kerykeion_point_from_degree(
 
 def setup_logging(level: str) -> None:
     """
-    Setup logging for testing.
+    Configure logging for the application.
 
     Args:
-        level: Log level as a string, options: debug, info, warning, error
+        level: Log level as string (debug, info, warning, error, critical)
     """
     logging_options: dict[str, int] = {
         "debug": logging.DEBUG,
@@ -145,18 +162,23 @@ def is_point_between(
     start_point: Union[int, float], end_point: Union[int, float], evaluated_point: Union[int, float]
 ) -> bool:
     """
-    Determines if a point is between two others on a circle, with additional rules:
-    - If evaluated_point == start_point, it is considered between.
-    - If evaluated_point == end_point, it is NOT considered between.
-    - The range between start_point and end_point must not exceed 180°.
+    Determine if a point lies between two other points on a circle.
+
+    Special rules:
+    - If evaluated_point equals start_point, returns True
+    - If evaluated_point equals end_point, returns False
+    - The arc between start_point and end_point must not exceed 180°
 
     Args:
-        - start_point: The first point on the circle.
-        - end_point: The second point on the circle.
-        - evaluated_point: The point to check.
+        start_point: The starting point on the circle
+        end_point: The ending point on the circle
+        evaluated_point: The point to evaluate
 
     Returns:
-        - True if evaluated_point is between start_point and end_point, False otherwise.
+        True if evaluated_point is between start_point and end_point, False otherwise
+
+    Raises:
+        KerykeionException: If the angular difference exceeds 180°
     """
 
     # Normalize angles to [0, 360)
@@ -193,17 +215,17 @@ def is_point_between(
 
 def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut_list: list) -> Houses:
     """
-    Determines the house in which a planet is located based on its position in degrees.
+    Determine which house contains a planet based on its degree position.
 
     Args:
-        planet_position_degree (Union[int, float]): The position of the planet in degrees.
-        houses_degree_ut_list (list): A list of the houses in degrees (0-360).
+        planet_position_degree: The planet's position in degrees (0-360)
+        houses_degree_ut_list: List of house cusp degrees
 
     Returns:
-        str: The house in which the planet is located.
+        The house name containing the planet
 
     Raises:
-        ValueError: If the planet's position does not fall within any house range.
+        ValueError: If the planet's position doesn't fall within any house range
     """
 
     house_names = get_args(Houses)
@@ -222,13 +244,16 @@ def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut
 
 def get_moon_emoji_from_phase_int(phase: int) -> LunarPhaseEmoji:
     """
-    Returns the emoji of the moon phase.
+    Get the emoji representation of a lunar phase.
 
     Args:
-        - phase: The phase of the moon (0-28)
+        phase: The lunar phase number (0-28)
 
     Returns:
-        - The emoji of the moon phase
+        The corresponding emoji for the lunar phase
+
+    Raises:
+        KerykeionException: If phase is outside valid range
     """
 
     lunar_phase_emojis = get_args(LunarPhaseEmoji)
@@ -258,13 +283,16 @@ def get_moon_emoji_from_phase_int(phase: int) -> LunarPhaseEmoji:
 
 def get_moon_phase_name_from_phase_int(phase: int) -> LunarPhaseName:
     """
-    Returns the name of the moon phase.
+    Get the name of a lunar phase from its numerical value.
 
     Args:
-        - phase: The phase of the moon (0-28)
+        phase: The lunar phase number (0-28)
 
     Returns:
-        - The name of the moon phase
+        The corresponding name for the lunar phase
+
+    Raises:
+        KerykeionException: If phase is outside valid range
     """
     lunar_phase_names = get_args(LunarPhaseName)
 
@@ -293,8 +321,15 @@ def get_moon_phase_name_from_phase_int(phase: int) -> LunarPhaseName:
 
 def check_and_adjust_polar_latitude(latitude: float) -> float:
     """
-    Utility function to check if the location is in the polar circle.
-    If it is, it sets the latitude to 66 or -66 degrees.
+    Adjust latitude values for polar regions to prevent calculation errors.
+
+    Latitudes beyond ±66° are clamped to ±66° for house calculations.
+
+    Args:
+        latitude: The original latitude value
+
+    Returns:
+        The adjusted latitude value, clamped between -66° and 66°
     """
     if latitude > 66.0:
         latitude = 66.0
@@ -311,7 +346,13 @@ def get_houses_list(
     subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel]
 ) -> list[KerykeionPointModel]:
     """
-    Return the names of the houses in the order of the houses.
+    Get a list of house objects in order from the subject.
+
+    Args:
+        subject: The astrological subject containing house data
+
+    Returns:
+        List of KerykeionPointModel objects representing the houses
     """
     houses_absolute_position_list = []
     for house in subject.houses_names_list:
@@ -324,8 +365,13 @@ def get_available_astrological_points_list(
     subject: AstrologicalSubjectModel
 ) -> list[KerykeionPointModel]:
     """
-    Return the names of the planets in the order of the planets.
-    The names can be used to access the planets from the AstrologicalSubject object with the __getitem__ method or the [] operator.
+    Get a list of active astrological point objects from the subject.
+
+    Args:
+        subject: The astrological subject containing point data
+
+    Returns:
+        List of KerykeionPointModel objects for all active points
     """
     planets_absolute_position_list = []
     for planet in subject.active_points:
@@ -336,17 +382,17 @@ def get_available_astrological_points_list(
 
 def circular_mean(first_position: Union[int, float], second_position: Union[int, float]) -> float:
     """
-    Computes the circular mean of two astrological positions (e.g., house cusps, planets).
+    Calculate the circular mean of two angular positions.
 
-    This function ensures that positions crossing 0° Aries (360°) are correctly averaged,
-    avoiding errors that occur with simple linear means.
+    This method correctly handles positions that cross the 0°/360° boundary,
+    avoiding errors that occur with simple arithmetic means.
 
     Args:
-        position1 (Union[int, float]): First position in degrees (0-360).
-        position2 (Union[int, float]): Second position in degrees (0-360).
+        first_position: First angular position in degrees (0-360)
+        second_position: Second angular position in degrees (0-360)
 
     Returns:
-        float: The circular mean position in degrees (0-360).
+        The circular mean position in degrees (0-360)
     """
     x = (math.cos(math.radians(first_position)) + math.cos(math.radians(second_position))) / 2
     y = (math.sin(math.radians(first_position)) + math.sin(math.radians(second_position))) / 2
@@ -361,14 +407,14 @@ def circular_mean(first_position: Union[int, float], second_position: Union[int,
 
 def calculate_moon_phase(moon_abs_pos: float, sun_abs_pos: float) -> LunarPhaseModel:
     """
-    Calculate the lunar phase based on the positions of the moon and sun.
+    Calculate lunar phase information from Sun and Moon positions.
 
     Args:
-    - moon_abs_pos (float): The absolute position of the moon.
-    - sun_abs_pos (float): The absolute position of the sun.
+        moon_abs_pos: Absolute position of the Moon in degrees
+        sun_abs_pos: Absolute position of the Sun in degrees
 
     Returns:
-    - dict: A dictionary containing the lunar phase information.
+        LunarPhaseModel containing phase data, emoji, and name
     """
     # Initialize moon_phase and sun_phase to None in case of an error
     moon_phase, sun_phase = None, None
@@ -408,14 +454,13 @@ def calculate_moon_phase(moon_abs_pos: float, sun_abs_pos: float) -> LunarPhaseM
 
 def circular_sort(degrees: list[Union[int, float]]) -> list[Union[int, float]]:
     """
-    Sort a list of degrees in a circular manner, starting from the first element
-    and progressing clockwise around the circle.
+    Sort degrees in circular clockwise progression starting from the first element.
 
     Args:
-        degrees: A list of numeric values representing degrees
+        degrees: List of numeric degree values
 
     Returns:
-        A list sorted based on circular clockwise progression from the first element
+        List sorted by clockwise distance from the first element
 
     Raises:
         ValueError: If the list is empty or contains non-numeric values
@@ -458,14 +503,16 @@ def circular_sort(degrees: list[Union[int, float]]) -> list[Union[int, float]]:
 
 def inline_css_variables_in_svg(svg_content: str) -> str:
     """
-    Process an SVG string to inline all CSS custom properties.
+    Replace CSS custom properties (variables) with their values in SVG content.
+
+    Extracts CSS variables from style blocks, replaces var() references with actual values,
+    and removes all style blocks from the SVG.
 
     Args:
-        svg_content (str): The original SVG string with CSS variables
+        svg_content: The original SVG string with CSS variables
 
     Returns:
-        str: The modified SVG with all CSS variables replaced by their values
-             and all style blocks removed
+        Modified SVG with CSS variables inlined and style blocks removed
     """
     # Find and extract CSS custom properties from style tags
     css_variable_map = {}
@@ -486,6 +533,15 @@ def inline_css_variables_in_svg(svg_content: str) -> str:
 
     # Function to replace var() references with their actual values
     def replace_css_variable_reference(match):
+        """
+        Replace CSS variable references with their actual values.
+
+        Args:
+            match: Regular expression match object containing variable name and optional fallback.
+
+        Returns:
+            str: The resolved CSS variable value or fallback value.
+        """
         variable_name = match.group(1).strip()
         fallback_value = match.group(2) if match.group(2) else None
 
@@ -510,13 +566,13 @@ def inline_css_variables_in_svg(svg_content: str) -> str:
 
 def datetime_to_julian(dt: datetime) -> float:
     """
-    Converts a Python datetime object to Julian day.
+    Convert a Python datetime object to Julian Day Number.
 
     Args:
-        dt: A datetime object
+        dt: The datetime object to convert
 
     Returns:
-        float: The corresponding Julian day (JD)
+        The corresponding Julian Day Number (JD) as a float
     """
     # Extract year, month and day
     year = dt.year
@@ -548,13 +604,13 @@ def datetime_to_julian(dt: datetime) -> float:
 
 def julian_to_datetime(jd):
     """
-    Converts a Julian day to a Python datetime object.
+    Convert a Julian Day Number to a Python datetime object.
 
     Args:
-        jd: Julian day number (float)
+        jd: Julian Day Number as a float
 
     Returns:
-        datetime: The corresponding datetime object
+        The corresponding datetime object
     """
     # Add 0.5 to the Julian day to adjust for noon-based Julian day
     jd_plus = jd + 0.5
@@ -613,13 +669,16 @@ def julian_to_datetime(jd):
 
 def get_house_name(house_number: int) -> Houses:
     """
-    Returns the name of the house based on its number.
+    Convert a house number to its corresponding house name.
 
     Args:
         house_number: House number (1-12)
 
     Returns:
-        Name of the house
+        The house name
+
+    Raises:
+        ValueError: If house_number is not in range 1-12
     """
     house_names: dict[int, Houses] = {
         1: "First_House",
@@ -645,13 +704,16 @@ def get_house_name(house_number: int) -> Houses:
 
 def get_house_number(house_name: Houses) -> int:
     """
-    Returns the number of the house based on its name.
+    Convert a house name to its corresponding house number.
 
     Args:
-        house_name: Name of the house
+        house_name: The house name
 
     Returns:
         House number (1-12)
+
+    Raises:
+        ValueError: If house_name is not recognized
     """
     house_numbers: dict[Houses, int] = {
         "First_House": 1,
@@ -677,14 +739,14 @@ def get_house_number(house_name: Houses) -> int:
 
 def find_common_active_points(first_points: list[AstrologicalPoint], second_points: list[AstrologicalPoint]) -> list[AstrologicalPoint]:
     """
-    Find only the elements that are present in both lists.
+    Find astrological points that appear in both input lists.
 
     Args:
-        first_points: List of astrological points
-        second_points: List of astrological points
+        first_points: First list of astrological points
+        second_points: Second list of astrological points
 
     Returns:
-        List of elements common to both lists (without duplicates, order not guaranteed).
+        List of points common to both input lists (without duplicates)
     """
     common_points = list(set(first_points) & set(second_points))
 

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

@@ -1,23 +1,28 @@
 Metadata-Version: 2.4
 Name: kerykeion
-Version: 5.0.0a9
-Summary: A python library for astrology.
+Version: 5.0.0a11
+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
 Author-email: Giacomo Battaglia <kerykeion.astrology@gmail.com>
 License: AGPL-3.0
 License-File: LICENSE
-Keywords: astrology,astrology library,astrology-calculator,astronomical-algorithms,birtchart,ephemeris,svg,synastry,zodiac,zodiac-sing
+Keywords: astrology,astrology calculations,astrology calculator,astrology library,astrology transits,astronomical algorithms,birth chart,ephemeris,houses of astrology,natal chart,planetary aspects,svg charts,synastry,zodiac,zodiac signs
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Religion
 Classifier: Topic :: Scientific/Engineering :: Astronomy
+Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

kerykeion-5.0.0a11.dist-info/RECORD

@@ -0,0 +1,50 @@
+kerykeion/__init__.py,sha256=0nw7gz0b1fGUvRlNfIMOGognUd9y6cP1hXxHN2LQ_nM,1338
+kerykeion/astrological_subject_factory.py,sha256=xyWbrThNuUnjKVrglJKCNdiKlnDmJU8GiRRu8QlIlL8,83659
+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/report.py,sha256=dUtI70wUjOouqNE1pf0ZYFY4qme9pR7WQRbs_ExEkjM,3029
+kerykeion/transits_time_range_factory.py,sha256=n25xQeqiKGYGhBvxUJKT6Dxc7L7lw46TGBy3L8RSb_g,13419
+kerykeion/utilities.py,sha256=MtVyZ2dbHrJPuDoPKPrkx0MrB83fxcbGtPx87piHCtQ,23471
+kerykeion/aspects/__init__.py,sha256=i1hg04VL15s-LVGOHuTWJsicv_HNwT3b2v6_-16s6A4,394
+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/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
+kerykeion/charts/themes/classic.css,sha256=LYYYWQHNG7-vuPCq8F2EPl3LauWXVrY3Q_tpwM0klgo,4660
+kerykeion/charts/themes/dark-high-contrast.css,sha256=YW5X5-M0dz5Vy2oz-JyDNXJYHSmV83lYCodydC-KS1A,7506
+kerykeion/charts/themes/dark.css,sha256=XVspznDRNMXsFzk7hY7IB7AI58alPAV_-CgV3gCKyzg,7581
+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/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/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
+kerykeion/settings/kerykeion_settings.py,sha256=umd8TZy-8ywowsd4TTkhwxSLLyX3xYj3A1zvNsTV_Y8,2955
+kerykeion/settings/kr.config.json,sha256=bvvhi8W-u9YHTbg9O8UyfOwclhLd8Mh8oobI1qHIgp4,58497
+kerykeion/settings/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kerykeion/settings/legacy/legacy_celestial_points_settings.py,sha256=YMvHhY8IQ_nNHf1-9JCSgRzTMQJaxXZfROztEhlP4Ac,6870
+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-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/aspects/natal_aspects.py

@@ -1,181 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    This is part of Kerykeion (C) 2025 Giacomo Battaglia
-"""
-
-import logging
-from dataclasses import dataclass, field
-from functools import cached_property
-from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
-from kerykeion.settings.kerykeion_settings import get_settings
-from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points, get_active_points_list
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel, ActiveAspect, CompositeSubjectModel, PlanetReturnModel
-from kerykeion.kr_types.kr_literals import AstrologicalPoint
-from kerykeion.kr_types.settings_models import KerykeionSettingsModel
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, 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
-from pathlib import Path
-from typing import Union, List, Optional
-
-
-AXES_LIST = [
-    "Ascendant",
-    "Medium_Coeli",
-    "Descendant",
-    "Imum_Coeli",
-]
-
-
-@dataclass
-class NatalAspects:
-    """
-    Generates an object with all the aspects of a birthcart.
-    """
-
-    user: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel]
-    new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
-    active_points: Optional[List[AstrologicalPoint]] = field(default_factory=lambda: None)
-    active_aspects: List[ActiveAspect] = field(default_factory=lambda: DEFAULT_ACTIVE_ASPECTS)
-
-    def __post_init__(self):
-        self.settings = get_settings(self.new_settings_file)
-
-        self.celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
-        self.aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
-        self.axes_orbit_settings =  DEFAULT_AXIS_ORBIT
-
-        if not self.active_points:
-            self.active_points = self.user.active_points
-        else:
-            self.active_points = find_common_active_points(
-                self.user.active_points,
-                self.active_points,
-            )
-
-
-    @cached_property
-    def all_aspects(self):
-        """
-        Return all the aspects of the points in the natal chart in a dictionary,
-        first all the individual aspects of each planet, second the aspects
-        without repetitions.
-        """
-
-        active_points_list = get_active_points_list(self.user, self.active_points)
-
-        # ---> TODO: Clean this up
-        filtered_settings = []
-        for a in self.aspects_settings:
-            for aspect in self.active_aspects:
-                if a["name"] == aspect["name"]:
-                    a["orb"] = aspect["orb"]  # Assign the aspect's orb
-                    filtered_settings.append(a)
-                    break  # Exit the inner loop once a match is found
-        self.aspects_settings = filtered_settings
-        # <--- TODO: Clean this up
-
-        self.all_aspects_list = []
-        for first in range(len(active_points_list)):
-            # Generates the aspects list without repetitions
-            for second in range(first + 1, len(active_points_list)):
-                # AC/DC, MC/IC and North/South nodes are always in opposition
-                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"),
-                }
-                if (active_points_list[first]["name"], active_points_list[second]["name"]) in opposite_pairs:
-                    continue
-
-                aspect = get_aspect_from_two_points(
-                    self.aspects_settings,
-                    active_points_list[first]["abs_pos"],
-                    active_points_list[second]["abs_pos"]
-                )
-
-                verdict = aspect["verdict"]
-                name = aspect["name"]
-                orbit = aspect["orbit"]
-                aspect_degrees = aspect["aspect_degrees"]
-                diff = aspect["diff"]
-
-                if verdict == True:
-                    aspect_model = AspectModel(
-                        p1_name=active_points_list[first]["name"],
-                        p1_owner=self.user.name,
-                        p1_abs_pos=active_points_list[first]["abs_pos"],
-                        p2_name=active_points_list[second]["name"],
-                        p2_owner=self.user.name,
-                        p2_abs_pos=active_points_list[second]["abs_pos"],
-                        aspect=name,
-                        orbit=orbit,
-                        aspect_degrees=aspect_degrees,
-                        diff=diff,
-                        p1=planet_id_decoder(self.celestial_points, active_points_list[first]["name"]),
-                        p2=planet_id_decoder(self.celestial_points, active_points_list[second]["name"]),
-                    )
-                    self.all_aspects_list.append(aspect_model)
-
-        return self.all_aspects_list
-
-    @cached_property
-    def relevant_aspects(self):
-        """
-        Filters the aspects list with the desired points, in this case
-        the most important are hardcoded.
-        Set the list with set_points and creating a list with the names
-        or the numbers of the houses.
-        The relevant aspects are the ones that are set as looping in the available_aspects list.
-        """
-
-        logging.debug("Relevant aspects not already calculated, calculating now...")
-        self.all_aspects
-
-        axes_list = AXES_LIST
-        counter = 0
-
-        # Remove aspects where the orbits exceed the maximum orb thresholds specified in the settings
-        # (specified usually in kr.config.json file)
-        aspects_filtered = self.all_aspects
-        aspects_list_subtract = []
-        for a in aspects_filtered:
-            counter += 1
-            name_p1 = str(a["p1_name"])
-            name_p2 = str(a["p2_name"])
-
-            if name_p1 in axes_list:
-                if abs(a["orbit"]) >= self.axes_orbit_settings:
-                    aspects_list_subtract.append(a)
-
-            elif name_p2 in axes_list:
-                if abs(a["orbit"]) >= self.axes_orbit_settings:
-                    aspects_list_subtract.append(a)
-
-        self.aspects = [item for item in aspects_filtered if item not in aspects_list_subtract]
-
-        return self.aspects
-
-
-if __name__ == "__main__":
-    from kerykeion.utilities import setup_logging
-
-    setup_logging(level="debug")
-
-    johnny = AstrologicalSubjectFactory.from_birth_data("Johnny Depp", 1963, 6, 9, 0, 0, 0, "Owensboro", "US")
-
-    # All aspects as a list of dictionaries
-    aspects = NatalAspects(johnny)
-    #print([a.model_dump() for a in aspects.all_aspects])
-
-    print("\n")
-
-    # Relevant aspects as a list of dictionaries
-    aspects = NatalAspects(johnny)
-    print([a.model_dump() for a in aspects.relevant_aspects])