kerykeion 4.2.3__tar.gz → 4.3.0__tar.gz

{kerykeion-4.2.3 → kerykeion-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.2.3
+Version: 4.3.0
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0
@@ -24,7 +24,7 @@ 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)

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/aspects/natal_aspects.py

@@ -5,14 +5,13 @@
 
 from pathlib import Path
 from kerykeion import AstrologicalSubject
-from logging import getLogger, basicConfig
+import logging
 from typing import Union
 from kerykeion.settings.kerykeion_settings import get_settings
 from dataclasses import dataclass
+from functools import cached_property
 from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points, get_active_points_list
 
-logger = getLogger(__name__)
-basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level="INFO")
 
 AXES_LIST = [
     "First_House",
@@ -21,6 +20,7 @@ AXES_LIST = [
     "Fourth_House",
 ]
 
+
 @dataclass
 class NatalAspects:
     """
@@ -29,8 +29,6 @@ class NatalAspects:
 
     user: AstrologicalSubject
     new_settings_file: Union[Path, None] = None
-    _all_aspects: Union[list, None] = None
-    _relevant_aspects: Union[list, None] = None
 
     def __post_init__(self):
         self.settings = get_settings(self.new_settings_file)
@@ -39,7 +37,7 @@ class NatalAspects:
         self.aspects_settings = self.settings["aspects"]
         self.axes_orbit_settings = self.settings["general_settings"]["axes_orbit"]
 
-    @property
+    @cached_property
     def all_aspects(self):
         """
         Return all the aspects of the points in the natal chart in a dictionary,
@@ -47,9 +45,6 @@ class NatalAspects:
         without repetitions.
         """
 
-        if self._all_aspects is not None:
-            return self._all_aspects
-
         active_points_list = get_active_points_list(self.user, self.settings)
 
         self.all_aspects_list = []
@@ -73,10 +68,7 @@ class NatalAspects:
                         "color": color,
                         "aid": aid,
                         "diff": diff,
-                        "p1": planet_id_decoder(
-                            self.celestial_points,
-                            active_points_list[first]["name"]
-                        ),
+                        "p1": planet_id_decoder(self.celestial_points, active_points_list[first]["name"]),
                         "p2": planet_id_decoder(
                             self.celestial_points,
                             active_points_list[second]["name"],
@@ -87,7 +79,7 @@ class NatalAspects:
 
         return self.all_aspects_list
 
-    @property
+    @cached_property
     def relevant_aspects(self):
         """
         Filters the aspects list with the desired points, in this case
@@ -96,11 +88,7 @@ class NatalAspects:
         or the numbers of the houses.
         """
 
-        if self._relevant_aspects is not None:
-            logger.debug("Relevant aspects already calculated, returning cached value")
-            return self._relevant_aspects
-
-        logger.debug("Relevant aspects not already calculated, calculating now...")
+        logging.debug("Relevant aspects not already calculated, calculating now...")
         self.all_aspects
 
         aspects_filtered = []
@@ -131,7 +119,9 @@ class NatalAspects:
 
 
 if __name__ == "__main__":
-    basicConfig(level="DEBUG", force=True)
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
+
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
 
     # All aspects

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/aspects/synastry_aspects.py

@@ -6,6 +6,7 @@
 from kerykeion import AstrologicalSubject
 from pathlib import Path
 from typing import Union
+from functools import cached_property
 
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.settings.kerykeion_settings import get_settings
@@ -26,11 +27,11 @@ class SynastryAspects(NatalAspects):
         # Subjects
         self.first_user = kr_object_one
         self.second_user = kr_object_two
-        
+
         # Settings
         self.new_settings_file = new_settings_file
         self.settings = get_settings(self.new_settings_file)
-        
+
         self.celestial_points = self.settings["celestial_points"]
         self.aspects_settings = self.settings["aspects"]
         self.axes_orbit_settings = self.settings["general_settings"]["axes_orbit"]
@@ -39,10 +40,7 @@ class SynastryAspects(NatalAspects):
         self._all_aspects: Union[list, None] = None
         self._relevant_aspects: Union[list, None] = None
 
-
-
-
-    @property
+    @cached_property
     def all_aspects(self):
         """
         Return all the aspects of the points in the natal chart in a dictionary,
@@ -52,7 +50,7 @@ class SynastryAspects(NatalAspects):
 
         if self._all_aspects is not None:
             return self._all_aspects
-        
+
         # Celestial Points Lists
         first_active_points_list = get_active_points_list(self.first_user, self.settings)
         second_active_points_list = get_active_points_list(self.second_user, self.settings)
@@ -63,7 +61,9 @@ class SynastryAspects(NatalAspects):
             # Generates the aspects list whitout repetitions
             for second in range(len(second_active_points_list)):
                 verdict, name, orbit, aspect_degrees, color, aid, diff = get_aspect_from_two_points(
-                    self.aspects_settings, first_active_points_list[first]["abs_pos"], second_active_points_list[second]["abs_pos"]
+                    self.aspects_settings,
+                    first_active_points_list[first]["abs_pos"],
+                    second_active_points_list[second]["abs_pos"],
                 )
 
                 if verdict == True:
@@ -79,8 +79,7 @@ class SynastryAspects(NatalAspects):
                         "aid": aid,
                         "diff": diff,
                         "p1": planet_id_decoder(
-                            self.settings.celestial_points,
-                            first_active_points_list[first]["name"]
+                            self.settings.celestial_points, first_active_points_list[first]["name"]
                         ),
                         "p2": planet_id_decoder(
                             self.settings.celestial_points,
@@ -94,6 +93,9 @@ class SynastryAspects(NatalAspects):
 
 
 if __name__ == "__main__":
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
+
     john = AstrologicalSubject("John", 1940, 10, 9, 10, 30, "Liverpool")
     yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 10, 30, "Tokyo")
 

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/astrological_subject.py

@@ -6,9 +6,9 @@
 import math
 import pytz
 import swisseph as swe
+import logging
 
 from datetime import datetime
-from logging import getLogger, basicConfig
 from kerykeion.fetch_geonames import FetchGeonames
 from kerykeion.kr_types import (
     KerykeionException,
@@ -23,12 +23,6 @@ from typing import Union, Literal
 
 DEFAULT_GEONAMES_USERNAME = "century.boy"
 
-logger = getLogger(__name__)
-basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-    level="INFO"
-)
-
 
 class AstrologicalSubject:
     """
@@ -51,7 +45,6 @@ class AstrologicalSubject:
     - lng (Union[int, float], optional): _ Defaults to False.
     - lat (Union[int, float], optional): _ Defaults to False.
     - tz_str (Union[str, bool], optional): _ Defaults to False.
-    - logger (Union[Logger, None], optional): _ Defaults to None.
     - geonames_username (str, optional): _ Defaults to 'century.boy'.
     - online (bool, optional): Sets if you want to use the online mode (using
         geonames) or not. Defaults to True.
@@ -136,7 +129,7 @@ class AstrologicalSubject:
         zodiac_type: ZodiacType = "Tropic",
         online: bool = True,
     ) -> None:
-        logger.debug("Starting Kerykeion")
+        logging.debug("Starting Kerykeion")
 
         # We set the swisseph path to the current directory
         swe.set_ephe_path(
@@ -163,7 +156,7 @@ class AstrologicalSubject:
 
         # This message is set to encourage the user to set a custom geonames username
         if geonames_username is None and online:
-            logger.info(
+            logging.info(
                 "\n"
                 "********" + \
                 "\n" + \
@@ -184,11 +177,11 @@ class AstrologicalSubject:
 
         if not self.city:
             self.city = "London"
-            logger.warning("No city specified, using London as default")
+            logging.warning("No city specified, using London as default")
 
         if not self.nation:
             self.nation = "GB"
-            logger.warning("No nation specified, using GB as default")
+            logging.warning("No nation specified, using GB as default")
 
         if (not self.online) and (not lng or not lat or not tz_str):
             raise KerykeionException(
@@ -219,7 +212,7 @@ class AstrologicalSubject:
 
     def _fetch_tz_from_geonames(self) -> None:
         """Gets the nearest time zone for the calculation"""
-        logger.debug("Conneting to Geonames...")
+        logging.debug("Conneting to Geonames...")
 
         geonames = FetchGeonames(
             self.city,
@@ -243,11 +236,11 @@ class AstrologicalSubject:
 
         if self.lat > 66.0:
             self.lat = 66.0
-            logger.info("Polar circle override for houses, using 66 degrees")
+            logging.info("Polar circle override for houses, using 66 degrees")
 
         elif self.lat < -66.0:
             self.lat = -66.0
-            logger.info("Polar circle override for houses, using -66 degrees")
+            logging.info("Polar circle override for houses, using -66 degrees")
 
     def _get_utc(self) -> None:
         """Converts local time to utc time."""
@@ -595,7 +588,7 @@ class AstrologicalSubject:
         """
 
         KrData = AstrologicalSubjectModel(**self.__dict__)
-        json_string = KrData.json(exclude_none=True)
+        json_string = KrData.model_dump_json(exclude_none=True)
         print(json_string)
 
         if dump:
@@ -608,7 +601,7 @@ class AstrologicalSubject:
 
             with open(json_path, "w", encoding="utf-8") as file:
                 file.write(json_string)
-                logger.info(f"JSON file dumped in {json_path}.")
+                logging.info(f"JSON file dumped in {json_path}.")
 
         return json_string
 
@@ -622,7 +615,8 @@ class AstrologicalSubject:
 
 if __name__ == "__main__":
     import json
-    basicConfig(level="DEBUG", force=True)
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
 
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")
     print(json.loads(johnny.json(dump=True)))

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/charts/kerykeion_chart_svg.py

@@ -5,6 +5,7 @@
 
 
 import pytz
+import logging
 
 from datetime import datetime
 from kerykeion.settings.kerykeion_settings import get_settings
@@ -12,21 +13,13 @@ from kerykeion.aspects.synastry_aspects import SynastryAspects
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
 from kerykeion.kr_types import KerykeionException, ChartType
-from kerykeion.kr_types import ChartTemplateModel
+from kerykeion.kr_types import ChartTemplateDictionary
 from kerykeion.charts.charts_utils import decHourJoin, degreeDiff, offsetToTz, sliceToX, sliceToY
-from logging import getLogger, basicConfig
 from pathlib import Path
 from string import Template
 from typing import Union
 
 
-logger = getLogger(__name__)
-basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-    level="INFO"
-)
-
-
 class KerykeionChartSVG:
     """
     Creates the instance that can generate the chart with the
@@ -166,7 +159,7 @@ class KerykeionChartSVG:
         self.home_countrycode = self.user.nation
         self.home_timezonestr = self.user.tz_str
 
-        logger.info(f"{self.user.name} birth location: {self.home_location}, {self.home_geolat}, {self.home_geolon}")
+        logging.info(f"{self.user.name} birth location: {self.home_location}, {self.home_geolat}, {self.home_geolon}")
 
         # default location
         self.location = self.home_location
@@ -238,7 +231,7 @@ class KerykeionChartSVG:
         Sets the output direcotry and returns it's path.
         """
         self.output_directory = dir_path
