kerykeion 4.0.3__py3-none-any.whl → 4.8.1__py3-none-any.whl

kerykeion/relationship_score.py

@@ -1,22 +1,15 @@
 # -*- 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
 from kerykeion.aspects.synastry_aspects import SynastryAspects
-from logging import basicConfig, getLogger
+import logging
 from pathlib import Path
 from typing import Union
 
 
-logger = getLogger(__name__)
-basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-    level="INFO"
-)
-
-
 class RelationshipScore:
     """
     Calculates the relevance of the relationship of the two subjects according to
@@ -59,7 +52,7 @@ class RelationshipScore:
         self.relevant_default_aspects = []
         self.__all_synastry_aspects = SynastryAspects(
             first_subject, second_subject, new_settings_file=new_settings_file
-        ).get_all_aspects()
+        ).all_aspects
 
         # Calculates all at initialization
         self._get_all()
@@ -78,7 +71,7 @@ class RelationshipScore:
         }
 
     def _log_aspect(self, aspect: dict, points: int) -> None:
-        logger.debug(
+        logging.debug(
             f"{points} Points: {aspect['p1_name']} {aspect['aspect']} {aspect['p2_name']}, rounded orbit: {int(aspect['orbit'])}"
         )
 
@@ -87,7 +80,7 @@ class RelationshipScore:
         5 points if is a destiny sign:
         """
         if self.first_subject.sun["quality"] == self.second_subject.sun["quality"]:
