kerykeion 4.24.6__py3-none-any.whl → 4.25.0__py3-none-any.whl

kerykeion/charts/templates/chart.xml

@@ -26,22 +26,31 @@ OpenAstro.org -->
             <rect class="background-rectangle" x="0" y="0" width="$chart_width"
                 height="$chart_height" style="fill: $paper_color_1" />
             <text x="20" y="22" style="fill: $paper_color_0; font-size: 24px">$stringTitle</text>
-            <text x="20" y="50" style="fill: $paper_color_0; font-size: 11px">$stringName</text>
-            <text x="20" y="62" style="fill: $paper_color_0; font-size: 11px">$stringLocation</text>
-            <text x="20" y="74" style="fill: $paper_color_0; font-size: 11px">$stringDateTime</text>
-            <text x="20" y="86" style="fill: $paper_color_0; font-size: 11px">$stringLat</text>
-            <text x="20" y="98" style="fill: $paper_color_0; font-size: 11px">$stringLon</text>
-            <text x="20" y="110" style="fill: $paper_color_0; font-size: 11px">$stringPosition</text>
-            <text x="20" y="452" style="fill: $paper_color_0; font-size: 10px">$bottomLeft0</text>
-            <text x="20" y="466" style="fill: $paper_color_0; font-size: 10px">$bottomLeft1</text>
-            <text x="20" y="480" style="fill: $paper_color_0; font-size: 10px">$bottomLeft2</text>
-            <text x="20" y="494" style="fill: $paper_color_0; font-size: 10px">$bottomLeft3</text>
-            <text x="20" y="508" style="fill: $paper_color_0; font-size: 10px">$bottomLeft4</text>
+            <text x="20" y="50" style="fill: $paper_color_0; font-size: 10px">$top_left_0</text>
+            <text x="20" y="62" style="fill: $paper_color_0; font-size: 10px">$top_left_1</text>
+            <text x="20" y="74" style="fill: $paper_color_0; font-size: 10px">$top_left_2</text>
+            <text x="20" y="86" style="fill: $paper_color_0; font-size: 10px">$top_left_3</text>
+            <text x="20" y="98" style="fill: $paper_color_0; font-size: 10px">$top_left_4</text>
+            <text x="20" y="110" style="fill: $paper_color_0; font-size: 10px">$top_left_5</text>
+            <text x="20" y="452" style="fill: $paper_color_0; font-size: 10px">$bottom_left_0</text>
+            <text x="20" y="466" style="fill: $paper_color_0; font-size: 10px">$bottom_left_1</text>
+            <text x="20" y="480" style="fill: $paper_color_0; font-size: 10px">$bottom_left_2</text>
+            <text x="20" y="494" style="fill: $paper_color_0; font-size: 10px">$bottom_left_3</text>
+            <text x="20" y="508" style="fill: $paper_color_0; font-size: 10px">$bottom_left_4</text>
         </g>
 
         <!-- Lunar Phase -->
         <g kr:node="Lunar_Phase" transform="translate(20,518)">
-            $moon_phase
+            <g transform="rotate($lunar_phase_rotate 20 10)">
+                <defs>
+                    <clipPath id="moonPhaseCutOffCircle">
+                    <circle cx="20" cy="10" r="10" />
+                    </clipPath>
+                </defs>
+                <circle cx="20" cy="10" r="10" style="fill: var(--kerykeion-chart-color-lunar-phase-0)" />
+                <circle cx="$lunar_phase_circle_center_x" cy="10" r="$lunar_phase_circle_radius" style="fill: var(--kerykeion-chart-color-lunar-phase-1)" clip-path="url(#moonPhaseCutOffCircle)" />
+                <circle cx="20" cy="10" r="10" style="fill: none; stroke: var(--kerykeion-chart-color-lunar-phase-0); stroke-width: 0.5px; stroke-opacity: 0.5" />
+            </g>
         </g>
 
         <g kr:node="Main_Content" transform="translate(50,50)">
@@ -94,13 +103,18 @@ OpenAstro.org -->
             </g>
 
             <!-- AspectGrid -->