-        logger.info(f"Output direcotry set to: {self.output_directory}")
+        logging.info(f"Output direcotry set to: {self.output_directory}")
 
     def parse_json_settings(self, settings_file):
         """
@@ -534,7 +527,7 @@ class KerykeionChartSVG:
         for i in range(len(self.available_planets_setting)):
             if self.available_planets_setting[i]["is_active"] == 1:
                 # list of planets sorted by degree
-                logger.debug(f"planet: {i}, degree: {self.points_deg_ut[i]}")
+                logging.debug(f"planet: {i}, degree: {self.points_deg_ut[i]}")
                 planets_degut[self.points_deg_ut[i]] = i
 
             self._value_element_from_planet(i)
@@ -566,7 +559,7 @@ class KerykeionChartSVG:
             diffb = degreeDiff(next, self.points_deg_ut[i])
             planets_by_pos[e] = [i, diffa, diffb]
 
-            logger.debug(f'{self.available_planets_setting[i]["label"]}, {diffa}, {diffb}')
+            logging.debug(f'{self.available_planets_setting[i]["label"]}, {diffa}, {diffb}')
 
             if diffb < planet_drange:
                 if group_open:
@@ -931,7 +924,7 @@ class KerykeionChartSVG:
                 for l, w in opp[k].items():
                     for a, b in sq.items():
                         if k in sq[a] and l in sq[a]:
-                            logger.debug(f"Got tsquare {a} {k} {l}")
+                            logging.debug(f"Got tsquare {a} {k} {l}")
                             if k > l:
                                 tsquare[f"{a},{l},{k}"] = f"{self.available_planets_setting[a]['label']} => {self.available_planets_setting[l]['label']}, {self.available_planets_setting[k]['label']}"
 
@@ -1252,7 +1245,7 @@ class KerykeionChartSVG:
 
         return out
 
-    def _createTemplateDictionary(self):
+    def _createTemplateDictionary(self) -> ChartTemplateDictionary:
         # self.chart_type = "Transit"
         # empty element points
         self.fire = 0.0
@@ -1280,7 +1273,7 @@ class KerykeionChartSVG:
             viewbox = self.chart_settings["wide_chart_viewBox"]
 
         # template dictionary
-        td: ChartTemplateModel = dict()
+        td: ChartTemplateDictionary = dict() # type: ignore
         r = 240
 
         if self.chart_type == "ExternalNatal":
@@ -1474,7 +1467,7 @@ class KerykeionChartSVG:
 
         # return filename
 
-        logger.debug(f"Template dictionary keys: {td.keys()}")
+        logging.debug(f"Template dictionary keys: {td.keys()}")
 
         self._createTemplateDictionary()
         return template.replace('"', "'")
@@ -1490,11 +1483,12 @@ class KerykeionChartSVG:
         with open(self.chartname, "w", encoding="utf-8", errors="ignore") as output_file:
             output_file.write(self.template)
 
-        logger.info(f"SVG Generated Correctly in: {self.chartname}")
+        logging.info(f"SVG Generated Correctly in: {self.chartname}")
 
 
 if __name__ == "__main__":
-    basicConfig(level="DEBUG", force=True)
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
 
     first = AstrologicalSubject("John Lennon", 1940, 10, 9, 10, 30, "Liverpool", "GB")
     second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/fetch_geonames.py

@@ -4,19 +4,12 @@
 """
 
 
