kerykeion 4.5.1__py3-none-any.whl → 4.6.1__py3-none-any.whl

kerykeion/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 
     Kerykeion is a python library for Astrology.
     It can calculate all the planet and house position,

kerykeion/aspects/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-This is part of Kerykeion (C) 2023 Giacomo Battaglia
+This is part of Kerykeion (C) 2024 Giacomo Battaglia
 
 The aspects module contains the classes and functions for calculating 
  aspects between planets and points in a chart.

kerykeion/aspects/aspects_utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 # TODO: Better documentation and unit tests
 

kerykeion/aspects/natal_aspects.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 from pathlib import Path

kerykeion/aspects/synastry_aspects.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 from kerykeion import AstrologicalSubject

kerykeion/astrological_subject.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
-import math
 import pytz
 import swisseph as swe
 import logging
@@ -17,7 +16,13 @@ from kerykeion.kr_types import (
     LunarPhaseModel,
     KerykeionPointModel,
 )
-from kerykeion.utilities import get_number_from_name, calculate_position
+from kerykeion.utilities import (
+    get_number_from_name, 
+    calculate_position, 
+    get_planet_house,
+    get_moon_emoji_from_phase_int,
+    get_moon_phase_name_from_phase_int,
+)
 from pathlib import Path
 from typing import Union, Literal
 
@@ -431,64 +436,21 @@ class AstrologicalSubject:
         """Calculates the house of the planet and updates
         the planets dictionary."""
 
-        def for_every_planet(planet, planet_deg):
-            """Function to do the calculation.
-            Args: planet dictionary, planet degree"""
-
-            def point_between(p1, p2, p3):
-                """Finds if a point is between two other in a circle
-                args: first point, second point, point in the middle"""
-                p1_p2 = math.fmod(p2 - p1 + 360, 360)
-                p1_p3 = math.fmod(p3 - p1 + 360, 360)
-                if (p1_p2 <= 180) != (p1_p3 > p1_p2):
-                    return True
-                else:
-                    return False
-
-            if point_between(self.houses_degree_ut[0], self.houses_degree_ut[1], planet_deg) == True:
-                planet["house"] = "First_House"
-            elif point_between(self.houses_degree_ut[1], self.houses_degree_ut[2], planet_deg) == True:
-                planet["house"] = "Second_House"
-            elif point_between(self.houses_degree_ut[2], self.houses_degree_ut[3], planet_deg) == True:
-                planet["house"] = "Third_House"
-            elif point_between(self.houses_degree_ut[3], self.houses_degree_ut[4], planet_deg) == True:
-                planet["house"] = "Fourth_House"
-            elif point_between(self.houses_degree_ut[4], self.houses_degree_ut[5], planet_deg) == True:
-                planet["house"] = "Fifth_House"
-            elif point_between(self.houses_degree_ut[5], self.houses_degree_ut[6], planet_deg) == True:
-                planet["house"] = "Sixth_House"
-            elif point_between(self.houses_degree_ut[6], self.houses_degree_ut[7], planet_deg) == True:
-                planet["house"] = "Seventh_House"
-            elif point_between(self.houses_degree_ut[7], self.houses_degree_ut[8], planet_deg) == True:
-                planet["house"] = "Eighth_House"
-            elif point_between(self.houses_degree_ut[8], self.houses_degree_ut[9], planet_deg) == True:
-                planet["house"] = "Ninth_House"
-            elif point_between(self.houses_degree_ut[9], self.houses_degree_ut[10], planet_deg) == True:
-                planet["house"] = "Tenth_House"
-            elif point_between(self.houses_degree_ut[10], self.houses_degree_ut[11], planet_deg) == True:
-                planet["house"] = "Eleventh_House"
-            elif point_between(self.houses_degree_ut[11], self.houses_degree_ut[0], planet_deg) == True:
-                planet["house"] = "Twelfth_House"
-            else:
-                planet["house"] = "error!"
-
-            return planet
-
-        self.sun = for_every_planet(self.sun, self.planets_degrees_ut[0])
-        self.moon = for_every_planet(self.moon, self.planets_degrees_ut[1])
-        self.mercury = for_every_planet(self.mercury, self.planets_degrees_ut[2])
-        self.venus = for_every_planet(self.venus, self.planets_degrees_ut[3])
-        self.mars = for_every_planet(self.mars, self.planets_degrees_ut[4])
-        self.jupiter = for_every_planet(self.jupiter, self.planets_degrees_ut[5])
-        self.saturn = for_every_planet(self.saturn, self.planets_degrees_ut[6])
-        self.uranus = for_every_planet(self.uranus, self.planets_degrees_ut[7])
-        self.neptune = for_every_planet(self.neptune, self.planets_degrees_ut[8])
-        self.pluto = for_every_planet(self.pluto, self.planets_degrees_ut[9])
-        self.mean_node = for_every_planet(self.mean_node, self.planets_degrees_ut[10])
-        self.true_node = for_every_planet(self.true_node, self.planets_degrees_ut[11])
+        self.sun.house = get_planet_house(self.planets_degrees_ut[0], self.houses_degree_ut)
+        self.moon.house = get_planet_house(self.planets_degrees_ut[1], self.houses_degree_ut)
+        self.mercury.house = get_planet_house(self.planets_degrees_ut[2], self.houses_degree_ut)
+        self.venus.house = get_planet_house(self.planets_degrees_ut[3], self.houses_degree_ut)
+        self.mars.house = get_planet_house(self.planets_degrees_ut[4], self.houses_degree_ut)
+        self.jupiter.house = get_planet_house(self.planets_degrees_ut[5], self.houses_degree_ut)
+        self.saturn.house = get_planet_house(self.planets_degrees_ut[6], self.houses_degree_ut)
+        self.uranus.house = get_planet_house(self.planets_degrees_ut[7], self.houses_degree_ut)
+        self.neptune.house = get_planet_house(self.planets_degrees_ut[8], self.houses_degree_ut)
+        self.pluto.house = get_planet_house(self.planets_degrees_ut[9], self.houses_degree_ut)
+        self.mean_node.house = get_planet_house(self.planets_degrees_ut[10], self.houses_degree_ut)
+        self.true_node.house = get_planet_house(self.planets_degrees_ut[11], self.houses_degree_ut)
 
         if not self.disable_chiron:
