kerykeion 5.0.1__py3-none-any.whl → 5.1.8__py3-none-any.whl

kerykeion/aspects/aspects_factory.py

@@ -98,7 +98,7 @@ class AspectsFactory:
         Example:
             >>> johnny = AstrologicalSubjectFactory.from_birth_data("Johnny", 1963, 6, 9, 0, 0, "Owensboro", "US")
             >>> chart_aspects = AspectsFactory.single_chart_aspects(johnny)
-            >>> print(f"Found {len(chart_aspects.relevant_aspects)} relevant aspects")
+            >>> print(f"Found {len(chart_aspects.aspects)} aspects")
         """
         # Initialize settings and configurations
         celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
@@ -162,7 +162,7 @@ class AspectsFactory:
             >>> john = AstrologicalSubjectFactory.from_birth_data("John", 1990, 1, 1, 12, 0, "London", "GB")
             >>> jane = AstrologicalSubjectFactory.from_birth_data("Jane", 1992, 6, 15, 14, 30, "Paris", "FR")
             >>> synastry = AspectsFactory.dual_chart_aspects(john, jane)
-            >>> print(f"Found {len(synastry.relevant_aspects)} relevant aspects")
+            >>> print(f"Found {len(synastry.aspects)} aspects")
         """
         # Initialize settings and configurations
         celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
@@ -208,12 +208,12 @@ class AspectsFactory:
         Create the complete single chart aspects model with all calculations.
 
         Returns:
-            SingleChartAspectsModel containing all aspects data
+            SingleChartAspectsModel containing filtered aspects data
         """
         all_aspects = AspectsFactory._calculate_single_chart_aspects(
             subject, active_points_resolved, active_aspects_resolved, aspects_settings, celestial_points
         )
-        relevant_aspects = AspectsFactory._filter_relevant_aspects(
+        filtered_aspects = AspectsFactory._filter_relevant_aspects(
             all_aspects,
             axis_orb_limit,
             apply_axis_orb_filter=axis_orb_limit is not None,
@@ -221,8 +221,7 @@ class AspectsFactory:
 
         return SingleChartAspectsModel(
             subject=subject,
-            all_aspects=all_aspects,
-            relevant_aspects=relevant_aspects,
+            aspects=filtered_aspects,
             active_points=active_points_resolved,
             active_aspects=active_aspects_resolved,
         )
@@ -250,13 +249,13 @@ class AspectsFactory:
             celestial_points: Celestial points configuration
 
         Returns:
-            DualChartAspectsModel: Complete model containing all aspects data
+            DualChartAspectsModel: Complete model containing filtered aspects data
         """
         all_aspects = AspectsFactory._calculate_dual_chart_aspects(
             first_subject, second_subject, active_points_resolved, active_aspects_resolved,
             aspects_settings, celestial_points
         )
