From e0c888fd5c822299ae4ba344c90ca10efc398f56 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Fri, 19 May 2023 14:49:10 -0400
Subject: [PATCH] Go all in on "task manager" naming

---
 tractor/trionics/_supervisor.py | 37 +++++++++++++--------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/tractor/trionics/_supervisor.py b/tractor/trionics/_supervisor.py
index 46a1ccd..2a5f73e 100644
--- a/tractor/trionics/_supervisor.py
+++ b/tractor/trionics/_supervisor.py
@@ -22,7 +22,6 @@ from __future__ import annotations
 from contextlib import (
     asynccontextmanager as acm,
     contextmanager as cm,
-    nullcontext,
 )
 from typing import (
     Generator,
@@ -51,7 +50,7 @@ class TaskOutcome(Struct):
 
     '''
     lowlevel_task: Task
-    _exited: Event = trio.Event()  # as per `trio.Runner.task_exited()`
+    _exited = trio.Event()  # as per `trio.Runner.task_exited()`
     _outcome: Outcome | None = None  # as per `outcome.Outcome`
     _result: Any | None = None  # the eventual maybe-returned-value
 
@@ -63,9 +62,8 @@ class TaskOutcome(Struct):
         '''
         if self._outcome is None:
             raise RuntimeError(
-                # f'Task {task.name} is not complete.\n'
-                f'Outcome is not complete.\n'
-                'wait on `await TaskOutcome.wait_for_result()` first!'
+                f'Task {self.lowlevel_task.name} is not complete.\n'
+                'First wait on `await TaskOutcome.wait_for_result()`!'
             )
         return self._result
 
@@ -102,14 +100,14 @@ class TaskOutcome(Struct):
         return self.result
 
 
-class ScopePerTaskNursery(Struct):
+class TaskManagerNursery(Struct):
     _n: Nursery
     _scopes: dict[
         Task,
         tuple[CancelScope, Outcome]
     ] = {}
 
-    scope_manager: Generator[Any, Outcome, None] | None = None
+    task_manager: Generator[Any, Outcome, None] | None = None
 
     async def start_soon(
         self,
@@ -117,7 +115,7 @@ class ScopePerTaskNursery(Struct):
         *args,
 
         name=None,
-        scope_manager: ContextManager | None = None,
+        task_manager: Generator[Any, Outcome, None] | None = None
 
     ) -> tuple[CancelScope, Task]:
 
@@ -131,7 +129,7 @@ class ScopePerTaskNursery(Struct):
 
         n: Nursery = self._n
 
-        sm = self.scope_manager
+        sm = self.task_manager
         # we do default behavior of a scope-per-nursery
         # if the user did not provide a task manager.
         if sm is None:
@@ -151,7 +149,8 @@ class ScopePerTaskNursery(Struct):
 
         ) -> None:
 
-            # TODO: this was working before?!
+            # TODO: this was working before?! and, do we need something
+            # like it to implement `.start()`?
             # nonlocal to_return
 
             # execute up to the first yield
@@ -203,15 +202,10 @@ class ScopePerTaskNursery(Struct):
 # TODO: define a decorator to runtime type check that this a generator
 # with a single yield that also delivers a value (of some std type) from
 # the yield expression?
-# @trio.task_scope_manager
+# @trio.task_manager
 def add_task_handle_and_crash_handling(
     nursery: Nursery,
 
-    # TODO: is this the only way we can have a per-task scope
-    # allocated or can we allow the user to somehow do it if
-    # they want below?
-    # scope: CancelScope,
-
 ) -> Generator[
     Any,
     Outcome,
@@ -261,14 +255,11 @@ def add_task_handle_and_crash_handling(
 
 @acm
 async def open_nursery(
-    scope_manager = None,
+    task_manager = None,
     **kwargs,
 ):
     async with trio.open_nursery(**kwargs) as nurse:
-        yield ScopePerTaskNursery(
-            nurse,
-            scope_manager=scope_manager,
-        )
+        yield TaskManagerNursery(nurse, task_manager=task_manager)
 
 
 async def sleep_then_return_val(val: str):
@@ -293,7 +284,7 @@ if __name__ == '__main__':
 
     async def main():
         async with open_nursery(
-            scope_manager=add_task_handle_and_crash_handling,
+            task_manager=add_task_handle_and_crash_handling,
         ) as sn:
             for _ in range(3):
                 outcome, _ = await sn.start_soon(trio.sleep_forever)
@@ -312,7 +303,7 @@ if __name__ == '__main__':
 
             await trio.sleep(0.6)
             print(
-                'Cancelling and waiting on {err_outcome.lowlevel_task} '
+                f'Cancelling and waiting on {err_outcome.lowlevel_task} '
                 'to CRASH..'
             )
             cs.cancel()