tracdap-runtime 0.6.3__py3-none-any.whl → 0.6.4__py3-none-any.whl

tracdap/rt/config/common.py

@@ -15,7 +15,7 @@ class _ConfigFile:
 @_dc.dataclass
 class PluginConfig:
 
-    protocol: str = None
+    protocol: str = ""
 
     properties: _tp.Dict[str, str] = _dc.field(default_factory=dict)
 
@@ -25,9 +25,9 @@ class PluginConfig:
 @_dc.dataclass
 class PlatformInfo:
 
-    environment: str = None
+    environment: str = ""
 
-    production: bool = None
+    production: bool = False
 
     deploymentInfo: _tp.Dict[str, str] = _dc.field(default_factory=dict)
 
@@ -35,27 +35,27 @@ class PlatformInfo:
 @_dc.dataclass
 class AuthenticationConfig:
 
-    jwtIssuer: str = None
+    jwtIssuer: str = ""
 
-    jwtExpiry: int = None
+    jwtExpiry: int = 0
 
-    jwtLimit: int = None
+    jwtLimit: int = 0
 
-    jwtRefresh: int = None
+    jwtRefresh: int = 0
 
     provider: _tp.Optional[PluginConfig] = None
 
-    disableAuth: bool = None
+    disableAuth: bool = False
 
-    disableSigning: bool = None
+    disableSigning: bool = False
 
-    systemUserId: str = None
+    systemUserId: str = ""
 
-    systemUserName: str = None
+    systemUserName: str = ""
 
-    systemTicketDuration: int = None
+    systemTicketDuration: int = 0
 
-    systemTicketRefresh: int = None
+    systemTicketRefresh: int = 0
 
 
 @_dc.dataclass
@@ -63,9 +63,9 @@ class StorageConfig:
 
     buckets: _tp.Dict[str, PluginConfig] = _dc.field(default_factory=dict)
 
-    defaultBucket: str = None
+    defaultBucket: str = ""
 
-    defaultFormat: str = None
+    defaultFormat: str = ""
 
 
 @_dc.dataclass
@@ -73,6 +73,6 @@ class ServiceConfig:
 
     enabled: _tp.Optional[bool] = None
 
-    alias: str = None
+    alias: str = ""
 
-    port: int = None
+    port: int = 0

tracdap/rt/config/job.py

@@ -12,9 +12,9 @@ import tracdap.rt.metadata as metadata
 @_dc.dataclass
 class JobConfig:
 
-    jobId: metadata.TagHeader = None
+    jobId: metadata.TagHeader = _dc.field(default_factory=lambda: metadata.TagHeader())
 
-    job: metadata.JobDefinition = None
+    job: metadata.JobDefinition = _dc.field(default_factory=lambda: metadata.JobDefinition())
 
     resources: _tp.Dict[str, metadata.ObjectDefinition] = _dc.field(default_factory=dict)
 

tracdap/rt/config/platform.py

@@ -38,19 +38,19 @@ class PlatformConfig:
 
     config: _tp.Dict[str, str] = _dc.field(default_factory=dict)
 
-    platformInfo: PlatformInfo = None
+    platformInfo: PlatformInfo = _dc.field(default_factory=lambda: PlatformInfo())
 
-    authentication: AuthenticationConfig = None
+    authentication: AuthenticationConfig = _dc.field(default_factory=lambda: AuthenticationConfig())
 
-    metadata: MetadataConfig = None
+    metadata: MetadataConfig = _dc.field(default_factory=lambda: MetadataConfig())
 
-    storage: StorageConfig = None
+    storage: StorageConfig = _dc.field(default_factory=lambda: StorageConfig())
 
     repositories: _tp.Dict[str, PluginConfig] = _dc.field(default_factory=dict)
 
-    executor: PluginConfig = None
+    executor: PluginConfig = _dc.field(default_factory=lambda: PluginConfig())
 
-    jobCache: PluginConfig = None
+    jobCache: PluginConfig = _dc.field(default_factory=lambda: PluginConfig())
 
     tenants: _tp.Dict[str, TenantConfig] = _dc.field(default_factory=dict)
 
