refactor interface

Author: Andrei Neagu

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/generic_scheduler/__init__.py

@@ -1,4 +1,4 @@
-from ._core import (
+from ._api import (
     cancel_operation,
     restart_create_operation_step_in_manual_intervention,
     restart_revert_operation_step_in_error,
@@ -29,8 +29,6 @@
     "BaseStep",
     "cancel_operation",
     "get_generic_scheduler_lifespans",
-    "restart_create_operation_step_in_manual_intervention",
-    "restart_revert_operation_step_in_error",
     "get_opration_context_proxy",
     "get_step_group_proxy",
     "get_step_store_proxy",
@@ -41,6 +39,8 @@
     "ParallelStepGroup",
     "ProvidedOperationContext",
     "RequiredOperationContext",
+    "restart_create_operation_step_in_manual_intervention",
+    "restart_revert_operation_step_in_error",
     "ScheduleId",
     "SingleStepGroup",
     "start_operation",

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/generic_scheduler/_api.py

@@ -0,0 +1,47 @@
+from fastapi import FastAPI
+
+from ._core import get_core
+from ._models import (
+    OperationContext,
+    OperationName,
+    ScheduleId,
+    StepName,
+)
+
+
+async def start_operation(
+    app: FastAPI,
+    operation_name: OperationName,
+    initial_operation_context: OperationContext,
+) -> ScheduleId:
+    """starts an operation by it's given name and initial context"""
+    return await get_core(app).start_operation(
+        operation_name, initial_operation_context
+    )
+
+
+async def cancel_operation(app: FastAPI, schedule_id: ScheduleId) -> None:
+    """aborts an opration and triggers revert of all it's executed steps"""
+    await get_core(app).cancel_schedule(schedule_id)
+
+
+async def restart_create_operation_step_in_manual_intervention(
+    app: FastAPI, schedule_id: ScheduleId, step_name: StepName
+) -> None:
+    """
+    restarts a step waiting for manual intervention
+    NOTE: to be used only with steps with wait_for_manual_intervention=True
+    and only to restart the `create`
+    """
+    await get_core(app).restart_operation_step_in_error(
+        schedule_id, step_name, in_manual_intervention=True
+    )
+
+
+async def restart_revert_operation_step_in_error(
+    app: FastAPI, schedule_id: ScheduleId, step_name: StepName
+) -> None:
+    """restarts a step stuck in `revert` in an error state"""
+    await get_core(app).restart_operation_step_in_error(
+        schedule_id, step_name, in_manual_intervention=False
+    )

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/generic_scheduler/_core.py

@@ -731,41 +731,3 @@ async def lifespan(app: FastAPI) -> AsyncIterator[State]:
 def get_core(app: FastAPI) -> Core:
     core: Core = app.state.generic_scheduler_core
     return core
-
-
-async def start_operation(
-    app: FastAPI,
-    operation_name: OperationName,
-    initial_operation_context: OperationContext,
-) -> ScheduleId:
-    """starts an operation by it's given name and initial context"""
-    return await get_core(app).start_operation(
-        operation_name, initial_operation_context
-    )
-
-
-async def cancel_operation(app: FastAPI, schedule_id: ScheduleId) -> None:
-    """aborts an opration and triggers revert of all it's executed steps"""
-    await get_core(app).cancel_schedule(schedule_id)
-
-
-async def restart_create_operation_step_in_manual_intervention(
-    app: FastAPI, schedule_id: ScheduleId, step_name: StepName
-) -> None:
-    """
-    restarts a step waiting for manual intervention
-    NOTE: to be used only with steps with wait_for_manual_intervention=True
-    and only to restart the `create`
-    """
-    await get_core(app).restart_operation_step_in_error(
-        schedule_id, step_name, in_manual_intervention=True
-    )
-
-
-async def restart_revert_operation_step_in_error(
-    app: FastAPI, schedule_id: ScheduleId, step_name: StepName
-) -> None:
-    """restarts a step stuck in `revert` in an error state"""
-    await get_core(app).restart_operation_step_in_error(
-        schedule_id, step_name, in_manual_intervention=False
-    )