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

kerykeion/house_comparison/house_comparison_utils.py

@@ -1,8 +1,19 @@
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, PlanetReturnModel
-from kerykeion.kr_types.kr_literals import AstrologicalPoint
+"""
+House Comparison Utilities
+
+Utility functions for calculating house placement relationships between astrological subjects.
+Provides core calculation logic for determining where points from one subject fall within
+another subject's house system.
+
+Author: Giacomo Battaglia
+Copyright: (C) 2025 Kerykeion Project
+License: AGPL-3.0
+"""
+
+from kerykeion.schemas.kr_models import AstrologicalSubjectModel, PlanetReturnModel, PointInHouseModel
+from kerykeion.schemas.kr_literals import AstrologicalPoint
 from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 from kerykeion.utilities import get_planet_house, get_house_number
-from kerykeion.house_comparison.house_comparison_models import PointInHouseModel
 from typing import Union
 
 
@@ -12,15 +23,33 @@ def calculate_points_in_reciprocal_houses(
     active_points: list[AstrologicalPoint] = DEFAULT_ACTIVE_POINTS,
 ) -> list[PointInHouseModel]:
     """
-    Calculates which houses of the house_subject the points of point_subject fall into.
+    Calculate house placements of one subject's points within another subject's house system.
+
+    Analyzes where each astrological point from the point_subject falls within the
+    house structure of the house_subject. Creates detailed mapping including both
+    the point's original house position and its projected house placement.
 
     Args:
-        point_subject: Subject whose points are being analyzed
-        house_subject: Subject whose houses are being considered
-        active_points: Optional list of point names to process. If None, all points are processed.
+        point_subject: Subject whose astrological points are being analyzed
+        house_subject: Subject whose house system provides the projection framework
+        active_points: List of astrological points to include in the analysis.
+                      Defaults to standard active points configuration.
 
     Returns:
-        List of PointInHouseModel objects
+        list[PointInHouseModel]: List of point placement models containing detailed
+                                information about each point's house relationships,
+                                including original and projected house positions.
+
+    Note:
+        Only processes points that exist in both the point_subject's active_points
+        and the provided active_points list. Points with None values are skipped.
+
+    Example:
+        >>> points_in_houses = calculate_points_in_reciprocal_houses(
+        ...     natal_chart, partner_chart, ["Sun", "Moon"]
+        ... )
+        >>> sun_placement = points_in_houses[0]  # Assuming Sun is first
+        >>> print(f"Sun falls in house: {sun_placement.projected_house_name}")
     """
     points_in_houses: list[PointInHouseModel] = []
 

kerykeion/planetary_return_factory.py

@@ -33,7 +33,7 @@ Dependencies:
     - kerykeion.AstrologicalSubjectFactory: For creating complete chart data
     - kerykeion.fetch_geonames: For online location data retrieval
     - kerykeion.utilities: For date/time conversions and astronomical functions
-    - kerykeion.kr_types: For type definitions and model structures
+    - kerykeion.schemas: For type definitions and model structures
 
 Example:
     Basic Solar Return calculation for a specific year:
@@ -73,7 +73,7 @@ import swisseph as swe
 from datetime import datetime, timezone
 from typing import Union
 
-from kerykeion.kr_types import KerykeionException
+from kerykeion.schemas import KerykeionException
 from kerykeion.fetch_geonames import FetchGeonames
 from kerykeion.utilities import julian_to_datetime, datetime_to_julian
 from kerykeion.astrological_subject_factory import (
@@ -82,8 +82,8 @@ from kerykeion.astrological_subject_factory import (
     DEFAULT_GEONAMES_USERNAME,
 )
 from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
-from kerykeion.kr_types.kr_literals import ReturnType
-from kerykeion.kr_types.kr_models import PlanetReturnModel, AstrologicalSubjectModel
+from kerykeion.schemas.kr_literals import ReturnType
+from kerykeion.schemas.kr_models import PlanetReturnModel, AstrologicalSubjectModel
 
 
 class PlanetaryReturnFactory:
@@ -486,11 +486,15 @@ class PlanetaryReturnFactory:
 
         return_julian_date = None
         if return_type == "Solar":
+            if self.subject.sun is None:
+                raise KerykeionException("Sun position is required for Solar return but is not available in the subject.")
             return_julian_date = swe.solcross_ut(
                 self.subject.sun.abs_pos,
                 julian_day,
             )
         elif return_type == "Lunar":
+            if self.subject.moon is None:
+                raise KerykeionException("Moon position is required for Lunar return but is not available in the subject.")
             return_julian_date = swe.mooncross_ut(
                 self.subject.moon.abs_pos,
                 julian_day,

kerykeion/relationship_score_factory.py

@@ -42,10 +42,10 @@ License: AGPL-3.0
 """
 
 from kerykeion import AstrologicalSubjectFactory
-from kerykeion.aspects.synastry_aspects_factory import SynastryAspectsFactory
+from kerykeion.aspects import AspectsFactory
 import logging
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, RelationshipScoreAspectModel, RelationshipScoreModel
-from kerykeion.kr_types.kr_literals import RelationshipScoreDescription
+from kerykeion.schemas.kr_models import AstrologicalSubjectModel, RelationshipScoreAspectModel, RelationshipScoreModel
+from kerykeion.schemas.kr_literals import RelationshipScoreDescription
 
 # Scoring constants
 DESTINY_SIGN_POINTS = 5
@@ -105,9 +105,9 @@ class RelationshipScoreFactory:
 
         self.score_value = 0
         self.relationship_score_description: RelationshipScoreDescription = "Minimal"
-        self.is_destiny_sign = True
+        self.is_destiny_sign = False
         self.relationship_score_aspects: list[RelationshipScoreAspectModel] = []
-        self._synastry_aspects = SynastryAspectsFactory.from_subjects(self.first_subject, self.second_subject).all_aspects
+        self._synastry_aspects = AspectsFactory.dual_chart_aspects(self.first_subject, self.second_subject).all_aspects
 
     def _evaluate_destiny_sign(self):
         """