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

kerykeion/utilities.py

@@ -1,15 +1,24 @@
-from kerykeion.kr_types import KerykeionPointModel, KerykeionException, ZodiacSignModel, AstrologicalSubjectModel, LunarPhaseModel
-from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, Planet, Houses, AxialCusps
+from kerykeion.kr_types import (
+    KerykeionPointModel,
+    KerykeionException,
+    ZodiacSignModel,
+    AstrologicalSubjectModel,
+    LunarPhaseModel,
+    CompositeSubjectModel,
+    PlanetReturnModel,
+)
+from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, AstrologicalPoint, Houses
 from typing import Union, get_args, TYPE_CHECKING
 import logging
 import math
 import re
+from datetime import datetime
 
 if TYPE_CHECKING:
-    from kerykeion import AstrologicalSubject
+    from kerykeion import AstrologicalSubjectFactory
 
 
-def get_number_from_name(name: Planet) -> int:
+def get_number_from_name(name: AstrologicalPoint) -> int:
     """Utility function, gets planet id from the name."""
 
     if name == "Sun":
@@ -45,20 +54,20 @@ def get_number_from_name(name: Planet) -> int:
         return 15
     elif name == "Mean_Lilith":
         return 12
-    elif name == "Ascendant": # TODO: Is this needed?
+    elif name == "Ascendant":  # TODO: Is this needed?
         return 9900
-    elif name == "Descendant": # TODO: Is this needed?
+    elif name == "Descendant":  # TODO: Is this needed?
         return 9901
-    elif name == "Medium_Coeli": # TODO: Is this needed?
+    elif name == "Medium_Coeli":  # TODO: Is this needed?
         return 9902
-    elif name == "Imum_Coeli": # TODO: Is this needed?
+    elif name == "Imum_Coeli":  # TODO: Is this needed?
         return 9903
     else:
         raise KerykeionException(f"Error in getting number from name! Name: {name}")
 
 
 def get_kerykeion_point_from_degree(
-    degree: Union[int, float], name: Union[Planet, Houses, AxialCusps], point_type: PointType
+    degree: Union[int, float], name: Union[AstrologicalPoint, Houses], point_type: PointType
 ) -> KerykeionPointModel:
     """
     Returns a KerykeionPointModel object based on the given degree.
@@ -74,8 +83,11 @@ def get_kerykeion_point_from_degree(
     Returns:
         KerykeionPointModel: The model representing the celestial point.
     """
+    # If - single degree is given, convert it to a positive degree
+    if degree < 0:
+        degree = degree % 360
 
