Update app.py

app.py

@@ -1,4 +1,3 @@
-import gradio as gr
 import os
 import subprocess
 import tempfile
@@ -7,6 +6,7 @@ from zipfile import ZipFile
 import logging
 import json
 import psutil
+from flask import Flask, request, jsonify, render_template, send_file
 import threading
 
 # Configure logging
@@ -14,8 +14,6 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 # Initialize Flask app
-from flask import Flask, request, jsonify
-
 app = Flask(__name__)
 
 connected_cpus = {}
@@ -60,16 +58,23 @@ def run_script(script_name, folder_path):
     return log_output
 
 # Function to handle file uploads and script execution
-def handle_upload(folder, script_name):
+@app.route('/upload', methods=['POST'])
+def handle_upload():
+    if 'file' not in request.files or 'script_name' not in request.form:
+        return jsonify({"status": "error", "message": "File or script name not provided"}), 400
+    
+    files = request.files.getlist('file')
+    script_name = request.form['script_name']
+    
     # Create a temporary directory to store uploaded files
     temp_dir = tempfile.mkdtemp()
     
     # Save the uploaded folder contents to the temporary directory
     folder_path = os.path.join(temp_dir, 'uploaded_folder')
     os.makedirs(folder_path, exist_ok=True)
-    for file_name, file_obj in folder.items():
-        with open(os.path.join(folder_path, file_name), 'wb') as f:
-            f.write(file_obj.read())
+    for file_obj in files:
+        file_path = os.path.join(folder_path, file_obj.filename)
+        file_obj.save(file_path)
 
     # Run the script
     log_output = run_script(script_name, folder_path)
@@ -81,43 +86,24 @@ def handle_upload(folder, script_name):
             for file in files:
                 zipf.write(os.path.join(root, file), os.path.relpath(os.path.join(root, file), folder_path))
     
-    return log_output, zip_path
+    return jsonify({"status": "success", "log_output": log_output, "download_url": f"/download/{os.path.basename(zip_path)}"})
+
+@app.route('/download/<filename>')
+def download_file(filename):
+    return send_file(os.path.join(tempfile.gettempdir(), filename), as_attachment=True)
 
-# Function to get connected CPUs information
+# Endpoint to get connected CPUs information
+@app.route('/cpu_info', methods=['GET'])
 def get_cpu_info():
     info = []
     for host, data in connected_cpus.items():
         info.append(f"{host}: {data['cpu_count']} CPUs, {data['usage']}% usage")
-    return "\n".join(info)
+    return jsonify({"status": "success", "cpu_info": "\n".join(info)})
 
-# Function to run Flask app in background
-def run_flask_app():
-    app.run(host='0.0.0.0', port=7860, threaded=True, debug=False)
+# Main interface
+@app.route('/')
+def index():
+    return render_template('index.html')
 
-# Function to launch Gradio interface
-def launch_gradio_interface():
-    iface = gr.Interface(
-        fn=handle_upload,
-        inputs=[
-            gr.File(label="Upload Folder", file_count="multiple", file_types=['file']),
-            gr.Textbox(label="Python Script Name")
-        ],
-        outputs=[
-            gr.Textbox(label="Log Output", interactive=False),
-            gr.File(label="Download Output Folder"),
-            gr.Textbox(label="Connected CPUs Info", interactive=False)
-        ],
-        live=True,
-        theme="light"  # Specify a theme that works, "light" is an example
-    )
-    iface.launch()
-
-# Start Flask app in a separate thread
 if __name__ == "__main__":
-    flask_thread = threading.Thread(target=run_flask_app)
-    flask_thread.start()
-
-    # Launch Gradio interface in the main thread
-    launch_gradio_interface()
-
-    flask_thread.join()
+    app.run(host='0.0.0.0', port=7860, threaded=True)