Release 2.9.0

.gitignore

@@ -9,3 +9,5 @@ __pycache__
 venv
 venv2
 build
+docker-compose.override.yml
+/workspace

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.11.0
     hooks:
     - id: black
   - repo: https://github.com/pycqa/flake8

Changelog.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 All notable changes to this project will be documented here.
 
+## [v2.9.0]
+- Install stack with GHCup (#626)
+- Fixed AI tester to report error when the specified `submission` file is not found (#663)
+- Updated docker image to use Ubuntu 24.04 (#668)
+- Fixed stack installation in Docker environment (#668)
+- Removed `click` from server requirements.txt file (#679)
+- Fixed bug in R tester setup that always triggered reinstallation of R dependencies (#680)
+
 ## [v2.8.3]
 - Add troubleshooting section talking about Docker Content Trust (DCT) (#653)
 - Fixed Python tester to display fully qualified name when running pytest (#656)
@@ -22,6 +30,7 @@ All notable changes to this project will be documented here.
 - Add `ai_tester` module to support AI-based autograding via `ai-autograding-feedback` (#625)
 - Add `ai` to list of testers (#628)
 - Fixed an `AttributeError` when handling exceptions in server `update_test_settings` (#629)
+- Add tag functionalty to `ai_tester` (#631)
 - Added opt out feature to the `ai_tester` by searching for `NO_EXTERNAL_AI_FEEDBACK` (#632)
 - Modified R tester to always display test result messages, even when tests pass (#633)
 

client/.dockerfiles/Dockerfile

@@ -1,7 +1,10 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 
 FROM ubuntu:$UBUNTU_VERSION
 
+# Remove ubuntu user, added in the 23.04 image
+RUN userdel -r ubuntu
+
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
     DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \

client/requirements.txt

@@ -1,6 +1,6 @@
-flask==3.1.1
-python-dotenv==1.1.1
-rq==2.4.1
-redis==6.2.0
-jsonschema==4.25.0
+flask==3.1.2
+python-dotenv==1.2.1
+rq==2.6.0
+redis==7.1.0
+jsonschema==4.25.1
 Werkzeug==3.1.3

compose.yaml

@@ -4,10 +4,10 @@ services:
       context: ./server
       dockerfile: ./.dockerfiles/Dockerfile
       args:
-        UBUNTU_VERSION: '22.04'
+        UBUNTU_VERSION: '24.04'
         LOGIN_USER: 'docker'
         WORKSPACE: '/home/docker/.autotesting'
-    image: markus-autotest-server-dev:1.3.0
+    image: markus-autotest-server-dev:1.4.0
     volumes:
       - ./server:/app:cached
       - venv_server:/home/docker/markus_venv
@@ -28,8 +28,8 @@ services:
       context: ./client
       dockerfile: ./.dockerfiles/Dockerfile
       args:
-        UBUNTU_VERSION: '22.04'
-    image: markus-autotest-client-dev:1.3.0
+        UBUNTU_VERSION: '24.04'
+    image: markus-autotest-client-dev:1.4.0
     container_name: 'autotest-client'
     volumes:
       - ./client:/app:cached

server/.dockerfiles/Dockerfile

@@ -1,7 +1,9 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 
 FROM ubuntu:$UBUNTU_VERSION AS base
 
+# Remove ubuntu user, added in the 23.04 image
+RUN userdel -r ubuntu
 
 ARG LOGIN_USER
 ARG WORKSPACE
@@ -29,6 +31,7 @@ RUN apt-get update -y && \
                        libharfbuzz-dev \
                        libfribidi-dev \
                        libxml2-dev \
+                       libnuma-dev \
                        r-base
 
 RUN useradd -ms /bin/bash $LOGIN_USER && \
@@ -37,18 +40,17 @@ RUN useradd -ms /bin/bash $LOGIN_USER && \
         adduser --disabled-login --no-create-home $worker && \
         echo "$LOGIN_USER ALL=($worker) NOPASSWD:ALL" | EDITOR="tee -a" visudo && \
         usermod -aG $worker $LOGIN_USER; \
-    done
-
-RUN chmod a+x /home/${LOGIN_USER}
+    done && \
+    chmod a+x /home/${LOGIN_USER}
 
 COPY . /app
 
 RUN find /app/autotest_server/testers -name requirements.system -exec {} \;
 
 RUN echo "TZ=$( cat /etc/timezone )" >> /etc/R/Renviron.site
 
-RUN mkdir -p ${WORKSPACE} && chown ${LOGIN_USER} ${WORKSPACE}
-RUN mkdir -p /home/${LOGIN_USER}/markus_venv && chown ${LOGIN_USER} /home/${LOGIN_USER}/markus_venv
+RUN mkdir -p ${WORKSPACE} && chown ${LOGIN_USER} ${WORKSPACE} && \
+    mkdir -p /home/${LOGIN_USER}/markus_venv && chown ${LOGIN_USER} /home/${LOGIN_USER}/markus_venv
 
 WORKDIR /home/${LOGIN_USER}
 

server/autotest_server/__init__.py

@@ -83,6 +83,8 @@ def _create_test_group_result(
             result["annotations"] = res["annotations"]
         elif "tags" in res:
             result["tags"] = res["tags"]
+        elif "extra_marks" in res:
+            result["extra_marks"] = res["extra_marks"]
         elif "overall_comment" in res:
             result["overall_comment"] = res["overall_comment"]
         else:

server/autotest_server/testers/ai/ai_tester.py

@@ -53,6 +53,7 @@ def __init__(
         super().__init__(specs, test_class, resource_settings=resource_settings)
         self.annotations = []
         self.overall_comments = []
+        self.tags = []
 
     def call_ai_feedback(self) -> dict:
         """
@@ -81,7 +82,17 @@ def call_ai_feedback(self) -> dict:
             return results
 
         submission_file = config.get("submission")
-        if self._term_in_file(submission_file):
+        try:
+            disallowed_term_in_file = self._term_in_file(submission_file)
+        except FileNotFoundError:
+            results[test_label] = {
+                "title": test_label,
+                "status": "error",
+                "message": f'Could not file submission file "{submission_file}"',
+            }
+            return results
+
+        if disallowed_term_in_file:
             results[test_label] = {
                 "title": test_label,
                 "status": "success",
@@ -96,15 +107,26 @@ def call_ai_feedback(self) -> dict:
         try:
             result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=timeout, env=env)
             output = result.stdout
+
+            parsed = None
+            try:
+                parsed = json.loads(output)
+            except json.JSONDecodeError:
+                pass
+            if isinstance(parsed, dict):
+                if "tags" in parsed:
+                    tags = parsed["tags"]
+                    self.tags.extend(tags)
+                if "output" in parsed:
+                    output = parsed["output"]
+
             if output_mode == "overall_comment":
                 self.overall_comments.append(output)
                 results[test_label] = {"title": test_label, "status": "success"}
             elif output_mode == "annotations":
-                try:
-                    annotations_data = json.loads(output)
-                    annotations = annotations_data.get("annotations", annotations_data)
-                except json.JSONDecodeError as e:
-                    raise ValueError(f"Invalid JSON in output for {test_label}: {e}")
+                if parsed is None:
+                    raise ValueError(f"Unable to parse the output of '{output}'")
+                annotations = parsed.get("annotations", parsed)
                 self.annotations.extend(annotations)
                 results[test_label] = {"title": test_label, "status": "success"}
             elif output_mode == "message":
@@ -122,23 +144,20 @@ def _term_in_file(self, file_path: str) -> bool:
         term = "NO_EXTERNAL_AI_FEEDBACK"
         path = Path(file_path)
 
-        try:
-            if path.suffix.lower() == ".pdf":
-                with open(file_path, "rb") as f:
-                    reader = PyPDF2.PdfReader(f)
-                    for page in reader.pages:
-                        text = page.extract_text() or ""
-                        if term in text:
-                            return True
-                return False
-            else:
-                with open(file_path, "r", encoding="utf-8") as f:
-                    for line in f:
-                        if term in line:
-                            return True
-                return False
-        except FileNotFoundError:
-            return True
+        if path.suffix.lower() == ".pdf":
+            with open(file_path, "rb") as f:
+                reader = PyPDF2.PdfReader(f)
+                for page in reader.pages:
+                    text = page.extract_text() or ""
+                    if term in text:
+                        return True
+            return False
+        else:
+            with open(file_path, "r", encoding="utf-8") as f:
+                for line in f:
+                    if term in line:
+                        return True
+            return False
 
     @Tester.run_decorator
     def run(self) -> None:
@@ -157,3 +176,5 @@ def after_tester_run(self) -> None:
             print(self.test_class.format_annotations(self.annotations))
         if self.overall_comments:
             print(self.test_class.format_overall_comment(self.overall_comments, separator="\n\n"))
+        if self.tags:
+            print(self.test_class.format_tags(self.tags))

server/autotest_server/testers/haskell/haskell_tester.py

@@ -7,6 +7,9 @@
 from ..tester import Tester, Test, TestError
 from ..specs import TestSpecs
 
+home = os.getenv("HOME")
+os.environ["PATH"] = f"{home}/.cabal/bin:{home}/.ghcup/bin:" + os.environ["PATH"]
+
 
 class HaskellTest(Test):
     def __init__(

server/autotest_server/testers/haskell/requirements.system

@@ -1,8 +1,15 @@
 #!/usr/bin/env bash
 
-if ! dpkg -l ghc cabal-install haskell-stack &> /dev/null; then
-  apt-get -y update
-  DEBIAN_FRONTEND=noninteractive apt-get install -y -o 'Dpkg::Options::=--force-confdef' -o 'Dpkg::Options::=--force-confold' ghc cabal-install haskell-stack
+apt-get -y update
+
+if ! dpkg -l ghc cabal-install &> /dev/null; then
+  DEBIAN_FRONTEND=noninteractive apt-get install -y -o 'Dpkg::Options::=--force-confdef' -o 'Dpkg::Options::=--force-confold' ghc cabal-install
 fi
 
-stack update
+if [ ! -x "$HOME/.ghcup/bin/ghcup" ] && [ ! -x "/usr/local/bin/stack" ]; then
+  BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
+  $HOME/.ghcup/bin/ghcup install stack recommended
+  if [ "$(id -u)" -eq 0 ]; then
+    cp $HOME/.ghcup/bin/stack /usr/local/bin/
+  fi
+fi

server/autotest_server/testers/haskell/setup.py

@@ -3,7 +3,10 @@
 import subprocess
 
 HASKELL_TEST_DEPS = ["tasty-discover", "tasty-quickcheck", "tasty-hunit"]
-STACK_RESOLVER = "lts-16.17"
+STACK_RESOLVER = "lts-21.21"
+
+home = os.getenv("HOME")
+os.environ["PATH"] = f"{home}/.cabal/bin:{home}/.ghcup/bin:" + os.environ["PATH"]
 
 
 def create_environment(_settings, _env_dir, default_env_dir):
@@ -16,22 +19,31 @@ def create_environment(_settings, _env_dir, default_env_dir):
 
 
 def install():
-    subprocess.run(
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), "requirements.system"),
-        check=True,
-        capture_output=True,
-        text=True,
-    )
+    try:
+        subprocess.run(
+            os.path.join(os.path.dirname(os.path.realpath(__file__)), "requirements.system"),
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+    except subprocess.CalledProcessError as e:
+        raise RuntimeError(f"Error executing Haskell requirements.system: {e}")
     resolver = STACK_RESOLVER
     cmd = ["stack", "build", "--resolver", resolver, "--system-ghc", *HASKELL_TEST_DEPS]
-    subprocess.run(cmd, check=True, capture_output=True)
-    subprocess.run(
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), "stack_permissions.sh"),
-        check=True,
-        shell=True,
-        capture_output=True,
-        text=True,
-    )
+    try:
+        subprocess.run(cmd, check=True, capture_output=True)
+    except subprocess.CalledProcessError as e:
+        raise RuntimeError(f"Error running {cmd}: {e}")
+    try:
+        subprocess.run(
+            os.path.join(os.path.dirname(os.path.realpath(__file__)), "stack_permissions.sh"),
+            check=True,
+            shell=True,
+            capture_output=True,
+            text=True,
+        )
+    except subprocess.CalledProcessError as e:
+        raise RuntimeError(f"Error running Haskell stack_permissions.sh: {e}")
 
 
 def settings():

server/autotest_server/testers/haskell/stack_permissions.sh

@@ -2,4 +2,6 @@ echo "allow-different-user: true" >> $STACK_ROOT/config.yaml
 echo "recommend-stack-upgrade: false" >> $STACK_ROOT/config.yaml
 chmod a+w $STACK_ROOT/stack.sqlite3.pantry-write-lock
 chmod a+w $STACK_ROOT/global-project/.stack-work/stack.sqlite3.pantry-write-lock
-chmod a+w $STACK_ROOT/pantry/pantry.sqlite3.pantry-write-lock
+chmod a+w $STACK_ROOT/pantry/pantry.sqlite3.pantry-write-lock
+chmod a+r $WORKSPACE/.stack/config.yaml
+chmod a+r $WORKSPACE/.stack/global-project/stack.yaml

server/autotest_server/testers/jupyter/requirements.txt

@@ -1,3 +1,3 @@
 pytest==7.1.2
-psycopg2-binary==2.9.10
+psycopg2-binary==2.9.11
 git+https://github.com/MarkUsProject/autotest-helpers.git#subdirectory=notebook_helper