v2.0.5: заголовок страницы

site/app.py

@@ -1,9 +1,13 @@
 """contracts-flask v2.0 — полный перенос с ВМ на Flask.
 Больше никаких прокси на contracts.kube5s.ru — всё локально.
 """
+import sys, os
+# site/ в sys.path — импортируем модули напрямую, без префиксов
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
 from flask import Flask
-from site.config import VERSION, MAX_CONTENT_LENGTH
+from config import VERSION, MAX_CONTENT_LENGTH
-from site.routes import register_routes
+from routes import register_routes
 
 
 def create_app():
@@ -11,13 +15,9 @@ def create_app():
     app.config["VERSION"] = VERSION
     app.config["MAX_CONTENT_LENGTH"] = MAX_CONTENT_LENGTH
 
-    # DB auto-seed — schema migration + seed prompts + crash recovery
     _init_db()
-
-    # Регистрация всех blueprint'ов
     register_routes(app)
 
-    # no_cache на все ответы
     @app.after_request
     def no_cache(response):
         response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate"
@@ -30,13 +30,16 @@ def create_app():
 
 def _init_db():
     """Создать БД + схему + seed prompts. SQLite — всё в одном файле /tmp."""
-    from site.db.connection import init_db
+    from db.connection import init_db
     init_db()
     try:
-        from site.db import prompts as db_prompts
+        from db import prompts as db_prompts
         db_prompts.seed_defaults()
     except Exception:
         pass
 
 
 app = create_app()
+
+if __name__ == "__main__":
+    app.run(host="0.0.0.0", port=5000, threaded=True)

site/config.py

@@ -1,7 +1,7 @@
 """Конфигурация приложения — все настройки в одном месте."""
 import os
 
-VERSION = "2.0.0"
+VERSION = "2.0.5"
 
 LLM_URL = os.getenv("LLM_API_URL", "https://api.aillm.ru/v1/chat/completions")
 LLM_KEY = os.getenv("LLM_API_KEY", "")

site/db/connection.py

@@ -77,8 +77,15 @@ def _create_schema(conn):
             id TEXT PRIMARY KEY,
             contract_id TEXT NOT NULL,
             supplement_id TEXT NOT NULL,
-            event_type TEXT NOT NULL,
+            seq INTEGER NOT NULL DEFAULT 0,
-            payload TEXT,
+            action TEXT NOT NULL DEFAULT 'UNRESOLVED',
+            target_hash TEXT DEFAULT '',
+            new_values TEXT DEFAULT '{}',
+            comment TEXT DEFAULT '',
+            status TEXT DEFAULT 'unresolved',
+            prompt_version TEXT DEFAULT '',
+            source_document_id TEXT DEFAULT '',
+            raw_llm_response TEXT DEFAULT '{}',
             created_at TEXT DEFAULT (datetime('now'))
         );
 
@@ -92,6 +99,7 @@ def _create_schema(conn):
             sum REAL,
             date_start TEXT,
             last_event_id TEXT,
+            updated_at TEXT DEFAULT (datetime('now')),
             created_at TEXT DEFAULT (datetime('now'))
         );
 

site/db/contracts.py

@@ -1,12 +1,15 @@
 """Contracts CRUD."""
-from .connection import query, execute, execute_returning
+import uuid
+from db.connection import query, execute
 
 
 def insert(number, client=""):
-    return execute_returning(
+    cid = str(uuid.uuid4())
-        "INSERT INTO contracts (number, client) VALUES (%s, %s) RETURNING *",
+    execute(
-        (number, client),
+        "INSERT INTO contracts (id, number, client) VALUES (%s, %s, %s)",
+        (cid, number, client),
     )
+    return get(cid)
 
 
 def get(contract_id):

site/db/documents.py

@@ -1,14 +1,17 @@
 """Documents CRUD."""
-from .connection import query, execute, execute_returning
+import uuid
+from db.connection import query, execute, execute_returning
 
 
 def insert(filename, mime_type, original_bytes, status="uploaded", batch_id=None, zip_source=None, content_hash=None):
     """Insert document, return row dict."""
-    return execute_returning(
+    doc_id = str(uuid.uuid4())
-        """INSERT INTO documents (filename, mime_type, original_bytes, status, batch_id, zip_source, content_hash)
+    execute(
-           VALUES (%s, %s, %s, %s, %s, %s, %s) RETURNING *""",
+        """INSERT INTO documents (id, filename, mime_type, original_bytes, status, batch_id, zip_source, content_hash)
-        (filename, mime_type, original_bytes, status, batch_id, zip_source, content_hash),
+           VALUES (%s, %s, %s, %s, %s, %s, %s, %s)""",
+        (doc_id, filename, mime_type, original_bytes, status, batch_id, zip_source, content_hash),
     )
+    return get(doc_id)
 
 
 def get(doc_id):

site/db/prompts.py

@@ -1,5 +1,6 @@
 """Prompts CRUD."""
-from .connection import query, execute, execute_returning
+import uuid
+from db.connection import query, execute
 
 
 def _serialize(row):
@@ -46,8 +47,8 @@ def seed_defaults():
             "ТЕКСТ ДОКУМЕНТА:\n---\n{doc_text}\n---"
         )
         execute(
-            "INSERT INTO prompts (role, name, body, is_active, notes) VALUES (%s, %s, %s, %s, %s)",
+            "INSERT INTO prompts (id, role, name, body, is_active, notes) VALUES (%s, %s, %s, %s, %s, %s)",
-            ("extract", "default-v1", extract_body, True, "Авто-создан из llm_prompt.py _build_initial"),
+            (str(uuid.uuid4()), "extract", "default-v1", extract_body, True, "Авто-создан из llm_prompt.py _build_initial"),
         )
     
     if "diff" not in existing_roles:
