kerykeion 5.1.5__py3-none-any.whl → 5.1.7__py3-none-any.whl

kerykeion/astrological_subject_factory.py

@@ -59,7 +59,8 @@ from kerykeion.utilities import (
     check_and_adjust_polar_latitude,
     calculate_moon_phase,
     datetime_to_julian,
-    get_house_number
+    get_house_number,
+    normalize_zodiac_type,
 )
 from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 
@@ -67,7 +68,7 @@ from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 DEFAULT_GEONAMES_USERNAME = "century.boy"
 DEFAULT_SIDEREAL_MODE: SiderealMode = "FAGAN_BRADLEY"
 DEFAULT_HOUSES_SYSTEM_IDENTIFIER: HousesSystemIdentifier = "P"
-DEFAULT_ZODIAC_TYPE: ZodiacType = "Tropic"
+DEFAULT_ZODIAC_TYPE: ZodiacType = "Tropical"
 DEFAULT_PERSPECTIVE_TYPE: PerspectiveType = "Apparent Geocentric"
 DEFAULT_GEONAMES_CACHE_EXPIRE_AFTER_DAYS = 30
 
@@ -148,8 +149,8 @@ class ChartConfiguration:
     combinations.
 
     Attributes:
-        zodiac_type (ZodiacType): The zodiac system to use ('Tropic' or 'Sidereal').
-            Defaults to 'Tropic'.
+        zodiac_type (ZodiacType): The zodiac system to use ('Tropical' or 'Sidereal').
+            Defaults to 'Tropical'.
         sidereal_mode (Optional[SiderealMode]): The sidereal calculation mode when using
             sidereal zodiac. Only required/used when zodiac_type is 'Sidereal'.
             Defaults to None (auto-set to FAGAN_BRADLEY for sidereal).
@@ -198,14 +199,17 @@ class ChartConfiguration:
             - Logs informational message when setting default sidereal mode
         """
         # Validate zodiac type
-        if self.zodiac_type not in get_args(ZodiacType):
-            raise KerykeionException(
-                f"'{self.zodiac_type}' is not a valid zodiac type! Available types are: {get_args(ZodiacType)}"
-            )
+        try:
+            normalized_zodiac_type = normalize_zodiac_type(self.zodiac_type)
+        except ValueError as exc:
+            raise KerykeionException(str(exc)) from exc
+        else:
+            if normalized_zodiac_type != self.zodiac_type:
+                self.zodiac_type = normalized_zodiac_type
 
         # Validate sidereal mode settings
-        if self.sidereal_mode and self.zodiac_type == "Tropic":
-            raise KerykeionException("You can't set a sidereal mode with a Tropic zodiac type!")
+        if self.sidereal_mode and self.zodiac_type == "Tropical":
+            raise KerykeionException("You can't set a sidereal mode with a Tropical zodiac type!")
 
         if self.zodiac_type == "Sidereal":
             if not self.sidereal_mode:
@@ -475,8 +479,8 @@ class AstrologicalSubjectFactory:
                 online location lookup. Get one free at geonames.org.
             online (bool, optional): Whether to fetch location data online. If False,
                 lng, lat, and tz_str must be provided. Defaults to True.
-            zodiac_type (ZodiacType, optional): Zodiac system - 'Tropic' or 'Sidereal'.
-                Defaults to 'Tropic'.
+            zodiac_type (ZodiacType, optional): Zodiac system - 'Tropical' or 'Sidereal'.
+                Defaults to 'Tropical'.
             sidereal_mode (SiderealMode, optional): Sidereal calculation mode (e.g.,
                 'FAGAN_BRADLEY', 'LAHIRI'). Only used with zodiac_type='Sidereal'.
             houses_system_identifier (HousesSystemIdentifier, optional): House system
@@ -726,7 +730,7 @@ class AstrologicalSubjectFactory:
                 or as fallback. Defaults to 51.5074 (Greenwich).
             geonames_username (str, optional): GeoNames API username. Required when
                 online=True. Defaults to DEFAULT_GEONAMES_USERNAME.
-            zodiac_type (ZodiacType, optional): Zodiac system. Defaults to 'Tropic'.
+            zodiac_type (ZodiacType, optional): Zodiac system. Defaults to 'Tropical'.
             sidereal_mode (SiderealMode, optional): Sidereal mode when zodiac_type
                 is 'Sidereal'. Defaults to None.
             houses_system_identifier (HousesSystemIdentifier, optional): House system.
@@ -866,7 +870,7 @@ class AstrologicalSubjectFactory:
             online (bool, optional): Whether to fetch location data online.
                 Defaults to True.
             zodiac_type (ZodiacType, optional): Zodiac system to use.
-                Defaults to 'Tropic'.
+                Defaults to 'Tropical'.
             sidereal_mode (SiderealMode, optional): Sidereal calculation mode.
                 Only used when zodiac_type is 'Sidereal'. Defaults to None.
             houses_system_identifier (HousesSystemIdentifier, optional): House

kerykeion/backword.py

@@ -36,6 +36,7 @@ from .chart_data_factory import ChartDataFactory
 from .charts.chart_drawer import ChartDrawer
 from .aspects import AspectsFactory
 from .settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
+from .utilities import normalize_zodiac_type
 from .schemas.kr_models import (
     AstrologicalSubjectModel,
     CompositeSubjectModel,
@@ -74,6 +75,42 @@ LEGACY_NODE_NAMES_MAP = {
 }
 
 
+def _normalize_zodiac_type_with_warning(zodiac_type: Optional[Union[str, ZodiacType]]) -> Optional[ZodiacType]:
+    """Normalize legacy zodiac type values with deprecation warning.
+
+    Wraps the utilities.normalize_zodiac_type function and adds a deprecation
+    warning for legacy formats like "tropic" or case-insensitive variants.
+
+    Args:
+        zodiac_type: Input zodiac type (may be legacy format)
+
+    Returns:
+        Normalized ZodiacType or None if input was None
+    """
+    if zodiac_type is None:
+        return None
+
+    zodiac_str = str(zodiac_type)
+
+    # Check if this is a legacy format (case-insensitive "tropic" or non-canonical case)
+    zodiac_lower = zodiac_str.lower()
+    if zodiac_lower in ("tropic", "tropical", "sidereal") and zodiac_str not in ("Tropical", "Sidereal"):
+        # Normalize using the utilities function
+        normalized = normalize_zodiac_type(zodiac_str)
+
+        # Emit deprecation warning for legacy usage
+        warnings.warn(
+            f"Zodiac type '{zodiac_str}' is deprecated in Kerykeion v5. "
+            f"Use '{normalized}' instead.",
+            DeprecationWarning,
+            stacklevel=4,
+        )
+        return normalized
+
+    # Already in correct format or will be normalized by utilities function
+    return cast(ZodiacType, normalize_zodiac_type(zodiac_str))
+
+
 def _normalize_active_points(points: Optional[Iterable[Union[str, AstrologicalPoint]]]) -> Optional[List[AstrologicalPoint]]:
     """Best-effort normalization of legacy string active points list.
 