-            self.chiron = for_every_planet(self.chiron, self.planets_degrees_ut[12])
+            self.chiron.house = get_planet_house(self.planets_degrees_ut[12], self.houses_degree_ut)
         else:
             self.chiron = None
 
@@ -583,33 +545,12 @@ class AstrologicalSubject:
             if degrees_between >= low and degrees_between < high:
                 sun_phase = x + 1
 
-        def moon_emoji(phase):
-            if phase == 1:
-                result = "🌑"
-            elif phase < 7:
-                result = "🌒"
-            elif 7 <= phase <= 9:
-                result = "🌓"
-            elif phase < 14:
-                result = "🌔"
-            elif phase == 14:
-                result = "🌕"
-            elif phase < 20:
-                result = "🌖"
-            elif 20 <= phase <= 22:
-                result = "🌗"
-            elif phase <= 28:
-                result = "🌘"
-            else:
-                result = phase
-
-            return result
-
         lunar_phase_dictionary = {
             "degrees_between_s_m": degrees_between,
             "moon_phase": moon_phase,
             "sun_phase": sun_phase,
-            "moon_emoji": moon_emoji(moon_phase),
+            "moon_emoji": get_moon_emoji_from_phase_int(moon_phase),
+            "moon_phase_name": get_moon_phase_name_from_phase_int(moon_phase)
         }
 
         self.lunar_phase = LunarPhaseModel(**lunar_phase_dictionary)

kerykeion/charts/__init__.py

@@ -1,5 +1,5 @@
 """
-This is part of Kerykeion (C) 2023 Giacomo Battaglia
+This is part of Kerykeion (C) 2024 Giacomo Battaglia
 
 This modules contains the charts logic for the Kerykeion project.
 """

kerykeion/charts/charts_utils.py

@@ -1,6 +1,6 @@
 import math
 import datetime
-from kerykeion.kr_types import KerykeionException
+from kerykeion.kr_types import KerykeionException, ChartType
 from typing import Union
 
 def decHourJoin(inH: int, inM: int, inS: int) -> float:
