tracdap-runtime 0.7.0rc1__py3-none-any.whl → 0.8.0b1__py3-none-any.whl

tracdap/rt/api/file_types.py

@@ -0,0 +1,29 @@
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+from tracdap.rt.metadata import *  # DOCGEN_REMOVE
+
+
+class CommonFileTypes:
+
+    TXT = FileType("txt", "text/plain")
+
+    JPG = FileType("jpg", "image/jpeg")
+    PNG = FileType("png", "image/png")
+    SVG = FileType("svg", "image/svg+xml")
+
+    WORD = FileType("docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+    EXCEL = FileType("xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+    POWERPOINT = FileType("pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation")

tracdap/rt/api/hook.py

@@ -116,7 +116,7 @@ class _StaticApiHook:
     @_abc.abstractmethod
     def define_schema(
             self, *fields: _tp.Union[_meta.FieldSchema, _tp.List[_meta.FieldSchema]],
-            schema_type: _meta.SchemaType = _meta.SchemaType.TABLE) \
+            schema_type: _meta.SchemaType = _meta.SchemaType.TABLE, dynamic: bool = False) \
             -> _meta.SchemaDefinition:
 
         pass
@@ -131,21 +131,29 @@ class _StaticApiHook:
 
     @_abc.abstractmethod
     def infer_schema(self, dataset: _tp.Any) -> _meta.SchemaDefinition:
+
         pass
 
     @_abc.abstractmethod
