tracdap-runtime 0.8.0b1__py3-none-any.whl → 0.8.0b3__py3-none-any.whl

tracdap/rt/{_exec → _impl/exec}/actors.py

@@ -13,8 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from __future__ import annotations
-
 import logging
 import threading
 import functools as func
@@ -25,8 +23,8 @@ import inspect
 import queue
 import time
 
-import tracdap.rt._impl.util as util  # noqa
-import tracdap.rt._impl.validation as _val  # noqa
+import tracdap.rt._impl.core.logging as _logging
+import tracdap.rt._impl.core.validation as _val
 import tracdap.rt.exceptions as _ex
 
 
@@ -118,7 +116,7 @@ class Actor:
     def error(self) -> tp.Optional[Exception]:
         return self.__ctx.get_error()
 
-    def actors(self) -> ActorContext:
+    def actors(self) -> "ActorContext":
         return self.__ctx
 
     def on_start(self):
@@ -134,7 +132,7 @@ class Actor:
 class ActorContext:
 
     def __init__(
-            self, node: ActorNode, message: str,
+            self, node: "ActorNode", message: str,
             current_actor: ActorId, parent: ActorId, sender: tp.Optional[ActorId]):
 
         self.__node = node
@@ -188,13 +186,13 @@ class ThreadsafeActor(Actor):
         super().__init__()
         self.__threadsafe: tp.Optional[ThreadsafeContext] = None
 
-    def threadsafe(self) -> ThreadsafeContext:
+    def threadsafe(self) -> "ThreadsafeContext":
         return self.__threadsafe
 
 
 class ThreadsafeContext:
 
-    def __init__(self, node: ActorNode):
+    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
@@ -235,7 +233,7 @@ class EventLoop:
         self.__shutdown = False
         self.__shutdown_now = False
         self.__done = False
-        self.__log = util.logger_for_object(self)
+        self.__log = _logging.logger_for_object(self)
 
     def post_message(self, msg: _T_MSG, processor: tp.Callable[[_T_MSG], None]) -> bool:
         with self.__msg_lock:
@@ -365,12 +363,12 @@ class FunctionCache:
 
 class ActorNode:
 
-    _log = util.logger_for_class(Actor)
+    _log = _logging.logger_for_class(Actor)
 
     def __init__(
             self, actor_id: ActorId, actor: Actor,
-            parent: tp.Optional[ActorNode],
-            system: ActorSystem,
+            parent: "tp.Optional[ActorNode]",
+            system: "ActorSystem",
             event_loop: EventLoop):
 
         self.actor_id = actor_id
@@ -483,7 +481,7 @@ class ActorNode:
 
         target_node._accept(msg)
 
-    def _lookup_node(self, target_id: ActorId) -> tp.Optional[ActorNode]:
+    def _lookup_node(self, target_id: ActorId) -> "tp.Optional[ActorNode]":
 
         # Check self first
 
@@ -904,7 +902,7 @@ class ActorSystem:
 
         super().__init__()
 
-        self._log = util.logger_for_object(self)
+        self._log = _logging.logger_for_object(self)
 
         # self.__actors: tp.Dict[ActorId, ActorNode] = {self.__ROOT_ID: ActorNode("", self.__ROOT_ID, None)}
         # self.__message_queue: tp.List[Msg] = list()

tracdap/rt/{_exec → _impl/exec}/context.py

@@ -26,11 +26,12 @@ import tracdap.rt.api as _api
 import tracdap.rt.api.experimental as _eapi
 import tracdap.rt.metadata as _meta
 import tracdap.rt.exceptions as _ex
-import tracdap.rt._impl.type_system as _types  # noqa
-import tracdap.rt._impl.data as _data  # noqa
-import tracdap.rt._impl.storage as _storage  # noqa
-import tracdap.rt._impl.util as _util  # noqa
-import tracdap.rt._impl.validation as _val  # noqa
+import tracdap.rt._impl.core.data as _data
+import tracdap.rt._impl.core.logging as _logging
+import tracdap.rt._impl.core.storage as _storage
+import tracdap.rt._impl.core.type_system as _types
+import tracdap.rt._impl.core.util as _util
+import tracdap.rt._impl.core.validation as _val
 
 
 class TracContextImpl(_api.TracContext):
@@ -63,10 +64,15 @@ class TracContextImpl(_api.TracContext):
                  model_class: _api.TracModel.__class__,
                  local_ctx: tp.Dict[str, tp.Any],
                  dynamic_outputs: tp.List[str] = None,
-                 checkout_directory: pathlib.Path = None):
+                 checkout_directory: pathlib.Path = None,
+                 log_provider: _logging.LogProvider = None):
 
-        self.__ctx_log = _util.logger_for_object(self)
-        self.__model_log = _util.logger_for_class(model_class)
+        # If no log provider is supplied, use the default (system logs only)
+        if log_provider is None:
+            log_provider = _logging.LogProvider()
+
+        self.__ctx_log = log_provider.logger_for_object(self)
+        self.__model_log = log_provider.logger_for_class(model_class)
 
         self.__model_def = model_def
         self.__model_class = model_class