@@ -108,3 +108,52 @@ def sliceToY(slice: Union[int, float], r: Union[int, float], offset: Union[int,
     plus = (math.pi * offset) / 180
     radial = ((math.pi / 6) * slice) + plus
     return r * ((math.sin(radial) / -1) + 1)
+
+
+def draw_zodiac_slice(
+        c1: Union[int, float],
+        chart_type: ChartType,
+        sixth_house_degree_ut: Union[int, float],
+        num: int,
+        r: Union[int, float],
+        style: str,
+        type: str,
+    ):
+    """
+    Draws a zodiac slice based on the given parameters.
+
+    Args:
+        - c1 (Union[int, float]): The value of c1.
+        - chart_type (Literal["Natal", "ExternalNatal", "Synastry", "Transit"]): The type of chart.
+        - sixth_house_degree_ut (Union[int, float]): The degree of the sixth house.
+        - num (int): The number of the sign. Note: In OpenAstro it did refer to self.zodiac, 
+            which is a list of the signs in order, starting with Aries. Eg:
+            {"name": "aries", "element": "fire"}
+        - r (Union[int, float]): The value of r.
+        - style (str): The CSS inline style.
+        - type (str): The type ?. In OpenAstro, it was the symbol of the sign. Eg: "aries".
+            self.zodiac[i]["name"]
+
+    Returns:
+        - str: The zodiac slice and symbol as an SVG path.
+    """
+
+    # pie slices
+    offset = 360 - sixth_house_degree_ut
+    # check transit
+    if chart_type == "Transit" or chart_type == "Synastry":
+        dropin = 0
+    else:
+        dropin = c1
+    slice = f'<path d="M{str(r)},{str(r)} L{str(dropin + sliceToX(num, r - dropin, offset))},{str(dropin + sliceToY(num, r - dropin, offset))} A{str(r - dropin)},{str(r - dropin)} 0 0,0 {str(dropin + sliceToX(num + 1, r - dropin, offset))},{str(dropin + sliceToY(num + 1, r - dropin, offset))} z" style="{style}"/>'
+
+    # symbols
+    offset = offset + 15
+    # check transit
+    if chart_type == "Transit" or chart_type == "Synastry":
+        dropin = 54
+    else:
+        dropin = 18 + c1
+    sign = f'<g transform="translate(-16,-16)"><use x="{str(dropin + sliceToX(num, r - dropin, offset))}" y="{str(dropin + sliceToY(num, r - dropin, offset))}" xlink:href="#{type}" /></g>'
+
+    return slice + "" + sign

kerykeion/charts/kerykeion_chart_svg.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 
@@ -14,7 +14,7 @@ from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
 from kerykeion.kr_types import KerykeionException, ChartType
 from kerykeion.kr_types import ChartTemplateDictionary
-from kerykeion.charts.charts_utils import decHourJoin, degreeDiff, offsetToTz, sliceToX, sliceToY
+from kerykeion.charts.charts_utils import decHourJoin, degreeDiff, offsetToTz, sliceToX, sliceToY, draw_zodiac_slice
 from pathlib import Path
 from string import Template
 from typing import Union
@@ -371,39 +371,30 @@ class KerykeionChartSVG:
 
         return out
 
-    def _zodiacSlice(self, num, r, style, type):
-        # pie slices
-        offset = 360 - self.user.houses_degree_ut[6]
-        # check transit
-        if self.chart_type == "Transit" or self.chart_type == "Synastry":
-            dropin = 0
-        else:
-            dropin = self.c1
-        slice = f'<path d="M{str(r)},{str(r)} L{str(dropin + sliceToX(num, r - dropin, offset))},{str(dropin + sliceToY(num, r - dropin, offset))} A{str(r - dropin)},{str(r - dropin)} 0 0,0 {str(dropin + sliceToX(num + 1, r - dropin, offset))},{str(dropin + sliceToY(num + 1, r - dropin, offset))} z" style="{style}"/>'
+    def _draw_zodiac_circle_slices(self, r):
+        """
+        Generate the SVG string representing the zodiac circle
+        with the 12 slices for each zodiac sign.
 
-        # symbols
-        offset = offset + 15
-        # check transit
-        if self.chart_type == "Transit" or self.chart_type == "Synastry":
-            dropin = 54
-        else:
-            dropin = 18 + self.c1
-        sign = f'<g transform="translate(-16,-16)"><use x="{str(dropin + sliceToX(num, r - dropin, offset))}" y="{str(dropin + sliceToY(num, r - dropin, offset))}" xlink:href="#{type}" /></g>'
+        Args:
+            r (float): The radius of the zodiac slices.
 
-        return slice + "" + sign
+        Returns:
+            str: The SVG string representing the zodiac circle.
+        """
 
-    def _makeZodiac(self, r):
         output = ""
-        for i in range(len(self.zodiac)):
-            output = (
-                output
-                + self._zodiacSlice(
-                    i,
-                    r,
-                    f'fill:{self.chart_colors_settings[f"zodiac_bg_{i}"]}; fill-opacity: 0.5;',
-                    self.zodiac[i]["name"],
-                )
+        for i, zodiac_element in enumerate(self.zodiac):
+            output += draw_zodiac_slice(
+                c1=self.c1,
+                chart_type=self.chart_type,
+                sixth_house_degree_ut=self.user.houses_degree_ut[6],
+                num=i,
+                r=r,
+                style=f'fill:{self.chart_colors_settings[f"zodiac_bg_{i}"]}; fill-opacity: 0.5;',
+                type=zodiac_element["name"],
             )
+
         return output
 
     def _makeHouses(self, r):
@@ -1210,40 +1201,47 @@ class KerykeionChartSVG:
         return out
 
     def _makeHousesGrid(self):
-        out = '<g transform="translate(600,-20)">'
+        """
+        Generate SVG code for a grid of astrological houses.
 
-        li = 10
+        Returns:
+            str: The SVG code for the grid of houses.
+        """
+        # Initialize the SVG group for the grid
+        grid_svg = '<g transform="translate(600,-20)">'
+
+        # Vertical position of the current house in the grid
+        vertical_position = 10
+
+        # Generate SVG code for each house
         for i in range(12):
-            if i < 9:
-                cusp = "&#160;&#160;" + str(i + 1)
-            else:
-                cusp = str(i + 1)
-            out += f'<g transform="translate(0,{li})">'
-            out += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {cusp}:</text>'
-            out += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.houses_sign_graph[i]]["name"]}" /></g>'
-            out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {self._dec2deg(self.user.houses_list[i]["position"])}</text>'
-            out += "</g>"
-            li = li + 14
+            # Add leading spaces to single-digit house numbers for alignment
+            house_number = str(i + 1).rjust(2, ' ')
 
-        out += "</g>"
+            # Start a new SVG group for the current house
+            grid_svg += f'<g transform="translate(0,{vertical_position})">'
 
-        if self.chart_type == "Synastry":
-            out += '<g transform="translate(840, -20)">'
-            li = 10
-            for i in range(12):
-                if i < 9:
-                    cusp = "&#160;&#160;" + str(i + 1)
-                else:
-                    cusp = str(i + 1)
-                out += '<g transform="translate(0,' + str(li) + ')">'
-                out += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {cusp}:</text>'
-                out += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.t_houses_sign_graph[i]]["name"]}" /></g>'
-                out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {self._dec2deg(self.t_user.houses_list[i]["position"])}</text>'
-                out += "</g>"
-                li = li + 14
-            out += "</g>"
+            # Add the house label
+            grid_svg += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {house_number}:</text>'
 