-    def define_input_table(
-            self, *fields: _tp.Union[_meta.FieldSchema, _tp.List[_meta.FieldSchema]],
-            label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
+    def define_file_type(self, extension: str, mime_type: str) -> _meta.FileType:
+
+        pass
+
+    @_abc.abstractmethod
+    def define_input(
+            self, requirement: _tp.Union[_meta.SchemaDefinition, _meta.FileType], *,
+            label: _tp.Optional[str] = None,
+            optional: bool = False, dynamic: bool = False,
             input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
             -> _meta.ModelInputSchema:
 
         pass
 
     @_abc.abstractmethod
-    def define_output_table(
-            self, *fields: _tp.Union[_meta.FieldSchema, _tp.List[_meta.FieldSchema]],
-            label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
+    def define_output(
+            self, requirement: _tp.Union[_meta.SchemaDefinition, _meta.FileType], *,
+            label: _tp.Optional[str] = None,
+            optional: bool = False, dynamic: bool = False,
             output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
             -> _meta.ModelOutputSchema:
 

tracdap/rt/api/model_api.py

@@ -194,6 +194,14 @@ class TracContext(metaclass=_abc.ABCMeta):
 
         pass
 
+    def get_file(self, file_name: str) -> bytes:
+
+        pass
+
+    def get_file_stream(self, file_name: str) -> _tp.ContextManager[_tp.BinaryIO]:
+
+        pass
+
     def put_schema(self, dataset_name: str, schema: SchemaDefinition):
 
         """
@@ -283,6 +291,14 @@ class TracContext(metaclass=_abc.ABCMeta):
 
         pass
 
+    def put_file(self, file_name: str, file_content: _tp.Union[bytes, bytearray]):
+
+        pass
+
+    def put_file_stream(self, file_name: str) -> _tp.ContextManager[_tp.BinaryIO]:
+
+        pass
+
     def log(self) -> _logging.Logger:
 
         """

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,32 @@ def load_schema(
     return sa.load_schema(package, schema_file, schema_type=schema_type)
 
 
+def define_file_type(extension: str, mime_type: str) -> 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):
+
+    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):
+
+    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,
@@ -512,34 +449,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(
@@ -581,11 +492,186 @@ 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:
+
+    file_type = define_file_type(extension, mime_type)
+    return define_input(file_type, label=label, optional=optional, input_props=input_props)
+
 
-    return sa.define_output_table(
-        *fields, label=label, optional=optional, dynamic=dynamic,
-        output_props=output_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:
+
+    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)
+
+
+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,5 +1,7 @@
 # Code generated by TRAC
 
+from .job import JobConfig
+
 from .common import _ConfigFile
 from .common import PluginConfig
 from .common import PlatformInfo
@@ -7,10 +9,8 @@ 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 .result import TagUpdateList
+from .result import JobResult
 
 from .platform import RoutingProtocol
 from .platform import DeploymentLayout
@@ -26,5 +26,5 @@ from .platform import RoutingMatch
 from .platform import RoutingTarget
 from .platform import DeploymentConfig
 
-from .result import TagUpdateList
-from .result import JobResult
+from .runtime import RuntimeConfig
+from .runtime import SparkSettings

tracdap/rt/config/common.py

@@ -44,7 +44,13 @@ class AuthenticationConfig:
 
     jwtRefresh: "int" = 0
 
-    provider: "_tp.Optional[PluginConfig]" = None
+    provider: "PluginConfig" = _dc.field(default_factory=lambda: PluginConfig())
+
+    loginPath: "_tp.Optional[str]" = None
+
+    refreshPath: "_tp.Optional[str]" = None
+
+    returnPath: "_tp.Optional[str]" = None
 
     disableAuth: "bool" = False
 
@@ -58,6 +64,8 @@ class AuthenticationConfig:
 
     systemTicketRefresh: "int" = 0
 
+    externalSystems: "_tp.Dict[str, PluginConfig]" = _dc.field(default_factory=dict)
+
 
 @_dc.dataclass
 class StorageConfig:
@@ -81,3 +89,5 @@ class ServiceConfig:
     alias: "str" = ""
 
     port: "int" = 0
+
+    properties: "_tp.Dict[str, str]" = _dc.field(default_factory=dict)

tracdap/rt/config/platform.py

@@ -53,9 +53,9 @@ class PlatformConfig:
 
     tenants: "_tp.Dict[str, TenantConfig]" = _dc.field(default_factory=dict)
 
-    webServer: "_tp.Optional[WebServerConfig]" = None
+    webServer: "WebServerConfig" = _dc.field(default_factory=lambda: WebServerConfig())
 
-    gateway: "_tp.Optional[GatewayConfig]" = None
+    gateway: "GatewayConfig" = _dc.field(default_factory=lambda: GatewayConfig())
 
     services: "_tp.Dict[str, ServiceConfig]" = _dc.field(default_factory=dict)
 
@@ -81,8 +81,6 @@ 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)
@@ -111,8 +109,6 @@ class WebServerRedirect:
 @_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)
@@ -151,6 +147,8 @@ class RoutingTarget:
 
     path: "str" = ""
 
+    hostAlias: "_tp.Optional[str]" = None
+
 
 @_dc.dataclass
 class DeploymentConfig:

tracdap/rt/launch/launch.py

@@ -112,9 +112,10 @@ def launch_model(
     runtime_instance = _runtime.TracRuntime(_sys_config, dev_mode=True, plugin_packages=plugin_packages)
     runtime_instance.pre_start()
 
-    job = runtime_instance.load_job_config(_job_config, model_class=model_class)
-
     with runtime_instance as rt:
+
+        job = rt.load_job_config(_job_config, model_class=model_class)
+
         rt.submit_job(job)
         rt.wait_for_job(job.jobId)
 
@@ -160,9 +161,10 @@ def launch_job(
     runtime_instance = _runtime.TracRuntime(_sys_config, dev_mode=dev_mode, plugin_packages=plugin_packages)
     runtime_instance.pre_start()
 
-    job = runtime_instance.load_job_config(_job_config)
-
     with runtime_instance as rt:
+
+        job = rt.load_job_config(_job_config)
+
         rt.submit_job(job)
         rt.wait_for_job(job.jobId)
 
@@ -184,6 +186,7 @@ def launch_cli(programmatic_args: _tp.Optional[_tp.List[str]] = None):
         launch_args = _cli_args()
 
     _sys_config = _resolve_config_file(launch_args.sys_config, None)
+    _job_config = _resolve_config_file(launch_args.job_config, None) if launch_args.job_config else None
 
     runtime_instance = _runtime.TracRuntime(
         _sys_config,
@@ -196,15 +199,10 @@ def launch_cli(programmatic_args: _tp.Optional[_tp.List[str]] = None):
 
     runtime_instance.pre_start()
 
-    if launch_args.job_config is not None:
-        _job_config = _resolve_config_file(launch_args.job_config, None)
-        job = runtime_instance.load_job_config(_job_config)
-    else:
-        job = None
-
     with runtime_instance as rt:
 
-        if job is not None:
+        if _job_config is not None:
+            job = rt.load_job_config(_job_config)
             rt.submit_job(job)
 
         if rt.is_oneshot():

tracdap/rt/metadata/__init__.py

@@ -21,6 +21,9 @@ from .data import SchemaDefinition
 from .data import PartKey
 from .data import DataDefinition
 
+from .file import FileDefinition
+from .file import FileType
+
 from .model import ModelType
 from .model import ModelParameter
 from .model import ModelInputSchema
@@ -56,9 +59,9 @@ from .job import JobGroup
 from .job import SequentialJobGroup
 from .job import ParallelJobGroup
 
-from .file import FileDefinition
-
-from .custom import CustomDefinition
+from .common import MetadataFormat
+from .common import MetadataVersion
+from .common import TenantInfo
 
 from .stoarge import CopyStatus
 from .stoarge import IncarnationStatus
@@ -67,12 +70,10 @@ from .stoarge import StorageIncarnation
 from .stoarge import StorageItem
 from .stoarge import StorageDefinition
 
-from .object import ObjectDefinition
-
-from .resource import ResourceType
+from .custom import CustomDefinition
 
-from .common import MetadataFormat
-from .common import MetadataVersion
-from .common import TenantInfo
+from .object import ObjectDefinition
 
 from .tag import Tag
+
+from .resource import ResourceType