kerykeion 5.0.0a1__py3-none-any.whl → 5.0.0a2__py3-none-any.whl

kerykeion/__init__.py

@@ -16,8 +16,7 @@ from .house_comparison.house_comparison_factory import HouseComparisonFactory
 from .house_comparison.house_comparison_models import HouseComparisonModel
 from .kr_types import *
 from .planetary_return_factory import PlanetaryReturnFactory, PlanetReturnModel
-from .relationship_score.relationship_score import RelationshipScore
-from .relationship_score.relationship_score_factory import RelationshipScoreFactory
+from .relationship_score_factory import RelationshipScoreFactory
 from .report import Report
 from .settings import KerykeionSettingsModel, get_settings
 from .transits_time_range import TransitsTimeRangeFactory

kerykeion/charts/charts_utils.py

@@ -5,10 +5,9 @@ from kerykeion.kr_types.kr_literals import AstrologicalPoint
 from typing import Union, Literal, TYPE_CHECKING
 from kerykeion.kr_types.kr_models import AspectModel, KerykeionPointModel, CompositeSubjectModel, PlanetReturnModel, AstrologicalSubjectModel
 from kerykeion.kr_types.settings_models import KerykeionLanguageCelestialPointModel, KerykeionSettingsCelestialPointModel
+from kerykeion.house_comparison import HouseComparisonModel
 
 
-if TYPE_CHECKING:
-    from kerykeion import HouseComparisonModel
 
 def get_decoded_kerykeion_celestial_point_name(input_planet_name: str, celestial_point_language: KerykeionLanguageCelestialPointModel) -> str:
     """
@@ -806,31 +805,27 @@ def calculate_moon_phase_chart_params(
     }
 
 
-def draw_house_grid(
+def draw_main_house_grid(
         main_subject_houses_list: list[KerykeionPointModel],
-        chart_type: ChartType,
-        secondary_subject_houses_list: Union[list[KerykeionPointModel], None] = None,
-        text_color: str = "#000000",
         house_cusp_generale_name_label: str = "Cusp",
+        text_color: str = "#000000",
+        x_position: int = 720,
+        y_position: int = 30,
     ) -> str:
     """
-    Generate SVG code for a grid of astrological houses.
+    Generate SVG code for a grid of astrological houses for the main subject.
 
     Parameters:
-    - main_houses (list[KerykeionPointModel]): List of houses for the main subject.
-    - chart_type (ChartType): Type of the chart (e.g., Synastry, Transit).
-    - secondary_houses (list[KerykeionPointModel], optional): List of houses for the secondary subject.
-    - text_color (str): Color of the text.
-    - cusp_label (str): Label for the house cusp.
+    - main_subject_houses_list (list[KerykeionPointModel]): List of houses for the main subject.
+    - house_cusp_generale_name_label (str): Label for the house cusp. Defaults to "Cusp".
+    - text_color (str): Color of the text. Defaults to "#000000".
+    - x_position (int): X position for the grid. Defaults to 720.
+    - y_position (int): Y position for the grid. Defaults to 30.
 
     Returns:
     - str: The SVG code for the grid of houses.
     """
-
-    if chart_type in ["Synastry", "Transit", "Return"] and secondary_subject_houses_list is None:
-        raise KerykeionException("secondary_houses is None")
-
-    svg_output = '<g transform="translate(700,0)">'
+    svg_output = f'<g transform="translate({x_position},{y_position})">'
 
     line_increment = 10
     for i, house in enumerate(main_subject_houses_list):
@@ -845,40 +840,57 @@ def draw_house_grid(
         line_increment += 14
 
     svg_output += "</g>"
+    return svg_output
 
-    if chart_type == "Synastry" or chart_type == "Return":
-        svg_output += '<!-- Synastry Houses -->'
-        svg_output += '<g transform="translate(950, 0)">'
-        line_increment = 10
-
-        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})">'
-                f'<text text-anchor="end" x="40" style="fill:{text_color}; font-size: 10px;">{house_cusp_generale_name_label} {cusp_number}:</text>'
-                f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{house["sign"]}" /></g>'
-                f'<text x="53" style="fill:{text_color}; font-size: 10px;"> {convert_decimal_to_degree_string(house["position"])}</text>'
-                f'</g>'
-            )
-            line_increment += 14
 
-        svg_output += "</g>"
+def draw_secondary_house_grid(
+        secondary_subject_houses_list: list[KerykeionPointModel],
+        house_cusp_generale_name_label: str = "Cusp",
+        text_color: str = "#000000",
+        x_position: int = 970,
+        y_position: int = 30,
+    ) -> str:
+    """
+    Generate SVG code for a grid of astrological houses for the secondary subject.
+
+    Parameters:
+    - secondary_subject_houses_list (list[KerykeionPointModel]): List of houses for the secondary subject.
+    - house_cusp_generale_name_label (str): Label for the house cusp. Defaults to "Cusp".
+    - text_color (str): Color of the text. Defaults to "#000000".
+    - x_position (int): X position for the grid. Defaults to 970.
+    - y_position (int): Y position for the grid. Defaults to 30.
+
+    Returns:
+    - str: The SVG code for the grid of houses.
+    """
+    svg_output = f'<g transform="translate({x_position},{y_position})">'
+
+    line_increment = 10
+    for i, house in enumerate(secondary_subject_houses_list):
+        cusp_number = f"&#160;&#160;{i + 1}" if i < 9 else str(i + 1)
+        svg_output += (
+            f'<g transform="translate(0,{line_increment})">'
+            f'<text text-anchor="end" x="40" style="fill:{text_color}; font-size: 10px;">{house_cusp_generale_name_label} {cusp_number}:</text>'
+            f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{house["sign"]}" /></g>'
+            f'<text x="53" style="fill:{text_color}; font-size: 10px;"> {convert_decimal_to_degree_string(house["position"])}</text>'
+            f'</g>'
+        )
+        line_increment += 14
 
+    svg_output += "</g>"
     return svg_output
 
 
-def draw_planet_grid(
+def draw_main_planet_grid(
         planets_and_houses_grid_title: str,
         subject_name: str,
         available_kerykeion_celestial_points: list[KerykeionPointModel],
         chart_type: ChartType,
         celestial_point_language: KerykeionLanguageCelestialPointModel,
-        second_subject_name: Union[str, None] = None,
-        second_subject_available_kerykeion_celestial_points: Union[list[KerykeionPointModel], None] = None,
         text_color: str = "#000000",
     ) -> str:
     """
