kerykeion 5.0.0a12__py3-none-any.whl → 5.0.0b2__py3-none-any.whl

kerykeion/charts/charts_utils.py

@@ -1,11 +1,35 @@
 import math
 import datetime
-from kerykeion.kr_types import KerykeionException, ChartType
-from kerykeion.kr_types.kr_literals import AstrologicalPoint
+from kerykeion.schemas import KerykeionException, ChartType
+from kerykeion.schemas.kr_literals import AstrologicalPoint
 from typing import Union, Literal
-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
+from kerykeion.schemas.kr_models import AspectModel, KerykeionPointModel, CompositeSubjectModel, PlanetReturnModel, AstrologicalSubjectModel, HouseComparisonModel
+from kerykeion.schemas.settings_models import KerykeionLanguageCelestialPointModel, KerykeionSettingsCelestialPointModel
+
+
+_SECOND_COLUMN_THRESHOLD = 20
+_THIRD_COLUMN_THRESHOLD = 28
+_FOURTH_COLUMN_THRESHOLD = 36
+_GRID_COLUMN_WIDTH = 125
+
+
+def _planet_grid_layout_position(index: int) -> tuple[int, int]:
+    """Return horizontal offset and row index for planet grids."""
+    if index < _SECOND_COLUMN_THRESHOLD:
+        column = 0
+        row = index
+    elif index < _THIRD_COLUMN_THRESHOLD:
+        column = 1
+        row = index - _SECOND_COLUMN_THRESHOLD
+    elif index < _FOURTH_COLUMN_THRESHOLD:
+        column = 2
+        row = index - _THIRD_COLUMN_THRESHOLD
+    else:
+        column = 3
+        row = index - _FOURTH_COLUMN_THRESHOLD
+
+    offset = -(_GRID_COLUMN_WIDTH * column)
+    return offset, row
 
 
 
