kerykeion 4.17.2__py3-none-any.whl → 4.18.1__py3-none-any.whl

kerykeion/__init__.py

@@ -9,7 +9,8 @@ This is part of Kerykeion (C) 2024 Giacomo Battaglia
 from .astrological_subject import AstrologicalSubject
 from .charts.kerykeion_chart_svg import KerykeionChartSVG
 from .kr_types import *
-from .relationship_score import RelationshipScore
+from .relationship_score.relationship_score import RelationshipScore
+from .relationship_score.relationship_score_factory import RelationshipScoreFactory
 from .aspects import SynastryAspects, NatalAspects
 from .report import Report
 from .settings import KerykeionSettingsModel, get_settings

kerykeion/aspects/aspects_utils.py

@@ -9,144 +9,55 @@ from kerykeion.settings import KerykeionSettingsModel
 from swisseph import difdeg2n
 from typing import Union
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
+from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsAspectModel
 
 
-def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, int], point_two: Union[float, int]):
-    """
-    Utility function.
-    It calculates the aspects between the 2 points.
-    Args: first point, second point.
+def get_aspect_from_two_points(
+    aspects_settings: Union[list[KerykeionSettingsAspectModel], list[dict]],
+    point_one: Union[float, int],
+    point_two: Union[float, int],
+):
     """
+    Utility function to calculate the aspects between two points.
+
+    Args:
+        aspects_settings (dict): Dictionary containing aspect settings.
+        point_one (Union[float, int]): First point.
+        point_two (Union[float, int]): Second point.
 
+    Returns:
+        dict: Dictionary containing the aspect details.
+    """
     distance = abs(difdeg2n(point_one, point_two))
     diff = abs(point_one - point_two)
 
-    if int(distance) <= aspects_settings[0]["orb"]:
-        name = aspects_settings[0]["name"]
-        aspect_degrees = aspects_settings[0]["degree"]
-        verdict = True
-        aid = 0
-
-    elif (
-        (aspects_settings[1]["degree"] - aspects_settings[1]["orb"])
-        <= int(distance)
-        <= (aspects_settings[1]["degree"] + aspects_settings[1]["orb"])
-    ):
-        name = aspects_settings[1]["name"]
-        aspect_degrees = aspects_settings[1]["degree"]
-        verdict = True
-        aid = 1
-
-    elif (
-        (aspects_settings[2]["degree"] - aspects_settings[2]["orb"])
-        <= int(distance)
-        <= (aspects_settings[2]["degree"] + aspects_settings[2]["orb"])
-    ):
-        name = aspects_settings[2]["name"]
-        aspect_degrees = aspects_settings[2]["degree"]
-        verdict = True
-        aid = 2
-
-    elif (
-        (aspects_settings[3]["degree"] - aspects_settings[3]["orb"])
-        <= int(distance)
-        <= (aspects_settings[3]["degree"] + aspects_settings[3]["orb"])
-    ):
-        name = aspects_settings[3]["name"]
-        aspect_degrees = aspects_settings[3]["degree"]
-        verdict = True
-        aid = 3
-
-    elif (
-        (aspects_settings[4]["degree"] - aspects_settings[4]["orb"])
-        <= int(distance)
-        <= (aspects_settings[4]["degree"] + aspects_settings[4]["orb"])
-    ):
-        name = aspects_settings[4]["name"]
-        aspect_degrees = aspects_settings[4]["degree"]
-        verdict = True
-        aid = 4
-
-    elif (
-        (aspects_settings[5]["degree"] - aspects_settings[5]["orb"])
-        <= int(distance)
-        <= (aspects_settings[5]["degree"] + aspects_settings[5]["orb"])
-    ):
-        name = aspects_settings[5]["name"]
-        aspect_degrees = aspects_settings[5]["degree"]
-        verdict = True
-        aid = 5
-
-    elif (
-        (aspects_settings[6]["degree"] - aspects_settings[6]["orb"])
-        <= int(distance)
-        <= (aspects_settings[6]["degree"] + aspects_settings[6]["orb"])
-    ):
-        name = aspects_settings[6]["name"]
-        aspect_degrees = aspects_settings[6]["degree"]
-        verdict = True
-        aid = 6
-
-    elif (
-        (aspects_settings[7]["degree"] - aspects_settings[7]["orb"])
-        <= int(distance)
-        <= (aspects_settings[7]["degree"] + aspects_settings[7]["orb"])
-    ):
-        name = aspects_settings[7]["name"]
-        aspect_degrees = aspects_settings[7]["degree"]
-        verdict = True
-        aid = 7
-
-    elif (
-        (aspects_settings[8]["degree"] - aspects_settings[8]["orb"])
-        <= int(distance)
-        <= (aspects_settings[8]["degree"] + aspects_settings[8]["orb"])
-    ):
-        name = aspects_settings[8]["name"]
-        aspect_degrees = aspects_settings[8]["degree"]
-        verdict = True
-        aid = 8
-
-    elif (
-        (aspects_settings[9]["degree"] - aspects_settings[9]["orb"])
-        <= int(distance)
-        <= (aspects_settings[9]["degree"] + aspects_settings[9]["orb"])
-    ):
-        name = aspects_settings[9]["name"]
-        aspect_degrees = aspects_settings[9]["degree"]
-        verdict = True
-        aid = 9
-
-    elif (
-        (aspects_settings[10]["degree"] - aspects_settings[10]["orb"])
-        <= int(distance)
-        <= (aspects_settings[10]["degree"] + aspects_settings[10]["orb"])
-    ):
-        name = aspects_settings[10]["name"]
-        aspect_degrees = aspects_settings[10]["degree"]
-        verdict = True
-        aid = 10
+    for aid, aspect in enumerate(aspects_settings):
+        aspect_degree = aspect["degree"] # type: ignore
+        aspect_orb = aspect["orb"] # type: ignore
 
+        if (aspect_degree - aspect_orb) <= int(distance) <= (aspect_degree + aspect_orb):
+            name = aspect["name"] # type: ignore
+            aspect_degrees = aspect_degree
+            verdict = True
+            break
     else:
         verdict = False
         name = None
-        distance = 0
         aspect_degrees = 0
-        aid = None
-
+        aid = None # type: ignore
 
     return {
-        "verdict": verdict, 
+        "verdict": verdict,
         "name": name,
         "orbit": distance - aspect_degrees,
         "distance": distance - aspect_degrees,
         "aspect_degrees": aspect_degrees,
         "aid": aid,
-        "diff": diff
+        "diff": diff,
     }
 
 
-def planet_id_decoder(planets_settings: dict, name: str):
+def planet_id_decoder(planets_settings: list[KerykeionSettingsCelestialPointModel], name: str) -> int:
     """
     Check if the name of the planet is the same in the settings and return
     the correct id for the planet.