-        return out
+            # Add the zodiac sign symbol for the house
+            zodiac_sign = self.zodiac[self.houses_sign_graph[i]]["name"]
+            grid_svg += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{zodiac_sign}" /></g>'
+
+            # Add the position of the house
+            house_position = self._dec2deg(self.user.houses_list[i]["position"])
+            grid_svg += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {house_position}</text>'
+
+            # End the SVG group for the current house
+            grid_svg += "</g>"
+
+            # Move down for the next house
+            vertical_position += 14
+
+        # End the SVG group for the grid
+        grid_svg += "</g>"
+
+        return grid_svg
 
     def _createTemplateDictionary(self) -> ChartTemplateDictionary:
         # self.chart_type = "Transit"
@@ -1446,8 +1444,13 @@ class KerykeionChartSVG:
         td["cfgRotate"] = rotate
         td["cfgTranslate"] = translate
 
-        # functions
-        td["makeZodiac"] = self._makeZodiac(r)
+        # ---
+        # Drawing Functions
+        #--- 
+
+        # Drawing the Zodiac slices
+        td["makeZodiac"] = self._draw_zodiac_circle_slices(r)
+        # TODO: Add the rest of the functions
         td["makeHouses"] = self._makeHouses(r)
         td["makePlanets"] = self._make_planets(r)
         td["makeElements"] = self._makeElements(r)

kerykeion/fetch_geonames.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 

