Upload 2 files

fix run_dir folder issues

app.py

@@ -20,11 +20,11 @@ from io import BytesIO
 from PIL import Image
 import json
 
-input_path = os.environ["SCRIPT_INPUT"]
-output_path = os.environ["SCRIPT_OUTPUT"]
+# input_path = os.environ["SCRIPT_INPUT"]
+# output_path = os.environ["SCRIPT_OUTPUT"]
 
 # Load JSON input
-with open(input_path, "r") as f:
+with open("input.txt", "r") as f:
     data = json.load(f)
     img_b64 = data["img"]
 
@@ -37,7 +37,8 @@ img.load()  # ⬅️ Ensure image is fully loaded before processing
 flipped = img.transpose(Image.FLIP_LEFT_RIGHT)
 
 # Save output
-flipped.save(os.path.join(output_path, "flipped.png"))
+# flipped.save(os.path.join(output_path, "flipped.png"))
+flipped.save()"flipped.png")
 print("Image flipped and saved as flipped.png.")
 """
 
@@ -56,7 +57,8 @@ def cleanup_old_runs(base_dir: Path, max_age: int):
 def zip_artifacts(output_dir: Path, zip_path: Path):
     with zipfile.ZipFile(zip_path, "w") as zf:
         for file in output_dir.iterdir():
-            zf.write(file, arcname=file.name)
+            if "output.zip" not in file.name:
+                zf.write(file, arcname=file.name)
 
 
 def run_script(code: str, user_input: str = "", cleanup_enabled: bool = True, cleanup_after: int = 600):
@@ -134,12 +136,33 @@ def run_script(code: str, user_input: str = "", cleanup_enabled: bool = True, cl
         orig_stderr = sys.stderr
         sys.stdout = sys.stderr = output
 
+        # try:
+        #     sys.argv = [
+        #         "run_script_venv.py",
+        #         str(script_path),
+        #         "--keep-workdir",
+        #         "--extra", "pandas",  # safe default dependency for common data handling
+        #     ]
+        #     os.environ["SCRIPT_INPUT"] = str(input_path)
+        #     os.environ["SCRIPT_OUTPUT"] = str(output_path)
+        #     run_in_venv()
+        # except SystemExit:
+        #     pass
+        # finally:
+        #     sys.stdout = orig_stdout
+        #     sys.stderr = orig_stderr
+
+        # Set working directory so user script writes to run_dir
+        old_cwd = os.getcwd()
+        os.chdir(run_dir)
+
         try:
             sys.argv = [
                 "run_script_venv.py",
-                str(script_path),
+                # str(script_path),
+                "script.py",
                 "--keep-workdir",
-                "--extra", "pandas",  # safe default dependency for common data handling
+                "--extra", "pandas",
             ]
             os.environ["SCRIPT_INPUT"] = str(input_path)
             os.environ["SCRIPT_OUTPUT"] = str(output_path)
@@ -147,16 +170,40 @@ def run_script(code: str, user_input: str = "", cleanup_enabled: bool = True, cl
         except SystemExit:
             pass
         finally:
+            os.chdir(old_cwd)
             sys.stdout = orig_stdout
             sys.stderr = orig_stderr
 
+
         output.seek(0)
         logs = output.read()
 
 
-    # Collect output artifacts
+    # # Collect output artifacts
+    # artifacts = {}
+    # for item in output_path.iterdir():
+    #     if item.suffix in {".txt", ".csv", ".json", ".md"}:
+    #         artifacts[item.name] = item.read_text()
+    #     elif item.suffix.lower() in {".png", ".jpg", ".jpeg"}:
+    #         artifacts[item.name] = f"[image file: {item.name}]"
+    #     else:
+    #         artifacts[item.name] = f"[file saved: {item.name}]"
+
+    # # Create zip
+    # zip_path = run_dir / "output.zip"
+    # zip_artifacts(output_path, zip_path)
+    # artifacts["Download All (ZIP)"] = str(zip_path)
+    # artifacts["__workdir__"] = str(run_dir)
+    
+    # Collect output artifacts (from output/ and run_dir/)
     artifacts = {}
-    for item in output_path.iterdir():
+    # ignored = {"script.py", "input.txt", "output.zip"}
+    ignored = {"output.zip"}
+    for item in run_dir.iterdir():
+        if item.name in ignored or item.name.startswith(".venv"):
+            continue
+        if item.is_dir():
+            continue  # Skip subdirectories except output
         if item.suffix in {".txt", ".csv", ".json", ".md"}:
             artifacts[item.name] = item.read_text()
         elif item.suffix.lower() in {".png", ".jpg", ".jpeg"}:
@@ -164,12 +211,14 @@ def run_script(code: str, user_input: str = "", cleanup_enabled: bool = True, cl
         else:
             artifacts[item.name] = f"[file saved: {item.name}]"
 
-    # Create zip
+    # Still allow zipped output/ as a bonus
     zip_path = run_dir / "output.zip"
-    zip_artifacts(output_path, zip_path)
+    zip_artifacts(run_dir, zip_path)
     artifacts["Download All (ZIP)"] = str(zip_path)
-
     artifacts["__workdir__"] = str(run_dir)
+
+    
+    
     return logs, artifacts, str(zip_path)