-            <g kr:node="Aspect_Grid" transform="translate(526,273)">
+            <g kr:node="Aspect_Grid">
                 $makeAspectGrid
             </g>
 
             <!-- Elements -->
             <g kr:node="Elements_Percentages">
-                $elements_percentages
+                <g transform="translate(-30,79)">
+                <text y="0" style="fill: var(--kerykeion-chart-color-fire-percentage); font-size: 10px;">$fire_string</text>
+                <text y="12" style="fill: var(--kerykeion-chart-color-earth-percentage); font-size: 10px;">$earth_string</text>
+                <text y="24" style="fill: var(--kerykeion-chart-color-air-percentage); font-size: 10px;">$air_string</text>
+                <text y="36" style="fill: var(--kerykeion-chart-color-water-percentage); font-size: 10px;">$water_string</text>
+                </g>"
             </g>
 
             <!-- Houses_And_Planets_Grid -->

kerykeion/composite_subject_factory.py

@@ -0,0 +1,200 @@
+from typing import Union
+
+from kerykeion import AstrologicalSubject
+from kerykeion import KerykeionException
+from kerykeion.kr_types.kr_models import CompositeSubjectModel, AstrologicalSubjectModel
+from kerykeion.kr_types.kr_literals import ZodiacType, PerspectiveType, HousesSystemIdentifier, SiderealMode, Planet, Houses, AxialCusps, CompositeChartType
+from kerykeion.utilities import (
+    get_kerykeion_point_from_degree,
+    get_planet_house,
+    circular_mean,
+    calculate_moon_phase
+)
+
+
+class CompositeSubjectFactory:
+    """
+    Factory class to create a Composite Subject Model from two Astrological Subjects
+    Currently, the only available method for creating composite charts is the midpoint method.
+    The composite houses and planets are calculated based on the midpoint of the corresponding points of the two subjects.
+    The house are then reordered to match the original house system of the first subject.
+
+    Args:
+        first_subject (AstrologicalSubject): First astrological subject
+        second_subject (AstrologicalSubject): Second astrological subject
+        chart_name (str): Name of the composite chart. If None, it will be automatically generated.
+    """
+
+    model: Union[CompositeSubjectModel, None]
+    first_subject: AstrologicalSubjectModel
+    second_subject: AstrologicalSubjectModel
+    name: str
+    composite_chart_type: CompositeChartType
+    zodiac_type: ZodiacType
+    sidereal_mode: Union[SiderealMode, None]
+    houses_system_identifier: HousesSystemIdentifier
+    houses_system_name: str
+    perspective_type: PerspectiveType
+    planets_names_list: list[Planet]
+    houses_names_list: list[Houses]
+    axial_cusps_names_list: list[AxialCusps]
+
+    def __init__(
+            self,
+            first_subject: Union[AstrologicalSubject, AstrologicalSubjectModel],
+            second_subject: Union[AstrologicalSubject, AstrologicalSubjectModel],
+            chart_name: Union[str, None] = None
+    ):
+        self.model: Union[CompositeSubjectModel, None] = None
+        self.composite_chart_type = "Midpoint"
+
+        # Subjects
+        if isinstance(first_subject, AstrologicalSubject) or isinstance(first_subject, AstrologicalSubjectModel):
+            self.first_subject = first_subject.model() # type: ignore
+            self.second_subject = second_subject.model() # type: ignore
+        else:
+            self.first_subject = first_subject
+            self.second_subject = second_subject
+
+        # Name
+        if chart_name is None:
+            self.name = f"{first_subject.name} and {second_subject.name} Composite Chart"
+        else:
+            self.name = chart_name
+
+        # Zodiac Type
+        if first_subject.zodiac_type != second_subject.zodiac_type:
+            raise KerykeionException("Both subjects must have the same zodiac type")
+        self.zodiac_type = first_subject.zodiac_type
+
+        # Sidereal Mode
+        if first_subject.sidereal_mode != second_subject.sidereal_mode:
+            raise KerykeionException("Both subjects must have the same sidereal mode")
+
+        if first_subject.sidereal_mode is not None:
+            self.sidereal_mode = first_subject.sidereal_mode
+        else:
+            self.sidereal_mode = None
+
+        # Houses System
+        if first_subject.houses_system_identifier != second_subject.houses_system_identifier:
+            raise KerykeionException("Both subjects must have the same houses system")
+        self.houses_system_identifier = first_subject.houses_system_identifier
+
+        # Houses System Name
+        if first_subject.houses_system_name != second_subject.houses_system_name:
+            raise KerykeionException("Both subjects must have the same houses system name")
+        self.houses_system_name = first_subject.houses_system_name
+
+        # Perspective Type
+        if first_subject.perspective_type != second_subject.perspective_type:
+            raise KerykeionException("Both subjects must have the same perspective type")
+        self.perspective_type = first_subject.perspective_type
+
+        # Planets Names List
+        self.planets_names_list = []
+        for planet in first_subject.planets_names_list:
+            if planet in second_subject.planets_names_list:
+                self.planets_names_list.append(planet)
+
+        # Houses Names List
+        self.houses_names_list = self.first_subject.houses_names_list
+
+        # Axial Cusps Names List
+        self.axial_cusps_names_list = self.first_subject.axial_cusps_names_list
+
+    def __str__(self):
+        return f"Composite Chart Data for {self.name}"
+
+    def __repr__(self):
+        return f"Composite Chart Data for {self.name}"
+
+    def __eq__(self, other):
+        return self.first_subject == other.first_subject and self.second_subject == other.second_subject and self.name == other.chart_name
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash((self.first_subject, self.second_subject, self.name))
+
+    def __copy__(self):
+        return CompositeSubjectFactory(self.first_subject, self.second_subject, self.name)
+
+    def __setitem__(self, key, value):
+        setattr(self, key, value)
+
+    def __getitem__(self, key):
+        return getattr(self, key)
+
+    def _calculate_midpoint_composite_points_and_houses(self):
+        # Houses
+        house_degree_list_ut = []
+        for house in self.first_subject.houses_names_list:
+            house_lower = house.lower()
+            self[house_lower] = get_kerykeion_point_from_degree(
+                circular_mean(
+                    self.first_subject[house_lower]["abs_pos"],
+                    self.second_subject[house_lower]["abs_pos"]
+                ),
+                house,
+                "House"
+            )
+            house_degree_list_ut.append(self[house_lower]["abs_pos"])
+
+        house_degree_list_ut = sorted(house_degree_list_ut)
+
+        # Planets
+        common_planets = []
+        for planet in self.first_subject.planets_names_list:
+            if planet in self.second_subject.planets_names_list:
+                common_planets.append(planet)
+
+        planets = {}
+        for planet in common_planets:
+            planet_lower = planet.lower()
+            planets[planet_lower] = {}
+            planets[planet_lower]["abs_pos"] = circular_mean(
+                self.first_subject[planet_lower]["abs_pos"],
+                self.second_subject[planet_lower]["abs_pos"]
+            )
+            self[planet_lower] = get_kerykeion_point_from_degree(planets[planet_lower]["abs_pos"], planet, "Planet")
+            self[planet_lower]["house"] = get_planet_house(self[planet_lower]['abs_pos'], house_degree_list_ut)
+
+
+        # Axial Cusps
+        for cusp in self.first_subject.axial_cusps_names_list:
+            cusp_lower = cusp.lower()
+            self[cusp_lower] = get_kerykeion_point_from_degree(
+                circular_mean(
+                    self.first_subject[cusp_lower]["abs_pos"],
+                    self.second_subject[cusp_lower]["abs_pos"]
+                ),
+                cusp,
+                "AxialCusps"
+            )
+            self[cusp_lower]["house"] = get_planet_house(self[cusp_lower]['abs_pos'], house_degree_list_ut)
+
+    def _calculate_composite_lunar_phase(self):
+        self.lunar_phase = calculate_moon_phase(
+            self['moon'].abs_pos,
+            self['sun'].abs_pos
+        )
+
+    def get_midpoint_composite_subject_model(self):
+        self._calculate_midpoint_composite_points_and_houses()
+        self._calculate_composite_lunar_phase()
+
+        return CompositeSubjectModel(
+            **self.__dict__
+        )
+
+
+if __name__ == "__main__":
+    from kerykeion.astrological_subject import AstrologicalSubject
+
+    first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
+
+    composite_chart = CompositeSubjectFactory(first, second)
+    print(composite_chart.get_midpoint_composite_subject_model().model_dump_json(indent=4))

