Merge pull request #311 from TU-Wien-dataLAB/release-0.9.1

Releases: 0.9.0, 0.9.1 & 0.9.2 - merge into `main`

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

.github/workflows/build.yml

@@ -17,12 +17,15 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      TESTCONTAINER_DOCKER_NETWORK: postgresql-testcontainers
+      DOCKER_BUILDKIT: 1
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # BUILD
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: '3.12'
     - name: Install dependencies
@@ -55,9 +58,15 @@ jobs:
         source venv/bin/activate
         pip install . 
         pip install -r ./requirements-test.txt
+
+    - name: Create Docker network for running Testcontainers
+      run: docker network create ${{ env.TESTCONTAINER_DOCKER_NETWORK }}
+
     - name: Run tests
       run: |
         source venv/bin/activate
+        git config --global user.name "Grader Test"
+        git config --global user.email "[email protected]"
         pytest ./grader_service/tests
 
     # Upload Artifacts
@@ -68,4 +77,4 @@ jobs:
         retention-days: 1
         path: |
           ./dist
-          !./dist/**/*.md
+          !./dist/**/*.md

.gitignore

@@ -3,7 +3,6 @@
 # Edit at https://www.toptal.com/developers/gitignore?templates=python,node,vscode,pycharm,macos,windows,linux
 
 jupyter_hub_config*.py
-grader_service*_config.py
 grader_labextension/grader/grader_labextension/labextension/*
 grader_labextension/grader/grader_labextension/labextension
 grader_labextension/grader/grader_labextension/labextension/build_log.json
@@ -504,8 +503,6 @@ Chart.lock
 #Sqlite database
 *.db
 grader_labextension/grader/grader_labextension/labextension/build_log.json
-grader_service_config.py
-
 
 #OpenAPI
 grader_labextension/.openapi-generator

.gitlab-ci.yml

@@ -169,6 +169,7 @@ To automatically add the groups for the grader service from the LTI authenticato
         if user_model is None:
             user_model = orm.User()
             user_model.name = user_name
+            user_model.display_name = user_name
             db.add(user_model)
             db.commit()
 

README.rst

@@ -15,18 +15,18 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.2
+version: 0.9.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.8.2"
+appVersion: "0.9.2"
 
 dependencies:
 - name: jupyterhub
   version: 4.2.0
   repository: https://jupyterhub.github.io/helm-chart
 - name: grader-service
-  version: 0.8.2
+  version: 0.9.2
   repository: https://tu-wien-datalab.github.io/grader-service/

charts/grader-service-all-in-one/Chart.yaml

@@ -97,7 +97,7 @@ grader-service:
       groups: list[str] = authentication["groups"]
 
       username = authentication["name"]
-      user_model: User = session.query(User).get(username)
+      user_model: User = session.query(User).filter(User.name == username).one_or_none()
       if user_model is None:
         user_model = User()
         user_model.name = username
@@ -122,21 +122,19 @@ grader-service:
             session.add(lecture)
             session.commit()
 
-          role = session.query(Role).filter(Role.username == username, Role.lectid == lecture.id).one_or_none()
+          role = session.query(Role).filter(Role.user_id == user.id, Role.lectid == lecture.id).one_or_none()
           if role is None:
             log.info(f'No role for user {username} in lecture {lecture_code}... creating role')
-            role = Role(username=username, lectid=lecture.id, role=scope)
+            role = Role(user_id=user.id, lectid=lecture.id, role=scope)
             session.add(role)
             session.commit()
           else:
-            log.info(f'Found role {role.role.name} for user {username}  in lecture {lecture_code}... updating role to {scope.name}')
+            log.info(f'Found role {role.role.name} for user {username} in lecture {lecture_code}... updating role to {scope.name}')
             role.role = scope
             session.commit()
         else:
-          log.info("Found group that doesn't match schema. Ignoring " + group)        
+          log.info("Found group that doesn't match schema. Ignoring %s", group)        
 
       return authentication
 
     c.Authenticator.post_auth_hook = post_auth_hook
-        
-

charts/grader-service-all-in-one/values.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.2
+version: 0.9.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.8.2"
+appVersion: "0.9.2"

charts/grader-service/Chart.yaml

@@ -3,7 +3,7 @@
 github_url = "https://github.com/TU-Wien-dataLAB/grader-service"
 
 [tool.tbump.version]
-current = "0.8.2"
+current = "0.9.2"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before

charts/grader-service/pyproject.toml

@@ -4,7 +4,7 @@ info:
   description: The REST API for the grader service
   license:
     name: BSD-3-Clause
-  version: '0.8.2'
+  version: '0.9.2'
 servers:
   - url: /api
     description: relative path to mock