-from logging import getLogger, basicConfig
+import logging
 from requests import Request
 from requests_cache import CachedSession
 from typing import Union
 
 
-logger = getLogger(__name__)
-basicConfig(
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-    level="INFO"
-)
-
-
 class FetchGeonames:
     """
     Class to handle requests to the GeoNames API
@@ -25,8 +18,6 @@ class FetchGeonames:
     city_name (str): Name of the city
     country_code (str): Two letters country code
     username (str, optional): GeoNames username, defaults to "century.boy".
-    logger (Union[logging.Logger, None], optional):
-        Optional logger, defaults to None. If none provided creates one.
     """
 
     def __init__(
@@ -57,21 +48,21 @@ class FetchGeonames:
         params = {"lat": lat, "lng": lon, "username": self.username}
 
         prepared_request = Request("GET", self.timezone_url, params=params).prepare()
-        logger.debug(f"Requesting data from GeoName timezones: {prepared_request.url}")
+        logging.debug(f"Requesting data from GeoName timezones: {prepared_request.url}")
 
         try:
             response = self.session.send(prepared_request)
             response_json = response.json()
 
         except Exception as e:
-            logger.error(f"Error fetching {self.timezone_url}: {e}")
+            logging.error(f"Error fetching {self.timezone_url}: {e}")
             return {}
 
         try:
             timezone_data["timezonestr"] = response_json["timezoneId"]
 
         except Exception as e:
-            logger.error(f"Error serializing data maybe wrong username? Details: {e}")
+            logging.error(f"Error serializing data maybe wrong username? Details: {e}")
             return {}
 
         if hasattr(response, "from_cache"):
@@ -95,14 +86,14 @@ class FetchGeonames:
         }
 
         prepared_request = Request("GET", self.base_url, params=params).prepare()
