progress and cancel

Co-authored-by: Copilot <copilot@github.com>

app_new.py

@@ -1056,7 +1056,7 @@ def analyze():
             user_id=current_user.id,
             details=f"batch_id={batch_id}, files={len(dcm_paths)}",
         )
-        return redirect(url_for("batch_progress", batch_id=batch_id))
+        return redirect(url_for("batch_progress", batch_id=batch_id, total=len(dcm_paths)))
     except Exception:
         logger.error("Celery unavailable; running synchronous fallback", exc_info=True)
         flash("Celery worker unavailable. Running batch synchronously; this may take a while.", "warning")
@@ -1097,7 +1097,7 @@ def analyze_directory():
             user_id=current_user.id,
             details=f"batch_id={batch_id}, files={len(dcm_paths)}",
         )
-        return redirect(url_for("batch_progress", batch_id=batch_id))
+        return redirect(url_for("batch_progress", batch_id=batch_id, total=len(dcm_paths)))
     except Exception:
         logger.error("Celery unavailable; running synchronous directory scan", exc_info=True)
         flash("Celery worker unavailable. Running directory scan synchronously.", "warning")
@@ -1115,8 +1115,15 @@ def batch_progress(batch_id):
     batch = _get_batch_from_celery(batch_id)
     if not batch or batch.get("user_id") != current_user.id:
         abort(404)
-    
-    return render_template("batch_progress.html", batch=batch, batch_id=batch_id)
+    expected_total = request.args.get("total", type=int)
+    if expected_total and (batch.get("total") or 0) == 0:
+        batch["total"] = expected_total
+    return render_template(
+        "batch_progress.html",
+        batch=batch,
+        batch_id=batch_id,
+        expected_total=expected_total or 0,
+    )
 
 @app.route("/batch/<batch_id>/status")
 @login_required
@@ -1127,6 +1134,26 @@ def batch_status(batch_id):
         return jsonify({"error": "Not found"}), 404
     return jsonify(batch)
 
+@app.route("/batch/<batch_id>/cancel", methods=["POST"])
+@login_required
+def cancel_batch(batch_id):
+    """Cancel a running batch task."""
+    user_id = _extract_user_id_from_batch_id(batch_id)
+    if user_id != current_user.id:
+        abort(404)
+    try:
+        celery_app.control.revoke(batch_id, terminate=True, signal="SIGTERM")
+        log_audit(
+            "batch_canceled",
+            user_id=current_user.id,
+            details=f"batch_id={batch_id}",
+            status="success",
+        )
+        return jsonify({"status": "canceled"})
+    except Exception as exc:
+        logger.error("Failed to cancel batch %s: %s", batch_id, exc, exc_info=True)
+        return jsonify({"error": "Cancel failed"}), 500
+
 def _get_batch_from_celery(batch_id: str) -> dict[str, Any] | None:
     """Retrieve batch status from Celery task result backend."""
     # In a production system, we'd also validate user_id from the database
@@ -1155,6 +1182,22 @@ def _get_batch_from_celery(batch_id: str) -> dict[str, Any] | None:
             "error": None,
             "queue_size": queue_size,
         }
+    elif result.state == "REVOKED":
+        return {
+            "batch_id": batch_id,
+            "user_id": user_id,
+            "status": "canceled",
+            "total": 0,
+            "processed": 0,
+            "succeeded": 0,
+            "failed_ids": [],
+            "image_ids": [],
+            "current_file": "",
+            "started_at": None,
+            "finished_at": None,
+            "error": None,
+            "queue_size": queue_size,
+        }
     
     # Build response matching _BATCHES format for frontend compatibility
     if result.state == "PROGRESS":

auth_routes.py

