tracdap-runtime 0.7.1__py3-none-any.whl → 0.8.0__py3-none-any.whl

tracdap/rt/api/static_api.py

@@ -162,35 +162,6 @@ def define_parameter(
     return sa.define_parameter(param_name, param_type, label, default_value, param_props=param_props)
 
 
-def declare_parameter(
-        param_name: str,
-        param_type: _tp.Union[BasicType, TypeDescriptor],
-        label: str,
-        default_value: _tp.Optional[_tp.Any] = None) \
-        -> _Named[ModelParameter]:
-
-    """
-    .. deprecated:: 0.4.4
-       Use :py:func:`define_parameter` or :py:func:`P` instead.
-
-    This function is deprecated and will be removed in a future version.
-    Please use :py:func:`define_parameter() <tracdap.rt.api.define_parameter>` instead.
-
-    :type param_name: str
-    :type param_type: :py:class:`BasicType <tracdap.rt.metadata.BasicType>` |
-                      :py:class:`TypeDescriptor <tracdap.rt.metadata.TypeDescriptor>`
-
-    :type label: str
-    :type default_value: Any | None
-    :rtype: _Named[:py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`]
-
-    :display: False
-    """
-
-    print("TRAC Warning: declare_parameter() is deprecated, please use define_parameter()", file=sys.stderr)
-
-    return define_parameter(param_name, param_type, label, default_value)
-
 
 def P(  # noqa
         param_name: str,
@@ -241,29 +212,6 @@ def define_parameters(
     return sa.define_parameters(*parameters)
 
 
-def declare_parameters(
-        *params: _tp.Union[_Named[ModelParameter], _tp.List[_Named[ModelParameter]]]) \
-        -> _tp.Dict[str, ModelParameter]:
-
-    """
-    .. deprecated:: 0.4.4
-       Use :py:func:`define_parameters` instead
-
-    This function is deprecated and will be removed in a future version.
-    Please use :py:func:`define_parameters() <tracdap.rt.api.define_parameters>` instead.
-
-    :type params: _Named[:py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`] |
-                  List[_Named[:py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`]]
-    :rtype: Dict[str, :py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`]
-
-    :display: False
-    """
-
-    print("TRAC Warning: declare_parameters() is deprecated, please use define_parameters()", file=sys.stderr)
-
-    return define_parameters(*params)
-
-
 def define_field(
         field_name: str,
         field_type: BasicType,
@@ -324,45 +272,6 @@ def define_field(
         format_code, field_order)
 
 
-def declare_field(
-        field_name: str,
-        field_type: BasicType,
-        label: str,
-        business_key: bool = False,
-        categorical: bool = False,
-        not_null: _tp.Optional[bool] = None,
-        format_code: _tp.Optional[str] = None,
-        field_order: _tp.Optional[int] = None) \
-        -> FieldSchema:
-
-    """
-    .. deprecated:: 0.4.4
-       Use :py:func:`define_field` or :py:func:`F` instead.
-
-    This function is deprecated and will be removed in a future version.
-    Please use :py:func:`define_field() <tracdap.rt.api.define_field>` instead.
-
-    :type field_name: str
-    :type field_type: :py:class:`BasicType <tracdap.rt.metadata.BasicType>`
-    :type label: str
-    :type business_key: bool
-    :type categorical: bool
-    :type not_null: bool | None
-    :type format_code: str | None
-    :type field_order: int | None
-    :rtype: :py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>`
-
-    :display: False
-    """
-
-    print("TRAC Warning: declare_field() is deprecated, please use define_field()", file=sys.stderr)
-
-    return define_field(
-        field_name, field_type, label,
-        business_key, categorical, not_null,
-        format_code, field_order)
-
-
 def F(  # noqa
         field_name: str,
         field_type: BasicType,
@@ -396,7 +305,7 @@ def F(  # noqa
 
 def define_schema(
         *fields: _tp.Union[FieldSchema, _tp.List[FieldSchema]],
-        schema_type: SchemaType = SchemaType.TABLE) \
+        schema_type: SchemaType = SchemaType.TABLE, dynamic: bool = False) \
         -> SchemaDefinition:
 
     """
@@ -416,16 +325,18 @@ def define_schema(
 
     :param fields: The list of fields to include in the schema
     :param schema_type: The type of schema to create (currently only TABLE schemas are supported)
+    :param dynamic: Define a dynamic schema (fields list should be empty)
     :return: A schema definition built from the supplied fields
 
     :type fields: :py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>` |
                   List[:py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>`]
     :type schema_type: :py:class:`SchemaType <tracdap.rt.metadata.SchemaType>`
+    :type dynamic: bool
     :rtype: :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>`
     """
 
     sa = _StaticApiHook.get_instance()
-    return sa.define_schema(*fields, schema_type=schema_type)
+    return sa.define_schema(*fields, schema_type=schema_type, dynamic=dynamic)
 
 
 def load_schema(
@@ -471,6 +382,62 @@ def load_schema(
     return sa.load_schema(package, schema_file, schema_type=schema_type)
 
 
+def define_file_type(extension: str, mime_type: str) -> FileType:
+
+    """
+    Define a :py:class:`FileType <tracdap.rt.metadata.FileType>` for use as a model input or output
+
+    :type extension: str
+    :type mime_type: str
+    :rtype: :py:class:`FileType <tracdap.rt.metadata.FileType>`
+    """
+
+    sa = _StaticApiHook.get_instance()
+    return sa.define_file_type(extension, mime_type)
+
+
+def define_input(
+        requirement: _tp.Union[SchemaDefinition, FileType], *,
+        label: _tp.Optional[str] = None,
+        optional: bool = False, dynamic: bool = False,
+        input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None):
+
+    """
+    Define a model input, which can be any type of dataset or file
+
+    :type requirement: :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>` | :py:class:`FileType <tracdap.rt.metadata.FileType>`
+    :type label: str | None
+    :type optional: bool
+    :type dynamic: bool
+    :type input_props: dict[str, :py:class:`Value <tracdap.rt.metadata.Value>`
+    :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
+    """
+
+    sa = _StaticApiHook.get_instance()
+    return sa.define_input(requirement, label=label, optional=optional, dynamic=dynamic, input_props=input_props)
+
+
+def define_output(
+        requirement: _tp.Union[SchemaDefinition, FileType], *,
+        label: _tp.Optional[str] = None,
+        optional: bool = False, dynamic: bool = False,
+        output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None):
+
+    """
+    Define a model output, which can be any type of dataset or file
+
+    :type requirement: :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>` | :py:class:`FileType <tracdap.rt.metadata.FileType>`
+    :type label: str | None
+    :type optional: bool
+    :type dynamic: bool
+    :type output_props: dict[str, :py:class:`Value <tracdap.rt.metadata.Value>`
+    :rtype: :py:class:`ModelOutputSchema <tracdap.rt.metadata.ModelOutputSchema>`
+    """
+
+    sa = _StaticApiHook.get_instance()
+    return sa.define_output(requirement, label=label, optional=optional, dynamic=dynamic, output_props=output_props)
+
+
 def define_input_table(
         *fields: _tp.Union[FieldSchema, _tp.List[FieldSchema]],
         label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
@@ -478,7 +445,7 @@ def define_input_table(
         -> ModelInputSchema:
 
     """
-    Define a model input with a table schema
+    Define a model input for a :py:class:`TableSchema <tracdap.rt.metadata.TableSchema>`
 
     Individual fields can be defined using :py:func:`define_field` or the shorthand alias :py:func:`F`.
     This function takes a number of fields, either as individual arguments or as a list, and uses them
@@ -512,34 +479,8 @@ def define_input_table(
     :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
     """
 
-    sa = _StaticApiHook.get_instance()
-
-    return sa.define_input_table(
-        *fields, label=label, optional=optional, dynamic=dynamic,
-        input_props=input_props)
-
-
-def declare_input_table(
-        *fields: _tp.Union[FieldSchema, _tp.List[FieldSchema]]) \
-        -> ModelInputSchema:
-
-    """
-    .. deprecated:: 0.4.4
-       Use :py:func:`define_input_table` instead.
-
-    This function is deprecated and will be removed in a future version.
-    Please use :py:func:`define_input_table() <tracdap.rt.api.define_input_table>` instead.
-
-    :type fields: :py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>` |
-                  List[:py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>`]
-    :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
-
-    :display: False
-    """
-
-    print("TRAC Warning: declare_input_table() is deprecated, please use define_input_table()", file=sys.stderr)
-
-    return define_input_table(*fields)
+    schema = define_schema(*fields, schema_type=SchemaType.TABLE, dynamic=dynamic)
+    return define_input(schema, label=label, optional=optional, dynamic=dynamic, input_props=input_props)
 
 
 def define_output_table(
@@ -549,7 +490,7 @@ def define_output_table(
         -> ModelOutputSchema:
 
     """
-    Define a model output with a table schema
+    Define a model output for a :py:class:`TableSchema <tracdap.rt.metadata.TableSchema>`
 
     Individual fields can be defined using :py:func:`define_field` or the shorthand alias :py:func:`F`.
     This function takes a number of fields, either as individual arguments or as a list, and uses them
@@ -581,11 +522,208 @@ def define_output_table(
     :rtype: :py:class:`ModelOutputSchema <tracdap.rt.metadata.ModelOutputSchema>`
     """
 
-    sa = _StaticApiHook.get_instance()
+    schema = define_schema(*fields, schema_type=SchemaType.TABLE, dynamic=dynamic)
+    return define_output(schema, label=label, optional=optional, dynamic=dynamic, output_props=output_props)
+
+
+def define_input_file(
+        extension: str, mime_type: str, *,
+        label: _tp.Optional[str] = None, optional: bool = False,
+        input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
+        -> ModelInputSchema:
+
+    """
+    Define a model input for a :py:class:`FileType <tracdap.rt.metadata.FileType>`
+
+    :type extension str
+    :type mime_type: sr
+    :type label: str | None
+    :type optional: bool
+    :type input_props: dict[str, Any] | None
+    :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
+    """
+
+    file_type = define_file_type(extension, mime_type)
+    return define_input(file_type, label=label, optional=optional, input_props=input_props)
+
+
+def define_output_file(
+        extension: str, mime_type: str, *,
+        label: _tp.Optional[str] = None, optional: bool = False,
+        output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
+        -> ModelOutputSchema:
+
+    """
+    Define a model output for a :py:class:`FileType <tracdap.rt.metadata.FileType>`
+
+    :type extension str
+    :type mime_type: sr
+    :type label: str | None
+    :type optional: bool
+    :type output_props: dict[str, Any] | None
+    :rtype: :py:class:`ModelOutputSchema <tracdap.rt.metadata.ModelOutputSchema>`
+    """
+
+    file_type = define_file_type(extension, mime_type)
+    return define_output(file_type, label=label, optional=optional, output_props=output_props)
+
+
+def ModelInputSchema(  # noqa
+        schema: SchemaDefinition,
+        label: _tp.Optional[str] = None,
+        optional: bool = False,
+        dynamic: bool = False,
+        inputProps: _tp.Optional[_tp.Dict[str, Value]] = None):  # noqa
+
+    """
+    .. deprecated:: 0.8.0
+       Use :py:func:`define_input` instead.
+
+    This function is provided for compatibility with TRAC versions before 0.8.0.
+    Please use :py:func:`define_input() <tracdap.rt.api.define_input>` instead.
+
+    :display: False
+    """
+
+    input_props = inputProps or dict()
+    return define_input(schema, label=label, optional=optional, dynamic=dynamic, input_props=input_props)
+
+
+def ModelOutputSchema(  # noqa
+        schema: SchemaDefinition,
+        label: _tp.Optional[str] = None,
+        optional: bool = False,
+        dynamic: bool = False,
+        outputProps: _tp.Optional[_tp.Dict[str, Value]] = None):  # noqa
+
+    """
+    .. deprecated:: 0.8.0
+       Use :py:func:`define_output` instead.
+
+    This function is provided for compatibility with TRAC versions before 0.8.0.
+    Please use :py:func:`define_output() <tracdap.rt.api.define_output>` instead.
+
+    :display: False
+    """
+
+    output_props = outputProps or dict()
+    return define_output(schema, label=label, optional=optional, dynamic=dynamic, output_props=output_props)
+
+
+
+def declare_parameter(
+        param_name: str,
+        param_type: _tp.Union[BasicType, TypeDescriptor],
+        label: str,
+        default_value: _tp.Optional[_tp.Any] = None) \
+        -> _Named[ModelParameter]:
+
+    """
+    .. deprecated:: 0.4.4
+       Use :py:func:`define_parameter` or :py:func:`P` instead.
+
+    This function is deprecated and will be removed in a future version.
+    Please use :py:func:`define_parameter() <tracdap.rt.api.define_parameter>` instead.
+
+    :type param_name: str
+    :type param_type: :py:class:`BasicType <tracdap.rt.metadata.BasicType>` |
+                      :py:class:`TypeDescriptor <tracdap.rt.metadata.TypeDescriptor>`
+
+    :type label: str
+    :type default_value: Any | None
+    :rtype: _Named[:py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`]
+
+    :display: False
+    """
+
+    print("TRAC Warning: declare_parameter() is deprecated, please use define_parameter()", file=sys.stderr)
+
+    return define_parameter(param_name, param_type, label, default_value)
+
+
+def declare_parameters(
+        *params: _tp.Union[_Named[ModelParameter], _tp.List[_Named[ModelParameter]]]) \
+        -> _tp.Dict[str, ModelParameter]:
+
+    """
+    .. deprecated:: 0.4.4
+       Use :py:func:`define_parameters` instead
+
+    This function is deprecated and will be removed in a future version.
+    Please use :py:func:`define_parameters() <tracdap.rt.api.define_parameters>` instead.
+
+    :type params: _Named[:py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`] |
+                  List[_Named[:py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`]]
+    :rtype: Dict[str, :py:class:`ModelParameter <tracdap.rt.metadata.ModelParameter>`]
+
+    :display: False
+    """
+
+    print("TRAC Warning: declare_parameters() is deprecated, please use define_parameters()", file=sys.stderr)
+
+    return define_parameters(*params)
+
 
-    return sa.define_output_table(
-        *fields, label=label, optional=optional, dynamic=dynamic,
-        output_props=output_props)
+def declare_field(
+        field_name: str,
+        field_type: BasicType,
+        label: str,
+        business_key: bool = False,
+        categorical: bool = False,
+        not_null: _tp.Optional[bool] = None,
+        format_code: _tp.Optional[str] = None,
+        field_order: _tp.Optional[int] = None) \
+        -> FieldSchema:
+
+    """
+    .. deprecated:: 0.4.4
+       Use :py:func:`define_field` or :py:func:`F` instead.
+
+    This function is deprecated and will be removed in a future version.
+    Please use :py:func:`define_field() <tracdap.rt.api.define_field>` instead.
+
+    :type field_name: str
+    :type field_type: :py:class:`BasicType <tracdap.rt.metadata.BasicType>`
+    :type label: str
+    :type business_key: bool
+    :type categorical: bool
+    :type not_null: bool | None
+    :type format_code: str | None
+    :type field_order: int | None
+    :rtype: :py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>`
+
+    :display: False
+    """
+
+    print("TRAC Warning: declare_field() is deprecated, please use define_field()", file=sys.stderr)
+
+    return define_field(
+        field_name, field_type, label,
+        business_key, categorical, not_null,
+        format_code, field_order)
+
+
+def declare_input_table(
+        *fields: _tp.Union[FieldSchema, _tp.List[FieldSchema]]) \
+        -> ModelInputSchema:
+
+    """
+    .. deprecated:: 0.4.4
+       Use :py:func:`define_input_table` instead.
+
+    This function is deprecated and will be removed in a future version.
+    Please use :py:func:`define_input_table() <tracdap.rt.api.define_input_table>` instead.
+
+    :type fields: :py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>` |
+                  List[:py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>`]
+    :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
+
+    :display: False
+    """
+
+    print("TRAC Warning: declare_input_table() is deprecated, please use define_input_table()", file=sys.stderr)
+
+    return define_input_table(*fields)
 
 
 def declare_output_table(

tracdap/rt/config/__init__.py

@@ -1,30 +1,30 @@
 # Code generated by TRAC
 
+from .result import TagUpdateList
+from .result import JobResult
+
 from .common import _ConfigFile
 from .common import PluginConfig
 from .common import PlatformInfo
-from .common import AuthenticationConfig
 from .common import StorageConfig
 from .common import ServiceConfig
 
-from .runtime import RuntimeConfig
-from .runtime import SparkSettings
-
-from .job import JobConfig
-
 from .platform import RoutingProtocol
 from .platform import DeploymentLayout
 from .platform import PlatformConfig
 from .platform import MetadataConfig
 from .platform import TenantConfig
-from .platform import WebServerConfig
-from .platform import WebServerRewriteRule
-from .platform import WebServerRedirect
 from .platform import GatewayConfig
+from .platform import GatewayRedirect
 from .platform import RouteConfig
 from .platform import RoutingMatch
 from .platform import RoutingTarget
 from .platform import DeploymentConfig
+from .platform import ClientConfig
 
-from .result import TagUpdateList
-from .result import JobResult
+from .runtime import RuntimeConfig
+from .runtime import SparkSettings
+
+from .job import JobConfig
+
+from .dynamic import DynamicConfig

tracdap/rt/config/common.py

@@ -33,32 +33,6 @@ class PlatformInfo:
     deploymentInfo: "_tp.Dict[str, str]" = _dc.field(default_factory=dict)
 
 
-@_dc.dataclass
-class AuthenticationConfig:
-
-    jwtIssuer: "str" = ""
-
-    jwtExpiry: "int" = 0
-
-    jwtLimit: "int" = 0
-
-    jwtRefresh: "int" = 0
-
-    provider: "_tp.Optional[PluginConfig]" = None
-
-    disableAuth: "bool" = False
-
-    disableSigning: "bool" = False
-
-    systemUserId: "str" = ""
-
-    systemUserName: "str" = ""
-
-    systemTicketDuration: "int" = 0
-
-    systemTicketRefresh: "int" = 0
-
-
 @_dc.dataclass
 class StorageConfig:
 
@@ -81,3 +55,5 @@ class ServiceConfig:
     alias: "str" = ""
 
     port: "int" = 0
+
+    properties: "_tp.Dict[str, str]" = _dc.field(default_factory=dict)

tracdap/rt/config/dynamic.py

@@ -0,0 +1,28 @@
+# Code generated by TRAC
+
+import typing as _tp  # noqa
+import dataclasses as _dc  # noqa
+import enum as _enum  # noqa
+
+import tracdap.rt.metadata as metadata
+
+
+
+@_dc.dataclass
+class DynamicConfig:
+
+    """
+    Represent config that is normally held in the metadata store
+    
+    This can be used to supply config to isolated processes, including
+    the runtime when operating in batch mode. It can also be used to
+    to supply config for testing or to bootstrap the metadata store.
+    """
+
+    configClass: "str" = ""
+
+    resourceClass: "str" = ""
+
+    config: "_tp.Dict[str, metadata.ConfigDefinition]" = _dc.field(default_factory=dict)
+
+    resources: "_tp.Dict[str, metadata.ResourceDefinition]" = _dc.field(default_factory=dict)

tracdap/rt/config/platform.py

@@ -39,8 +39,6 @@ class PlatformConfig:
 
     platformInfo: "PlatformInfo" = _dc.field(default_factory=lambda: PlatformInfo())
 
-    authentication: "AuthenticationConfig" = _dc.field(default_factory=lambda: AuthenticationConfig())
-
     metadata: "MetadataConfig" = _dc.field(default_factory=lambda: MetadataConfig())
 
     storage: "StorageConfig" = _dc.field(default_factory=lambda: StorageConfig())
@@ -53,14 +51,16 @@ class PlatformConfig:
 
     tenants: "_tp.Dict[str, TenantConfig]" = _dc.field(default_factory=dict)
 
-    webServer: "_tp.Optional[WebServerConfig]" = None
-
-    gateway: "_tp.Optional[GatewayConfig]" = None
+    gateway: "GatewayConfig" = _dc.field(default_factory=lambda: GatewayConfig())
 
     services: "_tp.Dict[str, ServiceConfig]" = _dc.field(default_factory=dict)
 
     deployment: "DeploymentConfig" = _dc.field(default_factory=lambda: DeploymentConfig())
 
+    clientConfig: "_tp.Dict[str, ClientConfig]" = _dc.field(default_factory=dict)
+
+    extensions: "_tp.Dict[str, protobuf.Any]" = _dc.field(default_factory=dict)
+
 
 @_dc.dataclass
 class MetadataConfig:
@@ -79,27 +79,15 @@ class TenantConfig:
 
 
 @_dc.dataclass
-class WebServerConfig:
-
-    enabled: "bool" = False
-
-    contentRoot: "PluginConfig" = _dc.field(default_factory=lambda: PluginConfig())
-
-    rewriteRules: "_tp.List[WebServerRewriteRule]" = _dc.field(default_factory=list)
-
-    redirects: "_tp.List[WebServerRedirect]" = _dc.field(default_factory=list)
-
-
-@_dc.dataclass
-class WebServerRewriteRule:
+class GatewayConfig:
 
-    source: "str" = ""
+    routes: "_tp.List[RouteConfig]" = _dc.field(default_factory=list)
 
-    target: "str" = ""
+    redirects: "_tp.List[GatewayRedirect]" = _dc.field(default_factory=list)
 
 
 @_dc.dataclass
-class WebServerRedirect:
+class GatewayRedirect:
 
     source: "str" = ""
 
@@ -108,16 +96,6 @@ class WebServerRedirect:
     status: "int" = 0
 
 
-@_dc.dataclass
-class GatewayConfig:
-
-    idleTimeout: "int" = 0
-
-    routes: "_tp.List[RouteConfig]" = _dc.field(default_factory=list)
-
-    redirects: "_tp.List[WebServerRedirect]" = _dc.field(default_factory=list)
-
-
 @_dc.dataclass
 class RouteConfig:
 
@@ -151,8 +129,16 @@ class RoutingTarget:
 
     path: "str" = ""
 
+    hostAlias: "_tp.Optional[str]" = None
+
 
 @_dc.dataclass
 class DeploymentConfig:
 
     layout: "DeploymentLayout" = DeploymentLayout.LAYOUT_NOT_SET
+
+
+@_dc.dataclass
+class ClientConfig:
+
+    properties: "_tp.Dict[str, str]" = _dc.field(default_factory=dict)

tracdap/rt/config/runtime.py

@@ -21,6 +21,8 @@ class RuntimeConfig:
 
     runtimeApi: "ServiceConfig" = _dc.field(default_factory=lambda: ServiceConfig())
 
+    properties: "_tp.Dict[str, str]" = _dc.field(default_factory=dict)
+
 
 @_dc.dataclass
 class SparkSettings:

tracdap/rt/ext/embed.py

@@ -14,8 +14,8 @@
 #  limitations under the License.
 
 import tracdap.rt.config as _cfg
-import tracdap.rt._impl.guard_rails as _guard  # noqa
-import tracdap.rt._exec.runtime as _rt  # noqa
+import tracdap.rt._impl.core.guard_rails as _guard  # noqa
+import tracdap.rt._impl.runtime as _rt  # noqa
 
 
 class __EmbeddedRuntime: