Update app.py

app.py

@@ -208,37 +208,6 @@ def safe_text(response):
 # -------------------------------------------------------------------
 @app.route("/capture", methods=["POST"])
 def capture_endpoint():
-    """
-    JSON body example:
-    {
-      "urls": ["https://x.com/USTreasury", "https://example.com"],   // required, array of one or more
-      "width": 10850,                                                // optional, default 1080
-      "height": 1920,                                                // optional, default 1920
-      "fullPage": true                                               // optional, default true
-    }
-    Response:
-    {
-      "results": [
-        {
-          "url": "...",
-          "output": {
-            "imageUrl": "...png",
-            "htmlUrl": "...html"
-          },
-          "meta": { "cached": false }
-        },
-        { ... }
-      ],
-      "errors": [
-        { "url": "...", "error": "...", "status": 403, "details": "..." }
-      ]
-    }
-    Behavior:
-    - Create workspace, then bot.
-    - Run capture for all URLs with the same bot/workspace.
-    - Delete bot first, then workspace, at the end of the request.
-    """
-    # Parse and validate body
     try:
         body = request.get_json(force=True) or {}
     except Exception:
@@ -248,12 +217,10 @@ def capture_endpoint():
     if not urls or not isinstance(urls, list):
         return jsonify({"error": "urls is required and must be a list"}), 400
 
-    # Optional params
     width = body.get("width", 1080)
     height = body.get("height", 1920)
     full_page = body.get("fullPage", True)
 
-    # Normalize numeric params
     try:
         width = int(width)
         if width <= 0:
@@ -268,66 +235,68 @@ def capture_endpoint():
         height = 1920
     full_page = bool(full_page)
 
-    workspace_id = None
-    bot_id = None
-
-    # Create (Workspace then Bot)
-    workspace_id = create_workspace()
-    if not workspace_id:
-        return jsonify({"error": "Failed to create workspace"}), 500
-
-    bot_id = create_bot(workspace_id)
-    if not bot_id:
-        # Cleanup: if bot creation fails, delete workspace
-        delete_workspace(workspace_id)
-        return jsonify({"error": "Failed to create bot"}), 500
-
     results = []
     errors = []
 
-    # Process multiple URLs using the same bot/workspace
     for url in urls:
         if not isinstance(url, str) or not url.strip():
             errors.append({"url": url, "error": "Invalid URL"})
             continue
 
-        capture = capture_screenshot(
-            url=url.strip(),
-            width=width,
-            height=height,
-            full_page=full_page,
-            bot_id=bot_id,
-            workspace_id=workspace_id
-        )
+        workspace_id = None
+        bot_id = None
+        try:
+            # Create workspace and bot PER URL
+            workspace_id = create_workspace()
+            if not workspace_id:
+                errors.append({"url": url, "error": "Failed to create workspace"})
+                continue
 
-        if isinstance(capture, dict) and capture.get("error"):
-            errors.append({"url": url, **capture})
-        else:
-            # Ensure consistent output structure
-            output = capture.get("output", {})
-            meta = capture.get("meta", {})
-            results.append({
-                "url": url,
-                "output": {
-                    "imageUrl": output.get("imageUrl"),
-                    "htmlUrl": output.get("htmlUrl")
-                },
-                "meta": meta
-            })
+            bot_id = create_bot(workspace_id)
+            if not bot_id:
+                errors.append({"url": url, "error": "Failed to create bot"})
+                # Cleanup workspace since bot failed
+                delete_workspace(workspace_id)
+                workspace_id = None
+                continue
 
-    # Delete (Bot first, then Workspace) regardless of success
-    try:
-        if bot_id:
-            delete_bot(bot_id, workspace_id)
-    finally:
-        if workspace_id:
-            delete_workspace(workspace_id)
+            # Capture with this bot/workspace
+            capture = capture_screenshot(
+                url=url.strip(),
+                width=width,
+                height=height,
+                full_page=full_page,
+                bot_id=bot_id,
+                workspace_id=workspace_id
+            )
+
+            if isinstance(capture, dict) and capture.get("error"):
+                errors.append({"url": url, **capture})
+            else:
+                output = capture.get("output", {})
+                meta = capture.get("meta", {})
+                results.append({
+                    "url": url,
+                    "output": {
+                        "imageUrl": output.get("imageUrl"),
+                        "htmlUrl": output.get("htmlUrl")
+                    },
+                    "meta": meta
+                })
+
+        finally:
+            # Cleanup per URL: delete bot first, then workspace
+            try:
+                if bot_id and workspace_id:
+                    delete_bot(bot_id, workspace_id)
+            finally:
+                if workspace_id:
+                    delete_workspace(workspace_id)
 
     response_body = {"results": results}
     if errors:
         response_body["errors"] = errors
 
-    # If all failed, return 502; else 200
     if results:
         return jsonify(response_body), 200
     else: