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

kerykeion/report.py

@@ -1,4 +1,4 @@
-from kerykeion import AstrologicalSubject
+from kerykeion import AstrologicalSubjectFactory
 from simple_ascii_tables import AsciiTable
 from kerykeion.utilities import get_houses_list, get_available_astrological_points_list
 from typing import Union
@@ -14,7 +14,7 @@ class Report:
     planets_table: str
     houses_table: str
 
-    def __init__(self, instance: Union[AstrologicalSubject, AstrologicalSubjectModel]):
+    def __init__(self, instance: AstrologicalSubjectModel):
         self.instance = instance
 
         self.get_report_title()
@@ -46,7 +46,7 @@ class Report:
         Creates the planets table.
         """
 
-        planets_data = [["Planet", "Sign", "Pos.", "Ret.", "House"]] + [
+        planets_data = [["AstrologicalPoint", "Sign", "Pos.", "Ret.", "House"]] + [
             [
                 planet.name,
                 planet.sign,
@@ -89,6 +89,6 @@ if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
     setup_logging(level="debug")
 
-    john = AstrologicalSubject("John", 1975, 10, 10, 21, 15, "Roma", "IT")
+    john = AstrologicalSubjectFactory.from_birth_data("John", 1975, 10, 10, 21, 15, "Roma", "IT")
     report = Report(john)
     report.print_report()

kerykeion/settings/config_constants.py

@@ -1,8 +1,9 @@
-from kerykeion.kr_types.kr_literals import Planet, AxialCusps, AspectName
+from kerykeion.kr_types.kr_literals import AstrologicalPoint
 from kerykeion.kr_types.kr_models import ActiveAspect
-from typing import List, Union
+from typing import List
 
-DEFAULT_ACTIVE_POINTS: List[Union[Planet, AxialCusps]] = [
+
+DEFAULT_ACTIVE_POINTS: List[AstrologicalPoint] = [
     "Sun",
     "Moon",
     "Mercury",
@@ -15,17 +16,40 @@ DEFAULT_ACTIVE_POINTS: List[Union[Planet, AxialCusps]] = [
     "Pluto",
     "Mean_Node",
     # "True_Node",
+    "Mean_South_Node",
+    # "True_South_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",
-    "Mean_Lilith",
-    "Mean_South_Node",
-    # "True_South_Node"
+    # "Vertex",
+    # "Anti_Vertex",
+    # "Pars_Fortunae",
+    # "Pars_Spiritus",
+    # "Pars_Amoris",
+    # "Pars_Fidei"
 ]
 """
 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.
 """
 
 DEFAULT_ACTIVE_ASPECTS: List[ActiveAspect] = [
@@ -45,3 +69,8 @@ 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.
 """
+
+DEFAULT_AXIS_ORBIT: int = 1
+"""
+Default orbit for the axes aspects.
+"""

kerykeion/settings/kerykeion_settings.py

@@ -53,6 +53,7 @@ def get_settings(new_settings_file: Union[Path, None, KerykeionSettingsModel, di
     return KerykeionSettingsModel(**settings_dict)
 
 
+@functools.lru_cache
 def merge_settings(settings: KerykeionSettingsModel, new_settings: Dict) -> KerykeionSettingsModel:
     """
     This function is used to merge the settings file with the default settings,