Merge branch 'fix/windows-excel-export-error' into 'enterprise'

fix: use cross-platform date formatting for Excel export and schedule display

See merge request dkinternal/testgen/dataops-testgen!550

Author: ci bot

testgen/common/cron_service.py

@@ -5,6 +5,8 @@
 import cron_converter
 import cron_descriptor
 
+from testgen.common import date_service
+
 
 class CronSample(TypedDict, total=False):
     id: str | None
@@ -26,7 +28,7 @@ def get_cron_sample(
         cron_schedule = cron_obj.schedule(reference_time or datetime.now(zoneinfo.ZoneInfo(cron_tz)))
         readable_cron_schedule = cron_descriptor.get_description(cron_expr)
         if formatted:
-            samples = [cron_schedule.next().strftime("%a %b %-d, %-I:%M %p") for _ in range(sample_count)]
+            samples = [date_service.format_friendly_datetime(cron_schedule.next(), "%a %b %-d, %-I:%M %p") for _ in range(sample_count)]
         else:
             samples = [int(cron_schedule.next().timestamp()) for _ in range(sample_count)]
     except zoneinfo.ZoneInfoNotFoundError:

testgen/common/date_service.py

@@ -97,12 +97,19 @@ def accommodate_dataframe_to_timezone(df, streamlit_session, time_columns=None):
             df[time_column] = df[time_column].dt.strftime("%Y-%m-%d %H:%M:%S")
 
 
+def format_friendly_datetime(dt: datetime, fmt: str) -> str:
+    """Cross-platform strftime: replaces Linux-only %-d and %-I before calling strftime."""
+    return dt.strftime(fmt.replace("%-d", str(dt.day)).replace("%-I", str(dt.hour % 12 or 12)))
+
+
 def get_timezoned_timestamp(streamlit_session, value, dateformat="%b %-d, %-I:%M %p"):
     ret = None
     if value and "browser_timezone" in streamlit_session:
         data = {"value": [value]}
         df = pd.DataFrame(data)
         timezone = streamlit_session["browser_timezone"]
-        df["value"] = df["value"].dt.tz_localize("UTC").dt.tz_convert(timezone).dt.strftime(dateformat)
+        df["value"] = df["value"].dt.tz_localize("UTC").dt.tz_convert(timezone).apply(
+            lambda dt: format_friendly_datetime(dt, dateformat) if pd.notna(dt) else ""
+        )
         ret = df.iloc[0, 0]
     return ret

testgen/common/notifications/notifications.py

@@ -1,6 +1,7 @@
 import math
 from datetime import datetime
 
+from testgen.common import date_service
 from testgen.common.notifications.base import BaseEmailTemplate
 from testgen.utils import friendly_score
 
@@ -14,7 +15,7 @@ def format_number_helper(self, number: int) -> str:
         return "" if number is None else f"{number:,}"
 
     def format_dt_helper(self, dt: datetime) -> str:
-        return "" if dt is None else dt.strftime("%b %d, %-I:%M %p UTC")
+        return "" if dt is None else date_service.format_friendly_datetime(dt, "%b %d, %-I:%M %p UTC")
 
     def format_duration_helper(self, start_time: datetime, end_time: datetime) -> str:
         total_seconds = abs(end_time - start_time).total_seconds()

testgen/ui/views/data_catalog.py

@@ -11,6 +11,7 @@
 from sqlalchemy.sql.expression import func as sa_func
 from streamlit.delta_generator import DeltaGenerator
 
+from testgen.common import date_service
 from testgen.common.data_catalog_service import (
     apply_column_metadata,
     apply_table_metadata,
@@ -492,7 +493,7 @@ def get_excel_report_data(update_progress: PROGRESS_UPDATE_TYPE, table_group: Ta
 
     for key in ["min_date", "max_date", "add_date", "last_mod_date", "drop_date"]:
         data[key] = data[key].apply(
-            lambda val: val.strftime("%b %-d %Y, %-I:%M %p") if not pd.isna(val) and not isinstance(val, str) else val
+            lambda val: date_service.format_friendly_datetime(val, "%b %-d %Y, %-I:%M %p") if not pd.isna(val) and not isinstance(val, str) else val
         )
 
     for key in ["data_source", "source_system", "source_process", "business_domain", "stakeholder_group", "transform_level", "aggregation_level", "data_product"]:

testgen/ui/views/dialogs/manage_schedules.py

@@ -6,6 +6,7 @@
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 
+from testgen.common import date_service
 from testgen.common.models import Session, with_database_session
 from testgen.common.models.scheduler import JobSchedule
 from testgen.ui.session import session
@@ -55,7 +56,7 @@ def build_data(self) -> dict:
                     "readableExpr": cron_descriptor.get_description(job.cron_expr),
                     "cronTz": job.cron_tz_str,
                     "sample": [
-                        sample.strftime("%a %b %-d, %-I:%M %p")
+                        date_service.format_friendly_datetime(sample, "%a %b %-d, %-I:%M %p")
                         for sample in job.get_sample_triggering_timestamps(CRON_SAMPLE_COUNT + 1)
                     ],
                     "active": job.active,

testgen/ui/views/test_definitions.py

@@ -768,7 +768,7 @@ def get_excel_report_data(
 
     for key in ["profiling_as_of_date", "last_manual_update"]:
         data[key] = data[key].apply(
-            lambda val: datetime.strptime(val, "%Y-%m-%d %H:%M:%S").strftime("%b %-d %Y, %-I:%M %p")
+            lambda val: date_service.format_friendly_datetime(datetime.strptime(val, "%Y-%m-%d %H:%M:%S"), "%b %-d %Y, %-I:%M %p")
             if (val and not pd.isna(val) and val != "NaT")
             else None
         )