kerykeion 4.26.2__py3-none-any.whl → 5.0.0a2__py3-none-any.whl

kerykeion/house_comparison/house_comparison_factory.py

@@ -0,0 +1,70 @@
+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.house_comparison.house_comparison_models import HouseComparisonModel
+from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
+from kerykeion.kr_types import AstrologicalSubjectModel, PlanetReturnModel
+from kerykeion.kr_types.kr_literals import AstrologicalPoint
+
+
+class HouseComparisonFactory:
+    """
+    Factory class for creating house comparison analyses between two astrological charts.
+
+    This class handles the generation of house comparison data, calculating how planets
+    from one chart interact with the house system of another chart (and vice versa).
+    This is useful for synastry analysis and other forms of relationship astrology.
+
+    Attributes:
+        first_subject (AstrologicalSubject): The first person's astrological chart
+        second_subject (AstrologicalSubject): The second person's astrological chart
+
+    Example:
+        >>> natal_chart = AstrologicalSubjectFactory.from_birth_data("Person A", 1990, 5, 15, 10, 30, "Rome", "IT")
+        >>> partner_chart = AstrologicalSubjectFactory.from_birth_data("Person B", 1992, 8, 23, 14, 45, "Milan", "IT")
+        >>> factory = HouseComparisonFactory(natal_chart, partner_chart)
+        >>> comparison = factory.get_house_comparison()
+        >>> print(comparison.model_dump_json(indent=4))
+
+    """
+    def __init__(self,
+                 first_subject: Union["AstrologicalSubjectModel", "PlanetReturnModel"],
+                 second_subject: Union["AstrologicalSubjectModel", "PlanetReturnModel"],
+                active_points: list[AstrologicalPoint] = DEFAULT_ACTIVE_POINTS,
+
+        ):
+        self.first_subject = first_subject
+        self.second_subject = second_subject
+        self.active_points = active_points
+
+    def get_house_comparison(self) -> "HouseComparisonModel":
+        """
+        Creates a house comparison model for two astrological subjects.
+
+        Args:
+            chart1: First astrological subject
+            chart2: Second astrological subject
+            description: Description of the comparison
+
+        Returns:
+            "HouseComparisonModel": Model containing the comparison data.
+        """
+        first_points_in_second_houses = calculate_points_in_reciprocal_houses(self.first_subject, self.second_subject, self.active_points)
+        second_points_in_first_houses = calculate_points_in_reciprocal_houses(self.second_subject, self.first_subject, self.active_points)
+
+        return HouseComparisonModel(
+            first_subject_name=self.first_subject.name,
+            second_subject_name=self.second_subject.name,
+            first_points_in_second_houses=first_points_in_second_houses,
+            second_points_in_first_houses=second_points_in_first_houses,
+        )
+
+
+if __name__ == "__main__":
+    natal_chart = AstrologicalSubjectFactory.from_birth_data("Person A", 1990, 5, 15, 10, 30, "Rome", "IT")
+    partner_chart = AstrologicalSubjectFactory.from_birth_data("Person B", 1992, 8, 23, 14, 45, "Milan", "IT")
+
+    factory = HouseComparisonFactory(natal_chart, partner_chart)
+    comparison = factory.get_house_comparison()
+
+    print(comparison.model_dump_json(indent=4))

kerykeion/house_comparison/house_comparison_models.py