@@ -368,9 +374,9 @@ class TracDataContextImpl(TracContextImpl, _eapi.TracDataContext):
             self, model_def: _meta.ModelDefinition, model_class: _api.TracModel.__class__,
             local_ctx: tp.Dict[str, tp.Any], dynamic_outputs: tp.List[str],
             storage_map: tp.Dict[str, tp.Union[_eapi.TracFileStorage, _eapi.TracDataStorage]],
-            checkout_directory: pathlib.Path = None):
+            checkout_directory: pathlib.Path = None, log_provider: _logging.LogProvider = None):
 
-        super().__init__(model_def, model_class, local_ctx, dynamic_outputs, checkout_directory)
+        super().__init__(model_def, model_class, local_ctx, dynamic_outputs, checkout_directory, log_provider)
 
         self.__model_def = model_def
         self.__local_ctx = local_ctx
@@ -460,7 +466,9 @@ class TracDataContextImpl(TracContextImpl, _eapi.TracDataContext):
 
 class TracFileStorageImpl(_eapi.TracFileStorage):
 
-    def __init__(self, storage_key: str, storage_impl: _storage.IFileStorage, write_access: bool, checkout_directory):
+    def __init__(
+            self, storage_key: str, storage_impl: _storage.IFileStorage,
+            write_access: bool, checkout_directory, log_provider: _logging.LogProvider):
 
         self.__storage_key = storage_key
 
@@ -481,7 +489,11 @@ class TracFileStorageImpl(_eapi.TracFileStorage):
             self.__rmdir = None
             self.__write_byte_stream = None
 
-        self.__log = _util.logger_for_object(self)
+        # If no log provider is supplied, use the default (system logs only)
+        if log_provider is None:
+            log_provider = _logging.LogProvider()
+
+        self.__log = log_provider.logger_for_object(self)
         self.__val = TracStorageValidator(self.__log, checkout_directory, self.__storage_key)
 
     def get_storage_key(self) -> str:
@@ -602,7 +614,7 @@ class TracDataStorageImpl(_eapi.TracDataStorage[_eapi.DATA_API]):
     def __init__(
             self, storage_key: str, storage_impl: _storage.IDataStorageBase[_data.T_INTERNAL_DATA, _data.T_INTERNAL_SCHEMA],
             data_converter: _data.DataConverter[_eapi.DATA_API, _data.T_INTERNAL_DATA, _data.T_INTERNAL_SCHEMA],
-            write_access: bool, checkout_directory):
+            write_access: bool, checkout_directory, log_provider: _logging.LogProvider):
 
         self.__storage_key = storage_key
         self.__converter = data_converter
@@ -619,7 +631,11 @@ class TracDataStorageImpl(_eapi.TracDataStorage[_eapi.DATA_API]):
             self.__create_table = None
             self.__write_table = None
 
-        self.__log = _util.logger_for_object(self)
+        # If no log provider is supplied, use the default (system logs only)
+        if log_provider is None:
+            log_provider = _logging.LogProvider()
+
+        self.__log = log_provider.logger_for_object(self)
         self.__val = TracStorageValidator(self.__log, checkout_directory, self.__storage_key)
 
     def has_table(self, table_name: str) -> bool:

tracdap/rt/{_exec → _impl/exec}/dev_mode.py

@@ -22,11 +22,12 @@ import tracdap.rt.api as _api
 import tracdap.rt.config as _cfg
 import tracdap.rt.metadata as _meta
 import tracdap.rt.exceptions as _ex
-import tracdap.rt._impl.config_parser as _cfg_p  # noqa
-import tracdap.rt._impl.models as _models  # noqa
-import tracdap.rt._impl.storage as _storage  # noqa
-import tracdap.rt._impl.type_system as _types  # noqa
-import tracdap.rt._impl.util as _util  # noqa
+import tracdap.rt._impl.core.config_parser as _cfg_p
+import tracdap.rt._impl.core.logging as _logging
+import tracdap.rt._impl.core.models as _models
+import tracdap.rt._impl.core.storage as _storage
+import tracdap.rt._impl.core.type_system as _types
+import tracdap.rt._impl.core.util as _util
 
 
 DEV_MODE_JOB_CONFIG = [
@@ -50,7 +51,7 @@ DEV_MODE_SYS_CONFIG = []
 
 class DevModeTranslator:
 
-    _log: tp.Optional[_util.logging.Logger] = None
+    _log: tp.Optional[_logging.Logger] = None
 
     @classmethod
     def translate_sys_config(cls, sys_config: _cfg.RuntimeConfig, config_mgr: _cfg_p.ConfigManager):
@@ -1039,4 +1040,4 @@ class DevModeTranslator:
 
 
 
-DevModeTranslator._log = _util.logger_for_class(DevModeTranslator)
+DevModeTranslator._log = _logging.logger_for_class(DevModeTranslator)