Update app.py

app.py

@@ -188,7 +188,6 @@ def secure_execute_flask_code(app_instance, code, log_func, request_obj):
 def run_flask_app(app_name: str, code: str):
     """Start a Flask app on a dedicated port"""
     global next_port
-    
     log_buffer = io.StringIO()
     flask_logs[app_name] = log_buffer
     port = next_port
@@ -201,56 +200,58 @@ def run_flask_app(app_name: str, code: str):
         print(f"[{app_name}] {msg}")
 
     try:
-        # Validate code first
         is_valid, validation_msg = validate_flask_code(code)
         if not is_valid:
             log(f"Code validation failed: {validation_msg}")
-            return
+            return f"Failed to start Flask app: {validation_msg}"
 
         from flask import Flask, request
         local_flask = Flask(app_name)
 
-        # Default route
         @local_flask.route("/")
         def home():
             return f"Hello from {app_name}!<br><br>App is running successfully."
 
-        # Secure execution of user code
         success, exec_msg = secure_execute_flask_code(local_flask, code, log, request)
         if not success:
             log(f"Failed to execute code: {exec_msg}")
-            return
+            return f"Failed to start Flask app: {exec_msg}"
 
-        # Start the Flask app in a separate thread
         def run_app():
-          try:
-            local_flask.run(host='0.0.0.0', port=port, debug=False, use_reloader=False)
-          except Exception as e:
-            return f"Error running Flask app: {e}"
-        
+            try:
+                local_flask.run(host='0.0.0.0', port=port, debug=False, use_reloader=False)
+            except Exception as e:
+                log(f"Error running Flask app: {e}")
+                return f"Error running Flask app: {e}"
+
         thread = threading.Thread(target=run_app, daemon=True)
         thread.start()
-        
         flask_apps[app_name] = local_flask
-        
-        # Get the correct URLs
+
         local_ip = get_local_ip()
         local_url = f"http://{local_ip}:{port}"
-        
-        # For Hugging Face Spaces
         if "hf.space" in public_url:
             space_id = public_url.split("https://")[1].split(".hf.space")[0]
             live_url = f"https://{space_id}.hf.space/proxy/{port}/"
         else:
             live_url = f"{public_url}/proxy/{port}/"
-        
+
         log(f"Started Flask app: {app_name} on port {port}")
         log(f"Local URL: {local_url}")
         log(f"Live URL: {live_url}")
-        log("App is now live and accessible!")
-
+        return f"Started Flask app: {app_name}\nLocal URL: {local_url}\nLive URL: {live_url}"
     except Exception as e:
         log(f"Error starting Flask app {app_name}: {e}")
+        return f"Error starting Flask app: {e}"
+
+def is_flask_app(file_path):
+    """Check if a Python file contains Flask code."""
+    try:
+        with open(file_path, 'r', encoding='utf-8') as f:
+            content = f.read()
+            return bool(re.search(r'@app\.route', content))
+    except Exception:
+        return False
 
 def run_python_app(file_path: str):
     """Run a regular Python application"""
@@ -337,6 +338,26 @@ def run_command(cmd: str):
     raw_cmd = parts[0].lower()
     args = parts[1] if len(parts) > 1 else ""
 
+    try:
+        # === STOP running process ===
+        if raw_cmd == "close":
+            if running_process and running_process.poll() is None:
+                running_process.terminate()
+                running_process = None
+                return f"$ {cmd}\n\nStopped running process.", "", None
+            return f"$ {cmd}\n\nNo active process to stop.", "", None
+def run_command(cmd: str):
+    """Handle terminal-like commands including Flask and Python apps"""
+    global current_dir, running_process
+    cmd = cmd.strip()  # Remove leading/trailing whitespace
+    if not cmd:
+        return "No command provided", "", None
+
+    # Split command into command and arguments (maxsplit=1 for commands with spaces)
+    parts = cmd.split(maxsplit=1)
+    raw_cmd = parts[0].lower()
+    args = parts[1] if len(parts) > 1 else ""
+
     try:
         # === STOP running process ===
         if raw_cmd == "close":
@@ -458,16 +479,10 @@ def run_command(cmd: str):
 
         # === Normal shell command ===
         try:
-            # Avoid shell=True for common commands
-            if raw_cmd == "ls":
-                cmd_parts = ['ls', '-l'] if not args else ['ls', '-l', args]
-            elif raw_cmd == "cat" and args:
-                cmd_parts = ['cat', expand_path(args)]
-            else:
-                cmd_parts = cmd.split()  # Split for safer execution
+            cmd_parts = ['ls', '-l'] if raw_cmd == "ls" and not args else cmd.split()
             running_process = subprocess.Popen(
                 cmd_parts,
-                shell=False,  # Prefer shell=False for safety
+                shell=False,  # Avoid shell=True for safety
                 cwd=current_dir,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,