tracdap-runtime 0.6.1.dev3__py3-none-any.whl → 0.6.3__py3-none-any.whl

tracdap/rt/_exec/actors.py

@@ -25,6 +25,7 @@ import queue
 import time
 
 import tracdap.rt._impl.util as util  # noqa
+import tracdap.rt._impl.validation as _val  # noqa
 import tracdap.rt.exceptions as _ex
 
 
@@ -180,6 +181,49 @@ class ActorContext:
         return self.__error or self.__node.error
 
 
+class ThreadsafeActor(Actor):
+
+    def __init__(self):
+        super().__init__()
+        self.__threadsafe: tp.Optional[ThreadsafeContext] = None
+
+    def threadsafe(self) -> ThreadsafeContext:
+        return self.__threadsafe
+
+
+class ThreadsafeContext:
+
+    def __init__(self, node: ActorNode):
+        self.__node = node
+        self.__id = node.actor_id
+        self.__parent = node.parent.actor_id if node.parent is not None else None
+
+    def spawn(self, actor: Actor):
+        self.__node.event_loop.post_message(
+            None, lambda _:
+            self.__node.spawn(actor) and None)
+
+    def send(self, target_id: ActorId, message: str, *args, **kwargs):
+        self.__node.event_loop.post_message(
+            None, lambda _:
+            self.__node.send_message(self.__id, target_id, message, args, kwargs))
+
+    def send_parent(self, message: str, *args, **kwargs):
+        self.__node.event_loop.post_message(
+            None, lambda _:
+            self.__node.send_message(self.__id, self.__parent, message, args, kwargs))
+
+    def stop(self):
+        self.__node.event_loop.post_message(
+            None, lambda _:
+            self.__node.send_signal(self.__id, self.__id, SignalNames.STOP))
+
+    def fail(self, error: Exception):
+        self.__node.event_loop.post_message(
+            None, lambda _:
+            self.__node.send_signal(self.__id, self.__id, SignalNames.STOP, error))
+
+
 class EventLoop:
 
     _T_MSG = tp.TypeVar("_T_MSG")
@@ -340,7 +384,7 @@ class ActorNode:
         self.state: ActorState = ActorState.NOT_STARTED
         self.error: tp.Optional[Exception] = None
 
-    def spawn(self, child_actor: Actor):
+    def spawn(self, child_actor: Actor) -> ActorId:
 
         if self._log.isEnabledFor(logging.DEBUG):
             self._log.debug(f"spawn [{self.actor_id}]: [{type(child_actor)}]")
@@ -355,6 +399,11 @@ class ActorNode:
         child_node = ActorNode(child_id, child_actor, self, self.system, event_loop)
         self.children[child_id] = child_node
 
+        # If this is a threadsafe actor, set up the threadsafe context
+        if isinstance(child_actor, ThreadsafeActor):
+            threadsafe = ThreadsafeContext(child_node)
+            child_actor._ThreadsafeActor__threadsafe = threadsafe
+
         child_node.send_signal(self.actor_id, child_id, SignalNames.START)
 
         return child_id
@@ -542,6 +591,12 @@ class ActorNode:
         if not self._check_message_target(signal):
             return
 
+        # Do not process signals after the actor has stopped
+        # This is common with e.g. STOP signals that propagate up and down the tree
+
+        if self.state in [ActorState.STOPPED, ActorState.FAILED]:
+            return
+
         # Call the signal receiver function
         # This gives the actor a chance to respond to the signal
 
@@ -768,10 +823,12 @@ class ActorNode:
         # Positional arg types
         for pos_param, pos_arg in zip(pos_params, args):
 
+            # If no type hint is available, allow anything through
+            # Otherwise, reuse the validator logic to type check individual args
             type_hint = type_hints.get(pos_param.name)
+            type_check = type_hint is None or _val.check_type(type_hint, pos_arg)
 
-            # If no type hint is available, allow anything through
-            if type_hint is not None and not isinstance(pos_arg, type_hint):
+            if not type_check:
                 error = f"Invalid message: [{message}] -> {target_id} (wrong parameter type for '{pos_param.name}')"
                 self._log.error(error)
                 raise EBadActor(error)