@@ -60,13 +60,13 @@ class PlatformConfig:
 
     services: _tp.Dict[str, ServiceConfig] = _dc.field(default_factory=dict)
 
-    deployment: DeploymentConfig = None
+    deployment: DeploymentConfig = _dc.field(default_factory=lambda: DeploymentConfig())
 
 
 @_dc.dataclass
 class MetadataConfig:
 
-    database: PluginConfig = None
+    database: PluginConfig = _dc.field(default_factory=lambda: PluginConfig())
 
     format: metadata.MetadataFormat = metadata.MetadataFormat.METADATA_FORMAT_NOT_SET
 
@@ -82,9 +82,9 @@ class TenantConfig:
 @_dc.dataclass
 class WebServerConfig:
 
-    enabled: bool = None
+    enabled: bool = False
 
-    contentRoot: PluginConfig = None
+    contentRoot: PluginConfig = _dc.field(default_factory=lambda: PluginConfig())
 
     rewriteRules: _tp.List[WebServerRewriteRule] = _dc.field(default_factory=list)
 
@@ -94,25 +94,25 @@ class WebServerConfig:
 @_dc.dataclass
 class WebServerRewriteRule:
 
-    source: str = None
+    source: str = ""
 
-    target: str = None
+    target: str = ""
 
 
 @_dc.dataclass
 class WebServerRedirect:
 
-    source: str = None
+    source: str = ""
 
-    target: str = None
+    target: str = ""
 
-    status: int = None
+    status: int = 0
 
 
 @_dc.dataclass
 class GatewayConfig:
 
-    idleTimeout: int = None
+    idleTimeout: int = 0
 
     routes: _tp.List[RouteConfig] = _dc.field(default_factory=list)
 
@@ -122,35 +122,35 @@ class GatewayConfig:
 @_dc.dataclass
 class RouteConfig:
 
-    routeName: str = None
+    routeName: str = ""
 
     routeType: RoutingProtocol = RoutingProtocol.PROTOCOL_NOT_SET
 
     protocols: _tp.List[RoutingProtocol] = _dc.field(default_factory=list)
 
-    match: RoutingMatch = None
+    match: RoutingMatch = _dc.field(default_factory=lambda: RoutingMatch())
 
-    target: RoutingTarget = None
+    target: RoutingTarget = _dc.field(default_factory=lambda: RoutingTarget())
 
 
 @_dc.dataclass
 class RoutingMatch:
 
-    host: str = None
+    host: str = ""
 
-    path: str = None
+    path: str = ""
 
 
 @_dc.dataclass
 class RoutingTarget:
 
-    scheme: str = None
+    scheme: str = ""
 
-    host: str = None
+    host: str = ""
 
-    port: int = None
+    port: int = 0
 
-    path: str = None
+    path: str = ""
 
 
 @_dc.dataclass

tracdap/rt/config/result.py

@@ -18,10 +18,10 @@ class TagUpdateList:
 @_dc.dataclass
 class JobResult:
 
-    jobId: metadata.TagHeader = None
+    jobId: metadata.TagHeader = _dc.field(default_factory=lambda: metadata.TagHeader())
 
     statusCode: metadata.JobStatusCode = metadata.JobStatusCode.JOB_STATUS_CODE_NOT_SET
 
-    statusMessage: str = None
+    statusMessage: str = ""
 
     results: _tp.Dict[str, metadata.ObjectDefinition] = _dc.field(default_factory=dict)

tracdap/rt/config/runtime.py

@@ -14,13 +14,13 @@ class RuntimeConfig:
 
     config: _tp.Dict[str, str] = _dc.field(default_factory=dict)
 
-    storage: StorageConfig = None
+    storage: StorageConfig = _dc.field(default_factory=lambda: StorageConfig())
 
     repositories: _tp.Dict[str, PluginConfig] = _dc.field(default_factory=dict)
 
-    sparkSettings: SparkSettings = None
+    sparkSettings: SparkSettings = _dc.field(default_factory=lambda: SparkSettings())
 
