v1.0.171: ▶ Сравнить группу via SSE + classify timer/progress

deploy/app.js

@@ -197,7 +197,28 @@ function showClassifyBtn() {
 async function runClassify() {
   var btn = document.getElementById('classifyBtn');
   btn.disabled = true;
-  btn.innerHTML = '<span class="spinner"></span> Классификация...';
+  btn.innerHTML = '<span class="spinner"></span> Классификация... 0с';
+
+  var start = Date.now();
+  var timer = setInterval(function() {
+    btn.innerHTML = '<span class="spinner"></span> Классификация... ' + Math.round((Date.now() - start) / 1000) + 'с';
+  }, 1000);
+
+  // Poll progress каждые 2с
+  var pollTimer = setInterval(async function() {
+    try {
+      var r = await fetch(VM_API + '/api/batch-progress?batch=' + batchId);
+      var d = await r.json();
+      if (d.ok && d.counts) {
+        var done = (d.counts.classified || 0) + (d.counts.failed || 0);
+        var total = d.total || 0;
+        btn.innerHTML = '<span class="spinner"></span> Классификация... ' + done + '/' + total + ' (' + Math.round((Date.now() - start) / 1000) + 'с)';
+        if (done >= total && total > 0) {
+          clearInterval(pollTimer);
+        }
+      }
+    } catch(e) {}
+  }, 2000);
 
   try {
     var resp = await fetch(VM_API + '/api/classify-batch', {
@@ -206,14 +227,18 @@ async function runClassify() {
       body: JSON.stringify({batch_id: batchId})
     });
     var data = await resp.json();
+    clearInterval(timer);
+    clearInterval(pollTimer);
     if (data.ok) {
-      btn.innerHTML = '✓ ' + data.done + '/' + data.total + ' классифицировано';
+      btn.innerHTML = '✓ ' + data.done + '/' + data.total + ' классифицировано (' + Math.round((Date.now() - start) / 1000) + 'с)';
       loadGroups();
     } else {
       btn.innerHTML = '✗ ' + (data.error || 'ошибка');
       btn.disabled = false;
     }
   } catch(e) {
+    clearInterval(timer);
+    clearInterval(pollTimer);
     btn.innerHTML = '✗ ' + e.message;
     btn.disabled = false;
   }
@@ -283,27 +308,49 @@ window.runCompareForGroup = async function(gi) {
 
   var btn = event.target;
   btn.disabled = true;
-  btn.innerHTML = '<span class="spinner"></span> Применяю группу...';
+  btn.innerHTML = '<span class="spinner"></span> Применяю...';
 
-  // 1. Apply groups (creates contracts + supplements)
   var ar = await fetch(VM_API + '/api/apply-groups', {
     method: 'POST',
     headers: {'Content-Type': 'application/json'},
     body: JSON.stringify({batch_id: batchId, groups: [group]})
   });
   var ad = await ar.json();
-  if (!ad.ok) { btn.innerHTML = '✗ ' + ad.error; btn.disabled = false; return; }
+  if (!ad.ok || !ad.contract_ids || !ad.contract_ids.length) {
+    btn.innerHTML = '✗ ошибка'; btn.disabled = false; return;
+  }
 
-  // 2. Get the created contract_id from supplements
-  var sr = await fetch(VM_API + '/api/supplements?contract_id=&batch=' + batchId);
-  // Actually need contract_id — let's get it from groups data
-  
+  var cid = ad.contract_ids[0];
   btn.innerHTML = '<span class="spinner"></span> Сравнение...';
   
-  // Use EventSource for process-v2 — but we need contract_id
-  // For now: use the old compare flow with contractId
-  btn.innerHTML = '✓ Готово — обновите страницу и нажмите «Общее сравнение»';
-  btn.disabled = false;
+  var diffCard = document.getElementById('diffCard');
+  var diffBody = document.getElementById('diffBody');
+  var diffStatus = document.getElementById('diffStatus');
+  diffCard.style.display = 'block';
+  diffBody.innerHTML = '';
+  diffStatus.textContent = '⏳ 0.0с';
+  
+  var start = Date.now();
+  var timer = setInterval(function() {
+    diffStatus.textContent = '⏳ ' + ((Date.now() - start) / 1000).toFixed(1) + 'с';
+  }, 200);
+  
+  var es = new EventSource(VM_API + '/process-v2?contract_id=' + cid);
+  es.onmessage = function(e) {
+    var d = JSON.parse(e.data);
+    if (d.type === 'done') {
+      clearInterval(timer); es.close();
+      diffStatus.textContent = '✓ ' + d.total_time_s + 'с';
+      btn.innerHTML = '✓ Готово'; btn.disabled = false;
+    } else if (d.type === 'applied') {
+      diffBody.innerHTML += '<div style="font-size:12px;margin-top:4px;">+' + (d.summary.added||0) + ' ~' + (d.summary.updated||0) + ' -' + (d.summary.deleted||0) + '</div>';
+    } else if (d.type === 'error') {
+      clearInterval(timer); es.close();
+      diffBody.innerHTML += '<div style="color:var(--destructive);">✗ ' + d.message + '</div>';
+      btn.innerHTML = '✗'; btn.disabled = false;
+    }
+  };
+  es.onerror = function() { clearInterval(timer); es.close(); btn.innerHTML = '✗ соединение'; btn.disabled = false; };
 };
 
 function uploadFile(file, onProgress) {

deploy/services/grouping.py

@@ -108,6 +108,7 @@ def apply_groups(batch_id, groups_data):
     Возвращает {ok, created: количество созданных supplements}.
     """
     created = 0
+    contract_ids = []
     for g in groups_data:
         contract_number = g.get("contract_number", "")
         if contract_number == "__unresolved__":
@@ -118,6 +119,7 @@ def apply_groups(batch_id, groups_data):
         # Create contract
         c = db_contracts.insert(contract_number, counterparty)
         contract_id = c["id"]
+        contract_ids.append(contract_id)
 
         # Create supplements in order
         for i, d in enumerate(docs):
@@ -126,4 +128,4 @@ def apply_groups(batch_id, groups_data):
             db_supplements.insert(contract_id, doc_id, supp_type)
             created += 1
 
-    return {"ok": True, "created": created}
+    return {"ok": True, "created": created, "contract_ids": contract_ids}