-    Draws the planet grid for the given celestial points and chart type.
+    Draws the planet grid for the main subject.
 
     Args:
         planets_and_houses_grid_title (str): Title of the grid.
@@ -886,37 +898,36 @@ def draw_planet_grid(
         available_kerykeion_celestial_points (list[KerykeionPointModel]): List of celestial points for the subject.
         chart_type (ChartType): Type of the chart.
         celestial_point_language (KerykeionLanguageCelestialPointModel): Language model for celestial points.
-        second_subject_name (str, optional): Name of the second subject. Defaults to None.
-        second_subject_available_kerykeion_celestial_points (list[KerykeionPointModel], optional): List of celestial points for the second subject. Defaults to None.
         text_color (str, optional): Color of the text. Defaults to "#000000".
 
     Returns:
-        str: The SVG output for the planet grid.
+        str: The SVG output for the main planet grid.
     """
     line_height = 10
     offset = 0
     offset_between_lines = 14
+    svg_output = ""
 
     if chart_type == "Synastry":
-        svg_output = (
-            f'<g transform="translate(0, -15)">'
+        svg_output += (
+            f'<g transform="translate(620, 15)">'  # Added the 620,30 offset (adjusted for -15)
             f'<text style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {subject_name}</text>'
             f'</g>'
         )
     elif chart_type == "Transit":
-        svg_output = (
-            f'<g transform="translate(0, -15)">'
+        svg_output += (
+            f'<g transform="translate(620, 15)">'  # Added the 620,30 offset (adjusted for -15)
             f'<text style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {subject_name}</text>'
             f'</g>'
         )
     elif chart_type == "Return":
-        svg_output = (
-            f'<g transform="translate(0, -15)">'
+        svg_output += (
+            f'<g transform="translate(620, 15)">'  # Added the 620,30 offset (adjusted for -15)
             f'<text style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {subject_name}</text>'
             f'</g>'
         )
     else:
-        svg_output = ""
+        svg_output += ""
 
     end_of_line = "</g>"
 
@@ -927,7 +938,7 @@ def draw_planet_grid(
 
         decoded_name = get_decoded_kerykeion_celestial_point_name(planet["name"], celestial_point_language)
         svg_output += (
-            f'<g transform="translate({offset},{line_height})">'
+            f'<g transform="translate({620 + offset},{30 + line_height})">'  # Added the 620,30 offset
             f'<text text-anchor="end" style="fill:{text_color}; font-size: 10px;">{decoded_name}</text>'
             f'<g transform="translate(5,-8)"><use transform="scale(0.4)" xlink:href="#{planet["name"]}" /></g>'
             f'<text text-anchor="start" x="19" style="fill:{text_color}; font-size: 10px;">{convert_decimal_to_degree_string(planet["position"])}</text>'
@@ -940,50 +951,70 @@ def draw_planet_grid(
         svg_output += end_of_line
         line_height += offset_between_lines
 
-    if chart_type in ["Transit", "Synastry", "Return"]:
-        if second_subject_available_kerykeion_celestial_points is None:
-            raise KerykeionException("second_subject_available_kerykeion_celestial_points is None")
+    return svg_output
 
-        if chart_type == "Transit":
-            svg_output += (
-                f'<g transform="translate(200, -15)">'
-                f'<text style="fill:{text_color}; font-size: 14px;">{second_subject_name}</text>'
-            )
-        elif chart_type == "Return":
-            svg_output += (
-                f'<g transform="translate(250, -15)">'
-                f'<text style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {second_subject_name}</text>'
-            )
-        else:
-            svg_output += (
-                f'<g transform="translate(250, -15)">'
-                f'<text style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {second_subject_name}</text>'
-            )
 
-        svg_output += end_of_line
+def draw_secondary_planet_grid(
+        planets_and_houses_grid_title: str,
+        second_subject_name: str,
+        second_subject_available_kerykeion_celestial_points: list[KerykeionPointModel],
+        chart_type: ChartType,
+        celestial_point_language: KerykeionLanguageCelestialPointModel,
+        text_color: str = "#000000",
+    ) -> str:
+    """
+    Draws the planet grid for the secondary subject in Transit, Synastry, or Return charts.
 
-        second_line_height = 10
-        second_offset = 250
-
-        for i, t_planet in enumerate(second_subject_available_kerykeion_celestial_points):
-            # if i == 27:
-            #     second_line_height = 10
-            #    second_offset = -120
-
-            second_decoded_name = get_decoded_kerykeion_celestial_point_name(t_planet["name"], celestial_point_language)
-            svg_output += (
-                f'<g transform="translate({second_offset},{second_line_height})">'
-                f'<text text-anchor="end" style="fill:{text_color}; font-size: 10px;">{second_decoded_name}</text>'
-                f'<g transform="translate(5,-8)"><use transform="scale(0.4)" xlink:href="#{t_planet["name"]}" /></g>'
-                f'<text text-anchor="start" x="19" style="fill:{text_color}; font-size: 10px;">{convert_decimal_to_degree_string(t_planet["position"])}</text>'
-                f'<g transform="translate(60,-8)"><use transform="scale(0.3)" xlink:href="#{t_planet["sign"]}" /></g>'
-            )
+    Args:
+        planets_and_houses_grid_title (str): Title of the grid.
+        second_subject_name (str): Name of the second subject.
+        second_subject_available_kerykeion_celestial_points (list[KerykeionPointModel]): List of celestial points for the second subject.
+        chart_type (ChartType): Type of the chart.
+        celestial_point_language (KerykeionLanguageCelestialPointModel): Language model for celestial points.
+        text_color (str, optional): Color of the text. Defaults to "#000000".
+
+    Returns:
+        str: The SVG output for the secondary planet grid.
+    """
+    svg_output = ""
+    end_of_line = "</g>"
 
-            if t_planet["retrograde"]:
-                svg_output += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
+    if chart_type == "Transit":
+        svg_output += (
+            f'<g transform="translate(820, 15)">'  # 620+200, 30-15
+            f'<text style="fill:{text_color}; font-size: 14px;">{second_subject_name}</text>'
+        )
+    elif chart_type == "Return":
+        svg_output += (
+            f'<g transform="translate(870, 15)">'  # 620+250, 30-15
+            f'<text style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {second_subject_name}</text>'
+        )
+    else:
+        svg_output += (
+            f'<g transform="translate(870, 15)">'  # 620+250, 30-15
+            f'<text style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {second_subject_name}</text>'
+        )
 
-            svg_output += end_of_line
-            second_line_height += offset_between_lines
+    svg_output += end_of_line
+
+    line_height = 10
+    offset = 250
+
+    for i, t_planet in enumerate(second_subject_available_kerykeion_celestial_points):
+        second_decoded_name = get_decoded_kerykeion_celestial_point_name(t_planet["name"], celestial_point_language)
+        svg_output += (
+            f'<g transform="translate({620 + offset},{30 + line_height})">'  # Added the 620,30 offset
+            f'<text text-anchor="end" style="fill:{text_color}; font-size: 10px;">{second_decoded_name}</text>'
+            f'<g transform="translate(5,-8)"><use transform="scale(0.4)" xlink:href="#{t_planet["name"]}" /></g>'
+            f'<text text-anchor="start" x="19" style="fill:{text_color}; font-size: 10px;">{convert_decimal_to_degree_string(t_planet["position"])}</text>'
+            f'<g transform="translate(60,-8)"><use transform="scale(0.3)" xlink:href="#{t_planet["sign"]}" /></g>'
+        )
+
+        if t_planet["retrograde"]:
+            svg_output += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
+
+        svg_output += end_of_line
+        line_height += 14  # Using fixed offset_between_lines value
 
     return svg_output
 
@@ -1538,3 +1569,4 @@ def calculate_synastry_quality_points(
             combined_totals[quality] = (combined_totals[quality] / total_points) * 100.0
 
     return combined_totals
+

kerykeion/charts/kerykeion_chart_svg.py

@@ -52,8 +52,10 @@ from kerykeion.charts.charts_utils import (
     draw_transit_aspect_grid,
     draw_single_house_comparison_grid,
     makeLunarPhase,
-    draw_house_grid,
-    draw_planet_grid,
+    draw_main_house_grid,
+    draw_secondary_house_grid,
+    draw_main_planet_grid,
+    draw_secondary_planet_grid,
     format_location_string,
     format_datetime_with_timezone,
     calculate_element_points,
@@ -836,12 +838,12 @@ class KerykeionChartSVG:
             template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
 
             # Houses and planet drawing
-            template_dict["makeHousesGrid"] = draw_house_grid(
+            template_dict["makeMainHousesGrid"] = draw_main_house_grid(
                 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"],
             )
+            template_dict["makeSecondaryHousesGrid"] = ""
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
                 r=self.main_radius,
@@ -866,7 +868,7 @@ class KerykeionChartSVG:
                 main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
             )
 
-            template_dict["makePlanetGrid"] = draw_planet_grid(
+            template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
                 planets_and_houses_grid_title=self.language_settings["planets_and_house"],
                 subject_name=self.first_obj.name,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
@@ -874,6 +876,7 @@ class KerykeionChartSVG:
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
             )
+            template_dict["makeSecondaryPlanetGrid"] = ""
             template_dict["makeHouseComparisonGrid"] = ""
 
         elif self.chart_type == "Composite":
@@ -971,12 +974,12 @@ class KerykeionChartSVG:
             template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
 
             # Houses and planet drawing
-            template_dict["makeHousesGrid"] = draw_house_grid(
+            template_dict["makeMainHousesGrid"] = draw_main_house_grid(
                 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"],
             )
+            template_dict["makeSecondaryHousesGrid"] = ""
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
                 r=self.main_radius,
@@ -1003,7 +1006,7 @@ class KerykeionChartSVG:
 
             subject_name = f"{self.first_obj.first_subject.name} {self.language_settings['and_word']} {self.first_obj.second_subject.name}" # type: ignore
 
-            template_dict["makePlanetGrid"] = draw_planet_grid(
+            template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
                 planets_and_houses_grid_title=self.language_settings["planets_and_house"],
                 subject_name=subject_name,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
@@ -1011,6 +1014,7 @@ class KerykeionChartSVG:
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
             )
+            template_dict["makeSecondaryPlanetGrid"] = ""
             template_dict["makeHouseComparisonGrid"] = ""
 
         elif self.chart_type == "Transit":
@@ -1112,13 +1116,17 @@ class KerykeionChartSVG:
             template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
 
             # Houses and planet drawing
-            template_dict["makeHousesGrid"] = draw_house_grid(
+            template_dict["makeMainHousesGrid"] = draw_main_house_grid(
                 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"],
             )
+            # template_dict["makeSecondaryHousesGrid"] = draw_secondary_house_grid(
+            #     secondary_subject_houses_list=second_subject_houses_list,
+            #     text_color=self.chart_colors_settings["paper_0"],
+            #     house_cusp_generale_name_label=self.language_settings["cusp"],
+            # )
+            template_dict["makeSecondaryHousesGrid"] = ""
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
                 r=self.main_radius,
@@ -1146,19 +1154,25 @@ class KerykeionChartSVG:
                 third_circle_radius=self.third_circle_radius,
             )
 
-            # Planet grid
-
+            # Planet grids
             first_return_grid_title = f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})"
             second_return_grid_title = f"{self.language_settings.get('Transit', 'Transit')} ({self.language_settings.get('outer_wheel', 'Outer Wheel')})"
-            template_dict["makePlanetGrid"] = draw_planet_grid(
+            template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
                 planets_and_houses_grid_title="",
                 subject_name=first_return_grid_title,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
+            )
+
+            template_dict["makeSecondaryPlanetGrid"] = draw_secondary_planet_grid(
+                planets_and_houses_grid_title="",
                 second_subject_name=second_return_grid_title,
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                celestial_point_language=self.language_settings["celestial_points"],
             )
 
             # House comparison grid
@@ -1254,7 +1268,8 @@ class KerykeionChartSVG:
                 zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
 
             template_dict["bottom_left_0"] = ""
-            template_dict["bottom_left_1"] = ""
+            # FIXME!
+            template_dict["bottom_left_1"] = "" # f"Compatibility Score: {16}/44" # type: ignore
             template_dict["bottom_left_2"] = zodiac_info
             template_dict["bottom_left_3"] = f"{self.language_settings.get('houses_system_' + self.first_obj.houses_system_identifier, self.first_obj.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
             template_dict["bottom_left_4"] = f'{self.language_settings.get("perspective_type", "Perspective")}: {self.language_settings.get(self.first_obj.perspective_type.lower().replace(" ", "_"), self.first_obj.perspective_type)}'
@@ -1263,10 +1278,14 @@ class KerykeionChartSVG:
             template_dict["makeLunarPhase"] = ""
 
             # Houses and planet drawing
-            template_dict["makeHousesGrid"] = draw_house_grid(
+            template_dict["makeMainHousesGrid"] = draw_main_house_grid(
                 main_subject_houses_list=first_subject_houses_list,
+                text_color=self.chart_colors_settings["paper_0"],
+                house_cusp_generale_name_label=self.language_settings["cusp"],
+            )
+
+            template_dict["makeSecondaryHousesGrid"] = draw_secondary_house_grid(
                 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"],
             )
@@ -1298,15 +1317,21 @@ class KerykeionChartSVG:
             )
 
             # Planet grid
-            template_dict["makePlanetGrid"] = draw_planet_grid(
+            template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
                 planets_and_houses_grid_title="",
                 subject_name=f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})",
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
+            )
+            template_dict["makeSecondaryPlanetGrid"] = draw_secondary_planet_grid(
+                planets_and_houses_grid_title="",
                 second_subject_name= f"{self.second_obj.name} ({self.language_settings.get('outer_wheel', 'Outer Wheel')})", # type: ignore
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                celestial_point_language=self.language_settings["celestial_points"],
             )
             template_dict["makeHouseComparisonGrid"] = ""
 
@@ -1404,10 +1429,14 @@ class KerykeionChartSVG:
             template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
 
             # Houses and planet drawing
-            template_dict["makeHousesGrid"] = draw_house_grid(
+            template_dict["makeMainHousesGrid"] = draw_main_house_grid(
                 main_subject_houses_list=first_subject_houses_list,
+                text_color=self.chart_colors_settings["paper_0"],
+                house_cusp_generale_name_label=self.language_settings["cusp"],
+            )
+
+            template_dict["makeSecondaryHousesGrid"] = draw_secondary_house_grid(
                 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"],
             )
@@ -1445,15 +1474,21 @@ class KerykeionChartSVG:
             else:
                 first_return_grid_title = f"{self.first_obj.name} ({self.language_settings.get('inner_wheel', 'Inner Wheel')})"
                 second_return_grid_title = f"{self.language_settings.get("lunar_return", "Lunar Return")} ({self.language_settings.get("outer_wheel", "Outer Wheel")})"
-            template_dict["makePlanetGrid"] = draw_planet_grid(
+            template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
                 planets_and_houses_grid_title="",
                 subject_name=first_return_grid_title,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
                 chart_type=self.chart_type,
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
+            )
+            template_dict["makeSecondaryPlanetGrid"] = draw_secondary_planet_grid(
+                planets_and_houses_grid_title="",
                 second_subject_name=second_return_grid_title,
                 second_subject_available_kerykeion_celestial_points=self.t_available_kerykeion_celestial_points,
+                chart_type=self.chart_type,
+                text_color=self.chart_colors_settings["paper_0"],
+                celestial_point_language=self.language_settings["celestial_points"]
             )
 
             house_comparison_factory = HouseComparisonFactory(
@@ -1525,7 +1560,7 @@ class KerykeionChartSVG:
 
             template_dict["top_left_0"] = f'{self.language_settings["info"]}:'
             template_dict["top_left_1"] = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime) # type: ignore
-            template_dict["top_left_2"] = format_location_string(self.location)
+            template_dict["top_left_2"] = f"{self.first_obj.city}, {self.first_obj.nation}"
             template_dict["top_left_3"] = f"{self.language_settings['latitude']}: {latitude_string}"
             template_dict["top_left_4"] = f"{self.language_settings['longitude']}: {longitude_string}"
 
@@ -1552,12 +1587,12 @@ class KerykeionChartSVG:
             template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
 
             # Houses and planet drawing
-            template_dict["makeHousesGrid"] = draw_house_grid(
+            template_dict["makeMainHousesGrid"] = draw_main_house_grid(
                 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"],
             )
+            template_dict["makeSecondaryHousesGrid"] = ""
 
             template_dict["makeHouses"] = draw_houses_cusps_and_text_number(
                 r=self.main_radius,
@@ -1582,7 +1617,7 @@ class KerykeionChartSVG:
                 main_subject_seventh_house_degree_ut=self.first_obj.seventh_house.abs_pos,
             )
 
-            template_dict["makePlanetGrid"] = draw_planet_grid(
+            template_dict["makeMainPlanetGrid"] = draw_main_planet_grid(
                 planets_and_houses_grid_title=self.language_settings["planets_and_house"],
                 subject_name=self.first_obj.name,
                 available_kerykeion_celestial_points=self.available_kerykeion_celestial_points,
@@ -1590,6 +1625,7 @@ class KerykeionChartSVG:
                 text_color=self.chart_colors_settings["paper_0"],
                 celestial_point_language=self.language_settings["celestial_points"],
             )
+            template_dict["makeSecondaryPlanetGrid"] = ""
             template_dict["makeHouseComparisonGrid"] = ""
 
         return ChartTemplateDictionary(**template_dict)

kerykeion/charts/templates/chart.xml

@@ -110,14 +110,21 @@ OpenAstro.org -->
 
         <!-- Houses_And_Planets_Grid -->
         <g kr:node="Houses_And_Planets_Grid">
-            <!-- Planet Grid -->
-            <g kr:node="Planet_Grid" transform="translate(620,30)">
-                $makePlanetGrid
+            <!-- Main Subject Grid -->
+            <g kr:node="Main_Planet_Grid">
+                $makeMainPlanetGrid
             </g>
 
-            <!-- Houses Grid -->
-            <g kr:node="Houses_Grid" transform="translate(20,30)">
-                $makeHousesGrid
+            <g kr:node="Secondary_Houses_Grid">
+                $makeSecondaryHousesGrid
+            </g>
+
+            <g kr:node="Secondary_Planet_Grid">
+                $makeSecondaryPlanetGrid
+            </g>
+
+            <g kr:node="Main_Houses_Grid">
+                $makeMainHousesGrid
             </g>
 
             <!-- House Comparison Grid -->

kerykeion/kr_types/chart_types.py

@@ -82,8 +82,10 @@ class ChartTemplateDictionary(TypedDict):
     makeZodiac: str
     makeHouses: str
     makePlanets: str
-    makePlanetGrid: str
-    makeHousesGrid: str
+    makeMainPlanetGrid: str
+    makeSecondaryPlanetGrid: str
+    makeMainHousesGrid: str
+    makeSecondaryHousesGrid: str
 
     color_style_tag: str
 

kerykeion/{relationship_score/relationship_score_factory.py → relationship_score_factory.py}

@@ -218,10 +218,10 @@ if __name__ == "__main__":
 
     setup_logging(level="critical")
 
-    giacomo = AstrologicalSubjectFactory.from_birth_data("Giacomo", 1993, 6, 10, 12, 15, "Montichiari", "IT")
-    yoko = AstrologicalSubjectFactory.from_birth_data("Susie Cox", 1949, 6, 17, 9, 40, "Tucson", "US")
+    john = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+    yoko = AstrologicalSubjectFactory.from_birth_data("Yoko Ono", 1933, 2, 18, 18, 30, "Tokyo", "JP")
 
-    factory = RelationshipScoreFactory(giacomo, yoko)
+    factory = RelationshipScoreFactory(john, yoko)
     score = factory.get_relationship_score()
     print(score)