-        relevant_aspects = AspectsFactory._filter_relevant_aspects(
+        filtered_aspects = AspectsFactory._filter_relevant_aspects(
             all_aspects,
             axis_orb_limit,
             apply_axis_orb_filter=False,
@@ -265,8 +264,7 @@ class AspectsFactory:
         return DualChartAspectsModel(
             first_subject=first_subject,
             second_subject=second_subject,
-            all_aspects=all_aspects,
-            relevant_aspects=relevant_aspects,
+            aspects=filtered_aspects,
             active_points=active_points_resolved,
             active_aspects=active_aspects_resolved,
         )
@@ -560,10 +558,11 @@ if __name__ == "__main__":
     # Test single chart aspects (replaces natal aspects)
     johnny = AstrologicalSubjectFactory.from_birth_data("Johnny Depp", 1963, 6, 9, 0, 0, city="Owensboro", nation="US")
     single_chart_aspects = AspectsFactory.single_chart_aspects(johnny)
-    print(f"Single chart aspects - All: {len(single_chart_aspects.all_aspects)}, Relevant: {len(single_chart_aspects.relevant_aspects)}")
+    print(f"Single chart aspects: {len(single_chart_aspects.aspects)}")
 
     # Test dual chart aspects (replaces synastry aspects)
     john = AstrologicalSubjectFactory.from_birth_data("John", 1940, 10, 9, 10, 30, "Liverpool", "GB")
     yoko = AstrologicalSubjectFactory.from_birth_data("Yoko", 1933, 2, 18, 10, 30, "Tokyo", "JP")
     dual_chart_aspects = AspectsFactory.dual_chart_aspects(john, yoko)
-    print(f"Dual chart aspects - All: {len(dual_chart_aspects.all_aspects)}, Relevant: {len(dual_chart_aspects.relevant_aspects)}")
+    print(f"Dual chart aspects: {len(dual_chart_aspects.aspects)}")
+

kerykeion/aspects/aspects_utils.py

@@ -49,8 +49,8 @@ def get_aspect_from_two_points(
     return {
         "verdict": verdict,
         "name": name,
-        "orbit": distance - aspect_degrees,
-        "distance": distance - aspect_degrees,
+        "orbit": abs(distance - aspect_degrees),
+        "distance": abs(distance - aspect_degrees),
         "aspect_degrees": aspect_degrees,
         "diff": diff,
     }

kerykeion/astrological_subject_factory.py

@@ -59,7 +59,8 @@ from kerykeion.utilities import (
     check_and_adjust_polar_latitude,
     calculate_moon_phase,
     datetime_to_julian,
-    get_house_number
+    get_house_number,
+    normalize_zodiac_type,
 )
 from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 
@@ -67,7 +68,7 @@ from kerykeion.settings.config_constants import DEFAULT_ACTIVE_POINTS
 DEFAULT_GEONAMES_USERNAME = "century.boy"
 DEFAULT_SIDEREAL_MODE: SiderealMode = "FAGAN_BRADLEY"
 DEFAULT_HOUSES_SYSTEM_IDENTIFIER: HousesSystemIdentifier = "P"
-DEFAULT_ZODIAC_TYPE: ZodiacType = "Tropic"
+DEFAULT_ZODIAC_TYPE: ZodiacType = "Tropical"
 DEFAULT_PERSPECTIVE_TYPE: PerspectiveType = "Apparent Geocentric"
 DEFAULT_GEONAMES_CACHE_EXPIRE_AFTER_DAYS = 30
 
@@ -148,8 +149,8 @@ class ChartConfiguration:
     combinations.
 
     Attributes:
-        zodiac_type (ZodiacType): The zodiac system to use ('Tropic' or 'Sidereal').
-            Defaults to 'Tropic'.
+        zodiac_type (ZodiacType): The zodiac system to use ('Tropical' or 'Sidereal').
+            Defaults to 'Tropical'.
         sidereal_mode (Optional[SiderealMode]): The sidereal calculation mode when using
             sidereal zodiac. Only required/used when zodiac_type is 'Sidereal'.
             Defaults to None (auto-set to FAGAN_BRADLEY for sidereal).
@@ -198,14 +199,17 @@ class ChartConfiguration:
             - Logs informational message when setting default sidereal mode
         """
         # Validate zodiac type
-        if self.zodiac_type not in get_args(ZodiacType):
-            raise KerykeionException(
-                f"'{self.zodiac_type}' is not a valid zodiac type! Available types are: {get_args(ZodiacType)}"
-            )
+        try:
+            normalized_zodiac_type = normalize_zodiac_type(self.zodiac_type)
+        except ValueError as exc:
+            raise KerykeionException(str(exc)) from exc
+        else:
+            if normalized_zodiac_type != self.zodiac_type:
+                self.zodiac_type = normalized_zodiac_type
 
         # Validate sidereal mode settings
-        if self.sidereal_mode and self.zodiac_type == "Tropic":
-            raise KerykeionException("You can't set a sidereal mode with a Tropic zodiac type!")
+        if self.sidereal_mode and self.zodiac_type == "Tropical":
+            raise KerykeionException("You can't set a sidereal mode with a Tropical zodiac type!")
 
         if self.zodiac_type == "Sidereal":
             if not self.sidereal_mode:
@@ -475,8 +479,8 @@ class AstrologicalSubjectFactory:
                 online location lookup. Get one free at geonames.org.
             online (bool, optional): Whether to fetch location data online. If False,
                 lng, lat, and tz_str must be provided. Defaults to True.
-            zodiac_type (ZodiacType, optional): Zodiac system - 'Tropic' or 'Sidereal'.
-                Defaults to 'Tropic'.
+            zodiac_type (ZodiacType, optional): Zodiac system - 'Tropical' or 'Sidereal'.
+                Defaults to 'Tropical'.
             sidereal_mode (SiderealMode, optional): Sidereal calculation mode (e.g.,
                 'FAGAN_BRADLEY', 'LAHIRI'). Only used with zodiac_type='Sidereal'.
             houses_system_identifier (HousesSystemIdentifier, optional): House system
@@ -726,7 +730,7 @@ class AstrologicalSubjectFactory:
                 or as fallback. Defaults to 51.5074 (Greenwich).
             geonames_username (str, optional): GeoNames API username. Required when
                 online=True. Defaults to DEFAULT_GEONAMES_USERNAME.
-            zodiac_type (ZodiacType, optional): Zodiac system. Defaults to 'Tropic'.
+            zodiac_type (ZodiacType, optional): Zodiac system. Defaults to 'Tropical'.
             sidereal_mode (SiderealMode, optional): Sidereal mode when zodiac_type
                 is 'Sidereal'. Defaults to None.
             houses_system_identifier (HousesSystemIdentifier, optional): House system.
@@ -866,7 +870,7 @@ class AstrologicalSubjectFactory:
             online (bool, optional): Whether to fetch location data online.
                 Defaults to True.
             zodiac_type (ZodiacType, optional): Zodiac system to use.
-                Defaults to 'Tropic'.
+                Defaults to 'Tropical'.
             sidereal_mode (SiderealMode, optional): Sidereal calculation mode.
                 Only used when zodiac_type is 'Sidereal'. Defaults to None.
             houses_system_identifier (HousesSystemIdentifier, optional): House

kerykeion/backword.py

@@ -36,6 +36,7 @@ from .chart_data_factory import ChartDataFactory
 from .charts.chart_drawer import ChartDrawer
 from .aspects import AspectsFactory
 from .settings.config_constants import DEFAULT_ACTIVE_POINTS, DEFAULT_ACTIVE_ASPECTS
+from .utilities import normalize_zodiac_type
 from .schemas.kr_models import (
     AstrologicalSubjectModel,
     CompositeSubjectModel,
@@ -74,6 +75,42 @@ LEGACY_NODE_NAMES_MAP = {
 }
 
 
+def _normalize_zodiac_type_with_warning(zodiac_type: Optional[Union[str, ZodiacType]]) -> Optional[ZodiacType]:
+    """Normalize legacy zodiac type values with deprecation warning.
+
+    Wraps the utilities.normalize_zodiac_type function and adds a deprecation
+    warning for legacy formats like "tropic" or case-insensitive variants.
+
+    Args:
+        zodiac_type: Input zodiac type (may be legacy format)
+
+    Returns:
+        Normalized ZodiacType or None if input was None
+    """
+    if zodiac_type is None:
+        return None
+
+    zodiac_str = str(zodiac_type)
+
+    # Check if this is a legacy format (case-insensitive "tropic" or non-canonical case)
+    zodiac_lower = zodiac_str.lower()
+    if zodiac_lower in ("tropic", "tropical", "sidereal") and zodiac_str not in ("Tropical", "Sidereal"):
+        # Normalize using the utilities function
+        normalized = normalize_zodiac_type(zodiac_str)
+
+        # Emit deprecation warning for legacy usage
+        warnings.warn(
+            f"Zodiac type '{zodiac_str}' is deprecated in Kerykeion v5. "
+            f"Use '{normalized}' instead.",
+            DeprecationWarning,
+            stacklevel=4,
+        )
+        return normalized
+
+    # Already in correct format or will be normalized by utilities function
+    return cast(ZodiacType, normalize_zodiac_type(zodiac_str))
+
+
 def _normalize_active_points(points: Optional[Iterable[Union[str, AstrologicalPoint]]]) -> Optional[List[AstrologicalPoint]]:
     """Best-effort normalization of legacy string active points list.
 
@@ -159,7 +196,10 @@ class AstrologicalSubject:
                 stacklevel=2,
             )
 
+        # Normalize legacy zodiac type values
+        zodiac_type = _normalize_zodiac_type_with_warning(zodiac_type)
         zodiac_type = DEFAULT_ZODIAC_TYPE if zodiac_type is None else zodiac_type
+
         houses_system_identifier = (
             DEFAULT_HOUSES_SYSTEM_IDENTIFIER if houses_system_identifier is None else houses_system_identifier
         )
@@ -352,6 +392,9 @@ class AstrologicalSubject:
         if online and resolved_geonames == DEFAULT_GEONAMES_USERNAME:
             warnings.warn(GEONAMES_DEFAULT_USERNAME_WARNING, UserWarning, stacklevel=2)
 
+        # Normalize legacy zodiac type values
+        normalized_zodiac_type = _normalize_zodiac_type_with_warning(zodiac_type)
+
         model = AstrologicalSubjectFactory.from_iso_utc_time(
             name=name,
             iso_utc_time=iso_utc_time,
@@ -362,7 +405,7 @@ class AstrologicalSubject:
             lng=float(lng),
             lat=float(lat),
             geonames_username=resolved_geonames,
-            zodiac_type=(zodiac_type or DEFAULT_ZODIAC_TYPE),  # type: ignore[arg-type]
+            zodiac_type=(normalized_zodiac_type or DEFAULT_ZODIAC_TYPE),  # type: ignore[arg-type]
             sidereal_mode=sidereal_mode,
             houses_system_identifier=(houses_system_identifier or DEFAULT_HOUSES_SYSTEM_IDENTIFIER),  # type: ignore[arg-type]
             perspective_type=(perspective_type or DEFAULT_PERSPECTIVE_TYPE),  # type: ignore[arg-type]
@@ -676,14 +719,16 @@ class NatalAspects:
 
     @cached_property
     def all_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._all_aspects_cache is None:
-            self._all_aspects_cache = list(self._build_aspects_model().all_aspects)
+            self._all_aspects_cache = list(self._build_aspects_model().aspects)
         return self._all_aspects_cache
 
     @cached_property
     def relevant_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._relevant_aspects_cache is None:
-            self._relevant_aspects_cache = list(self._build_aspects_model().relevant_aspects)
+            self._relevant_aspects_cache = list(self._build_aspects_model().aspects)
         return self._relevant_aspects_cache
 
 # ---------------------------------------------------------------------------
@@ -748,14 +793,16 @@ class SynastryAspects:
 
     @cached_property
     def all_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._all_aspects_cache is None:
-            self._all_aspects_cache = list(self._build_dual_model().all_aspects)
+            self._all_aspects_cache = list(self._build_dual_model().aspects)
         return self._all_aspects_cache
 
     @cached_property
     def relevant_aspects(self):
+        """Legacy property - returns the same as aspects for backwards compatibility."""
         if self._relevant_aspects_cache is None:
-            self._relevant_aspects_cache = list(self._build_dual_model().relevant_aspects)
+            self._relevant_aspects_cache = list(self._build_dual_model().aspects)
         return self._relevant_aspects_cache
 
     def get_relevant_aspects(self):

kerykeion/chart_data_factory.py

@@ -159,10 +159,10 @@ class ChartDataFactory:
             )
 
         # Calculate aspects based on chart type
-        aspects: Union[SingleChartAspectsModel, DualChartAspectsModel]
+        aspects_model: Union[SingleChartAspectsModel, DualChartAspectsModel]
         if chart_type in ["Natal", "Composite", "SingleReturnChart"]:
             # Single chart aspects
-            aspects = AspectsFactory.single_chart_aspects(
+            aspects_model = AspectsFactory.single_chart_aspects(
                 first_subject,
                 active_points=effective_active_points,
                 active_aspects=active_aspects,
@@ -172,7 +172,7 @@ class ChartDataFactory:
             # Dual chart aspects - second_subject is guaranteed to exist here due to validation above
             if second_subject is None:
                 raise KerykeionException(f"Second subject is required for {chart_type} charts.")
-            aspects = AspectsFactory.dual_chart_aspects(
+            aspects_model = AspectsFactory.dual_chart_aspects(
                 first_subject,
                 second_subject,
                 active_points=effective_active_points,
@@ -301,7 +301,7 @@ class ChartDataFactory:
             return SingleChartDataModel(
                 chart_type=cast(Literal["Natal", "Composite", "SingleReturnChart"], chart_type),
                 subject=first_subject,
-                aspects=cast(SingleChartAspectsModel, aspects),
+                aspects=cast(SingleChartAspectsModel, aspects_model).aspects,
                 element_distribution=element_distribution,
                 quality_distribution=quality_distribution,
                 active_points=effective_active_points,
@@ -315,7 +315,7 @@ class ChartDataFactory:
                 chart_type=cast(Literal["Transit", "Synastry", "DualReturnChart"], chart_type),
                 first_subject=first_subject,
                 second_subject=second_subject,
-                aspects=cast(DualChartAspectsModel, aspects),
+                aspects=cast(DualChartAspectsModel, aspects_model).aspects,
                 house_comparison=house_comparison,
                 relationship_score=relationship_score,
                 element_distribution=element_distribution,
@@ -542,8 +542,11 @@ if __name__ == "__main__":
 
     print(f"Chart Type: {natal_data.chart_type}")
     print(f"Active Points: {len(natal_data.active_points)}")
-    print(f"Aspects: {len(natal_data.aspects.relevant_aspects)}")
+    print(f"Aspects: {len(natal_data.aspects)}")
     print(f"Fire: {natal_data.element_distribution.fire_percentage}%")
     print(f"Earth: {natal_data.element_distribution.earth_percentage}%")
     print(f"Air: {natal_data.element_distribution.air_percentage}%")
     print(f"Water: {natal_data.element_distribution.water_percentage}%")
+
+    print("\n---\n")
+    print(natal_data.model_dump_json(indent=4))

kerykeion/charts/chart_drawer.py

@@ -78,6 +78,9 @@ from kerykeion.settings.chart_defaults import (
 from typing import List, Literal
 
 
+logger = logging.getLogger(__name__)
+
+
 class ChartDrawer:
     """
     ChartDrawer generates astrological chart visualizations as SVG files from pre-computed chart data.
@@ -315,7 +318,7 @@ class ChartDrawer:
 
         active_points_count = len(self.available_planets_setting)
         if active_points_count > 24:
-            logging.warning(
+            logger.warning(
                 "ChartDrawer detected %s active celestial points; rendering may look crowded beyond 24.",
                 active_points_count,
             )
@@ -343,7 +346,7 @@ class ChartDrawer:
             # --- NATAL CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.relevant_aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -366,7 +369,7 @@ class ChartDrawer:
             # --- COMPOSITE CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.relevant_aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -384,7 +387,7 @@ class ChartDrawer:
             # --- TRANSIT CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.relevant_aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -405,7 +408,7 @@ class ChartDrawer:
             # --- SYNASTRY CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.relevant_aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -423,7 +426,7 @@ class ChartDrawer:
             # --- RETURN CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.relevant_aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -441,7 +444,7 @@ class ChartDrawer:
             # --- SINGLE WHEEL RETURN CHART SETUP ---
 
             # Extract aspects from pre-computed chart data
-            self.aspects_list = chart_data.aspects.relevant_aspects
+            self.aspects_list = chart_data.aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -856,7 +859,7 @@ class ChartDrawer:
         try:
             required_width = self._estimate_required_width_full()
         except Exception as e:
-            logging.debug(f"Auto-size width calculation failed: {e}")
+            logger.debug("Auto-size width calculation failed: %s", e)
             return
 
         minimum_width = self._minimum_width_for_chart_type()
@@ -1071,24 +1074,28 @@ class ChartDrawer:
             return f"{synastry_label}: {name1} {and_word} {name2}"
 
         elif self.chart_type == "DualReturnChart":
-            year = datetime.fromisoformat(self.second_obj.iso_formatted_local_datetime).year # type: ignore
+            return_datetime = datetime.fromisoformat(self.second_obj.iso_formatted_local_datetime) # type: ignore
+            year = return_datetime.year
+            month_year = return_datetime.strftime("%m/%Y")
             truncated_name = self._truncate_name(self.first_obj.name)
             if self.second_obj is not None and isinstance(self.second_obj, PlanetReturnModel) and self.second_obj.return_type == "Solar":
                 solar_label = self._translate("solar_return", "Solar")
                 return f"{truncated_name} - {solar_label} {year}"
             else:
                 lunar_label = self._translate("lunar_return", "Lunar")
-                return f"{truncated_name} - {lunar_label} {year}"
+                return f"{truncated_name} - {lunar_label} {month_year}"
 
         elif self.chart_type == "SingleReturnChart":
-            year = datetime.fromisoformat(self.first_obj.iso_formatted_local_datetime).year # type: ignore
+            return_datetime = datetime.fromisoformat(self.first_obj.iso_formatted_local_datetime) # type: ignore
+            year = return_datetime.year
+            month_year = return_datetime.strftime("%m/%Y")
             truncated_name = self._truncate_name(self.first_obj.name)
             if isinstance(self.first_obj, PlanetReturnModel) and self.first_obj.return_type == "Solar":
                 solar_label = self._translate("solar_return", "Solar")
                 return f"{truncated_name} - {solar_label} {year}"
             else:
                 lunar_label = self._translate("lunar_return", "Lunar")
-                return f"{truncated_name} - {lunar_label} {year}"
+                return f"{truncated_name} - {lunar_label} {month_year}"
 
         # Fallback for unknown chart types
         return self._truncate_name(self.first_obj.name)
@@ -1267,7 +1274,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = f"{self._translate('day_of_week', 'Day of Week')}: {localized_weekday}" # type: ignore
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1429,7 +1436,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1573,19 +1580,64 @@ class ChartDrawer:
 
             template_dict["makeAspects"] = self._draw_all_transit_aspects_lines(self.main_radius, self.main_radius - 160)
 
-            # Top left section
-            latitude_string = convert_latitude_coordinate_to_string(self.geolat, self._translate("north", "North"), self._translate("south", "South"))
-            longitude_string = convert_longitude_coordinate_to_string(self.geolon, self._translate("east", "East"), self._translate("west", "West"))
-
-            template_dict["top_left_0"] = f"{self.first_obj.name}"
-            template_dict["top_left_1"] = f"{format_location_string(self.first_obj.city)}, {self.first_obj.nation}" # type: ignore
-            template_dict["top_left_2"] = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime) # type: ignore
-            template_dict["top_left_3"] = f"{self._translate('latitude', 'Latitude')}: {latitude_string}"
-            template_dict["top_left_4"] = f"{self._translate('longitude', 'Longitude')}: {longitude_string}"
-            template_dict["top_left_5"] = ""#f"{self._translate('type', 'Type')}: {self._translate(self.chart_type, self.chart_type)}"
+            # Top left section (clear separation of Natal vs Transit details)
+            natal_latitude_string = (
+                convert_latitude_coordinate_to_string(
+                    self.first_obj.lat,  # type: ignore[arg-type]
+                    self._translate("north_letter", "N"),
+                    self._translate("south_letter", "S"),
+                )
+                if getattr(self.first_obj, "lat", None) is not None
+                else ""
+            )
+            natal_longitude_string = (
+                convert_longitude_coordinate_to_string(
+                    self.first_obj.lng,  # type: ignore[arg-type]
+                    self._translate("east_letter", "E"),
+                    self._translate("west_letter", "W"),
+                )
+                if getattr(self.first_obj, "lng", None) is not None
+                else ""
+            )
+
+            transit_latitude_string = ""
+            transit_longitude_string = ""
+            if self.second_obj is not None:
+                if getattr(self.second_obj, "lat", None) is not None:
+                    transit_latitude_string = convert_latitude_coordinate_to_string(
+                        self.second_obj.lat,  # type: ignore[arg-type]
+                        self._translate("north_letter", "N"),
+                        self._translate("south_letter", "S"),
+                    )
+                if getattr(self.second_obj, "lng", None) is not None:
+                    transit_longitude_string = convert_longitude_coordinate_to_string(
+                        self.second_obj.lng,  # type: ignore[arg-type]
+                        self._translate("east_letter", "E"),
+                        self._translate("west_letter", "W"),
+                    )
+
+            natal_dt = format_datetime_with_timezone(self.first_obj.iso_formatted_local_datetime)  # type: ignore[arg-type]
+            natal_place = f"{format_location_string(self.first_obj.city)}, {self.first_obj.nation}"  # type: ignore[arg-type]
+            transit_dt = (
+                format_datetime_with_timezone(self.second_obj.iso_formatted_local_datetime)  # type: ignore[arg-type]
+                if self.second_obj is not None and getattr(self.second_obj, "iso_formatted_local_datetime", None) is not None
+                else ""
+            )
+            transit_place = (
+                f"{format_location_string(self.second_obj.city)}, {self.second_obj.nation}"  # type: ignore[arg-type]
+                if self.second_obj is not None
+                else ""
+            )
+
+            template_dict["top_left_0"] = f"{self._translate('chart_info_natal_label', 'Natal')}: {natal_dt}"
+            template_dict["top_left_1"] = natal_place
+            template_dict["top_left_2"] = f"{natal_latitude_string}  ·  {natal_longitude_string}"
+            template_dict["top_left_3"] = f"{self._translate('chart_info_transit_label', 'Transit')}: {transit_dt}"
+            template_dict["top_left_4"] = transit_place
+            template_dict["top_left_5"] = f"{transit_latitude_string}  ·  {transit_longitude_string}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1597,17 +1649,25 @@ class ChartDrawer:
 
             # Lunar phase information from second object (Transit) (optional)
             if self.second_obj is not None and hasattr(self.second_obj, 'lunar_phase') and self.second_obj.lunar_phase is not None:
-                template_dict["bottom_left_2"] = f'{self._translate("lunation_day", "Lunation Day")}: {self.second_obj.lunar_phase.get("moon_phase", "")}' # type: ignore
-                template_dict["bottom_left_3"] = f'{self._translate("lunar_phase", "Lunar Phase")}: {self._translate(self.second_obj.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.second_obj.lunar_phase.moon_phase_name)}'
+                template_dict["bottom_left_3"] = (
+                    f"{self._translate('Transit', 'Transit')} "
+                    f"{self._translate('lunation_day', 'Lunation Day')}: "
+                    f"{self.second_obj.lunar_phase.get('moon_phase', '')}"
+                )  # type: ignore
+                template_dict["bottom_left_4"] = (
+                    f"{self._translate('Transit', 'Transit')} "
+                    f"{self._translate('lunar_phase', 'Lunar Phase')}: "
+                    f"{self._translate(self.second_obj.lunar_phase.moon_phase_name.lower().replace(' ', '_'), self.second_obj.lunar_phase.moon_phase_name)}"
+                )
             else:
-                template_dict["bottom_left_2"] = ""
                 template_dict["bottom_left_3"] = ""
+                template_dict["bottom_left_4"] = ""
 
-            template_dict["bottom_left_4"] = f'{self._translate("perspective_type", "Perspective")}: {self._translate(self.second_obj.perspective_type.lower().replace(" ", "_"), self.second_obj.perspective_type)}' # type: ignore
+            template_dict["bottom_left_2"] = f'{self._translate("perspective_type", "Perspective")}: {self._translate(self.second_obj.perspective_type.lower().replace(" ", "_"), self.second_obj.perspective_type)}' # type: ignore
 
-            # Moon phase section calculations - use first_obj for visualization
-            if self.first_obj.lunar_phase is not None:
-                template_dict["makeLunarPhase"] = makeLunarPhase(self.first_obj.lunar_phase["degrees_between_s_m"], self.geolat)
+            # Moon phase section calculations - use transit subject data only
+            if self.second_obj is not None and getattr(self.second_obj, "lunar_phase", None):
+                template_dict["makeLunarPhase"] = makeLunarPhase(self.second_obj.lunar_phase["degrees_between_s_m"], self.geolat)
             else:
                 template_dict["makeLunarPhase"] = ""
 
@@ -1763,7 +1823,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = format_datetime_with_timezone(self.second_obj.iso_formatted_local_datetime) # type: ignore
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -1963,7 +2023,7 @@ class ChartDrawer:
             template_dict["top_left_5"] = f"{latitude_string} / {longitude_string}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -2136,7 +2196,7 @@ class ChartDrawer:
                 template_dict["top_left_5"] = f"{self._translate('type', 'Type')}: {self._translate('lunar_return', 'Lunar Return')}"
 
             # Bottom left section
-            if self.first_obj.zodiac_type == "Tropic":
+            if self.first_obj.zodiac_type == "Tropical":
                 zodiac_info = f"{self._translate('zodiac', 'Zodiac')}: {self._translate('tropical', 'Tropical')}"
             else:
                 mode_const = "SIDM_" + self.first_obj.sidereal_mode # type: ignore
@@ -2233,7 +2293,7 @@ class ChartDrawer:
 
         # return filename
 
-        logging.debug(f"Template dictionary has {len(td.model_dump())} fields")
+        logger.debug("Template dictionary includes %s fields", len(td.model_dump()))
 
         self._create_template_dictionary()