ci: refactor Dockerfile using nvcr.io/nvidia/pytorch:24.10-py3 as base image, use samgis-lisa==1.0.9

Dockerfile

@@ -1,19 +1,19 @@
 # Include global ARGs at the dockerfile top
 ARG ARCH="x86_64"
-ARG LAMBDA_TASK_ROOT="/var/task"
-ARG FASTAPI_STATIC="${LAMBDA_TASK_ROOT}/static"
-ARG PYTHONPATH="${LAMBDA_TASK_ROOT}:${PYTHONPATH}:/usr/local/lib/python3/dist-packages"
+ARG WORKDIR_ROOT="/var/task"
+ARG FASTAPI_STATIC="${WORKDIR_ROOT}/static"
+ARG PYTHONPATH="${WORKDIR_ROOT}:${PYTHONPATH}:/usr/local/lib/python3/dist-packages"
 ARG POETRY_NO_INTERACTION=1
 ARG POETRY_VIRTUALENVS_IN_PROJECT=1
 ARG POETRY_VIRTUALENVS_CREATE=1
 ARG POETRY_CACHE_DIR=/tmp/poetry_cache
 
-FROM pytorch/pytorch:2.4.1-cuda12.4-cudnn9-runtime as builder_global
+FROM nvcr.io/nvidia/pytorch:24.10-py3 AS builder_global
 
 LABEL authors="alessandro@trinca.tornidor.com"
 
 ARG ARCH
-ARG LAMBDA_TASK_ROOT
+ARG WORKDIR_ROOT
 ARG PYTHONPATH
 ARG POETRY_NO_INTERACTION
 ARG POETRY_VIRTUALENVS_IN_PROJECT
@@ -23,24 +23,28 @@ ARG POETRY_CACHE_DIR
 RUN echo "ARCH: $ARCH ..."
 
 RUN echo "ARG POETRY_CACHE_DIR: ${POETRY_CACHE_DIR} ..."
-RUN echo "ARG PYTHONPATH: $PYTHONPATH ..."
+RUN echo "ARG PYTHONPATH: $PYTHONPATH, check for python3 and pip"
+RUN which python3
+RUN python3 --version
+RUN python --version
+RUN which pip
+RUN echo "arg dep:"
 
 # Set working directory to function root directory
-WORKDIR ${LAMBDA_TASK_ROOT}
-RUN apt update && apt install git git-lfs software-properties-common -y
-RUN git lfs install
-RUN git clone https://huggingface.co/spaces/aletrn/samgis-lisa-on-cuda ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda && \
-    ls -l ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/dockerfiles/apt_preferences_ubuntu && \
-    cp ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/dockerfiles/apt_preferences_ubuntu /etc/apt/preferences && \
-    ls -l ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/pyproject.toml && \
-    cp ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/pyproject.toml ${LAMBDA_TASK_ROOT}/pyproject.toml && \
-    ls -l ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/poetry.lock && \
-    cp ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/poetry.lock ${LAMBDA_TASK_ROOT}/poetry.lock
-COPY ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/dockerfiles/ubuntu.sources /etc/apt/ubuntu.sources
-RUN echo "ls samgis-lisa-on-cuda ..."
-RUN ls -l /etc/apt/preferences ${LAMBDA_TASK_ROOT}/pyproject.toml ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda
-RUN ls -l ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/static
-RUN add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy main universe restricted multiverse" && \
+RUN groupadd -g 999 python && useradd -r -u 999 -g python python
+# Set working directory to function root directory
+RUN mkdir ${WORKDIR_ROOT} && chown python:python ${WORKDIR_ROOT}
+WORKDIR ${WORKDIR_ROOT}
+COPY --chown=python:python requirements_poetry.txt pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}/
+
+WORKDIR ${WORKDIR_ROOT}
+COPY --chown=python:python ./requirements_poetry.txt pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}/
+RUN apt update && apt install software-properties-common -y
+COPY --chown=python:python ./dockerfiles/ubuntu.sources /etc/apt/ubuntu.sources
+COPY --chown=python:python ./dockerfiles/apt_preferences_ubuntu /etc/apt/preferences
+
+RUN ls -l /etc/apt/preferences ${WORKDIR_ROOT}/pyproject.toml
+RUN apt update && add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy main universe restricted multiverse" && \
     add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy-security main universe restricted multiverse" && \
     add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe restricted multiverse" && \
     add-apt-repository "deb http://archive.ubuntu.com/ubuntu noble main universe restricted multiverse" && \
