tracdap-runtime 0.5.29__py3-none-any.whl → 0.6.0__py3-none-any.whl

tracdap/rt/_version.py

@@ -12,4 +12,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "0.5.29"
+__version__ = "0.6.0"

tracdap/rt/api/static_api.py

@@ -125,7 +125,8 @@ def define_parameter(
     If a default value is specified, the model parameter becomes optional. It is ok to omit optional parameters
     when running models or setting up jobs, in which case the default value will be used. If no default is
     specified then the model parameter becomes mandatory, a value must always be supplied in order to execute
-    the model.
+    the model. TRAC will apply type coercion where possible to ensure the default value matches the parameter type,
+    if the default value cannot be coerced to match the parameter type then model validation will fail.
 
     Once defined model parameters can be passed to :py:func:`define_parameters`,
     either as a list or as individual arguments, to create the set of parameters for a model.

tracdap/rt/config/__init__.py

@@ -4,27 +4,22 @@ from .common import _ConfigFile
 from .common import PluginConfig
 from .common import PlatformInfo
 from .common import AuthenticationConfig
+from .common import StorageConfig
 
-from .gateway import GwProtocol
-from .gateway import GwRestMapping
-from .gateway import GatewayConfig
-from .gateway import GwRoute
-from .gateway import GwMatch
-from .gateway import GwTarget
-from .gateway import GwServiceMap
-from .gateway import GwService
-
+from .platform import RoutingProtocol
+from .platform import DeploymentLayout
 from .platform import PlatformConfig
 from .platform import MetadataConfig
-from .platform import StorageConfig
 from .platform import TenantConfig
 from .platform import WebServerConfig
 from .platform import WebServerRewriteRule
 from .platform import WebServerRedirect
-from .platform import InstantMap
-from .platform import InstanceConfig
-from .platform import ServiceMap
+from .platform import GatewayConfig
+from .platform import RouteConfig
+from .platform import RoutingMatch
+from .platform import RoutingTarget
 from .platform import ServiceConfig
+from .platform import DeploymentConfig
 
 from .result import TagUpdateList
 from .result import JobResult

tracdap/rt/config/common.py

@@ -56,3 +56,13 @@ class AuthenticationConfig:
     systemTicketDuration: int = None
 
     systemTicketRefresh: int = None
+
+
+@_dc.dataclass
+class StorageConfig:
+
+    buckets: _tp.Dict[str, PluginConfig] = _dc.field(default_factory=dict)
+
+    defaultBucket: str = None
+
+    defaultFormat: str = None

tracdap/rt/config/common_pb2.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/config/common.proto
+# Protobuf Python Version: 4.25.3
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,36 +14,42 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1btracdap/config/common.proto\x12\x0etracdap.config\"u\n\x0b_ConfigFile\x12\x37\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\'.tracdap.config._ConfigFile.ConfigEntry\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x81\x02\n\x0cPluginConfig\x12\x10\n\x08protocol\x18\x01 \x01(\t\x12@\n\nproperties\x18\x02 \x03(\x0b\x32,.tracdap.config.PluginConfig.PropertiesEntry\x12:\n\x07secrets\x18\x03 \x03(\x0b\x32).tracdap.config.PluginConfig.SecretsEntry\x1a\x31\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a.\n\x0cSecretsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xb8\x01\n\x0cPlatformInfo\x12\x13\n\x0b\x65nvironment\x18\x01 \x01(\t\x12\x12\n\nproduction\x18\x02 \x01(\x08\x12H\n\x0e\x64\x65ploymentInfo\x18\x03 \x03(\x0b\x32\x30.tracdap.config.PlatformInfo.DeploymentInfoEntry\x1a\x35\n\x13\x44\x65ploymentInfoEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xba\x02\n\x14\x41uthenticationConfig\x12\x11\n\tjwtIssuer\x18\x01 \x01(\t\x12\x11\n\tjwtExpiry\x18\x02 \x01(\x11\x12\x10\n\x08jwtLimit\x18\x06 \x01(\x11\x12\x12\n\njwtRefresh\x18\x07 \x01(\x11\x12\x33\n\x08provider\x18\x03 \x01(\x0b\x32\x1c.tracdap.config.PluginConfigH\x00\x88\x01\x01\x12\x13\n\x0b\x64isableAuth\x18\x04 \x01(\x08\x12\x16\n\x0e\x64isableSigning\x18\x05 \x01(\x08\x12\x14\n\x0csystemUserId\x18\x08 \x01(\t\x12\x16\n\x0esystemUserName\x18\t \x01(\t\x12\x1c\n\x14systemTicketDuration\x18\n \x01(\x11\x12\x1b\n\x13systemTicketRefresh\x18\x0b \x01(\x11\x42\x0b\n\t_providerB\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1btracdap/config/common.proto\x12\x0etracdap.config\"u\n\x0b_ConfigFile\x12\x37\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\'.tracdap.config._ConfigFile.ConfigEntry\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x81\x02\n\x0cPluginConfig\x12\x10\n\x08protocol\x18\x01 \x01(\t\x12@\n\nproperties\x18\x02 \x03(\x0b\x32,.tracdap.config.PluginConfig.PropertiesEntry\x12:\n\x07secrets\x18\x03 \x03(\x0b\x32).tracdap.config.PluginConfig.SecretsEntry\x1a\x31\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a.\n\x0cSecretsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xb8\x01\n\x0cPlatformInfo\x12\x13\n\x0b\x65nvironment\x18\x01 \x01(\t\x12\x12\n\nproduction\x18\x02 \x01(\x08\x12H\n\x0e\x64\x65ploymentInfo\x18\x03 \x03(\x0b\x32\x30.tracdap.config.PlatformInfo.DeploymentInfoEntry\x1a\x35\n\x13\x44\x65ploymentInfoEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xba\x02\n\x14\x41uthenticationConfig\x12\x11\n\tjwtIssuer\x18\x01 \x01(\t\x12\x11\n\tjwtExpiry\x18\x02 \x01(\x11\x12\x10\n\x08jwtLimit\x18\x06 \x01(\x11\x12\x12\n\njwtRefresh\x18\x07 \x01(\x11\x12\x33\n\x08provider\x18\x03 \x01(\x0b\x32\x1c.tracdap.config.PluginConfigH\x00\x88\x01\x01\x12\x13\n\x0b\x64isableAuth\x18\x04 \x01(\x08\x12\x16\n\x0e\x64isableSigning\x18\x05 \x01(\x08\x12\x14\n\x0csystemUserId\x18\x08 \x01(\t\x12\x16\n\x0esystemUserName\x18\t \x01(\t\x12\x1c\n\x14systemTicketDuration\x18\n \x01(\x11\x12\x1b\n\x13systemTicketRefresh\x18\x0b \x01(\x11\x42\x0b\n\t_provider\"\xc8\x01\n\rStorageConfig\x12;\n\x07\x62uckets\x18\x01 \x03(\x0b\x32*.tracdap.config.StorageConfig.BucketsEntry\x12\x15\n\rdefaultBucket\x18\x02 \x01(\t\x12\x15\n\rdefaultFormat\x18\x03 \x01(\t\x1aL\n\x0c\x42ucketsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.common_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.common_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\030org.finos.tracdap.configP\001'
-  __CONFIGFILE_CONFIGENTRY._options = None
-  __CONFIGFILE_CONFIGENTRY._serialized_options = b'8\001'
-  _PLUGINCONFIG_PROPERTIESENTRY._options = None
-  _PLUGINCONFIG_PROPERTIESENTRY._serialized_options = b'8\001'
-  _PLUGINCONFIG_SECRETSENTRY._options = None
-  _PLUGINCONFIG_SECRETSENTRY._serialized_options = b'8\001'
-  _PLATFORMINFO_DEPLOYMENTINFOENTRY._options = None
-  _PLATFORMINFO_DEPLOYMENTINFOENTRY._serialized_options = b'8\001'
-  __CONFIGFILE._serialized_start=47
-  __CONFIGFILE._serialized_end=164
-  __CONFIGFILE_CONFIGENTRY._serialized_start=119
-  __CONFIGFILE_CONFIGENTRY._serialized_end=164
-  _PLUGINCONFIG._serialized_start=167
-  _PLUGINCONFIG._serialized_end=424
-  _PLUGINCONFIG_PROPERTIESENTRY._serialized_start=327
-  _PLUGINCONFIG_PROPERTIESENTRY._serialized_end=376
-  _PLUGINCONFIG_SECRETSENTRY._serialized_start=378
-  _PLUGINCONFIG_SECRETSENTRY._serialized_end=424
-  _PLATFORMINFO._serialized_start=427
-  _PLATFORMINFO._serialized_end=611
-  _PLATFORMINFO_DEPLOYMENTINFOENTRY._serialized_start=558
-  _PLATFORMINFO_DEPLOYMENTINFOENTRY._serialized_end=611
-  _AUTHENTICATIONCONFIG._serialized_start=614
-  _AUTHENTICATIONCONFIG._serialized_end=928
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\030org.finos.tracdap.configP\001'
+  _globals['__CONFIGFILE_CONFIGENTRY']._options = None
+  _globals['__CONFIGFILE_CONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._options = None
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._serialized_options = b'8\001'
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._options = None
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._serialized_options = b'8\001'
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._options = None
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._serialized_options = b'8\001'
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._options = None
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._serialized_options = b'8\001'
+  _globals['__CONFIGFILE']._serialized_start=47
+  _globals['__CONFIGFILE']._serialized_end=164
+  _globals['__CONFIGFILE_CONFIGENTRY']._serialized_start=119
+  _globals['__CONFIGFILE_CONFIGENTRY']._serialized_end=164
+  _globals['_PLUGINCONFIG']._serialized_start=167
+  _globals['_PLUGINCONFIG']._serialized_end=424
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._serialized_start=327
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._serialized_end=376
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._serialized_start=378
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._serialized_end=424
+  _globals['_PLATFORMINFO']._serialized_start=427
+  _globals['_PLATFORMINFO']._serialized_end=611
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._serialized_start=558
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._serialized_end=611
+  _globals['_AUTHENTICATIONCONFIG']._serialized_start=614
+  _globals['_AUTHENTICATIONCONFIG']._serialized_end=928
+  _globals['_STORAGECONFIG']._serialized_start=931
+  _globals['_STORAGECONFIG']._serialized_end=1131
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._serialized_start=1055
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._serialized_end=1131
 # @@protoc_insertion_point(module_scope)

tracdap/rt/config/job_pb2.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/config/job.proto
+# Protobuf Python Version: 4.25.3
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,24 +19,24 @@ from tracdap.metadata import job_pb2 as tracdap_dot_metadata_dot_job__pb2
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18tracdap/config/job.proto\x12\x0etracdap.config\x1a tracdap/metadata/object_id.proto\x1a\x1dtracdap/metadata/object.proto\x1a\x1atracdap/metadata/job.proto\"\xae\x04\n\tJobConfig\x12*\n\x05jobId\x18\x01 \x01(\x0b\x32\x1b.tracdap.metadata.TagHeader\x12,\n\x03job\x18\x02 \x01(\x0b\x32\x1f.tracdap.metadata.JobDefinition\x12;\n\tresources\x18\x03 \x03(\x0b\x32(.tracdap.config.JobConfig.ResourcesEntry\x12G\n\x0fresourceMapping\x18\x04 \x03(\x0b\x32..tracdap.config.JobConfig.ResourceMappingEntry\x12\x43\n\rresultMapping\x18\x05 \x03(\x0b\x32,.tracdap.config.JobConfig.ResultMappingEntry\x1aT\n\x0eResourcesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ObjectDefinition:\x02\x38\x01\x1aS\n\x14ResourceMappingEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x1b.tracdap.metadata.TagHeader:\x02\x38\x01\x1aQ\n\x12ResultMappingEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x1b.tracdap.metadata.TagHeader:\x02\x38\x01\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.job_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.job_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\030org.finos.tracdap.configP\001'
-  _JOBCONFIG_RESOURCESENTRY._options = None
-  _JOBCONFIG_RESOURCESENTRY._serialized_options = b'8\001'
-  _JOBCONFIG_RESOURCEMAPPINGENTRY._options = None
-  _JOBCONFIG_RESOURCEMAPPINGENTRY._serialized_options = b'8\001'
-  _JOBCONFIG_RESULTMAPPINGENTRY._options = None
-  _JOBCONFIG_RESULTMAPPINGENTRY._serialized_options = b'8\001'
-  _JOBCONFIG._serialized_start=138
-  _JOBCONFIG._serialized_end=696
-  _JOBCONFIG_RESOURCESENTRY._serialized_start=444
-  _JOBCONFIG_RESOURCESENTRY._serialized_end=528
-  _JOBCONFIG_RESOURCEMAPPINGENTRY._serialized_start=530
-  _JOBCONFIG_RESOURCEMAPPINGENTRY._serialized_end=613
-  _JOBCONFIG_RESULTMAPPINGENTRY._serialized_start=615
-  _JOBCONFIG_RESULTMAPPINGENTRY._serialized_end=696
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\030org.finos.tracdap.configP\001'
+  _globals['_JOBCONFIG_RESOURCESENTRY']._options = None
+  _globals['_JOBCONFIG_RESOURCESENTRY']._serialized_options = b'8\001'
+  _globals['_JOBCONFIG_RESOURCEMAPPINGENTRY']._options = None
+  _globals['_JOBCONFIG_RESOURCEMAPPINGENTRY']._serialized_options = b'8\001'
+  _globals['_JOBCONFIG_RESULTMAPPINGENTRY']._options = None
+  _globals['_JOBCONFIG_RESULTMAPPINGENTRY']._serialized_options = b'8\001'
+  _globals['_JOBCONFIG']._serialized_start=138
+  _globals['_JOBCONFIG']._serialized_end=696
+  _globals['_JOBCONFIG_RESOURCESENTRY']._serialized_start=444
+  _globals['_JOBCONFIG_RESOURCESENTRY']._serialized_end=528
+  _globals['_JOBCONFIG_RESOURCEMAPPINGENTRY']._serialized_start=530
+  _globals['_JOBCONFIG_RESOURCEMAPPINGENTRY']._serialized_end=613
+  _globals['_JOBCONFIG_RESULTMAPPINGENTRY']._serialized_start=615
+  _globals['_JOBCONFIG_RESULTMAPPINGENTRY']._serialized_end=696
 # @@protoc_insertion_point(module_scope)

tracdap/rt/config/platform.py

@@ -9,6 +9,29 @@ import tracdap.rt.metadata as metadata
 from .common import *  # noqa
 
 
+class RoutingProtocol(_enum.Enum):
+
+    PROTOCOL_NOT_SET = 0, 
+
+    HTTP = 1, 
+
+    GRPC = 2, 
+
+    GRPC_WEB = 3, 
+
+    REST = 4, 
+
+
+class DeploymentLayout(_enum.Enum):
+
+    LAYOUT_NOT_SET = 0, 
+
+    SANDBOX = 1, 
+
+    HOSTED = 2, 
+
+    CUSTOM = 3, 
+
 
 @_dc.dataclass
 class PlatformConfig:
@@ -33,9 +56,11 @@ class PlatformConfig:
 
     webServer: _tp.Optional[WebServerConfig] = None
 
-    instances: InstantMap = None
+    gateway: _tp.Optional[GatewayConfig] = None
+
+    services: _tp.Dict[str, ServiceConfig] = _dc.field(default_factory=dict)
 
-    services: ServiceMap = None
+    deployment: DeploymentConfig = None
 
 
 @_dc.dataclass
@@ -46,16 +71,6 @@ class MetadataConfig:
     format: metadata.MetadataFormat = metadata.MetadataFormat.METADATA_FORMAT_NOT_SET
 
 
-@_dc.dataclass
-class StorageConfig:
-
-    buckets: _tp.Dict[str, PluginConfig] = _dc.field(default_factory=dict)
-
-    defaultBucket: str = None
-
-    defaultFormat: str = None
-
-
 @_dc.dataclass
 class TenantConfig:
 
@@ -69,8 +84,6 @@ class WebServerConfig:
 
     enabled: bool = None
 
-    port: int = None
-
     contentRoot: PluginConfig = None
 
     rewriteRules: _tp.List[WebServerRewriteRule] = _dc.field(default_factory=list)
@@ -97,17 +110,37 @@ class WebServerRedirect:
 
 
 @_dc.dataclass
-class InstantMap:
+class GatewayConfig:
+
+    idleTimeout: int = None
+
+    routes: _tp.List[RouteConfig] = _dc.field(default_factory=list)
+
+
+@_dc.dataclass
+class RouteConfig:
+
+    routeName: str = None
+
+    routeType: RoutingProtocol = RoutingProtocol.PROTOCOL_NOT_SET
 
-    meta: _tp.List[InstanceConfig] = _dc.field(default_factory=list)
+    protocols: _tp.List[RoutingProtocol] = _dc.field(default_factory=list)
 
-    data: _tp.List[InstanceConfig] = _dc.field(default_factory=list)
+    match: RoutingMatch = None
 
-    orch: _tp.List[InstanceConfig] = _dc.field(default_factory=list)
+    target: RoutingTarget = None
 
 
 @_dc.dataclass
-class InstanceConfig:
+class RoutingMatch:
+
+    host: str = None
+
+    path: str = None
+
+
+@_dc.dataclass
+class RoutingTarget:
 
     scheme: str = None
 
@@ -115,18 +148,20 @@ class InstanceConfig:
 
     port: int = None
 
+    path: str = None
+
 
 @_dc.dataclass
-class ServiceMap:
+class ServiceConfig:
 
-    meta: ServiceConfig = None
+    enabled: _tp.Optional[bool] = None
 
-    data: ServiceConfig = None
+    alias: str = None
 
-    orch: ServiceConfig = None
+    port: int = None
 
 
 @_dc.dataclass
-class ServiceConfig:
+class DeploymentConfig:
 
-    port: int = None
+    layout: DeploymentLayout = DeploymentLayout.LAYOUT_NOT_SET

tracdap/rt/config/platform_pb2.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/config/platform.proto
+# Protobuf Python Version: 4.25.3
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,50 +16,56 @@ from tracdap.metadata import common_pb2 as tracdap_dot_metadata_dot_common__pb2
 from tracdap.config import common_pb2 as tracdap_dot_config_dot_common__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dtracdap/config/platform.proto\x12\x0etracdap.config\x1a\x1dtracdap/metadata/common.proto\x1a\x1btracdap/config/common.proto\"\xfa\x06\n\x0ePlatformConfig\x12:\n\x06\x63onfig\x18\x01 \x03(\x0b\x32*.tracdap.config.PlatformConfig.ConfigEntry\x12\x32\n\x0cplatformInfo\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PlatformInfo\x12<\n\x0e\x61uthentication\x18\x05 \x01(\x0b\x32$.tracdap.config.AuthenticationConfig\x12\x30\n\x08metadata\x18\x06 \x01(\x0b\x32\x1e.tracdap.config.MetadataConfig\x12.\n\x07storage\x18\x07 \x01(\x0b\x32\x1d.tracdap.config.StorageConfig\x12\x46\n\x0crepositories\x18\x08 \x03(\x0b\x32\x30.tracdap.config.PlatformConfig.RepositoriesEntry\x12.\n\x08\x65xecutor\x18\t \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12.\n\x08jobCache\x18\x0c \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12<\n\x07tenants\x18\n \x03(\x0b\x32+.tracdap.config.PlatformConfig.TenantsEntry\x12\x37\n\twebServer\x18\x0b \x01(\x0b\x32\x1f.tracdap.config.WebServerConfigH\x00\x88\x01\x01\x12-\n\tinstances\x18\x03 \x01(\x0b\x32\x1a.tracdap.config.InstantMap\x12,\n\x08services\x18\x04 \x01(\x0b\x32\x1a.tracdap.config.ServiceMap\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aQ\n\x11RepositoriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\x1aL\n\x0cTenantsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.TenantConfig:\x02\x38\x01\x42\x0c\n\n_webServer\"r\n\x0eMetadataConfig\x12.\n\x08\x64\x61tabase\x18\x01 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12\x30\n\x06\x66ormat\x18\x02 \x01(\x0e\x32 .tracdap.metadata.MetadataFormat\"\xc8\x01\n\rStorageConfig\x12;\n\x07\x62uckets\x18\x01 \x03(\x0b\x32*.tracdap.config.StorageConfig.BucketsEntry\x12\x15\n\rdefaultBucket\x18\x02 \x01(\t\x12\x15\n\rdefaultFormat\x18\x03 \x01(\t\x1aL\n\x0c\x42ucketsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\"j\n\x0cTenantConfig\x12\x1a\n\rdefaultBucket\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x1a\n\rdefaultFormat\x18\x02 \x01(\tH\x01\x88\x01\x01\x42\x10\n\x0e_defaultBucketB\x10\n\x0e_defaultFormat\"\xd5\x01\n\x0fWebServerConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x0c\n\x04port\x18\x02 \x01(\x05\x12\x31\n\x0b\x63ontentRoot\x18\x03 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12:\n\x0crewriteRules\x18\x04 \x03(\x0b\x32$.tracdap.config.WebServerRewriteRule\x12\x34\n\tredirects\x18\x05 \x03(\x0b\x32!.tracdap.config.WebServerRedirect\"6\n\x14WebServerRewriteRule\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\"C\n\x11WebServerRedirect\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x05\"\x96\x01\n\nInstantMap\x12,\n\x04meta\x18\x01 \x03(\x0b\x32\x1e.tracdap.config.InstanceConfig\x12,\n\x04\x64\x61ta\x18\x02 \x03(\x0b\x32\x1e.tracdap.config.InstanceConfig\x12,\n\x04orch\x18\x03 \x03(\x0b\x32\x1e.tracdap.config.InstanceConfig\"<\n\x0eInstanceConfig\x12\x0e\n\x06scheme\x18\x01 \x01(\t\x12\x0c\n\x04host\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\"\x93\x01\n\nServiceMap\x12+\n\x04meta\x18\x01 \x01(\x0b\x32\x1d.tracdap.config.ServiceConfig\x12+\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1d.tracdap.config.ServiceConfig\x12+\n\x04orch\x18\x03 \x01(\x0b\x32\x1d.tracdap.config.ServiceConfig\"\x1d\n\rServiceConfig\x12\x0c\n\x04port\x18\x01 \x01(\rB\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dtracdap/config/platform.proto\x12\x0etracdap.config\x1a\x1dtracdap/metadata/common.proto\x1a\x1btracdap/config/common.proto\"\xa4\x08\n\x0ePlatformConfig\x12:\n\x06\x63onfig\x18\x01 \x03(\x0b\x32*.tracdap.config.PlatformConfig.ConfigEntry\x12\x32\n\x0cplatformInfo\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PlatformInfo\x12<\n\x0e\x61uthentication\x18\x05 \x01(\x0b\x32$.tracdap.config.AuthenticationConfig\x12\x30\n\x08metadata\x18\x06 \x01(\x0b\x32\x1e.tracdap.config.MetadataConfig\x12.\n\x07storage\x18\x07 \x01(\x0b\x32\x1d.tracdap.config.StorageConfig\x12\x46\n\x0crepositories\x18\x08 \x03(\x0b\x32\x30.tracdap.config.PlatformConfig.RepositoriesEntry\x12.\n\x08\x65xecutor\x18\t \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12.\n\x08jobCache\x18\x0c \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12<\n\x07tenants\x18\n \x03(\x0b\x32+.tracdap.config.PlatformConfig.TenantsEntry\x12\x37\n\twebServer\x18\x0b \x01(\x0b\x32\x1f.tracdap.config.WebServerConfigH\x00\x88\x01\x01\x12\x33\n\x07gateway\x18\r \x01(\x0b\x32\x1d.tracdap.config.GatewayConfigH\x01\x88\x01\x01\x12>\n\x08services\x18\x04 \x03(\x0b\x32,.tracdap.config.PlatformConfig.ServicesEntry\x12\x34\n\ndeployment\x18\x0e \x01(\x0b\x32 .tracdap.config.DeploymentConfig\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aQ\n\x11RepositoriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\x1aL\n\x0cTenantsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.TenantConfig:\x02\x38\x01\x1aN\n\rServicesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.config.ServiceConfig:\x02\x38\x01\x42\x0c\n\n_webServerB\n\n\x08_gateway\"r\n\x0eMetadataConfig\x12.\n\x08\x64\x61tabase\x18\x01 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12\x30\n\x06\x66ormat\x18\x02 \x01(\x0e\x32 .tracdap.metadata.MetadataFormat\"j\n\x0cTenantConfig\x12\x1a\n\rdefaultBucket\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x1a\n\rdefaultFormat\x18\x02 \x01(\tH\x01\x88\x01\x01\x42\x10\n\x0e_defaultBucketB\x10\n\x0e_defaultFormat\"\xc7\x01\n\x0fWebServerConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x31\n\x0b\x63ontentRoot\x18\x03 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12:\n\x0crewriteRules\x18\x04 \x03(\x0b\x32$.tracdap.config.WebServerRewriteRule\x12\x34\n\tredirects\x18\x05 \x03(\x0b\x32!.tracdap.config.WebServerRedirect\"6\n\x14WebServerRewriteRule\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\"C\n\x11WebServerRedirect\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x05\"Q\n\rGatewayConfig\x12\x13\n\x0bidleTimeout\x18\x01 \x01(\r\x12+\n\x06routes\x18\x02 \x03(\x0b\x32\x1b.tracdap.config.RouteConfig\"\xe4\x01\n\x0bRouteConfig\x12\x11\n\trouteName\x18\x01 \x01(\t\x12\x32\n\trouteType\x18\x02 \x01(\x0e\x32\x1f.tracdap.config.RoutingProtocol\x12\x32\n\tprotocols\x18\x03 \x03(\x0e\x32\x1f.tracdap.config.RoutingProtocol\x12+\n\x05match\x18\x05 \x01(\x0b\x32\x1c.tracdap.config.RoutingMatch\x12-\n\x06target\x18\x06 \x01(\x0b\x32\x1d.tracdap.config.RoutingTarget\"*\n\x0cRoutingMatch\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\t\"I\n\rRoutingTarget\x12\x0e\n\x06scheme\x18\x01 \x01(\t\x12\x0c\n\x04host\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\x12\x0c\n\x04path\x18\x04 \x01(\t\"N\n\rServiceConfig\x12\x14\n\x07\x65nabled\x18\x01 \x01(\x08H\x00\x88\x01\x01\x12\r\n\x05\x61lias\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\rB\n\n\x08_enabled\"D\n\x10\x44\x65ploymentConfig\x12\x30\n\x06layout\x18\x01 \x01(\x0e\x32 .tracdap.config.DeploymentLayout*S\n\x0fRoutingProtocol\x12\x14\n\x10PROTOCOL_NOT_SET\x10\x00\x12\x08\n\x04HTTP\x10\x01\x12\x08\n\x04GRPC\x10\x02\x12\x0c\n\x08GRPC_WEB\x10\x03\x12\x08\n\x04REST\x10\x04*K\n\x10\x44\x65ploymentLayout\x12\x12\n\x0eLAYOUT_NOT_SET\x10\x00\x12\x0b\n\x07SANDBOX\x10\x01\x12\n\n\x06HOSTED\x10\x02\x12\n\n\x06\x43USTOM\x10\x03\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.platform_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.platform_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\030org.finos.tracdap.configP\001'
-  _PLATFORMCONFIG_CONFIGENTRY._options = None
-  _PLATFORMCONFIG_CONFIGENTRY._serialized_options = b'8\001'
-  _PLATFORMCONFIG_REPOSITORIESENTRY._options = None
-  _PLATFORMCONFIG_REPOSITORIESENTRY._serialized_options = b'8\001'
-  _PLATFORMCONFIG_TENANTSENTRY._options = None
-  _PLATFORMCONFIG_TENANTSENTRY._serialized_options = b'8\001'
-  _STORAGECONFIG_BUCKETSENTRY._options = None
-  _STORAGECONFIG_BUCKETSENTRY._serialized_options = b'8\001'
-  _PLATFORMCONFIG._serialized_start=110
-  _PLATFORMCONFIG._serialized_end=1000
-  _PLATFORMCONFIG_CONFIGENTRY._serialized_start=780
-  _PLATFORMCONFIG_CONFIGENTRY._serialized_end=825
-  _PLATFORMCONFIG_REPOSITORIESENTRY._serialized_start=827
-  _PLATFORMCONFIG_REPOSITORIESENTRY._serialized_end=908
-  _PLATFORMCONFIG_TENANTSENTRY._serialized_start=910
-  _PLATFORMCONFIG_TENANTSENTRY._serialized_end=986
-  _METADATACONFIG._serialized_start=1002
-  _METADATACONFIG._serialized_end=1116
-  _STORAGECONFIG._serialized_start=1119
-  _STORAGECONFIG._serialized_end=1319
-  _STORAGECONFIG_BUCKETSENTRY._serialized_start=1243
-  _STORAGECONFIG_BUCKETSENTRY._serialized_end=1319
-  _TENANTCONFIG._serialized_start=1321
-  _TENANTCONFIG._serialized_end=1427
-  _WEBSERVERCONFIG._serialized_start=1430
-  _WEBSERVERCONFIG._serialized_end=1643
-  _WEBSERVERREWRITERULE._serialized_start=1645
-  _WEBSERVERREWRITERULE._serialized_end=1699
-  _WEBSERVERREDIRECT._serialized_start=1701
-  _WEBSERVERREDIRECT._serialized_end=1768
-  _INSTANTMAP._serialized_start=1771
-  _INSTANTMAP._serialized_end=1921
-  _INSTANCECONFIG._serialized_start=1923
-  _INSTANCECONFIG._serialized_end=1983
-  _SERVICEMAP._serialized_start=1986
-  _SERVICEMAP._serialized_end=2133
-  _SERVICECONFIG._serialized_start=2135
-  _SERVICECONFIG._serialized_end=2164
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\030org.finos.tracdap.configP\001'
+  _globals['_PLATFORMCONFIG_CONFIGENTRY']._options = None
+  _globals['_PLATFORMCONFIG_CONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_PLATFORMCONFIG_REPOSITORIESENTRY']._options = None
+  _globals['_PLATFORMCONFIG_REPOSITORIESENTRY']._serialized_options = b'8\001'
+  _globals['_PLATFORMCONFIG_TENANTSENTRY']._options = None
+  _globals['_PLATFORMCONFIG_TENANTSENTRY']._serialized_options = b'8\001'
+  _globals['_PLATFORMCONFIG_SERVICESENTRY']._options = None
+  _globals['_PLATFORMCONFIG_SERVICESENTRY']._serialized_options = b'8\001'
+  _globals['_ROUTINGPROTOCOL']._serialized_start=2306
+  _globals['_ROUTINGPROTOCOL']._serialized_end=2389
+  _globals['_DEPLOYMENTLAYOUT']._serialized_start=2391
+  _globals['_DEPLOYMENTLAYOUT']._serialized_end=2466
+  _globals['_PLATFORMCONFIG']._serialized_start=110
+  _globals['_PLATFORMCONFIG']._serialized_end=1170
+  _globals['_PLATFORMCONFIG_CONFIGENTRY']._serialized_start=858
+  _globals['_PLATFORMCONFIG_CONFIGENTRY']._serialized_end=903
+  _globals['_PLATFORMCONFIG_REPOSITORIESENTRY']._serialized_start=905
+  _globals['_PLATFORMCONFIG_REPOSITORIESENTRY']._serialized_end=986
+  _globals['_PLATFORMCONFIG_TENANTSENTRY']._serialized_start=988
+  _globals['_PLATFORMCONFIG_TENANTSENTRY']._serialized_end=1064
+  _globals['_PLATFORMCONFIG_SERVICESENTRY']._serialized_start=1066
+  _globals['_PLATFORMCONFIG_SERVICESENTRY']._serialized_end=1144
+  _globals['_METADATACONFIG']._serialized_start=1172
+  _globals['_METADATACONFIG']._serialized_end=1286
+  _globals['_TENANTCONFIG']._serialized_start=1288
+  _globals['_TENANTCONFIG']._serialized_end=1394
+  _globals['_WEBSERVERCONFIG']._serialized_start=1397
+  _globals['_WEBSERVERCONFIG']._serialized_end=1596
+  _globals['_WEBSERVERREWRITERULE']._serialized_start=1598
+  _globals['_WEBSERVERREWRITERULE']._serialized_end=1652
+  _globals['_WEBSERVERREDIRECT']._serialized_start=1654
+  _globals['_WEBSERVERREDIRECT']._serialized_end=1721
+  _globals['_GATEWAYCONFIG']._serialized_start=1723
+  _globals['_GATEWAYCONFIG']._serialized_end=1804
+  _globals['_ROUTECONFIG']._serialized_start=1807
+  _globals['_ROUTECONFIG']._serialized_end=2035
+  _globals['_ROUTINGMATCH']._serialized_start=2037
+  _globals['_ROUTINGMATCH']._serialized_end=2079
+  _globals['_ROUTINGTARGET']._serialized_start=2081
+  _globals['_ROUTINGTARGET']._serialized_end=2154
+  _globals['_SERVICECONFIG']._serialized_start=2156
+  _globals['_SERVICECONFIG']._serialized_end=2234
+  _globals['_DEPLOYMENTCONFIG']._serialized_start=2236
+  _globals['_DEPLOYMENTCONFIG']._serialized_end=2304
 # @@protoc_insertion_point(module_scope)

tracdap/rt/config/result_pb2.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/config/result.proto
+# Protobuf Python Version: 4.25.3
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,18 +20,18 @@ from tracdap.metadata import tag_update_pb2 as tracdap_dot_metadata_dot_tag__upd
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1btracdap/config/result.proto\x12\x0etracdap.config\x1a tracdap/metadata/object_id.proto\x1a\x1dtracdap/metadata/object.proto\x1a\x1atracdap/metadata/job.proto\x1a!tracdap/metadata/tag_update.proto\";\n\rTagUpdateList\x12*\n\x05\x61ttrs\x18\x01 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\"\x9d\x02\n\tJobResult\x12*\n\x05jobId\x18\x01 \x01(\x0b\x32\x1b.tracdap.metadata.TagHeader\x12\x33\n\nstatusCode\x18\x02 \x01(\x0e\x32\x1f.tracdap.metadata.JobStatusCode\x12\x15\n\rstatusMessage\x18\x03 \x01(\t\x12\x37\n\x07results\x18\x04 \x03(\x0b\x32&.tracdap.config.JobResult.ResultsEntry\x1aR\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ObjectDefinition:\x02\x38\x01J\x04\x08\x05\x10\x06R\x05\x61ttrsB\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.result_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.result_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\030org.finos.tracdap.configP\001'
-  _JOBRESULT_RESULTSENTRY._options = None
-  _JOBRESULT_RESULTSENTRY._serialized_options = b'8\001'
-  _TAGUPDATELIST._serialized_start=175
-  _TAGUPDATELIST._serialized_end=234
-  _JOBRESULT._serialized_start=237
-  _JOBRESULT._serialized_end=522
-  _JOBRESULT_RESULTSENTRY._serialized_start=427
-  _JOBRESULT_RESULTSENTRY._serialized_end=509
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\030org.finos.tracdap.configP\001'
+  _globals['_JOBRESULT_RESULTSENTRY']._options = None
+  _globals['_JOBRESULT_RESULTSENTRY']._serialized_options = b'8\001'
+  _globals['_TAGUPDATELIST']._serialized_start=175
+  _globals['_TAGUPDATELIST']._serialized_end=234
+  _globals['_JOBRESULT']._serialized_start=237
+  _globals['_JOBRESULT']._serialized_end=522
+  _globals['_JOBRESULT_RESULTSENTRY']._serialized_start=427
+  _globals['_JOBRESULT_RESULTSENTRY']._serialized_end=509
 # @@protoc_insertion_point(module_scope)

tracdap/rt/config/runtime.py

@@ -6,7 +6,6 @@ import dataclasses as _dc  # noqa
 import enum as _enum  # noqa
 
 from .common import *  # noqa
-from .platform import *  # noqa
 
 
 

tracdap/rt/config/runtime_pb2.py

@@ -1,42 +1,42 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/config/runtime.proto
+# Protobuf Python Version: 4.25.3
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
 from tracdap.config import common_pb2 as tracdap_dot_config_dot_common__pb2
-from tracdap.config import platform_pb2 as tracdap_dot_config_dot_platform__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ctracdap/config/runtime.proto\x12\x0etracdap.config\x1a\x1btracdap/config/common.proto\x1a\x1dtracdap/config/platform.proto\"\xf9\x02\n\rRuntimeConfig\x12\x39\n\x06\x63onfig\x18\x01 \x03(\x0b\x32).tracdap.config.RuntimeConfig.ConfigEntry\x12.\n\x07storage\x18\x02 \x01(\x0b\x32\x1d.tracdap.config.StorageConfig\x12\x45\n\x0crepositories\x18\x03 \x03(\x0b\x32/.tracdap.config.RuntimeConfig.RepositoriesEntry\x12\x34\n\rsparkSettings\x18\x05 \x01(\x0b\x32\x1d.tracdap.config.SparkSettings\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aQ\n\x11RepositoriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\"\x85\x01\n\rSparkSettings\x12\x41\n\nsparkProps\x18\x01 \x03(\x0b\x32-.tracdap.config.SparkSettings.SparkPropsEntry\x1a\x31\n\x0fSparkPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ctracdap/config/runtime.proto\x12\x0etracdap.config\x1a\x1btracdap/config/common.proto\"\xf9\x02\n\rRuntimeConfig\x12\x39\n\x06\x63onfig\x18\x01 \x03(\x0b\x32).tracdap.config.RuntimeConfig.ConfigEntry\x12.\n\x07storage\x18\x02 \x01(\x0b\x32\x1d.tracdap.config.StorageConfig\x12\x45\n\x0crepositories\x18\x03 \x03(\x0b\x32/.tracdap.config.RuntimeConfig.RepositoriesEntry\x12\x34\n\rsparkSettings\x18\x05 \x01(\x0b\x32\x1d.tracdap.config.SparkSettings\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aQ\n\x11RepositoriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\"\x85\x01\n\rSparkSettings\x12\x41\n\nsparkProps\x18\x01 \x03(\x0b\x32-.tracdap.config.SparkSettings.SparkPropsEntry\x1a\x31\n\x0fSparkPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.runtime_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.runtime_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\030org.finos.tracdap.configP\001'
-  _RUNTIMECONFIG_CONFIGENTRY._options = None
-  _RUNTIMECONFIG_CONFIGENTRY._serialized_options = b'8\001'
-  _RUNTIMECONFIG_REPOSITORIESENTRY._options = None
-  _RUNTIMECONFIG_REPOSITORIESENTRY._serialized_options = b'8\001'
-  _SPARKSETTINGS_SPARKPROPSENTRY._options = None
-  _SPARKSETTINGS_SPARKPROPSENTRY._serialized_options = b'8\001'
-  _RUNTIMECONFIG._serialized_start=109
-  _RUNTIMECONFIG._serialized_end=486
-  _RUNTIMECONFIG_CONFIGENTRY._serialized_start=358
-  _RUNTIMECONFIG_CONFIGENTRY._serialized_end=403
-  _RUNTIMECONFIG_REPOSITORIESENTRY._serialized_start=405
-  _RUNTIMECONFIG_REPOSITORIESENTRY._serialized_end=486
-  _SPARKSETTINGS._serialized_start=489
-  _SPARKSETTINGS._serialized_end=622
-  _SPARKSETTINGS_SPARKPROPSENTRY._serialized_start=573
-  _SPARKSETTINGS_SPARKPROPSENTRY._serialized_end=622
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\030org.finos.tracdap.configP\001'
+  _globals['_RUNTIMECONFIG_CONFIGENTRY']._options = None
+  _globals['_RUNTIMECONFIG_CONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_RUNTIMECONFIG_REPOSITORIESENTRY']._options = None
+  _globals['_RUNTIMECONFIG_REPOSITORIESENTRY']._serialized_options = b'8\001'
+  _globals['_SPARKSETTINGS_SPARKPROPSENTRY']._options = None
+  _globals['_SPARKSETTINGS_SPARKPROPSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNTIMECONFIG']._serialized_start=78
+  _globals['_RUNTIMECONFIG']._serialized_end=455
+  _globals['_RUNTIMECONFIG_CONFIGENTRY']._serialized_start=327
+  _globals['_RUNTIMECONFIG_CONFIGENTRY']._serialized_end=372
+  _globals['_RUNTIMECONFIG_REPOSITORIESENTRY']._serialized_start=374
+  _globals['_RUNTIMECONFIG_REPOSITORIESENTRY']._serialized_end=455
+  _globals['_SPARKSETTINGS']._serialized_start=458
+  _globals['_SPARKSETTINGS']._serialized_end=591
+  _globals['_SPARKSETTINGS_SPARKPROPSENTRY']._serialized_start=542
+  _globals['_SPARKSETTINGS_SPARKPROPSENTRY']._serialized_end=591
 # @@protoc_insertion_point(module_scope)