Merge branch 'main' into 'production'

Main

See merge request !103

README.md

@@ -19,11 +19,12 @@ pg_dump -d nacsos_core -h localhost -U root -W -p 5432 > dump.sql
 ```bash
 virtualenv venv
 source venv/bin/activate
-pip install -r requirements.txt
+pip install -r requirements_dev.txt
 ```
 
 For development, it is advised to install `nacsos-data` locally (not from git) via
 ```bash
+pip install -r ../nacsos-data/requirements.txt
 pip install -e ../nacsos-data/
 ```
 (assuming both projects reside side-by-side, otherwise adapt path accordingly)

requirements.txt

-fastapi==0.111.1
-hypercorn==0.17.3
-toml==0.10.2
-email-validator==2.2.0
-python-dotenv==1.0.1
-passlib[bcrypt]==1.7.4
-pymitter==0.5.1
-uvicorn==0.30.3
-python-multipart==0.0.9
-aiosmtplib==3.0.1
-aiofiles==24.1.0
-dramatiq[redis,watch]==1.17.0
-dramatiq-abort==1.1.0
-dramatiq-dashboard==0.4.0
-nacsos_data[utils,scripts] @ git+ssh://git@gitlab.pik-potsdam.de/mcc-apsis/nacsos/nacsos-data.git@v0.16.3
+-r requirements_base.txt
+nacsos_data[utils,scripts] @ git+ssh://git@gitlab.pik-potsdam.de/mcc-apsis/nacsos/nacsos-data.git@v0.16.5
\ No newline at end of file

requirements_base.txt

+fastapi==0.112.1
+hypercorn==0.17.3
+toml==0.10.2
+email-validator==2.2.0
+python-dotenv==1.0.1
+passlib[bcrypt]==1.7.4
+pymitter==0.5.1
+uvicorn==0.30.6
+python-multipart==0.0.9
+aiosmtplib==3.0.2
+aiofiles==24.1.0
+dramatiq[redis,watch]==1.17.0
+dramatiq-abort==1.1.0
+dramatiq-dashboard==0.4.0
\ No newline at end of file

requirements_dev.txt

-flake8==7.1.0
+-r requirements_base.txt
+
+flake8==7.1.1
 tox==4.15.1
 pytest==8.2.2
 pytest-cov==5.0.0
-mypy==1.10.1
+mypy==1.11.1
 types-toml==0.10.8.20240310
-types-PyYAML==6.0.12.20240311
+types-PyYAML==6.0.12.20240808
 types-aiofiles==24.1.0.20240626
\ No newline at end of file

server/api/errors.py

@@ -33,6 +33,10 @@ class NoNextAssignmentWarning(Warning):
     status = http_status.HTTP_204_NO_CONTENT
 
 
+class RemainingDependencyWarning(Warning):
+    status = http_status.HTTP_412_PRECONDITION_FAILED
+
+
 class AssignmentScopeNotFoundError(Exception):
     pass
 

server/api/routes/annotations.py

+import uuid
 from typing import TYPE_CHECKING
 
 from pydantic import BaseModel
-from sqlalchemy import select, func as F, distinct
+from sqlalchemy import select, func as F, distinct, text
 from sqlalchemy.orm import load_only
 from fastapi import APIRouter, Depends, HTTPException, status as http_status, Query
 
@@ -10,7 +11,7 @@ from nacsos_data.db.schemas import (
     AssignmentScope,
     User,
     Annotation,
-    BotAnnotation
+    BotAnnotation, Assignment
 )
 from nacsos_data.models.annotations import (
     AnnotationSchemeModel,
@@ -81,7 +82,8 @@ from server.api.errors import (
     NoNextAssignmentWarning,
     ProjectNotFoundError,
     AnnotationSchemeNotFoundError,
-    MissingInformationError
+    MissingInformationError,
+    RemainingDependencyWarning
 )
 from server.util.security import UserPermissionChecker
 from server.data import db_engine
@@ -412,6 +414,88 @@ async def make_assignments(payload: MakeAssignmentsRequestModel,
     return assignments
 
 
+@router.post('/config/scopes/clear/{scheme_id}')
+async def clear_empty_assignments(scope_id: str,
+                                  permissions=Depends(UserPermissionChecker('annotations_edit'))) -> None:
+    """
+    Drop all assignments in a scope that are still incomplete...
+
+    :param scope_id:
+    :param permissions:
+    :return:
+    """
+    async with db_engine.session() as session:  # type: AsyncSession
+        stmt = text('''
+            DELETE
+            FROM assignment
+            WHERE assignment_id IN (
+                WITH counts AS (
+                    SELECT ass.assignment_id, count(ann.assignment_id) as cnt
+                    FROM assignment ass
+                        LEFT OUTER JOIN annotation ann ON ass.assignment_id = ann.assignment_id
+                    WHERE ass.assignment_scope_id = :scope_id
+                    GROUP BY ass.assignment_id
+                )
+                SELECT assignment_id
+                FROM counts
+                WHERE cnt = 0
+        );''')
+        await session.execute(stmt, {'scope_id': scope_id})
+
+
+class AssignmentEditInfo(BaseModel):
+    scope_id: str
+    scheme_id: str
+    item_id: str
+    user_id: str
+    order: int
+
+
+@router.put('/config/assignments/edit/', response_model=AssignmentModel)
+async def edit_assignment(info: AssignmentEditInfo,
+                          permissions=Depends(UserPermissionChecker('annotations_edit'))) -> AssignmentModel:
+    async with db_engine.session() as session:  # type: AsyncSession
+
+        # Check, if we already have an assignment for this...
+        assignment = (await session.execute(
+            select(Assignment)
+            .where(
+                Assignment.item_id == info.item_id,
+                Assignment.user_id == info.user_id,
+                Assignment.assignment_scope_id == info.scope_id
+            ))).scalars().one_or_none()
+        n_annotations: int = (await session.execute(  # type: ignore[assignment]
+            select(F.count(Annotation.annotation_id).label('n_annotations'))
+            .join(Assignment)
+            .where(Assignment.item_id == info.item_id,
+                   Assignment.user_id == info.user_id,
+                   Assignment.assignment_scope_id == info.scope_id))).scalar()
+
+        # yes we do, drop this assignment!
+        if assignment is not None:
+            model = AssignmentModel.model_validate(assignment.__dict__)
+            if n_annotations == 0:
+                await session.delete(assignment)
+                return model
+
+            raise RemainingDependencyWarning('Assignment has annotations, won\'t delete!')
+
+        # seems to be a new one, create it!
+        assignment = Assignment(
+            assignment_id=uuid.uuid4(),
+            item_id=info.item_id,
+            user_id=info.user_id,
+            assignment_scope_id=info.scope_id,
+            annotation_scheme_id=info.scheme_id,
+            order=info.order,
+            status=AssignmentStatus.OPEN
+        )
+        session.add(assignment)
+        model = AssignmentModel.model_validate(assignment.__dict__)
+        await session.commit()
+        return model
+
+
 @router.get('/config/scopes/{scheme_id}', response_model=list[AssignmentScopeModel])
 async def get_assignment_scopes_for_scheme(scheme_id: str,
                                            permissions=Depends(UserPermissionChecker('annotations_read'))) \