@@ -189,7 +213,7 @@ def draw_zodiac_slice(
     # pie slices
     offset = 360 - seventh_house_degree_ut
     # check transit
-    if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "Return":
+    if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "DualReturnChart":
         dropin: Union[int, float] = 0
     else:
         dropin = c1
@@ -198,7 +222,7 @@ def draw_zodiac_slice(
     # symbols
     offset = offset + 15
     # check transit
-    if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "Return":
+    if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "DualReturnChart":
         dropin = 54
     else:
         dropin = 18 + c1
@@ -287,7 +311,7 @@ def draw_aspect_line(
     y2 = sliceToY(0, ar, second_offset) + (r - ar)
 
     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'<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"]}" kr:orb="{aspect["orbit"]}" kr:aspectdegrees="{aspect["aspect_degrees"]}" kr:planetsdiff="{aspect["diff"]}" kr:aspectmovement="{aspect["aspect_movement"]}">'
         f'<line class="aspect" x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {color}; stroke-width: 1; stroke-opacity: .9;"/>'
         f"</g>"
     )
@@ -419,7 +443,7 @@ def draw_first_circle(
     Returns:
         str: The SVG path of the first circle.
     """
-    if chart_type == "Synastry" or chart_type == "Transit" or chart_type == "Return":
+    if chart_type == "Synastry" or chart_type == "Transit" or chart_type == "DualReturnChart":
         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:
@@ -462,7 +486,7 @@ def draw_second_circle(
         str: The SVG path of the second circle.
     """
 
-    if chart_type == "Synastry" or chart_type == "Transit" or chart_type == "Return":
+    if chart_type == "Synastry" or chart_type == "Transit" or chart_type == "DualReturnChart":
         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:
@@ -492,7 +516,7 @@ def draw_third_circle(
     Returns:
     - str: The SVG element as a string.
     """
-    if chart_type in {"Synastry", "Transit", "Return"}:
+    if chart_type in {"Synastry", "Transit", "DualReturnChart"}:
         # 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" />'
 
@@ -572,6 +596,7 @@ def draw_houses_cusps_and_text_number(
     chart_type: ChartType,
     second_subject_houses_list: Union[list[KerykeionPointModel], None] = None,
     transit_house_cusp_color: Union[str, None] = None,
+    external_view: bool = False,
 ) -> str:
     """
     Draws the houses cusps and text numbers for a given chart type.
@@ -589,9 +614,10 @@ def draw_houses_cusps_and_text_number(
     - chart_type: Type of the chart (e.g., Transit, Synastry).
     - second_subject_houses_list: List of house for the second subject (optional).
     - transit_house_cusp_color: Color for transit house cusps (optional).
+    - external_view: Whether to use external view mode for positioning (optional).
 
     Returns:
-    - A string containing the SVG path for the houses cusps and text numbers.
+    - A string containing SVG elements for house cusps and numbers.
     """
 
     path = ""
@@ -599,7 +625,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", "Return"] else (c3, c1, False)
+        dropin, roff, t_roff = (160, 72, 36) if chart_type in ["Transit", "Synastry", "DualReturnChart"] 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)
@@ -621,7 +647,7 @@ def draw_houses_cusps_and_text_number(
             i, standard_house_cusp_color
         )
 
-        if chart_type in ["Transit", "Synastry", "Return"]:
+        if chart_type in ["Transit", "Synastry", "DualReturnChart"]:
             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")
 
@@ -651,17 +677,21 @@ def draw_houses_cusps_and_text_number(
 
             # Add the house cusp line for the second subject
             stroke_opacity = "0" if chart_type == "Transit" else ".3"
-            path += '<g kr:node="Cusp">'
+            path += f'<g kr:node="Cusp" kr:absoluteposition="{second_subject_houses_list[i].abs_pos}" kr:signposition="{second_subject_houses_list[i].position}" kr:sing="{second_subject_houses_list[i].sign}" kr:slug="{second_subject_houses_list[i].name}">'
             path += f"<line x1='{t_x1}' y1='{t_y1}' x2='{t_x2}' y2='{t_y2}' style='stroke: {t_linecolor}; stroke-width: 1px; stroke-opacity:{stroke_opacity};'/>"
             path += "</g>"
 
-        # Adjust dropin based on chart type
-        dropin = {"Transit": 84, "Synastry": 84, "Return": 84, "ExternalNatal": 100}.get(chart_type, 48)
+        # Adjust dropin based on chart type and external view
+        dropin_map = {"Transit": 84, "Synastry": 84, "DualReturnChart": 84}
+        if external_view:
+            dropin = 100
+        else:
+            dropin = dropin_map.get(chart_type, 48)
         xtext = sliceToX(0, (r - dropin), text_offset) + dropin
         ytext = sliceToY(0, (r - dropin), text_offset) + dropin
 
         # Add the house cusp line for the first subject
-        path += '<g kr:node="Cusp">'
+        path += f'<g kr:node="Cusp" kr:absoluteposition="{first_subject_houses_list[i].abs_pos}" kr:signposition="{first_subject_houses_list[i].position}" kr:sing="{first_subject_houses_list[i].sign}" kr:slug="{first_subject_houses_list[i].name}">'
         path += f'<line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" style="stroke: {linecolor}; stroke-width: 1px; stroke-dasharray:3,2; stroke-opacity:.4;"/>'
         path += "</g>"
 
@@ -708,9 +738,12 @@ def draw_transit_aspect_list(
     if aspects_list and isinstance(aspects_list[0], dict):
         aspects_list = [AspectModel(**aspect) for aspect in aspects_list]  # type: ignore
 
+    # Type narrowing: at this point aspects_list contains AspectModel instances
+    typed_aspects_list: list[AspectModel] = aspects_list  # type: ignore
+
     inner_path = ""
 
-    for i, aspect in enumerate(aspects_list):
+    for i, aspect in enumerate(typed_aspects_list):
         # Calculate which column this aspect belongs in
         current_column = i // aspects_per_column
 
@@ -722,12 +755,22 @@ def draw_transit_aspect_list(
         vertical_position = current_line * line_height
 
         # Special handling for many aspects - if we exceed max_columns
+        # Bottom-align the overflow columns so the list starts from the bottom
         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)
+            overflow_total = len(aspects_list) - (aspects_per_column * max_columns)
+            if overflow_total > 0:
+                # Index within the overflow sequence (beyond the first row of columns)
+                overflow_index = i - (aspects_per_column * max_columns)
+                # Which overflow column we are in (0-based)
+                overflow_col_idx = overflow_index // aspects_per_column
+                # How many items go into this overflow column
+                items_in_this_column = min(
+                    aspects_per_column,
+                    max(0, overflow_total - (overflow_col_idx * aspects_per_column)),
+                )
+                # Compute extra top offset (in lines) to bottom-align this column
+                top_offset_lines = max(0, aspects_per_column - items_in_this_column)
+                vertical_position = (top_offset_lines + (i % aspects_per_column)) * line_height
 
         inner_path += f'<g transform="translate({horizontal_position},{vertical_position})">'
 
@@ -824,7 +867,7 @@ def draw_main_house_grid(
         main_subject_houses_list: list[KerykeionPointModel],
         house_cusp_generale_name_label: str = "Cusp",
         text_color: str = "#000000",
-        x_position: int = 720,
+        x_position: int = 750,
         y_position: int = 30,
     ) -> str:
     """
@@ -862,7 +905,7 @@ 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,
+        x_position: int = 1015,
         y_position: int = 30,
     ) -> str:
     """
@@ -903,57 +946,58 @@ def draw_main_planet_grid(
         chart_type: ChartType,
         celestial_point_language: KerykeionLanguageCelestialPointModel,
         text_color: str = "#000000",
+        x_position: int = 645,
+        y_position: int = 0,
     ) -> str:
     """
-    Draws the planet grid for the main subject.
+    Draw the planet grid (main subject) and optional title.
+
+    The entire output is wrapped in a single SVG group `<g>` so the
+    whole block can be repositioned by changing the group transform.
 
     Args:
-        planets_and_houses_grid_title (str): Title of the grid.
-        subject_name (str): Name of the subject.
-        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.
-        text_color (str, optional): Color of the text. Defaults to "#000000".
+        planets_and_houses_grid_title: Title prefix to show for eligible chart types.
+        subject_name: Subject name to append to the title.
+        available_kerykeion_celestial_points: Celestial points to render in the grid.
+        chart_type: Chart type identifier (Literal string).
+        celestial_point_language: Language model for celestial point decoding.
+        text_color: Text color for labels (default: "#000000").
+        x_position: X translation applied to the outer `<g>` (default: 620).
+        y_position: Y translation applied to the outer `<g>` (default: 0).
 
     Returns:
-        str: The SVG output for the main planet grid.
+        SVG string for the main planet grid wrapped in a `<g>`.
     """
-    line_height = 10
-    offset = 0
-    offset_between_lines = 14
-    svg_output = ""
+    # Layout constants (kept identical to previous behavior)
+    BASE_Y = 30
+    HEADER_Y = 15  # Title baseline inside the wrapper
+    LINE_START = 10
+    LINE_STEP = 14
 
-    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":
+    # Wrap everything inside a single group so position can be changed once
+    svg_output = f'<g transform="translate({x_position},{y_position})">'
+
+    # Add title only for specific chart types
+    if chart_type in ("Synastry", "Transit", "DualReturnChart"):
         svg_output += (
-            f'<g transform="translate(620, 15)">'  # Added the 620,30 offset (adjusted for -15)
+            f'<g transform="translate(0, {HEADER_Y})">'
             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 == 22:
-            line_height = 10
-            offset = -125
+        offset, row_index = _planet_grid_layout_position(i)
+        line_height = LINE_START + (row_index * LINE_STEP)
+
+        decoded_name = get_decoded_kerykeion_celestial_point_name(
+            planet["name"],
+            celestial_point_language,
+        )
 
-        decoded_name = get_decoded_kerykeion_celestial_point_name(planet["name"], celestial_point_language)
         svg_output += (
-            f'<g transform="translate({620 + offset},{30 + line_height})">'  # Added the 620,30 offset
+            f'<g transform="translate({offset},{BASE_Y + line_height})">'
             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>'
@@ -964,7 +1008,9 @@ def draw_main_planet_grid(
             svg_output += '<g transform="translate(74,-6)"><use transform="scale(.5)" xlink:href="#retrograde" /></g>'
 
         svg_output += end_of_line
-        line_height += offset_between_lines
+
+    # Close the wrapper group
+    svg_output += "</g>"
 
     return svg_output
 
@@ -976,49 +1022,64 @@ def draw_secondary_planet_grid(
         chart_type: ChartType,
         celestial_point_language: KerykeionLanguageCelestialPointModel,
         text_color: str = "#000000",
+        x_position: int = 910,
+        y_position: int = 0,
     ) -> str:
     """
-    Draws the planet grid for the secondary subject in Transit, Synastry, or Return charts.
+    Draw the planet grid for the secondary subject and its title.
+
+    The entire output is wrapped in a single SVG group `<g>` so the
+    whole block can be repositioned by changing the group transform.
 
     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".
+        planets_and_houses_grid_title: Title prefix (used except for Transit charts).
+        second_subject_name: Name of the secondary subject.
+        second_subject_available_kerykeion_celestial_points: Celestial points to render for the secondary subject.
+        chart_type: Chart type identifier (Literal string).
+        celestial_point_language: Language model for celestial point decoding.
+        text_color: Text color for labels (default: "#000000").
+        x_position: X translation applied to the outer `<g>` (default: 870).
+        y_position: Y translation applied to the outer `<g>` (default: 0).
 
     Returns:
-        str: The SVG output for the secondary planet grid.
+        SVG string for the secondary planet grid wrapped in a `<g>`.
     """
-    svg_output = ""
-    end_of_line = "</g>"
+    # Layout constants
+    BASE_Y = 30
+    HEADER_Y = 15
+    LINE_START = 10
+    LINE_STEP = 14
 
-    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>'
-        )
+    # Open wrapper group
+    svg_output = f'<g transform="translate({x_position},{y_position})">'
 
-    svg_output += end_of_line
+    # Title content and its relative x offset
+    header_text = (
+        second_subject_name if chart_type == "Transit"
+        else f"{planets_and_houses_grid_title} {second_subject_name}"
+    )
+    header_x_offset = -50 if chart_type == "Transit" else 0
 
-    line_height = 10
-    offset = 250
+    svg_output += (
+        f'<g transform="translate({header_x_offset}, {HEADER_Y})">'
+        f'<text style="fill:{text_color}; font-size: 14px;">{header_text}</text>'
+        f'</g>'
+    )
+
+    # Grid rows
+    line_height = LINE_START
+    end_of_line = "</g>"
 
     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)
+        offset, row_index = _planet_grid_layout_position(i)
+        line_height = LINE_START + (row_index * LINE_STEP)
+
+        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'<g transform="translate({offset},{BASE_Y + 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>'
@@ -1029,7 +1090,10 @@ def draw_secondary_planet_grid(
             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
+
+
+    # Close wrapper group
+    svg_output += "</g>"
 
     return svg_output
 
@@ -1281,9 +1345,9 @@ def draw_house_comparison_grid(
         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",
+        return_label: str = "DualReturnChart",
         radix_label: str = "Radix",
-        x_position: int = 1030,
+        x_position: int = 1100,
         y_position: int = 0,
 ) -> str:
     """
@@ -1584,4 +1648,3 @@ def calculate_synastry_quality_points(
             combined_totals[quality] = (combined_totals[quality] / total_points) * 100.0
 
     return combined_totals
-

kerykeion/charts/draw_planets.py

@@ -1,9 +1,9 @@
 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
-from kerykeion.kr_types.kr_literals import Houses
+from kerykeion.schemas import KerykeionException, ChartType, KerykeionPointModel
+from kerykeion.schemas.settings_models import KerykeionSettingsCelestialPointModel
+from kerykeion.schemas.kr_literals import Houses
 import logging
-from typing import Union, get_args
+from typing import Union, get_args, List, Optional
 
 
 def draw_planets(
@@ -15,13 +15,15 @@ def draw_planets(
     main_subject_seventh_house_degree_ut: Union[int, float],
     chart_type: ChartType,
     second_subject_available_kerykeion_celestial_points: Union[list[KerykeionPointModel], None] = None,
+    external_view: bool = False,
 ) -> str:
     """
     Draws the planets on an astrological chart based on the provided parameters.
 
     This function calculates positions, handles overlap of celestial points, and draws SVG
     elements for each planet/point on the chart. It supports different chart types including
-    natal charts, transits, synastry, and returns.
+    natal charts, transits, synastry, and returns. For single-subject charts (Natal), it
+    can render planets in external view mode using the external_view parameter.
 
     Args:
         radius (Union[int, float]): The radius of the chart in pixels.
@@ -30,10 +32,13 @@ def draw_planets(
         third_circle_radius (Union[int, float]): Radius of the third circle in the chart.
         main_subject_first_house_degree_ut (Union[int, float]): Degree of the first house for the main subject.
         main_subject_seventh_house_degree_ut (Union[int, float]): Degree of the seventh house for the main subject.
-        chart_type (ChartType): Type of the chart (e.g., "Transit", "Synastry", "Return", "ExternalNatal").
+        chart_type (ChartType): Type of the chart (e.g., "Transit", "Synastry", "DualReturnChart", "Natal").
         second_subject_available_kerykeion_celestial_points (Union[list[KerykeionPointModel], None], optional):
             List of celestial points for the second subject, required for "Transit", "Synastry", or "Return" charts.
             Defaults to None.
+        external_view (bool, optional):
+            Whether to render planets in external view mode (planets on outer ring with connecting lines).
+            Only applicable for single-subject charts. Defaults to False.
 
     Raises:
         KerykeionException: If secondary celestial points are required but not provided.
@@ -43,7 +48,7 @@ def draw_planets(
     """
     # Constants and initialization
     PLANET_GROUPING_THRESHOLD = 3.4  # Distance threshold to consider planets as grouped
-    TRANSIT_RING_EXCLUDE_POINTS_NAMES = get_args(Houses)
+    TRANSIT_RING_EXCLUDE_POINTS_NAMES: List[str] = list(get_args(Houses))
     output = ""
 
     # -----------------------------------------------------------
@@ -64,12 +69,13 @@ def draw_planets(
     secondary_points_abs_positions = []
     secondary_points_rel_positions = []
     if chart_type == "Transit" or chart_type == "Synastry" or chart_type == "Return":
-        secondary_points_abs_positions = [
-            planet.abs_pos for planet in second_subject_available_kerykeion_celestial_points
-        ]
-        secondary_points_rel_positions = [
-            planet.position for planet in second_subject_available_kerykeion_celestial_points
-        ]
+        if second_subject_available_kerykeion_celestial_points is not None:
+            secondary_points_abs_positions = [
+                planet.abs_pos for planet in second_subject_available_kerykeion_celestial_points
+            ]
+            secondary_points_rel_positions = [
+                planet.position for planet in second_subject_available_kerykeion_celestial_points
+            ]
 
     # -----------------------------------------------------------
     # 2. Create position lookup dictionary for main celestial points
@@ -86,9 +92,9 @@ def draw_planets(
     # -----------------------------------------------------------
     # 3. Identify groups of celestial points that are close to each other
     # -----------------------------------------------------------
-    point_groups = []
+    point_groups: List[List[List[Union[int, float, str]]]] = []
     is_group_open = False
-    planets_by_position = [None] * len(position_index_map)
+    planets_by_position: List[Optional[List[Union[int, float]]]] = [None] * len(position_index_map)
 
     # Process each celestial point to find groups
     for position_idx, abs_position in enumerate(sorted_positions):
@@ -142,7 +148,7 @@ def draw_planets(
     # -----------------------------------------------------------
     # 4. Calculate position adjustments to avoid overlapping
     # -----------------------------------------------------------
-    position_adjustments = [0] * len(available_planets_setting)
+    position_adjustments: List[float] = [0.0] * len(available_planets_setting)
 
     # Process each group to calculate position adjustments
     for group in point_groups:
@@ -159,11 +165,12 @@ def draw_planets(
     # -----------------------------------------------------------
     # 5. Draw main celestial points
     # -----------------------------------------------------------
+    adjusted_offset = 0.0  # Initialize for use outside loop
     for position_idx, abs_position in enumerate(sorted_positions):
         point_idx = position_index_map[abs_position]
 
         # Determine radius based on chart type and point type
-        point_radius = _determine_point_radius(point_idx, chart_type, bool(position_idx % 2))
+        point_radius = _determine_point_radius(point_idx, chart_type, bool(position_idx % 2), external_view)
 
         # Calculate position offset for the point
         adjusted_offset = _calculate_point_offset(
@@ -191,11 +198,11 @@ def draw_planets(
             scale_factor = 0.8
         elif chart_type == "Return":
             scale_factor = 0.8
-        elif chart_type == "ExternalNatal":
+        elif external_view:
             scale_factor = 0.8
 
-        # Draw connecting lines for ExternalNatal chart type
-        if chart_type == "ExternalNatal":
+        # Draw connecting lines for external view
+        if external_view:
             output = _draw_external_natal_lines(
                 output,
                 radius,
@@ -327,7 +334,8 @@ def _handle_multi_point_group(group: list, position_adjustments: list, threshold
 def _determine_point_radius(
     point_idx: int,
     chart_type: str,
-    is_alternate_position: bool
+    is_alternate_position: bool,
+    external_view: bool = False
 ) -> int:
     """
     Determine the radius for placing a celestial point based on its type and chart type.
@@ -336,6 +344,7 @@ def _determine_point_radius(
         point_idx (int): Index of the celestial point.
         chart_type (str): Type of the chart.
         is_alternate_position (bool): Whether to use alternate positioning.
+        external_view (bool): Whether external view is enabled.
 
     Returns:
         int: Radius value for the point.
@@ -359,10 +368,10 @@ def _determine_point_radius(
         else:
             return 110 if is_alternate_position else 130
     else:
-        # Default natal chart and ExternalNatal handling
+        # Default natal chart and external view handling
         # if 22 < point_idx < 27 it is asc,mc,dsc,ic (angles of chart)
         amin, bmin, cmin = 0, 0, 0
-        if chart_type == "ExternalNatal":
+        if external_view:
             amin = 74 - 10
             bmin = 94 - 10
             cmin = 40 - 10
@@ -402,7 +411,7 @@ def _draw_external_natal_lines(
     color: str,
 ) -> str:
     """
-    Draw connecting lines for the ExternalNatal chart type.
+    Draw connecting lines for external view charts.
 
     Creates two line segments: one from the circle to the original position,
     and another from the original position to the adjusted position.
@@ -450,7 +459,7 @@ def _generate_point_svg(point_details: KerykeionPointModel, x: float, y: float,
     Returns:
         str: SVG element for the celestial point.
     """
-    svg = f'<g kr:node="ChartPoint" kr:house="{point_details["house"]}" kr:sign="{point_details["sign"]}" '
+    svg = f'<g kr:node="ChartPoint" kr:house="{point_details["house"]}" kr:sign="{point_details["sign"]}" kr:absoluteposition="{point_details["abs_pos"]}" kr:signposition="{point_details["position"]}" '
     svg += f'kr:slug="{point_details["name"]}" transform="translate(-{12 * scale},-{12 * scale}) scale({scale})">'
     svg += f'<use x="{x * (1/scale)}" y="{y * (1/scale)}" xlink:href="#{point_name}" />'
     svg += "</g>"
@@ -488,7 +497,7 @@ def _draw_secondary_points(
         str: Updated SVG output with added secondary points.
     """
     # Initialize position adjustments for grouped points
-    position_adjustments = {i: 0 for i in range(len(points_settings))}
+    position_adjustments: dict[int, float] = {i: 0.0 for i in range(len(points_settings))}
 
     # Map absolute position to point index
     position_index_map = {}
@@ -501,7 +510,7 @@ def _draw_secondary_points(
     sorted_positions = sorted(position_index_map.keys())
 
     # Find groups of points that are close to each other
-    point_groups = []
+    point_groups: List[List[int]] = []
     in_group = False
 
     for pos_idx, abs_position in enumerate(sorted_positions):
@@ -536,7 +545,7 @@ def _draw_secondary_points(
             position_adjustments[group[1]] = 1.0
         elif len(group) == 3:
             position_adjustments[group[0]] = -1.5
-            position_adjustments[group[1]] = 0
+            position_adjustments[group[1]] = 0.0
             position_adjustments[group[2]] = 1.5
         elif len(group) == 4:
             position_adjustments[group[0]] = -2.0
@@ -546,6 +555,7 @@ def _draw_secondary_points(
 
     # Draw each secondary point
     alternate_position = False
+    point_idx = 0  # Initialize for use outside loop
 
     for pos_idx, abs_position in enumerate(sorted_positions):
         point_idx = position_index_map[abs_position]