kerykeion 4.14.9__py3-none-any.whl → 4.14.11__py3-none-any.whl

kerykeion/charts/charts_utils.py

@@ -177,7 +177,7 @@ def draw_zodiac_slice(
     offset = 360 - seventh_house_degree_ut
     # check transit
     if chart_type == "Transit" or chart_type == "Synastry":
-        dropin = 0
+        dropin: Union[int, float] = 0
     else:
         dropin = c1
     slice = f'<path d="M{str(r)},{str(r)} L{str(dropin + sliceToX(num, r - dropin, offset))},{str(dropin + sliceToY(num, r - dropin, offset))} A{str(r - dropin)},{str(r - dropin)} 0 0,0 {str(dropin + sliceToX(num + 1, r - dropin, offset))},{str(dropin + sliceToY(num + 1, r - dropin, offset))} z" style="{style}"/>'
@@ -273,12 +273,11 @@ def draw_aspect_line(
     x2 = sliceToX(0, ar, second_offset) + (r - ar)
     y2 = sliceToY(0, ar, second_offset) + (r - ar)
 
-    out = ""
-    out += f'<g kr:node="Aspect" kr:aspectname="{aspect["aspect"]}" kr:to="{aspect["p1_name"]}" kr:tooriginaldegrees="{aspect["p1_abs_pos"]}" kr:from="{aspect["p2_name"]}" kr:fromoriginaldegrees="{aspect["p2_abs_pos"]}">'
-    out += f'<line class="aspect" x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {color}; stroke-width: 1; stroke-opacity: .9;"/>'
-    out += f"</g>"
-
-    return out
+    return (
+        f'<g kr:node="Aspect" kr:aspectname="{aspect["aspect"]}" kr:to="{aspect["p1_name"]}" kr:tooriginaldegrees="{aspect["p1_abs_pos"]}" kr:from="{aspect["p2_name"]}" kr:fromoriginaldegrees="{aspect["p2_abs_pos"]}">'
+        f'<line class="aspect" x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {color}; stroke-width: 1; stroke-opacity: .9;"/>'
+        f"</g>"
+    )
 
 
 def draw_elements_percentages(
@@ -313,14 +312,14 @@ def draw_elements_percentages(
     air_percentage = int(round(100 * air_points / total))
     water_percentage = int(round(100 * water_points / total))
 
-    out = '<g transform="translate(-30,79)">'
-    out += f'<text y="0" style="fill:#ff6600; font-size: 10px;">{fire_label}  {str(fire_percentage)}%</text>'
-    out += f'<text y="12" style="fill:#6a2d04; font-size: 10px;">{earth_label} {str(earth_percentage)}%</text>'
-    out += f'<text y="24" style="fill:#6f76d1; font-size: 10px;">{air_label}   {str(air_percentage)}%</text>'
-    out += f'<text y="36" style="fill:#630e73; font-size: 10px;">{water_label} {str(water_percentage)}%</text>'
-    out += "</g>"
-
-    return out
+    return (
+        f'<g transform="translate(-30,79)">'
+        f'<text y="0" style="fill:#ff6600; font-size: 10px;">{fire_label}  {str(fire_percentage)}%</text>'
+        f'<text y="12" style="fill:#6a2d04; font-size: 10px;">{earth_label} {str(earth_percentage)}%</text>'
+        f'<text y="24" style="fill:#6f76d1; font-size: 10px;">{air_label}   {str(air_percentage)}%</text>'
+        f'<text y="36" style="fill:#630e73; font-size: 10px;">{water_label} {str(water_percentage)}%</text>'
+        f"</g>"
+    )
 
 
 def convert_decimal_to_degree_string(dec: float, type="3") -> str:
@@ -495,7 +494,7 @@ def draw_third_circle(
     stroke_color: str,
     fill_color: str,
     chart_type: ChartType,
-    c3: Union[int, float, None] = None,
+    c3: Union[int, float]
 ) -> str:
     """
     Draws the third circle in an SVG chart.
@@ -570,7 +569,7 @@ def draw_aspect_grid(stroke_color: str, available_planets_list: list, aspects_li
 
 def draw_houses_cusps_and_text_number(
     r: Union[int, float],
-    first_subject_houses_list_ut: list,
+    first_subject_houses_list: list[KerykeionPointModel],
     standard_house_cusp_color: str,
     first_house_color: str,
     tenth_house_color: str,
@@ -579,15 +578,15 @@ def draw_houses_cusps_and_text_number(
     c1: Union[int, float],
     c3: Union[int, float],
     chart_type: ChartType,
-    second_subject_houses_list_ut: list = None,
-    transit_house_cusp_color: str = None,
+    second_subject_houses_list: Union[list[KerykeionPointModel], None] = None,
+    transit_house_cusp_color: Union[str, None] = None,
 ) -> str:
     """
     Draws the houses cusps and text numbers for a given chart type.
 
     Parameters:
     - r: Radius of the chart.
-    - first_subject_houses_list_ut: List of house cusps for the first subject.
+    - first_subject_houses_list: List of house for the first subject.
     - standard_house_cusp_color: Default color for house cusps.
     - first_house_color: Color for the first house cusp.
     - tenth_house_color: Color for the tenth house cusp.
@@ -596,25 +595,22 @@ def draw_houses_cusps_and_text_number(
     - c1: Offset for the first subject.
     - c3: Offset for the third subject.
     - chart_type: Type of the chart (e.g., Transit, Synastry).
-    - second_subject_houses_list_ut: List of house cusps for the second subject (optional).
+    - second_subject_houses_list: List of house for the second subject (optional).
     - transit_house_cusp_color: Color for transit house cusps (optional).
 
     Returns:
     - A string containing the SVG path for the houses cusps and text numbers.
     """
-    if chart_type in ["Transit", "Synastry"]:
-        if second_subject_houses_list_ut is None or transit_house_cusp_color is None:
-            raise KerykeionException("second_subject_houses_list_ut or transit_house_cusp_color is None")
 
     path = ""
     xr = 12
 
     for i in range(xr):
         # Determine offsets based on chart type
-        dropin, roff, t_roff = (160, 72, 36) if chart_type in ["Transit", "Synastry"] else (c3, c1, None)
+        dropin, roff, t_roff = (160, 72, 36) if chart_type in ["Transit", "Synastry"] else (c3, c1, False)
 
         # Calculate the offset for the current house cusp
-        offset = (int(first_subject_houses_list_ut[int(xr / 2)]) / -1) + int(first_subject_houses_list_ut[i])
+        offset = (int(first_subject_houses_list[int(xr / 2)].abs_pos) / -1) + int(first_subject_houses_list[i].abs_pos)
 
         # Calculate the coordinates for the house cusp lines
         x1 = sliceToX(0, (r - dropin), offset) + dropin
@@ -625,7 +621,7 @@ def draw_houses_cusps_and_text_number(
         # Calculate the text offset for the house number
         next_index = (i + 1) % xr
         text_offset = offset + int(
-            degreeDiff(first_subject_houses_list_ut[next_index], first_subject_houses_list_ut[i]) / 2
+            degreeDiff(first_subject_houses_list[next_index].abs_pos, first_subject_houses_list[i].abs_pos) / 2
         )
 
         # Determine the line color based on the house index
@@ -634,9 +630,12 @@ def draw_houses_cusps_and_text_number(
         )
 
         if chart_type in ["Transit", "Synastry"]:
+            if second_subject_houses_list is None or transit_house_cusp_color is None:
+                raise KerykeionException("second_subject_houses_list_ut or transit_house_cusp_color is None")
+
             # Calculate the offset for the second subject's house cusp
-            zeropoint = 360 - first_subject_houses_list_ut[6]
-            t_offset = (zeropoint + second_subject_houses_list_ut[i]) % 360
+            zeropoint = 360 - first_subject_houses_list[6].abs_pos
+            t_offset = (zeropoint + second_subject_houses_list[i].abs_pos) % 360
 
             # Calculate the coordinates for the second subject's house cusp lines
             t_x1 = sliceToX(0, (r - t_roff), t_offset) + t_roff
@@ -646,7 +645,7 @@ def draw_houses_cusps_and_text_number(
 
             # Calculate the text offset for the second subject's house number
             t_text_offset = t_offset + int(
-                degreeDiff(second_subject_houses_list_ut[next_index], second_subject_houses_list_ut[i]) / 2
+                degreeDiff(second_subject_houses_list[next_index].abs_pos, second_subject_houses_list[i].abs_pos) / 2
             )
             t_linecolor = linecolor if i in [0, 9, 6, 3] else transit_house_cusp_color
             xtext = sliceToX(0, (r - 8), t_text_offset) + 8
@@ -685,8 +684,8 @@ def draw_houses_cusps_and_text_number(
 def draw_aspect_transit_grid(
     grid_title: str,
     aspects_list: Union[list[AspectModel], list[dict]],
-    celestial_point_language: KerykeionLanguageCelestialPointModel,
-    aspects_settings: KerykeionSettingsAspectModel,
+    celestial_point_language: Union[KerykeionLanguageCelestialPointModel, dict],
+    aspects_settings: Union[KerykeionSettingsAspectModel, dict],
 ) -> str:
     """
     Generates the SVG output for the aspect transit grid.
@@ -700,10 +699,16 @@ def draw_aspect_transit_grid(
     Returns:
     - A string containing the SVG path data for the aspect transit grid.
     """
+    
+    if isinstance(celestial_point_language, dict):
+        celestial_point_language = KerykeionLanguageCelestialPointModel(**celestial_point_language)
+
+    if isinstance(aspects_settings, dict):
+        aspects_settings = KerykeionSettingsAspectModel(**aspects_settings)
 
     # If not instance of AspectModel, convert to AspectModel
     if isinstance(aspects_list[0], dict):
-        aspects_list = [AspectModel(**aspect) for aspect in aspects_list]
+        aspects_list = [AspectModel(**aspect) for aspect in aspects_list] # type: ignore
 
     line = 0
     nl = 0
@@ -890,7 +895,7 @@ def draw_house_grid(
         svg_output += '<g transform="translate(850, -20)">'
         line_increment = 10
 
-        for i, house in enumerate(secondary_subject_houses_list):
+        for i, house in enumerate(secondary_subject_houses_list): # type: ignore
             cusp_number = f"&#160;&#160;{i + 1}" if i < 9 else str(i + 1)
             svg_output += (
                 f'<g transform="translate(0,{line_increment})">'
@@ -912,8 +917,8 @@ def draw_planet_grid(
         available_kerykeion_celestial_points: list[KerykeionPointModel],
         chart_type: ChartType,
         celestial_point_language: KerykeionLanguageCelestialPointModel,
-        second_subject_name: str = None,
-        second_subject_available_kerykeion_celestial_points: list[KerykeionPointModel] = None,
+        second_subject_name: Union[str, None] = None,
+        second_subject_available_kerykeion_celestial_points: Union[list[KerykeionPointModel], None] = None,
         text_color: str = "#000000",
     ) -> str:
     """
@@ -966,6 +971,9 @@ def draw_planet_grid(
         line_height += offset_between_lines
 
     if chart_type in ["Transit", "Synastry"]:
+        if second_subject_available_kerykeion_celestial_points is None:
+            raise KerykeionException("second_subject_available_kerykeion_celestial_points is None")
+
         if chart_type == "Transit":
             svg_output += (
                 f'<g transform="translate(320, -15)">'

kerykeion/charts/draw_planets.py

@@ -1,3 +1,5 @@
+# type: ignore
+
 from kerykeion.charts.charts_utils import degreeDiff, sliceToX, sliceToY, convert_decimal_to_degree_string
 from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel
@@ -7,7 +9,6 @@ from typing import Union, get_args
 
 
 
-
 def draw_planets(
     radius: Union[int, float],
     available_kerykeion_celestial_points: list[KerykeionPointModel],

kerykeion/charts/kerykeion_chart_svg.py

@@ -13,6 +13,7 @@ from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
 from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointModel, Sign
 from kerykeion.kr_types import ChartTemplateDictionary
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel
 from kerykeion.charts.charts_utils import (
     draw_zodiac_slice, 
@@ -33,7 +34,8 @@ from kerykeion.charts.charts_utils import (
     draw_house_grid,
     draw_planet_grid,
 )
-from kerykeion.charts.draw_planets import draw_planets
+from kerykeion.charts.draw_planets import draw_planets # type: ignore
+from kerykeion.utilities import get_houses_list
 from pathlib import Path
 from scour.scour import scourString
 from string import Template
@@ -62,8 +64,8 @@ class KerykeionChartSVG:
     _DEFAULT_NATAL_WIDTH = 772.2
 
     # Set at init
-    first_obj: AstrologicalSubject
-    second_obj: Union[AstrologicalSubject, None]
+    first_obj: Union[AstrologicalSubject, AstrologicalSubjectModel]
+    second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None]
     chart_type: ChartType
     new_output_directory: Union[Path, None]
     new_settings_file: Union[Path, None]
@@ -86,7 +88,7 @@ class KerykeionChartSVG:
     aspects_settings: dict
     planet_in_zodiac_extra_points: int
     chart_settings: dict
-    user: AstrologicalSubject
+    user: Union[AstrologicalSubject, AstrologicalSubjectModel]
     available_planets_setting: List[KerykeionSettingsCelestialPointModel]
     height: float
     location: str
@@ -96,9 +98,9 @@ class KerykeionChartSVG:
 
     def __init__(
         self,
-        first_obj: AstrologicalSubject,
+        first_obj: Union[AstrologicalSubject, AstrologicalSubjectModel],
         chart_type: ChartType = "Natal",
-        second_obj: Union[AstrologicalSubject, None] = None,
+        second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None] = None,
         new_output_directory: Union[str, None] = None,
         new_settings_file: Union[Path, None] = None,
     ):
@@ -167,9 +169,6 @@ class KerykeionChartSVG:
         if self.chart_type == "Transit":
             self.t_name = self.language_settings["transit_name"]
 
-        self.template = None
-
-
         # Default radius for the chart
         self.main_radius = 240
 
@@ -226,7 +225,7 @@ class KerykeionChartSVG:
             output += draw_zodiac_slice(
                 c1=self.first_circle_radius,
                 chart_type=self.chart_type,
-                seventh_house_degree_ut=self.user.houses_degree_ut[6],
+                seventh_house_degree_ut=self.user.seventh_house.abs_pos,
                 num=i,
                 r=r,
                 style=f'fill:{self.chart_colors_settings[f"zodiac_bg_{i}"]}; fill-opacity: 0.5;',
@@ -342,7 +341,7 @@ class KerykeionChartSVG:
             template_dict["degreeRing"] = draw_transit_ring_degree_steps(self.main_radius, self.user.seventh_house.abs_pos)
             template_dict["first_circle"] = draw_first_circle(self.main_radius, self.chart_colors_settings["zodiac_transit_ring_2"], self.chart_type)
             template_dict["second_circle"] = draw_second_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_1'], self.chart_colors_settings['paper_1'], self.chart_type)
-            template_dict['third_circle'] = draw_third_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_0'], self.chart_colors_settings['paper_1'], self.chart_type)
+            template_dict['third_circle'] = draw_third_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_0'], self.chart_colors_settings['paper_1'], self.chart_type, self.third_circle_radius)
             template_dict["makeAspectGrid"] = draw_aspect_transit_grid(self.language_settings["aspects"], self.aspects_list, self.planets_settings, self.aspects_settings)
 
             template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
@@ -410,24 +409,28 @@ class KerykeionChartSVG:
         # Set planet colors
         for planet in self.planets_settings:
             planet_id = planet["id"]
-            template_dict[f"planets_color_{planet_id}"] = planet["color"]
+            template_dict[f"planets_color_{planet_id}"] = planet["color"] # type: ignore
 
         # Set zodiac colors
         for i in range(12):
-            template_dict[f"zodiac_color_{i}"] = self.chart_colors_settings[f"zodiac_icon_{i}"]
+            template_dict[f"zodiac_color_{i}"] = self.chart_colors_settings[f"zodiac_icon_{i}"] # type: ignore
 
         # Set orb colors
         for aspect in self.aspects_settings:
-            template_dict[f"orb_color_{aspect['degree']}"] = aspect['color']
+            template_dict[f"orb_color_{aspect['degree']}"] = aspect['color'] # type: ignore
 
         # Drawing functions
         template_dict["makeZodiac"] = self._draw_zodiac_circle_slices(self.main_radius)
 
+        first_subject_houses_list = get_houses_list(self.user)
+
         # Draw houses grid and cusps
         if self.chart_type in ["Transit", "Synastry"]:
+            second_subject_houses_list = get_houses_list(self.t_user)
+
             template_dict["makeHousesGrid"] = draw_house_grid(
-                main_subject_houses_list=self.user.houses_list,
-                secondary_subject_houses_list=self.t_user.houses_list,
+                main_subject_houses_list=first_subject_houses_list,
+                secondary_subject_houses_list=second_subject_houses_list,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
                 house_cusp_generale_name_label=self.language_settings["cusp"]
@@ -435,7 +438,7 @@ class KerykeionChartSVG:
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
                 r=self.main_radius,
-                first_subject_houses_list_ut=self.user.houses_degree_ut,
+                first_subject_houses_list=first_subject_houses_list,
                 standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
                 first_house_color=self.planets_settings[12]["color"],
                 tenth_house_color=self.planets_settings[13]["color"],
@@ -444,13 +447,13 @@ class KerykeionChartSVG:
                 c1=self.first_circle_radius,
                 c3=self.third_circle_radius,
                 chart_type=self.chart_type,
-                second_subject_houses_list_ut=self.t_user.houses_degree_ut,
+                second_subject_houses_list=second_subject_houses_list,
                 transit_house_cusp_color=self.chart_colors_settings["houses_transit_line"],
             )
 
         else:
             template_dict["makeHousesGrid"] = draw_house_grid(
-                main_subject_houses_list=self.user.houses_list,
+                main_subject_houses_list=first_subject_houses_list,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
                 house_cusp_generale_name_label=self.language_settings["cusp"]
@@ -458,7 +461,7 @@ class KerykeionChartSVG:
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
                 r=self.main_radius,
-                first_subject_houses_list_ut=self.user.houses_degree_ut,
+                first_subject_houses_list=first_subject_houses_list,
                 standard_house_cusp_color=self.chart_colors_settings["houses_radix_line"],
                 first_house_color=self.planets_settings[12]["color"],
                 tenth_house_color=self.planets_settings[13]["color"],
@@ -476,8 +479,8 @@ class KerykeionChartSVG:
                 available_planets_setting=self.available_planets_setting,
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
                 radius=self.main_radius, 
-                main_subject_first_house_degree_ut=self.user.houses_degree_ut[0],
-                main_subject_seventh_house_degree_ut=self.user.houses_degree_ut[6],
+                main_subject_first_house_degree_ut=self.user.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.user.seventh_house.abs_pos,
                 chart_type=self.chart_type, 
                 third_circle_radius=self.third_circle_radius,
             )
@@ -488,8 +491,8 @@ class KerykeionChartSVG:
                 radius=self.main_radius, 
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 third_circle_radius=self.third_circle_radius,
-                main_subject_first_house_degree_ut=self.user.houses_degree_ut[0],
-                main_subject_seventh_house_degree_ut=self.user.houses_degree_ut[6],
+                main_subject_first_house_degree_ut=self.user.first_house.abs_pos,
+                main_subject_seventh_house_degree_ut=self.user.seventh_house.abs_pos
             )
 
         # Draw elements percentages
@@ -566,7 +569,7 @@ class KerykeionChartSVG:
     def makeSVG(self, minify: bool = False):
         """Prints out the SVG file in the specifide folder"""
 
-        if not (self.template):
+        if not hasattr(self, "template"):
             self.template = self.makeTemplate(minify)
 
         self.chartname = self.output_directory / f"{self.user.name} - {self.chart_type} Chart.svg"

kerykeion/ephemeris_data.py

@@ -1,4 +1,5 @@
 from kerykeion import AstrologicalSubject
+from kerykeion.utilities import get_houses_list, get_available_planets_list
 from kerykeion.astrological_subject import DEFAULT_HOUSES_SYSTEM_IDENTIFIER, DEFAULT_PERSPECTIVE_TYPE, DEFAULT_ZODIAC_TYPE
 from kerykeion.kr_types import EphemerisDictModel
 from kerykeion.kr_types import SiderealMode, HousesSystemIdentifier, PerspectiveType, ZodiacType
@@ -133,7 +134,10 @@ class EphemerisDataFactory:
                 is_dst=self.is_dst,
             )
 
-            ephemeris_data_list.append({"date": date.isoformat(), "planets": subject.planets_list, "houses": subject.houses_list})
+            houses_list = get_houses_list(subject)
+            available_planets = get_available_planets_list(subject)
+
+            ephemeris_data_list.append({"date": date.isoformat(), "planets": available_planets, "houses": houses_list})
 
         return ephemeris_data_list
 

kerykeion/kr_types/kr_literals.py

@@ -99,3 +99,6 @@ Literal type for perspective types.
 
 Usually the standard is "Apparent Geocentric"
 """
+
+
+SignsEmoji = Literal["♈️", "♉️", "♊️", "♋️", "♌️", "♍️", "♎️", "♏️", "♐️", "♑️", "♒️", "♓️"]

kerykeion/kr_types/kr_models.py

@@ -17,11 +17,11 @@ from kerykeion.kr_types import (
     Sign,
     ZodiacType,
     SignNumbers,
-    HouseNumbers,
     PointType,
     SiderealMode,
     HousesSystemIdentifier,
     Houses,
+    SignsEmoji
 )
 
 
@@ -39,7 +39,7 @@ class SubscriptableBaseModel(BaseModel):
     def __delitem__(self, key):
         delattr(self, key)
 
-    def get(self, key, default):
+    def get(self, key, default = None):
         return getattr(self, key, default)
 
 
@@ -130,14 +130,14 @@ class AstrologicalSubjectModel(SubscriptableBaseModel):
     mean_node: KerykeionPointModel
     true_node: KerykeionPointModel
 
-    # Lunar Phase
     lunar_phase: LunarPhaseModel
+    """Lunar phase model"""
+    
+    planets_names_list: list[Planet]
+    """Ordered list of available planets names"""
 
-    # Lists
-    # houses_list: list[KerykeionPointModel]
-    # planets_list: list[KerykeionPointModel]
-    # planets_degrees_ut: list[float]
-    # houses_degree_ut: list[float]
+    houses_names_list: list[Houses]
+    """Ordered list of houses names"""
 
 
 class EphemerisDictModel(SubscriptableBaseModel):
@@ -158,3 +158,11 @@ class AspectModel(SubscriptableBaseModel):
     diff: float
     p1: int
     p2: int
+
+
+class ZodiacSignModel(SubscriptableBaseModel):
+    sign: Sign
+    quality: Quality
+    element: Element
+    emoji: SignsEmoji
+    sign_num: SignNumbers

kerykeion/relationship_score.py

@@ -8,6 +8,7 @@ from kerykeion.aspects.synastry_aspects import SynastryAspects
 import logging
 from pathlib import Path
 from typing import Union
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 
 
 class RelationshipScore:
@@ -31,8 +32,8 @@ class RelationshipScore:
 
     """
 
-    first_subject: AstrologicalSubject
-    second_subject: AstrologicalSubject
+    first_subject: Union[AstrologicalSubject, AstrologicalSubjectModel]
+    second_subject: Union[AstrologicalSubject, AstrologicalSubjectModel]
     score: int
     is_destiny_sign: bool
     relevant_aspects: list
@@ -40,8 +41,8 @@ class RelationshipScore:
 
     def __init__(
         self,
-        first_subject: AstrologicalSubject,
-        second_subject: AstrologicalSubject,
+        first_subject: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        second_subject: Union[AstrologicalSubject, AstrologicalSubjectModel],
         new_settings_file: Union[Path, None] = None,
     ):
         self.first_subject = first_subject

kerykeion/report.py

@@ -1,5 +1,8 @@
 from kerykeion import AstrologicalSubject
 from terminaltables import AsciiTable
+from kerykeion.utilities import get_houses_list, get_available_planets_list
+from typing import Union
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 
 class Report:
     """
@@ -11,7 +14,7 @@ class Report:
     planets_table: str
     houses_table: str
 
-    def __init__(self, instance: AstrologicalSubject):
+    def __init__(self, instance: Union[AstrologicalSubject, AstrologicalSubjectModel]):
         self.instance = instance
 
         self.get_report_title()
@@ -51,7 +54,7 @@ class Report:
                 ("R" if planet.retrograde else "-"),
                 planet.house,
             ]
-            for planet in self.instance.planets_list
+            for planet in get_available_planets_list(self.instance)
         ]
 
         self.planets_table = AsciiTable(planets_data).table
@@ -62,7 +65,7 @@ class Report:
         """
 
         houses_data = [["House", "Sign", "Position"]] + [
-            [house.name, house.sign, round(float(house.position), 2)] for house in self.instance.houses_list
+            [house.name, house.sign, round(float(house.position), 2)] for house in get_houses_list(self.instance)
         ]
 
         self.houses_table = AsciiTable(houses_data).table