Update app.py

app.py

@@ -5,10 +5,8 @@ from telethon import TelegramClient
 from telethon.errors import SessionPasswordNeededError, PhoneCodeInvalidError, AuthKeyError
 from huggingface_hub import upload_file
 from dotenv import load_dotenv
-from fastapi import FastAPI, Form, HTTPException
-from fastapi.responses import HTMLResponse, FileResponse
-from fastapi.staticfiles import StaticFiles
-import uvicorn
+from flask import Flask, request, render_template, jsonify
+import threading
 
 # === Load secrets from .env ===
 load_dotenv()
@@ -132,51 +130,54 @@ async def process_filenames(name_input):
         logging.error(f"Error in process_filenames: {e}")
         return f"❌ Error: {str(e)}"
 
-        
-# === FastAPI App ===
-app = FastAPI(title="Hugging Face Uploader", description="Upload files from Telegram to Hugging Face datasets")
+def run_async_in_thread(coro):
+    """Run async function in a separate thread with its own event loop"""
+    def run_in_thread():
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        try:
+            return loop.run_until_complete(coro)
+        finally:
+            loop.close()
+    
+    import concurrent.futures
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        future = executor.submit(run_in_thread)
+        return future.result()
 
-@app.get("/", response_class=HTMLResponse)
-async def index():
-    """Serve the main HTML page"""
-    try:
-        with open("index.html", "r", encoding="utf-8") as f:
-            return HTMLResponse(content=f.read())
-    except FileNotFoundError:
-        raise HTTPException(status_code=404, detail="index.html not found")
+# === Flask App with explicit template and static folder paths ===
+# Get the directory where this script is located
+basedir = os.path.abspath(os.path.dirname(__file__))
 
-@app.get("/style.css")
-async def get_css():
-    """Serve the CSS file"""
-    return FileResponse("style.css", media_type="text/css")
+app = Flask(__name__, 
+           template_folder=os.path.join(basedir, 'templates'),
+           static_folder=os.path.join(basedir, 'static'))
 
-@app.get("/script.js")
-async def get_js():
-    """Serve the JavaScript file"""
-    return FileResponse("script.js", media_type="application/javascript")
+@app.route('/')
+def index():
+    return render_template('index.html')
 
-@app.post("/upload")
-async def upload(filenames: str = Form(...)):
-    """Handle file upload requests"""
+@app.route('/upload', methods=['POST'])
+def upload():
     try:
-        if not filenames.strip():
-            raise HTTPException(status_code=400, detail="❌ Error: No filenames provided")
+        filenames_input = request.form.get('filenames', '').strip()
+        if not filenames_input:
+            return "❌ Error: No filenames provided", 400
         
         # Check if credentials are configured
         if not client:
-            raise HTTPException(status_code=500, detail="❌ Error: Application not configured. Please set up your environment variables with API credentials.")
+            return "❌ Error: Application not configured. Please set up your environment variables with API credentials.", 500
         
-        # Process filenames using the async function
-        results = await process_filenames(filenames)
-        return {"results": results}
+        # Run the async function in a separate thread
+        results = run_async_in_thread(process_filenames(filenames_input))
+        return results
     
     except Exception as e:
         logging.error(f"Error in upload route: {e}")
-        raise HTTPException(status_code=500, detail=f"❌ Error: {str(e)}")
+        return f"❌ Error: {str(e)}", 500
 
-@app.get("/health")
-async def health():
-    """Health check endpoint"""
+@app.route('/health')
+def health():
     status = {
         "status": "healthy",
         "message": "Hugging Face Uploader is running",
@@ -185,17 +186,16 @@ async def health():
             "huggingface": bool(HF_TOKEN and REPO_ID),
             "channel": bool(CHANNEL)
         },
-        "files": {
-            "index_html_exists": os.path.exists("index.html"),
-            "style_css_exists": os.path.exists("style.css"),
-            "script_js_exists": os.path.exists("script.js"),
-            "session_file_exists": os.path.exists("my_session.session")
+        "paths": {
+            "basedir": basedir,
+            "template_folder": app.template_folder,
+            "static_folder": app.static_folder
         }
     }