kerykeion/kr_types/chart_types.py

@@ -13,18 +13,17 @@ class ChartTemplateDictionary(TypedDict):
     chart_width: float
     viewbox: str
     stringTitle: str
-    stringName: str
-    bottomLeft0: str
-    bottomLeft1: str
-    bottomLeft2: str
-    bottomLeft3: str
-    bottomLeft4: str
-    moon_phase: str
-    stringLocation: str
-    stringDateTime: str
-    stringLat: str
-    stringLon: str
-    stringPosition: str
+    top_left_0: str
+    bottom_left_0: str
+    bottom_left_1: str
+    bottom_left_2: str
+    bottom_left_3: str
+    bottom_left_4: str
+    top_left_1: str
+    top_left_2: str
+    top_left_3: str
+    top_left_4: str
+    top_left_5: str
 
     # Font color
     paper_color_0: str
@@ -81,8 +80,16 @@ class ChartTemplateDictionary(TypedDict):
     makeZodiac: str
     makeHouses: str
     makePlanets: str
-    elements_percentages: str
     makePlanetGrid: str
     makeHousesGrid: str
 
     color_style_tag: 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

kerykeion/kr_types/kr_literals.py

@@ -40,7 +40,7 @@ Quality = Literal["Cardinal", "Fixed", "Mutable"]
 """Literal type for Qualities"""
 
 
