From 4b1857883f586a53a10242b7dff018f5e80087ab Mon Sep 17 00:00:00 2001
From: Sean Sube <seansube@gmail.com>
Date: Mon, 13 Feb 2023 23:15:43 -0600
Subject: [PATCH] fix(api): split up base and extras launch scripts

---
 api/launch-extras.bat |  6 ++++++
 api/launch-extras.sh  | 28 ++++++++++++++++++++++++++++
 api/launch.bat        |  3 +--
 api/launch.sh         |  1 -
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 api/launch-extras.bat
 create mode 100755 api/launch-extras.sh

diff --git a/api/launch-extras.bat b/api/launch-extras.bat
new file mode 100644
index 00000000..fa3c8908
--- /dev/null
+++ b/api/launch-extras.bat
@@ -0,0 +1,6 @@
+echo "Downloading and converting models to ONNX format..."
+IF "%ONNX_WEB_EXTRA_MODELS%"=="" (set ONNX_WEB_EXTRA_MODELS=extras.json)
+python -m onnx_web.convert --sources --diffusion --upscaling --correction --extras=%ONNX_WEB_EXTRA_MODELS% --token=%HF_TOKEN%
+
+echo "Launching API server..."
+flask --app=onnx_web.serve run --host=0.0.0.0
diff --git a/api/launch-extras.sh b/api/launch-extras.sh
new file mode 100755
index 00000000..96db9bb2
--- /dev/null
+++ b/api/launch-extras.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+set -eu
+
+if [ -n "${VIRTUAL_ENV+set}" ]; then
+  echo "Using current virtual env..."
+else
+  if [ -d "onnx_env" ]; then
+    echo "Loading existing virtual env..."
+    . onnx_env/bin/activate
+  else
+    echo "Creating new virtual env..."
+    python -m venv onnx_env
+    . onnx_env/bin/activate
+  fi
+fi
+
+echo "Downloading and converting models to ONNX format..."
+python3 -m onnx_web.convert \
+  --sources \
+  --diffusion \
+  --upscaling \
+  --correction \
+  --extras=${ONNX_WEB_EXTRA_MODELS:-extras.json} \
+  --token=${HF_TOKEN:-}
+
+echo "Launching API server..."
+flask --app=onnx_web.serve run --host=0.0.0.0
diff --git a/api/launch.bat b/api/launch.bat
index e46b55fa..f589bd11 100644
--- a/api/launch.bat
+++ b/api/launch.bat
@@ -1,6 +1,5 @@
 echo "Downloading and converting models to ONNX format..."
-IF "%ONNX_WEB_EXTRA_MODELS%"=="" (set ONNX_WEB_EXTRA_MODELS=extras.json)
-python -m onnx_web.convert --sources --diffusion --upscaling --correction --extras=extras.json --token=%HF_TOKEN%
+python -m onnx_web.convert --sources --diffusion --upscaling --correction --token=%HF_TOKEN%
 
 echo "Launching API server..."
 flask --app=onnx_web.serve run --host=0.0.0.0
diff --git a/api/launch.sh b/api/launch.sh
index 96db9bb2..50863ba8 100755
--- a/api/launch.sh
+++ b/api/launch.sh
@@ -21,7 +21,6 @@ python3 -m onnx_web.convert \
   --diffusion \
   --upscaling \
   --correction \
-  --extras=${ONNX_WEB_EXTRA_MODELS:-extras.json} \
   --token=${HF_TOKEN:-}
 
 echo "Launching API server..."