Update app.py

app.py

@@ -1,5 +1,5 @@
 import flask
-from flask import Flask, render_template_string, request, redirect, url_for, session, flash, send_file, jsonify, Response
+from flask import Flask, render_template_string, request, redirect, url_for, session, flash, send_file, jsonify, Response, stream_with_context
 from flask_caching import Cache
 import json
 import os
@@ -476,9 +476,14 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         document.getElementById('modalContent').innerHTML = '';
         document.getElementById('modal-download-btn').style.display = 'none';
     }
-
+    
     async function initiateDownload(fileId) {
         haptic.impactOccurred('medium');
+        const downloadBtn = document.getElementById('modal-download-btn');
+        const originalHTML = downloadBtn.innerHTML;
+        downloadBtn.innerHTML = '<div class="loading-spinner" style="width:20px; height:20px; border-width:2px;"></div>';
+        downloadBtn.onclick = null;
+
         try {
             const response = await fetch(`{{ url_for('download_tma', file_id='__FILE_ID__') }}`.replace('__FILE_ID__', fileId));
             const data = await response.json();
@@ -490,6 +495,11 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             }
         } catch (error) {
             Telegram.WebApp.showAlert('Сетевая ошибка при создании ссылки для скачивания.');
+        } finally {
+            if (downloadBtn) {
+                downloadBtn.innerHTML = originalHTML;
+                downloadBtn.onclick = () => { initiateDownload(fileId); };
+            }
         }
     }
 
@@ -771,14 +781,13 @@ def download_tma(file_id):
         return jsonify({'status': 'error', 'message': 'Файл не найден или доступ запрещен'}), 404
 
     token = uuid.uuid4().hex
-    cache.set(f"download_token_{token}", file_node, timeout=60)
+    cache.set(f"download_token_{token}", file_node, timeout=300)
     public_url = url_for('public_download', token=token, _external=True)
     return jsonify({'status': 'success', 'url': public_url})
 
 @app.route('/public_download/<token>')
 def public_download(token):
     file_node = cache.get(f"download_token_{token}")
-    cache.delete(f"download_token_{token}")
     if not file_node:
         return Response("Ссылка для скачивания недействительна или истекла.", status=404)
 
@@ -788,23 +797,33 @@ def public_download(token):
         return Response("Ошибка: Путь к файлу не найден.", status=500)
 
     try:
-        local_file_path = hf_hub_download(
-            repo_id=REPO_ID,
-            filename=hf_path,
-            repo_type="dataset",
-            token=HF_TOKEN_READ,
-            cache_dir=os.path.join(UPLOAD_FOLDER, 'hf_download_cache')
-        )
-        return send_file(
-            local_file_path,
-            as_attachment=True,
-            download_name=original_filename
-        )
-    except hf_utils.EntryNotFoundError:
-        logging.error(f"File not found on Hugging Face: {hf_path}")
-        return Response("Файл не найден на удаленном хранилище.", status=404)
+        hf_url = f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(hf_path)}"
+        headers = {}
+        if HF_TOKEN_READ:
+            headers["Authorization"] = f"Bearer {HF_TOKEN_READ}"
+        
+        req = requests.get(hf_url, headers=headers, stream=True, allow_redirects=True)
+        req.raise_for_status()
+
+        encoded_filename = quote(original_filename)
+        response_headers = {
+            'Content-Type': req.headers.get('Content-Type', 'application/octet-stream'),
+            'Content-Disposition': f"attachment; filename*=UTF-8''{encoded_filename}",
+            'Content-Length': req.headers.get('Content-Length')
+        }
+        response_headers = {k: v for k, v in response_headers.items() if v is not None}
+
+        return Response(stream_with_context(req.iter_content(chunk_size=8192)), headers=response_headers)
+
+    except requests.exceptions.HTTPError as e:
+        if e.response.status_code == 404:
+            logging.error(f"File not found on Hugging Face during streaming: {hf_path}")
+            return Response("Файл не найден на удаленном хранилище.", status=404)
+        else:
+            logging.error(f"HTTP error downloading from HF via streaming: {e}")
+            return Response(f'Ошибка HTTP при скачивании файла: {e}', status=502)
     except Exception as e:
-        logging.error(f"Error downloading with token {token} from HF: {e}")
+        logging.error(f"Error streaming with token {token} from HF: {e}")
         return Response(f'Ошибка скачивания файла: {e}', status=502)
 
 @app.route('/batch_download_tma')
@@ -1318,7 +1337,7 @@ def admin_download_file(tma_user_id_str, file_id):
         return jsonify({'status': 'error', 'message': 'File not found or access denied!'}), 404
 
     token = uuid.uuid4().hex
-    cache.set(f"download_token_{token}", file_node, timeout=60)
+    cache.set(f"download_token_{token}", file_node, timeout=300)
     public_url = url_for('public_download', token=token, _external=True)
     return jsonify({'status': 'success', 'url': public_url})