-    return status
+    return jsonify(status)
 
-@app.get("/config")
-async def config():
+@app.route('/config')
+def config():
     """Show configuration status"""
     config_status = {
         "API_ID": "✅ Set" if API_ID else "❌ Missing",
@@ -204,60 +204,65 @@ async def config():
         "CHANNEL_USERNAME": "✅ Set" if CHANNEL else "❌ Missing",
         "DATASET_REPO": "✅ Set" if REPO_ID else "❌ Missing"
     }
-    return config_status
+    
+    return jsonify(config_status)
 
-@app.get("/debug")
-async def debug():
+@app.route('/debug')
+def debug():
     """Debug endpoint to check file structure"""
     import glob
     
     debug_info = {
         "current_directory": os.getcwd(),
+        "script_directory": basedir,
+        "template_folder": app.template_folder,
+        "static_folder": app.static_folder,
         "files_in_current_dir": os.listdir('.'),
-        "html_exists": os.path.exists('index.html'),
-        "css_exists": os.path.exists('style.css'),
-        "js_exists": os.path.exists('script.js'),
-        "session_file_exists": os.path.exists('my_session.session'),
-        "downloads_folder_exists": os.path.exists('downloads'),
-        "log_file_exists": os.path.exists('upload.log')
+        "templates_exists": os.path.exists('templates'),
+        "static_exists": os.path.exists('static'),
+        "templates_files": glob.glob('templates/*') if os.path.exists('templates') else [],
+        "static_files": glob.glob('static/**/*', recursive=True) if os.path.exists('static') else [],
+        "session_file_exists": os.path.exists('my_session.session')
     }
     
-    return debug_info
+    return jsonify(debug_info)
 
-@app.get("/session-info")
-async def session_info():
+@app.route('/session-info')
+def session_info():
     """Check Telegram session status"""
     if not client:
-        return {"error": "Client not initialized"}
+        return jsonify({"error": "Client not initialized"})
     
     try:
+        # This is a synchronous check
         session_status = {
             "session_file_exists": os.path.exists('my_session.session'),
             "client_initialized": bool(client),
             "session_file_size": os.path.getsize('my_session.session') if os.path.exists('my_session.session') else 0
         }
-        return session_status
+        return jsonify(session_status)
     except Exception as e:
-        return {"error": str(e)}
+        return jsonify({"error": str(e)})
 
 if __name__ == '__main__':
-    print("Starting Hugging Face Uploader with FastAPI...")
+    print("Starting Hugging Face Uploader...")
     print("Configuration status:")
     print(f"  API_ID: {'✅ Set' if API_ID else '❌ Missing'}")
     print(f"  API_HASH: {'✅ Set' if API_HASH else '❌ Missing'}")
     print(f"  HF_TOKEN: {'✅ Set' if HF_TOKEN else '❌ Missing'}")
     print(f"  CHANNEL_USERNAME: {'✅ Set' if CHANNEL else '❌ Missing'}")
     print(f"  DATASET_REPO: {'✅ Set' if REPO_ID else '❌ Missing'}")
-    print(f"\nFile structure:")
-    print(f"  index.html exists: {os.path.exists('index.html')}")
-    print(f"  style.css exists: {os.path.exists('style.css')}")
-    print(f"  script.js exists: {os.path.exists('script.js')}")
+    print(f"\nPaths:")
+    print(f"  Base directory: {basedir}")
+    print(f"  Template folder: {app.template_folder}")
+    print(f"  Static folder: {app.static_folder}")
+    print(f"\nSession info:")
     print(f"  Session file exists: {os.path.exists('my_session.session')}")
     print("\n⚠️  IMPORTANT: This application requires a pre-authenticated Telegram session.")
-    print("   You must create the session file locally first, then upload it to your deployment.")
-    print("\nTo configure, set environment variables in your deployment environment.")
+    print("   You must create the session file locally first, then upload it to your Space.")
+    print("\nTo configure, set environment variables in your Space settings.")
     print("Visit http://localhost:7860 to use the application.")
     
     # Use port 7860 for Hugging Face Spaces compatibility
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    app.run(host='0.0.0.0', port=7860, debug=False)