mypy

Author: Andrei Neagu

packages/service-library/src/servicelib/aiohttp/long_running_tasks/_server.py

@@ -93,7 +93,9 @@ async def start_long_running_task(
     except asyncio.CancelledError:
         # cancel the task, the client has disconnected
         if task_id:
-            await lrt_api.cancel_task(long_running_manager.tasks_manager, None, task_id)
+            await lrt_api.cancel_task(
+                long_running_manager.tasks_manager, task_context, task_id
+            )
         raise
 
 

packages/service-library/src/servicelib/fastapi/long_running_tasks/_routes.py

@@ -30,7 +30,7 @@ async def list_tasks(
             ),
         )
         for t in await lrt_api.list_tasks(
-            long_running_manager.tasks_manager, task_context=None
+            long_running_manager.tasks_manager, task_context={}
         )
     ]
 
@@ -52,7 +52,7 @@ async def get_task_status(
 ) -> TaskStatus:
     assert request  # nosec
     return await lrt_api.get_task_status(
-        long_running_manager.tasks_manager, task_context=None, task_id=task_id
+        long_running_manager.tasks_manager, task_context={}, task_id=task_id
     )
 
 
@@ -75,7 +75,7 @@ async def get_task_result(
 ) -> TaskResult | Any:
     assert request  # nosec
     return await lrt_api.get_task_result(
-        long_running_manager.tasks_manager, task_context=None, task_id=task_id
+        long_running_manager.tasks_manager, task_context={}, task_id=task_id
     )
 
 
@@ -98,5 +98,5 @@ async def cancel_and_delete_task(
 ) -> None:
     assert request  # nosec
     await lrt_api.remove_task(
-        long_running_manager.tasks_manager, task_context=None, task_id=task_id
+        long_running_manager.tasks_manager, task_context={}, task_id=task_id
     )

packages/service-library/src/servicelib/long_running_tasks/lrt_api.py

@@ -57,13 +57,13 @@ async def start_task(
 
 
 async def list_tasks(
-    tasks_manager: TasksManager, task_context: TaskContext | None
+    tasks_manager: TasksManager, task_context: TaskContext
 ) -> list[TaskBase]:
     return await tasks_manager.list_tasks(with_task_context=task_context)
 
 
 async def get_task_status(
-    tasks_manager: TasksManager, task_context: TaskContext | None, task_id: TaskId
+    tasks_manager: TasksManager, task_context: TaskContext, task_id: TaskId
 ) -> TaskStatus:
     """returns the status of a task"""
     return await tasks_manager.get_task_status(
@@ -72,7 +72,7 @@ async def get_task_status(
 
 
 async def get_task_result(
-    tasks_manager: TasksManager, task_context: TaskContext | None, task_id: TaskId
+    tasks_manager: TasksManager, task_context: TaskContext, task_id: TaskId
 ) -> Any:
     try:
         task_result = await tasks_manager.get_task_result(
@@ -101,14 +101,14 @@ async def get_task_result(
 
 
 async def remove_task(
-    tasks_manager: TasksManager, task_context: TaskContext | None, task_id: TaskId
+    tasks_manager: TasksManager, task_context: TaskContext, task_id: TaskId
 ) -> None:
     """removes / cancels a task"""
     await tasks_manager.remove_task(task_id, with_task_context=task_context)
 
 
 async def cancel_task(
-    tasks_manager: TasksManager, task_context: TaskContext | None, task_id: TaskId
+    tasks_manager: TasksManager, task_context: TaskContext, task_id: TaskId
 ) -> None:
     """cancels a task"""
     await tasks_manager.cancel_task(task_id, with_task_context=task_context)