@@ -49,89 +53,92 @@ RUN add-apt-repository "deb http://archive.ubuntu.com/ubuntu jammy main universe
 
 RUN cat /etc/lsb-release
 # avoid segment-geospatial exception caused by missing libGL.so.1 library
-RUN echo "BUILDER: check libz.s* before start" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so*
+RUN echo "BUILDER: check libz.s* before start:" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so* /lib/${ARCH}-linux-gnu/libz.so*
 
-RUN apt update && apt upgrade -y && apt install -y libgl1 curl python3-pip && apt clean
-#RUN echo "run update noble..."
-#RUN apt update
-#RUN apt update && apt install -t noble zlib1g -y
-RUN echo "BUILDER: check libz.s* after install from trixie" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so*
+RUN apt update && apt upgrade -y && apt install -y libgl1 curl && apt clean
+RUN echo "run update noble..."
+RUN apt update && apt install -t noble zlib1g -y
+RUN rm /lib/x86_64-linux-gnu/libz.so.1.2* || echo "BUILDER: no /lib/${ARCH}-linux-gnu/libz.so.1.2* found"
+RUN rm /usr/lib/${ARCH}-linux-gnu/libz.so.1.2* || echo "BUILDER: no /usr/lib/${ARCH}-linux-gnu/libz.so.1.2* found"
+RUN ln -sf /usr/lib/${ARCH}-linux-gnu/libz.so.1 /usr/lib/${ARCH}-linux-gnu/libz.so
+RUN ln -sf /lib/${ARCH}-linux-gnu/libz.so.1 /lib/${ARCH}-linux-gnu/libz.so
+RUN echo "BUILDER: check libz.s* after install from noble" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so* /lib/${ARCH}-linux-gnu/libz.so*
 
 RUN ls -l /etc/apt/sources* /etc/apt/preferences*
 
-# poetry installation path is NOT within ${LAMBDA_TASK_ROOT}: not needed for runtime docker image
-RUN python -m pip install -r ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/requirements_poetry.txt
+# ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
+# poetry installation path is NOT within ${WORKDIR_ROOT}: not needed for runtime docker image
+RUN python3 -m pip install -r ${WORKDIR_ROOT}/requirements_poetry.txt
 
 RUN which poetry && poetry --version && poetry config --list
-RUN poetry config virtualenvs.path ${LAMBDA_TASK_ROOT}
+RUN poetry config virtualenvs.path ${WORKDIR_ROOT}
 RUN poetry config installer.max-workers 7
 RUN echo "# poetry config --list #" && poetry config --list
-RUN ls -ld ${LAMBDA_TASK_ROOT}/
-#RUN . ${LAMBDA_TASK_ROOT}/.venv/bin/activate && ${LAMBDA_TASK_ROOT}/.venv/bin/python --version && ${LAMBDA_TASK_ROOT}/.venv/bin/python -m pip install pip wheel setuptools --upgrade
-RUN poetry run python -m pip install pip wheel setuptools --upgrade
+RUN ls -ld ${WORKDIR_ROOT}/
+#RUN . ${WORKDIR_ROOT}/.venv/bin/activate && ${WORKDIR_ROOT}/.venv/bin/python --version && ${WORKDIR_ROOT}/.venv/bin/python -m pip install pip wheel setuptools --upgrade
+RUN echo "current path:"
+RUN pwd
+RUN echo "installing poetry dependencies..."
+RUN poetry run python3 -m pip install pip wheel setuptools --upgrade
 RUN poetry install --no-root --no-cache
 
