kerykeion 5.0.0a9__py3-none-any.whl → 5.1.8__py3-none-any.whl

kerykeion/settings/config_constants.py

@@ -1,5 +1,5 @@
-from kerykeion.kr_types.kr_literals import AstrologicalPoint
-from kerykeion.kr_types.kr_models import ActiveAspect
+from kerykeion.schemas.kr_literals import AstrologicalPoint
+from kerykeion.schemas.kr_models import ActiveAspect
 from typing import List
 
 
@@ -14,10 +14,10 @@ DEFAULT_ACTIVE_POINTS: List[AstrologicalPoint] = [
     "Uranus",
     "Neptune",
     "Pluto",
-    "Mean_Node",
-    # "True_Node",
-    "Mean_South_Node",
-    # "True_South_Node",
+    # "Mean_North_Lunar_Node",
+    "True_North_Lunar_Node",
+    # "Mean_South_Lunar_Node",
+    "True_South_Lunar_Node",
     "Chiron",
     "Mean_Lilith",
     # "True_Lilith",
@@ -38,8 +38,8 @@ DEFAULT_ACTIVE_POINTS: List[AstrologicalPoint] = [
     # "Spica",
     "Ascendant",
     "Medium_Coeli",
-    # "Descendant",
-    # "Imum_Coeli",
+    "Descendant",
+    "Imum_Coeli",
     # "Vertex",
     # "Anti_Vertex",
     # "Pars_Fortunae",
@@ -49,7 +49,56 @@ DEFAULT_ACTIVE_POINTS: List[AstrologicalPoint] = [
 ]
 """
 Default list of active points in the charts or aspects calculations.
-The full list of points is available in the `kr_types.kr_literals.AstrologicalPoint` literal.
+The full list of points is available in the `schemas.kr_literals.AstrologicalPoint` literal.
+"""
+
+ALL_ACTIVE_POINTS: List[AstrologicalPoint] = [
+    "Sun",
+    "Moon",
+    "Mercury",
+    "Venus",
+    "Mars",
+    "Jupiter",
+    "Saturn",
+    "Uranus",
+    "Neptune",
+    "Pluto",
+    "Mean_North_Lunar_Node",
+    "True_North_Lunar_Node",
+    "Mean_South_Lunar_Node",
+    "True_South_Lunar_Node",
+    "Chiron",
+    "Mean_Lilith",
+    "True_Lilith",
+    "Earth",
+    "Pholus",
+    "Ceres",
+    "Pallas",
+    "Juno",
+    "Vesta",
+    "Eris",
+    "Sedna",
+    "Haumea",
+    "Makemake",
+    "Ixion",
+    "Orcus",
+    "Quaoar",
+    "Regulus",
+    "Spica",
+    "Ascendant",
+    "Medium_Coeli",
+    "Descendant",
+    "Imum_Coeli",
+    "Vertex",
+    "Anti_Vertex",
+    "Pars_Fortunae",
+    "Pars_Spiritus",
+    "Pars_Amoris",
+    "Pars_Fidei"
+]
+"""
+Full list of active points in the charts or aspects calculations.
+The full list of points is available in the `schemas.kr_literals.AstrologicalPoint` literal.
 """
 
 DEFAULT_ACTIVE_ASPECTS: List[ActiveAspect] = [
@@ -67,10 +116,37 @@ DEFAULT_ACTIVE_ASPECTS: List[ActiveAspect] = [
 ]
 """
 Default list of active aspects in the aspects calculations.
-The full list of aspects is available in the `kr_types.kr_literals.AspectName` literal.
+The full list of aspects is available in the `schemas.kr_literals.AspectName` literal.
 """
 
-DEFAULT_AXIS_ORBIT: int = 1
+ALL_ACTIVE_ASPECTS: List[ActiveAspect] = [
+    {"name": "conjunction", "orb": 10},
+    {"name": "opposition", "orb": 10},
+    {"name": "trine", "orb": 8},
+    {"name": "sextile", "orb": 6},
+    {"name": "square", "orb": 5},
+    {"name": "quintile", "orb": 1},
+    {"name": "semi-sextile", "orb": 1},
+    {"name": "semi-square", "orb": 1},
+    {"name": "sesquiquadrate", "orb": 1},
+    {"name": "biquintile", "orb": 1},
+    {"name": "quincunx", "orb": 1},
+]
+"""
+Full list of active aspects in the charts or aspects calculations.
+The full list of aspects is available in the `schemas.kr_literals.AspectName` literal.
+"""
+
+DISCEPOLO_SCORE_ACTIVE_ASPECTS: List[ActiveAspect] = [
+    {"name": "conjunction", "orb": 8},
+    {"name": "semi-sextile", "orb": 2},
+    {"name": "semi-square", "orb": 2},
+    {"name": "sextile", "orb": 4},
+    {"name": "square", "orb": 5},
+    {"name": "trine", "orb": 7},
+    {"name": "sesquiquadrate", "orb": 2},
+    {"name": "opposition", "orb": 8},
+]
 """
-Default orbit for the axes aspects.
+List of active aspects with their orbs according to Ciro Discepolo's affinity scoring methodology.
 """

kerykeion/settings/kerykeion_settings.py

@@ -1,94 +1,51 @@
-# -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2025 Giacomo Battaglia
-"""
-
-
-from json import load
-import logging
-from pathlib import Path
-from typing import Dict, Union
-from kerykeion.kr_types import KerykeionSettingsModel
-import functools
-
-
-def get_settings(new_settings_file: Union[Path, None, KerykeionSettingsModel, dict] = None) -> KerykeionSettingsModel:
-    """
-    This function is used to get the settings dict from the settings file.
-    If no settings file is passed as argument, or the file is not found, it will fallback to:
-    - The system wide config file, located in ~/.config/kerykeion/kr.config.json
-    - The default config file, located in the package folder
-
-    Args:
-        new_settings_file (Union[Path, None], optional): The path of the settings file. Defaults to None.
-
-    Returns:
-        Dict: The settings dict
-    """
+Utilities for loading Kerykeion configuration settings from Python sources.
 
-    if isinstance(new_settings_file, dict):
-        return KerykeionSettingsModel(**new_settings_file)
-    elif isinstance(new_settings_file, KerykeionSettingsModel):
-        return new_settings_file
-
-    # Config path we passed as argument
-    if new_settings_file is not None:
-        settings_file = new_settings_file
-
-        if not settings_file.exists():
-            raise FileNotFoundError(f"File {settings_file} does not exist")
+The translation strings are now stored directly in :mod:`translation_strings`,
+so the loader simply wraps those dictionaries (or any user-provided overrides).
+"""
 
-    # System wide config path
-    else:
-        home_folder = Path.home()
-        settings_file = home_folder / ".config" / "kerykeion" / "kr.config.json"
+from __future__ import annotations
 
-    # Fallback to the default config in the package
-    if not settings_file.exists():
-        settings_file = Path(__file__).parent / "kr.config.json"
+from copy import deepcopy
+from typing import Any, Mapping, Optional, cast
 
-    logging.debug(f"Kerykeion config file path: {settings_file}")
-    settings_dict = load_settings_file(settings_file)
+from .translation_strings import LANGUAGE_SETTINGS
 
-    return KerykeionSettingsModel(**settings_dict)
+SettingsSource = Optional[Mapping[str, Any]]
 
 
-@functools.lru_cache
-def merge_settings(settings: KerykeionSettingsModel, new_settings: Dict) -> KerykeionSettingsModel:
+def load_settings_mapping(settings_source: Optional[SettingsSource] = None) -> Mapping[str, Any]:
     """
-    This function is used to merge the settings file with the default settings,
-    it's useful to add new settings to the config file without breaking the old ones.
+    Resolve the configuration mapping from the provided source.
 
     Args:
-        settings (KerykeionSettingsModel): The default settings
-        new_settings (Dict): The new settings to add to the default ones
+        settings_source (Mapping | None): Optional overrides for the bundled
+            language settings. When provided, keys and nested dictionaries are
+            merged on top of the default values.
 
     Returns:
-        KerykeionSettingsModel: The new settings
-    """
-    new_settings_dict = settings.model_dump() | new_settings
-    return KerykeionSettingsModel(**new_settings_dict)
-
-
-@functools.lru_cache
-def load_settings_file(settings_file_path: str) -> dict:
+        Mapping[str, Any]: The resolved configuration dictionary.
     """
-    This function is used to load the settings file from a path.
-
-    Args:
-        settings_file (Path): The path of the settings file
+    language_settings = deepcopy(LANGUAGE_SETTINGS)
 
-    Returns:
-        dict: The settings dict
-    """
-    with open(settings_file_path, "r", encoding="utf8") as f:
-        settings_dict = load(f)
+    if settings_source:
+        overrides = cast(Mapping[str, Any], settings_source)
+        if "language_settings" in overrides:
+            overrides = cast(Mapping[str, Any], overrides["language_settings"])
+        language_settings = _deep_merge(language_settings, overrides)
 
-    return settings_dict
+    return {"language_settings": language_settings}
 
 
-if __name__ == "__main__":
-    from kerykeion.utilities import setup_logging
-    setup_logging(level="debug")
+def _deep_merge(base: Mapping[str, Any], overrides: Mapping[str, Any]) -> dict[str, Any]:
+    merged: dict[str, Any] = {key: deepcopy(value) for key, value in base.items()}
+    for key, value in overrides.items():
+        if key in merged and isinstance(merged[key], Mapping) and isinstance(value, Mapping):
+            merged[key] = _deep_merge(cast(Mapping[str, Any], merged[key]), cast(Mapping[str, Any], value))
+        else:
+            merged[key] = deepcopy(value)
+    return merged
 
-    print(get_settings())
+# Keep the public surface area explicit for downstream imports.
+__all__ = ["SettingsSource", "load_settings_mapping", "LANGUAGE_SETTINGS"]