From e887a6654db84da39c39d5839afeacae80954f63 Mon Sep 17 00:00:00 2001
From: martabal <74269598+martabal@users.noreply.github.com>
Date: Fri, 16 Jun 2023 22:04:30 +0200
Subject: [PATCH] feat: ray

Signed-off-by: martabal <74269598+martabal@users.noreply.github.com>
---
 Dockerfile                                           | 10 +++-------
 root/etc/s6-overlay/s6-rc.d/init-config-ml/run       |  1 +
 root/etc/s6-overlay/s6-rc.d/svc-machine-learning/run |  4 +---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f60c58d..491793b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,18 +32,14 @@ RUN \
     IMMICH_VERSION=$(curl -sL https://api.github.com/repos/immich-app/immich/releases/latest | \
       jq -r '.tag_name'); \
   fi && \
-  curl -o \
-    /tmp/immich.tar.gz -L \
-    "https://github.com/immich-app/immich/archive/${IMMICH_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/immich.tar.gz -C \
-    /tmp/immich --strip-components=1 && \
+  curl -sL "https://github.com/mertalev/immich/archive/ml-ray.tar.gz" -o /tmp/immich.tar.gz && \
+	tar xf /tmp/immich.tar.gz -C /tmp/immich --strip-components=1 && \
   echo "**** install machine-learning ****" && \
   cd /tmp/immich/machine-learning && \
   mkdir -p \
     /app/immich/machine-learning && \
   cp -a \
-    src \
+    app \
     /app/immich/machine-learning && \
   echo "**** cleanup ****" && \
   apt-get autoremove -y --purge && \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-ml/run b/root/etc/s6-overlay/s6-rc.d/init-config-ml/run
index 72a5098..647e918 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-config-ml/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-config-ml/run
@@ -22,6 +22,7 @@ pip install -U --no-cache-dir \
     onnxruntime-gpu \
     packaging \
     Pillow \
+    ray[serve] \
     scikit-learn \
     scipy \
     sentencepiece \
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-machine-learning/run b/root/etc/s6-overlay/s6-rc.d/svc-machine-learning/run
index dc0cb0d..d0a121e 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-machine-learning/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-machine-learning/run
@@ -1,10 +1,8 @@
 #!/usr/bin/with-contenv bash
 
-source /config/cuda-venv/bin/activate
-
 export HOME=/tmp
 
 exec \
     s6-notifyoncheck -d -n 300 -w 5000 -c "nc -z localhost 3003" \
         cd /app/immich/machine-learning s6-setuidgid abc \
-            python3 src/main.py
+            /config/cuda-venv/bin/serve run app.main:ingress --host 0.0.0.0 --port 3003