Added database to inference server (#1446)

* added db for inference

* fixed dockerfiles for inference

docker/inference/Dockerfile.server

@@ -7,7 +7,7 @@ ARG APP_USER="${MODULE}-${SERVICE}"
 ARG APP_RELATIVE_PATH="${MODULE}/${SERVICE}"
 
 
-FROM python:3-slim as build
+FROM python:3.10-slim as build
 ARG APP_RELATIVE_PATH
 
 WORKDIR /build
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/pip \
 
 
 
-FROM python:3.10-alpine3.17 as base-env
+FROM python:3.10-slim as base-env
 ARG APP_USER
 ARG APP_RELATIVE_PATH
 ARG MODULE
@@ -50,6 +50,9 @@ WORKDIR ${APP_ROOT}
 
 
 COPY --chown="${APP_USER}:${APP_USER}" --from=build /build/lib                     ${APP_LIBS}
+COPY --chown="${APP_USER}:${APP_USER}"              ./${APP_RELATIVE_PATH}/alembic alembic
+COPY --chown="${APP_USER}:${APP_USER}"              ./${APP_RELATIVE_PATH}/alembic.ini .
+COPY --chown="${APP_USER}:${APP_USER}"              ./${APP_RELATIVE_PATH}/oasst_inference_server oasst_inference_server
 COPY --chown="${APP_USER}:${APP_USER}"              ./${APP_RELATIVE_PATH}/main.py .
 
 

docker/inference/Dockerfile.text-client

@@ -1,50 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG APP_USER="text-client"
-ARG APP_RELATIVE_PATH="inference/text-client"
-
-
-FROM python:3.10-alpine3.17 as build
-ARG APP_RELATIVE_PATH
-
-WORKDIR /build
-
-COPY ./${APP_RELATIVE_PATH}/requirements.txt .
-
-RUN --mount=type=cache,target=/var/cache/pip \
-    pip install                  \
-      --cache-dir=/var/cache/pip \
-      --target=lib               \
-      -r requirements.txt
-
-
-
-FROM python:3.10-alpine3.17 as base-env
-ARG APP_USER
-ARG APP_RELATIVE_PATH
-
-ENV APP_ROOT="/opt/${APP_RELATIVE_PATH}"
-ENV APP_LIBS="/var/opt/${APP_RELATIVE_PATH}/lib"
-
-ENV PATH="${PATH}:${APP_LIBS}/bin"
-ENV PYTHONPATH="${PYTHONPATH}:${APP_LIBS}"
-
-
-RUN adduser               \
-      --disabled-password \
-      --no-create-home    \
-      "${APP_USER}"
-
-USER ${APP_USER}
-
-WORKDIR ${APP_ROOT}
-
-COPY --chown="${APP_USER}:${APP_USER}" --from=build /build/lib                         ${APP_LIBS}
-COPY --chown="${APP_USER}:${APP_USER}"              ./${APP_RELATIVE_PATH}/__main__.py .
-
-
-
-FROM base-env as prod
-
-
-CMD python3 __main__.py --backend-url "${BACKEND_URL}"

docker/inference/Dockerfile.worker

@@ -48,7 +48,7 @@ WORKDIR ${APP_ROOT}
 
 
 COPY --chown="${APP_USER}:${APP_USER}" --from=build /build/lib                         ${APP_LIBS}
-COPY --chown="${APP_USER}:${APP_USER}"              ./${APP_RELATIVE_PATH}/__main__.py .
+COPY --chown="${APP_USER}:${APP_USER}"              ./${APP_RELATIVE_PATH}/*.py .
 
 
 CMD python3 __main__.py --backend-url "${BACKEND_URL}" --inference-server-url "${INFERENCE_SERVER_URL}"