Merge branch 'release-0.9.1' into feat/custom-cell-timeout

Author: nadjajovancevic

.github/workflows/action_main.yml

@@ -30,18 +30,33 @@ jobs:
         id: changeDirsStep
         uses: tj-actions/changed-files@v46
         with:
-          dir_names: true
+          dir_names: true  # this only outputs directory names
           files: |
             **/*
             *
+
+      - name: Check if Dockerfile changed
+        id: changeDockerfileStep
+        uses: tj-actions/changed-files@v46
+        with:
+          files: Dockerfile
+
+
       - id: outputStep
-        run: echo "::set-output name=changeDirs::${{ steps.changeDirsStep.outputs.all_changed_files }}"
+        run: |
+          {
+            echo "changeDirs=${{ steps.changeDirsStep.outputs.all_changed_files }}";
+            echo "changeDockerfile=${{ steps.changeDockerfileStep.outputs.any_changed }}"
+          } >> "$GITHUB_OUTPUT"
 
   # ON CHANGED FILES
   build_grader-service:
     uses: ./.github/workflows/build.yml
     needs: init
-    if: contains(needs.init.outputs.changeDirs, 'grader_service') || contains(needs.init.outputs.changeDirs, '.github/workflows') || contains(needs.init.outputs.changeDirs, 'Dockerfile')
+    if: |
+      contains(needs.init.outputs.changeDirs, 'grader_service') ||
+      contains(needs.init.outputs.changeDirs, '.github/workflows') ||
+      needs.init.outputs.changeDockerfile == 'true'
 
   dockerize_grader-service:
     needs: build_grader-service

.gitlab-ci.yml

@@ -114,11 +114,10 @@ and handle the evaluation of user submissions, such as running notebooks for gra
 Auto-grading is accomplished using the `grader_service.convert` submodule, which can be executed as a command-line interface (CLI). 
 Different executors are available to manage this:
 - **LocalAutogradeExecutor**: Executes the module directly within the current Python process on the worker by importing the package and invoking the converters.
-- **LocalProcessAutogradeExecutor**: Runs the submodule in a separate process.
+- **LocalAutogradeProcessExecutor**: Runs the submodule in a separate process.
 - **KubeAutogradeExecutor**: Spawns a Kubernetes pod to run the submodule. This is the only approach that allows different images for lectures, as the grading code must be executed in the same environment as the lecture.
 
 
 # How To Scale
 
 [//]: # (TODO: what is the minimal setup? what is the most sophisticated setup)
-

docs/source/admin/system_architecture.md

@@ -17,7 +17,7 @@ the containers together with their services.
 
 Run the following command:
 ```bash
-DATABASE_TYPE=sqlite docker compose up --build -d
+docker compose up --build -d
 ```
 
 This command builds the images and starts the containers in detached mode. It sets SQLite as its database that is integrated in `Grader Service`.
@@ -43,5 +43,3 @@ To stop and remove the containers, run:
 ```bash
 docker compose -f docker-compose.yml -f docker-compose-postgres.yml down -v
 ```
-
-

docs/source/installation/docker.md

@@ -1,20 +1,24 @@
 FROM postgres
 
-# Install git
+# Install python
 RUN apt-get update && \
-    apt-get install -y python3 python3-venv && \
+    apt-get install -y python3 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Install uv
+COPY --from=ghcr.io/astral-sh/uv:0.9.3 /uv /uvx /bin/
+
 WORKDIR /app
 
-# Copy necessary files and folders
+# Install python dependencies, only copying necessary files
 COPY ./pyproject.toml MANIFEST.in ./
-COPY ./grader_service ./grader_service
-# Create a virtual environment
-RUN python3 -m venv /venv
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --no-install-project --link-mode=copy
 
-# Activate venv and install the package
-RUN /venv/bin/pip install .
+# Copy the project files and install the package itself
+COPY ./grader_service ./grader_service
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv pip install --link-mode=copy .
 
-CMD ["sh", "-c", "/app/init-db.sh"]
+CMD ["sh", "-c", "/app/init-db-postgres.sh"]

examples/docker_compose/Dockerfile-DBInit

@@ -6,12 +6,14 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Install uv
+COPY --from=ghcr.io/astral-sh/uv:0.9.3 /uv /uvx /bin/
+
 WORKDIR /app
 
 ENV JUPYTERHUB_CRYPT_KEY=e3f92a0d5e37446c7e894a2ef6c6ec3bcb4aa3c38d2a442eb567adf780597aa0
 
-RUN pip install grader_labextension
-
-RUN python3 -m pip install dockerspawner oauthenticator
+RUN  --mount=type=cache,target=/root/.cache/uv \
+    uv pip install grader_labextension dockerspawner oauthenticator
 
-CMD ["jupyterhub", "-f", "/app/jupyterhub_config.py"]
+CMD ["jupyterhub", "-f", "/app/jupyterhub_config.py"]

examples/docker_compose/Dockerfile-Hub

@@ -1,19 +1,26 @@
 FROM python:3.13-slim
 
-# Install git
+# Install git and sqlite
 RUN apt-get update && \
-    apt-get install -y git && \
+    apt-get install -y git sqlite3 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Install uv
+COPY --from=ghcr.io/astral-sh/uv:0.9.3 /uv /uvx /bin/
+ENV UV_SYSTEM_PYTHON=true
+
 WORKDIR /app
 
-# Copy necessary files and folders
+# Install python dependencies, only copying necessary files
 COPY ./pyproject.toml MANIFEST.in ./
-COPY ./grader_service ./grader_service
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --no-install-project
 
-RUN pip install .
-RUN pip install numpy ipykernel
+# Copy the project files and install only the package itself
+COPY ./grader_service ./grader_service
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv pip install --link-mode=copy -e .
 
 # Set default branch to main and default user
 RUN git config --global init.defaultBranch main && \

examples/docker_compose/Dockerfile-Service

@@ -16,7 +16,7 @@ the containers together with their services.
 
 Run the following command:
 ```bash
-DATABASE_TYPE=sqlite docker compose up --build -d
+docker compose up --build -d
 ```
 
 This command builds the images and starts the containers in detached mode. It sets SQLite as its database that is integrated in `Grader Service`.
@@ -42,5 +42,3 @@ To stop and remove the containers, run:
 ```bash
 docker compose -f docker-compose.yml -f docker-compose-postgres.yml down -v
 ```
-
-