diff --git a/.env b/.env index 0c0eca4..fbaff76 100644 --- a/.env +++ b/.env @@ -1,7 +1,3 @@ -# if you want to use modelbench from modelbench-private, uncomment below line -# NOTE: this will not work if you do not have access to that repo -# USE_PRIVATE_MODELBENCH=true - # postgres env for local mlflow tracking server # you don't need to set these if mlflow is already running somewhere else # (in that case, you don't need postgres at all) diff --git a/.env.jupyteronly b/.env.jupyteronly index ba49c53..260ab46 100644 --- a/.env.jupyteronly +++ b/.env.jupyteronly @@ -1,7 +1,3 @@ -# if you want to use modelbench from modelbench-private, uncomment below line -# NOTE: this will not work if you do not have access to that repo -USE_PRIVATE_MODELBENCH=true - # THIS MUST BE SET MLFLOW_TRACKING_URI=https://modelplane.mlflow.dev.modelmodel.org diff --git a/.env.nojupyter b/.env.nojupyter index 3fb45be..e28d76e 100644 --- a/.env.nojupyter +++ b/.env.nojupyter @@ -1,7 +1,3 @@ -# if you want to use modelbench from modelbench-private, uncomment below line -# NOTE: this will not work if you do not have access to that repo -# USE_PRIVATE_MODELBENCH=true - # postgres env for local mlflow tracking server # you don't need to set these if mlflow is already running somewhere else # (in that case, you don't need postgres at all) diff --git a/Dockerfile.jupyter b/Dockerfile.jupyter index 6cbca8c..bd68377 100644 --- a/Dockerfile.jupyter +++ b/Dockerfile.jupyter @@ -1,9 +1,6 @@ FROM python:3.12-slim -ARG USE_PRIVATE_MODELBENCH - ENV PATH="/root/.local/bin:$PATH" -ENV USE_PRIVATE_MODELBENCH=${USE_PRIVATE_MODELBENCH} # Used for the notebook server WORKDIR /app @@ -18,12 +15,7 @@ RUN mkdir -p /root/.ssh && chmod 700 /root/.ssh RUN git config --global core.sshCommand "ssh -o UserKnownHostsFile=/root/.ssh/known_hosts -o ForwardAgent=yes" RUN ssh-keyscan github.com > /root/.ssh/known_hosts -# conditionally forward ssh key to install private dependencies -RUN --mount=type=ssh if [ "$USE_PRIVATE_MODELBENCH" = "true" ]; then \ - poetry install --no-interaction --no-ansi --no-root --extras modelbench-private; \ - else \ - poetry install --no-interaction --no-ansi --no-root; \ - fi +RUN poetry install --no-interaction --no-ansi --no-root COPY src/ ./src/ RUN echo $(poetry env info --path) diff --git a/docker-compose.yaml b/docker-compose.yaml index a4c5e80..96be7eb 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -60,13 +60,10 @@ services: build: context: . dockerfile: Dockerfile.jupyter - args: - USE_PRIVATE_MODELBENCH: ${USE_PRIVATE_MODELBENCH} environment: MLFLOW_TRACKING_URI: ${MLFLOW_TRACKING_URI} MLFLOW_TRACKING_USERNAME: ${MLFLOW_TRACKING_USERNAME} MLFLOW_TRACKING_PASSWORD: ${MLFLOW_TRACKING_PASSWORD} - USE_PRIVATE_MODELBENCH: ${USE_PRIVATE_MODELBENCH} JUPYTER_TOKEN: ${JUPYTER_TOKEN} GIT_PYTHON_REFRESH: ${GIT_PYTHON_REFRESH} VLLM_API_KEY: ${VLLM_API_KEY}