Nail/contracts-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upload: всегда одно соединение, убран if cid, v1.23

Browse Source
This commit is contained in:
naeel
2026-06-17 18:58:43 +04:00
parent 6585598fca
commit 05c41e8c4a
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/app.py
+21 -15
View File
@@ -152,25 +152,31 @@ class ContractsApp:
mime = mimeutil.guess_mime(filename) or "application/octet-stream" mime = mimeutil.guess_mime(filename) or "application/octet-stream"
cid = data.get("cid") cid = data.get("cid")
conn = None # Всегда одно соединение
if cid: conn, err = db.connect()
contract_id = cid if err:
else: return jsonify({"error": f"БД: {err}"}), 500
conn, err = db.connect() try:
if err:
return jsonify({"error": f"БД: {err}"}), 500
cur = conn.cursor() cur = conn.cursor()
cur.execute( if cid:
"INSERT INTO contracts (number, client) VALUES (%s, %s) RETURNING id", contract_id = cid
("б/н " + __import__("datetime").datetime.now().strftime("%Y%m%d-%H%M"), ""), else:
) cur.execute(
contract_id = cur.fetchone()[0] "INSERT INTO contracts (number, client) VALUES (%s, %s) RETURNING id",
conn.commit() ("б/н " + __import__("datetime").datetime.now().strftime("%Y%m%d-%H%M"), ""),
)
contract_id = cur.fetchone()[0]
doc_id = _save_file_to_db(filename, file_bytes, mime, str(contract_id), conn=conn) doc_id = _save_file_to_db(filename, file_bytes, mime, str(contract_id), conn=conn)
if conn: conn.commit()
cur.close() cur.close()
except Exception as e:
try: conn.rollback()
except: pass
raise e
finally:
db.put_conn(conn) db.put_conn(conn)
return jsonify({"contract_id": str(contract_id), "doc_id": str(doc_id) if doc_id else None}) return jsonify({"contract_id": str(contract_id), "doc_id": str(doc_id) if doc_id else None})
# ── Чанковая загрузка ────────────────────────────────────── # ── Чанковая загрузка ──────────────────────────────────────
site/templates/upload.html
+1 -1
View File
@@ -59,7 +59,7 @@
<body> <body>
<div class="topbar"> <div class="topbar">
<img src="{{ url_for('static', filename='nubes-logo.svg') }}" alt="Nubes"> <img src="{{ url_for('static', filename='nubes-logo.svg') }}" alt="Nubes">
<span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.22</span></span> <span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.23</span></span>
</div> </div>
<div class="content"> <div class="content">