-        logger.debug(f"Requesting data from geonames basic: {prepared_request.url}")
+        logging.debug(f"Requesting data from geonames basic: {prepared_request.url}")
 
         try:
             response = self.session.send(prepared_request)
             response_json = response.json()
 
         except Exception as e:
-            logger.error(f"Error in fetching {self.base_url}: {e}")
+            logging.error(f"Error in fetching {self.base_url}: {e}")
             return {}
 
         try:
@@ -112,7 +103,7 @@ class FetchGeonames:
             city_data_whitout_tz["countryCode"] = response_json["geonames"][0]["countryCode"]
 
         except Exception as e:
-            logger.error(f"Error serializing data maybe wrong username? Details: {e}")
+            logging.error(f"Error serializing data maybe wrong username? Details: {e}")
             return {}
 
         if hasattr(response, "from_cache"):
@@ -132,18 +123,15 @@ class FetchGeonames:
             timezone_response = self.__get_timezone(city_data_response["lat"], city_data_response["lng"])
 
         except Exception as e:
-            logger.error(f"Error in fetching timezone: {e}")
+            logging.error(f"Error in fetching timezone: {e}")
             return {}
 
         return {**timezone_response, **city_data_response}
 
 
 if __name__ == "__main__":
-    basicConfig(
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-        level="DEBUG",
-        force=True,
-    )
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
 
     geonames = FetchGeonames("Roma", "IT")
     print(geonames.get_serialized_data())

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/kr_types/__init__.py

