fixed merge

Author: Andrei Neagu

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

@@ -1,8 +1,15 @@
+import logging
 from typing import Any
 
+from common_library.error_codes import create_error_code
+from servicelib.logging_errors import create_troubleshotting_log_kwargs
+
+from .errors import TaskNotCompletedError, TaskNotFoundError
 from .models import TaskBase, TaskId, TaskStatus
 from .task import RegisteredTaskName, TaskContext, TasksManager
 
+_logger = logging.getLogger(__name__)
+
 
 async def start_task(
     tasks_manager: TasksManager,
@@ -67,16 +74,30 @@ def get_task_status(
 async def get_task_result(
     tasks_manager: TasksManager, task_context: TaskContext | None, task_id: TaskId
 ) -> Any:
-    """retruns the result of a task, which is directly whatever the remove hanlder returned"""
     try:
-        return tasks_manager.get_task_result(
-            task_id=task_id, with_task_context=task_context
+        task_result = tasks_manager.get_task_result(
+            task_id, with_task_context=task_context
+        )
+        await tasks_manager.remove_task(
+            task_id, with_task_context=task_context, reraise_errors=False
+        )
+        return task_result
+    except (TaskNotFoundError, TaskNotCompletedError):
+        raise
+    except Exception as exc:
+        _logger.exception(
+            **create_troubleshotting_log_kwargs(
+                user_error_msg=f"{task_id=} raised an exception",
+                error=exc,
+                error_code=create_error_code(exc),
+                error_context={"task_context": task_context, "task_id": task_id},
+            ),
         )
-    finally:
-        # the task is always removed even if an error occurs
+        # the task shall be removed in this case
         await tasks_manager.remove_task(
             task_id, with_task_context=task_context, reraise_errors=False
         )
+        raise
 
 
 async def remove_task(