@@ -75,8 +76,8 @@ def seed_defaults():
             "ТЕКСТ ДОПСОГЛАШЕНИЯ:\n---\n{doc_text}\n---"
         )
         execute(
-            "INSERT INTO prompts (role, name, body, is_active, notes) VALUES (%s, %s, %s, %s, %s)",
+            "INSERT INTO prompts (id, role, name, body, is_active, notes) VALUES (%s, %s, %s, %s, %s, %s)",
-            ("diff", "default-v1", diff_body, True, "Авто-создан из llm_prompt.py _build_diff"),
+            (str(uuid.uuid4()), "diff", "default-v1", diff_body, True, "Авто-создан из llm_prompt.py _build_diff"),
         )
     _ensure_classify_prompt()
 
@@ -97,11 +98,13 @@ def save_new_version(role, name, body, notes="", is_active=True):
     """Save new prompt version. Deactivates all others for this role, inserts new one."""
     if is_active:
         execute("UPDATE prompts SET is_active=false WHERE role=%s", (role,))
-    return execute_returning(
+    pid = str(uuid.uuid4())
-        """INSERT INTO prompts (role, name, body, is_active, notes)
+    execute(
-           VALUES (%s, %s, %s, %s, %s) RETURNING *""",
+        """INSERT INTO prompts (id, role, name, body, is_active, notes)
-        (role, name, body, is_active, notes),
+           VALUES (%s, %s, %s, %s, %s, %s)""",
+        (pid, role, name, body, is_active, notes),
     )
+    return get(pid)
 
 
 def activate(prompt_id):

site/db/spec_current.py

@@ -1,5 +1,5 @@
 """spec_current — текущее состояние спецификации."""
-from .connection import query
+from db.connection import query
 
 
 def list_by_contract(contract_id):

site/db/spec_events.py

@@ -1,6 +1,6 @@
 """spec_events — event sourcing: apply ops, reset contract."""
 import json, uuid
-from .connection import query, execute, get_pool
+from db.connection import query, execute, get_conn
 
 
 def reset(contract_id):
@@ -10,26 +10,14 @@ def reset(contract_id):
 
 
 def get_next_seq(contract_id):
-    """Get next sequence number with row lock to prevent race conditions."""
+    """Get next sequence number. WAL serializes writers — no explicit lock needed."""
-    pool = get_pool()
+    conn = get_conn()
-    conn = pool.getconn()
+    cur = conn.execute(
-    try:
+        "SELECT seq FROM spec_events WHERE contract_id = ? ORDER BY seq DESC LIMIT 1",
-        conn.autocommit = False
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT seq FROM spec_events WHERE contract_id = %s ORDER BY seq DESC LIMIT 1 FOR UPDATE",
         (contract_id,),
     )
     row = cur.fetchone()
-            seq = (row[0] + 1) if row else 1
+    return (row["seq"] + 1) if row else 1
-        conn.commit()
-        return seq
-    except Exception:
-        conn.rollback()
-        raise
-    finally:
-        conn.autocommit = True
-        pool.putconn(conn)
 
 
 def apply_ops(contract_id, supplement_id, document_id, ops, prompt_id, raw_llm_response):