@@ -157,8 +68,12 @@ def planet_id_decoder(planets_settings: dict, name: str):
             result = planet["id"]
             return result
 
+    raise ValueError(f"Planet {name} not found in the settings")
+
 
-def get_active_points_list(subject: Union[AstrologicalSubject, AstrologicalSubjectModel], settings: Union[KerykeionSettingsModel, dict]) -> list:
+def get_active_points_list(
+    subject: Union[AstrologicalSubject, AstrologicalSubjectModel], settings: Union[KerykeionSettingsModel, dict]
+) -> list:
     """
     Given an astrological subject and the settings, return a list of the active points.
     Args:

kerykeion/aspects/natal_aspects.py

@@ -11,7 +11,7 @@ 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
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsModel
 
 
@@ -35,9 +35,9 @@ class NatalAspects:
     def __post_init__(self):
         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"]
+        self.celestial_points = self.settings.celestial_points
+        self.aspects_settings = self.settings.aspects
+        self.axes_orbit_settings = self.settings.general_settings.axes_orbit
 
     @cached_property
     def all_aspects(self):
@@ -55,7 +55,8 @@ class NatalAspects:
             # Generates the aspects list without repetitions
             for second in range(first + 1, len(active_points_list)):
                 aspect = get_aspect_from_two_points(
-                    self.aspects_settings, active_points_list[first]["abs_pos"], active_points_list[second]["abs_pos"]
+                    self.aspects_settings, active_points_list[first]["abs_pos"], 
+                    active_points_list[second]["abs_pos"]
                 )
 
                 verdict = aspect["verdict"]
@@ -64,27 +65,23 @@ class NatalAspects:
                 aspect_degrees = aspect["aspect_degrees"]
                 aid = aspect["aid"]
                 diff = aspect["diff"]
-                
 
                 if verdict == True:
-                    d_asp = {
-                        "p1_name": active_points_list[first]["name"],
-                        "p1_abs_pos": active_points_list[first]["abs_pos"],
-                        "p2_name": active_points_list[second]["name"],
-                        "p2_abs_pos": active_points_list[second]["abs_pos"],
-                        "aspect": name,
-                        "orbit": orbit,
-                        "aspect_degrees": aspect_degrees,
-                        "aid": aid,
-                        "diff": diff,
-                        "p1": planet_id_decoder(self.celestial_points, active_points_list[first]["name"]),
-                        "p2": planet_id_decoder(
-                            self.celestial_points,
-                            active_points_list[second]["name"],
-                        ),
-                    }
-
-                    self.all_aspects_list.append(d_asp)
+                    aspect_model = AspectModel(
+                        p1_name=active_points_list[first]["name"],
+                        p1_abs_pos=active_points_list[first]["abs_pos"],
+                        p2_name=active_points_list[second]["name"],
+                        p2_abs_pos=active_points_list[second]["abs_pos"],
+                        aspect=name,
+                        orbit=orbit,
+                        aspect_degrees=aspect_degrees,
+                        aid=aid,
+                        diff=diff,
+                        p1=planet_id_decoder(self.celestial_points, active_points_list[first]["name"]),
+                        p2=planet_id_decoder(self.celestial_points, active_points_list[second]["name"]),
+                        is_major=self.aspects_settings[aid]["is_major"],
+                    )
+                    self.all_aspects_list.append(aspect_model)
 
         return self.all_aspects_list
 
@@ -95,6 +92,7 @@ class NatalAspects:
         the most important are hardcoded.
         Set the list with set_points and creating a list with the names
         or the numbers of the houses.
+        The relevant aspects are the ones that are set as active ("is_active") in the settings.
         """
 
         logging.debug("Relevant aspects not already calculated, calculating now...")