@@ -0,0 +1,38 @@
+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"""

kerykeion/house_comparison/house_comparison_utils.py

@@ -0,0 +1,98 @@
+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
+from kerykeion.utilities import get_planet_house, get_house_number
+from kerykeion.house_comparison.house_comparison_models import PointInHouseModel
+from typing import Union
+
+
+def calculate_points_in_reciprocal_houses(
+    point_subject: Union[AstrologicalSubjectModel, PlanetReturnModel],
+    house_subject: Union[AstrologicalSubjectModel, PlanetReturnModel],
+    active_points: list[AstrologicalPoint] = DEFAULT_ACTIVE_POINTS,
+) -> list[PointInHouseModel]:
+    """
+    Calculates which houses of the house_subject the points of point_subject fall into.
+
+    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.
+
+    Returns:
+        List of PointInHouseModel objects
+    """
+    points_in_houses: list[PointInHouseModel] = []
+
+    # List of points to consider
+    celestial_points = []
+
+    for point in point_subject.active_points:
+        if point not in active_points:
+            continue
+
+        point_obj = getattr(point_subject, point.lower())
+        if point_obj is not None:
+            celestial_points.append(point_obj)
+
+    # Ordered list of house cusps degrees for house_subject
+    house_cusps = [
+        house_subject.first_house.abs_pos,
+        house_subject.second_house.abs_pos,
+        house_subject.third_house.abs_pos,
+        house_subject.fourth_house.abs_pos,
+        house_subject.fifth_house.abs_pos,
+        house_subject.sixth_house.abs_pos,
+        house_subject.seventh_house.abs_pos,
+        house_subject.eighth_house.abs_pos,
+        house_subject.ninth_house.abs_pos,
+        house_subject.tenth_house.abs_pos,
+        house_subject.eleventh_house.abs_pos,
+        house_subject.twelfth_house.abs_pos,
+    ]
+
+    # Ordered list of house cusps degrees for point_subject
+    point_subject_house_cusps = [
+        point_subject.first_house.abs_pos,
+        point_subject.second_house.abs_pos,
+        point_subject.third_house.abs_pos,
+        point_subject.fourth_house.abs_pos,
+        point_subject.fifth_house.abs_pos,
+        point_subject.sixth_house.abs_pos,
+        point_subject.seventh_house.abs_pos,
+        point_subject.eighth_house.abs_pos,
+        point_subject.ninth_house.abs_pos,
+        point_subject.tenth_house.abs_pos,
+        point_subject.eleventh_house.abs_pos,
+        point_subject.twelfth_house.abs_pos,
+    ]
+
+    # For each point, determine which house it falls in
+    for point in celestial_points:
+        if point is None:
+            continue
+
+        point_degree = point.abs_pos
+        house_name = get_planet_house(point_degree, house_cusps)
+        house_number = get_house_number(house_name)
+
+        # Find which house the point is in its own chart (point_subject)
+        point_owner_house_name = get_planet_house(point_degree, point_subject_house_cusps)
+        point_owner_house_number = get_house_number(point_owner_house_name)
+
+        point_in_house = PointInHouseModel(
+            point_name=point.name,
+            point_degree=point.position,
+            point_sign=point.sign,
+            point_owner_name=point_subject.name,
+            point_owner_house_name=point_owner_house_name,
+            point_owner_house_number=point_owner_house_number,
+            projected_house_number=house_number,
+            projected_house_name=house_name,
+            projected_house_owner_name=house_subject.name,
+        )
+
+        points_in_houses.append(point_in_house)
+
+    return points_in_houses

kerykeion/kr_types/chart_types.py

@@ -9,6 +9,8 @@ class ChartTemplateDictionary(TypedDict):
     third_circle: str
     makeAspects: str
     makeAspectGrid: str
+    makeDoubleChartAspectList: str
+    makeHouseComparisonGrid: str
     chart_height: float
     chart_width: float
     viewbox: str
@@ -80,16 +82,22 @@ class ChartTemplateDictionary(TypedDict):
     makeZodiac: str
     makeHouses: str
     makePlanets: str
-    makePlanetGrid: str
-    makeHousesGrid: str
+    makeMainPlanetGrid: str
+    makeSecondaryPlanetGrid: str
+    makeMainHousesGrid: str
+    makeSecondaryHousesGrid: str
 
     color_style_tag: str
 
+    element_string: str
     fire_string: str
     earth_string: str
     air_string: str
     water_string: str
 
-    lunar_phase_rotate: str
-    lunar_phase_circle_center_x: str
-    lunar_phase_circle_radius: str
+    quality_string: str
+    cardinal_string: str
+    fixed_string: str
+    mutable_string: str
+
+    makeLunarPhase: str

kerykeion/kr_types/kr_literals.py

@@ -25,10 +25,35 @@ HouseNumbers = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
 """Literal type for House Numbers, starting from the First House (1) to the Twelfth House (12)"""
 
 
-Planet = Literal["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "Mean_Node", "True_Node", "Mean_South_Node", "True_South_Node", "Chiron", "Mean_Lilith"]
-"""Literal type for Planets"""
+AstrologicalPoint = Literal[
+    # Main Planets
+    "Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto",
+
+    # Nodes
+    "Mean_Node", "True_Node", "Mean_South_Node", "True_South_Node",
+
+    # Special Points
+    "Chiron", "Mean_Lilith", "True_Lilith", "Earth", "Pholus",
+
+    # Asteroids
+    "Ceres", "Pallas", "Juno", "Vesta",
+
+    # Trans-Neptunian Objects
+    "Eris", "Sedna", "Haumea", "Makemake", "Ixion", "Orcus", "Quaoar",
+
+    # Fixed Stars
+    "Regulus", "Spica",
+
+    # Arabic Parts
+    "Pars_Fortunae", "Pars_Spiritus", "Pars_Amoris", "Pars_Fidei",
+
+    # Special Points
+    "Vertex", "Anti_Vertex",
+
+    # Axial Cusps
+    "Ascendant", "Medium_Coeli", "Descendant", "Imum_Coeli",
+]
 
-AxialCusps = Literal["Ascendant", "Medium_Coeli", "Descendant", "Imum_Coeli"]
 """Literal type for Axial Cusps"""
 
 
@@ -40,11 +65,11 @@ Quality = Literal["Cardinal", "Fixed", "Mutable"]
 """Literal type for Qualities"""
 
 
-ChartType = Literal["Natal", "ExternalNatal", "Synastry", "Transit", "Composite"]
+ChartType = Literal["Natal", "ExternalNatal", "Synastry", "Transit", "Composite", "Return", "SingleWheelReturn"]
 """Literal type for Chart Types"""
 
 
-PointType = Literal["Planet", "House", "AxialCusps"]
+PointType = Literal["AstrologicalPoint", "House"]
 """Literal type for Point Types"""
 
 
@@ -107,7 +132,7 @@ Usually the standard is "Apparent Geocentric"
 SignsEmoji = Literal["♈️", "♉️", "♊️", "♋️", "♌️", "♍️", "♎️", "♏️", "♐️", "♑️", "♒️", "♓️"]
 """Literal type for Zodiac Signs Emoji"""
 
-KerykeionChartTheme = Literal["light", "dark", "dark-high-contrast", "classic"]
+KerykeionChartTheme = Literal["light", "dark", "dark-high-contrast", "classic", "strawberry"]
 """Literal type for Kerykeion Chart Themes"""
 
 
@@ -136,3 +161,6 @@ AspectName = Literal[
     "opposition"
 ]
 """Literal type for all the available aspects names"""
+
+ReturnType = Literal["Lunar", "Solar"]
+"""Literal type for Return Types"""

kerykeion/kr_types/kr_models.py

@@ -3,17 +3,15 @@
     This is part of Kerykeion (C) 2025 Giacomo Battaglia
 """
 