@@ -1,5 +1,5 @@
 from .kerykeion_exception import KerykeionException
 from .kr_literals import *
 from .kr_models import *
-from .chart_types import ChartTemplateModel
-from .settings_models import KerykeionSettingsModel
+from .chart_types import ChartTemplateDictionary
+from .settings_models import KerykeionSettingsModel

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/kr_types/chart_types.py

@@ -1,16 +1,7 @@
-from typing import Literal, Union, Optional
-from pydantic import BaseModel
+from typing import TypedDict
 
 
-class ChartTemplateModel(BaseModel):
-    """Pydantic model for the chart template."""
-
-    def __setitem__(self, key, value):
-        setattr(self, key, value)
-
-    def __getitem__(self, key):
-        return getattr(self, key)
-
+class ChartTemplateDictionary(TypedDict):
     transitRing: str
     degreeRing: str
     c1: str
@@ -19,14 +10,14 @@ class ChartTemplateModel(BaseModel):
     c2style: str
     c3: str
     c3style: str
-    makeAspects: bool
-    makeAspectGrid: bool
-    makePatterns: bool
-    chart_width: int
-    circleX: int
-    circleY: int
-    svgWidth: int
-    svgHeight: int
+    makeAspects: str
+    makeAspectGrid: str
+    makePatterns: str
+    chart_width: float
+    circleX: str
+    circleY: str
+    svgWidth: str
+    svgHeight: str
     viewbox: str
     stringTitle: str
     stringName: str
@@ -39,7 +30,7 @@ class ChartTemplateModel(BaseModel):
     lunar_phase_cx: int
     lunar_phase_r: int
     lunar_phase_outline: str
-    lunar_phase_rotate: int
+    lunar_phase_rotate: float
     stringLocation: str
     stringDateTime: str
     stringLat: str
@@ -86,12 +77,12 @@ class ChartTemplateModel(BaseModel):
     orb_color_144: str
     orb_color_150: str
     orb_color_180: str
-    cfgZoom: float
-    cfgRotate: int
+    cfgZoom: str
+    cfgRotate: str
     cfgTranslate: str
-    makeZodiac: bool
-    makeHouses: bool
-    makePlanets: bool
-    makeElements: bool
-    makePlanetGrid: bool
-    makeHousesGrid: bool
+    makeZodiac: str
+    makeHouses: str
+    makePlanets: str
+    makeElements: str
+    makePlanetGrid: str
+    makeHousesGrid: str

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/kr_types/kr_models.py

@@ -11,7 +11,7 @@ from .kr_literals import *
 
 
 class LunarPhaseModel(BaseModel):