-ChartType = Literal["Natal", "ExternalNatal", "Synastry", "Transit"]
+ChartType = Literal["Natal", "ExternalNatal", "Synastry", "Transit", "Composite"]
 """Literal type for Chart Types"""
 
 
@@ -114,9 +114,14 @@ KerykeionChartTheme = Literal["light", "dark", "dark-high-contrast", "classic"]
 KerykeionChartLanguage = Literal["EN", "FR", "PT", "IT", "CN", "ES", "RU", "TR", "DE", "HI"]
 """Literal type for Kerykeion Chart Languages"""
 
+
 RelationshipScoreDescription = Literal["Minimal", "Medium", "Important", "Very Important", "Exceptional", "Rare Exceptional"]
 """Literal type for Relationship Score Description"""
 
+
+CompositeChartType = Literal["Midpoint"]
+"""Literal type for Composite Chart Types"""
+
 AspectName = Literal[
     "conjunction",
     "semi-sextile",

kerykeion/kr_types/kr_models.py

@@ -25,7 +25,8 @@ from kerykeion.kr_types import (
     HousesSystemIdentifier,
     Houses,
     SignsEmoji,
-    RelationshipScoreDescription
+    RelationshipScoreDescription,
+    PerspectiveType
 )
 
 
@@ -74,6 +75,10 @@ class KerykeionPointModel(SubscriptableBaseModel):
 
 
 class AstrologicalSubjectModel(SubscriptableBaseModel):
+    """
+    Pydantic Model for Astrological Subject
+    """
+
     # Data
     name: str
     year: int
@@ -90,7 +95,7 @@ class AstrologicalSubjectModel(SubscriptableBaseModel):
     sidereal_mode: Union[SiderealMode, None]
     houses_system_identifier: HousesSystemIdentifier
     houses_system_name: str
-    perspective_type: str
+    perspective_type: PerspectiveType
     iso_formatted_local_datetime: str
     iso_formatted_utc_datetime: str
     julian_day: float
@@ -198,6 +203,78 @@ class RelationshipScoreModel(SubscriptableBaseModel):
     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"""
+
+
 class ActiveAspect(TypedDict):
     name: AspectName
     orb: int

kerykeion/kr_types/settings_models.py

@@ -137,6 +137,12 @@ class KerykeionLanguageModel(SubscriptableBaseModel):
     lunar_phase: str = Field(title="Lunar Phase", description="The name of the Lunar Phase label in the chart, in the language")
     day: str = Field(title="Day", description="The name of the Day label in the chart, in the language")
     celestial_points: KerykeionLanguageCelestialPointModel
+    composite_chart: str = Field(title="Composite Chart", description="The name of the Composite Chart label in the chart, in the language")
+    midpoints: str = Field(title="Midpoints", description="The name of the Midpoints label in the chart, in the language")
+    north_letter: str = Field(title="North Letter", description="The name of the North Letter label in the chart, in the language")
+    east_letter: str = Field(title="East Letter", description="The name of the East Letter label in the chart, in the language")
+    south_letter: str = Field(title="South Letter", description="The name of the South Letter label in the chart, in the language")
+    west_letter: str = Field(title="West Letter", description="The name of the West Letter label in the chart, in the language")
 
 
 class KerykeionGeneralSettingsModel(SubscriptableBaseModel):

kerykeion/settings/kr.config.json

@@ -21,6 +21,12 @@
       "transit_name": "At the time of the transit",
       "lunar_phase": "Lunar phase",
       "day": "Day",
+      "composite_chart": "Composite Chart",
+      "midpoints": "Midpoints",
+      "north_letter": "N",
+      "east_letter": "E",
+      "south_letter": "S",
+      "west_letter": "W",
       "celestial_points": {
         "Sun": "Sun",
         "Moon": "Moon",
@@ -65,6 +71,12 @@
       "transit_name": "Au moment de la transition",
       "lunar_phase": "Phase Lunaire",
       "day": "Jour",
+      "composite_chart": "Carte Composite",
+      "midpoints": "Milieux",
+      "north_letter": "N",
+      "east_letter": "E",
+      "south_letter": "S",
+      "west_letter": "W",
       "celestial_points": {
         "Sun": "Soleil",
         "Moon": "Lune",
@@ -109,6 +121,12 @@
       "transit_name": "No momento do trânsito",
       "lunar_phase": "Fase lunar",
       "day": "Dia",
+      "composite_chart": "Carta Composta",
+      "midpoints": "Meios",
+      "north_letter": "N",
+      "east_letter": "E",
+      "south_letter": "S",
+      "west_letter": "W",
       "celestial_points": {
         "Sun": "Sol",
         "Moon": "Lua",
@@ -153,6 +171,12 @@
       "transit_name": "Al momento del transito",
       "lunar_phase": "Fase lunare",
       "day": "Giorno",
+      "composite_chart": "Tema Composito",
+      "midpoints": "Punti Medi",
+      "north_letter": "N",
+      "east_letter": "E",
+      "south_letter": "S",
+      "west_letter": "W",
       "celestial_points": {
         "Sun": "Sole",
         "Moon": "Luna",
@@ -197,6 +221,12 @@
       "transit_name": "流年名稱",
       "lunar_phase": "月相",
       "day": "日",
+      "composite_chart": "合盤",
+      "midpoints": "中點",
+      "north_letter": "北",
+      "east_letter": "東",
+      "south_letter": "南",
+      "west_letter": "西",
       "celestial_points": {
         "Sun": "太陽",
         "Moon": "月亮",
@@ -241,6 +271,12 @@
       "transit_name": "En el momento del tránsito",
       "lunar_phase": "Fase lunar",
       "day": "Día",
+      "composite_chart": "Carta Compuesta",
+      "midpoints": "Puntos Medios",
+      "north_letter": "N",
+      "east_letter": "E",
+      "south_letter": "S",
+      "west_letter": "W",
       "celestial_points": {
         "Sun": "Sol",
         "Moon": "Luna",
@@ -285,6 +321,12 @@
       "transit_name": "В момент транзита",
       "lunar_phase": "Лунная фаза",
       "day": "День",
+      "composite_chart": "Композитная карта",
+      "midpoints": "Средние точки",
+      "north_letter": "С",
+      "east_letter": "В",
+      "south_letter": "Ю",
+      "west_letter": "З",
       "celestial_points": {
         "Sun": "Солнце",
         "Moon": "Луна",
@@ -329,6 +371,12 @@
       "transit_name": "Geçiş anında",
       "lunar_phase": "Ay Aşaması",
       "day": "Gün",
+      "composite_chart": "Kompozit Harita",
+      "midpoints": "Orta Noktalar",
+      "north_letter": "K",
+      "east_letter": "D",
+      "south_letter": "G",
+      "west_letter": "B",
       "celestial_points": {
         "Sun": "Güneş",
         "Moon": "Ay",
@@ -373,6 +421,12 @@
       "transit_name": "Zum Zeitpunkt des Transits",
       "lunar_phase": "Mondphase",
       "day": "Tag",
+      "composite_chart": "Komposit-Chart",
+      "midpoints": "Mittelpunkte",
+      "north_letter": "N",
+      "east_letter": "E",
+      "south_letter": "S",
+      "west_letter": "W",
       "celestial_points": {
         "Sun": "Sonne",
         "Moon": "Mond",
@@ -417,6 +471,12 @@
       "transit_name": "गोचर के समय",
       "lunar_phase": "चंद्र चरण",
       "day": "दिन",
+      "composite_chart": "संयुक्त चार्ट",
+      "midpoints": "मध्य बिंदु",
+      "north_letter": "उ",
+      "east_letter": "पू",
+      "south_letter": "द",
+      "west_letter": "प",
       "celestial_points": {
         "Sun": "सूर्य",
         "Moon": "चंद्रमा",

kerykeion/utilities.py

@@ -1,4 +1,4 @@
-from kerykeion.kr_types import KerykeionPointModel, KerykeionException, ZodiacSignModel, AstrologicalSubjectModel
+from kerykeion.kr_types import KerykeionPointModel, KerykeionException, ZodiacSignModel, AstrologicalSubjectModel, LunarPhaseModel
 from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, Planet, Houses, AxialCusps
 from typing import Union, get_args, TYPE_CHECKING
 import logging
@@ -318,3 +318,75 @@ def get_available_astrological_points_list(subject: Union["AstrologicalSubject",
         planets_absolute_position_list.append(subject[axis.lower()])
 
     return planets_absolute_position_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).
+
+    This function ensures that positions crossing 0° Aries (360°) are correctly averaged,
+    avoiding errors that occur with simple linear means.
+
+    Args:
+        position1 (Union[int, float]): First position in degrees (0-360).
+        position2 (Union[int, float]): Second position in degrees (0-360).
+
+    Returns:
+        float: 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
+    mean_position = math.degrees(math.atan2(y, x))
+
+    # Ensure the result is within 0-360°
+    if mean_position < 0:
+        mean_position += 360
+
+    return mean_position
+
+
+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.
+
+    Args:
+    - moon_abs_pos (float): The absolute position of the moon.
+    - sun_abs_pos (float): The absolute position of the sun.
+
+    Returns:
+    - dict: A dictionary containing the lunar phase information.
+    """
+    # Initialize moon_phase and sun_phase to None in case of an error
+    moon_phase, sun_phase = None, None
+
+    # Calculate the anti-clockwise degrees between the sun and moon
+    degrees_between = (moon_abs_pos - sun_abs_pos) % 360
+
+    # Calculate the moon phase (1-28) based on the degrees between the sun and moon
+    step = 360.0 / 28.0
+    moon_phase = int(degrees_between // step) + 1
+
+    # Define the sun phase steps
+    sunstep = [
+        0, 30, 40, 50, 60, 70, 80, 90, 120, 130, 140, 150, 160, 170, 180,
+        210, 220, 230, 240, 250, 260, 270, 300, 310, 320, 330, 340, 350
+    ]
+
+    # Calculate the sun phase (1-28) based on the degrees between the sun and moon
+    for x in range(len(sunstep)):
+        low = sunstep[x]
+        high = sunstep[x + 1] if x < len(sunstep) - 1 else 360
+        if low <= degrees_between < high:
+            sun_phase = x + 1
+            break
+
+    # Create a dictionary with the lunar phase information
+    lunar_phase_dictionary = {
+        "degrees_between_s_m": degrees_between,
+        "moon_phase": moon_phase,
+        "sun_phase": sun_phase,
+        "moon_emoji": get_moon_emoji_from_phase_int(moon_phase),
+        "moon_phase_name": get_moon_phase_name_from_phase_int(moon_phase)
+    }
+
+    return LunarPhaseModel(**lunar_phase_dictionary)

{kerykeion-4.24.6.dist-info → kerykeion-4.25.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.24.6
+Version: 4.25.0
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0