@@ -92,6 +92,9 @@ def _validate_otp(submitted_code: str, expected_purpose: str) -> tuple[bool, str
         return False, "OTP purpose mismatch. Please request a new code.", None
 
     expires_raw = payload.get("expires_at")
+    if not expires_raw:
+        _clear_otp()
+        return False, "OTP is invalid. Please request a new code.", None
     try:
         expires_at = datetime.fromisoformat(expires_raw)
     except Exception:

static/css/pages.css

@@ -963,6 +963,11 @@
 .batch-header {
   margin-bottom: 20px;
 }
+.batch-header-actions {
+  margin-top: 14px;
+  display: flex;
+  justify-content: flex-end;
+}
 .batch-header h1 {
   font-size: 1.6rem;
   font-weight: 800;

static/js/batch.js

@@ -7,6 +7,8 @@
 
     var statusUrl = page.dataset.statusUrl;
     var pollMs = 1000;
+    var expectedTotal = parseInt(page.dataset.expectedTotal || '0', 10) || 0;
+    var cancelUrl = page.dataset.cancelUrl;
 
     var title = document.getElementById('batchTitle');
     var subtitle = document.getElementById('batchSubtitle');
@@ -24,21 +26,51 @@
     var doneSummary = document.getElementById('doneSummary');
     var failPanel = document.getElementById('failPanel');
     var failList = document.getElementById('failList');
+    var cancelBtn = document.getElementById('cancelBatch');
     var prevIds = [];
+    var canceled = false;
 
     if (!statusUrl || !title || !subtitle || !fill || !pctLabel || !currentFile || !statTotal || !statProc || !statOK || !statFail || !feedPanel || !feedList || !donePanel || !doneSummary || !failPanel || !failList) {
       return;
     }
 
+    if (cancelBtn && cancelUrl) {
+      cancelBtn.addEventListener('click', function () {
+        if (!confirm('Cancel this batch? Any in-progress file may not complete.')) {
+          return;
+        }
+        cancelBtn.disabled = true;
+        fetch(cancelUrl, { method: 'POST' })
+          .then(function (response) { return response.json(); })
+          .then(function (data) {
+            canceled = true;
+            title.textContent = 'Batch Canceled';
+            subtitle.textContent = 'The batch was canceled. You can start a new upload anytime.';
+            currentFile.textContent = '';
+            if (queueStatus) {
+              queueStatus.textContent = '';
+            }
+          })
+          .catch(function () {
+            cancelBtn.disabled = false;
+          });
+      });
+    }
+
     function poll() {
       fetch(statusUrl)
         .then(function (response) {
           return response.json();
         })
         .then(function (data) {
-          var pct = data.total > 0 ? Math.round(data.processed / data.total * 100) : 0;
+          if (canceled) {
+            return;
+          }
 
-          statTotal.textContent = data.total;
+          var total = data.total > 0 ? data.total : expectedTotal;
+          var pct = total > 0 ? Math.round(data.processed / total * 100) : 0;
+
+          statTotal.textContent = total;
           statProc.textContent = data.processed;
           statOK.textContent = data.succeeded;
           statFail.textContent = data.failed_ids ? data.failed_ids.length : 0;
@@ -53,6 +85,10 @@
             }
           }
 
+          if (data.status === 'pending' && expectedTotal > 0) {
+            subtitle.textContent = 'Queued - waiting for a worker. Total files: ' + expectedTotal + '.';
+          }
+
           fill.style.width = pct + '%';
           pctLabel.textContent = pct + '%';
           currentFile.textContent = data.current_file ? 'Processing: ' + data.current_file : '';
@@ -75,12 +111,18 @@
             });
           }
 
+          if (data.status === 'canceled') {
+            title.textContent = 'Batch Canceled';
+            subtitle.textContent = 'The batch was canceled.';
+            return;
+          }
+
           if (data.status === 'completed' || data.status === 'failed') {
             title.textContent = 'Batch Complete';
             subtitle.textContent = '';
             donePanel.style.display = 'block';
             var failCount = data.failed_ids ? data.failed_ids.length : 0;
-            doneSummary.textContent = data.succeeded + ' of ' + data.total + ' files processed successfully' + (failCount > 0 ? ', ' + failCount + ' failed' : '') + '.';
+            doneSummary.textContent = data.succeeded + ' of ' + total + ' files processed successfully' + (failCount > 0 ? ', ' + failCount + ' failed' : '') + '.';
 
             if (data.failed_ids && data.failed_ids.length) {
               failPanel.style.display = 'block';

templates/batch_progress.html

@@ -3,7 +3,13 @@
 {% block title %}Batch Processing — AI Medical Intelligence Pipeline{% endblock %}
 
 {% block content %}
-<div class="batch-page" data-batch-id="{{ batch_id }}" data-status-url="{{ url_for('batch_status', batch_id=batch_id) }}" data-reports-url="{{ url_for('reports') }}">
+{% set display_total = batch.total if batch.total else (expected_total or 0) %}
+<div class="batch-page"
+  data-batch-id="{{ batch_id }}"
+  data-status-url="{{ url_for('batch_status', batch_id=batch_id) }}"
+  data-cancel-url="{{ url_for('cancel_batch', batch_id=batch_id) }}"
+  data-reports-url="{{ url_for('reports') }}"
+  data-expected-total="{{ display_total }}">
 <section class="breadcrumb">
   <a href="{{ url_for('home') }}">Home</a>
   <span class="sep">/</span>
@@ -15,13 +21,16 @@
 <section class="batch-header">
   <h1 id="batchTitle">Processing Batch&hellip;</h1>
   <p class="muted" id="batchSubtitle">
-    Analyzing {{ batch.total }} DICOM file{{ 's' if batch.total != 1 }} — please keep this page open.
+    Analyzing {{ display_total }} DICOM file{{ 's' if display_total != 1 }} — please keep this page open.
   </p>
   <p class="muted" id="queueStatus">
     {% if batch.queue_size is not none %}
       Queue size: {{ batch.queue_size }}
     {% endif %}
   </p>
+  <div class="batch-header-actions">
+    <button type="button" class="btn btn-outline" id="cancelBatch">Cancel Batch</button>
+  </div>
 </section>
 
 <!-- ── Progress bar ────────────────────────────────────────────────── -->
@@ -29,7 +38,7 @@
   <div class="batch-stats-row">
     <div class="batch-stat">
       <span class="batch-stat-label">Total</span>
-      <span class="batch-stat-value" id="statTotal">{{ batch.total }}</span>
+      <span class="batch-stat-value" id="statTotal">{{ display_total }}</span>
     </div>
     <div class="batch-stat">
       <span class="batch-stat-label">Processed</span>