-    runtimeApi: ServiceConfig = None
+    runtimeApi: ServiceConfig = _dc.field(default_factory=lambda: ServiceConfig())
 
 
 @_dc.dataclass

tracdap/rt/launch/cli.py

@@ -16,18 +16,18 @@ import argparse
 import pathlib
 
 
-def _cli_args():
+def _cli_args(programmatic_args = None):
 
     parser = argparse.ArgumentParser(
         prog="python -m tracdap.rt.launch",
         description="TRAC D.A.P. Runtime for Python")
 
     parser.add_argument(
-        "--sys-config", dest="sys_config", type=pathlib.Path, required=True,
+        "--sys-config", dest="sys_config", type=str, required=True,
         help="Path to the system configuration file for the TRAC runtime")
 
     parser.add_argument(
-        "--job-config", dest="job_config", type=pathlib.Path, required=True,
+        "--job-config", dest="job_config", type=str, required=True,
         help="Path to the job configuration for the job to be executed")
 
     parser.add_argument(
@@ -55,4 +55,7 @@ def _cli_args():
         "--plugin-package", dest="plugin_packages", type=str, action="append",
         help="Do not clean up the scratch location on exit")
 
-    return parser.parse_args()
+    if programmatic_args:
+        return parser.parse_args(programmatic_args)
+    else:
+        return parser.parse_args()

tracdap/rt/launch/launch.py

@@ -29,7 +29,15 @@ from .cli import _cli_args
 def _resolve_config_file(
         config_path: _tp.Union[str, _pathlib.Path],
         model_dir: _tp.Optional[_pathlib.Path] = None) \
-        -> _pathlib.Path:
+        -> _tp.Union[_pathlib.Path, str]:
+
+    # If the config path is a URL, do not convert it into a path
+    if isinstance(config_path, str):
+        scheme_sep = config_path.find(":")
+        # Single letter scheme is a Windows file path (C:\...)
+        scheme = scheme = config_path[:scheme_sep] if scheme_sep > 1 else "file"
+        if scheme != "file":
+            return config_path
 
     if _pathlib.Path(config_path).is_absolute():
         return config_path
