чанковая загрузка 50KB, /chunk endpoint, v1.15

This commit is contained in:
2026-06-17 16:34:27 +04:00
parent 1714abf766
commit 87026a1fd8
2 changed files with 133 additions and 45 deletions
+85 -16
View File
@@ -17,6 +17,28 @@ from api import api_bp
load_dotenv()
# Хранилище чанков (в памяти, теряется при рестарте)
_chunk_store = {}
def _save_file_to_db(filename, file_bytes, mime, contract_id):
"""Сохранить один файл в БД: documents + supplements. Возвращает doc_id или None."""
db.execute(
"INSERT INTO documents (filename, mime_type, original_bytes, status) VALUES (%s,%s,%s,'uploaded')",
(filename, mime, file_bytes),
)
doc, _ = db.query_one(
"SELECT id FROM documents WHERE filename=%s AND status='uploaded' ORDER BY created_at DESC LIMIT 1",
(filename,),
)
doc_id = doc["id"] if doc else None
if doc_id:
db.execute(
"INSERT INTO supplements (contract_id, document_id, type) VALUES (%s,%s,'initial')",
(str(contract_id), str(doc_id)),
)
return doc_id
class ContractsApp:
def __init__(self):
@@ -27,6 +49,7 @@ class ContractsApp:
def _add_routes(self):
self.app.add_url_rule("/", "index", self._index, methods=["GET", "POST"])
self.app.add_url_rule("/parse/<cid>", "parse", self._parse, methods=["GET"])
self.app.add_url_rule("/chunk", "chunk", self._chunk_upload, methods=["POST"])
self.app.add_url_rule("/health", "health", self._health)
self.app.register_blueprint(test_bp)
self.app.register_blueprint(upload_bp)
@@ -74,25 +97,71 @@ class ContractsApp:
continue
filename = f.filename
mime = mimeutil.guess_mime(filename) or f.content_type or "application/octet-stream"
file_bytes = f.read()
db.execute(
"INSERT INTO documents (filename, mime_type, original_bytes, status) VALUES (%s,%s,%s,'uploaded')",
(filename, mime, file_bytes),
)
doc, _ = db.query_one(
"SELECT id FROM documents WHERE filename=%s AND status='uploaded' ORDER BY created_at DESC LIMIT 1",
(filename,),
)
doc_id = doc["id"] if doc else None
if doc_id:
db.execute(
"INSERT INTO supplements (contract_id, document_id, type) VALUES (%s,%s,'initial')",
(str(contract_id), str(doc_id)),
)
_save_file_to_db(filename, f.read(), mime, str(contract_id))
return jsonify({"contract_id": str(contract_id)})
# ── Чанковая загрузка ──────────────────────────────────────
def _chunk_upload(self):
"""Принять чанк файла. На последнем — собрать и сохранить."""
upload_id = request.form.get("upload_id", "")
filename = request.form.get("filename", "")
chunk_index = int(request.form.get("chunk_index", 0))
total_chunks = int(request.form.get("total_chunks", 1))
cid = request.form.get("cid")
chunk_file = request.files.get("chunk")
if not chunk_file:
return jsonify({"error": "Нет чанка"}), 400
chunk_data = chunk_file.read()
if upload_id not in _chunk_store:
_chunk_store[upload_id] = {
"filename": filename,
"mime": mimeutil.guess_mime(filename) or "application/octet-stream",
"chunks": [None] * total_chunks,
"total": total_chunks,
"cid": cid,
"received": 0,
}
store = _chunk_store[upload_id]
if store["chunks"][chunk_index] is None:
store["chunks"][chunk_index] = chunk_data
store["received"] += 1
if store["received"] == total_chunks:
# Собрать файл
file_bytes = b"".join(store["chunks"])
mime = store["mime"]
fname = store["filename"]
cid = store["cid"]
# Создать контракт если нет
if cid:
contract_id = cid
else:
conn, err = db.connect()
if err:
del _chunk_store[upload_id]
return jsonify({"error": f"БД: {err}"}), 500
cur = conn.cursor()
cur.execute(
"INSERT INTO contracts (number, client) VALUES (%s, %s) RETURNING id",
("б" + __import__("datetime").datetime.now().strftime("%Y%m%d-%H%M"), ""),
)
contract_id = cur.fetchone()[0]
conn.commit()
cur.close()
conn.close()
_save_file_to_db(fname, file_bytes, mime, str(contract_id))
del _chunk_store[upload_id]
return jsonify({"contract_id": str(contract_id)})
return jsonify({"chunk": chunk_index, "received": store["received"], "total": total_chunks})
def _show_contract(self, cid):
"""Показать договор с кнопкой «Обработать»."""
contract, _ = db.query_one("SELECT id,number,created_at FROM contracts WHERE id=%s", (cid,))