kerykeion/kr_types/__init__.py

@@ -1,3 +1,8 @@
+# -*- coding: utf-8 -*-
+"""
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
+"""
+
 from .kerykeion_exception import KerykeionException
 from .kr_literals import *
 from .kr_models import *

kerykeion/kr_types/kerykeion_exception.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 

kerykeion/kr_types/kr_literals.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 
@@ -56,3 +56,13 @@ Quality = Literal[
 ChartType = Literal["Natal", "ExternalNatal", "Synastry", "Transit"]
 
 LunarPhaseEmoji = Literal["🌑", "🌒", "🌓", "🌔", "🌕", "🌖", "🌗", "🌘"]
+LunarPhaseName = Literal[
+        "New Moon", 
+        "Waxing Crescent", 
+        "First Quarter", 
+        "Waxing Gibbous", 
+        "Full Moon", 
+        "Waning Gibbous", 
+        "Last Quarter", 
+        "Waning Crescent"
+    ]

kerykeion/kr_types/kr_models.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 
 from typing import Literal, Union, Optional
 from pydantic import BaseModel
 
-from .kr_literals import *
+from kerykeion.kr_types import LunarPhaseEmoji, LunarPhaseName, Planet, Houses, Quality, Element, Sign, ZodiacType
 
 
 class LunarPhaseModel(BaseModel):
@@ -15,11 +15,12 @@ class LunarPhaseModel(BaseModel):
     moon_phase: int
     sun_phase: int
     moon_emoji: LunarPhaseEmoji
+    moon_phase_name: LunarPhaseName
 
     def __str__(self):
         return (
             super()
-            .dict(
+            .model_dump(
                 exclude_none=True,
                 exclude_unset=True,
                 exclude_defaults=True,
@@ -73,7 +74,7 @@ class KerykeionPointModel(BaseModel):
     def __str__(self):
         return (
             super()
-            .dict(
+            .model_dump(
                 exclude_none=True,
                 exclude_unset=True,
                 exclude_defaults=True,
@@ -85,7 +86,7 @@ class KerykeionPointModel(BaseModel):
     def __repr__(self):
         return (
             super()
-            .dict(
+            .model_dump(
                 exclude_none=True,
                 exclude_unset=True,
                 exclude_defaults=True,
@@ -162,6 +163,7 @@ class AstrologicalSubjectModel(BaseModel):
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
+
     setup_logging(level="debug")
 
     sun = KerykeionPointModel(
@@ -176,5 +178,5 @@ if __name__ == "__main__":
         point_type="Planet",
     )
 
-    print(sun.json())
+    print(sun.model_dump_json())
     print(sun)

kerykeion/kr_types/settings_models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 
@@ -22,7 +22,7 @@ class CustomBaseModel(BaseModel):
         return getattr(self, item)
     
     def __str__(self) -> str:
-        return str(self.dict())
+        return str(self.model_dump())
 
     def get(self, item, default=None):
         return getattr(self, item, default)

kerykeion/relationship_score.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 from kerykeion import AstrologicalSubject

kerykeion/settings/kerykeion_settings.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 
@@ -60,7 +60,7 @@ def merge_settings(settings: KerykeionSettingsModel, new_settings: Dict) -> Kery
     Returns:
         KerykeionSettingsModel: The new settings
     """
-    new_settings_dict = settings.dict() | new_settings
+    new_settings_dict = settings.model_dump() | new_settings
     return KerykeionSettingsModel(**new_settings_dict)
 
 

kerykeion/utilities.py

@@ -1,6 +1,9 @@
 from kerykeion.kr_types import KerykeionPointModel, KerykeionException, KerykeionSettingsModel, AstrologicalSubjectModel
+from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName
 from typing import Union, Literal
 import logging
+import math
+
 
 
 def get_number_from_name(name: str) -> int:
@@ -220,3 +223,135 @@ def setup_logging(level: str) -> None:
     format: str = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
     loglevel: int = logopt.get(level, logging.INFO)
     logging.basicConfig(format=format, level=loglevel)
+
+def check_if_point_between(
+    start_point: Union[int, float], end_point: Union[int, float], evaluated_point: Union[int, float]
+) -> bool:
+    """
+    Finds if a point is between two other in a circle.
+
+    Args:
+        - start_point: The first point
+        - end_point: The second point
+        - point: The point to check if it is between start_point and end_point
+
+    Returns:
+        - True if point is between start_point and end_point, False otherwise
+    """
+
+    p1_p2 = math.fmod(end_point - start_point + 360, 360)
+    p1_p3 = math.fmod(evaluated_point - start_point + 360, 360)
+
+    if (p1_p2 <= 180) != (p1_p3 > p1_p2):
+        return True
+    else:
+        return False
+
+
+def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut_list: list) -> str:
+    """
+    Returns the house in which a planet is located.
+
+    Args:
+        - planet_position_degree: The position of the planet in degrees
+        - houses_degree_ut_list: A list of the houses in degrees (0-360)
+
+    Returns:
+        - The house in which the planet is located
+    """
+
+    house = None
+    if check_if_point_between(houses_degree_ut_list[0], houses_degree_ut_list[1], planet_position_degree) == True:
+        house = "First_House"
+    elif check_if_point_between(houses_degree_ut_list[1], houses_degree_ut_list[2], planet_position_degree) == True:
+        house = "Second_House"
+    elif check_if_point_between(houses_degree_ut_list[2], houses_degree_ut_list[3], planet_position_degree) == True:
+        house = "Third_House"
+    elif check_if_point_between(houses_degree_ut_list[3], houses_degree_ut_list[4], planet_position_degree) == True:
+        house = "Fourth_House"
+    elif check_if_point_between(houses_degree_ut_list[4], houses_degree_ut_list[5], planet_position_degree) == True:
+        house = "Fifth_House"
+    elif check_if_point_between(houses_degree_ut_list[5], houses_degree_ut_list[6], planet_position_degree) == True:
+        house = "Sixth_House"
+    elif check_if_point_between(houses_degree_ut_list[6], houses_degree_ut_list[7], planet_position_degree) == True:
+        house = "Seventh_House"
+    elif check_if_point_between(houses_degree_ut_list[7], houses_degree_ut_list[8], planet_position_degree) == True:
+        house = "Eighth_House"
+    elif check_if_point_between(houses_degree_ut_list[8], houses_degree_ut_list[9], planet_position_degree) == True:
+        house = "Ninth_House"
+    elif check_if_point_between(houses_degree_ut_list[9], houses_degree_ut_list[10], planet_position_degree) == True:
+        house = "Tenth_House"
+    elif check_if_point_between(houses_degree_ut_list[10], houses_degree_ut_list[11], planet_position_degree) == True:
+        house = "Eleventh_House"
+    elif check_if_point_between(houses_degree_ut_list[11], houses_degree_ut_list[0], planet_position_degree) == True:
+        house = "Twelfth_House"
+    else:
+        raise ValueError("Error in house calculation, planet: ", planet_position_degree)
+
+    return house
+
+def get_moon_emoji_from_phase_int(phase: int) -> LunarPhaseEmoji:
+    """
+    Returns the emoji of the moon phase.
+    
+    Args:
+        - phase: The phase of the moon (0-28)
+    
+    Returns:
+        - The emoji of the moon phase
+    """
+    
+    if phase == 1:
+        result = "🌑"
+    elif phase < 7:
+        result = "🌒"
+    elif 7 <= phase <= 9:
+        result = "🌓"
+    elif phase < 14:
+        result = "🌔"
+    elif phase == 14:
+        result = "🌕"
+    elif phase < 20:
+        result = "🌖"
+    elif 20 <= phase <= 22:
+        result = "🌗"
+    elif phase <= 28:
+        result = "🌘"
+
+    else:
+        raise KerykeionException(f"Error in moon emoji calculation! Phase: {phase}")
+
+    return result
+
+def get_moon_phase_name_from_phase_int(phase: int) -> LunarPhaseName:
+    """
+    Returns the name of the moon phase.
+    
+    Args:
+        - phase: The phase of the moon (0-28)
+    
+    Returns:
+        - The name of the moon phase
+    """
+    
+    if phase == 1:
+        result = "New Moon"
+    elif phase < 7:
+        result = "Waxing Crescent"
+    elif 7 <= phase <= 9:
+        result = "First Quarter"
+    elif phase < 14:
+        result = "Waxing Gibbous"
+    elif phase == 14:
+        result = "Full Moon"
+    elif phase < 20:
+        result = "Waning Gibbous"
+    elif 20 <= phase <= 22:
+        result = "Last Quarter"
+    elif phase <= 28:
+        result = "Waning Crescent"
+
+    else:
+        raise KerykeionException(f"Error in moon name calculation! Phase: {phase}")
+    
+    return result

{kerykeion-4.5.1.dist-info → kerykeion-4.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.5.1
+Version: 4.6.1
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0

kerykeion-4.6.1.dist-info/RECORD

@@ -0,0 +1,32 @@
+LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion/__init__.py,sha256=Z2-gAp09RAl2_WwzPO-OTc4ZRDLh54kTduAoy891gQc,3917
+kerykeion/aspects/__init__.py,sha256=9FlDVI1ndCJga0-chNIhcLitjU_x3kbtAFfFqVp2ejc,293
+kerykeion/aspects/aspects_utils.py,sha256=Rdo3ITDSU80n6U7aazpzzK4ruv7Iui2PaI3zMGqu1NQ,5832
+kerykeion/aspects/natal_aspects.py,sha256=m3_v1dM6YXvENZ6iN_EJkikKxySZBeR5QKhGsaChERk,4507
+kerykeion/aspects/synastry_aspects.py,sha256=uwg7Lc7wKnpxW9ydOdBHqx9cvO_t0ydGfIGluBIDD7c,3993
+kerykeion/astrological_subject.py,sha256=9vLsYZYfAfkR5EJO_EkbkhXa4i788Yv1lCESaQrt5kU,22965
+kerykeion/charts/__init__.py,sha256=Juxkduy2TaagWblh_7CE8Acrg3dHL27-WEddJhau_eQ,127
+kerykeion/charts/charts_utils.py,sha256=jJLgoBcs9e6-ArNFsj_N7Wel0zCzMKEsGrlz_A7MECE,5167
+kerykeion/charts/kerykeion_chart_svg.py,sha256=mx6VOcSCbPJlxNI0rFk-PQAwMvNEM5wbHMpClWV9EcA,64662
+kerykeion/charts/templates/chart.xml,sha256=ZrkqJV3Du8vG1w8kVkM1wI-IiZNVDLDuS6dRtPz7wVo,69874
+kerykeion/enums.py,sha256=Ben9GLYkPucpYY2ZDpURzUbNCc9jzK2MuaffkgiXFdQ,965
+kerykeion/fetch_geonames.py,sha256=fWuhgP_hZTPzDuodu7hvSznzGCWj3IC3vHAX32zPRw8,4444
+kerykeion/kr_types/__init__.py,sha256=-qhGQikurdoHnGtuT1bsaEeZ-IwmZtIHMjGOPC9_oqQ,295
+kerykeion/kr_types/chart_types.py,sha256=PvdOEqzZZBrJxFKQqAC0KcnfIY4T4I2i6CeLQhvVbe8,1945
+kerykeion/kr_types/kerykeion_exception.py,sha256=G-7VFta78qBt10l54JZWvwH-3lUNKmDwuILXaVGVu9A,314
+kerykeion/kr_types/kr_literals.py,sha256=Kc7LfdeTqHi5uDGoQHWsB81GTBc5E-fGxTJqWKK1FFU,1267
+kerykeion/kr_types/kr_models.py,sha256=3gyT4z-J9EM6p5175HKJX9q9WVWQTDt5Y_m3m8lZu9s,4260
+kerykeion/kr_types/settings_models.py,sha256=fueHaDLW2GPQl4HWImUNsWxeM7xcF0JU-fFc3rQqPgE,12743
+kerykeion/relationship_score.py,sha256=R9JugfK5_gJgr5ND-EghkqpqZcutzzKlJ-2JnYUMVv4,6794
+kerykeion/report.py,sha256=kS5avIN119pJVapYjZOvabg77nEcA8sSrOuXbRifABk,2565
+kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
+kerykeion/settings/kerykeion_settings.py,sha256=uRAbhJ0ZXAbGBPGJjhh5u8YX2phcXobEwJA646wMHcM,2347
+kerykeion/settings/kr.config.json,sha256=1Yhv9RGHom5U9e-JZZRWVfT2Ubllz2WrckdwadDWfyg,12282
+kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
+kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
+kerykeion/utilities.py,sha256=ncoXHvzXhNjhdm-uU6hMirVo287laq2GAJElNE6cBZM,10822
+kerykeion-4.6.1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.6.1.dist-info/METADATA,sha256=ex70YSaS2hxS_HFpcfQx0rkIfd0Xpp_PoskW6BNXC90,10311
+kerykeion-4.6.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.6.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.6.1.dist-info/RECORD,,

kerykeion-4.5.1.dist-info/RECORD

@@ -1,32 +0,0 @@
-LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion/__init__.py,sha256=PCtgM8o1R8Poo4RoISq23jLP-74LYWoShnK4bm81Yks,3917
-kerykeion/aspects/__init__.py,sha256=8uOTYtcMwyDBbDjIoz8wvWtdcgdU-86yQeM3EVLwnIA,293
-kerykeion/aspects/aspects_utils.py,sha256=10ozUZ4ZhMJ8e_wOZ02hoW9mHJm_d7bq4QXKG90CeNc,5832
-kerykeion/aspects/natal_aspects.py,sha256=k3L6wLec7l7BF1jKULN8rNlQNOhINnfPN6x8MixoMMo,4507
-kerykeion/aspects/synastry_aspects.py,sha256=rM_of6GU-ZQL1A6JaLsG59MTaAeWx29MWRf9te9hHeg,3993
-kerykeion/astrological_subject.py,sha256=PjupScv1RFmQyqRwJWBG6lJX1KyZJzek2L3V37Kb19I,25678
-kerykeion/charts/__init__.py,sha256=3WzR2n9dr6MDzjTbEQOYpXSFlhfMfga5YWNsPawdbRw,127
-kerykeion/charts/charts_utils.py,sha256=qQMXu5XZCCjvyqL62fzh4JnKLzd_G6u9pcMk6f1DpIc,3197
-kerykeion/charts/kerykeion_chart_svg.py,sha256=-5kclHKKL8kya2lFFnw5pZiygck82lAFBSI-eyse8lk,65295
-kerykeion/charts/templates/chart.xml,sha256=ZrkqJV3Du8vG1w8kVkM1wI-IiZNVDLDuS6dRtPz7wVo,69874
-kerykeion/enums.py,sha256=Ben9GLYkPucpYY2ZDpURzUbNCc9jzK2MuaffkgiXFdQ,965
-kerykeion/fetch_geonames.py,sha256=NwiRzl-OlA2yoEtgHEvdgWeed42cpcONmOhb9s-DAOY,4444
-kerykeion/kr_types/__init__.py,sha256=-vRe-jixD6n8d7vsLSwbbvU4c2RXOoVvv0pjbX-9eiY,205
-kerykeion/kr_types/chart_types.py,sha256=PvdOEqzZZBrJxFKQqAC0KcnfIY4T4I2i6CeLQhvVbe8,1945
-kerykeion/kr_types/kerykeion_exception.py,sha256=CtdpOaGTox_LBGB0Ji_qtcwbgYAqBJ8AfDXbeaiAkM0,314
-kerykeion/kr_types/kr_literals.py,sha256=hbgeq5yPuyLv9zXp7shBeEsMHOd8UQBBUa_HQnBQu7w,1034
-kerykeion/kr_types/kr_models.py,sha256=q34Dp0nRu9BZ7Wk_1oBCXpOxmK665gHmVlPBLXNoOe0,4106
-kerykeion/kr_types/settings_models.py,sha256=4dOTAy6UgevF9dGPnBLIp4Aw5FBEygifnjDO8kALmdw,12737
-kerykeion/relationship_score.py,sha256=IPO8IH9J6GOYuuAfn01d0KamY1xSIjl391Zvk5F434Y,6794
-kerykeion/report.py,sha256=kS5avIN119pJVapYjZOvabg77nEcA8sSrOuXbRifABk,2565
-kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
-kerykeion/settings/kerykeion_settings.py,sha256=vZCpWpTHVD3ItERWzsVW3syhgchJbWaPqGN6bsSl6vQ,2341
-kerykeion/settings/kr.config.json,sha256=1Yhv9RGHom5U9e-JZZRWVfT2Ubllz2WrckdwadDWfyg,12282
-kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
-kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
-kerykeion/utilities.py,sha256=LOug1qgHoR12hNvL2hqdRWTnTHst4BdzY6u1dl3PfL0,6207
-kerykeion-4.5.1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.5.1.dist-info/METADATA,sha256=WHRoRCegIbOD5j7kII32Wo68NBK0YRGjmKIyHp5k8uA,10311
-kerykeion-4.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-kerykeion-4.5.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.5.1.dist-info/RECORD,,