revert worker

* Support old vLLM payloads

start_server.sh

@@ -46,6 +46,33 @@ JSON
     exit 1
 }
 
+function install_vastai_sdk() {
+    # If SDK_BRANCH is set, install vastai-sdk from the vast-sdk repo at that branch/tag/commit.
+    if [ -n "${SDK_BRANCH:-}" ]; then
+        if [ -n "${SDK_VERSION:-}" ]; then
+            echo "WARNING: Both SDK_BRANCH and SDK_VERSION are set; using SDK_BRANCH=${SDK_BRANCH}"
+        fi
+        echo "Installing vastai-sdk from https://github.com/vast-ai/vast-sdk/ @ ${SDK_BRANCH}"
+        if ! uv pip install "vastai-sdk @ git+https://github.com/vast-ai/vast-sdk.git@${SDK_BRANCH}"; then
+            report_error_and_exit "Failed to install vastai-sdk from vast-ai/vast-sdk@${SDK_BRANCH}"
+        fi
+        return 0
+    fi
+
+    if [ -n "${SDK_VERSION:-}" ]; then
+        echo "Installing vastai-sdk version ${SDK_VERSION}"
+        if ! uv pip install "vastai-sdk==${SDK_VERSION}"; then
+            report_error_and_exit "Failed to install vastai-sdk==${SDK_VERSION}"
+        fi
+        return 0
+    fi
+
+    echo "Installing default vastai-sdk"
+    if ! uv pip install vastai-sdk; then
+        report_error_and_exit "Failed to install vastai-sdk"
+    fi
+}
+
 [ -n "$BACKEND" ] && [ -z "$HF_TOKEN" ] && report_error_and_exit "HF_TOKEN must be set when BACKEND is set!"
 [ -z "$CONTAINER_ID" ] && report_error_and_exit "CONTAINER_ID must be set!"
 [ "$BACKEND" = "comfyui" ] && [ -z "$COMFY_MODEL" ] && report_error_and_exit "For comfyui backends, COMFY_MODEL must be set!"
@@ -123,6 +150,8 @@ then
         report_error_and_exit "Failed to install Python requirements"
     fi
 
+    install_vastai_sdk
+
     if ! touch ~/.no_auto_tmux; then
         report_error_and_exit "Failed to create ~/.no_auto_tmux"
     fi

workers/openai/worker.py

@@ -28,6 +28,12 @@ MODEL_INFO_LOG_MSGS = [
 nltk.download("words")
 WORD_LIST = nltk.corpus.words.words()
 
+def request_parser(request):
+    data = request
+    if request.get("input") is not None:
+        data = request.get("input")
+    return data
+
 
 def completions_benchmark_generator() -> dict:
     prompt = " ".join(random.choices(WORD_LIST, k=int(250)))
@@ -54,18 +60,20 @@ worker_config = WorkerConfig(
             route="/v1/completions",
             workload_calculator= lambda data: data.get("max_tokens", 0),
             allow_parallel_requests=True,
-            max_queue_time=60.0,
+            request_parser=request_parser,
+            max_queue_time=600.0,
             benchmark_config=BenchmarkConfig(
                 generator=completions_benchmark_generator,
-                concurrency=100,
+                concurrency=10,
-                runs=2
+                runs=3
             )
         ),
         HandlerConfig(
             route="/v1/chat/completions",
             workload_calculator= lambda data: data.get("max_tokens", 0),
             allow_parallel_requests=True,
-            max_queue_time=60.0,
+            request_parser=request_parser,
+            max_queue_time=600.0,
         )
     ],
     log_action_config=LogActionConfig(

workers/tgi/worker.py

@@ -52,17 +52,18 @@ worker_config = WorkerConfig(
         HandlerConfig(
             route="/generate",
             allow_parallel_requests=True,
-            max_queue_time=60.0,
+            max_queue_time=600.0,
             benchmark_config=BenchmarkConfig(
                 generator=benchmark_generator,
-                concurrency=50
+                concurrency=10,
+                runs=3
             ),
             workload_calculator= lambda x: x["parameters"]["max_new_tokens"]
         ),
         HandlerConfig(
             route="/generate_stream",
             allow_parallel_requests=True,
-            max_queue_time=60.0,
+            max_queue_time=600.0,
             workload_calculator= lambda x: x["parameters"]["max_new_tokens"]
         )
     ],