-
-from typing import Union, Optional
+from typing import Union, Optional, List
 from typing_extensions import TypedDict
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from kerykeion.kr_types.kr_literals import AspectName
 
 from kerykeion.kr_types import (
-    AxialCusps,
     LunarPhaseEmoji,
     LunarPhaseName,
-    Planet,
+    AstrologicalPoint,
     Houses,
     Quality,
     Element,
@@ -23,10 +21,10 @@ from kerykeion.kr_types import (
     PointType,
     SiderealMode,
     HousesSystemIdentifier,
-    Houses,
     SignsEmoji,
     RelationshipScoreDescription,
-    PerspectiveType
+    PerspectiveType,
+    ReturnType
 )
 
 
@@ -61,7 +59,7 @@ class KerykeionPointModel(SubscriptableBaseModel):
     Kerykeion Point Model
     """
 
-    name: Union[Planet, Houses, AxialCusps]
+    name: Union[AstrologicalPoint, Houses]
     quality: Quality
     element: Element
     sign: Sign
@@ -74,61 +72,91 @@ class KerykeionPointModel(SubscriptableBaseModel):
     retrograde: Optional[bool] = None
 
 
-class AstrologicalSubjectModel(SubscriptableBaseModel):
+class AstrologicalBaseModel(SubscriptableBaseModel):
     """
-    Pydantic Model for Astrological Subject
+    Base Model with common fields for all astrological subjects
     """
-
-    # Data
+    # Common identification data
     name: str
-    year: int
-    month: int
-    day: int
-    hour: int
-    minute: int
+
+    # Common location data
     city: str
     nation: str
     lng: float
     lat: float
     tz_str: str
+
+    # Common time data
+    iso_formatted_local_datetime: str
+    iso_formatted_utc_datetime: str
+    julian_day: float
+    day_of_week: str
+
+    # Common configuration
     zodiac_type: ZodiacType
     sidereal_mode: Union[SiderealMode, None]
     houses_system_identifier: HousesSystemIdentifier
     houses_system_name: str
     perspective_type: PerspectiveType
-    iso_formatted_local_datetime: str
-    iso_formatted_utc_datetime: str
-    julian_day: float
-
-    # Deprecated properties -->
-    utc_time: float
-    local_time: float
-    # <-- Deprecated properties
 
-
-    # Planets
+    # Common celestial points
+    # Main planets
     sun: KerykeionPointModel
     moon: KerykeionPointModel
-    mercury: KerykeionPointModel
-    venus: KerykeionPointModel
-    mars: KerykeionPointModel
-    jupiter: KerykeionPointModel
-    saturn: KerykeionPointModel
-    uranus: KerykeionPointModel
-    neptune: KerykeionPointModel
-    pluto: KerykeionPointModel
-
-    # Axes
-    ascendant: KerykeionPointModel
-    descendant: KerykeionPointModel
-    medium_coeli: KerykeionPointModel
-    imum_coeli: KerykeionPointModel
-
-    # Optional Planets:
-    chiron: Union[KerykeionPointModel, None]
-    mean_lilith: Union[KerykeionPointModel, None]
-
-    # Houses
+    mercury: Optional[KerykeionPointModel] = None
+    venus: Optional[KerykeionPointModel] = None
+    mars: Optional[KerykeionPointModel] = None
+    jupiter: Optional[KerykeionPointModel] = None
+    saturn: Optional[KerykeionPointModel] = None
+    uranus: Optional[KerykeionPointModel] = None
+    neptune: Optional[KerykeionPointModel] = None
+    pluto: Optional[KerykeionPointModel] = None
+
+    # Common axes
+    ascendant: Optional[KerykeionPointModel] = None
+    descendant: Optional[KerykeionPointModel] = None
+    medium_coeli: Optional[KerykeionPointModel] = None
+    imum_coeli: Optional[KerykeionPointModel] = None
+
+    # Common optional planets
+    chiron: Optional[KerykeionPointModel] = None
+    earth: Optional[KerykeionPointModel] = None
+    pholus: Optional[KerykeionPointModel] = None
+
+    # Lilith Points
+    mean_lilith: Optional[KerykeionPointModel] = None
+    true_lilith: Optional[KerykeionPointModel] = None
+
+    # Asteroids
+    ceres: Optional[KerykeionPointModel] = None
+    pallas: Optional[KerykeionPointModel] = None
+    juno: Optional[KerykeionPointModel] = None
+    vesta: Optional[KerykeionPointModel] = None
+
+    # Trans-Neptunian Objects
+    eris: Optional[KerykeionPointModel] = None
+    sedna: Optional[KerykeionPointModel] = None
+    haumea: Optional[KerykeionPointModel] = None
+    makemake: Optional[KerykeionPointModel] = None
+    ixion: Optional[KerykeionPointModel] = None
+    orcus: Optional[KerykeionPointModel] = None
+    quaoar: Optional[KerykeionPointModel] = None
+
+    # Fixed Stars
+    regulus: Optional[KerykeionPointModel] = None
+    spica: Optional[KerykeionPointModel] = None
+
+    # Arabic Parts
+    pars_fortunae: Optional[KerykeionPointModel] = None
+    pars_spiritus: Optional[KerykeionPointModel] = None
+    pars_amoris: Optional[KerykeionPointModel] = None
+    pars_fidei: Optional[KerykeionPointModel] = None
+
+    # Special Points
+    vertex: Optional[KerykeionPointModel] = None
+    anti_vertex: Optional[KerykeionPointModel] = None
+
+    # Common houses
     first_house: KerykeionPointModel
     second_house: KerykeionPointModel
     third_house: KerykeionPointModel
@@ -142,29 +170,54 @@ class AstrologicalSubjectModel(SubscriptableBaseModel):
     eleventh_house: KerykeionPointModel
     twelfth_house: KerykeionPointModel
 
-    # Nodes
-    mean_node: KerykeionPointModel
-    true_node: KerykeionPointModel
-    mean_south_node: KerykeionPointModel
-    true_south_node: KerykeionPointModel
+    # Common nodes
+    mean_node: Optional[KerykeionPointModel] = None
+    true_node: Optional[KerykeionPointModel] = None
+    mean_south_node: Optional[KerykeionPointModel] = None
+    true_south_node: Optional[KerykeionPointModel] = None
+
+    # Common lists and settings
+    houses_names_list: List[Houses] = Field(description="Ordered list of houses names")
+    active_points: List[AstrologicalPoint] = Field(description="List of active points in the chart or aspects calculations.")
 
-    planets_names_list: list[Planet]
-    """Ordered list of available planets names"""
+    # Common lunar phase data
+    lunar_phase: LunarPhaseModel = Field(description="Lunar phase model")
 
-    axial_cusps_names_list: list[AxialCusps]
-    """Ordered list of available axes names"""
 
-    houses_names_list: list[Houses]
-    """Ordered list of houses names"""
+class AstrologicalSubjectModel(AstrologicalBaseModel):
+    """
+    Pydantic Model for Astrological Subject
+    """
+    # Specific birth/event data
+    year: int
+    month: int
+    day: int
+    hour: int
+    minute: int
 
-    lunar_phase: LunarPhaseModel
-    """Lunar phase model"""
+
+class CompositeSubjectModel(AstrologicalBaseModel):
+    """
+    Pydantic Model for Composite Subject
+    """
+    # Specific composite data
+    first_subject: AstrologicalSubjectModel
+    second_subject: AstrologicalSubjectModel
+    composite_chart_type: str
+
+
+class PlanetReturnModel(AstrologicalBaseModel):
+    """
+    Pydantic Model for Planet Return
+    """
+    # Specific return data
+    return_type: ReturnType = Field(description="Type of return: Solar or Lunar")
 
 
 class EphemerisDictModel(SubscriptableBaseModel):
     date: str
-    planets: list[KerykeionPointModel]
-    houses: list[KerykeionPointModel]
+    planets: List[KerykeionPointModel]
+    houses: List[KerykeionPointModel]
 
 
 class AspectModel(SubscriptableBaseModel):
@@ -201,80 +254,8 @@ class RelationshipScoreModel(SubscriptableBaseModel):
     score_value: int
     score_description: RelationshipScoreDescription
     is_destiny_sign: bool
-    aspects: list[RelationshipScoreAspectModel]
-    subjects: list[AstrologicalSubjectModel]
-
-
-class CompositeSubjectModel(SubscriptableBaseModel):
-    """
-    Pydantic Model for Composite Subject
-    """
-
-    # Data
-    name: str
-    first_subject: AstrologicalSubjectModel
-    second_subject: AstrologicalSubjectModel
-    composite_chart_type: str
-
-    zodiac_type: ZodiacType
-    sidereal_mode: Union[SiderealMode, None]
-    houses_system_identifier: HousesSystemIdentifier
-    houses_system_name: str
-    perspective_type: PerspectiveType
-
-    # Planets
-    sun: KerykeionPointModel
-    moon: KerykeionPointModel
-    mercury: KerykeionPointModel
-    venus: KerykeionPointModel
-    mars: KerykeionPointModel
-    jupiter: KerykeionPointModel
-    saturn: KerykeionPointModel
-    uranus: KerykeionPointModel
-    neptune: KerykeionPointModel
-    pluto: KerykeionPointModel
-
-    # Axes
-    ascendant: KerykeionPointModel
-    descendant: KerykeionPointModel
-    medium_coeli: KerykeionPointModel
-    imum_coeli: KerykeionPointModel
-
-    # Optional Planets:
-    chiron: Union[KerykeionPointModel, None]
-    mean_lilith: Union[KerykeionPointModel, None]
-
-    # Houses
-    first_house: KerykeionPointModel
-    second_house: KerykeionPointModel
-    third_house: KerykeionPointModel
-    fourth_house: KerykeionPointModel
-    fifth_house: KerykeionPointModel
-    sixth_house: KerykeionPointModel
-    seventh_house: KerykeionPointModel
-    eighth_house: KerykeionPointModel
-    ninth_house: KerykeionPointModel
-    tenth_house: KerykeionPointModel
-    eleventh_house: KerykeionPointModel
-    twelfth_house: KerykeionPointModel
-
-    # Nodes
-    mean_node: KerykeionPointModel
-    true_node: KerykeionPointModel
-    mean_south_node: KerykeionPointModel
-    true_south_node: KerykeionPointModel
-
-    planets_names_list: list[Planet]
-    """Ordered list of available planets names"""
-
-    axial_cusps_names_list: list[AxialCusps]
-    """Ordered list of available axes names"""
-
-    houses_names_list: list[Houses]
-    """Ordered list of houses names"""
-
-    lunar_phase: LunarPhaseModel
-    """Lunar phase model"""
+    aspects: List[RelationshipScoreAspectModel]
+    subjects: List[AstrologicalSubjectModel]
 
 
 class ActiveAspect(TypedDict):
@@ -288,17 +269,9 @@ class TransitMomentModel(SubscriptableBaseModel):
 
     Captures all active aspects between moving celestial bodies and
     the fixed positions in a person's natal chart at a specific date and time.
-
-    Attributes:
-        date: ISO 8601 formatted date and time of the transit moment.
-        aspects: List of astrological aspects active at this specific moment.
     """
-
-    date: str
-    """ISO 8601 formatted date and time of the transit moment."""
-
-    aspects: list[AspectModel]
-    """List of aspects active at this specific moment."""
+    date: str = Field(description="ISO 8601 formatted date and time of the transit moment.")
+    aspects: List[AspectModel] = Field(description="List of aspects active at this specific moment.")
 
 
 class TransitsTimeRangeModel(SubscriptableBaseModel):
@@ -307,18 +280,7 @@ class TransitsTimeRangeModel(SubscriptableBaseModel):
 
     This model holds a time series of transit snapshots, allowing analysis of
     planetary movements and their aspects to a natal chart over a period of time.
-
-    Attributes:
-        transits: List of transit moments occurring during the specified time period.
-        subject: The astrological subject model for whom the transits are calculated.
-        dates: List of all dates in ISO 8601 format for which transits were calculated.
     """
-
-    transits: list[TransitMomentModel]
-    """List of transit moments."""
-
-    subject: Optional[AstrologicalSubjectModel]
-    """Astrological subject data."""
-
-    dates: Optional[list[str]]
-    """ISO 8601 formatted dates of all transit moments."""
+    transits: List[TransitMomentModel] = Field(description="List of transit moments.")
+    subject: Optional[AstrologicalSubjectModel] = Field(description="Astrological subject data.")
+    dates: Optional[List[str]] = Field(description="ISO 8601 formatted dates of all transit moments.")