diff --git a/environment.yml b/environment.yml index a8167b3c..b54959fc 100644 --- a/environment.yml +++ b/environment.yml @@ -53,6 +53,7 @@ dependencies: - moto - aiobotocore - botocore + - pip - pip: - types-aiobotocore[essential] - boto3-stubs[essential] diff --git a/src/diracx/core/models.py b/src/diracx/core/models.py index 3637d108..20668652 100644 --- a/src/diracx/core/models.py +++ b/src/diracx/core/models.py @@ -67,7 +67,7 @@ class JobStatus(StrEnum): RESCHEDULED = "Rescheduled" -class JobMinorStatus(str, Enum): +class JobMinorStatus(StrEnum): MAX_RESCHEDULING = "Maximum of reschedulings reached" RESCHEDULED = "Job Rescheduled" diff --git a/src/diracx/routers/job_manager/__init__.py b/src/diracx/routers/job_manager/__init__.py index a608c791..987a8252 100644 --- a/src/diracx/routers/job_manager/__init__.py +++ b/src/diracx/routers/job_manager/__init__.py @@ -299,7 +299,7 @@ async def reschedule_bulk_jobs( job_ids: Annotated[list[int], Query()], job_db: JobDB, job_logging_db: JobLoggingDB, - user_info: Annotated[UserInfo, Depends(verify_dirac_access_token)], + user_info: Annotated[AuthorizedUserInfo, Depends(verify_dirac_access_token)], ): rescheduled_jobs = [] # TODO: Joblist Policy: @@ -349,7 +349,7 @@ async def reschedule_bulk_jobs( async def reschedule_single_job( job_id: int, job_db: JobDB, - user_info: Annotated[UserInfo, Depends(verify_dirac_access_token)], + user_info: Annotated[AuthorizedUserInfo, Depends(verify_dirac_access_token)], ): try: result = await job_db.rescheduleJob(job_id)