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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 4.4.0rc2
+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.0rc2 → orchestrator_core-4.4.1}/orchestrator/__init__.py

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

{orchestrator_core-4.4.0rc2 → orchestrator_core-4.4.1}/orchestrator/cli/scheduler.py

@@ -13,11 +13,13 @@
 
 
 import logging
+import time
 
 import typer
-from apscheduler.schedulers.blocking import BlockingScheduler
 
-from orchestrator.schedules.scheduler import get_paused_scheduler, jobstores, scheduler_dispose_db_connections
+from orchestrator.schedules.scheduler import (
+    get_paused_scheduler,
+)
 
 log = logging.getLogger(__name__)
 
@@ -27,18 +29,11 @@ app: typer.Typer = typer.Typer()
 @app.command()
 def run() -> None:
     """Start scheduler and loop eternally to keep thread alive."""
-    # necessary to add the schedules to the DB since they are added to the BackgroundScheduler
     with get_paused_scheduler() as scheduler:
         scheduler.resume()
-        scheduler.pause()
 
-    blocking_scheduler = BlockingScheduler(jobstores=jobstores, jobstore_update_interval=5)
-
-    try:
-        blocking_scheduler.start()
-    finally:
-        blocking_scheduler.shutdown()
-        scheduler_dispose_db_connections()
+        while True:
+            time.sleep(1)
 
 
 @app.command()

{orchestrator_core-4.4.0rc2 → 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.0rc2 → 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.0rc2 → orchestrator_core-4.4.1}/orchestrator/schedules/scheduler.py

@@ -16,6 +16,7 @@ from contextlib import contextmanager
 from datetime import datetime
 from typing import Any, Generator
 
+from apscheduler.executors.pool import ThreadPoolExecutor
 from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
 from apscheduler.schedulers.background import BackgroundScheduler
 from more_itertools import partition
@@ -28,24 +29,29 @@ 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),
+}
+job_defaults = {
+    "coalesce": True,
+}
 
-scheduler = BackgroundScheduler(jobstores=jobstores)
-
-
-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(wait=False)
-        scheduler_dispose_db_connections()
+        scheduler.shutdown()
+        scheduler._jobstores["default"].engine.dispose()
 
 
 class ScheduledTask(BaseModel):

{orchestrator_core-4.4.0rc2 → orchestrator_core-4.4.1}/pyproject.toml

@@ -105,6 +105,7 @@ dev = [
     "pyinstrument>=5.0.2",
     "pytest==8.4.1",
     "pytest-asyncio==0.21.2",
+    "pytest-celery>=1.2.1",
     "pytest-codspeed>=3.2.0",
     "pytest-cov>=6.2.1",
     "pytest-httpx>=0.29.0",