-    degrees_between_s_m: Union[int, float]
+    degrees_between_s_m: Union[float, int]
     moon_phase: int
     sun_phase: int
     moon_emoji: LunarPhaseEmoji
@@ -31,7 +31,7 @@ class LunarPhaseModel(BaseModel):
     def __repr__(self):
         return (
             super()
-            .dict(
+            .model_dump(
                 exclude_none=True,
                 exclude_unset=True,
                 exclude_defaults=True,
@@ -136,6 +136,7 @@ class AstrologicalSubjectModel(BaseModel):
     uranus: KerykeionPointModel
     neptune: KerykeionPointModel
     pluto: KerykeionPointModel
+    chiron: KerykeionPointModel
 
     # Houses
     first_house: KerykeionPointModel
@@ -160,6 +161,9 @@ class AstrologicalSubjectModel(BaseModel):
 
 
 if __name__ == "__main__":
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
+
     sun = KerykeionPointModel(
         name="Sun",
         element="Air",

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/kr_types/settings_models.py

@@ -5,16 +5,11 @@
 
 
 from json import load
-from logging import getLogger, basicConfig
 from pydantic import BaseModel, Field
 from pathlib import Path
 from typing import Dict, List, Union
 
 
-logger = getLogger(__name__)
-basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level="INFO")
-
-
 class CustomBaseModel(BaseModel):
     """
     Extends the BaseModel class of Pydantic to add some useful methods.

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/relationship_score.py

@@ -5,18 +5,11 @@
 
 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
@@ -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-4.2.3 → kerykeion-4.3.0}/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-4.2.3 → kerykeion-4.3.0}/kerykeion/settings/kerykeion_settings.py

@@ -5,18 +5,12 @@
 
 
 from json import load
-from logging import getLogger, basicConfig
+import logging
 from pathlib import Path
 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")
-
-
-
-
 def get_settings(new_settings_file: Union[Path, None] = None) -> KerykeionSettingsModel:
     """
     This function is used to get the settings dict from the settings file.
@@ -47,7 +41,7 @@ def get_settings(new_settings_file: Union[Path, None] = None) -> KerykeionSettin
     if not settings_file.exists():
         settings_file = Path(__file__).parent / "kr.config.json"
 
-    logger.debug(f"Kerykeion config file path: {settings_file}")
+    logging.debug(f"Kerykeion config file path: {settings_file}")
     with open(settings_file, "r", encoding="utf8") as f:
         settings_dict = load(f)
 
@@ -71,4 +65,7 @@ def merge_settings(settings: KerykeionSettingsModel, new_settings: Dict) -> Kery
 
 
 if __name__ == "__main__":
+    from kerykeion.utilities import setup_logging
+    setup_logging(level="debug")
+
     print(get_settings())

{kerykeion-4.2.3 → kerykeion-4.3.0}/kerykeion/utilities.py

@@ -1,8 +1,6 @@
 from kerykeion.kr_types import KerykeionPointModel, KerykeionException, KerykeionSettingsModel, AstrologicalSubjectModel
 from typing import Union, Literal
-from logging import getLogger
-
-logger = getLogger(__name__)
+import logging
 
 
 def get_number_from_name(name: str) -> int:
@@ -203,4 +201,17 @@ def calculate_position(
     else:
         raise KerykeionException(f"Error in calculating positions! Degrees: {degree}")
 
-    return KerykeionPointModel(**dictionary)
+    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)

{kerykeion-4.2.3 → kerykeion-4.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kerykeion"
-version = "4.2.3"
+version = "4.3.0"
 authors = ["Giacomo Battaglia <battaglia.giacomo@yahoo.it>"]
 description = "A python library for astrology."
 license = "AGPL-3.0"
@@ -46,7 +46,7 @@ pyswisseph = "^2.10.3.1"
 pytz = "^2022.7"
 requests = "^2.28.1"
 requests-cache = "^0.9.7"
-pydantic = "^1.10.4"
+pydantic = "^2.5"
 terminaltables = "^3.1.10"
 
 [tool.poetry.scripts]