@@ -136,13 +144,21 @@ def launch_job(
         rt.wait_for_job(job.jobId)
 
 
-def launch_cli():
+def launch_cli(programmatic_args: _tp.Optional[_tp.List[str]] = None):
 
     """
     Launch the TRAC runtime using the command line interface
+
+    CLI arguments are read from the process command line by default. To pass CLI args
+    explicitly, provide the list of arguments using the programmatic_args parameter.
+
+    :param programmatic_args: Optional parameter to pass CLI args explicitly in code
     """
 
-    launch_args = _cli_args()
+    if programmatic_args:
+        launch_args = _cli_args(programmatic_args)
+    else:
+        launch_args = _cli_args()
 
     _sys_config = _resolve_config_file(launch_args.sys_config, None)
 

tracdap/rt/metadata/common.py

@@ -49,10 +49,10 @@ class TenantInfo:
 
     """Information about a tenant that is set up on the TRAC platform."""
 
-    tenantCode: str = None
+    tenantCode: str = ""
 
     """* Unique code used to identify the tenant, required by most API calls."""
 
-    description: str = None
+    description: str = ""
 
     """* A short description of the tenant, suitable for displaying to users in lists."""

tracdap/rt/metadata/custom.py

@@ -11,8 +11,8 @@ class CustomDefinition:
 
     """Define a custom object that can be stored and managed in the TRAC metadata store"""
 
-    customSchemaType: str = None
+    customSchemaType: str = ""
 
-    customSchemaVersion: int = None
+    customSchemaVersion: int = 0
 
-    customData: bytes = None
+    customData: bytes = b""

tracdap/rt/metadata/data.py

@@ -54,17 +54,17 @@ class FieldSchema:
         :class:`TableSchema <TableSchema>`
     """
 
-    fieldName: str = None
+    fieldName: str = ""
 
-    fieldOrder: int = None
+    fieldOrder: int = 0
 
     fieldType: BasicType = BasicType.BASIC_TYPE_NOT_SET
 
-    label: str = None
+    label: str = ""
 
-    businessKey: bool = None
+    businessKey: bool = False
 
-    categorical: bool = None
+    categorical: bool = False
 
     notNull: _tp.Optional[bool] = None
 
@@ -110,7 +110,7 @@ class PartKey:
 
     """Partition key for tabular datasets"""
 
-    opaqueKey: str = None
+    opaqueKey: str = ""
 
     partType: PartType = PartType.PART_ROOT
 
@@ -129,23 +129,23 @@ class DataDefinition:
     @_dc.dataclass
     class Delta:
 
-        deltaIndex: int = None
+        deltaIndex: int = 0
 
-        dataItem: str = None
+        dataItem: str = ""
 
     @_dc.dataclass
     class Snap:
 
-        snapIndex: int = None
+        snapIndex: int = 0
 
         deltas: _tp.List[DataDefinition.Delta] = _dc.field(default_factory=list)
 
     @_dc.dataclass
     class Part:
 
-        partKey: PartKey = None
+        partKey: PartKey = _dc.field(default_factory=lambda: PartKey())
 
-        snap: DataDefinition.Snap = None
+        snap: DataDefinition.Snap = _dc.field(default_factory=lambda: DataDefinition.Snap())
 
     schemaId: _tp.Optional[TagSelector] = None
 
@@ -153,4 +153,4 @@ class DataDefinition:
 
     parts: _tp.Dict[str, DataDefinition.Part] = _dc.field(default_factory=dict)
 
-    storageId: TagSelector = None
+    storageId: TagSelector = _dc.field(default_factory=lambda: TagSelector())

tracdap/rt/metadata/file.py

@@ -14,14 +14,14 @@ class FileDefinition:
 
     """Describes a file object stored in the TRAC platform"""
 
-    name: str = None
+    name: str = ""
 
-    extension: str = None
+    extension: str = ""
 
-    mimeType: str = None
+    mimeType: str = ""
 
-    size: int = None
+    size: int = 0
 
-    storageId: TagSelector = None
+    storageId: TagSelector = _dc.field(default_factory=lambda: TagSelector())
 
-    dataItem: str = None
+    dataItem: str = ""

tracdap/rt/metadata/flow.py

@@ -59,13 +59,13 @@ class FlowNode:
 
     outputs: _tp.List[str] = _dc.field(default_factory=list)
 
-    nodeSearch: SearchExpression = None
+    nodeSearch: SearchExpression = _dc.field(default_factory=lambda: SearchExpression())
 
     nodeAttrs: _tp.List[TagUpdate] = _dc.field(default_factory=list)
 
     nodeProps: _tp.Dict[str, Value] = _dc.field(default_factory=dict)
 
-    label: str = None
+    label: str = ""
 
 
 @_dc.dataclass
@@ -85,9 +85,9 @@ class FlowSocket:
         :class:`FlowEdge <FlowEdge>`
     """
 
-    node: str = None
+    node: str = ""
 
-    socket: str = None
+    socket: str = ""
 
 
 @_dc.dataclass
@@ -100,9 +100,9 @@ class FlowEdge:
         :class:`FlowSocket <FlowSocket>`
     """
 
-    source: FlowSocket = None
+    source: FlowSocket = _dc.field(default_factory=lambda: FlowSocket())
 
-    target: FlowSocket = None
+    target: FlowSocket = _dc.field(default_factory=lambda: FlowSocket())
 
 
 @_dc.dataclass

tracdap/rt/metadata/job.py

@@ -99,7 +99,7 @@ class RunModelJob:
 
     """Specification for a RuN_MODEL job"""
 
-    model: TagSelector = None
+    model: TagSelector = _dc.field(default_factory=lambda: TagSelector())
 
     parameters: _tp.Dict[str, Value] = _dc.field(default_factory=dict)
 
@@ -117,7 +117,7 @@ class RunFlowJob:
 
     """Specification for a RUN_FLOW job"""
 
-    flow: TagSelector = None
+    flow: TagSelector = _dc.field(default_factory=lambda: TagSelector())
 
     parameters: _tp.Dict[str, Value] = _dc.field(default_factory=dict)
 
@@ -137,18 +137,18 @@ class ImportModelJob:
 
     """Specification for an IMPORT_MODEL job"""
 
-    language: str = None
+    language: str = ""
 
-    repository: str = None
+    repository: str = ""
 
     packageGroup: _tp.Optional[str] = None
 
-    package: str = None
+    package: str = ""
 
-    version: str = None
+    version: str = ""
 
-    entryPoint: str = None
+    entryPoint: str = ""
 
-    path: str = None
+    path: str = ""
 
     modelAttrs: _tp.List[TagUpdate] = _dc.field(default_factory=list)

tracdap/rt/metadata/model.py

@@ -15,9 +15,9 @@ class ModelParameter:
 
     """Describes an individual parameter of a model"""
 
-    paramType: TypeDescriptor = None
+    paramType: TypeDescriptor = _dc.field(default_factory=lambda: TypeDescriptor())
 
-    label: str = None
+    label: str = ""
 
     defaultValue: _tp.Optional[Value] = None
 
@@ -39,11 +39,13 @@ class ModelInputSchema:
     other options may be required. These capabilities may be added in future releases.
     """
 
-    schema: SchemaDefinition = None
+    schema: SchemaDefinition = _dc.field(default_factory=lambda: SchemaDefinition())
 
     label: _tp.Optional[str] = None
 
-    optional: bool = None
+    optional: bool = False
+
+    dynamic: bool = False
 
     inputProps: _tp.Dict[str, Value] = _dc.field(default_factory=dict)
 
@@ -64,11 +66,13 @@ class ModelOutputSchema:
     added in future releases.
     """
 
-    schema: SchemaDefinition = None
+    schema: SchemaDefinition = _dc.field(default_factory=lambda: SchemaDefinition())
 
     label: _tp.Optional[str] = None
 
-    optional: bool = None
+    optional: bool = False
+
+    dynamic: bool = False
 
     outputProps: _tp.Dict[str, Value] = _dc.field(default_factory=dict)
 
@@ -78,17 +82,17 @@ class ModelDefinition:
 
     """Define a model for execution on the TRAC platform"""
 
-    language: str = None
+    language: str = ""
 
-    repository: str = None
+    repository: str = ""
 
     packageGroup: _tp.Optional[str] = None
 
-    package: str = None
+    package: str = ""
 
-    version: str = None
+    version: str = ""
 
-    entryPoint: str = None
+    entryPoint: str = ""
 
     path: _tp.Optional[str] = None
 

tracdap/rt/metadata/object_id.py

@@ -56,7 +56,7 @@ class TagHeader:
         :class:`ObjectType <ObjectType>`
     """
 
-    objectId: str = None
+    objectId: str = ""
 
     """
     Object ID of the object this tag is associated with.
@@ -64,27 +64,27 @@ class TagHeader:
     Object IDs are UUIDs (RFC4122, https://www.ietf.org/rfc/rfc4122.txt)
     """
 
-    objectVersion: int = None
+    objectVersion: int = 0
 
     """Version of the object this tag is associated with."""
 
-    objectTimestamp: DatetimeValue = None
+    objectTimestamp: DatetimeValue = _dc.field(default_factory=lambda: DatetimeValue())
 
     """Timestamp for when this version of the object was created."""
 
-    tagVersion: int = None
+    tagVersion: int = 0
 
     """Version of this tag."""
 
-    tagTimestamp: DatetimeValue = None
+    tagTimestamp: DatetimeValue = _dc.field(default_factory=lambda: DatetimeValue())
 
     """Timestamp for when this version of the tag was created."""
 
-    isLatestObject: bool = None
+    isLatestObject: bool = False
 
     """isLatest flag for the object the tag is associated with."""
 
-    isLatestTag: bool = None
+    isLatestTag: bool = False
 
     """isLatest flag for the tag."""
 
@@ -132,7 +132,7 @@ class TagSelector:
         :class:`ObjectType <ObjectType>`
     """
 
-    objectId: str = None
+    objectId: str = ""
 
     """
     Object ID of the tag being selected.