demo seed change 2

services/forecasting/app/api/internal_demo.py

@@ -16,7 +16,7 @@ from pathlib import Path
 import json
 
 sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent))
-from shared.utils.demo_dates import adjust_date_for_demo, BASE_REFERENCE_DATE
+from shared.utils.demo_dates import adjust_date_for_demo, resolve_time_marker
 
 from app.core.database import get_db
 from app.models.forecasts import Forecast, PredictionBatch
@@ -37,6 +37,60 @@ def verify_internal_api_key(x_internal_api_key: Optional[str] = Header(None)):
     return True
 
 
+def parse_date_field(date_value, session_time: datetime, field_name: str = "date") -> Optional[datetime]:
+    """
+    Parse date field, handling both ISO strings and BASE_TS markers.
+
+    Supports:
+    - BASE_TS markers: "BASE_TS + 1h30m", "BASE_TS - 2d"
+    - ISO 8601 strings: "2025-01-15T06:00:00Z"
+    - None values (returns None)
+
+    Returns timezone-aware datetime or None.
+    """
+    if not date_value:
+        return None
+
+    # Check if it's a BASE_TS marker
+    if isinstance(date_value, str) and date_value.startswith("BASE_TS"):
+        try:
+            return resolve_time_marker(date_value, session_time)
+        except ValueError as e:
+            logger.warning(
+                f"Invalid BASE_TS marker in {field_name}",
+                marker=date_value,
+                error=str(e)
+            )
+            return None
+
+    # Handle regular ISO date strings
+    try:
+        if isinstance(date_value, str):
+            original_date = datetime.fromisoformat(date_value.replace('Z', '+00:00'))
+        elif hasattr(date_value, 'isoformat'):
+            original_date = date_value
+        else:
+            logger.warning(f"Unsupported date format in {field_name}", date_value=date_value)
+            return None
+
+        return adjust_date_for_demo(original_date, session_time)
+    except (ValueError, AttributeError) as e:
+        logger.warning(
+            f"Invalid date format in {field_name}",
+            date_value=date_value,
+            error=str(e)
+        )
+        return None
+
+
+def align_to_week_start(target_date: datetime) -> datetime:
+    """Align forecast date to Monday (start of week)"""
+    if target_date:
+        days_since_monday = target_date.weekday()
+        return target_date - timedelta(days=days_since_monday)
+    return target_date
+
+
 @router.post("/internal/demo/clone")
 async def clone_demo_data(
     base_tenant_id: str,
@@ -181,8 +235,7 @@ async def clone_demo_data(
                         
                         adjusted_forecast_date = adjust_date_for_demo(
                             original_date,
-                            session_time,
-                            BASE_REFERENCE_DATE
+                            session_time
                         )
                         forecast_data[date_field] = adjusted_forecast_date
                     except (ValueError, AttributeError) as e:
@@ -263,8 +316,7 @@ async def clone_demo_data(
                         
                         adjusted_batch_date = adjust_date_for_demo(
                             original_date,
-                            session_time,
-                            BASE_REFERENCE_DATE
+                            session_time
                         )
                         batch_data[date_field] = adjusted_batch_date
                     except (ValueError, AttributeError) as e: