rename stuff

Author: sanderegg

scripts/maintenance/computational-clusters/autoscaled_monitor/cli.py

@@ -155,7 +155,7 @@ def cancel_jobs(
         typer.Option(help="the wallet ID"),
     ] = None,
     *,
-    force: Annotated[
+    abort_in_db: Annotated[
         bool,
         typer.Option(
             help="will also force the job to abort in the database (use only if job is in WAITING FOR CLUSTER/WAITING FOR RESOURCE)"
@@ -169,8 +169,9 @@ def cancel_jobs(
     Keyword Arguments:
         user_id -- the user ID
         wallet_id -- the wallet ID
+        abort_in_db -- will also force the job to abort in the database (use only if job is in WAITING FOR CLUSTER/WAITING FOR RESOURCE)
     """
-    asyncio.run(api.cancel_jobs(state, user_id, wallet_id, force=force))
+    asyncio.run(api.cancel_jobs(state, user_id, wallet_id, abort_in_db=abort_in_db))
 
 
 @app.command()
@@ -185,6 +186,7 @@ def trigger_cluster_termination(
     Keyword Arguments:
         user_id -- the user ID
         wallet_id -- the wallet ID
+        force -- will not ask for confirmation (VERY RISKY! USE WITH CAUTION!)
     """
     asyncio.run(api.trigger_cluster_termination(state, user_id, wallet_id, force=force))
 

scripts/maintenance/computational-clusters/autoscaled_monitor/core.py

@@ -620,7 +620,7 @@ async def _get_db_task_to_dask_job(
 
 
 async def cancel_jobs(  # noqa: C901, PLR0912
-    state: AppState, user_id: int, wallet_id: int | None, *, force: bool
+    state: AppState, user_id: int, wallet_id: int | None, *, abort_in_db: bool
 ) -> None:
     # get the theory
     computational_tasks = await db.list_computational_tasks_from_db(state, user_id)
@@ -661,7 +661,7 @@ async def cancel_jobs(  # noqa: C901, PLR0912
                     state,
                     the_cluster,
                     task_to_dask_job=task_to_dask_job,
-                    abort_in_db=force,
+                    abort_in_db=abort_in_db,
                 )
             else:
                 try:
@@ -685,7 +685,7 @@ async def cancel_jobs(  # noqa: C901, PLR0912
                                     state, the_cluster, dask_task.job_id
                                 )
 
-                        if comp_task is not None and force:
+                        if comp_task is not None and abort_in_db:
                             await db.abort_job_in_db(
                                 state, comp_task.project_id, comp_task.node_id
                             )