-            logger.debug(
+            logging.debug(
                 f'5 points: Destiny sign, {self.first_subject.sun["sign"]} and {self.second_subject.sun["sign"]}'
             )
             self.is_destiny_sign = True
@@ -200,7 +193,8 @@ class RelationshipScore:
 
 
 if __name__ == "__main__":
-    basicConfig(level="DEBUG", force=True)
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
 
     lui = AstrologicalSubject("John", 1975, 10, 10, 21, 15, "Roma", "IT")
     lei = AstrologicalSubject("Sarah", 1978, 2, 9, 15, 50, "Roma", "IT")

kerykeion/report.py

@@ -83,6 +83,9 @@ class Report:
 
 
 if __name__ == "__main__":
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
+
     john = AstrologicalSubject("John", 1975, 10, 10, 21, 15, "Roma", "IT")
     report = Report(john)
     report.print_report()

kerykeion/settings/__init__.py

@@ -1 +1 @@
-from .kerykeion_settings import KerykeionSettingsModel, get_settings_dict
+from .kerykeion_settings import KerykeionSettingsModel, get_settings

kerykeion/settings/kerykeion_settings.py

@@ -1,186 +1,30 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2023 Giacomo Battaglia
+    This is part of Kerykeion (C) 2024 Giacomo Battaglia
 """
 
 
 from json import load
-from logging import getLogger, basicConfig
-from pydantic import BaseModel, Field
+import logging
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import Dict, Union
+from kerykeion.kr_types import KerykeionSettingsModel
 
 
-logger = getLogger(__name__)
-basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level="INFO")
-
-
-class CustomBaseModel(BaseModel):
+def get_settings(new_settings_file: Union[Path, None] = None) -> KerykeionSettingsModel:
     """
-    Extends the BaseModel class of Pydantic to add some useful methods.
+    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
     """
 
-    def __init__(self, **data):
-        super().__init__(**data)
-
-    def __getitem__(self, item):
-        return getattr(self, item)
-
-    def get(self, item, default=None):
-        return getattr(self, item, default)
-
-
-class KerykeionSettingsCelestialPointModel(CustomBaseModel):
-    """
-    Defines the model for a celestial point data.
-    """
-
-    id: int = Field(title="Celestial Point ID", description="Celestial Point ID according to Pyswisseph")
-    name: str = Field(title="Celestial Point Name", description="Celestial Point Name")
-    color: str = Field(title="Celestial Point Color", description="Celestial Point Color, used in the chart")
-    is_active: bool = Field(title="Celestial Point is Active", description="Indicates if the celestial point is active in the chart")
-    element_points: int = Field(title="Celestial Point Element Points", description="Element Points given to the celestial point")
-    related_zodiac_signs: List[int] = Field(title="Celestial Point Related Zodiac Signs", description="Zodiac Signs related to the celestial point")
-    label: str = Field(title="Celestial Point Label", description="The name of the celestial point in the chart, it can be different from the name")
-
-
-# Chart Colors Settings
-class KerykeionSettingsChartColorsModel(CustomBaseModel):
-    """
-    Defines the model for the chart colors.
-    """
-
-    paper_0: str = Field(title="Paper Color 0", description="Paper Color 0")
-    paper_1: str = Field(title="Paper Color 1", description="Paper Color 1")
-    zodiac_bg_0: str = Field(title="Zodiac Background Color 0", description="Zodiac Background Color 0")
-    zodiac_bg_1: str = Field(title="Zodiac Background Color 1", description="Zodiac Background Color 1")
-    zodiac_bg_2: str = Field(title="Zodiac Background Color 2", description="Zodiac Background Color 2")
-    zodiac_bg_3: str = Field(title="Zodiac Background Color 3", description="Zodiac Background Color 3")
-    zodiac_bg_4: str = Field(title="Zodiac Background Color 4", description="Zodiac Background Color 4")
-    zodiac_bg_5: str = Field(title="Zodiac Background Color 5", description="Zodiac Background Color 5")
-    zodiac_bg_6: str = Field(title="Zodiac Background Color 6", description="Zodiac Background Color 6")
-    zodiac_bg_7: str = Field(title="Zodiac Background Color 7", description="Zodiac Background Color 7")
-    zodiac_bg_8: str = Field(title="Zodiac Background Color 8", description="Zodiac Background Color 8")
-    zodiac_bg_9: str = Field(title="Zodiac Background Color 9", description="Zodiac Background Color 9")
-    zodiac_bg_10: str = Field(title="Zodiac Background Color 10", description="Zodiac Background Color 10")
-    zodiac_bg_11: str = Field(title="Zodiac Background Color 11", description="Zodiac Background Color 11")
-    zodiac_icon_0: str = Field(title="Zodiac Icon Color 0", description="Zodiac Icon Color 0")
-    zodiac_icon_1: str = Field(title="Zodiac Icon Color 1", description="Zodiac Icon Color 1")
-    zodiac_icon_2: str = Field(title="Zodiac Icon Color 2", description="Zodiac Icon Color 2")
-    zodiac_icon_3: str = Field(title="Zodiac Icon Color 3", description="Zodiac Icon Color 3")
-    zodiac_icon_4: str = Field(title="Zodiac Icon Color 4", description="Zodiac Icon Color 4")
-    zodiac_icon_5: str = Field(title="Zodiac Icon Color 5", description="Zodiac Icon Color 5")
-    zodiac_icon_6: str = Field(title="Zodiac Icon Color 6", description="Zodiac Icon Color 6")
-    zodiac_icon_7: str = Field(title="Zodiac Icon Color 7", description="Zodiac Icon Color 7")
-    zodiac_icon_8: str = Field(title="Zodiac Icon Color 8", description="Zodiac Icon Color 8")
-    zodiac_icon_9: str = Field(title="Zodiac Icon Color 9", description="Zodiac Icon Color 9")
-    zodiac_icon_10: str = Field(title="Zodiac Icon Color 10", description="Zodiac Icon Color 10")
-    zodiac_icon_11: str = Field(title="Zodiac Icon Color 11", description="Zodiac Icon Color 11")
-    zodiac_radix_ring_0: str = Field(title="Zodiac Radix Ring Color 0", description="Zodiac Radix Ring Color 0")
-    zodiac_radix_ring_1: str = Field(title="Zodiac Radix Ring Color 1", description="Zodiac Radix Ring Color 1")
-    zodiac_radix_ring_2: str = Field(title="Zodiac Radix Ring Color 2", description="Zodiac Radix Ring Color 2")
-    zodiac_transit_ring_0: str = Field(title="Zodiac Transit Ring Color 0", description="Zodiac Transit Ring Color 0")
-    zodiac_transit_ring_1: str = Field(title="Zodiac Transit Ring Color 1", description="Zodiac Transit Ring Color 1")
-    zodiac_transit_ring_2: str = Field(title="Zodiac Transit Ring Color 2", description="Zodiac Transit Ring Color 2")
-    zodiac_transit_ring_3: str = Field(title="Zodiac Transit Ring Color 3", description="Zodiac Transit Ring Color 3")
-    houses_radix_line: str = Field(title="Houses Radix Line Color", description="Houses Radix Line Color")
-    houses_transit_line: str = Field(title="Houses Transit Line Color", description="Houses Transit Line Color")
-    lunar_phase_0: str = Field(title="Lunar Phase Color 0", description="Lunar Phase Color 0")
-    lunar_phase_1: str = Field(title="Lunar Phase Color 1", description="Lunar Phase Color 1")
-    lunar_phase_2: str = Field(title="Lunar Phase Color 2", description="Lunar Phase Color 2")
-
-
-# Aspect Settings
-class KerykeionSettingsAspectModel(CustomBaseModel):
-    """
-    Defines the model for an aspect.
-    """
-
-    degree: int = Field(title="Aspect Degrees", description="The degree of the aspect")
-    name: str = Field(title="Aspect Name", description="The name of the aspect")
-    is_active: bool = Field(title="Aspect is Active", description="Is the aspect active?")
-    visible_grid: bool = Field(title="Aspect Visible Grid", description="Is the aspect visible in the grid?")
-    is_major: bool = Field(title="Aspect is Major", description="Is the aspect major?")
-    is_minor: bool = Field(title="Aspect is Minor", description="Is the aspect minor?")
-    orb: int = Field(title="Aspect Orb", description="The orb of the aspect")
-    color: str = Field(title="Aspect Color", description="The color of the aspect")
-
-
-# Language Settings
-class KerykeionLanguageCelestialPointModel(CustomBaseModel):
-    """
-    This class is used to define the labels, show in the chart, for the celestial points.
-    It is used to translate the celestial points in the language of the chart.
-    """
-
-    Sun: str = Field(title="Sun", description="The name of the Sun in the chart, in the language")
-    Moon: str = Field(title="Moon", description="The name of the Moon in the chart, in the language")
-    Mercury: str = Field(title="Mercury", description="The name of Mercury in the chart, in the language")
-    Venus: str = Field(title="Venus", description="The name of Venus in the chart, in the language")
-    Mars: str = Field(title="Mars", description="The name of Mars in the chart, in the language")
-    Jupiter: str = Field(title="Jupiter", description="The name of Jupiter in the chart, in the language")
-    Saturn: str = Field(title="Saturn", description="The name of Saturn in the chart, in the language")
-    Uranus: str = Field(title="Uranus", description="The name of Uranus in the chart, in the language")
-    Neptune: str = Field(title="Neptune", description="The name of Neptune in the chart, in the language")
-    Pluto: str = Field(title="Pluto", description="The name of Pluto in the chart, in the language")
-    True_Node: str = Field(title="True Node", description="The name of True Node in the chart, in the language")
-    Mean_Node: str = Field(title="Mean Node", description="The name of Mean Node in the chart, in the language")
-    Chiron: str = Field(title="Chiron", description="The name of Chiron in the chart, in the language")
-    Asc: str = Field(title="Ascendant", description="The name of Ascendant in the chart, in the language")
-    Mc: str = Field(title="Medium Coeli", description="The name of Medium Coeli in the chart, in the language")
-    Dsc: str = Field(title="Descendant", description="The name of Descendant in the chart, in the language")
-    Ic: str = Field(title="Imum Coeli", description="The name of Imum Coeli in the chart, in the language")
-
-
-class KerykeionLanguageModel(CustomBaseModel):
-    """
-    This model is used to store the language settings for the chart,
-    it's used to translate the celestial points and the other labels
-    """
-
-    info: str = Field(title="Info", description="The name of the Info label in the chart, in the language")
-    cusp: str = Field(title="Cusp", description="The name of the Cusp label in the chart, in the language")
-    longitude: str = Field(title="Longitude", description="The name of the Longitude label in the chart, in the language")
-    latitude: str = Field(title="Latitude", description="The name of the Latitude label in the chart, in the language")
-    north: str = Field(title="North", description="The name of the North label in the chart, in the language")
-    east: str = Field(title="East", description="The name of the East label in the chart, in the language")
-    south: str = Field(title="South", description="The name of the South label in the chart, in the language")
-    west: str = Field(title="West", description="The name of the West label in the chart, in the language")
-    fire: str = Field(title="Fire", description="The name of the Fire label in the chart, in the language")
-    earth: str = Field(title="Earth", description="The name of the Earth label in the chart, in the language")
-    air: str = Field(title="Air", description="The name of the Air label in the chart, in the language")
-    water: str = Field(title="Water", description="The name of the Water label in the chart, in the language")
-    and_word: str = Field(title="And", description="The name of the And word in the chart, in the language")
-    transits: str = Field(title="Transits", description="The name of the Transits label in the chart, in the language")
-    type: str = Field(title="Type", description="The name of the Type label in the chart, in the language")
-    aspects: str = Field(title="Aspects", description="The name of the Aspects label in the chart, in the language")
-    planets_and_house: str = Field(title="Planets and Houses", description="The name of the Planets and Houses label in the chart, in the language")
-    transit_name: str = Field(title="Transit Name", description="The name of the Transit Name label in the chart, in the language")
-    lunar_phase: str = Field(title="Lunar Phase", description="The name of the Lunar Phase label in the chart, in the language")
-    day: str = Field(title="Day", description="The name of the Day label in the chart, in the language")
-    celestial_points: KerykeionLanguageCelestialPointModel
-
-
-class KerykeionGeneralSettingsModel(CustomBaseModel):
-    axes_orbit: int = Field(title="Axes Orbit", description="The orbit of the axes in the chart")
-    planet_in_zodiac_extra_points: int = Field(title="Planet in Zodiac Extra Points", description="The extra points of the planet in the zodiac")
-    language: str = Field(title="Language", description="The language of the chart")
-
-
-# Settings Model
-class KerykeionSettingsModel(CustomBaseModel):
-    """
-    This class is used to define the global settings for the Kerykeion.
-    """
-
-    chart_colors: KerykeionSettingsChartColorsModel = Field(title="Chart Colors", description="The colors of the chart")
-    celestial_points: List[KerykeionSettingsCelestialPointModel] = Field(title="Celestial Points", description="The list of the celestial points of the chart")
-    aspects: List[KerykeionSettingsAspectModel] = Field(title="Aspects", description="The list of the aspects of the chart")
-    language_settings: dict[str, KerykeionLanguageModel] = Field(title="Language Settings", description="The language settings of the chart")
-    general_settings: KerykeionGeneralSettingsModel = Field(title="General Settings", description="The general settings of the chart")
-
-
-def get_settings_dict(new_settings_file: Union[Path, None] = None) -> Dict:
     # Config path we passed as argument
     if new_settings_file is not None:
         settings_file = new_settings_file
@@ -197,17 +41,31 @@ def get_settings_dict(new_settings_file: Union[Path, None] = None) -> Dict:
     if not settings_file.exists():
         settings_file = Path(__file__).parent / "kr.config.json"
 
-    logger.debug(f"Kerykeion config file path: {settings_file}")
-    with open(settings_file, "r") as f:
+    logging.debug(f"Kerykeion config file path: {settings_file}")
+    with open(settings_file, "r", encoding="utf8") as f:
         settings_dict = load(f)
 
-    return settings_dict
+    return KerykeionSettingsModel(**settings_dict)
 
 
-def merge_settings_file(settings: KerykeionSettingsModel, new_settings: Dict) -> KerykeionSettingsModel:
-    new_settings_dict = settings.dict() | new_settings
+def merge_settings(settings: KerykeionSettingsModel, new_settings: Dict) -> KerykeionSettingsModel:
+    """
+    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.
+    
+    Args:
+        settings (KerykeionSettingsModel): The default settings
+        new_settings (Dict): The new settings to add to the default ones
+        
+    Returns:
+        KerykeionSettingsModel: The new settings
+    """
+    new_settings_dict = settings.model_dump() | new_settings
     return KerykeionSettingsModel(**new_settings_dict)
 
 
 if __name__ == "__main__":
-    print(get_settings_dict())
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
+
+    print(get_settings())

kerykeion/settings/kr.config.json

@@ -77,7 +77,7 @@
         "Mc": "Mc",
         "Dsc": "Dsc",
         "Ic": "Ic",
-        "North_Node": "Noeud Nord",
+        "True_Node": "Noeud Nord",
         "Mean_Node": "Noeud Moyen",
         "Chiron": "Chiron"
       }
@@ -411,21 +411,21 @@
     },
     {
       "id": 10,
-      "name": "True_Node",
+      "name": "Mean_Node",
       "color": "#4c1541",
-      "is_active": true,
-      "element_points": 20,
+      "is_active": false,
+      "element_points": 0,
       "related_zodiac_signs": [],
-      "label": "True_Node"
+      "label": "Mean_Node"
     },
     {
       "id": 11,
-      "name": "Mean_Node",
+      "name": "True_Node",
       "color": "#4c1541",
-      "is_active": false,
-      "element_points": 0,
+      "is_active": true,
+      "element_points": 20,
       "related_zodiac_signs": [],
-      "label": "Mean_Node"
+      "label": "True_Node"
     },
     {
       "id": 12,
@@ -517,5 +517,9 @@
     "axes_orbit": 1,
     "planet_in_zodiac_extra_points": 10,
     "language": "EN"
+  },
+  "chart_settings": {
+    "basic_chart_viewBox": "0 0 772.2 546.0",
+    "wide_chart_viewBox": "0 0 1060 546.0"
   }
 }

kerykeion/utilities.py

@@ -1,9 +1,9 @@
-from kerykeion.kr_types import KerykeionPointModel, KerykeionException
-from pathlib import Path
+from kerykeion.kr_types import KerykeionPointModel, KerykeionException, KerykeionSettingsModel, AstrologicalSubjectModel
+from kerykeion.kr_types.kr_literals import LunarPhaseEmoji, LunarPhaseName
 from typing import Union, Literal
-from logging import getLogger
+import logging
+import math
 
-logger = getLogger(__name__)
 
 
 def get_number_from_name(name: str) -> int:
@@ -206,3 +206,152 @@ def calculate_position(
 
     return KerykeionPointModel(**dictionary)
 
+
+def setup_logging(level: str) -> None:
+    """
+    Setup logging for testing.
+
+    Args:
+        level: Log level as a string, options: debug, info, warning, error
+    """
+    logopt: dict[str, int] = {
+        "debug": logging.DEBUG,
+        "info": logging.INFO,
+        "warning": logging.WARNING,
+        "error": logging.ERROR,
+    }
+    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.0.3.dist-info → kerykeion-4.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.0.3
+Version: 4.8.1
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0
@@ -18,17 +18,19 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: pydantic (>=1.10.4,<2.0.0)
+Requires-Dist: pydantic (>=2.5,<3.0)
 Requires-Dist: pyswisseph (>=2.10.3.1,<3.0.0.0)
 Requires-Dist: pytz (>=2022.7,<2023.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)
 Requires-Dist: requests-cache (>=0.9.7,<0.10.0)
+Requires-Dist: scour (>=0.38.2,<0.39.0)
 Requires-Dist: terminaltables (>=3.1.10,<4.0.0)
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion
 Description-Content-Type: text/markdown
@@ -63,7 +65,10 @@ also it can calculate the aspects of a single persone or between two, you can se
 need in the settings in the utility module.
 It also can generate an SVG of a birthchart, a synastry chart or a transit chart.
 
+The core goal of this project is to provide a simple and easy approach to astrology in a data driven way.
+
 Here's an example of a birthchart:
+
 ![Kanye Birth Chart](http://centuryboy.altervista.org/KanyeNatalChart.svg)
 
 ## Web API
@@ -254,3 +259,12 @@ You can clone this repository or download a zip file using the right side button
 
 Feel free to contribute to the code!
 
+## License
+
+This project is licensed under the AGPL-3.0 License.
+To understand how this impacts your use of the software, please see the [LICENSE](LICENSE) file for details.
+If you have questions, you can reach out to me at my [email](mailto:battaglia.giacomo@yahoo.it?subject=Kerykeion) address.
+As a rule of thumb, if you are using this library in a project, you should open source the code of the project with a compatible license.
+
+You can implement the logic of kerkeion in your project and also keep it closed source by using a third party API, like the [AstrologerAPI](https://rapidapi.com/gbattaglia/api/astrologer/). The AstrologerAPI is AGPL-3.0 compliant. Subscribing to the API is also, currently, the best way to support the project.
+

kerykeion-4.8.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=Z9QUNqX6mrOm4ihxmhH0hiMv6ilp_-0HCQ4u_feE73g,22956
+kerykeion/charts/__init__.py,sha256=Juxkduy2TaagWblh_7CE8Acrg3dHL27-WEddJhau_eQ,127
+kerykeion/charts/charts_utils.py,sha256=45Ee0Hj5nb30q97ggYTQEShxkbCPq65gI0-sE32UxDM,15112
+kerykeion/charts/kerykeion_chart_svg.py,sha256=vtTYgwXELnZoPKvySpEQRLZSaYVzzpDQBcUk9DwnQjw,60764
+kerykeion/charts/templates/chart.xml,sha256=njaX-1vglR7PFInmteCNHcxwMTjsMJPkW56TlJq0qxw,70158
+kerykeion/enums.py,sha256=Ben9GLYkPucpYY2ZDpURzUbNCc9jzK2MuaffkgiXFdQ,965
+kerykeion/fetch_geonames.py,sha256=ZWB1DbcH54ab3fQhzPhLY0Dz0OaPJqiHFn2e7DRr1MM,4588
+kerykeion/kr_types/__init__.py,sha256=-qhGQikurdoHnGtuT1bsaEeZ-IwmZtIHMjGOPC9_oqQ,295
+kerykeion/kr_types/chart_types.py,sha256=g9z53FTOsb2rusUG8nK4dtFgvVa6RCwAfAbrxFb9KaM,2180
+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=V4iEj7egXZHrWiV1cGQIezbtVmOKbOB-BRzPwa8WVtc,12683
+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.8.1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.8.1.dist-info/METADATA,sha256=5KQpaw5C7-Ym6P1S6QJ8pIjMyOn4JlVh3cJrroZmluA,10351
+kerykeion-4.8.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.8.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.8.1.dist-info/RECORD,,

{kerykeion-4.0.3.dist-info → kerykeion-4.8.1.dist-info}/WHEEL

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

kerykeion-4.0.3.dist-info/RECORD

@@ -1,29 +0,0 @@
-LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion/__init__.py,sha256=b01JNmaaRWjA9seRjAA59Cduy1dNVJ0iU2oUFw5qZiw,3885
-kerykeion/aspects/__init__.py,sha256=KAGLkC41PRsRqiV6Ii38HIME-rfTrefiKOOzC5d7Ub0,292
-kerykeion/aspects/natal_aspects.py,sha256=W5AhNGAXqaBmhQOJghxqYWbETT3NHXLpGdDfqe1gj9E,10436
-kerykeion/aspects/synastry_aspects.py,sha256=DBEV-gT5gRuN8Rl6YNamjkvGQMvjehKL8qgTo75O9XI,2862
-kerykeion/astrological_subject.py,sha256=cIZiPnuNYSiSOOEAdOiSqxQbJXKDa-8jV8T7oDfRDe0,21222
-kerykeion/charts/__init__.py,sha256=3WzR2n9dr6MDzjTbEQOYpXSFlhfMfga5YWNsPawdbRw,127
-kerykeion/charts/charts_utils.py,sha256=qQMXu5XZCCjvyqL62fzh4JnKLzd_G6u9pcMk6f1DpIc,3197
-kerykeion/charts/kerykeion_chart_svg.py,sha256=Bj74zQMwSbicQ0nWXlGBYWW3ito2kT5BLuU7GI84Cwc,66633
-kerykeion/charts/templates/chart.xml,sha256=ZrkqJV3Du8vG1w8kVkM1wI-IiZNVDLDuS6dRtPz7wVo,69874
-kerykeion/fetch_geonames.py,sha256=6tgjrwBMyjbA6YNZ4rcESyYSn0FDyi1xL2gkFuy9o6k,4774
-kerykeion/kr_types/__init__.py,sha256=xlBzpRwcKTamjYOYxCTf-BGAX5NODBQB3zqBP_sH28o,104
-kerykeion/kr_types/chart_types.py,sha256=0grG4IdOd6fYbon5ErBy0xYxB66Ajfsl9o1F4ISPtck,2184
-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=pnUwYC3EqxPN3brmWjBUqYT_9Blxcqc--VqUoi6wfOs,3971
-kerykeion/relationship_score.py,sha256=bzM97kFjjDbc-grXhWG2PDkodu6dAFYZis3bO7qaR-A,6916
-kerykeion/report.py,sha256=se2ZSDKjk2v2eaMWqBFaYPhcqyGP-RlQbr6uA-9-Mz0,2481
-kerykeion/settings/__init__.py,sha256=adj8WE0Svgce770ZAhF0B4BhH4liQfTkPDQC6aL39a8,74
-kerykeion/settings/kerykeion_settings.py,sha256=f6c2BEBpO8J19-rayFNqDP1X6XccTAeIbrM5Vx1gfsc,13498
-kerykeion/settings/kr.config.json,sha256=twLNLD1AQivCVo-mmfmLRlwvuM1LWanPYBcnn9M0Ij4,12167
-kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
-kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
-kerykeion/utilities.py,sha256=l2IuKGP687USF5uzRHJFrNmvzHMSFzZEWliWSIHUjlU,5707
-kerykeion-4.0.3.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.0.3.dist-info/METADATA,sha256=n6ENISZ6woM5dw93ZwDVZGVHTb4Ev40sADyK0X3Yhaw,9409
-kerykeion-4.0.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-kerykeion-4.0.3.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.0.3.dist-info/RECORD,,