@@ -780,20 +837,20 @@ class ActorNode:
         for kw_param in kw_params:
 
             kw_arg = kwargs.get(kw_param.name)
-            type_hint = type_hints.get(kw_param.name)
 
             # If param has taken a default value, no type check is needed
             if kw_arg is None:
                 continue
 
-            # If no type hint is available, allow anything through
-            if type_hint is not None and not isinstance(kw_arg, type_hint):
+            # Otherwise use the same type-validation logic as positional args
+            type_hint = type_hints.get(kw_param.name)
+            type_check = type_hint is None or _val.check_type(type_hint, kw_arg)
+
+            if not type_check:
                 error = f"Invalid message: [{message}] -> {target_id} (wrong parameter type for '{kw_param.name}')"
                 self._log.error(error)
                 raise EBadActor(error)
 
-        # TODO: Verify generics for both args and kwargs
-
 
 class RootActor(Actor):
 
@@ -864,11 +921,17 @@ class ActorSystem:
 
         self.__root_started = threading.Event()
         self.__root_stopped = threading.Event()
+
         self.__root_actor = RootActor(main_actor, self.__root_started, self.__root_stopped)
         self.__root_node = ActorNode(self.ROOT_ID, self.__root_actor, None, self, self.__system_event_loop)
 
     # Public API
 
+    def main_id(self) -> ActorId:
+        if not self.__root_started.is_set():
+            raise EBadActor("System has not started yet")
+        return self.__root_actor.main_id
+
     def start(self, wait=True):
 
         self.__system_thread.start()
@@ -913,12 +976,26 @@ class ActorSystem:
 
         return self.__root_node.error
 
-    def send(self, message: str, *args, **kwargs):
+    def spawn_agent(self, agent: Actor) -> ActorId:
+
+        if not self.__root_started.is_set():
+            raise EBadActor("System has not started yet")
+
+        return self.__root_node.spawn(agent)
+
+    def send_main(self, message: str, *args, **kwargs):
 
         if self.__root_actor.main_id is None:
             raise EBadActor("System has not started yet")
 
-        self.__root_node.send_message("/external", self.__root_actor.main_id, message, args, kwargs)
+        self.__root_node.send_message("/external", self.__root_actor.main_id, message, args, kwargs)  # TODO
+
+    def send(self, actor_id: ActorId, message: str, *args, **kwargs):
+
+        if not self.__root_started.is_set():
+            raise EBadActor("System has not started yet")
+
+        self.__root_node.send_message("/external", actor_id, message, args, kwargs)
 
     def _setup_event_loops(self, thread_pools: tp.Dict[str, int]):
 

tracdap/rt/_exec/context.py

@@ -79,7 +79,6 @@ class TracContextImpl(_api.TracContext):
             self.__data,
             checkout_directory)
 
-
     def get_parameter(self, parameter_name: str) -> tp.Any:
 
         _val.validate_signature(self.get_parameter, parameter_name)
@@ -92,6 +91,31 @@ class TracContextImpl(_api.TracContext):
 
         return _types.MetadataCodec.decode_value(value)
 
+    def has_dataset(self, dataset_name: str) -> bool:
+
+        _val.validate_signature(self.has_dataset, dataset_name)
+
+        part_key = _data.DataPartKey.for_root()
+
+        self.__val.check_dataset_name_not_null(dataset_name)
+        self.__val.check_dataset_valid_identifier(dataset_name)
+
+        data_view = self.__data.get(dataset_name)
+
+        if data_view is None:
+            return False
+
+        # If the item exists but is not a dataset, that is still a runtime error
+        # E.g. if this method is called for FILE inputs
+        self.__val.check_context_item_is_dataset(dataset_name)
+
+        part = data_view.parts.get(part_key)
+
+        if part is None or len(part) == 0:
+            return False
+
+        return True
+
     def get_schema(self, dataset_name: str) -> _meta.SchemaDefinition:
 
         _val.validate_signature(self.get_schema, dataset_name)