@@ -159,7 +196,10 @@ class AstrologicalSubject:
                 stacklevel=2,
             )
 
+        # Normalize legacy zodiac type values
+        zodiac_type = _normalize_zodiac_type_with_warning(zodiac_type)
         zodiac_type = DEFAULT_ZODIAC_TYPE if zodiac_type is None else zodiac_type
+
         houses_system_identifier = (
             DEFAULT_HOUSES_SYSTEM_IDENTIFIER if houses_system_identifier is None else houses_system_identifier
         )
@@ -352,6 +392,9 @@ class AstrologicalSubject:
         if online and resolved_geonames == DEFAULT_GEONAMES_USERNAME:
             warnings.warn(GEONAMES_DEFAULT_USERNAME_WARNING, UserWarning, stacklevel=2)
 
+        # Normalize legacy zodiac type values
+        normalized_zodiac_type = _normalize_zodiac_type_with_warning(zodiac_type)
+
         model = AstrologicalSubjectFactory.from_iso_utc_time(
             name=name,
             iso_utc_time=iso_utc_time,
@@ -362,7 +405,7 @@ class AstrologicalSubject:
             lng=float(lng),
             lat=float(lat),
             geonames_username=resolved_geonames,
-            zodiac_type=(zodiac_type or DEFAULT_ZODIAC_TYPE),  # type: ignore[arg-type]
+            zodiac_type=(normalized_zodiac_type or DEFAULT_ZODIAC_TYPE),  # type: ignore[arg-type]
             sidereal_mode=sidereal_mode,
             houses_system_identifier=(houses_system_identifier or DEFAULT_HOUSES_SYSTEM_IDENTIFIER),  # type: ignore[arg-type]
             perspective_type=(perspective_type or DEFAULT_PERSPECTIVE_TYPE),  # type: ignore[arg-type]

kerykeion/charts/chart_drawer.py

@@ -78,6 +78,9 @@ from kerykeion.settings.chart_defaults import (
 from typing import List, Literal
 
 
+logger = logging.getLogger(__name__)
+
+
 class ChartDrawer:
     """
     ChartDrawer generates astrological chart visualizations as SVG files from pre-computed chart data.
@@ -315,7 +318,7 @@ class ChartDrawer:
 
         active_points_count = len(self.available_planets_setting)
         if active_points_count > 24:
-            logging.warning(
+            logger.warning(
                 "ChartDrawer detected %s active celestial points; rendering may look crowded beyond 24.",
                 active_points_count,
             )
@@ -856,7 +859,7 @@ class ChartDrawer:
         try:
             required_width = self._estimate_required_width_full()
         except Exception as e:
-            logging.debug(f"Auto-size width calculation failed: {e}")
+            logger.debug("Auto-size width calculation failed: %s", e)
             return
 
         minimum_width = self._minimum_width_for_chart_type()
@@ -1271,7 +1274,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = f"{self._translate('day_of_week', 'Day of Week')}: {localized_weekday}" # type: ignore
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1433,7 +1436,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1589,7 +1592,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = ""#f"{self._translate('type', 'Type')}: {self._translate(self.chart_type, self.chart_type)}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1609,9 +1612,9 @@ class ChartDrawer:
 
             template_dict["bottom_left_4"] = f'{self._translate("perspective_type", "Perspective")}: {self._translate(self.second_obj.perspective_type.lower().replace(" ", "_"), self.second_obj.perspective_type)}' # type: ignore
 
-            # Moon phase section calculations - use first_obj for visualization
-            if self.first_obj.lunar_phase is not None:
-                template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            # Moon phase section calculations - use transit subject data only
+            if self.second_obj is not None and getattr(self.second_obj, "lunar_phase", None):
+                template_dict["makeLunarPhase"] = makeLunarPhase(self.second_obj.lunar_phase["degrees_between_s_m"], self.geolat)
             else:
                 template_dict["makeLunarPhase"] = ""
 
@@ -1767,7 +1770,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = format_datetime_with_timezone(self.second_obj.iso_formatted_local_datetime) # type: ignore
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1967,7 +1970,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -2140,7 +2143,7 @@ class ChartDrawer:
                 template_dict["top_left_5"] = f"{self._translate('type', 'Type')}: {self._translate('lunar_return', 'Lunar Return')}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -2237,7 +2240,7 @@ class ChartDrawer:
 
         # return filename
 
-        logging.debug(f"Template dictionary has {len(td.model_dump())} fields")
+        logger.debug("Template dictionary includes %s fields", len(td.model_dump()))
 
         self._create_template_dictionary()
 

kerykeion/ephemeris_data_factory.py

@@ -48,10 +48,19 @@ License: AGPL-3.0
 
 from kerykeion import AstrologicalSubjectFactory
 from kerykeion.schemas.kr_models import AstrologicalSubjectModel
-from kerykeion.utilities import get_houses_list, get_available_astrological_points_list
+from kerykeion.utilities import (
+    get_houses_list,
+    get_available_astrological_points_list,
+    normalize_zodiac_type,
+)
 from kerykeion.astrological_subject_factory import DEFAULT_HOUSES_SYSTEM_IDENTIFIER, DEFAULT_PERSPECTIVE_TYPE, DEFAULT_ZODIAC_TYPE
-from kerykeion.schemas import EphemerisDictModel
-from kerykeion.schemas import SiderealMode, HousesSystemIdentifier, PerspectiveType, ZodiacType
+from kerykeion.schemas import (
+    EphemerisDictModel,
+    SiderealMode,
+    HousesSystemIdentifier,
+    PerspectiveType,
+    ZodiacType,
+)
 from datetime import datetime, timedelta
 from typing import Literal, Union, List
 import logging
@@ -161,7 +170,7 @@ class EphemerisDataFactory:
         self.lng = lng
         self.tz_str = tz_str
         self.is_dst = is_dst
-        self.zodiac_type = zodiac_type
+        self.zodiac_type = normalize_zodiac_type(zodiac_type)
         self.sidereal_mode = sidereal_mode
         self.houses_system_identifier = houses_system_identifier
         self.perspective_type = perspective_type

kerykeion/fetch_geonames.py

@@ -6,13 +6,16 @@ License: AGPL-3.0
 """
 
 
-import logging
+from logging import getLogger
 from datetime import timedelta
 from requests import Request
 from requests_cache import CachedSession
 from typing import Union
 
 
+logger = getLogger(__name__)
+
+
 class FetchGeonames:
     """
     Class to handle requests to the GeoNames API for location data and timezone information.
@@ -63,21 +66,21 @@ class FetchGeonames:
         params = {"lat": lat, "lng": lon, "username": self.username}
 
         prepared_request = Request("GET", self.timezone_url, params=params).prepare()
-        logging.debug(f"Requesting data from GeoName timezones: {prepared_request.url}")
+        logger.debug("GeoNames timezone lookup url=%s", prepared_request.url)
 
         try:
             response = self.session.send(prepared_request)
             response_json = response.json()
 
         except Exception as e:
-            logging.error(f"Error fetching {self.timezone_url}: {e}")
+            logger.error("GeoNames timezone request failed for %s: %s", self.timezone_url, e)
             return {}
 
         try:
             timezone_data["timezonestr"] = response_json["timezoneId"]
 
         except Exception as e:
-            logging.error(f"Error serializing data maybe wrong username? Details: {e}")
+            logger.error("GeoNames timezone payload missing expected keys: %s", e)
             return {}
 
         if hasattr(response, "from_cache"):
@@ -109,15 +112,16 @@ class FetchGeonames:
         }
 
         prepared_request = Request("GET", self.base_url, params=params).prepare()
-        logging.debug(f"Requesting data from geonames basic: {prepared_request.url}")
+        logger.debug("GeoNames search url=%s", prepared_request.url)
 
         try:
             response = self.session.send(prepared_request)
+            response.raise_for_status()
             response_json = response.json()
-            logging.debug(f"Response from GeoNames: {response_json}")
+            logger.debug("GeoNames search response: %s", response_json)
 
         except Exception as e:
-            logging.error(f"Error in fetching {self.base_url}: {e}")
+            logger.error("GeoNames search request failed for %s: %s", self.base_url, e)
             return {}
 
         try:
@@ -127,7 +131,7 @@ class FetchGeonames:
             city_data_whitout_tz["countryCode"] = response_json["geonames"][0]["countryCode"]
 
         except Exception as e:
-            logging.error(f"Error serializing data maybe wrong username? Details: {e}")
+            logger.error("GeoNames search payload missing expected keys: %s", e)
             return {}
 
         if hasattr(response, "from_cache"):
@@ -147,15 +151,16 @@ class FetchGeonames:
             timezone_response = self.__get_timezone(city_data_response["lat"], city_data_response["lng"])
 
         except Exception as e:
-            logging.error(f"Error in fetching timezone: {e}")
+            logger.error("Unable to fetch timezone details: %s", e)
             return {}
 
         return {**timezone_response, **city_data_response}
 
 
 if __name__ == "__main__":
-    from kerykeion.utilities import setup_logging
-    setup_logging(level="debug")
+    """Run a tiny demonstration when executing the module directly."""
+    from kerykeion.utilities import setup_logging as configure_logging
 
+    configure_logging("debug")
     geonames = FetchGeonames("Montichiari", "IT")
     print(geonames.get_serialized_data())

kerykeion/report.py

@@ -727,8 +727,7 @@ if __name__ == "__main__":
         natal_subject.iso_formatted_local_datetime,
         "Solar",
     )
-
-    # Composite chart subject
+    # Derive a composite subject representing the pair's midpoint configuration
     composite_subject = CompositeSubjectFactory(
         natal_subject,
         partner_subject,

kerykeion/schemas/kr_literals.py

@@ -5,7 +5,7 @@ This is part of Kerykeion (C) 2025 Giacomo Battaglia
 from typing import Literal
 
 
-ZodiacType = Literal["Tropic", "Sidereal"]
+ZodiacType = Literal["Tropical", "Sidereal"]
 """Literal type for Zodiac Types"""
 
 

kerykeion/settings/kerykeion_settings.py

@@ -47,5 +47,5 @@ def _deep_merge(base: Mapping[str, Any], overrides: Mapping[str, Any]) -> dict[s
             merged[key] = deepcopy(value)
     return merged
 
-
+# Keep the public surface area explicit for downstream imports.
 __all__ = ["SettingsSource", "load_settings_mapping", "LANGUAGE_SETTINGS"]

kerykeion/utilities.py

@@ -12,15 +12,108 @@ from kerykeion.schemas import (
     LunarPhaseModel,
     CompositeSubjectModel,
     PlanetReturnModel,
+    ZodiacType,
 )
-from kerykeion.schemas.kr_literals import LunarPhaseEmoji, LunarPhaseName, PointType, AstrologicalPoint, Houses
-from typing import Union, Optional, get_args
-import logging
+from kerykeion.schemas.kr_literals import (
+    LunarPhaseEmoji,
+    LunarPhaseName,
+    PointType,
+    AstrologicalPoint,
+    Houses,
+)
+from typing import Union, Optional, get_args, cast
+from logging import DEBUG, INFO, WARNING, ERROR, CRITICAL, basicConfig, getLogger
 import math
 import re
 from datetime import datetime
 
 
+logger = getLogger(__name__)
+
+def normalize_zodiac_type(value: str) -> ZodiacType:
+    """
+    Normalize a zodiac type string to its canonical representation.
+
+    Handles case-insensitive matching and legacy formats like "tropic" or "Tropic",
+    automatically converting them to the canonical forms "Tropical" or "Sidereal".
+
+    Args:
+        value: Input zodiac type string (case-insensitive).
+
+    Returns:
+        ZodiacType: Canonical zodiac type ("Tropical" or "Sidereal").
+
+    Raises:
+        ValueError: If `value` is not a recognized zodiac type.
+
+    Examples:
+        >>> normalize_zodiac_type("tropical")
+        'Tropical'
+        >>> normalize_zodiac_type("Tropic")
+        'Tropical'
+        >>> normalize_zodiac_type("SIDEREAL")
+        'Sidereal'
+    """
+    # Normalize to lowercase for comparison
+    value_lower = value.lower()
+
+    # Map legacy and case-insensitive variants to canonical forms
+    if value_lower in ("tropical", "tropic"):
+        return cast(ZodiacType, "Tropical")
+    elif value_lower == "sidereal":
+        return cast(ZodiacType, "Sidereal")
+    else:
+        raise ValueError(
+            "'{value}' is not a valid zodiac type. Accepted values are: Tropical, Sidereal "
+            "(case-insensitive, 'tropic' also accepted as legacy).".format(value=value)
+        )
+
+_POINT_NUMBER_MAP: dict[str, int] = {
+    "Sun": 0,
+    "Moon": 1,
+    "Mercury": 2,
+    "Venus": 3,
+    "Mars": 4,
+    "Jupiter": 5,
+    "Saturn": 6,
+    "Uranus": 7,
+    "Neptune": 8,
+    "Pluto": 9,
+    "Mean_North_Lunar_Node": 10,
+    "True_North_Lunar_Node": 11,
+    # Swiss Ephemeris has no dedicated IDs for the south nodes; we reserve high values.
+    "Mean_South_Lunar_Node": 1000,
+    "True_South_Lunar_Node": 1100,
+    "Chiron": 15,
+    "Mean_Lilith": 12,
+    "Ascendant": 9900,
+    "Descendant": 9901,
+    "Medium_Coeli": 9902,
+    "Imum_Coeli": 9903,
+}
+
+# Logging helpers
+def setup_logging(level: str) -> None:
+    """Configure the root logger so demo scripts share the same formatting."""
+    normalized_level = (level or "").strip().lower()
+    level_map: dict[str, int] = {
+        "debug": DEBUG,
+        "info": INFO,
+        "warning": WARNING,
+        "error": ERROR,
+        "critical": CRITICAL,
+    }
+
+    selected_level = level_map.get(normalized_level, INFO)
+    basicConfig(
+        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+        level=selected_level,
+    )
+    logger.setLevel(selected_level)
+
+
+
+
 def get_number_from_name(name: AstrologicalPoint) -> int:
     """
     Convert an astrological point name to its corresponding numerical identifier.
@@ -35,49 +128,10 @@ def get_number_from_name(name: AstrologicalPoint) -> int:
         KerykeionException: If the name is not recognized
     """
 
-    if name == "Sun":
-        return 0
-    elif name == "Moon":
-        return 1
-    elif name == "Mercury":
-        return 2
-    elif name == "Venus":
-        return 3
-    elif name == "Mars":
-        return 4
-    elif name == "Jupiter":
-        return 5
-    elif name == "Saturn":
-        return 6
-    elif name == "Uranus":
-        return 7
-    elif name == "Neptune":
-        return 8
-    elif name == "Pluto":
-        return 9
-    elif name == "Mean_North_Lunar_Node":
-        return 10
-    elif name == "True_North_Lunar_Node":
-        return 11
-    # Note: Swiss ephemeris library has no constants for south nodes. We're using integers >= 1000 for them.
-    elif name == "Mean_South_Lunar_Node":
-        return 1000
-    elif name == "True_South_Lunar_Node":
-        return 1100
-    elif name == "Chiron":
-        return 15
-    elif name == "Mean_Lilith":
-        return 12
-    elif name == "Ascendant":  # TODO: Is this needed?
-        return 9900
-    elif name == "Descendant":  # TODO: Is this needed?
-        return 9901
-    elif name == "Medium_Coeli":  # TODO: Is this needed?
-        return 9902
-    elif name == "Imum_Coeli":  # TODO: Is this needed?
-        return 9903
-    else:
-        raise KerykeionException(f"Error in getting number from name! Name: {name}")
+    try:
+        return _POINT_NUMBER_MAP[str(name)]
+    except KeyError as exc:  # pragma: no cover - defensive branch
+        raise KerykeionException(f"Error in getting number from name! Name: {name}") from exc
 
 
 def get_kerykeion_point_from_degree(
@@ -124,7 +178,6 @@ def get_kerykeion_point_from_degree(
     sign_index = int(degree // 30)
     sign_degree = degree % 30
     zodiac_sign = ZODIAC_SIGNS[sign_index]
-
     return KerykeionPointModel(
         name=name,
         quality=zodiac_sign.quality,
@@ -139,87 +192,34 @@ def get_kerykeion_point_from_degree(
         declination=declination,
     )
 
+# Angular helpers
+def is_point_between(start_angle: Union[int, float], end_angle: Union[int, float], candidate: Union[int, float]) -> bool:
+    """Return True when ``candidate`` lies on the clockwise arc from ``start_angle`` to ``end_angle``."""
 
-def setup_logging(level: str) -> None:
-    """
-    Configure logging for the application.
-
-    Args:
-        level: Log level as string (debug, info, warning, error, critical)
-    """
-    logging_options: dict[str, int] = {
-        "debug": logging.DEBUG,
-        "info": logging.INFO,
-        "warning": logging.WARNING,
-        "error": logging.ERROR,
-        "critical": logging.CRITICAL,
-    }
-    format: str = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-    loglevel: int = logging_options.get(level, logging.INFO)
-    logging.basicConfig(format=format, level=loglevel)
-
+    normalize = lambda value: value % 360
 
-def is_point_between(
-    start_point: Union[int, float], end_point: Union[int, float], evaluated_point: Union[int, float]
-) -> bool:
-    """
-    Determine if a point lies between two other points on a circle.
-
-    Special rules:
-    - If evaluated_point equals start_point, returns True
-    - If evaluated_point equals end_point, returns False
-    - The arc between start_point and end_point must not exceed 180°
-
-    Args:
-        start_point: The starting point on the circle
-        end_point: The ending point on the circle
-        evaluated_point: The point to evaluate
-
-    Returns:
-        True if evaluated_point is between start_point and end_point, False otherwise
-
-    Raises:
-        KerykeionException: If the angular difference exceeds 180°
-    """
-
-    # Normalize angles to [0, 360)
-    start_point = start_point % 360
-    end_point = end_point % 360
-    evaluated_point = evaluated_point % 360
-
-    # Compute angular difference
-    angular_difference = math.fmod(end_point - start_point + 360, 360)
-
-    # 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:
+    start = normalize(start_angle)
+    end = normalize(end_angle)
+    target = normalize(candidate)
+    span = (end - start) % 360
+    if span > 180:
         raise KerykeionException(
-            f"The angle between start and end point is not allowed to exceed 180°, yet is: {angular_difference}"
+            f"The angle between start and end point is not allowed to exceed 180°, yet is: {span}"
         )
-
-    # 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
-    # should really be same value. This case is captured later below by the term 0 <= p1_p3.
-    if evaluated_point == start_point:
+    if target == start:
         return True
-
-    # Handle explicitly when evaluated_point == end_point
-    if evaluated_point == end_point:
+    if target == end:
         return False
+    distance_from_start = (target - start) % 360
+    return distance_from_start < span
 
-    # Compute angular differences for evaluation
-    p1_p3 = math.fmod(evaluated_point - start_point + 360, 360)
-
-    # Check if point lies in the interval
-    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:
+# House helpers
+def get_planet_house(planet_degree: Union[int, float], houses_degree_ut_list: list) -> Houses:
     """
     Determine which house contains a planet based on its degree position.
 
     Args:
-        planet_position_degree: The planet's position in degrees (0-360)
+        planet_degree: The planet's position in degrees (0-360)
         houses_degree_ut_list: List of house cusp degrees
 
     Returns:
@@ -236,11 +236,11 @@ def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut
         start_degree = houses_degree_ut_list[i]
         end_degree = houses_degree_ut_list[(i + 1) % len(houses_degree_ut_list)]
 
-        if is_point_between(start_degree, end_degree, planet_position_degree):
+        if is_point_between(start_degree, end_degree, planet_degree):
             return house_names[i]
 
     # If no house is found, raise an error
-    raise ValueError(f"Error in house calculation, planet: {planet_position_degree}, houses: {houses_degree_ut_list}")
+    raise ValueError(f"Error in house calculation, planet: {planet_degree}, houses: {houses_degree_ut_list}")
 
 
 def get_moon_emoji_from_phase_int(phase: int) -> LunarPhaseEmoji:
@@ -334,11 +334,11 @@ def check_and_adjust_polar_latitude(latitude: float) -> float:
     """
     if latitude > 66.0:
         latitude = 66.0
-        logging.info("Polar circle override for houses, using 66 degrees")
+        logger.info("Latitude capped at 66° to keep house calculations stable.")
 
     elif latitude < -66.0:
         latitude = -66.0
-        logging.info("Polar circle override for houses, using -66 degrees")
+        logger.info("Latitude capped at -66° to keep house calculations stable.")
 
     return latitude
 

{kerykeion-5.1.5.dist-info → kerykeion-5.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kerykeion
-Version: 5.1.5
+Version: 5.1.7
 Summary: A Python library for astrological calculations, including natal charts, houses, planetary aspects, and SVG chart generation.
 Project-URL: Homepage, https://www.kerykeion.net/
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion
@@ -1781,6 +1781,8 @@ Since the AstrologerAPI is an external third-party service, using it does _not_
 
 Contributions are welcome! Feel free to submit pull requests or report issues.
 
+By submitting a contribution, you agree to assign the copyright of that contribution to the maintainer. The project stays openly available under the AGPL for everyone, while the re-licensing option helps sustain future development. Your authorship remains acknowledged in the commit history and release notes.
+
 ## Citations
 
 If using Kerykeion in published or academic work, please cite as follows:

{kerykeion-5.1.5.dist-info → kerykeion-5.1.7.dist-info}/RECORD

@@ -1,20 +1,20 @@
 kerykeion/__init__.py,sha256=7gI_kWXhsmEK4SvNV6CkRmI0yjA3r7EO8UfQc_44UZU,1963
-kerykeion/astrological_subject_factory.py,sha256=KaNuPSgVOgAva9z83fTuCpvIfEm3hsJro-z_mFPU1Q4,94604
-kerykeion/backword.py,sha256=zqsFWE0xI7vwXnFT2vngufFaJueI3qCIDCVgG-alzCM,32860
+kerykeion/astrological_subject_factory.py,sha256=qR6dWULcF4J2ym2oTI4CQ-zfQfMgAFNyLwhGXhJkg-A,94740
+kerykeion/backword.py,sha256=aZrC6gRhLuewv3PvpHWlPvqrDGxspCEN2mMAh8tLtfM,34500
 kerykeion/chart_data_factory.py,sha256=gtAlZs_IjPMUJUitLjkRFCESmAj-wEOlYdCPQ2b8XwA,25123
 kerykeion/composite_subject_factory.py,sha256=eUtjThDlYr6SQsEi02_CgO1kEMUMYgQGzR5rX91GEwY,17120
-kerykeion/ephemeris_data_factory.py,sha256=uwEhVqqkB56HbxKueMAvSAbEKkYTJ9GH3mVLDNxIQnc,20358
-kerykeion/fetch_geonames.py,sha256=SPI4fSvD59C-IVpaoeOHuD7_kjGbTLo2fypO2x57-p4,5432
+kerykeion/ephemeris_data_factory.py,sha256=UKgoJQSqiyy4U0jNw23NI_BP0kbZblJU5mtBnNZtnb0,20417
+kerykeion/fetch_geonames.py,sha256=VO-TK4m_xSE62yWE5cf6CE2OLVfkPLeTPqXw8igzDnU,5619
 kerykeion/planetary_return_factory.py,sha256=bIVPqa2gs7hYHi8aaMfVr4U99xWZk3LmYqZI9KG6ACo,37572
 kerykeion/relationship_score_factory.py,sha256=pVrsRlFs__bfVe8K3cOirsnRtdBOW2DbnKqPa7jCWF0,11396
-kerykeion/report.py,sha256=MK5_E_DkG09kEdFMueyQ45J_6JJg3QvkYSA0tywehx4,31414
+kerykeion/report.py,sha256=fHGzPh9vhDIWzT_Gr4V5KrfLjiDWLlSlBgOk6-DeH80,31463
 kerykeion/transits_time_range_factory.py,sha256=YRSFVa2MIZFQMPbEL2njKd-P7p431zoAsINrddZz5Yw,13934
-kerykeion/utilities.py,sha256=LKljXx0HSjlT5pspvG4VIY1po_xG1dLGNNfEWg0G5Fs,24391
+kerykeion/utilities.py,sha256=AqcJ9zmVEcwiurMfN63MDSeegJ1dJ4L1sQVJeoNIGOE,24016
 kerykeion/aspects/__init__.py,sha256=csJmxvLdBu-bHuW676f3dpY__Qyc6LwRyrpWVTh3n1A,287
 kerykeion/aspects/aspects_factory.py,sha256=XCuOOpo0ZW7sihYT2f50bLVpebEk19b9EtEjXonwte0,24156
 kerykeion/aspects/aspects_utils.py,sha256=00-MMLEGChpceab8sHKB1_qg6EG4ycTG2u2vYZcyLmQ,5784
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
-kerykeion/charts/chart_drawer.py,sha256=VCk2s6kUT2AhNWhVdepuhp2_6qHk3Fiq0d4EMq0pvZQ,122240
+kerykeion/charts/chart_drawer.py,sha256=Rhv2eVV2G_GBb6Khh4uor9sqSH6KJ5i6RA5ZFpVPzuI,122333
 kerykeion/charts/charts_utils.py,sha256=iwgDhVc_GwKuQBZ6JNmn6RWVILD5KIcjbrnDTR3wrAc,70911
 kerykeion/charts/draw_planets.py,sha256=tIj3FeLLomVSbCaZUxfw_qBEB3pxi4EIEhqaeTgTyTY,29061
 kerykeion/charts/templates/aspect_grid_only.xml,sha256=v3QtNMjk-kBdUTfB0r6thg--Ta_tNFdRQCzdk5PAycY,86429
@@ -38,13 +38,13 @@ kerykeion/kr_types/settings_models.py,sha256=xtpsrhjmhdowDSBeQ7TEMR53-uEEspCoXKC
 kerykeion/schemas/__init__.py,sha256=EcwbnoYPKLq3m7n5s2cEZ8UyWpxdmHXbvM23hLNBNBI,2376
 kerykeion/schemas/chart_template_model.py,sha256=fQ_EZ8ccOgNd4gXu5KilF1dUH9B2RVCDLHc09YkYLyY,8978
 kerykeion/schemas/kerykeion_exception.py,sha256=vTYdwj_mL-Q-MqHJvEzzBXxQ5YI2kAwUC6ImoWxMKXc,454
-kerykeion/schemas/kr_literals.py,sha256=p0lm598ut0GyeT-sRzWNcp5BFk9-FdYme4XjEUFJ3cA,5656
+kerykeion/schemas/kr_literals.py,sha256=mvPH3_TyuF5GTYKfIGk9SpxbuW7uYhSlp20SZJ7l6BY,5658
 kerykeion/schemas/kr_models.py,sha256=e1PQxUqC437IWIVKrOi71NVR5bEV7KGhF_JAaxs9zN0,21945
 kerykeion/schemas/settings_models.py,sha256=NlOW9T7T5kD5Dzna1UOdb7XPQeQnzMOu0y4-ApERxPw,17619
 kerykeion/settings/__init__.py,sha256=IJUqkYTpvmbKecVeCbsiL1qU_4xWc78u4OrvN_T3ZAI,624
 kerykeion/settings/chart_defaults.py,sha256=TSm2hXCxym3I7XpIqIMBLWM253Z0dCGbhPi2MpWbD_0,12490
 kerykeion/settings/config_constants.py,sha256=D1PApNT7Zldlv8QINmaKnyLovY5UJ2FsAqHNTTPd5ps,3717
-kerykeion/settings/kerykeion_settings.py,sha256=Aoi_9SeHlgmTaopMdC4Ojb9V0kw-iKZKqJopZBiTikM,1884
+kerykeion/settings/kerykeion_settings.py,sha256=aeRlxvy2GwC-mxoD_DFMXMoO4yPQp1XQbEAGVQat0Wo,1947
 kerykeion/settings/translation_strings.py,sha256=UYxiZT5aiNZ4tpQuTauIlXwMm3tzfz6QE9DPNVtlHdo,56412
 kerykeion/settings/translations.py,sha256=A_Zwr-ujvxBLvE4a87-28pM3KifdUaAvsR3XvMZNg0s,2377
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
@@ -57,7 +57,7 @@ kerykeion/sweph/ast28/se28978s.se1,sha256=nU2Qp-ELc_tzFnRc1QT6uVueWXEipvhYDgfQRX
 kerykeion/sweph/ast50/se50000s.se1,sha256=9jTrPlIrZMOBWC9cNgwzcfz0KBHdXFZoY9-NZ_HtECo,15748
 kerykeion/sweph/ast90/se90377s.se1,sha256=bto2x4LtBv8b1ej1XhVFYq-kfHO9cczbKV9U1f9UVu4,10288
 kerykeion/sweph/ast90/se90482s.se1,sha256=uHxz6bP4K8zgtQFrlWFwxrYfmqm5kXxsg6OYhAIUbAA,16173
-kerykeion-5.1.5.dist-info/METADATA,sha256=G32MUXKcYQ0CO9XgyEd3ku5749Aqc9PoifJ5ptJI0fU,61445
-kerykeion-5.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kerykeion-5.1.5.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-5.1.5.dist-info/RECORD,,
+kerykeion-5.1.7.dist-info/METADATA,sha256=w1pDxVeTBbyLbZ-m6qCBi9-gSx8eI1fXUUHm1_g1Gf0,61756
+kerykeion-5.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kerykeion-5.1.7.dist-info/licenses/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-5.1.7.dist-info/RECORD,,