Merge branch 'main' into fix/api-v3-validate-advisory-purl

Author: shubhamrai9122-creator

requirements-dev.txt

@@ -154,6 +154,7 @@ typecode==30.2.0
 typecode-libmagic==5.39.210531
 typing_extensions==4.13.0
 tzlocal==5.3.1
+tzdata==2026.5
 univers==32.0.1
 uritemplate==4.2.0
 urllib3==2.6.3

requirements.txt

@@ -81,6 +81,7 @@ typecode==30.2.0
 typecode-libmagic==5.39.210531
 typing_extensions==4.13.0
 tzlocal==5.3.1
+tzdata==2026.5
 univers==32.0.1
 uritemplate==4.2.0
 urllib3==2.6.3

setup.cfg

@@ -66,6 +66,7 @@ install_requires =
     django-environ==0.11.2
     gunicorn==23.0.0
     django-altcha==0.2.0
+    tzdata==2026.5
 
     # for the API doc
     drf-spectacular[sidecar]==0.24.2

vulnerabilities/middleware/timezone.py

@@ -17,14 +17,18 @@ def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
-        try:
-            # Activate local timezone for user using cookies
-            tzname = request.COOKIES.get("user_timezone")
-            if tzname:
+        tzname = request.COOKIES.get("user_timezone")
+        if tzname:
+            try:
                 timezone.activate(zoneinfo.ZoneInfo(tzname))
-            else:
+            except Exception as e:
                 timezone.deactivate()
-        except Exception as e:
+        else:
+            timezone.deactivate()
+
+        try:
+            response = self.get_response(request)
+        finally:
             timezone.deactivate()
 
-        return self.get_response(request)
+        return response

vulnerabilities/pipelines/management/cleanup_pipeline_runs.py

@@ -44,20 +44,25 @@ def cleanup_old_pipeline_runs(self):
         )
         for pipeline in progress.iter(pipelines):
             cutoff = timezone.now() - timedelta(days=retention_days)
-            runs = pipeline.pipelineruns.filter(run_exitcode__isnull=False).order_by(
-                "-created_date"
+            keep_ids = list(
+                pipeline.pipelineruns.filter(run_exitcode__isnull=False)
+                .order_by("-created_date")[:minimum_number_of_runs_to_keep]
+                .values_list("run_id", flat=True)
             )
-            runs_to_keep = runs[:minimum_number_of_runs_to_keep]
-            runs_to_delete = runs.filter(created_date__lt=cutoff).exclude(
-                run_id__in=runs_to_keep.values("run_id")
+            runs_to_delete = pipeline.pipelineruns.filter(created_date__lt=cutoff).exclude(
+                run_id__in=keep_ids
             )
 
             if runs_to_delete.exists():
                 pipeline_count += 1
 
-            for run in runs_to_delete.iterator():
-                run.delete()
-                deleted_run_count += 1
+            while runs_to_delete.exists():
+                chunk_ids = list(runs_to_delete[:5000].values_list("run_id", flat=True))
+                if not chunk_ids:
+                    break
+
+                count, _ = pipeline.pipelineruns.filter(run_id__in=chunk_ids).delete()
+                deleted_run_count += count
 
         self.log(
             f"Successfully removed {deleted_run_count:,d} runs from {pipeline_count} pipelines that were older than {retention_days} days."

vulnerabilities/templates/pipeline_dashboard.html

@@ -161,7 +161,7 @@ <h1>Pipeline Dashboard</h1>
                                     </div>
                                     <div class="column has-text-grey" style="flex: 0 0 18%;">
                                         {% if schedule.latest_run_end_date %}
-                                            {{ schedule.latest_run_end_date|date:"Y-m-d h:i a T" }}
+                                            {{ schedule.latest_run_end_date|date:"Y-m-d h:i A T" }}
                                         {% else %}
                                             N/A
                                         {% endif %}

vulnerabilities/templates/pipeline_run_details.html

@@ -79,7 +79,7 @@ <h1 class="title">{{ pipeline_name }} Run Log</h1>
                         <p class="is-size-7 has-text-weight-semibold">Start</p>
                         <p class="has-text-grey is-size-7">
                             {% if run.run_start_date %}
-                            {{ run.run_start_date|date:"Y-m-d h:i a T" }}
+                            {{ run.run_start_date|date:"Y-m-d h:i A T" }}
                             {% else %}
                             N/A
                             {% endif %}
@@ -89,15 +89,15 @@ <h1 class="title">{{ pipeline_name }} Run Log</h1>
                         <p class="is-size-7 has-text-weight-semibold">End</p>
                         <p class="has-text-grey is-size-7">
                             {% if run.run_end_date %}
-                            {{ run.run_end_date|date:"Y-m-d h:i a T" }}
+                            {{ run.run_end_date|date:"Y-m-d h:i A T" }}
                             {% else %}
                             N/A
                             {% endif %}
                         </p>
                     </div>
                     <div class="column is-one-fifth-desktop is-one-quarter-tablet is-half-mobile">
                         <p class="is-size-7 has-text-weight-semibold">Created</p>
-                        <p class="has-text-grey is-size-7">{{ run.created_date|date:"Y-m-d h:i a T" }}</p>
+                        <p class="has-text-grey is-size-7">{{ run.created_date|date:"Y-m-d h:i A T" }}</p>
                     </div>
                     <div class="column is-one-fifth-desktop is-one-quarter-tablet is-half-mobile">
                         <p class="is-size-7 has-text-weight-semibold">Version</p>

vulnerabilities/templates/pipeline_run_list.html

@@ -95,14 +95,14 @@ <h1>{{ pipeline_name }} Runs</h1>
                   </div>
                   <div class="column is-one-fifth has-text-grey">
                     {% if run.run_start_date %}
-                      {{ run.run_start_date|date:"Y-m-d h:i a T" }}
+                      {{ run.run_start_date|date:"Y-m-d h:i A T" }}
                     {% else %}
                       N/A
                     {% endif %}
                   </div>
                   <div class="column is-one-fifth has-text-grey">
                     {% if run.run_end_date %}
-                      {{ run.run_end_date|date:"Y-m-d h:i a T" }}
+                      {{ run.run_end_date|date:"Y-m-d h:i A T" }}
                     {% else %}
                       N/A
                     {% endif %}