@@ -129,6 +127,7 @@ class NatalAspects:
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
+
     setup_logging(level="debug")
 
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US")

kerykeion/aspects/synastry_aspects.py

@@ -11,7 +11,7 @@ from functools import cached_property
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points, get_active_points_list
-from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel, AspectModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsModel
 from typing import Union
 
@@ -25,7 +25,7 @@ class SynastryAspects(NatalAspects):
         self,
         kr_object_one: Union[AstrologicalSubject, AstrologicalSubjectModel],
         kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
-        new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
+        new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None,
     ):
         # Subjects
         self.first_user = kr_object_one
@@ -35,9 +35,9 @@ class SynastryAspects(NatalAspects):
         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"]
+        self.celestial_points = self.settings.celestial_points
+        self.aspects_settings = self.settings.aspects
+        self.axes_orbit_settings = self.settings.general_settings.axes_orbit
 
         # Private variables of the aspects
         self._all_aspects: Union[list, None] = None
@@ -76,34 +76,29 @@ class SynastryAspects(NatalAspects):
                 aid = aspect["aid"]
                 diff = aspect["diff"]
 
-
                 if verdict == True:
-                    d_asp = {
-                        "p1_name": first_active_points_list[first]["name"],
-                        "p1_abs_pos": first_active_points_list[first]["abs_pos"],
-                        "p2_name": second_active_points_list[second]["name"],
-                        "p2_abs_pos": second_active_points_list[second]["abs_pos"],
-                        "aspect": name,
-                        "orbit": orbit,
-                        "aspect_degrees": aspect_degrees,
-                        "aid": aid,
-                        "diff": diff,
-                        "p1": planet_id_decoder(
-                            self.settings.celestial_points, first_active_points_list[first]["name"]
-                        ),
-                        "p2": planet_id_decoder(
-                            self.settings.celestial_points,
-                            second_active_points_list[second]["name"],
-                        ),
-                    }
-
-                    self.all_aspects_list.append(d_asp)
+                    aspect_model = AspectModel(
+                        p1_name=first_active_points_list[first]["name"],
+                        p1_abs_pos=first_active_points_list[first]["abs_pos"],
+                        p2_name=second_active_points_list[second]["name"],
+                        p2_abs_pos=second_active_points_list[second]["abs_pos"],
+                        aspect=name,
+                        orbit=orbit,
+                        aspect_degrees=aspect_degrees,
+                        aid=aid,
+                        diff=diff,
+                        p1=planet_id_decoder(self.celestial_points, first_active_points_list[first]["name"]),
+                        p2=planet_id_decoder(self.celestial_points, second_active_points_list[second]["name"]),
+                        is_major=self.aspects_settings[aid]["is_major"],
+                    )
+                    self.all_aspects_list.append(aspect_model)
 
         return self.all_aspects_list
 
 
 if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
