Handle errors from model for comfyui-json

start_server.sh

@@ -58,16 +58,10 @@ then
         source ~/.local/bin/env
     fi
 
-    if [[ ! -d $SERVER_DIR ]]; then
+    # Fork testing
-        git clone --depth=1 "${PYWORKER_REPO:-https://github.com/vast-ai/pyworker}" "$SERVER_DIR"
+    [[ ! -d $SERVER_DIR ]] && git clone "${PYWORKER_REPO:-https://github.com/vast-ai/pyworker}" "$SERVER_DIR"
-    fi
-
     if [[ -n ${PYWORKER_REF:-} ]]; then
-        (
+        (cd "$SERVER_DIR" && git checkout "$PYWORKER_REF")
-            cd "$SERVER_DIR"
-            git fetch --depth=1 origin "$PYWORKER_REF"
-            git checkout "$PYWORKER_REF"
-        )
     fi
 
     uv venv --python-preference only-managed "$ENV_PATH" -p 3.10

workers/comfyui-json/server.py

@@ -33,33 +33,39 @@ log = logging.getLogger(__file__)
 async def generate_client_response(
         client_request: web.Request, model_response: ClientResponse
     ) -> Union[web.Response, web.StreamResponse]:
-        # Check if the response is actually streaming based on response headers/content-type
+        match model_response.status:
-        is_streaming_response = (
+            case 200:
-            model_response.content_type == "text/event-stream"
+                log.debug("SUCCESS")
-            or model_response.content_type == "application/x-ndjson"
+                # Check if the response is actually streaming based on response headers/content-type
-            or model_response.headers.get("Transfer-Encoding") == "chunked"
+                is_streaming_response = (
-            or "stream" in model_response.content_type.lower()
+                    model_response.content_type == "text/event-stream"
-        )
+                    or model_response.content_type == "application/x-ndjson"
+                    or model_response.headers.get("Transfer-Encoding") == "chunked"
+                    or "stream" in model_response.content_type.lower()
+                )
 
-        if is_streaming_response:
+                if is_streaming_response:
-            log.debug("Detected streaming response...")
+                    log.debug("Detected streaming response...")
-            res = web.StreamResponse()
+                    res = web.StreamResponse()
-            res.content_type = model_response.content_type
+                    res.content_type = model_response.content_type
-            await res.prepare(client_request)
+                    await res.prepare(client_request)
-            async for chunk in model_response.content:
+                    async for chunk in model_response.content:
-                await res.write(chunk)
+                        await res.write(chunk)
-            await res.write_eof()
+                    await res.write_eof()
-            log.debug("Done streaming response")
+                    log.debug("Done streaming response")
-            return res
+                    return res
-        else:
+                else:
-            log.debug("Detected non-streaming response...")
+                    log.debug("Detected non-streaming response...")
-            content = await model_response.read()
+                    content = await model_response.read()
-            return web.Response(
+                    return web.Response(
-                body=content,
+                        body=content,
-                status=model_response.status,
+                        status=model_response.status,
-                content_type=model_response.content_type
+                        content_type=model_response.content_type
-            )
+                    )
-            
+            case code:
+                log.debug(f"Model responded with error {code}")
+                return web.Response(status=code)
+                
 
 @dataclasses.dataclass
 class ComfyWorkflowHandler(EndpointHandler[ComfyWorkflowData]):