Merge remote-tracking branch 'origin/main'

Author: Ishankoradia

ddpui/api/report_api.py

@@ -77,9 +77,9 @@ def create_snapshot(request, payload: SnapshotCreate):
         s = ReportService.create_snapshot(
             title=payload.title,
             dashboard_id=payload.dashboard_id,
-            date_column=payload.date_column.model_dump(),
-            period_end=payload.period_end,
             orguser=orguser,
+            date_column=payload.date_column.model_dump() if payload.date_column else {},
+            period_end=payload.period_end,
             period_start=payload.period_start,
         )
         return api_response(

ddpui/core/reports/report_service.py

@@ -299,9 +299,9 @@ def get_report_chart_data(
     def create_snapshot(
         title: str,
         dashboard_id: int,
-        date_column: Dict[str, str],
-        period_end: date,
         orguser: OrgUser,
+        date_column: Optional[Dict[str, str]] = None,
+        period_end: Optional[date] = None,
         period_start: Optional[date] = None,
     ) -> ReportSnapshot:
         """Create a snapshot from a dashboard.
@@ -314,10 +314,11 @@ def create_snapshot(
         Args:
             title: User-provided title for the snapshot
             dashboard_id: ID of the dashboard to snapshot
-            date_column: Dictionary with {schema_name, table_name, column_name}
-                        identifying the datetime column for period filtering
-            period_end: End of reporting period (inclusive)
             orguser: The user creating the snapshot
+            date_column: Dictionary with {schema_name, table_name, column_name}
+                        identifying the datetime column for period filtering.
+                        None for dashboards without datetime columns.
+            period_end: End of reporting period (inclusive). None when no date filtering.
             period_start: Start of reporting period (inclusive). None means no lower bound.
 
         Returns:
@@ -328,7 +329,7 @@ def create_snapshot(
                                     dashboard doesn't exist, or date_column is
                                     not a valid datetime column in the warehouse
         """
-        if period_start is not None and period_start > period_end:
+        if period_start is not None and period_end is not None and period_start > period_end:
             raise SnapshotValidationError("period_start must be before period_end")
 
         # Fetch dashboard with filters prefetched (used only for freezing)
@@ -339,45 +340,45 @@ def create_snapshot(
         except Dashboard.DoesNotExist:
             raise SnapshotValidationError(f"Dashboard {dashboard_id} not found")
 
-        # Validate date_column: first check dashboard filters, then fall back
-        # to verifying the column exists in the warehouse as a datetime type
-        datetime_filters = dashboard.filters.filter(filter_type="datetime")
-        match_on_filter = datetime_filters.filter(
-            schema_name=date_column["schema_name"],
-            table_name=date_column["table_name"],
-            column_name=date_column["column_name"],
-        ).exists()
-
-        if not match_on_filter:
-            # Fallback: verify the column exists in the warehouse as datetime
-            org_warehouse = OrgWarehouse.objects.filter(org=orguser.org).first()
-            if not org_warehouse:
-                raise SnapshotValidationError("Warehouse not configured")
-
-            warehouse_client = WarehouseFactory.get_warehouse_client(org_warehouse)
-            all_columns = warehouse_client.get_table_columns(
-                date_column["schema_name"],
-                date_column["table_name"],
-            )
-
-            # Find the specific column
-            target_col = None
-            for col in all_columns:
-                if col["name"] == date_column["column_name"]:
-                    target_col = col
-                    break
-
-            if not target_col:
-                raise SnapshotValidationError(
-                    f"Column '{date_column['column_name']}' not found in "
-                    f"{date_column['schema_name']}.{date_column['table_name']}"
+        # Validate date_column if provided
+        if date_column:
+            datetime_filters = dashboard.filters.filter(filter_type="datetime")
+            match_on_filter = datetime_filters.filter(
+                schema_name=date_column["schema_name"],
+                table_name=date_column["table_name"],
+                column_name=date_column["column_name"],
+            ).exists()
+
+            if not match_on_filter:
+                # Fallback: verify the column exists in the warehouse as datetime
+                org_warehouse = OrgWarehouse.objects.filter(org=orguser.org).first()
+                if not org_warehouse:
+                    raise SnapshotValidationError("Warehouse not configured")
+
+                warehouse_client = WarehouseFactory.get_warehouse_client(org_warehouse)
+                all_columns = warehouse_client.get_table_columns(
+                    date_column["schema_name"],
+                    date_column["table_name"],
                 )
 
-            if target_col.get("translated_type") != TranslateColDataType.DATETIME:
-                raise SnapshotValidationError(
-                    f"Column '{date_column['column_name']}' is not a datetime column "
-                    f"(type: {target_col['data_type']})"
-                )
+                # Find the specific column
+                target_col = None
+                for col in all_columns:
+                    if col["name"] == date_column["column_name"]:
+                        target_col = col
+                        break
+
+                if not target_col:
+                    raise SnapshotValidationError(
+                        f"Column '{date_column['column_name']}' not found in "
+                        f"{date_column['schema_name']}.{date_column['table_name']}"
+                    )
+
+                if target_col.get("translated_type") != TranslateColDataType.DATETIME:
+                    raise SnapshotValidationError(
+                        f"Column '{date_column['column_name']}' is not a datetime column "
+                        f"(type: {target_col['data_type']})"
+                    )
 
         frozen_dashboard = FrozenDashboardConfig(
             **ReportService._freeze_dashboard(dashboard)

ddpui/migrations/0158_allow_null_period_end_on_snapshot.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2 on 2026-04-28 09:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ddpui", "0157_orgdbt_is_repo_managed_by_system"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="reportsnapshot",
+            name="period_end",
+            field=models.DateField(
+                blank=True,
+                help_text="End of reporting period (inclusive). NULL for snapshots without date filtering.",
+                null=True,
+            ),
+        ),
+    ]

ddpui/models/report.py

@@ -29,7 +29,11 @@ class ReportSnapshot(models.Model):
         blank=True,
         help_text="Start of reporting period (inclusive). NULL = no lower bound.",
     )
-    period_end = models.DateField(help_text="End of reporting period (inclusive)")
+    period_end = models.DateField(
+        null=True,
+        blank=True,
+        help_text="End of reporting period (inclusive). NULL for snapshots without date filtering.",
+    )
 
     # --- FROZEN DATA (2 layers) ---
 

ddpui/schemas/report_schema.py

@@ -53,9 +53,9 @@ class SnapshotCreate(Schema):
 
     title: str = Field(..., min_length=1, max_length=255)
     dashboard_id: int
-    date_column: DateColumnSchema
+    date_column: Optional[DateColumnSchema] = None
     period_start: Optional[date] = None  # None = no lower bound
-    period_end: date
+    period_end: Optional[date] = None
 
 
 class SnapshotUpdate(Schema):
@@ -75,7 +75,7 @@ class SnapshotResponse(Schema):
     dashboard_title: Optional[str] = None  # From frozen_dashboard, not a live FK
     date_column: Optional[Dict[str, str]] = None
     period_start: Optional[date] = None
-    period_end: date
+    period_end: Optional[date] = None
     summary: Optional[str] = None
     created_by: Optional[str] = None
     created_at: datetime