+
     setup_logging(level="debug")
 
     john = AstrologicalSubject("John", 1940, 10, 9, 18, 30, "Liverpool")

kerykeion/charts/kerykeion_chart_svg.py

@@ -15,7 +15,7 @@ from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointMode
 from kerykeion.kr_types import ChartTemplateDictionary
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsModel
-from kerykeion.kr_types.kr_literals import KerykeionChartTheme
+from kerykeion.kr_types.kr_literals import KerykeionChartTheme, KerykeionChartLanguage
 from kerykeion.charts.charts_utils import (
     draw_zodiac_slice, 
     convert_latitude_coordinate_to_string, 
@@ -64,9 +64,12 @@ class KerykeionChartSVG:
     """
     
     # Constants
+    _BASIC_CHART_VIEWBOX = "0 0 772.2 546.0"
+    _WIDE_CHART_VIEWBOX = "0 0 1060 546.0"
     _DEFAULT_HEIGHT = 546.0
     _DEFAULT_FULL_WIDTH = 1200
     _DEFAULT_NATAL_WIDTH = 772.2
+    _PLANET_IN_ZODIAC_EXTRA_POINTS = 10
 
     # Set at init
     first_obj: Union[AstrologicalSubject, AstrologicalSubjectModel]
@@ -85,14 +88,11 @@ class KerykeionChartSVG:
     first_circle_radius: float
     second_circle_radius: float
     third_circle_radius: float
-    homedir: Path
     width: Union[float, int]
     language_settings: dict
     chart_colors_settings: dict
     planets_settings: dict
     aspects_settings: dict
-    planet_in_zodiac_extra_points: int
-    chart_settings: dict
     user: Union[AstrologicalSubject, AstrologicalSubjectModel]
     available_planets_setting: List[KerykeionSettingsCelestialPointModel]
     height: float
@@ -110,17 +110,17 @@ class KerykeionChartSVG:
         new_settings_file: Union[Path, None, KerykeionSettingsModel, dict] = None,
         theme: Union[KerykeionChartTheme, None] = "classic",
         double_chart_aspect_grid_type: Literal["list", "table"] = "list",
-        chart_language: str = "EN",
+        chart_language: KerykeionChartLanguage = "EN",
     ):
         # Directories:
-        self.homedir = Path.home()
+        home_directory = Path.home()
         self.new_settings_file = new_settings_file
         self.chart_language = chart_language
 
         if new_output_directory:
             self.output_directory = Path(new_output_directory)
         else:
-            self.output_directory = self.homedir
+            self.output_directory = home_directory
 
         self.parse_json_settings(new_settings_file)
         self.chart_type = chart_type
@@ -235,8 +235,6 @@ class KerykeionChartSVG:
         self.chart_colors_settings = settings["chart_colors"]
         self.planets_settings = settings["celestial_points"]
         self.aspects_settings = settings["aspects"]
-        self.planet_in_zodiac_extra_points = settings["general_settings"]["planet_in_zodiac_extra_points"]
-        self.chart_settings = settings["chart_settings"]
 
     def _draw_zodiac_circle_slices(self, r):
         """
@@ -272,7 +270,7 @@ class KerykeionChartSVG:
         The points should include just the standard way of calculating the elements points.
         """
 
-        zodiac = (
+        ZODIAC = (
             {"name": "Ari", "element": "fire"},
             {"name": "Tau", "element": "earth"},
             {"name": "Gem", "element": "air"},
@@ -305,9 +303,9 @@ class KerykeionChartSVG:
             if related_zodiac_signs != []:
                 for e in range(len(related_zodiac_signs)):
                     if int(related_zodiac_signs[e]) == int(cz):
-                        extra_points = self.planet_in_zodiac_extra_points
+                        extra_points = self._PLANET_IN_ZODIAC_EXTRA_POINTS
 
-            ele = zodiac[points_sign[i]]["element"]
+            ele = ZODIAC[points_sign[i]]["element"]
             if ele == "fire":
                 self.fire = self.fire + self.available_planets_setting[i]["element_points"] + extra_points
 
@@ -366,7 +364,7 @@ class KerykeionChartSVG:
         template_dict["stringName"] = f"{self.user.name}:" if self.chart_type in ["Synastry", "Transit"] else f'{self.language_settings["info"]}:'
 
         # Set viewbox based on chart type
-        template_dict['viewbox'] = self.chart_settings["basic_chart_viewBox"] if self.chart_type in ["Natal", "ExternalNatal"] else self.chart_settings["wide_chart_viewBox"]
+        template_dict['viewbox'] = self._BASIC_CHART_VIEWBOX if self.chart_type in ["Natal", "ExternalNatal"] else self._WIDE_CHART_VIEWBOX
 
         # Generate rings and circles based on chart type
         if self.chart_type in ["Transit", "Synastry"]:
@@ -888,4 +886,9 @@ if __name__ == "__main__":
     # German Language Chart
     german_subject = AstrologicalSubject("Albert Einstein", 1879, 3, 14, 11, 30, "Ulm", "DE")
     german_chart = KerykeionChartSVG(german_subject, chart_language="DE")
-    german_chart.makeSVG()
+    german_chart.makeSVG()
+
+    # Hindi Language Chart
+    hindi_subject = AstrologicalSubject("Amitabh Bachchan", 1942, 10, 11, 4, 0, "Allahabad", "IN")
+    hindi_chart = KerykeionChartSVG(hindi_subject, chart_language="HI")
+    hindi_chart.makeSVG()

kerykeion/ephemeris_data.py

@@ -99,18 +99,25 @@ class EphemerisDataFactory:
         if len(self.dates_list) > 1000:
             logging.warning(f"Large number of dates: {len(self.dates_list)}. The calculation may take a while.")
 
-    def get_ephemeris_data(self) -> list:
+    def get_ephemeris_data(self, as_model: bool = False) -> list:
         """
         Generate ephemeris data for the specified date range.
         The data is structured as a list of dictionaries, where each dictionary contains the date, planets, and houses data.
-        Eg. [{"date": "2020-01-01T00:00:00", "planets": [{...}, {...}, ...], "houses": [{...}, {...}, ...]}, ...]
+        Example:
+        [
+            {
+                "date": "2020-01-01T00:00:00",
+                "planets": [{...}, {...}, ...],
+                "houses": [{...}, {...}, ...]
+            },
+            ...
+        ]
 
         Args:
-        - as_model: boolean representing if the ephemeris data should be returned as model instances. Default is False.
-        - as_dict: boolean representing if the ephemeris data should be returned as dictionaries. Default is False.
+        - as_model (bool): If True, the ephemeris data will be returned as model instances. Default is False.
 
         Returns:
-        - list of dictionaries representing the ephemeris data.
+        - list: A list of dictionaries representing the ephemeris data. If as_model is True, a list of EphemerisDictModel instances is returned.
         """
         ephemeris_data_list = []
         for date in self.dates_list:
@@ -139,17 +146,10 @@ class EphemerisDataFactory:
 
             ephemeris_data_list.append({"date": date.isoformat(), "planets": available_planets, "houses": houses_list})
 
-        return ephemeris_data_list
-
-    def get_ephemeris_data_as_model(self) -> list[EphemerisDictModel]:
-        """
-        Generate ephemeris data as model instances for the specified date range.
-        The data is structured as a list of EphemerisDictModel instances.
+        if as_model:
+            return [EphemerisDictModel(**data) for data in ephemeris_data_list]
 
-        Returns:
-        - list of EphemerisDictModel instances representing the ephemeris data.
-        """
-        return [EphemerisDictModel(**data) for data in self.get_ephemeris_data()]
+        return ephemeris_data_list
 
 
 if "__main__" == __name__:
@@ -170,7 +170,7 @@ if "__main__" == __name__:
         max_days=None,
     )
 
-    ephemeris_data = factory.get_ephemeris_data_as_model()
+    ephemeris_data = factory.get_ephemeris_data(as_model=True)
     print(ephemeris_data[0])
     print(len(ephemeris_data))
 

kerykeion/kr_types/kr_literals.py

@@ -104,4 +104,9 @@ Usually the standard is "Apparent Geocentric"
 SignsEmoji = Literal["♈️", "♉️", "♊️", "♋️", "♌️", "♍️", "♎️", "♏️", "♐️", "♑️", "♒️", "♓️"]
 
 
-KerykeionChartTheme = Literal["light", "dark", "dark-high-contrast", "classic"]
+KerykeionChartTheme = Literal["light", "dark", "dark-high-contrast", "classic"]
+
+
+KerykeionChartLanguage = Literal["EN", "FR", "PT", "IT", "CN", "ES", "RU", "TR", "DE", "HI"]
+
+RelationshipScoreDescription = Literal["Minimal", "Medium", "Important", "Very Important", "Exceptional", "Rare Exceptional"]

kerykeion/kr_types/kr_models.py

@@ -21,7 +21,8 @@ from kerykeion.kr_types import (
     SiderealMode,
     HousesSystemIdentifier,
     Houses,
-    SignsEmoji
+    SignsEmoji,
+    RelationshipScoreDescription
 )
 
 
@@ -158,6 +159,7 @@ class AspectModel(SubscriptableBaseModel):
     diff: float
     p1: int
     p2: int
+    is_major: bool
 
 
 class ZodiacSignModel(SubscriptableBaseModel):
@@ -165,4 +167,19 @@ class ZodiacSignModel(SubscriptableBaseModel):
     quality: Quality
     element: Element
     emoji: SignsEmoji
-    sign_num: SignNumbers
+    sign_num: SignNumbers
+
+
+class RelationshipScoreAspectModel(SubscriptableBaseModel):
+    p1_name: str
+    p2_name: str
+    aspect: str
+    orbit: float
+
+
+class RelationshipScoreModel(SubscriptableBaseModel):
+    score_value: int
+    score_description: RelationshipScoreDescription
+    is_destiny_sign: bool
+    aspects: list[RelationshipScoreAspectModel]
+    subjects: list[AstrologicalSubjectModel]

kerykeion/kr_types/settings_models.py

@@ -80,13 +80,9 @@ class KerykeionSettingsAspectModel(SubscriptableBaseModel):
     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?")
     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")
 
-    # Deprecated: Not used anymore
-    visible_grid: bool = Field(title="Aspect Visible Grid", description="Is the aspect visible in the grid?")
-
 
 # Language Settings
 class KerykeionLanguageCelestialPointModel(SubscriptableBaseModel):
@@ -146,14 +142,7 @@ class KerykeionLanguageModel(SubscriptableBaseModel):
 
 class KerykeionGeneralSettingsModel(SubscriptableBaseModel):
     axes_orbit: int = Field(title="Axes Orbit", description="The orbit of the axes in the chart")
-    language: str = Field(title="Language", description="The language of the chart")
-
-    # Deprecated: Should be removed
-    planet_in_zodiac_extra_points: int = Field(title="Planet in Zodiac Extra Points", description="The extra points of the planet in the zodiac")
 
-class KerykeionChartSettingsModel(SubscriptableBaseModel):
-    basic_chart_viewBox: str = Field(title="Basic Chart ViewBox", description="The viewbox of the basic chart")
-    wide_chart_viewBox: str = Field(title="Wide Chart ViewBox", description="The viewbox of the wide chart")
 
 # Settings Model
 class KerykeionSettingsModel(SubscriptableBaseModel):
@@ -165,5 +154,4 @@ class KerykeionSettingsModel(SubscriptableBaseModel):
     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")
-    chart_settings: KerykeionChartSettingsModel = Field(title="Chart Settings", description="The chart settings of the chart")
+    general_settings: KerykeionGeneralSettingsModel = Field(title="General Settings", description="The general settings of the chart")

kerykeion/relationship_score/__init__.py

@@ -0,0 +1,2 @@
+from .relationship_score import RelationshipScore
+from .relationship_score_factory import RelationshipScoreFactory