kerykeion 5.0.0a8__py3-none-any.whl → 5.0.0a10__py3-none-any.whl

kerykeion/charts/draw_planets.py

@@ -88,7 +88,6 @@ def draw_planets(
     keys.sort()
     switch = 0
 
-    planets_degrouped = {}
     groups = []
     planets_by_pos = list(range(len(planets_degut)))
     planet_drange = 3.4
@@ -186,7 +185,7 @@ def draw_planets(
             # position relative to next planets
             else:
                 startA = (leftover / (xa + xb)) * xa
-                startB = (leftover / (xa + xb)) * xb
+                (leftover / (xa + xb)) * xb
 
             if available > need:
                 planets_delta[groups[a][0][0]] = startA - groups[a][0][1] + (1.5 * planet_drange)
@@ -265,7 +264,7 @@ def draw_planets(
 
         output += f'<g kr:node="ChartPoint" kr:house="{planet_details["house"]}" kr:sign="{planet_details["sign"]}" kr:slug="{planet_details["name"]}" transform="translate(-{12 * scale},-{12 * scale}) scale({scale})">'
         output += f'<use x="{planet_x * (1/scale)}" y="{planet_y * (1/scale)}" xlink:href="#{available_planets_setting[i]["name"]}" />'
-        output += f"</g>"
+        output += "</g>"
 
     # make transit degut and display planets
     if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "Return":
@@ -373,7 +372,7 @@ def draw_planets(
                 xo = -1
             deg_x = sliceToX(0, (radius - rtext), t_offset + xo) + rtext
             deg_y = sliceToY(0, (radius - rtext), t_offset + xo) + rtext
-            degree = int(t_offset)
+            int(t_offset)
             output += f'<g transform="translate({deg_x},{deg_y})">'
             output += f'<text transform="rotate({rotate})" text-anchor="{textanchor}'
             output += f'" style="fill: {available_planets_setting[i]["color"]}; font-size: 10px;">{convert_decimal_to_degree_string(t_points_deg[i], format_type="1")}'

kerykeion/charts/draw_planets_v2.py

@@ -50,15 +50,15 @@ def draw_planets_v2(
     # 1. Validate inputs and prepare data
     # -----------------------------------------------------------
     if chart_type == "Transit" and second_subject_available_kerykeion_celestial_points is None:
-        raise KerykeionException(f"Secondary celestial points are required for Transit charts")
+        raise KerykeionException("Secondary celestial points are required for Transit charts")
     elif chart_type == "Synastry" and second_subject_available_kerykeion_celestial_points is None:
-        raise KerykeionException(f"Secondary celestial points are required for Synastry charts")
+        raise KerykeionException("Secondary celestial points are required for Synastry charts")
     elif chart_type == "Return" and second_subject_available_kerykeion_celestial_points is None:
-        raise KerykeionException(f"Secondary celestial points are required for Return charts")
+        raise KerykeionException("Secondary celestial points are required for Return charts")
 
     # Extract absolute and relative positions for main celestial points
     main_points_abs_positions = [planet.abs_pos for planet in available_kerykeion_celestial_points]
-    main_points_rel_positions = [planet.position for planet in available_kerykeion_celestial_points]
+    [planet.position for planet in available_kerykeion_celestial_points]
 
     # Extract absolute and relative positions for secondary celestial points if needed
     secondary_points_abs_positions = []
@@ -87,7 +87,6 @@ def draw_planets_v2(
     # 3. Identify groups of celestial points that are close to each other
     # -----------------------------------------------------------
     point_groups = []
-    current_group = []
     is_group_open = False
     planets_by_position = [None] * len(position_index_map)
 
@@ -573,7 +572,7 @@ def draw_secondary_points(
         # Draw point symbol
         point_x = sliceToX(0, radius - point_radius, point_offset) + point_radius
         point_y = sliceToY(0, radius - point_radius, point_offset) + point_radius
-        output += f'<g class="transit-planet-name" transform="translate(-6,-6)"><g transform="scale(0.5)">'
+        output += '<g class="transit-planet-name" transform="translate(-6,-6)"><g transform="scale(0.5)">'
         output += f'<use x="{point_x*2}" y="{point_y*2}" xlink:href="#{points_settings[point_idx]["name"]}" /></g></g>'
 
         # Draw connecting line

kerykeion/charts/kerykeion_chart_svg.py

@@ -9,8 +9,8 @@ import swisseph as swe
 from typing import get_args, Union, Optional
 
 from kerykeion.settings.kerykeion_settings import get_settings
-from kerykeion.aspects.synastry_aspects import SynastryAspects
-from kerykeion.aspects.natal_aspects import NatalAspects
+from kerykeion.aspects.synastry_aspects_factory import SynastryAspectsFactory
+from kerykeion.aspects.natal_aspects_factory import NatalAspectsFactory
 from kerykeion.house_comparison.house_comparison_factory import HouseComparisonFactory
 from kerykeion.kr_types import (
     KerykeionException,
@@ -42,6 +42,7 @@ from kerykeion.charts.charts_utils import (
     draw_transit_ring_degree_steps,
     draw_degree_ring,
     draw_transit_ring,
+    draw_background_circle,
     draw_first_circle,
     draw_house_comparison_grid,
     draw_second_circle,
@@ -72,7 +73,7 @@ from kerykeion.settings.legacy.legacy_chart_aspects_settings import DEFAULT_CHAR
 from pathlib import Path
 from scour.scour import scourString
 from string import Template
-from typing import Union, List, Literal
+from typing import List, Literal
 from datetime import datetime
 
 
@@ -176,6 +177,7 @@ class KerykeionChartSVG:
     chart_language: KerykeionChartLanguage
     active_points: List[AstrologicalPoint]
     active_aspects: List[ActiveAspect]
+    transparent_background: bool
 
     # Internal properties
     fire: float
@@ -210,6 +212,7 @@ class KerykeionChartSVG:
         active_points: Optional[list[AstrologicalPoint]] = None,
         active_aspects: list[ActiveAspect]= DEFAULT_ACTIVE_ASPECTS,
         *,
+        transparent_background: bool = False,
         colors_settings: dict = DEFAULT_CHART_COLORS,
         celestial_points_settings: list[dict] = DEFAULT_CELESTIAL_POINTS_SETTINGS,
         aspects_settings: list[dict] = DEFAULT_CHART_ASPECTS_SETTINGS,
@@ -238,6 +241,8 @@ class KerykeionChartSVG:
                 Celestial points to include in the chart visualization.
             active_aspects (List[ActiveAspect], optional):
                 Aspects to calculate, each defined by name and orb.
+            transparent_background (bool, optional):
+                Whether to use a transparent background instead of the theme color. Defaults to False.
         """
         # --------------------
         # COMMON INITIALIZATION
@@ -248,6 +253,7 @@ class KerykeionChartSVG:
         self.active_aspects = active_aspects
         self.chart_type = chart_type
         self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
+        self.transparent_background = transparent_background
         self.chart_colors_settings = colors_settings
         self.planets_settings = celestial_points_settings
         self.aspects_settings = aspects_settings
@@ -306,7 +312,7 @@ class KerykeionChartSVG:
                 raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
 
             # Calculate aspects
-            natal_aspects_instance = NatalAspects(
+            natal_aspects_instance = NatalAspectsFactory.from_subject(
                 self.first_obj,
                 new_settings_file=self.new_settings_file,
                 active_points=self.active_points,
@@ -341,7 +347,7 @@ class KerykeionChartSVG:
                 raise KerykeionException("First object must be a CompositeSubjectModel instance.")
 
             # Calculate aspects
-            self.aspects_list = NatalAspects(self.first_obj, new_settings_file=self.new_settings_file, active_points=self.active_points).relevant_aspects
+            self.aspects_list = NatalAspectsFactory.from_subject(self.first_obj, new_settings_file=self.new_settings_file, active_points=self.active_points).relevant_aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -372,7 +378,7 @@ class KerykeionChartSVG:
             self.second_obj = second_obj
 
             # Calculate aspects (transit to natal)
-            synastry_aspects_instance = SynastryAspects(
+            synastry_aspects_instance = SynastryAspectsFactory.from_subjects(
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
@@ -417,7 +423,7 @@ class KerykeionChartSVG:
             self.second_obj = second_obj
 
             # Calculate aspects (natal to partner)
-            synastry_aspects_instance = SynastryAspects(
+            synastry_aspects_instance = SynastryAspectsFactory.from_subjects(
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
@@ -458,7 +464,7 @@ class KerykeionChartSVG:
             self.second_obj = second_obj
 
             # Calculate aspects (natal to return)
-            synastry_aspects_instance = SynastryAspects(
+            synastry_aspects_instance = SynastryAspectsFactory.from_subjects(
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
@@ -492,7 +498,7 @@ class KerykeionChartSVG:
                 raise KerykeionException("First object must be an AstrologicalSubjectModel or AstrologicalSubject instance.")
 
             # Calculate aspects
-            natal_aspects_instance = NatalAspects(
+            natal_aspects_instance = NatalAspectsFactory.from_subject(
                 self.first_obj,
                 new_settings_file=self.new_settings_file,
                 active_points=self.active_points,
@@ -708,6 +714,12 @@ class KerykeionChartSVG:
         template_dict["paper_color_0"] = self.chart_colors_settings["paper_0"]
         template_dict["paper_color_1"] = self.chart_colors_settings["paper_1"]
 
+        # Set background color based on transparent_background setting
+        if self.transparent_background:
+            template_dict["background_color"] = "transparent"
+        else:
+            template_dict["background_color"] = self.chart_colors_settings["paper_1"]
+
         # Set planet colors
         for planet in self.planets_settings:
             planet_id = planet["id"]
@@ -769,6 +781,11 @@ class KerykeionChartSVG:
                 self.first_obj.seventh_house.abs_pos,
                 self.chart_colors_settings["paper_0"],
             )
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_radix_ring_2"],
@@ -800,7 +817,7 @@ class KerykeionChartSVG:
             template_dict["makeAspects"] = self._draw_all_aspects_lines(self.main_radius, self.main_radius - self.third_circle_radius)
 
             # Chart title
-            template_dict["stringTitle"] = f'{self.first_obj.name} - {self.language_settings.get("Birth Chart", "Birth Chart")}'
+            template_dict["stringTitle"] = f'{self.first_obj.name} - {self.language_settings.get("birth_chart", "Birth Chart")}'
 
             # Top left section
             latitude_string = convert_latitude_coordinate_to_string(self.geolat, self.language_settings["north"], self.language_settings["south"])
@@ -894,6 +911,11 @@ class KerykeionChartSVG:
                 self.first_obj.seventh_house.abs_pos,
                 self.chart_colors_settings["paper_0"],
             )
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_radix_ring_2"],
@@ -1054,6 +1076,11 @@ class KerykeionChartSVG:
                 self.chart_colors_settings["zodiac_transit_ring_3"],
             )
             template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_transit_ring_2"],
@@ -1224,6 +1251,11 @@ class KerykeionChartSVG:
                 self.chart_colors_settings["zodiac_transit_ring_3"],
             )
             template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_transit_ring_2"],
@@ -1365,6 +1397,11 @@ class KerykeionChartSVG:
                 self.chart_colors_settings["zodiac_transit_ring_3"],
             )
             template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.first_obj.seventh_house.abs_pos)
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_transit_ring_2"],
@@ -1547,6 +1584,11 @@ class KerykeionChartSVG:
                 self.first_obj.seventh_house.abs_pos,
                 self.chart_colors_settings["paper_0"],
             )
+            template_dict["background_circle"] = draw_background_circle(
+                self.main_radius,
+                self.chart_colors_settings["paper_1"],
+                self.chart_colors_settings["paper_1"],
+            )
             template_dict["first_circle"] = draw_first_circle(
                 self.main_radius,
                 self.chart_colors_settings["zodiac_radix_ring_2"],

kerykeion/charts/templates/aspect_grid_only.xml

@@ -7,7 +7,7 @@
     height="100%"
     viewBox="28 20 255 250"
     preserveAspectRatio="xMidYMid"
-    style="background-color: $paper_color_1"
+    style="background-color: $background_color"
 >
 
     <!-- Colors -->

kerykeion/charts/templates/chart.xml

@@ -7,7 +7,7 @@
     height="100%"
     viewBox="$viewbox"
     preserveAspectRatio="xMidYMid"
-    style="background-color: $paper_color_1"
+    style="background-color: $background_color"
 >
     <title>$stringTitle</title>
 
@@ -60,6 +60,12 @@
 
         <!-- Full Wheel -->
         <g kr:node="Full_Wheel" transform="translate(100,50)">
+
+            <!-- Background Circle -->
+            <g kr:node='Background_Circle'>
+                $background_circle
+            </g>
+
             <!-- Zodiac -->
             <g kr:node="Zodiac">
                 $makeZodiac

kerykeion/charts/templates/wheel_only.xml

@@ -5,9 +5,9 @@
     xmlns:kr="https://www.kerykeion.net/"
     width="100%"
     height="100%"
-    viewBox="40 40 500 500"
+    viewBox="85 40 500 500"
     preserveAspectRatio="xMidYMid"
-    style="background-color: $paper_color_1"
+    style="background-color: $background_color"
 >
     <title>$stringTitle | Kerykeion</title>
 
@@ -21,6 +21,12 @@
 
         <!-- Full Wheel -->
         <g kr:node="Full_Wheel" transform="translate(100,50)">
+
+            <!-- Background Circle -->
+            <g kr:node='Background_Circle'>
+                $background_circle
+            </g>
+
             <!-- Zodiac -->
             <g kr:node="Zodiac">
                 $makeZodiac

kerykeion/composite_subject_factory.py

@@ -1,4 +1,4 @@
-from typing import Union, TYPE_CHECKING
+from typing import Union
 
 # Fix the circular import by changing this import
 from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory

kerykeion/house_comparison/__init__.py

@@ -1,3 +1,9 @@
 
 from .house_comparison_factory import HouseComparisonFactory
 from .house_comparison_models import HouseComparisonModel, PointInHouseModel
+
+__all__ = [
+    "HouseComparisonFactory",
+    "HouseComparisonModel", 
+    "PointInHouseModel",
+]

kerykeion/house_comparison/house_comparison_factory.py

@@ -1,6 +1,6 @@
 from kerykeion.house_comparison.house_comparison_utils import calculate_points_in_reciprocal_houses
 from typing import Union
-from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
+from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 from kerykeion.house_comparison.house_comparison_models import HouseComparisonModel
 from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 from kerykeion.kr_types import AstrologicalSubjectModel, PlanetReturnModel

kerykeion/house_comparison/house_comparison_utils.py

@@ -1,4 +1,3 @@
-from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, PlanetReturnModel
 from kerykeion.kr_types.kr_literals import AstrologicalPoint
 from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS

kerykeion/kr_types/__init__.py

@@ -8,3 +8,52 @@ from .kr_literals import *
 from .kr_models import *
 from .chart_types import ChartTemplateDictionary
 from .settings_models import KerykeionSettingsModel
+
+__all__ = [
+    # Exceptions
+    "KerykeionException",
+
+    # Settings and Chart Types
+    "ChartTemplateDictionary",
+    "KerykeionSettingsModel",
+
+    # Main Literal Types (from kr_literals)
+    "ZodiacType",
+    "Sign",
+    "SignNumbers",
+    "Houses",
+    "HouseNumbers",
+    "AstrologicalPoint",
+    "Element",
+    "Quality",
+    "ChartType",
+    "PointType",
+    "LunarPhaseEmoji",
+    "LunarPhaseName",
+    "SiderealMode",
+    "HousesSystemIdentifier",
+    "PerspectiveType",
+    "SignsEmoji",
+    "KerykeionChartTheme",
+    "KerykeionChartLanguage",
+    "RelationshipScoreDescription",
+    "CompositeChartType",
+    "AspectName",
+
+    # Main Model Classes (from kr_models)
+    "SubscriptableBaseModel",
+    "LunarPhaseModel",
+    "KerykeionPointModel",
+    "AstrologicalBaseModel",
+    "AstrologicalSubjectModel",
+    "CompositeSubjectModel",
+    "PlanetReturnModel",
+    "EphemerisDictModel",
+    "AspectModel",
+    "ZodiacSignModel",
+    "RelationshipScoreAspectModel",
+    "RelationshipScoreModel",
+    "ActiveAspect",
+    "TransitMomentModel",
+    "TransitsTimeRangeModel",
+]

kerykeion/kr_types/chart_types.py

@@ -4,6 +4,7 @@ from typing_extensions import TypedDict
 class ChartTemplateDictionary(TypedDict):
     transitRing: str
     degreeRing: str
+    background_circle: str
     first_circle: str
     second_circle: str
     third_circle: str
@@ -31,6 +32,8 @@ class ChartTemplateDictionary(TypedDict):
     paper_color_0: str
     # Background color of the chart
     paper_color_1: str
+    # Dynamic background color (can be transparent or theme color)
+    background_color: str
 
     # Planets colors, from 0 to 16 (0 is the Sun)
     planets_color_0: str

kerykeion/kr_types/kr_models.py

@@ -285,6 +285,35 @@ class TransitMomentModel(SubscriptableBaseModel):
     aspects: List[AspectModel] = Field(description="List of aspects active at this specific moment.")
 
 
+class NatalAspectsModel(SubscriptableBaseModel):
+    """
+    Model representing all aspects in a natal chart.
+
+    Contains both all calculated aspects and the filtered relevant aspects
+    for an astrological subject.
+    """
+    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.")
+    relevant_aspects: List[AspectModel] = Field(description="Filtered list of relevant aspects 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.")
+
+
+class SynastryAspectsModel(SubscriptableBaseModel):
+    """
+    Model representing all aspects between two astrological subjects.
+
+    Contains both all calculated synastry aspects and the filtered relevant aspects
+    between two charts.
+    """
+    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 synastry aspects.")
+    relevant_aspects: List[AspectModel] = Field(description="Filtered list of relevant synastry aspects 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.")
+
+
 class TransitsTimeRangeModel(SubscriptableBaseModel):
     """
     Model representing a collection of transit moments for an astrological subject.

kerykeion/kr_types/settings_models.py

@@ -5,7 +5,7 @@
 
 
 from pydantic import Field
-from typing import List, Optional, Union
+from typing import Optional
 from kerykeion.kr_types.kr_models import SubscriptableBaseModel
 
 
@@ -163,6 +163,14 @@ class KerykeionLanguageModel(SubscriptableBaseModel):
     return_point: str = Field(title="Return Point", description="The return point label in the chart, in the language")
     natal: str = Field(title="Natal", description="The natal label in the chart, in the language")
     perspective_type: str = Field(title="Perspective Type", description="The perspective type label in the chart, in the language")
+    location: str = Field(title="Location", description="The location label in the chart, in the language")
+    day_of_week: str = Field(title="Day of Week", description="The day of week label in the chart, in the language")
+    elements: str = Field(title="Elements", description="The elements label in the chart, in the language")
+    qualities: str = Field(title="Qualities", description="The qualities label in the chart, in the language")
+    cardinal: str = Field(title="Cardinal", description="The cardinal quality label in the chart, in the language")
+    fixed: str = Field(title="Fixed", description="The fixed quality label in the chart, in the language")
+    mutable: str = Field(title="Mutable", description="The mutable quality label in the chart, in the language")
+    birth_chart: str = Field(title="Birth Chart", description="The birth chart label in the chart, in the language")
 
 # Settings Model
 class KerykeionSettingsModel(SubscriptableBaseModel):

kerykeion/planetary_return_factory.py

@@ -10,7 +10,7 @@ import logging
 import swisseph as swe
 
 from datetime import datetime, timezone
-from typing import Optional, Union
+from typing import Union
 
 from kerykeion.kr_types import KerykeionException
 from kerykeion.fetch_geonames import FetchGeonames
@@ -18,6 +18,7 @@ from kerykeion.utilities import julian_to_datetime, datetime_to_julian
 from kerykeion.astrological_subject_factory import (
     GEONAMES_DEFAULT_USERNAME_WARNING,
     DEFAULT_GEONAMES_CACHE_EXPIRE_AFTER_DAYS,
+    DEFAULT_GEONAMES_USERNAME,
 )
 from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 from kerykeion.kr_types.kr_literals import ReturnType
@@ -118,10 +119,10 @@ class PlanetaryReturnFactory:
             self.city_data: dict[str, str] = geonames.get_serialized_data()
 
             if (
-                not "countryCode" in self.city_data
-                or not "timezonestr" in self.city_data
-                or not "lat" in self.city_data
-                or not "lng" in self.city_data
+                "countryCode" not in self.city_data
+                or "timezonestr" not in self.city_data
+                or "lat" not in self.city_data
+                or "lng" not in self.city_data
             ):
                 raise KerykeionException("No data found for this city, try again! Maybe check your connection?")
 

kerykeion/relationship_score_factory.py

@@ -4,13 +4,21 @@
 """
 
 from kerykeion import AstrologicalSubjectFactory
-from kerykeion.aspects.synastry_aspects import SynastryAspects
+from kerykeion.aspects.synastry_aspects_factory import SynastryAspectsFactory
 import logging
-from pathlib import Path
-from typing import Union
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, RelationshipScoreAspectModel, RelationshipScoreModel
 from kerykeion.kr_types.kr_literals import RelationshipScoreDescription
 
+# Scoring constants
+DESTINY_SIGN_POINTS = 5
+HIGH_PRECISION_ORBIT_THRESHOLD = 2
+MAJOR_ASPECT_POINTS_HIGH_PRECISION = 11
+MAJOR_ASPECT_POINTS_STANDARD = 8
+MINOR_ASPECT_POINTS = 4
+SUN_ASCENDANT_ASPECT_POINTS = 4
+MOON_ASCENDANT_ASPECT_POINTS = 4
+VENUS_MARS_ASPECT_POINTS = 4
+
 
 class RelationshipScoreFactory:
     """
@@ -56,16 +64,16 @@ class RelationshipScoreFactory:
         self.relationship_score_description: RelationshipScoreDescription = "Minimal"
         self.is_destiny_sign = True
         self.relationship_score_aspects: list[RelationshipScoreAspectModel] = []
-        self._synastry_aspects = SynastryAspects(self.first_subject, self.second_subject).all_aspects
+        self._synastry_aspects = SynastryAspectsFactory.from_subjects(self.first_subject, self.second_subject).all_aspects
 
     def _evaluate_destiny_sign(self):
         """
         Evaluates if the subjects share the same sun sign quality and adds points if true.
         """
-        if self.first_subject.sun["quality"] == self.second_subject.sun["quality"]:
+        if self.first_subject.sun["quality"] == self.second_subject.sun["quality"]: # type: ignore
             self.is_destiny_sign = True
-            self.score_value += 5
-            logging.debug(f"Destiny sign found, adding 5 points, total score: {self.score_value}")
+            self.score_value += DESTINY_SIGN_POINTS
+            logging.debug(f"Destiny sign found, adding {DESTINY_SIGN_POINTS} points, total score: {self.score_value}")
 
     def _evaluate_aspect(self, aspect, points):
         """
@@ -99,7 +107,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
         """
         if aspect["p1_name"] == "Sun" and aspect["p2_name"] == "Sun" and aspect["aspect"] in {"conjunction", "opposition", "square"}:
-            points = 11 if aspect["orbit"] <= 2 else 8
+            points = MAJOR_ASPECT_POINTS_HIGH_PRECISION if aspect["orbit"] <= HIGH_PRECISION_ORBIT_THRESHOLD else MAJOR_ASPECT_POINTS_STANDARD
             self._evaluate_aspect(aspect, points)
 
     def _evaluate_sun_moon_conjunction(self, aspect):
@@ -112,7 +120,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
         """
         if {aspect["p1_name"], aspect["p2_name"]} == {"Moon", "Sun"} and aspect["aspect"] == "conjunction":
-            points = 11 if aspect["orbit"] <= 2 else 8
+            points = MAJOR_ASPECT_POINTS_HIGH_PRECISION if aspect["orbit"] <= HIGH_PRECISION_ORBIT_THRESHOLD else MAJOR_ASPECT_POINTS_STANDARD
             self._evaluate_aspect(aspect, points)
 
     def _evaluate_sun_sun_other_aspects(self, aspect):
@@ -124,7 +132,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
         """
         if aspect["p1_name"] == "Sun" and aspect["p2_name"] == "Sun" and aspect["aspect"] not in {"conjunction", "opposition", "square"}:
-            points = 4
+            points = MINOR_ASPECT_POINTS
             self._evaluate_aspect(aspect, points)
 
     def _evaluate_sun_moon_other_aspects(self, aspect):
@@ -136,7 +144,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
         """
         if {aspect["p1_name"], aspect["p2_name"]} == {"Moon", "Sun"} and aspect["aspect"] != "conjunction":
-            points = 4
+            points = MINOR_ASPECT_POINTS
             self._evaluate_aspect(aspect, points)
 
     def _evaluate_sun_ascendant_aspect(self, aspect):
@@ -148,7 +156,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
         """
         if {aspect["p1_name"], aspect["p2_name"]} == {"Sun", "Ascendant"}:
-            points = 4
+            points = SUN_ASCENDANT_ASPECT_POINTS
             self._evaluate_aspect(aspect, points)
 
     def _evaluate_moon_ascendant_aspect(self, aspect):
@@ -160,7 +168,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
         """
         if {aspect["p1_name"], aspect["p2_name"]} == {"Moon", "Ascendant"}:
-            points = 4
+            points = MOON_ASCENDANT_ASPECT_POINTS
             self._evaluate_aspect(aspect, points)
 
     def _evaluate_venus_mars_aspect(self, aspect):
@@ -172,7 +180,7 @@ class RelationshipScoreFactory:
             aspect (dict): Aspect information.
         """
         if {aspect["p1_name"], aspect["p2_name"]} == {"Venus", "Mars"}:
-            points = 4
+            points = VENUS_MARS_ASPECT_POINTS
             self._evaluate_aspect(aspect, points)
 
     def _evaluate_relationship_score_description(self):
@@ -218,10 +226,12 @@ if __name__ == "__main__":
 
     setup_logging(level="critical")
 
-    john = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
-    yoko = AstrologicalSubjectFactory.from_birth_data("Yoko Ono", 1933, 2, 18, 18, 30, "Tokyo", "JP")
+    john = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB", lng=53.416666, lat=-3, tz_str="Europe/London")
+    yoko = AstrologicalSubjectFactory.from_birth_data("Yoko Ono", 1933, 2, 18, 20, 30, "Tokyo", "JP", lng=35.68611, lat=139.7525, tz_str="Asia/Tokyo")
 
     factory = RelationshipScoreFactory(john, yoko)
     score = factory.get_relationship_score()
-    print(score)
 
+    # Remove subjects key
+    score.subjects = []
+    print(score.model_dump_json(indent=4))