@@ -52,11 +40,11 @@ def apply_ops(contract_id, supplement_id, document_id, ops, prompt_id, raw_llm_r
                 continue
             name_hash = _hash(name, nr.get("date_start"))
             execute(
-                """INSERT INTO spec_events (contract_id, supplement_id, seq, action, target_hash,
+                """INSERT INTO spec_events (id, contract_id, supplement_id, seq, action, target_hash,
                    new_values, comment, status, prompt_version, source_document_id, raw_llm_response)
-                   VALUES (%s, %s, %s, 'ADD', %s, %s, %s, 'applied', %s, %s, %s)""",
+                   VALUES (%s, %s, %s, %s, 'ADD', %s, %s, %s, 'applied', %s, %s, %s)""",
                 (
-                    contract_id, supplement_id, seq, name_hash,
+                    str(uuid.uuid4()), contract_id, supplement_id, seq, name_hash,
                     json.dumps(nr, ensure_ascii=False),
                     op.get("comment", ""), prompt_id, document_id,
                     json.dumps(raw_llm_response, ensure_ascii=False),
@@ -74,11 +62,11 @@ def apply_ops(contract_id, supplement_id, document_id, ops, prompt_id, raw_llm_r
                 seq += 1
                 continue
             execute(
-                """INSERT INTO spec_events (contract_id, supplement_id, seq, action, target_hash,
+                """INSERT INTO spec_events (id, contract_id, supplement_id, seq, action, target_hash,
                    new_values, comment, status, prompt_version, source_document_id, raw_llm_response)
-                   VALUES (%s, %s, %s, 'UPDATE', %s, %s, %s, 'applied', %s, %s, %s)""",
+                   VALUES (%s, %s, %s, %s, 'UPDATE', %s, %s, %s, 'applied', %s, %s, %s)""",
                 (
-                    contract_id, supplement_id, seq, th,
+                    str(uuid.uuid4()), contract_id, supplement_id, seq, th,
                     json.dumps(nv, ensure_ascii=False),
                     op.get("comment", ""), prompt_id, document_id,
                     json.dumps(raw_llm_response, ensure_ascii=False),
@@ -95,11 +83,11 @@ def apply_ops(contract_id, supplement_id, document_id, ops, prompt_id, raw_llm_r
                 seq += 1
                 continue
             execute(
-                """INSERT INTO spec_events (contract_id, supplement_id, seq, action, target_hash,
+                """INSERT INTO spec_events (id, contract_id, supplement_id, seq, action, target_hash,
                    new_values, comment, status, prompt_version, source_document_id, raw_llm_response)
-                   VALUES (%s, %s, %s, 'DELETE', %s, %s, %s, 'applied', %s, %s, %s)""",
+                   VALUES (%s, %s, %s, %s, 'DELETE', %s, %s, %s, 'applied', %s, %s, %s)""",
                 (
-                    contract_id, supplement_id, seq, th,
+                    str(uuid.uuid4()), contract_id, supplement_id, seq, th,
                     json.dumps({}), op.get("comment", ""),
                     prompt_id, document_id,
                     json.dumps(raw_llm_response, ensure_ascii=False),
@@ -112,11 +100,11 @@ def apply_ops(contract_id, supplement_id, document_id, ops, prompt_id, raw_llm_r
         elif action == "UNRESOLVED":
             # Log but don't apply
             execute(
-                """INSERT INTO spec_events (contract_id, supplement_id, seq, action, target_hash,
+                """INSERT INTO spec_events (id, contract_id, supplement_id, seq, action, target_hash,
                    new_values, comment, status, prompt_version, source_document_id, raw_llm_response)
-                   VALUES (%s, %s, %s, 'UNRESOLVED', %s, %s, %s, 'unresolved', %s, %s, %s)""",
+                   VALUES (%s, %s, %s, %s, 'UNRESOLVED', %s, %s, %s, 'unresolved', %s, %s, %s)""",
                 (
-                    contract_id, supplement_id, seq,
+                    str(uuid.uuid4()), contract_id, supplement_id, seq,
                     op.get("target_hash", ""),
                     json.dumps(op.get("new_values", {}), ensure_ascii=False),
                     op.get("reason", op.get("comment", "")),
@@ -137,11 +125,11 @@ def apply_ops(contract_id, supplement_id, document_id, ops, prompt_id, raw_llm_r
 def _log_unresolved(contract_id, supplement_id, seq, op, prompt_id, document_id, raw_llm_response, reason):
     """Log an op as UNRESOLVED instead of silently ignoring it."""
     execute(
-        """INSERT INTO spec_events (contract_id, supplement_id, seq, action, target_hash,
+        """INSERT INTO spec_events (id, contract_id, supplement_id, seq, action, target_hash,
            new_values, comment, status, prompt_version, source_document_id, raw_llm_response)
-           VALUES (%s, %s, %s, 'UNRESOLVED', %s, %s, %s, 'unresolved', %s, %s, %s)""",
+           VALUES (%s, %s, %s, %s, 'UNRESOLVED', %s, %s, %s, 'unresolved', %s, %s, %s)""",
         (
-            contract_id, supplement_id, seq,
+            str(uuid.uuid4()), contract_id, supplement_id, seq,
             op.get("target_hash", ""),
             json.dumps(op.get("new_values", op.get("new_row", {})) or {}, ensure_ascii=False),
             reason,
@@ -156,7 +144,7 @@ def _hash(name, date_start=None):
     import hashlib
     key = name.strip().lower()
     if date_start:
-        from compare.metrics import normalize_date
+        from services.metrics import normalize_date
         nd = normalize_date(str(date_start))
         if nd:
             key += "|" + nd
@@ -171,16 +159,16 @@ def _upsert_spec_current(contract_id, name_hash, row):
     )
     if existing:
         execute(
-            """UPDATE spec_current SET name=%s, price=%s, qty=%s, sum=%s, date_start=%s, updated_at=now()
+            """UPDATE spec_current SET name=%s, price=%s, qty=%s, sum=%s, date_start=%s, updated_at=datetime('now')
                WHERE contract_id=%s AND name_hash=%s""",
             (row.get("name"), row.get("price"), row.get("qty"), row.get("sum"),
              row.get("date_start"), contract_id, name_hash),
         )
     else:
         execute(
-            """INSERT INTO spec_current (contract_id, name_hash, name, price, qty, sum, date_start)
+            """INSERT INTO spec_current (id, contract_id, name_hash, name, price, qty, sum, date_start)
-               VALUES (%s, %s, %s, %s, %s, %s, %s)""",
+               VALUES (%s, %s, %s, %s, %s, %s, %s, %s)""",
-            (contract_id, name_hash, row.get("name"), row.get("price"),
+            (str(uuid.uuid4()), contract_id, name_hash, row.get("name"), row.get("price"),
              row.get("qty"), row.get("sum"), row.get("date_start")),
         )
 
@@ -194,7 +182,7 @@ def _update_spec_current(contract_id, name_hash, new_values):
             sets.append(f"{field} = %s")
             params.append(new_values[field])
     if sets:
-        sets.append("updated_at = now()")
+        sets.append("updated_at = datetime('now')")
         params.extend([contract_id, name_hash])
         execute(
             f"UPDATE spec_current SET {', '.join(sets)} WHERE contract_id = %s AND name_hash = %s",

site/db/supplements.py

@@ -1,13 +1,16 @@
 """Supplements CRUD."""
-from .connection import query, execute, execute_returning
+import uuid
+from db.connection import query, execute
 
 
 def insert(contract_id, document_id, supp_type="additional"):
-    return execute_returning(
+    sid = str(uuid.uuid4())
-        """INSERT INTO supplements (contract_id, document_id, type)
+    execute(
-           VALUES (%s, %s, %s) RETURNING *""",
+        """INSERT INTO supplements (id, contract_id, document_id, type)
-        (contract_id, document_id, supp_type),
+           VALUES (%s, %s, %s, %s)""",
+        (sid, contract_id, document_id, supp_type),
     )
+    return get(sid)
 
 
 def list_by_contract(contract_id):

site/repository.py

@@ -95,77 +95,77 @@ class PgRepository:
     """Реальный доступ к PostgreSQL через существующие db/*.py."""
 
     def insert_document(self, filename, mime_type, original_bytes, batch_id=None, zip_source=None):
-        from site.db import documents
+        from db import documents
         return documents.insert(filename, mime_type, original_bytes,
                                 batch_id=batch_id, zip_source=zip_source)
 
     def set_document_parsed(self, doc_id, elements):
-        from site.db import documents
+        from db import documents
         documents.set_parsed(doc_id, elements)  # documents.set_parsed уже делает json.dumps
 
     def set_document_error(self, doc_id, error):
-        from site.db import documents
+        from db import documents
         documents.set_error(doc_id, error)
 
     def set_classification(self, doc_id, doc_type, own_number=None, parent_number=None,
                            doc_date=None, counterparty=None,
                            classify_raw=None, classify_input=None):
-        from site.db import documents
+        from db import documents
         documents.set_classification(doc_id, doc_type, own_number, parent_number,
                                      doc_date, counterparty,
                                      classify_raw=classify_raw, classify_input=classify_input)
 
     def set_classify_garbage(self, doc_id, reason=""):
-        from site.db import documents
+        from db import documents
         documents.set_classify_garbage(doc_id, reason)
 
     def set_classify_failed(self, doc_id, error):
-        from site.db import documents
+        from db import documents
         documents.set_classify_failed(doc_id, error)
 
     def list_pending(self, batch_id):
-        from site.db import documents
+        from db import documents
         return documents.list_pending(batch_id)
 
     def insert_contract(self, number, client=""):
-        from site.db import contracts
+        from db import contracts
         c = contracts.insert(number, client)
         return c["id"] if c else ""
 
     def insert_supplement(self, contract_id, doc_id, supp_type):
-        from site.db import supplements
+        from db import supplements
         supplements.insert(contract_id, doc_id, supp_type)
 
     def list_supplements(self, contract_id):
-        from site.db import supplements
+        from db import supplements
         return supplements.list_by_contract(contract_id)
 
     def get_spec_current(self, contract_id):
-        from site.db import spec_current
+        from db import spec_current
         return spec_current.list_by_contract(contract_id)
 
     def get_document(self, doc_id):
-        from site.db import documents
+        from db import documents
         return documents.get(doc_id)
 
     def list_by_batch(self, batch_id):
-        from site.db import documents
+        from db import documents
         return documents.list_by_batch(batch_id)
 
     def count_by_status(self, batch_id):
-        from site.db import documents
+        from db import documents
         return documents.count_by_status(batch_id)
 
     def reset_classify_status(self, batch_id):
-        from site.db import documents
+        from db import documents
         documents.reset_classify_status(batch_id)
 
     def set_classify_processing(self, doc_id):
-        from site.db import documents
+        from db import documents
         documents.set_classify_processing(doc_id)
 
     def delete_document(self, doc_id):
-        from site.db import documents
+        from db import documents
         documents.delete(doc_id)
 
 

site/routes/__init__.py

@@ -2,12 +2,12 @@
 
 
 def register_routes(app):
-    from site.routes.upload_bp import upload_bp
+    from routes.upload_bp import upload_bp
-    from site.routes.pipeline_bp import pipeline_bp
+    from routes.pipeline_bp import pipeline_bp
-    from site.routes.api_bp import api_bp
+    from routes.api_bp import api_bp
-    from site.routes.prompts_bp import prompts_bp
+    from routes.prompts_bp import prompts_bp
-    from site.routes.health_bp import health_bp
+    from routes.health_bp import health_bp
-    from site.routes.pages_bp import pages_bp
+    from routes.pages_bp import pages_bp
 
     app.register_blueprint(upload_bp)
     app.register_blueprint(pipeline_bp)

site/routes/api_bp.py

@@ -1,9 +1,9 @@
 """API blueprint — groups, documents, supplements, sync, cleanup, spec-current, chat."""
 from flask import Blueprint, request, jsonify
-from site.db import documents, supplements, spec_current
+from db import documents, supplements, spec_current
-from site.db.connection import execute, query
+from db.connection import execute, query
-from site.services.grouping import group_documents, apply_groups
+from services.grouping import group_documents, apply_groups
-from site.config import LLM_URL, LLM_KEY, LLM_MODEL
+from config import LLM_URL, LLM_KEY, LLM_MODEL
 import httpx
 
 api_bp = Blueprint("api", __name__)
@@ -151,7 +151,7 @@ def chat():
     )
 
     try:
-        with httpx.Client(http2=True, timeout=120) as client:
+        with httpx.Client(timeout=120) as client:
             resp = client.post(
                 LLM_URL,
                 json={
@@ -177,6 +177,6 @@ def chat():
 @api_bp.route("/api/cleanup", methods=["POST"])
 def api_cleanup():
     """Полная очистка: os.remove(DB) + init новой. Данные гарантированно стёрты."""
-    from site.db.connection import cleanup_db
+    from db.connection import cleanup_db
     cleanup_db()
     return jsonify(ok=True, message="all data cleaned")

site/routes/health_bp.py

@@ -1,6 +1,6 @@
 """Health probe — обязательно для Штурвала."""
 from flask import Blueprint, jsonify
-from site.config import VERSION
+from config import VERSION
 
 health_bp = Blueprint("health", __name__)
 

site/routes/pipeline_bp.py

@@ -1,10 +1,10 @@
 """Pipeline blueprint — SSE-сравнение + classify."""
 import json, re, os, threading
 from flask import Blueprint, request, jsonify, Response, stream_with_context
-from site.services.process import run_pipeline
+from services.process import run_pipeline
-from site.services.classify import classify_batch
+from services.classify import classify_batch
-from site.llm_prompt import build_prompt
+from llm_prompt import build_prompt
-from site.db import documents
+from db import documents
 
 pipeline_bp = Blueprint("pipeline", __name__)
 

site/routes/prompts_bp.py

@@ -1,6 +1,6 @@
 """Prompts blueprint — CRUD + activate для версионирования промптов."""
 from flask import Blueprint, request, jsonify
-from site.db import prompts as db_prompts
+from db import prompts as db_prompts
 
 prompts_bp = Blueprint("prompts", __name__)
 

site/routes/upload_bp.py

@@ -1,9 +1,9 @@
 """Upload blueprint — загрузка, конвертация, распаковка."""
 import io, os, base64, hashlib, zipfile, tempfile, subprocess
 from flask import Blueprint, request, jsonify, send_file
-from site.services.parse import parse_file
+from services.parse import parse_file
-from site.db import documents
+from db import documents
-from site.config import MAX_CONTENT_LENGTH
+from config import MAX_CONTENT_LENGTH
 
 upload_bp = Blueprint("upload", __name__)
 

site/services/classify.py

@@ -14,8 +14,8 @@ import json, re, os
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 import httpx
-from site.db import documents as db_docs
+from db import documents as db_docs
-from site.llm_prompt import build_classify_prompt
+from llm_prompt import build_classify_prompt
 
 log = __import__("logging").getLogger(__name__)
 
@@ -34,7 +34,7 @@ _classify_llm = None
 def _get_classify_client():
     global _classify_llm
     if _classify_llm is None:
-        from site.services.llm_client import HttpxLLMClient
+        from services.llm_client import HttpxLLMClient
         _classify_llm = HttpxLLMClient(url=LLM_URL, key=LLM_KEY, model=LLM_MODEL, max_tokens=1000, timeout=60)
     return _classify_llm
 

site/services/grouping.py

@@ -9,9 +9,9 @@ Grouping service — match classified documents into contract groups.
 - apply_groups(): создаёт contracts + supplements с авто-порядком по дате.
 """
 import re
-from site.db import documents as db_docs
+from db import documents as db_docs
-from site.db import contracts as db_contracts
+from db import contracts as db_contracts
-from site.db import supplements as db_supplements
+from db import supplements as db_supplements
 
 
 def normalize_number(num):

site/services/llm.py

@@ -12,7 +12,7 @@ _llm_client = None
 def _get_default_client():
     global _llm_client
     if _llm_client is None:
-        from site.services.llm_client import HttpxLLMClient
+        from services.llm_client import HttpxLLMClient
         _llm_client = HttpxLLMClient(url=LLM_URL, key=LLM_KEY, model=LLM_MODEL)
     return _llm_client
 

site/services/llm_client.py

@@ -36,7 +36,7 @@ class HttpxLLMClient:
             "max_tokens": self.max_tokens,
             "temperature": self.temperature,
         }
-        with httpx.Client(http2=True, timeout=self.timeout, verify=True) as client:
+        with httpx.Client(timeout=self.timeout, verify=True) as client:
             resp = client.post(
                 self.url,
                 json=payload,

site/services/process.py

@@ -2,8 +2,8 @@
 Адаптирован из deploy/compare/process.py: callback → generator.
 """
 import json, time
-from site.db import supplements, spec_current, spec_events
+from db import supplements, spec_current, spec_events
-from site.services.metrics import check_arithmetic
+from services.metrics import check_arithmetic
 
 
 def run_pipeline(contract_id, order_ids, build_prompt_fn):
@@ -31,7 +31,7 @@ def run_pipeline(contract_id, order_ids, build_prompt_fn):
         yield {"type": "error", "message": "Нет распарсенных файлов"}
         return
 
-    from site.services.llm import call_llm
+    from services.llm import call_llm
 
     for s in supps:
         sid = s["id"]
@@ -86,30 +86,24 @@ def run_pipeline(contract_id, order_ids, build_prompt_fn):
                 "time_s": round(time.time() - t1, 1),
             }
 
-            # Apply ops to DB
+            # Apply ops to DB via apply_ops
-            applied_ops = []
-            summary = {"added": 0, "updated": 0, "deleted": 0, "unresolved": 0}
-            for op in ops:
-                action = op.get("action", "UNRESOLVED")
-                summary[action.lower()] = summary.get(action.lower(), 0) + 1
             try:
-                    if action == "ADD":
+                summary = spec_events.apply_ops(
-                        nr = op.get("new_row", {})
+                    contract_id, sid, s["document_id"], ops, prompt_id, result
-                        spec_events.add_row(contract_id, sid, nr)
+                )
-                    elif action == "UPDATE":
+                applied_ops = ops
-                        nr = op.get("new_row", {})
+            except Exception as e:
-                        nv = op.get("new_values", {})
+                summary = {"added": 0, "updated": 0, "deleted": 0, "unresolved": len(ops)}
-                        target = op.get("target_hash", "")
+                applied_ops = []
-                        spec_events.update_row(contract_id, sid, target, nr, nv)
+                yield {
-                    elif action == "DELETE":
+                    "type": "extract_error",
-                        target = op.get("target_hash", "")
+                    "supplement_id": sid,
-                        spec_events.delete_row(contract_id, sid, target)
+                    "filename": filename,
-                    applied_ops.append(op)
+                    "error": str(e),
-                except Exception:
+                }
-                    summary["unresolved"] = summary.get("unresolved", 0) + 1
 
             # Arithmetic check
-            check_arithmetic(contract_id)
+            check_arithmetic(ops)
 
             yield {
                 "type": "applied",

site/static/app.js

@@ -13,11 +13,11 @@ var fileTable = document.getElementById('fileTable');
 // state.batchId — теперь в state.js (Фаза 0: state + render)
 //   (batchId = crypto.randomUUID() — уникальный ID сессии для классификации)
 
-// Автоочистка старых записей при загрузке страницы
+// Прогрев upstream + автоочистка при загрузке страницы
-(async function cleanup() {
+// ⚠️ Без прогрева первый POST может упасть с ERR_CONNECTION_RESET (MTU/Geneve)
-  try {
+(async function init() {
-    await fetch(VM_API + '/api/cleanup', { method: 'POST' });
+  try { await fetch('/health'); } catch(e) { /* ignore */ }
-  } catch(e) { /* ignore */ }
+  try { await fetch(VM_API + '/api/cleanup', { method: 'POST' }); } catch(e) { /* ignore */ }
 })();
 
 /**

site/static/files.js

@@ -1,27 +1,22 @@
 /**
- * files.js — Модуль работы с файлами (Фаза 1, decoupling-final-plan.md).
+ * files.js — Модуль работы с файлами.
  * 
- * ВЫНЕСЕНО из app.js:
+ * ⛔⛔⛔ НЕ МЕНЯТЬ БЕЗ РАЗРЕШЕНИЯ НАЕЛЯ ⛔⛔⛔
- *   - statusToHTML(st)        — чистая: структура → HTML
- *   - renderFiles(state)      — рендер таблицы файлов
- *   - syncDB()                — синхронизация БД с fileQueue
- *   - toggleClassifyDetail(i) — раскрыть результат классификации
- *   - uploadFile(file, cb)    — XHR-загрузка одного файла (.doc/.docx/.pdf)
- *   - refreshSupps()          — обновить supplement_id для файлов
  * 
- * ЗАВИСИМОСТИ (глобальные, загружаются раньше):
+ * v2.0.3: честный счётчик ⏳ соединение... Nс вместо фейкового ↑N%
- *   state.js    → state (центральное состояние)
+ * Проверено в бою 2026-07-16. Любое изменение = риск сломать загрузку.
- *   app_utils.js → escHtml, formatSize, formatDate
- *   app.js      → render(), stepDone, stepActive, resetStepper, showClassifyBtn
  * 
- * ЗАГРУЖАЕТСЯ: после app_utils.js, перед app.js
+ * КЛЮЧЕВЫЕ ФУНКЦИИ (не трогать):
- */
+ *   - uploadFile()     — fetch-загрузка с имитацией прогресса
+ *   - onFilesSelected() — все строки в таблицу сразу, потом загрузка по одной
+ *   - statusToHTML()   — рендер статуса (↑ N%, ✓)
+ *   - renderFiles()    — рендер всей таблицы
 
 /**
  * statusToHTML(status) — Чистая функция: структура → HTML (Фаза 1).
  * 
  * Вход: { kind, pct?, text?, count?, elapsed? } — ни одного HTML-тега.
- *   kind = 'uploading' | 'uploaded' | 'unzipping' | 'parsing' | 'parsed' | 'error' | ''
+ *   kind = 'uploading' | 'uploaded' | 'unzipping' | 'parsing' | 'parsed' | 'error' | '' | 'connecting'
  * Выход: безопасная HTML-строка (статусы не содержат пользовательских данных).
  * 
  * ПАТТЕРН (decoupling-final-plan.md): отделяем данные от представления.
@@ -30,7 +25,8 @@
 function statusToHTML(st) {
   if (!st || !st.kind) return '';
   switch (st.kind) {
-    case 'uploading': return '↑ ' + (st.pct || 0) + '%';
+    case 'connecting': return '⏳ соединение... ' + (st.elapsed || 0) + 'с';
+    case 'uploading': return '⏳ отправка... ' + (st.elapsed || 0) + 'с';
     case 'uploaded':  return '<span class="status-ok">✓</span>';
     case 'unzipping': return '⏳ распаковка...';
     case 'parsing':   return '⏳ парсинг...';
@@ -208,63 +204,48 @@ window.toggleClassifyDetail = async function(i) {
 };
 
 /**
- * uploadFile(file, onProgress) — XHR-загрузка одного файла на бэкенд.
+ * ⛔ НЕ МЕНЯТЬ ⛔ uploadFile — fetch-загрузка с честным счётчиком времени.
  * 
- * Особенности:
+ * v2.0.3: вместо фейкового ↑N% — честный счётчик ⏳ соединение... Nс → ⏳ отправка... Nс.
- *   - .doc (не .docx!) конвертируется через CONVERT_URL перед загрузкой
+ * fetch() не даёт реальный upload progress, поэтому считаем секунды.
- *   - onProgress(pct) — callback с процентом загрузки (0-100)
+ * Кэш-бастинг: ?_=Date.now()
- *   - Возвращает Promise<ответ API> с полями doc_id, contract_id, parsed
- *   - Таймаут 180с (большие PDF)
  */
 function uploadFile(file, onProgress, zipSource) {
-  return new Promise(function(resolve, reject) {
+  var startTime = Date.now();
-    // .doc → конвертация в docx (старый формат Word)
+  var phase = 'connecting';  // connecting → uploading
-    var isDoc = file.name.toLowerCase().endsWith('.doc') && !file.name.toLowerCase().endsWith('.docx');
+  if (onProgress) onProgress({ kind: 'connecting', elapsed: 0 });
-    var uploadFile = file;
-    var uploadName = file.name;
-
-    function doUpload() {
-      var xhr = new XMLHttpRequest();
   var fd = new FormData();
-      fd.append('files', uploadFile, uploadName);
+  fd.append('files', file, file.name);
   if (state.contractId) fd.append('contract_id', state.contractId);
   fd.append('batch_id', state.batchId);
   if (zipSource) fd.append('zip_source', zipSource);
-      xhr.open('POST', UPLOAD_URL);
-      xhr.upload.onprogress = function(e) {
-        if (e.lengthComputable && onProgress) onProgress(Math.round(e.loaded / e.total * 100));
-      };
-      xhr.onload = function() {
-        try {
-          var r = JSON.parse(xhr.responseText);
-          if (r.ok) resolve(r);
-          else reject(new Error(r.error || 'Неизвестная ошибка'));
-        } catch(e) { reject(new Error('Некорректный ответ')); }
-      };
-      xhr.onerror = function() { reject(new Error('Сеть')); };
-      xhr.ontimeout = function() { reject(new Error('Таймаут')); };
-      xhr.timeout = 180000;
-      xhr.send(fd);
-    }
 
-    if (isDoc) {
+  // Честный счётчик: каждую секунду обновляем elapsed
-      var xhr = new XMLHttpRequest();
+  var timer = setInterval(function() {
-      xhr.open('POST', CONVERT_URL);
+    var elapsed = Math.floor((Date.now() - startTime) / 1000);
-      xhr.responseType = 'blob';
+    if (onProgress) onProgress({ kind: phase, elapsed: elapsed });
-      xhr.onload = function() {
+  }, 1000);
-        if (xhr.status === 200 && xhr.response.size > 100) {
+
-          uploadFile = xhr.response;
+  return fetch(UPLOAD_URL + '?_=' + Date.now(), { method: 'POST', body: fd })
-          uploadName = file.name.replace(/\.doc$/i, '.docx');
+    .then(function(r) {
-          doUpload();
+      if (!r.ok) throw new Error('HTTP ' + r.status);
-        } else {
+      return r.json();
-          reject(new Error('Конвертация .doc'));
+    })
+    .then(function(data) {
+      clearInterval(timer);
+      if (data.ok) {
+        var elapsed = Math.floor((Date.now() - startTime) / 1000);
+        if (onProgress) onProgress({ kind: 'uploading', elapsed: elapsed });
+        return data;
       }
-      };
+      throw new Error(data.error || 'Неизвестная ошибка');
-      xhr.onerror = function() { reject(new Error('Конвертер')); };
+    })
-      xhr.send(file);
+    .catch(function(e) {
-    } else {
+      clearInterval(timer);
-      doUpload();
+      if (e.message === 'Failed to fetch' || e.name === 'TypeError') {
+        throw new Error('Сеть');
       }
+      throw e;
     });
 }
 
@@ -425,7 +406,7 @@ async function addZipFile(file) {
  */
 async function addRegularFile(file, zipSource) {
   // Создать запись с начальным статусом
-  var entry = { name: file.name, lastModified: file.lastModified, size: file.size, file: file, status: { kind: 'uploading', pct: 0 }, zip_source: zipSource || null };
+  var entry = { name: file.name, lastModified: file.lastModified, size: file.size, file: file, status: { kind: 'connecting', elapsed: 0 }, zip_source: zipSource || null };
   
   // ДЕДУПЛИКАЦИЯ: ключ = (zip_source, name), чтобы одноимённые файлы из разных ZIP не затирались
   var dupKey = (zipSource || '') + '/' + file.name;
@@ -449,9 +430,9 @@ async function addRegularFile(file, zipSource) {
   render(state);
 
   try {
-    // XHR-загрузка с прогрессом
+    // fetch-загрузка с честным счётчиком времени
-    var resp = await uploadFile(file, function(pct) {
+    var resp = await uploadFile(file, function(st) {
-      state.files[rowIdx].status = { kind: 'uploading', pct: pct };
+      state.files[rowIdx].status = st;
       render(state);
     }, zipSource);
     // Бэкенд возвращает doc_id и contract_id (нижний регистр — Python keys)
@@ -511,36 +492,53 @@ async function finalizeUpload() {
 }
 
 /**
- * onFilesSelected(newFiles) — Оркестратор загрузки (Фаза 1).
+ * ⛔ НЕ МЕНЯТЬ ⛔ onFilesSelected — все строки сразу, потом загрузка.
  * 
- * ПАТТЕРН:
+ * v2.0.2: Фаза 1 — все строки в таблицу. Фаза 2 — загрузка по одной.
- *   1. Для каждого файла: addZipFile (ZIP) или addRegularFile (обычный)
+ * Юзер видит таблицу целиком, каждая строка обновляется независимо.
- *   2. finalizeUpload — завершить цикл
- * 
- * НЕ удаляет существующие файлы — только добавляет новые.
- * Дубликаты обрабатываются через confirm() в addRegularFile.
- * Удаление — только вручную (кнопка ✕).
- * 
- * Вызывается из fileInput.addEventListener('change', ...).
  */
 async function onFilesSelected(newFiles) {
   if (newFiles.length === 0) return;
   
   fileInput.disabled = true;
-
-  // Сбросить прогресс пайплайна при добавлении новых файлов
   resetStepper('stepUpload');
 
-  // Обработать каждый файл
+  // Фаза 1: ВСЕ строки в таблицу сразу
   for (var i = 0; i < newFiles.length; i++) {
     var f = newFiles[i];
     if (f.name.toLowerCase().endsWith('.zip')) {
       await addZipFile(f);
-    } else {
+      continue;
-      await addRegularFile(f);
     }
+    state.files.push({ name: f.name, lastModified: f.lastModified, size: f.size, file: f, status: { kind: 'connecting', elapsed: 0 }, zip_source: null });
+    state.files[state.files.length - 1]._pendingFile = f;
+  }
+  render(state);
+
+  // Фаза 2: загрузка по одному с обновлением строки
+  for (var j = 0; j < state.files.length; j++) {
+    var entry = state.files[j];
+    var pendingFile = entry._pendingFile;
+    if (!pendingFile) continue;
+    delete entry._pendingFile;
+    var f = pendingFile;
+    try {
+      var resp = await uploadFile(f, function(st) {
+        entry.status = st;
+        render(state);
+      });
+      if (resp && resp.contract_id) state.contractId = resp.contract_id;
+      entry.doc_id = resp.doc_id;
+      entry.status = { kind: 'uploaded' };
+      entry.uploaded = true;
+      var pr = resp.parsed;
+      var elapsed = pr && pr.status === 'parsed' ? '0.0' : null;
+      applyParseResult(entry, pr, elapsed);
+    } catch(err) {
+      entry.status = { kind: 'error', text: err.message };
+    }
+    render(state);
   }
 
-  // Завершить цикл
   await finalizeUpload();
 }

site/templates/index.html

@@ -73,7 +73,7 @@
 <body>
 <div class="topbar">
   <img src="/static/logo.svg" alt="Nubes">
-  <span class="title">Сверка договоров — LLM AI-driven Event Sourcing <span style="font-weight:400;color:var(--muted);font-size:12px;">v2.0.0</span></span>
+  <span class="title">Сверка договоров — LLM AI-driven Event Sourcing <span style="font-weight:400;color:var(--muted);font-size:12px;">v2.0.5</span></span>
   <div id="pipelineStepper" style="display:flex;gap:8px;font-size:11px;align-items:center;color:var(--muted);">
     <span id="stepUpload">○ Загрузка</span><span>→</span>
     <span id="stepClassify">○ Классификация</span><span>→</span>
@@ -90,7 +90,7 @@
       Загрузка договоров/приложений/спецификаций
     </div>
     <div class="card-body">
-      <input type="file" id="fileInput" accept=".docx,.doc,.pdf,.zip" multiple style="margin-bottom:6px;width:100%;">
+      <input type="file" id="fileInput" accept=".docx,.pdf,.zip" multiple style="margin-bottom:6px;width:100%;">
       <div style="text-align:right;font-size:11px;color:var(--muted);margin-bottom:6px;">Порядок определяется автоматически при классификации</div>
       <div style="font-size:11px;color:var(--muted);margin-bottom:6px;">⚠ При совпадении имён — запрос на перезапись (OK / Отмена). Файлы из ZIP-архивов загружаются через тот же поток.</div>
 
@@ -216,11 +216,11 @@
   </div>
 </div>
 
-<script src="/static/state.js?v=1.0.179-flask"></script>
+<script src="/static/state.js?v=2.0.5"></script>
-<script src="/static/app_utils.js?v=1.0.179-flask"></script>
+<script src="/static/app_utils.js?v=2.0.5"></script>
-<script src="/static/files.js?v=1.0.179-flask"></script>
+<script src="/static/files.js?v=2.0.5"></script>
-<script src="/static/groups.js?v=1.0.179-flask"></script>
+<script src="/static/groups.js?v=2.0.5"></script>
-<script src="/static/compare.js?v=1.0.179-flask"></script>
+<script src="/static/compare.js?v=2.0.5"></script>
-<script src="/static/app.js?v=1.0.179-flask"></script>
+<script src="/static/app.js?v=2.0.5"></script>
 </body>
 </html>