orchestrator-core 4.4.0rc3__tar.gz → 4.4.1__tar.gz

{orchestrator_core-4.4.0rc3 → orchestrator_core-4.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 4.4.0rc3
+Version: 4.4.1
 Summary: This is the orchestrator workflow engine.
 Author-email: SURF <automation-beheer@surf.nl>
 Requires-Python: >=3.11,<3.14

{orchestrator_core-4.4.0rc3 → orchestrator_core-4.4.1}/orchestrator/__init__.py

@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "4.4.0rc3"
+__version__ = "4.4.1"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

{orchestrator_core-4.4.0rc3 → orchestrator_core-4.4.1}/orchestrator/graphql/schemas/process.py

@@ -82,8 +82,8 @@ class ProcessType:
         )
 
     @strawberry.field(description="Returns user permissions for operations on this process")  # type: ignore
-    def user_permissions(self, info: OrchestratorInfo) -> FormUserPermissionsType:
-        oidc_user = info.context.get_current_user
+    async def user_permissions(self, info: OrchestratorInfo) -> FormUserPermissionsType:
+        oidc_user = await info.context.get_current_user
         workflow = get_workflow(self.workflow_name)
         process = load_process(db.session.get(ProcessTable, self.process_id))  # type: ignore[arg-type]
         auth_resume, auth_retry = get_auth_callbacks(get_steps_to_evaluate_for_rbac(process), workflow)  # type: ignore[arg-type]

{orchestrator_core-4.4.0rc3 → orchestrator_core-4.4.1}/orchestrator/graphql/schemas/workflow.py

@@ -33,8 +33,8 @@ class Workflow:
         return [Step(name=step.name, assignee=step.assignee) for step in get_workflow(self.name).steps]  # type: ignore
 
     @strawberry.field(description="Return whether the currently logged-in used is allowed to start this workflow")  # type: ignore
-    def is_allowed(self, info: OrchestratorInfo) -> bool:
-        oidc_user = info.context.get_current_user
+    async def is_allowed(self, info: OrchestratorInfo) -> bool:
+        oidc_user = await info.context.get_current_user
         workflow_table = get_original_model(self, WorkflowTable)
         workflow = get_workflow(workflow_table.name)
 

{orchestrator_core-4.4.0rc3 → orchestrator_core-4.4.1}/orchestrator/schedules/scheduler.py

@@ -29,7 +29,6 @@ from orchestrator.db.sorting.sorting import SortOrder
 from orchestrator.settings import app_settings
 from orchestrator.utils.helpers import camel_to_snake, to_camel
 
-jobstores = {"default": SQLAlchemyJobStore(url=str(app_settings.DATABASE_URI))}
 executors = {
     "default": ThreadPoolExecutor(1),
 }
@@ -37,22 +36,22 @@ job_defaults = {
     "coalesce": True,
 }
 
-scheduler = BackgroundScheduler(jobstores=jobstores, executors=executors, job_defaults=job_defaults)
-
-
-def scheduler_dispose_db_connections() -> None:
-    jobstores["default"].engine.dispose()
+scheduler = BackgroundScheduler(executors=executors, job_defaults=job_defaults)
 
 
 @contextmanager
 def get_paused_scheduler() -> Generator[BackgroundScheduler, Any, None]:
+    try:
+        scheduler.add_jobstore(SQLAlchemyJobStore(url=str(app_settings.DATABASE_URI)))
+    except ValueError:
+        pass
     scheduler.start(paused=True)
 
     try:
         yield scheduler
     finally:
         scheduler.shutdown()
-        scheduler_dispose_db_connections()
+        scheduler._jobstores["default"].engine.dispose()
 
 
 class ScheduledTask(BaseModel):