-RUN git clone https://huggingface.co/aletrn/sam-quantized/ ${LAMBDA_TASK_ROOT}/sam-quantized
-RUN git clone -n --depth=1 --filter=tree:0 https://huggingface.co/spaces/aletrn/lisa-on-cuda ${LAMBDA_TASK_ROOT}/lisa-on-cuda && \
-    cd ${LAMBDA_TASK_ROOT}/lisa-on-cuda && \
-    git sparse-checkout set --no-cone resources && \
-    git checkout
-WORKDIR ${LAMBDA_TASK_ROOT}
-RUN ls -l ${LAMBDA_TASK_ROOT}/*
+ENV VIRTUAL_ENV=${WORKDIR_ROOT}/.venv \
+    PATH="${WORKDIR_ROOT}/.venv/bin:$PATH" \
+    PYTHONPATH="${WORKDIR_ROOT}:${WORKDIR_ROOT}/.venv/bin:/usr/local/lib/python3/dist-packages:${PYTHONPATH}"
 
+RUN ls -l ${WORKDIR_ROOT}/.venv/bin
+RUN ls -ld ${WORKDIR_ROOT}/.venv/bin
 
-FROM pytorch/pytorch:2.4.1-cuda12.4-cudnn9-runtime as runtime
+RUN which python3
+RUN python3 -c "import sys; print(sys.path)"
+RUN python3 -c "import cv2"
+
+FROM nvcr.io/nvidia/pytorch:24.10-py3 AS runtime
 
 ARG ARCH
-ARG LAMBDA_TASK_ROOT
+ARG WORKDIR_ROOT
 
-ENV VIRTUAL_ENV=${LAMBDA_TASK_ROOT}/.venv \
-    PATH="${LAMBDA_TASK_ROOT}/.venv/bin:$PATH"
+ENV VIRTUAL_ENV=${WORKDIR_ROOT}/.venv \
+    PATH="${WORKDIR_ROOT}/.venv/bin:$PATH" \
+    PYTHONPATH="${WORKDIR_ROOT}:${WORKDIR_ROOT}/.venv/bin:/usr/local/lib/python3/dist-packages:${PYTHONPATH}"
 
-RUN echo "COPY --from=builder_global /usr/lib/${ARCH}-linux-gnu/libGL.so* /usr/lib/${ARCH}-linux-gnu/"
-COPY --from=builder_global /usr/lib/${ARCH}-linux-gnu/libGL.so* /usr/lib/${ARCH}-linux-gnu/
+RUN which python3
+RUN echo "COPY --chown=python:python --from=builder_global /usr/lib/${ARCH}-linux-gnu/libGL.so* /usr/lib/${ARCH}-linux-gnu/"
+COPY --chown=python:python --from=builder_global /usr/lib/${ARCH}-linux-gnu/libGL.so* /usr/lib/${ARCH}-linux-gnu/
 RUN echo "RUNTIME: check libz.s* before upgrade" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so*
 RUN echo "RUNTIME: remove libz.s* to force upgrade" && rm /usr/lib/${ARCH}-linux-gnu/libz.so*
-COPY --from=builder_global /usr/lib/${ARCH}-linux-gnu/libz.so* /usr/lib/${ARCH}-linux-gnu/
+COPY --chown=python:python --from=builder_global /usr/lib/${ARCH}-linux-gnu/libz.so* /usr/lib/${ARCH}-linux-gnu/
 RUN echo "RUNTIME: check libz.s* after copy" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so*
-COPY --from=builder_global ${LAMBDA_TASK_ROOT}/.venv ${LAMBDA_TASK_ROOT}/.venv
-RUN echo "COPY --from=builder_global ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/scripts/docker_entrypoint.sh ${LAMBDA_TASK_ROOT}/"
-COPY --from=builder_global ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/scripts/docker_entrypoint.sh ${LAMBDA_TASK_ROOT}/
-RUN echo "COPY --from=builder_global ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/scripts/entrypoint.sh ${LAMBDA_TASK_ROOT}/"
-COPY --from=builder_global ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/scripts/entrypoint.sh ${LAMBDA_TASK_ROOT}/
-
-RUN echo "new LAMBDA_TASK_ROOT after hidden venv copy => ${LAMBDA_TASK_ROOT}"
-RUN ls -ld ${LAMBDA_TASK_ROOT}/
-RUN ls -lA ${LAMBDA_TASK_ROOT}/
-RUN echo "content of LAMBDA_TASK_ROOT/.venv => ${LAMBDA_TASK_ROOT}/.venv"
-RUN ls -ld ${LAMBDA_TASK_ROOT}/.venv
-RUN ls -lA ${LAMBDA_TASK_ROOT}/.venv
-RUN ls -lA ${LAMBDA_TASK_ROOT}/docker_entrypoint.sh
-RUN ls -lA ${LAMBDA_TASK_ROOT}/entrypoint.sh
+
+COPY --chown=python:python --from=builder_global ${WORKDIR_ROOT}/.venv ${WORKDIR_ROOT}/.venv
+RUN echo "COPY --chown=python:python scripts/docker_entrypoint.sh ${WORKDIR_ROOT}/"
+COPY --chown=python:python ./scripts/docker_entrypoint.sh ${WORKDIR_ROOT}/
+RUN echo "COPY --chown=python:python scripts/entrypoint.sh ${WORKDIR_ROOT}/"
+COPY --chown=python:python ./scripts/entrypoint.sh ${WORKDIR_ROOT}/
+RUN chmod 700 ${WORKDIR_ROOT}/docker_entrypoint.sh ${WORKDIR_ROOT}/entrypoint.sh
+RUN apt update && apt upgrade -y && apt clean
+
+RUN echo "new WORKDIR_ROOT after hidden venv COPY --chown=python:python => ${WORKDIR_ROOT}"
+RUN ls -ld ${WORKDIR_ROOT}/
+RUN ls -lA ${WORKDIR_ROOT}/
+RUN echo "content of WORKDIR_ROOT/.venv => ${WORKDIR_ROOT}/.venv"
+RUN ls -ld ${WORKDIR_ROOT}/.venv
+RUN ls -lA ${WORKDIR_ROOT}/.venv
+RUN ls -lA ${WORKDIR_ROOT}/docker_entrypoint.sh
+RUN ls -lA ${WORKDIR_ROOT}/entrypoint.sh
 RUN cat /etc/lsb-release
-# deb-src http://it.archive.ubuntu.com/ubuntu/ noble main universe restricted multiverse
-# add-apt-repository "deb http://archive.ubuntu.com/ubuntu noble main universe restricted multiverse"
-RUN echo "install software-properties-common ..."
-COPY --from=builder_global /etc/apt/ubuntu.sources /etc/apt/ubuntu.sources
-RUN apt update && apt install software-properties-common -y
-RUN echo "install nodejs from source ..."
-RUN add-apt-repository "deb-src http://archive.ubuntu.com/ubuntu noble main universe restricted multiverse"
-RUN apt update && apt build-dep nodejs && apt -b source -t noble nodejs && apt remove software-properties-common -y && \
-    apt autoremove && apt clean
-RUN which node
-RUN which npm
 
 
 ### conditional section
-FROM node:20-slim AS node_fastapi
+FROM node:22 AS node_fastapi
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-ARG LAMBDA_TASK_ROOT
+ARG WORKDIR_ROOT
 
 RUN corepack enable
 
-COPY --from=builder_global ${LAMBDA_TASK_ROOT}/samgis-lisa-on-cuda/static /appnode
+COPY ./static /appnode
 WORKDIR /appnode
 # RUN echo "pnpm store path:" && pnpm store path
 RUN ls -l /appnode
@@ -140,7 +147,7 @@ RUN ls -l /appnode/list_files.html
 
 FROM node_fastapi AS node_prod_deps
 
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store; pnpm install --prod --frozen-lockfile
 # here multiple conditions concatenated to avoid failing on check
 RUN if [ ! -d /appnode/node_modules ]; then echo "no node_modules folder" && exit 1; fi
 
@@ -160,65 +167,58 @@ RUN if [ ! -d /appnode/dist ]; then echo "no dist folder" && exit 1; fi
 
 FROM runtime
 ARG FASTAPI_STATIC
+# Include global arg in this stage of the build
+ARG WORKDIR_ROOT="/var/task"
+ENV VIRTUAL_ENV=${WORKDIR_ROOT}/.venv \
+    PATH="${WORKDIR_ROOT}/.venv/bin:$PATH"
+ENV IS_AWS_LAMBDA=""
 
-RUN echo "show disk space, df -h ..."
-RUN df -h
-RUN echo "creating FASTAPI_STATIC folder: ${FASTAPI_STATIC}, use `mkdir -p` to avoid failure if missing parent folder ..."
-RUN mkdir -p ${FASTAPI_STATIC}
-
-COPY --from=builder_global ${LAMBDA_TASK_ROOT}/sam-quantized/machine_learning_models \
-    ${LAMBDA_TASK_ROOT}/machine_learning_models
-RUN ls -ld ${LAMBDA_TASK_ROOT}/machine_learning_models
-RUN ls -lh ${LAMBDA_TASK_ROOT}/machine_learning_models
-COPY --from=builder_global ${LAMBDA_TASK_ROOT}/lisa-on-cuda/resources ${LAMBDA_TASK_ROOT}/resources
-COPY --from=node_prod_deps /appnode/node_modules* ${FASTAPI_STATIC}/node_modules
-COPY --from=node_build /appnode/dist* ${FASTAPI_STATIC}/dist
-COPY --from=node_build /appnode/list_files.html ${FASTAPI_STATIC}/list_files.html
+RUN mkdir ${FASTAPI_STATIC}
+
+COPY --chown=python:python ./app.py ${WORKDIR_ROOT}/
+COPY --chown=python:python ./sam-quantized/machine_learning_models ${WORKDIR_ROOT}/machine_learning_models
+COPY --chown=python:python --from=node_prod_deps /appnode/node_modules* ${FASTAPI_STATIC}/node_modules
+COPY --chown=python:python --from=node_build /appnode/dist* ${FASTAPI_STATIC}/dist
+COPY --chown=python:python static/list_files.html ${FASTAPI_STATIC}/
 RUN ls -l ${FASTAPI_STATIC}/
 RUN ls -l ${FASTAPI_STATIC}/list_files.html
 
-
-# Include global arg in this stage of the build
-ARG LAMBDA_TASK_ROOT="/var/task"
-ARG PYTHONPATH="${LAMBDA_TASK_ROOT}:${PYTHONPATH}:/usr/local/lib/python3/dist-packages"
-ENV VIRTUAL_ENV=${LAMBDA_TASK_ROOT}/.venv \
-    PATH="${LAMBDA_TASK_ROOT}/.venv/bin:$PATH"
-ENV IS_AWS_LAMBDA=""
-
 # Set working directory to function root directory
-WORKDIR ${LAMBDA_TASK_ROOT}
+WORKDIR ${WORKDIR_ROOT}
 
+# ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
+RUN ls -lA ${WORKDIR_ROOT}/
+RUN ls -ld ${WORKDIR_ROOT}/.venv
 RUN ls -l /usr/bin/which
-RUN /usr/bin/which python
-RUN python --version
-RUN node --version
-RUN npm --version
+RUN /usr/bin/which python3
+RUN python3 --version
+# RUN node --version
+# RUN npm --version
 RUN echo "PYTHONPATH: ${PYTHONPATH}."
 RUN echo "PATH: ${PATH}."
-RUN echo "LAMBDA_TASK_ROOT: ${LAMBDA_TASK_ROOT}."
-RUN ls -l ${LAMBDA_TASK_ROOT}
-RUN ls -ld ${LAMBDA_TASK_ROOT}
-RUN ls -l ${LAMBDA_TASK_ROOT}/machine_learning_models
-RUN python -c "import sys; print(sys.path)"
-RUN python -c "import cv2"
-RUN python -c "import fastapi"
-RUN python -c "import geopandas"
-RUN python -c "import loguru"
-RUN python -c "import rasterio"
-RUN python -c "import uvicorn"
+RUN echo "WORKDIR_ROOT: ${WORKDIR_ROOT}."
+RUN ls -l ${WORKDIR_ROOT}
+RUN ls -ld ${WORKDIR_ROOT}
+RUN ls -l ${WORKDIR_ROOT}/machine_learning_models
+RUN python3 -c "import sys; print(sys.path)"
+RUN python3 -c "import cv2"
+RUN python3 -c "import fastapi"
+RUN python3 -c "import geopandas"
+RUN python3 -c "import rasterio"
+RUN python3 -c "import uvicorn"
 RUN df -h
-RUN echo "LAMBDA_TASK_ROOT /static/:"
-RUN ls -l ${LAMBDA_TASK_ROOT}/static/ || true
-RUN ls -l ${LAMBDA_TASK_ROOT}/static/dist || true
-RUN ls -l ${LAMBDA_TASK_ROOT}/static/node_modules || true
+RUN echo "WORKDIR_ROOT /static/:"
+RUN ls -l ${WORKDIR_ROOT}/static/ || true
+RUN ls -l ${WORKDIR_ROOT}/static/dist || true
+RUN ls -l ${WORKDIR_ROOT}/static/node_modules || true
 RUN echo "FASTAPI_STATIC:"
 RUN ls -l ${FASTAPI_STATIC}/ || true
 RUN ls -l ${FASTAPI_STATIC}/dist || true
 RUN ls -l ${FASTAPI_STATIC}/node_modules || true
-RUN ls -ld ${LAMBDA_TASK_ROOT}/
-RUN ls -lA ${LAMBDA_TASK_ROOT}/
-RUN ls -l ${LAMBDA_TASK_ROOT}/.venv
-RUN ls -l ${LAMBDA_TASK_ROOT}/.venv/bin/activate
+RUN ls -ld ${WORKDIR_ROOT}/
+RUN ls -lA ${WORKDIR_ROOT}/
+RUN ls -l ${WORKDIR_ROOT}/.venv
+RUN ls -l ${WORKDIR_ROOT}/.venv/bin/activate
 
 #CMD [
 #    "source", "/var/task/.venv/bin/activate", "&&",

app.py

@@ -240,7 +240,7 @@ async def index() -> FileResponse:
     return FileResponse(path=str(static_dist_folder / "index.html"), media_type="text/html")
 
 
-app_logger.info(f"creating gradio interface...")
+app_logger.info("creating gradio interface...")
 gr_interface = get_gradio_interface_geojson(infer_lisa_gradio)
 app_logger.info(f"gradio interface created, mounting gradio app on url {vite_gradio_url} within FastAPI...")
 app = gr.mount_gradio_app(app, gr_interface, path=vite_gradio_url)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "samgis-lisa-on-cuda"
-version = "1.6.0"
+version = "1.6.1"
 description = "A VLM backend for machine learning instance segmentation on geospatial data that uses LISA (Reasoning Segmentation via Large Language Model). This demo uses a dedicated GPU."
 authors = ["alessandro trinca tornidor <alessandro@trinca.tornidor.com>"]
 license = "MIT license"
@@ -9,11 +9,11 @@ package-mode = false
 
 [metadata]
 name = "samgis-lisa-on-cuda"
-version = "1.6.0"
+version = "1.6.1"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.11"
-samgis-lisa = "1.0.8"
+samgis-lisa = "1.0.9"
 
 [tool.poetry.group.test]
 optional = true

requirements.txt

@@ -1 +1 @@
-samgis-lisa==1.0.8
+samgis-lisa==1.0.9

requirements_no_versions.txt

@@ -1,2 +1 @@
-samgis-lisa
-samgis_lisa
+samgis-lisa

requirements_poetry.txt

@@ -1 +1 @@
-poetry==1.8.3
+poetry==1.8.5

scripts/docker_entrypoint.sh

@@ -9,7 +9,7 @@ source ${WORKDIR}/.venv/bin/activate
 which python
 python --version
 
-chmod +x ${WORKDIR}/entrypoint.sh
+chmod 700 ${WORKDIR}/entrypoint.sh
 bash ${WORKDIR}/entrypoint.sh
 
 exit 0

scripts/entrypoint.sh

@@ -19,7 +19,7 @@ CUDA_VISIBLE_DEVICES=$(nvidia-smi --query-gpu=memory.free,index --format=csv,nou
 echo "calculated CUDA_VISIBLE_DEVICES env variable: ${CUDA_VISIBLE_DEVICES}."
 export CUDA_VISIBLE_DEVICES
 
-echo "running command 'uvicorn wrappers.fastapi_wrapper:app --host 0.0.0.0 --port 7860'..."
-uvicorn wrappers.fastapi_wrapper:app --host 0.0.0.0 --port 7860
+echo "running command 'uvicorn app:app --host 0.0.0.0 --port 7860'..."
+uvicorn app:app --host 0.0.0.0 --port 7860
 
 exit 0