ver Jan5th

debugged

desktop_env/server/main.py

@@ -16,17 +16,19 @@ app = Flask(__name__)
 pyautogui.PAUSE = 0
 pyautogui.DARWIN_CATCH_UP_TIME = 0
 
+logger = app.logger
 
 @app.route('/setup/execute', methods=['POST'])
 @app.route('/execute', methods=['POST'])
 def execute_command():
     data = request.json
     # The 'command' key in the JSON request should contain the command to be executed.
-    command = data.get('command', [])
+    shell = data.get('shell', False)
+    command = data.get('command', "" if shell else [])
 
     # Execute the command without any safety checks.
     try:
-        result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, text=True)
         return jsonify({
             'status': 'success',
             'output': result.stdout,
@@ -94,7 +96,7 @@ def capture_screen_with_cursor():
         # Use the screencapture utility to capture the screen with the cursor
         subprocess.run(["screencapture", "-C", file_path])
     else:
-        print(f"The platform you're using ({user_platform}) is not currently supported")
+        logger.warning(f"The platform you're using ({user_platform}) is not currently supported")
 
     return send_file(file_path, mimetype='image/png')
 
@@ -190,7 +192,7 @@ def download_file():
             return "File downloaded successfully"
 
         except requests.RequestException as e:
-            print(f"Failed to download {url}. Retrying... ({max_retries - i - 1} attempts left)")
+            logger.error(f"Failed to download {url}. Retrying... ({max_retries - i - 1} attempts left)")
 
     return f"Failed to download {url}. No retries left. Error: {e}", 500