Upgraded to markus_exam_matcher v0.4.0 (#7823)

Author: david-yz-liu

.dockerfiles/.env

@@ -1,5 +1,5 @@
 MARKUS__REDIS__URL=redis://redis:6379/
-MARKUS__PYTHON=/app/venv/bin/python
+MARKUS__PYTHON=/app/venv/bin/python3.13
 PGUSER=postgres
 PGHOST=postgres
 PGPORT=5432

.dockerfiles/Dockerfile

@@ -77,10 +77,11 @@ ENV PATH="$GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH"
 
 # install optional system dependencies
 RUN apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
+    DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends openssh-server \
-                                                                               python3 \
-                                                                               python3-dev \
-                                                                               python3-venv \
+                                                                               python3.13 \
+                                                                               python3.13-venv \
                                                                                equivs \
                                                                                libjemalloc2
 

.dockerfiles/entrypoint-dev-deps-updater.sh

@@ -20,20 +20,22 @@ else
 fi
 
 # Install Python packages
-[ -f ./venv/bin/python3 ] || python3 -m venv ./venv
-./venv/bin/python3 -m pip install -q --upgrade pip
-printf "[MarkUs] Running pip install -q -r requirements-jupyter.txt..."
-if ./venv/bin/python3 -m pip install -q -r requirements-jupyter.txt; then
+PYTHON_EXE=./venv/bin/python3.13
+[ -f $PYTHON_EXE ] || python3.13 -m venv ./venv
+$PYTHON_EXE -m pip install -q --upgrade pip
+$PYTHON_EXE -m pip install -q uv
+printf "[MarkUs] Running $PYTHON_EXE -m pip install -q -r requirements-jupyter.txt..."
+if $PYTHON_EXE -m pip install -q -r requirements-jupyter.txt; then
   printf " \e[32m✔\e[0m \n"
 fi
-printf "[MarkUs] Running pip install -q -r requirements-scanner.txt..."
-if ./venv/bin/python3 -m pip install -q -r requirements-scanner.txt; then
+printf "[MarkUs] Running $PYTHON_EXE -m pip install -q -r requirements-scanner.txt..."
+if $PYTHON_EXE -m pip install --extra-index-url https://download.pytorch.org/whl/cpu -r requirements-scanner.txt; then
   printf " \e[32m✔\e[0m \n"
 fi
 
 # Install chromium (for nbconvert webpdf conversion)
-printf "[MarkUs] Running playwright install chromium..."
-if ./venv/bin/python3 -m playwright install chromium; then
+printf "[MarkUs] Running $PYTHON_EXE -m playwright install chromium..."
+if $PYTHON_EXE -m playwright install chromium; then
   printf " \e[32m✔\e[0m \n"
 fi
 

.github/workflows/test_ci.yml

@@ -101,7 +101,7 @@ jobs:
       - name: Install python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.13"
       - name: Get pip cache dir
         id: pip-cache
         run: |
@@ -122,8 +122,8 @@ jobs:
             ${{ runner.os }}-playwright-
       - name: Install python packages and playwright dependencies
         run: |
-          python3.10 -m venv venv
-          ./venv/bin/pip install -r requirements-jupyter.txt -r requirements-scanner.txt
+          python3.13 -m venv venv
+          ./venv/bin/pip install --extra-index-url https://download.pytorch.org/whl/cpu -r requirements-jupyter.txt -r requirements-scanner.txt
           ./venv/bin/playwright install chromium
       - name: Configure server
         run: |

app/jobs/split_pdf_job.rb

@@ -52,9 +52,16 @@ def perform(exam_template, _path, split_pdf_log, _original_filename = nil, _role
       qr_scan_results = {}
       if status.success?
         csv = CSV.parse(stdout, headers: false)
-        csv.each do |row|
+        csv.each_with_index do |row, i|
           next if row.empty?
           qr_scan_results[row[0]] = row.length >= 2 ? row[1] : ''
+          if row.length >= 3
+            orientation = row[2].to_i
+            if (-181..-179).cover?(orientation) || (179..181).cover?(orientation)
+              current_rotation = pdf.pages[i][:Rotate] || 0
+              pdf.pages[i][:Rotate] = (current_rotation + orientation) % 360
+            end
+          end
         end
       else
         raise "Error running markus-exam-matcher. Details:\n#{stdout}\n#{stderr}"

requirements-scanner.txt

@@ -1,2 +1,2 @@
 # TODO: replace requirements files with Pipfile file (when it is stable and supported by pip)
-markus_exam_matcher==0.2.0
+markus_exam_matcher==0.4.0

spec/jobs/split_pdf_job_spec.rb

@@ -81,14 +81,9 @@
     SplitPdfJob.perform_now(exam_template, '', split_pdf_log, filename, instructor, user)
 
     expect(Group.count).to eq 1
-    expect(split_pdf_log.num_groups_in_incomplete).to eq 1
-    expect(split_pdf_log.num_pages_qr_scan_error).to eq 2
-    expect(split_pdf_log.split_pages.where(status: 'ERROR: QR code not found').count).to eq 2
-    expect(split_pdf_log.split_pages.where(status: 'Saved to incomplete directory').count).to eq 4
-
-    # Check that error pages were saved correctly.
-    error_dir_entries = Dir.entries(File.join(exam_template.base_path, 'error')) - %w[. ..]
-    expect(error_dir_entries.length).to eq 2
+    expect(split_pdf_log.num_groups_in_complete).to eq 1
+    expect(split_pdf_log.num_pages_qr_scan_error).to eq 0
+    expect(split_pdf_log.split_pages.where(status: 'Saved to complete directory').count).to eq 6
   end
 
   it 'correctly splits a PDF with one test paper with three pages having an unparseable QR code but parseable text' do