-    if degree < 0 or degree >= 360:
+    if degree >= 360:
         raise KerykeionException(f"Error in calculating positions! Degrees: {degree}")
 
     ZODIAC_SIGNS = {
@@ -109,6 +121,7 @@ def get_kerykeion_point_from_degree(
         point_type=point_type,
     )
 
+
 def setup_logging(level: str) -> None:
     """
     Setup logging for testing.
@@ -129,9 +142,7 @@ def setup_logging(level: str) -> None:
 
 
 def is_point_between(
-    start_point: Union[int, float],
-    end_point: Union[int, float],
-    evaluated_point: Union[int, float]
+    start_point: Union[int, float], end_point: Union[int, float], evaluated_point: Union[int, float]
 ) -> bool:
     """
     Determines if a point is between two others on a circle, with additional rules:
@@ -159,7 +170,9 @@ def is_point_between(
     # Ensure the range is not greater than 180°. Otherwise, it is not truly defined what
     # being located in between two points on a circle actually means.
     if angular_difference > 180:
-        raise KerykeionException(f"The angle between start and end point is not allowed to exceed 180°, yet is: {angular_difference}")
+        raise KerykeionException(
+            f"The angle between start and end point is not allowed to exceed 180°, yet is: {angular_difference}"
+        )
 
     # Handle explicitly when evaluated_point == start_point. Note: It may happen for mathematical
     # reasons that evaluated_point and start_point deviate very slightly from each other, but
@@ -178,7 +191,6 @@ def is_point_between(
     return (0 <= p1_p3) and (p1_p3 < angular_difference)
 
 
-
 def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut_list: list) -> Houses:
     """
     Determines the house in which a planet is located based on its position in degrees.
@@ -243,6 +255,7 @@ def get_moon_emoji_from_phase_int(phase: int) -> LunarPhaseEmoji:
 
     return result
 
+
 def get_moon_phase_name_from_phase_int(phase: int) -> LunarPhaseName:
     """
     Returns the name of the moon phase.
@@ -255,11 +268,10 @@ def get_moon_phase_name_from_phase_int(phase: int) -> LunarPhaseName:
     """
     lunar_phase_names = get_args(LunarPhaseName)
 
-
     if phase == 1:
         result = lunar_phase_names[0]
     elif phase < 7:
-        result =  lunar_phase_names[1]
+        result = lunar_phase_names[1]
     elif 7 <= phase <= 9:
         result = lunar_phase_names[2]
     elif phase < 14:
@@ -281,8 +293,8 @@ def get_moon_phase_name_from_phase_int(phase: int) -> LunarPhaseName:
 
 def check_and_adjust_polar_latitude(latitude: float) -> float:
     """
-        Utility function to check if the location is in the polar circle.
-        If it is, it sets the latitude to 66 or -66 degrees.
+    Utility function to check if the location is in the polar circle.
+    If it is, it sets the latitude to 66 or -66 degrees.
     """
     if latitude > 66.0:
         latitude = 66.0
@@ -295,28 +307,29 @@ def check_and_adjust_polar_latitude(latitude: float) -> float:
     return latitude
 
 
-def get_houses_list(subject: Union["AstrologicalSubject", AstrologicalSubjectModel]) -> list[KerykeionPointModel]:
+def get_houses_list(
+    subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel]
+) -> list[KerykeionPointModel]:
     """
     Return the names of the houses in the order of the houses.
     """
     houses_absolute_position_list = []
     for house in subject.houses_names_list:
-            houses_absolute_position_list.append(subject[house.lower()])
+        houses_absolute_position_list.append(subject[house.lower()])
 
     return houses_absolute_position_list
 
 
-def get_available_astrological_points_list(subject: Union["AstrologicalSubject", AstrologicalSubjectModel]) -> list[KerykeionPointModel]:
+def get_available_astrological_points_list(
+    subject: AstrologicalSubjectModel
+) -> list[KerykeionPointModel]:
     """
     Return the names of the planets in the order of the planets.
     The names can be used to access the planets from the AstrologicalSubject object with the __getitem__ method or the [] operator.
     """
     planets_absolute_position_list = []
-    for planet in subject.planets_names_list:
-            planets_absolute_position_list.append(subject[planet.lower()])
-
-    for axis in subject.axial_cusps_names_list:
-        planets_absolute_position_list.append(subject[axis.lower()])
+    for planet in subject.active_points:
+        planets_absolute_position_list.append(subject[planet.lower()])
 
     return planets_absolute_position_list
 
@@ -387,7 +400,7 @@ def calculate_moon_phase(moon_abs_pos: float, sun_abs_pos: float) -> LunarPhaseM
         "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)
+        "moon_phase_name": get_moon_phase_name_from_phase_int(moon_phase),
     }
 
     return LunarPhaseModel(**lunar_phase_dictionary)
@@ -490,8 +503,192 @@ def inline_css_variables_in_svg(svg_content: str) -> str:
     # This handles nested variables or variables that reference other variables
     processed_svg = svg_without_style_blocks
     while variable_usage_pattern.search(processed_svg):
-        processed_svg = variable_usage_pattern.sub(
-            lambda m: replace_css_variable_reference(m), processed_svg
-        )
+        processed_svg = variable_usage_pattern.sub(lambda m: replace_css_variable_reference(m), processed_svg)
 
     return processed_svg
+
+
+def datetime_to_julian(dt: datetime) -> float:
+    """
+    Converts a Python datetime object to Julian day.
+
+    Args:
+        dt: A datetime object
+
+    Returns:
+        float: The corresponding Julian day (JD)
+    """
+    # Extract year, month and day
+    year = dt.year
+    month = dt.month
+    day = dt.day
+
+    # Adjust month and year according to the conversion formula
+    if month <= 2:
+        year -= 1
+        month += 12
+
+    # Calculate century and year in century
+    a = year // 100
+    b = 2 - a + (a // 4)
+
+    # Calculate the Julian day
+    jd = int(365.25 * (year + 4716)) + int(30.6001 * (month + 1)) + day + b - 1524.5
+
+    # Add the time portion
+    hour = dt.hour
+    minute = dt.minute
+    second = dt.second
+    microsecond = dt.microsecond
+
+    jd += (hour + minute / 60 + second / 3600 + microsecond / 3600000000) / 24
+
+    return jd
+
+
+def julian_to_datetime(jd):
+    """
+    Converts a Julian day to a Python datetime object.
+
+    Args:
+        jd: Julian day number (float)
+
+    Returns:
+        datetime: The corresponding datetime object
+    """
+    # Add 0.5 to the Julian day to adjust for noon-based Julian day
+    jd_plus = jd + 0.5
+
+    # Integer and fractional parts
+    Z = int(jd_plus)
+    F = jd_plus - Z
+
+    # Calculate alpha
+    if Z < 2299161:
+        A = Z  # Julian calendar
+    else:
+        alpha = int((Z - 1867216.25) / 36524.25)
+        A = Z + 1 + alpha - int(alpha / 4)  # Gregorian calendar
+
+    # Calculate B
+    B = A + 1524
+
+    # Calculate C
+    C = int((B - 122.1) / 365.25)
+
+    # Calculate D
+    D = int(365.25 * C)
+
+    # Calculate E
+    E = int((B - D) / 30.6001)
+
+    # Calculate day and month
+    day = B - D - int(30.6001 * E) + F
+
+    # Integer part of day
+    day_int = int(day)
+
+    # Fractional part converted to hours, minutes, seconds, microseconds
+    day_frac = day - day_int
+    hours = int(day_frac * 24)
+    minutes = int((day_frac * 24 - hours) * 60)
+    seconds = int((day_frac * 24 * 60 - hours * 60 - minutes) * 60)
+    microseconds = int(((day_frac * 24 * 60 - hours * 60 - minutes) * 60 - seconds) * 1000000)
+
+    # Calculate month
+    if E < 14:
+        month = E - 1
+    else:
+        month = E - 13
+
+    # Calculate year
+    if month > 2:
+        year = C - 4716
+    else:
+        year = C - 4715
+
+    # Create and return datetime object
+    return datetime(year, month, day_int, hours, minutes, seconds, microseconds)
+
+
+def get_house_name(house_number: int) -> Houses:
+    """
+    Returns the name of the house based on its number.
+
+    Args:
+        house_number: House number (1-12)
+
+    Returns:
+        Name of the house
+    """
+    house_names: dict[int, Houses] = {
+        1: "First_House",
+        2: "Second_House",
+        3: "Third_House",
+        4: "Fourth_House",
+        5: "Fifth_House",
+        6: "Sixth_House",
+        7: "Seventh_House",
+        8: "Eighth_House",
+        9: "Ninth_House",
+        10: "Tenth_House",
+        11: "Eleventh_House",
+        12: "Twelfth_House",
+    }
+
+    name = house_names.get(house_number, None)
+    if name is None:
+        raise ValueError(f"Invalid house number: {house_number}")
+
+    return name
+
+
+def get_house_number(house_name: Houses) -> int:
+    """
+    Returns the number of the house based on its name.
+
+    Args:
+        house_name: Name of the house
+
+    Returns:
+        House number (1-12)
+    """
+    house_numbers: dict[Houses, int] = {
+        "First_House": 1,
+        "Second_House": 2,
+        "Third_House": 3,
+        "Fourth_House": 4,
+        "Fifth_House": 5,
+        "Sixth_House": 6,
+        "Seventh_House": 7,
+        "Eighth_House": 8,
+        "Ninth_House": 9,
+        "Tenth_House": 10,
+        "Eleventh_House": 11,
+        "Twelfth_House": 12,
+    }
+
+    number = house_numbers.get(house_name, None)
+    if number is None:
+        raise ValueError(f"Invalid house name: {house_name}")
+
+    return number
+
+
+def find_common_active_points(first_points: list[AstrologicalPoint], second_points: list[AstrologicalPoint]) -> list[AstrologicalPoint]:
+    """
+        Find the common astrological points between those available in the subject and those requested.
+
+        Args:
+            first_points: List of points available in the astrological subject
+            second_points: List of points requested by the user
+
+        Returns:
+            List containing only the requested points that are also available in the subject
+    """
+    common_points: list[AstrologicalPoint]
+    common_points = [point for point in second_points if point in first_points]
+
+    ignored_points = set(second_points) - set(common_points)
+
+    return common_points

{kerykeion-4.26.2.dist-info → kerykeion-5.0.0a1.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: kerykeion
-Version: 4.26.2
+Version: 5.0.0a1
 Summary: A python library for astrology.
-Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
 Keywords: astrology,ephemeris,astrology library,birtchart,svg,zodiac,zodiac-sing,astronomical-algorithms,synastry,astrology-calculator
 Author: Giacomo Battaglia
@@ -34,6 +33,7 @@ Requires-Dist: requests-cache (>=1.2.1,<2.0.0)
 Requires-Dist: scour (>=0.38.2,<0.39.0)
 Requires-Dist: simple-ascii-tables (>=1.0.0,<2.0.0)
 Requires-Dist: typing-extensions (>=4.12.2,<5.0.0)
+Project-URL: Homepage, https://www.kerykeion.net/
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion
 Description-Content-Type: text/markdown
 

kerykeion-5.0.0a1.dist-info/RECORD

@@ -0,0 +1,56 @@
+kerykeion/__init__.py,sha256=X2UY4tkmzUb3UkNYfdUaxhnDuSeWZvyMBdFQpb7HPQE,1008
+kerykeion/aspects/__init__.py,sha256=9kx_Rx1NJx5SM7nDCSbI79S1neZ3c-q2NvQr-S6A9PY,292
+kerykeion/aspects/aspects_utils.py,sha256=NgxdeKd9CAPbzFlLe-yr9RFumM0Cc0kfWEONYREOFJ4,3252
+kerykeion/aspects/natal_aspects.py,sha256=SfI3ferjtyV47fBG6q3q1aczc-GFOwN4P7WpyZTgPSA,7269
+kerykeion/aspects/synastry_aspects.py,sha256=4ZBiFrbyyXxclnyaEIBeLJQO3uQVnpsqvI5Kj3-ijuI,5979
+kerykeion/aspects/transits_time_range.py,sha256=E03BJYcNK3kO30EC96Ys2EaH-EDyZF2nj4C7_LcFrOk,1182
+kerykeion/astrological_subject_factory.py,sha256=hakOwdD_yuG4c62sfwbeOz5fn_JIziz9Cv0COv4oNdQ,52009
+kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
+kerykeion/charts/charts_utils.py,sha256=oz8HNs-BxiKJ_p6wxhA1U1CTjevVttTJh0ZBB_JdrHY,61390
+kerykeion/charts/draw_planets.py,sha256=dbVCA4MFs7ChZKH4w1eErBiF_mluuxAD4fouBrXs-x0,17696
+kerykeion/charts/draw_planets_v2.py,sha256=IqyTLs1salrfJguwMtEpuscXg3kqyrrAAdXuGqzl-XQ,27630
+kerykeion/charts/kerykeion_chart_svg.py,sha256=5MawAcARnM-S0i6J22yiUuEuWp_DNLooHNarbyOn5-c,91695
+kerykeion/charts/templates/aspect_grid_only.xml,sha256=ZiBVeToVmCA8QxYlB_cfnsAO1NNeQAnJ_6rIYkr4F58,70091
+kerykeion/charts/templates/chart.xml,sha256=AaV9bqzTwmQaD6Pq7BRsXNYZ1CBvPR_XhGjPV80NC9c,79695
+kerykeion/charts/templates/wheel_only.xml,sha256=hSV4FYD7qLKd93jq82B9mnGoH0PKyMRaqp3jL16T9YI,71287
+kerykeion/charts/themes/classic.css,sha256=KZD9pg63rDWO3GeV1QgNSCM6JZO4qBjH8hI8MQRe2Vg,4344
+kerykeion/charts/themes/dark-high-contrast.css,sha256=k73G2A5mtLhRqcuIUpd803sIh_7e504rqSgaP_YbNVA,7236
+kerykeion/charts/themes/dark.css,sha256=q7cUSl2BWqDfur8h67DjDjiZ5Kgy5UA0oni-c-ro6TI,7311
+kerykeion/charts/themes/light.css,sha256=8UvlwNFc66s5fPHv4wfeSHNHYwHM_YQnO9jg5Jy4amw,7320
+kerykeion/charts/themes/strawberry.css,sha256=0ydvGeNBctktFrC-UOFZTTzNJ36oVpERD-x4krKovB8,8044
+kerykeion/composite_subject_factory.py,sha256=d3omKRw7AlJFQVrOa1nBOu9jQx7W-2UrL8V7TKyVXHg,7551
+kerykeion/enums.py,sha256=nPXgP_ocsRnRno5H-yunZy3fp-hLZ9aYRaUb-2gBdvw,1199
+kerykeion/ephemeris_data.py,sha256=h56Y4FCTYPcIzSnDiKNXYzEpeiqU554ccUmfXENigls,10750
+kerykeion/fetch_geonames.py,sha256=e66Nh6yq9A4VjnuvVSiV1TW1IkJ9m3Q2LKPWrkOGgO0,4764
+kerykeion/house_comparison/__init__.py,sha256=FQutYoG1T_ljkjJ0OAFvkeH8rASwMK7ieCpH_hDFJWU,139
+kerykeion/house_comparison/house_comparison_factory.py,sha256=R3O3R786yH6W2c8cKma8P7FNXU6JGl29omRHmucNN_Q,3369
+kerykeion/house_comparison/house_comparison_models.py,sha256=R9EW5F3fiIKIm8qrwTxtXhNOGDpf1-Lh9hbM1uK83oE,1549
+kerykeion/house_comparison/house_comparison_utils.py,sha256=BXDXmxeLSwEDbum-APNzdwK3FjweCEaoY_Z3V1kGMIk,3851
+kerykeion/kr_types/__init__.py,sha256=jshJOccCQcYZuoOvrILRZH6imy4RBvKpFPujlNLFyGE,295
+kerykeion/kr_types/chart_types.py,sha256=4kyQg6KtLsoMc_BytRT4s11UMljc7VjrGw9fvWnn-8M,2235
+kerykeion/kr_types/kerykeion_exception.py,sha256=kE1y0K0rmuz32b4K_ZppSsZ59I2Get0ZkvOkTE5HejI,314
+kerykeion/kr_types/kr_literals.py,sha256=4kJhzm_0LERiJEJks0KgDyThueMZj_F1OK2Far5SMZc,4870
+kerykeion/kr_types/kr_models.py,sha256=ZHnE5ABCYs1oB3UvGGNs3gjaphY9A64UUsDArRTqOt4,8227
+kerykeion/kr_types/settings_models.py,sha256=qKlcn-Go1dAhC7oMFY_saogNcRa4WvKSewyvsKZt2S0,16604
+kerykeion/planetary_return_factory.py,sha256=HHEELll_eW964tvEOvT1YiJF6mBnc8NuQCi6hSgviQ0,11395
+kerykeion/relationship_score/__init__.py,sha256=cLaEBQXQBfyRkv0OaS3ceLROzvWcvKXWiRq0PS6LDjY,114
+kerykeion/relationship_score/relationship_score.py,sha256=rdkNH4X5PROd2uqAmNXBVzlfnPCmdNUiG04q0W01ngI,6455
+kerykeion/relationship_score/relationship_score_factory.py,sha256=PWMrboHqf_Ji07zJN_h8_C61u7YnlrTfJH-SGVVCZts,8500
+kerykeion/report.py,sha256=w4KNQz0ADPPXE60PX6NVTxjppZ9q_naSbgYKQiX6Epk,2827
+kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
+kerykeion/settings/config_constants.py,sha256=R4fEe4WzRSq3BXqsnfgHj1oe_swkVMx3iGe-C_Zu0mw,1772
+kerykeion/settings/kerykeion_settings.py,sha256=umd8TZy-8ywowsd4TTkhwxSLLyX3xYj3A1zvNsTV_Y8,2955
+kerykeion/settings/kr.config.json,sha256=zpIqaxE4Af-g9heBWPTGj5giuZLL3dk2TdqOwBiDn78,55380
+kerykeion/settings/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kerykeion/settings/legacy/legacy_celestial_points_settings.py,sha256=YMvHhY8IQ_nNHf1-9JCSgRzTMQJaxXZfROztEhlP4Ac,6870
+kerykeion/settings/legacy/legacy_chart_aspects_settings.py,sha256=tO4tgPgPP07_wu9f8SXyJQ9WrTh3iWz4YvBS2axCGU8,1650
+kerykeion/settings/legacy/legacy_color_settings.py,sha256=gBUmGSNvvLzRYbdVtzwTDnMwWoh4tOCyT_9Q6aQRv_s,2620
+kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
+kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
+kerykeion/transits_time_range.py,sha256=iJSkXcNKJBcfrN8gN9P0xGKLsRBwJs-mMuAtPsvUqNE,5505
+kerykeion/utilities.py,sha256=9dYu3sF_g2Sv5uPiCylbb6-uPoG3eJqKfA6FUQpvhfM,22435
+kerykeion-5.0.0a1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.0.0a1.dist-info/METADATA,sha256=b_TnYJJjfJdrincsYHnvsKLs3Svl2exzbjTq0FTAyac,23594
+kerykeion-5.0.0a1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+kerykeion-5.0.0a1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-5.0.0a1.dist-info/RECORD,,

{kerykeion-4.26.2.dist-info → kerykeion-5.0.0a1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any