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

kerykeion/charts/charts_utils.py

@@ -1,9 +1,12 @@
 import math
 import datetime
 from kerykeion.kr_types import KerykeionException, ChartType
-from typing import Union, Literal
-from kerykeion.kr_types.kr_models import AspectModel, KerykeionPointModel
-from kerykeion.kr_types.settings_models import KerykeionLanguageCelestialPointModel, KerykeionSettingsAspectModel
+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
+
 
 
 def get_decoded_kerykeion_celestial_point_name(input_planet_name: str, celestial_point_language: KerykeionLanguageCelestialPointModel) -> str:
@@ -186,7 +189,7 @@ def draw_zodiac_slice(
     # pie slices
     offset = 360 - seventh_house_degree_ut
     # check transit
-    if chart_type == "Transit" or chart_type == "Synastry":
+    if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "Return":
         dropin: Union[int, float] = 0
     else:
         dropin = c1
@@ -195,7 +198,7 @@ def draw_zodiac_slice(
     # symbols
     offset = offset + 15
     # check transit
-    if chart_type == "Transit" or chart_type == "Synastry":
+    if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "Return":
         dropin = 54
     else:
         dropin = 18 + c1
@@ -289,6 +292,7 @@ def draw_aspect_line(
         f"</g>"
     )
 
+
 def convert_decimal_to_degree_string(dec: float, format_type: Literal["1", "2", "3"] = "3") -> str:
     """
     Converts a decimal float to a degrees string in the specified format.
@@ -415,7 +419,7 @@ def draw_first_circle(
     Returns:
         str: The SVG path of the first circle.
     """
-    if chart_type == "Synastry" or chart_type == "Transit":
+    if chart_type == "Synastry" or chart_type == "Transit" or chart_type == "Return":
         return f'<circle cx="{r}" cy="{r}" r="{r - 36}" style="fill: none; stroke: {stroke_color}; stroke-width: 1px; stroke-opacity:.4;" />'
     else:
         if c1 is None:
@@ -443,7 +447,7 @@ def draw_second_circle(
         str: The SVG path of the second circle.
     """
 
-    if chart_type == "Synastry" or chart_type == "Transit":
+    if chart_type == "Synastry" or chart_type == "Transit" or chart_type == "Return":
         return f'<circle cx="{r}" cy="{r}" r="{r - 72}" style="fill: {fill_color}; fill-opacity:.4; stroke: {stroke_color}; stroke-opacity:.4; stroke-width: 1px" />'
 
     else:
@@ -473,7 +477,7 @@ def draw_third_circle(
     Returns:
     - str: The SVG element as a string.
     """
-    if chart_type in {"Synastry", "Transit"}:
+    if chart_type in {"Synastry", "Transit", "Return"}:
         # For Synastry and Transit charts, use a fixed radius adjustment of 160
         return f'<circle cx="{radius}" cy="{radius}" r="{radius - 160}" style="fill: {fill_color}; fill-opacity:.8; stroke: {stroke_color}; stroke-width: 1px" />'
 
@@ -485,7 +489,7 @@ def draw_aspect_grid(
         stroke_color: str,
         available_planets: list,
         aspects: list,
-        x_start: int = 380,
+        x_start: int = 510,
         y_start: int = 468,
     ) -> str:
     """
@@ -506,7 +510,7 @@ def draw_aspect_grid(
     box_size = 14
 
     # Filter active planets
-    active_planets = [planet for planet in available_planets if planet.is_active]
+    active_planets = [planet for planet in available_planets if planet["is_active"]]
 
     # Reverse the list of active planets for the first iteration
     reversed_planets = active_planets[::-1]
@@ -580,7 +584,7 @@ def draw_houses_cusps_and_text_number(
 
     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, False)
+        dropin, roff, t_roff = (160, 72, 36) if chart_type in ["Transit", "Synastry", "Return"] else (c3, c1, False)
 
         # Calculate the offset for the current house cusp
         offset = (int(first_subject_houses_list[int(xr / 2)].abs_pos) / -1) + int(first_subject_houses_list[i].abs_pos)
@@ -602,7 +606,7 @@ def draw_houses_cusps_and_text_number(
             i, standard_house_cusp_color
         )
 
-        if chart_type in ["Transit", "Synastry"]:
+        if chart_type in ["Transit", "Synastry", "Return"]:
             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")
 
@@ -637,7 +641,7 @@ def draw_houses_cusps_and_text_number(
             path += f"</g>"
 
         # Adjust dropin based on chart type
-        dropin = {"Transit": 84, "Synastry": 84, "ExternalNatal": 100}.get(chart_type, 48)
+        dropin = {"Transit": 84, "Synastry": 84, "Return": 84, "ExternalNatal": 100}.get(chart_type, 48)
         xtext = sliceToX(0, (r - dropin), text_offset) + dropin
         ytext = sliceToY(0, (r - dropin), text_offset) + dropin
 
@@ -658,7 +662,12 @@ def draw_transit_aspect_list(
     grid_title: str,
     aspects_list: Union[list[AspectModel], list[dict]],
     celestial_point_language: Union[KerykeionLanguageCelestialPointModel, dict],
-    aspects_settings: Union[KerykeionSettingsAspectModel, dict],
+    aspects_settings: dict,
+    *,
+    aspects_per_column: int = 14,
+    column_width: int = 100,
+    line_height: int = 14,
+    max_columns: int = 6
 ) -> str:
     """
     Generates the SVG output for the aspect transit grid.
@@ -666,8 +675,12 @@ def draw_transit_aspect_list(
     Parameters:
     - grid_title: Title of the grid.
     - aspects_list: List of aspects.
-    - planets_labels: Dictionary containing the planet labels.
+    - celestial_point_language: Dictionary containing the celestial point language data.
     - aspects_settings: Dictionary containing the aspect settings.
+    - aspects_per_column: Number of aspects to display per column (default: 14).
+    - column_width: Width in pixels for each column (default: 100).
+    - line_height: Height in pixels for each line (default: 14).
+    - max_columns: Maximum number of columns before vertical adjustment (default: 6).
 
     Returns:
     - A string containing the SVG path data for the aspect transit grid.
@@ -676,65 +689,52 @@ def draw_transit_aspect_list(
     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] # type: ignore
+    if aspects_list and isinstance(aspects_list[0], dict):
+        aspects_list = [AspectModel(**aspect) for aspect in aspects_list]  # type: ignore
 
-    line = 0
-    nl = 0
     inner_path = ""
+
     for i, aspect in enumerate(aspects_list):
-        # Adjust the vertical position for every 12 aspects
-        if i == 14:
-            nl = 100
-            line = 0
-
-        elif i == 28:
-            nl = 200
-            line = 0
-
-        elif i == 42:
-            nl = 300
-            line = 0
-
-        elif i == 56:
-            nl = 400
-            line = 0
-
-        elif i == 70:
-            nl = 500
-            # When there are more than 60 aspects, the text is moved up
-            if len(aspects_list) > 84:
-                line = -1 * (len(aspects_list) - 84) * 14
-            else:
-                line = 0
-
-        inner_path += f'<g transform="translate({nl},{line})">'
-
-        # first planet symbol
-        inner_path += f'<use transform="scale(0.4)" x="0" y="3" xlink:href="#{celestial_point_language[aspects_list[i]["p1"]]["name"]}" />'
-
-        # aspect symbol
-        # TODO: Remove the "degree" element EVERYWHERE!
-        aspect_name = aspects_list[i]["aspect"]
-        id_value = next((a["degree"] for a in aspects_settings if a["name"] == aspect_name), None) # type: ignore
-        inner_path += f'<use  x="15" y="0" xlink:href="#orb{id_value}" />'
-
-        # second planet symbol
+        # Calculate which column this aspect belongs in
+        current_column = i // aspects_per_column
+
+        # Calculate horizontal position based on column
+        horizontal_position = current_column * column_width
+
+        # Calculate vertical position within the column
+        current_line = i % aspects_per_column
+        vertical_position = current_line * line_height
+
+        # Special handling for many aspects - if we exceed max_columns
+        if current_column >= max_columns:
+            # Calculate how many aspects will overflow beyond the max columns
+            overflow_aspects = len(aspects_list) - (aspects_per_column * max_columns)
+            if overflow_aspects > 0:
+                # Adjust the starting vertical position to move text up
+                vertical_position = vertical_position - (overflow_aspects * line_height)
+
+        inner_path += f'<g transform="translate({horizontal_position},{vertical_position})">'
+
+        # First planet symbol
+        inner_path += f'<use transform="scale(0.4)" x="0" y="3" xlink:href="#{celestial_point_language[aspect["p1"]]["name"]}" />'
+
+        # Aspect symbol
+        aspect_name = aspect["aspect"]
+        id_value = next((a["degree"] for a in aspects_settings if a["name"] == aspect_name), None)  # type: ignore
+        inner_path += f'<use x="15" y="0" xlink:href="#orb{id_value}" />'
+
+        # Second planet symbol
         inner_path += f'<g transform="translate(30,0)">'
-        inner_path += f'<use transform="scale(0.4)" x="0" y="3" xlink:href="#{celestial_point_language[aspects_list[i]["p2"]]["name"]}" />'
+        inner_path += f'<use transform="scale(0.4)" x="0" y="3" xlink:href="#{celestial_point_language[aspect["p2"]]["name"]}" />'
         inner_path += f"</g>"
 
-        # difference in degrees
-        inner_path += f'<text y="8" x="45" style="fill: var(--kerykeion-chart-color-paper-0); font-size: 10px;">{convert_decimal_to_degree_string(aspects_list[i]["orbit"])}</text>'
-        # line
+        # Difference in degrees
+        inner_path += f'<text y="8" x="45" style="fill: var(--kerykeion-chart-color-paper-0); font-size: 10px;">{convert_decimal_to_degree_string(aspect["orbit"])}</text>'
+
         inner_path += f"</g>"
-        line = line + 14
 
-    out = '<g transform="translate(526,273)">'
+    out = '<g transform="translate(565,273)">'
     out += f'<text y="-15" x="0" style="fill: var(--kerykeion-chart-color-paper-0); font-size: 14px;">{grid_title}:</text>'
     out += inner_path
     out += '</g>'
@@ -804,31 +804,28 @@ def calculate_moon_phase_chart_params(
         "lunar_phase_rotate": lunar_phase_rotate,
     }
 
-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"] and secondary_subject_houses_list is None:
-        raise KerykeionException("secondary_houses is None")
-
-    svg_output = '<g transform="translate(650,-20)">'
+    svg_output = f'<g transform="translate({x_position},{y_position})">'
 
     line_increment = 10
     for i, house in enumerate(main_subject_houses_list):
@@ -843,40 +840,57 @@ def draw_house_grid(
         line_increment += 14
 
     svg_output += "</g>"
+    return svg_output
 
-    if chart_type == "Synastry":
-        svg_output += '<!-- Synastry Houses -->'
-        svg_output += '<g transform="translate(910, -20)">'
-        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.
@@ -884,33 +898,47 @@ 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 = ""
 
-    svg_output = (
-        f'<g transform="translate(175, -15)">'
-        f'<text text-anchor="end" style="fill:{text_color}; font-size: 14px;">{planets_and_houses_grid_title} {subject_name}:</text>'
-        f'</g>'
-    )
+    if chart_type == "Synastry":
+        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(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(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 += ""
 
     end_of_line = "</g>"
 
     for i, planet in enumerate(available_kerykeion_celestial_points):
-        if i == 27:
+        if i == 22:
             line_height = 10
-            offset = -120
+            offset = -125
 
         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>'
@@ -923,45 +951,70 @@ def draw_planet_grid(
         svg_output += end_of_line
         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")
+    return svg_output
 
-        if chart_type == "Transit":
-            svg_output += (
-                f'<g transform="translate(320, -15)">'
-                f'<text text-anchor="end" style="fill:{text_color}; font-size: 14px;">{second_subject_name}:</text>'
-            )
-        else:
-            svg_output += (
-                f'<g transform="translate(380, -15)">'
-                f'<text text-anchor="end" 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".
 
-            if t_planet["retrograde"]:
-                svg_output += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
+    Returns:
+        str: The SVG output for the secondary planet grid.
+    """
+    svg_output = ""
+    end_of_line = "</g>"
 
-            svg_output += end_of_line
-            second_line_height += offset_between_lines
+    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
+
+    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
 
@@ -994,7 +1047,7 @@ def draw_transit_aspect_grid(
     y_start = y_indent
 
     # Filter active planets
-    active_planets = [planet for planet in available_planets if planet.is_active]
+    active_planets = [planet for planet in available_planets if planet["is_active"]]
 
     # Reverse the list of active planets for the first iteration
     reversed_planets = active_planets[::-1]
@@ -1040,3 +1093,480 @@ def draw_transit_aspect_grid(
                     svg_output += f'<use  x="{x_aspect - box_size + 1}" y="{y_aspect + 1}" xlink:href="#orb{aspect["aspect_degrees"]}" />'
 
     return svg_output
+
+
+def format_location_string(location: str, max_length: int = 35) -> str:
+    """
+    Format a location string to ensure it fits within a specified maximum length.
+
+    If the location is longer than max_length, it attempts to shorten by using only
+    the first and last parts separated by commas. If still too long, it truncates
+    and adds ellipsis.
+
+    Args:
+        location: The original location string
+        max_length: Maximum allowed length for the output string (default: 35)
+
+    Returns:
+        Formatted location string that fits within max_length
+    """
+    if len(location) > max_length:
+        split_location = location.split(",")
+        if len(split_location) > 1:
+            shortened = split_location[0] + ", " + split_location[-1]
+            if len(shortened) > max_length:
+                return shortened[:max_length] + "..."
+            return shortened
+        else:
+            return location[:max_length] + "..."
+    return location
+
+
+def format_datetime_with_timezone(iso_datetime_string: str) -> str:
+    """
+    Format an ISO datetime string with a custom format that includes properly formatted timezone.
+
+    Args:
+        iso_datetime_string: ISO formatted datetime string
+
+    Returns:
+        Formatted datetime string with properly formatted timezone offset (HH:MM)
+    """
+    dt = datetime.datetime.fromisoformat(iso_datetime_string)
+    custom_format = dt.strftime('%Y-%m-%d %H:%M [%z]')
+    custom_format = custom_format[:-3] + ':' + custom_format[-3:]
+
+    return custom_format
+
+
+def calculate_element_points(
+        planets_settings: list[KerykeionSettingsCelestialPointModel],
+        celestial_points_names: list[str],
+        subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
+    ):
+    """
+    Calculate elemental point totals based on planetary positions.
+
+    Args:
+        planets_settings (list): List of planet configuration dictionaries
+        celestial_points_names (list): List of celestial point names to process
+        subject: Astrological subject with get() method for accessing planet data
+
+    Returns:
+        dict: Dictionary with element point totals for 'fire', 'earth', 'air', and 'water'
+    """
+    ZODIAC = (
+        {"name": "Ari", "element": "fire"},
+        {"name": "Tau", "element": "earth"},
+        {"name": "Gem", "element": "air"},
+        {"name": "Can", "element": "water"},
+        {"name": "Leo", "element": "fire"},
+        {"name": "Vir", "element": "earth"},
+        {"name": "Lib", "element": "air"},
+        {"name": "Sco", "element": "water"},
+        {"name": "Sag", "element": "fire"},
+        {"name": "Cap", "element": "earth"},
+        {"name": "Aqu", "element": "air"},
+        {"name": "Pis", "element": "water"},
+    )
+
+    # Initialize element point totals
+    element_totals = {
+        "fire": 0.0,
+        "earth": 0.0,
+        "air": 0.0,
+        "water": 0.0
+    }
+
+    # Make list of the points sign
+    points_sign = [subject.get(planet).sign_num for planet in celestial_points_names]
+
+    for i in range(len(planets_settings)):
+        # Add points to appropriate element
+        element = ZODIAC[points_sign[i]]["element"]
+        element_totals[element] += planets_settings[i]["element_points"]
+
+    return element_totals
+
+
+def calculate_synastry_element_points(
+        planets_settings: list[KerykeionSettingsCelestialPointModel],
+        celestial_points_names: list[str],
+        subject1: AstrologicalSubjectModel,
+        subject2: AstrologicalSubjectModel,
+    ):
+    """
+    Calculate elemental point totals for both subjects in a synastry chart.
+
+    Args:
+        planets_settings (list): List of planet configuration dictionaries
+        celestial_points_names (list): List of celestial point names to process
+        subject1: First astrological subject with get() method for accessing planet data
+        subject2: Second astrological subject with get() method for accessing planet data
+
+    Returns:
+        dict: Dictionary with element point totals as percentages, where the sum equals 100%
+    """
+    ZODIAC = (
+        {"name": "Ari", "element": "fire"},
+        {"name": "Tau", "element": "earth"},
+        {"name": "Gem", "element": "air"},
+        {"name": "Can", "element": "water"},
+        {"name": "Leo", "element": "fire"},
+        {"name": "Vir", "element": "earth"},
+        {"name": "Lib", "element": "air"},
+        {"name": "Sco", "element": "water"},
+        {"name": "Sag", "element": "fire"},
+        {"name": "Cap", "element": "earth"},
+        {"name": "Aqu", "element": "air"},
+        {"name": "Pis", "element": "water"},
+    )
+
+    # Initialize combined element point totals
+    combined_totals = {
+        "fire": 0.0,
+        "earth": 0.0,
+        "air": 0.0,
+        "water": 0.0
+    }
+
+    # Make list of the points sign for both subjects
+    subject1_points_sign = [subject1.get(planet).sign_num for planet in celestial_points_names]
+    subject2_points_sign = [subject2.get(planet).sign_num for planet in celestial_points_names]
+
+    # Calculate element points for subject 1
+    for i in range(len(planets_settings)):
+        # Add points to appropriate element
+        element1 = ZODIAC[subject1_points_sign[i]]["element"]
+        combined_totals[element1] += planets_settings[i]["element_points"]
+
+    # Calculate element points for subject 2
+    for i in range(len(planets_settings)):
+        # Add points to appropriate element
+        element2 = ZODIAC[subject2_points_sign[i]]["element"]
+        combined_totals[element2] += planets_settings[i]["element_points"]
+
+    # Calculate total points across all elements
+    total_points = sum(combined_totals.values())
+
+    # Convert to percentages (total = 100%)
+    if total_points > 0:
+        for element in combined_totals:
+            combined_totals[element] = (combined_totals[element] / total_points) * 100.0
+
+    return combined_totals
+
+
+def draw_house_comparison_grid(
+        house_comparison: "HouseComparisonModel",
+        celestial_point_language: KerykeionLanguageCelestialPointModel,
+        active_points: list[AstrologicalPoint],
+        *,
+        points_owner_subject_number: Literal[1, 2] = 1,
+        text_color: str = "var(--kerykeion-color-neutral-content)",
+        house_position_comparison_label: str = "House Position Comparison",
+        return_point_label: str = "Return Point",
+        return_label: str = "Return",
+        radix_label: str = "Radix",
+        x_position: int = 1030,
+        y_position: int = 0,
+) -> str:
+    """
+    Generate SVG code for displaying a comparison of points across houses between two charts.
+
+    Parameters:
+    - house_comparison ("HouseComparisonModel"): Model containing house comparison data,
+      including first_subject_name, second_subject_name, and points in houses.
+    - celestial_point_language (KerykeionLanguageCelestialPointModel): Language model for celestial points
+    - active_celestial_points (list[KerykeionPointModel]): List of active celestial points to display
+    - text_color (str): Color for the text elements
+
+    Returns:
+    - str: SVG code for the house comparison grid.
+    """
+    if points_owner_subject_number == 1:
+        comparison_data = house_comparison.first_points_in_second_houses
+    else:
+        comparison_data = house_comparison.second_points_in_first_houses
+
+    svg_output = f'<g transform="translate({x_position},{y_position})">'
+
+    # Add title
+    svg_output += f'<text text-anchor="start" x="0" y="-15" style="fill:{text_color}; font-size: 14px;">{house_position_comparison_label}</text>'
+
+    # Add column headers
+    line_increment = 10
+    svg_output += (
+        f'<g transform="translate(0,{line_increment})">'
+        f'<text text-anchor="start" x="0" style="fill:{text_color}; font-weight: bold; font-size: 10px;">{return_point_label}</text>'
+        f'<text text-anchor="start" x="77" style="fill:{text_color}; font-weight: bold; font-size: 10px;">{return_label}</text>'
+        f'<text text-anchor="start" x="132" style="fill:{text_color}; font-weight: bold; font-size: 10px;">{radix_label}</text>'
+        f'</g>'
+    )
+    line_increment += 15
+
+    # Create a dictionary to store all points by name for combined display
+    all_points_by_name = {}
+
+    for point in comparison_data:
+        # Only process points that are active
+        if point.point_name in active_points and point.point_name not in all_points_by_name:
+            all_points_by_name[point.point_name] = {
+                "name": point.point_name,
+                "secondary_house": point.projected_house_number,
+                "native_house": point.point_owner_house_number
+            }
+
+    # Display all points organized by name
+    for name, point_data in all_points_by_name.items():
+        native_house = point_data.get("native_house", "-")
+        secondary_house = point_data.get("secondary_house", "-")
+
+        svg_output += (
+            f'<g transform="translate(0,{line_increment})">'
+            f'<g transform="translate(0,-9)"><use transform="scale(0.4)" xlink:href="#{name}" /></g>'
+            f'<text text-anchor="start" x="15" style="fill:{text_color}; font-size: 10px;">{get_decoded_kerykeion_celestial_point_name(name, celestial_point_language)}</text>'
+            f'<text text-anchor="start" x="90" style="fill:{text_color}; font-size: 10px;">{native_house}</text>'
+            f'<text text-anchor="start" x="140" style="fill:{text_color}; font-size: 10px;">{secondary_house}</text>'
+            f'</g>'
+        )
+        line_increment += 12
+
+    svg_output += "</g>"
+
+    return svg_output
+
+
+def draw_single_house_comparison_grid(
+        house_comparison: "HouseComparisonModel",
+        celestial_point_language: KerykeionLanguageCelestialPointModel,
+        active_points: list[AstrologicalPoint],
+        *,
+        points_owner_subject_number: Literal[1, 2] = 1,
+        text_color: str = "var(--kerykeion-color-neutral-content)",
+        house_position_comparison_label: str = "House Position Comparison",
+        return_point_label: str = "Return Point",
+        natal_house_label: str = "Natal House",
+        x_position: int = 1030,
+        y_position: int = 0,
+) -> str:
+    """
+    Generate SVG code for displaying celestial points and their house positions.
+
+    Parameters:
+    - house_comparison ("HouseComparisonModel"): Model containing house comparison data,
+      including first_subject_name, second_subject_name, and points in houses.
+    - celestial_point_language (KerykeionLanguageCelestialPointModel): Language model for celestial points
+    - active_points (list[AstrologicalPoint]): List of active celestial points to display
+    - points_owner_subject_number (Literal[1, 2]): Which subject's points to display (1 for first, 2 for second)
+    - text_color (str): Color for the text elements
+    - house_position_comparison_label (str): Label for the house position comparison grid
+    - return_point_label (str): Label for the return point column
+    - house_position_label (str): Label for the house position column
+    - x_position (int): X position for the grid
+    - y_position (int): Y position for the grid
+
+    Returns:
+    - str: SVG code for the house position grid.
+    """
+    if points_owner_subject_number == 1:
+        comparison_data = house_comparison.first_points_in_second_houses
+    else:
+        comparison_data = house_comparison.second_points_in_first_houses
+
+    svg_output = f'<g transform="translate({x_position},{y_position})">'
+
+    # Add title
+    svg_output += f'<text text-anchor="start" x="0" y="-15" style="fill:{text_color}; font-size: 14px;">{house_position_comparison_label}</text>'
+
+    # Add column headers
+    line_increment = 10
+    svg_output += (
+        f'<g transform="translate(0,{line_increment})">'
+        f'<text text-anchor="start" x="0" style="fill:{text_color}; font-weight: bold; font-size: 10px;">{return_point_label}</text>'
+        f'<text text-anchor="start" x="77" style="fill:{text_color}; font-weight: bold; font-size: 10px;">{natal_house_label}</text>'
+        f'</g>'
+    )
+    line_increment += 15
+
+    # Create a dictionary to store all points by name for combined display
+    all_points_by_name = {}
+
+    for point in comparison_data:
+        # Only process points that are active
+        if point.point_name in active_points and point.point_name not in all_points_by_name:
+            all_points_by_name[point.point_name] = {
+                "name": point.point_name,
+                "house": point.projected_house_number
+            }
+
+    # Display all points organized by name
+    for name, point_data in all_points_by_name.items():
+        house = point_data.get("house", "-")
+
+        svg_output += (
+            f'<g transform="translate(0,{line_increment})">'
+            f'<g transform="translate(0,-9)"><use transform="scale(0.4)" xlink:href="#{name}" /></g>'
+            f'<text text-anchor="start" x="15" style="fill:{text_color}; font-size: 10px;">{get_decoded_kerykeion_celestial_point_name(name, celestial_point_language)}</text>'
+            f'<text text-anchor="start" x="90" style="fill:{text_color}; font-size: 10px;">{house}</text>'
+            f'</g>'
+        )
+        line_increment += 12
+
+    svg_output += "</g>"
+
+    return svg_output
+
+
+def makeLunarPhase(degrees_between_sun_and_moon: float, latitude: float) -> str:
+    """
+    Generate SVG representation of lunar phase.
+
+    Parameters:
+    - degrees_between_sun_and_moon (float): Angle between sun and moon in degrees
+    - latitude (float): Observer's latitude for correct orientation
+
+    Returns:
+    - str: SVG representation of lunar phase
+    """
+    # Calculate parameters for the lunar phase visualization
+    params = calculate_moon_phase_chart_params(degrees_between_sun_and_moon, latitude)
+
+    # Extract the calculated values
+    lunar_phase_circle_center_x = params["circle_center_x"]
+    lunar_phase_circle_radius = params["circle_radius"]
+    lunar_phase_rotate = params["lunar_phase_rotate"]
+
+    # Generate the SVG for the lunar phase
+    svg = (
+        f'<g transform="rotate({lunar_phase_rotate} 20 10)">\n'
+        f'    <defs>\n'
+        f'        <clipPath id="moonPhaseCutOffCircle">\n'
+        f'            <circle cx="20" cy="10" r="10" />\n'
+        f'        </clipPath>\n'
+        f'    </defs>\n'
+        f'    <circle cx="20" cy="10" r="10" style="fill: var(--kerykeion-chart-color-lunar-phase-0)" />\n'
+        f'    <circle cx="{lunar_phase_circle_center_x}" cy="10" r="{lunar_phase_circle_radius}" style="fill: var(--kerykeion-chart-color-lunar-phase-1)" clip-path="url(#moonPhaseCutOffCircle)" />\n'
+        f'    <circle cx="20" cy="10" r="10" style="fill: none; stroke: var(--kerykeion-chart-color-lunar-phase-0); stroke-width: 0.5px; stroke-opacity: 0.5" />\n'
+        f'</g>'
+    )
+
+    return svg
+
+
+def calculate_quality_points(
+        planets_settings: list[KerykeionSettingsCelestialPointModel],
+        celestial_points_names: list[str],
+        subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
+    ):
+    """
+    Calculate quality point totals based on planetary positions.
+
+    Args:
+        planets_settings (list): List of planet configuration dictionaries
+        celestial_points_names (list): List of celestial point names to process
+        subject: Astrological subject with get() method for accessing planet data
+        planet_in_zodiac_extra_points (int): Extra points awarded for planets in their home sign
+
+    Returns:
+        dict: Dictionary with quality point totals for 'cardinal', 'fixed', and 'mutable'
+    """
+    ZODIAC = (
+        {"name": "Ari", "quality": "cardinal"},
+        {"name": "Tau", "quality": "fixed"},
+        {"name": "Gem", "quality": "mutable"},
+        {"name": "Can", "quality": "cardinal"},
+        {"name": "Leo", "quality": "fixed"},
+        {"name": "Vir", "quality": "mutable"},
+        {"name": "Lib", "quality": "cardinal"},
+        {"name": "Sco", "quality": "fixed"},
+        {"name": "Sag", "quality": "mutable"},
+        {"name": "Cap", "quality": "cardinal"},
+        {"name": "Aqu", "quality": "fixed"},
+        {"name": "Pis", "quality": "mutable"},
+    )
+
+    # Initialize quality point totals
+    quality_totals = {
+        "cardinal": 0.0,
+        "fixed": 0.0,
+        "mutable": 0.0
+    }
+
+    # Make list of the points sign
+    points_sign = [subject.get(planet).sign_num for planet in celestial_points_names]
+
+    for i in range(len(planets_settings)):
+        # Add points to appropriate quality
+        quality = ZODIAC[points_sign[i]]["quality"]
+        quality_totals[quality] += planets_settings[i]["element_points"]
+
+    return quality_totals
+
+
+def calculate_synastry_quality_points(
+        planets_settings: list[KerykeionSettingsCelestialPointModel],
+        celestial_points_names: list[str],
+        subject1: AstrologicalSubjectModel,
+        subject2: AstrologicalSubjectModel,
+    ):
+    """
+    Calculate quality point totals for both subjects in a synastry chart.
+
+    Args:
+        planets_settings (list): List of planet configuration dictionaries
+        celestial_points_names (list): List of celestial point names to process
+        subject1: First astrological subject with get() method for accessing planet data
+        subject2: Second astrological subject with get() method for accessing planet data
+
+    Returns:
+        dict: Dictionary with quality point totals as percentages, where the sum equals 100%
+    """
+    ZODIAC = (
+        {"name": "Ari", "quality": "cardinal"},
+        {"name": "Tau", "quality": "fixed"},
+        {"name": "Gem", "quality": "mutable"},
+        {"name": "Can", "quality": "cardinal"},
+        {"name": "Leo", "quality": "fixed"},
+        {"name": "Vir", "quality": "mutable"},
+        {"name": "Lib", "quality": "cardinal"},
+        {"name": "Sco", "quality": "fixed"},
+        {"name": "Sag", "quality": "mutable"},
+        {"name": "Cap", "quality": "cardinal"},
+        {"name": "Aqu", "quality": "fixed"},
+        {"name": "Pis", "quality": "mutable"},
+    )
+
+    # Initialize combined quality point totals
+    combined_totals = {
+        "cardinal": 0.0,
+        "fixed": 0.0,
+        "mutable": 0.0
+    }
+
+    # Make list of the points sign for both subjects
+    subject1_points_sign = [subject1.get(planet).sign_num for planet in celestial_points_names]
+    subject2_points_sign = [subject2.get(planet).sign_num for planet in celestial_points_names]
+
+    # Calculate quality points for subject 1
+    for i in range(len(planets_settings)):
+        # Add points to appropriate quality
+        quality1 = ZODIAC[subject1_points_sign[i]]["quality"]
+        combined_totals[quality1] += planets_settings[i]["element_points"]
+
+    # Calculate quality points for subject 2
+    for i in range(len(planets_settings)):
+        # Add points to appropriate quality
+        quality2 = ZODIAC[subject2_points_sign[i]]["quality"]
+        combined_totals[quality2] += planets_settings[i]["element_points"]
+
+    # Calculate total points across all qualities
+    total_points = sum(combined_totals.values())
+
+    # Convert to percentages (total = 100%)
+    if total_points > 0:
+        for quality in combined_totals:
+            combined_totals[quality] = (combined_totals[quality] / total_points) * 100.0
+
+    return combined_totals
+