tracdap-runtime 0.8.0rc2__py3-none-any.whl → 0.9.0b2__py3-none-any.whl

tracdap/rt/_impl/grpc/codec.py

@@ -22,9 +22,10 @@ import tracdap.rt.metadata as metadata
 import tracdap.rt._impl.grpc.tracdap.metadata.type_pb2 as type_pb2
 import tracdap.rt._impl.grpc.tracdap.metadata.object_id_pb2 as object_id_pb2
 import tracdap.rt._impl.grpc.tracdap.metadata.object_pb2 as object_pb2
-from tracdap.rt._impl.grpc.tracdap.metadata import model_pb2
+import tracdap.rt._impl.grpc.tracdap.metadata.model_pb2 as model_pb2
 import tracdap.rt._impl.grpc.tracdap.metadata.data_pb2 as data_pb2
 import tracdap.rt._impl.grpc.tracdap.metadata.storage_pb2 as storage_pb2
+import tracdap.rt._impl.grpc.tracdap.metadata.job_pb2 as job_pb2
 
 from google.protobuf import message as _message
 
@@ -55,20 +56,11 @@ __METADATA_MAPPING = {
     metadata.StorageDefinition: storage_pb2.StorageDefinition,
     metadata.StorageIncarnation: storage_pb2.StorageIncarnation,
     metadata.StorageCopy: storage_pb2.StorageCopy,
-    metadata.StorageItem: storage_pb2.StorageItem
+    metadata.StorageItem: storage_pb2.StorageItem,
+    metadata.ResultDefinition: job_pb2.ResultDefinition
 }
 
 
-_T_MSG = tp.TypeVar('_T_MSG', bound=_message.Message)
-
-
-def encode_message(msg_class: _T_MSG.__class__, obj: tp.Any) -> _T_MSG:
-
-    attrs = dict((k, encode(v)) for k, v in obj.__dict__.items())
-
-    return msg_class(**attrs)
-
-
 def encode(obj: tp.Any) -> tp.Any:
 
     # Translate TRAC domain objects into generic dict / list structures
@@ -95,6 +87,9 @@ def encode(obj: tp.Any) -> tp.Any:
     if msg_class is None:
         raise ex.ETracInternal(f"No gRPC metadata mapping is available for type {type(obj).__name__}")
 
-    attrs = dict((k, encode(v)) for k, v in obj.__dict__.items() if v is not None)
+    if hasattr(obj, "__slots__"):
+        attrs = dict((k, encode(getattr(obj, k))) for k in obj.__slots__)
+    else:
+        attrs = dict((k, encode(v)) for k, v in obj.__dict__.items() if v is not None)
 
     return msg_class(**attrs)

tracdap/rt/_impl/grpc/server.py

@@ -305,8 +305,8 @@ class GetJobStatusRequest(ApiRequest[runtime_pb2.RuntimeJobInfoRequest, runtime_
         else:
             self._response = runtime_pb2.RuntimeJobStatus(
                 jobId=codec.encode(job_details.jobId),
-                statusCode=codec.encode(job_details.statusCode),
-                statusMessage=codec.encode(job_details.statusMessage))
+                statusCode=codec.encode(job_details.result.statusCode),
+                statusMessage=codec.encode(job_details.result.statusMessage))
 
         self._mark_complete()
 
@@ -336,12 +336,12 @@ class GetJobResultRequest(ApiRequest[runtime_pb2.RuntimeJobInfoRequest, runtime_
 
         else:
 
-            encoded_results = dict((k, codec.encode(v)) for k, v in job_details.results.items())
-
             self._response = runtime_pb2.RuntimeJobResult(
                 jobId=codec.encode(job_details.jobId),
-                statusCode=codec.encode(job_details.statusCode),
-                statusMessage=codec.encode(job_details.statusMessage),
-                results=encoded_results)
+                resultId=codec.encode(job_details.resultId),
+                result=codec.encode(job_details.result),
+                objectIds=codec.encode(job_details.objectIds),
+                objects=codec.encode(job_details.objects),
+                attrs=codec.encode(job_details.attrs))
 
         self._mark_complete()

tracdap/rt/_impl/grpc/tracdap/api/internal/runtime_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/rt/_impl/grpc/tracdap/api/internal/runtime.proto
-# Protobuf Python Version: 4.25.3
+# Protobuf Python Version: 4.25.5
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -15,10 +15,11 @@ _sym_db = _symbol_database.Default()
 from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_object__id__pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import job_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_job__pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import object_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_object__pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import tag_update_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_tag__update__pb2
 from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n8tracdap/rt/_impl/grpc/tracdap/api/internal/runtime.proto\x12\x14tracdap.api.internal\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x30tracdap/rt/_impl/grpc/tracdap/metadata/job.proto\x1a\x33tracdap/rt/_impl/grpc/tracdap/metadata/object.proto\x1a\x1cgoogle/api/annotations.proto\"6\n\x16RuntimeListJobsRequest\x12\x12\n\x05limit\x18\x01 \x01(\rH\x00\x88\x01\x01\x42\x08\n\x06_limit\"O\n\x17RuntimeListJobsResponse\x12\x34\n\x04jobs\x18\x01 \x03(\x0b\x32&.tracdap.api.internal.RuntimeJobStatus\"f\n\x15RuntimeJobInfoRequest\x12\x34\n\x0bjobSelector\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x12\x10\n\x06jobKey\x18\x02 \x01(\tH\x00\x42\x05\n\x03job\"\x9f\x01\n\x10RuntimeJobStatus\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\x13\n\x0b\x65rrorDetail\x18\x04 \x01(\t\"\xa4\x02\n\x10RuntimeJobResult\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\x44\n\x07results\x18\x04 \x03(\x0b\x32\x33.tracdap.api.internal.RuntimeJobResult.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\x01\x32\x95\x03\n\x0eTracRuntimeApi\x12{\n\x08listJobs\x12,.tracdap.api.internal.RuntimeListJobsRequest\x1a-.tracdap.api.internal.RuntimeListJobsResponse\"\x12\x82\xd3\xe4\x93\x02\x0c\x12\n/list-jobs\x12\x81\x01\n\x0cgetJobStatus\x12+.tracdap.api.internal.RuntimeJobInfoRequest\x1a&.tracdap.api.internal.RuntimeJobStatus\"\x1c\x82\xd3\xe4\x93\x02\x16\x12\x14/job-status/{jobKey}\x12\x81\x01\n\x0cgetJobResult\x12+.tracdap.api.internal.RuntimeJobInfoRequest\x1a&.tracdap.api.internal.RuntimeJobResult\"\x1c\x82\xd3\xe4\x93\x02\x16\x12\x14/job-result/{jobKey}B7\n\x1eorg.finos.tracdap.api.internalB\x13RuntimeServiceProtoP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n8tracdap/rt/_impl/grpc/tracdap/api/internal/runtime.proto\x12\x14tracdap.api.internal\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x30tracdap/rt/_impl/grpc/tracdap/metadata/job.proto\x1a\x33tracdap/rt/_impl/grpc/tracdap/metadata/object.proto\x1a\x37tracdap/rt/_impl/grpc/tracdap/metadata/tag_update.proto\x1a\x1cgoogle/api/annotations.proto\"6\n\x16RuntimeListJobsRequest\x12\x12\n\x05limit\x18\x01 \x01(\rH\x00\x88\x01\x01\x42\x08\n\x06_limit\"O\n\x17RuntimeListJobsResponse\x12\x34\n\x04jobs\x18\x01 \x03(\x0b\x32&.tracdap.api.internal.RuntimeJobStatus\"f\n\x15RuntimeJobInfoRequest\x12\x34\n\x0bjobSelector\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x12\x10\n\x06jobKey\x18\x02 \x01(\tH\x00\x42\x05\n\x03job\"\x9f\x01\n\x10RuntimeJobStatus\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\x13\n\x0b\x65rrorDetail\x18\x04 \x01(\t\"C\n\x15RuntimeJobResultAttrs\x12*\n\x05\x61ttrs\x18\x01 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\"\x88\x04\n\x10RuntimeJobResult\x12*\n\x05jobId\x18\x01 \x01(\x0b\x32\x1b.tracdap.metadata.TagHeader\x12-\n\x08resultId\x18\x02 \x01(\x0b\x32\x1b.tracdap.metadata.TagHeader\x12\x32\n\x06result\x18\x03 \x01(\x0b\x32\".tracdap.metadata.ResultDefinition\x12.\n\tobjectIds\x18\x04 \x03(\x0b\x32\x1b.tracdap.metadata.TagHeader\x12\x44\n\x07objects\x18\x05 \x03(\x0b\x32\x33.tracdap.api.internal.RuntimeJobResult.ObjectsEntry\x12@\n\x05\x61ttrs\x18\x06 \x03(\x0b\x32\x31.tracdap.api.internal.RuntimeJobResult.AttrsEntry\x1aR\n\x0cObjectsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ObjectDefinition:\x02\x38\x01\x1aY\n\nAttrsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.tracdap.api.internal.RuntimeJobResultAttrs:\x02\x38\x01\x32\x95\x03\n\x0eTracRuntimeApi\x12{\n\x08listJobs\x12,.tracdap.api.internal.RuntimeListJobsRequest\x1a-.tracdap.api.internal.RuntimeListJobsResponse\"\x12\x82\xd3\xe4\x93\x02\x0c\x12\n/list-jobs\x12\x81\x01\n\x0cgetJobStatus\x12+.tracdap.api.internal.RuntimeJobInfoRequest\x1a&.tracdap.api.internal.RuntimeJobStatus\"\x1c\x82\xd3\xe4\x93\x02\x16\x12\x14/job-status/{jobKey}\x12\x81\x01\n\x0cgetJobResult\x12+.tracdap.api.internal.RuntimeJobInfoRequest\x1a&.tracdap.api.internal.RuntimeJobResult\"\x1c\x82\xd3\xe4\x93\x02\x16\x12\x14/job-result/{jobKey}B7\n\x1eorg.finos.tracdap.api.internalB\x13RuntimeServiceProtoP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -26,26 +27,32 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.rt._impl.grpc.tracd
 if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\036org.finos.tracdap.api.internalB\023RuntimeServiceProtoP\001'
-  _globals['_RUNTIMEJOBRESULT_RESULTSENTRY']._options = None
-  _globals['_RUNTIMEJOBRESULT_RESULTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNTIMEJOBRESULT_OBJECTSENTRY']._options = None
+  _globals['_RUNTIMEJOBRESULT_OBJECTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNTIMEJOBRESULT_ATTRSENTRY']._options = None
+  _globals['_RUNTIMEJOBRESULT_ATTRSENTRY']._serialized_options = b'8\001'
   _globals['_TRACRUNTIMEAPI'].methods_by_name['listJobs']._options = None
   _globals['_TRACRUNTIMEAPI'].methods_by_name['listJobs']._serialized_options = b'\202\323\344\223\002\014\022\n/list-jobs'
   _globals['_TRACRUNTIMEAPI'].methods_by_name['getJobStatus']._options = None
   _globals['_TRACRUNTIMEAPI'].methods_by_name['getJobStatus']._serialized_options = b'\202\323\344\223\002\026\022\024/job-status/{jobKey}'
   _globals['_TRACRUNTIMEAPI'].methods_by_name['getJobResult']._options = None
   _globals['_TRACRUNTIMEAPI'].methods_by_name['getJobResult']._serialized_options = b'\202\323\344\223\002\026\022\024/job-result/{jobKey}'
-  _globals['_RUNTIMELISTJOBSREQUEST']._serialized_start=271
-  _globals['_RUNTIMELISTJOBSREQUEST']._serialized_end=325
-  _globals['_RUNTIMELISTJOBSRESPONSE']._serialized_start=327
-  _globals['_RUNTIMELISTJOBSRESPONSE']._serialized_end=406
-  _globals['_RUNTIMEJOBINFOREQUEST']._serialized_start=408
-  _globals['_RUNTIMEJOBINFOREQUEST']._serialized_end=510
-  _globals['_RUNTIMEJOBSTATUS']._serialized_start=513
-  _globals['_RUNTIMEJOBSTATUS']._serialized_end=672
-  _globals['_RUNTIMEJOBRESULT']._serialized_start=675
-  _globals['_RUNTIMEJOBRESULT']._serialized_end=967
-  _globals['_RUNTIMEJOBRESULT_RESULTSENTRY']._serialized_start=885
-  _globals['_RUNTIMEJOBRESULT_RESULTSENTRY']._serialized_end=967
-  _globals['_TRACRUNTIMEAPI']._serialized_start=970
-  _globals['_TRACRUNTIMEAPI']._serialized_end=1375
+  _globals['_RUNTIMELISTJOBSREQUEST']._serialized_start=328
+  _globals['_RUNTIMELISTJOBSREQUEST']._serialized_end=382
+  _globals['_RUNTIMELISTJOBSRESPONSE']._serialized_start=384
+  _globals['_RUNTIMELISTJOBSRESPONSE']._serialized_end=463
+  _globals['_RUNTIMEJOBINFOREQUEST']._serialized_start=465
+  _globals['_RUNTIMEJOBINFOREQUEST']._serialized_end=567
+  _globals['_RUNTIMEJOBSTATUS']._serialized_start=570
+  _globals['_RUNTIMEJOBSTATUS']._serialized_end=729
+  _globals['_RUNTIMEJOBRESULTATTRS']._serialized_start=731
+  _globals['_RUNTIMEJOBRESULTATTRS']._serialized_end=798
+  _globals['_RUNTIMEJOBRESULT']._serialized_start=801
+  _globals['_RUNTIMEJOBRESULT']._serialized_end=1321
+  _globals['_RUNTIMEJOBRESULT_OBJECTSENTRY']._serialized_start=1148
+  _globals['_RUNTIMEJOBRESULT_OBJECTSENTRY']._serialized_end=1230
+  _globals['_RUNTIMEJOBRESULT_ATTRSENTRY']._serialized_start=1232
+  _globals['_RUNTIMEJOBRESULT_ATTRSENTRY']._serialized_end=1321
+  _globals['_TRACRUNTIMEAPI']._serialized_start=1324
+  _globals['_TRACRUNTIMEAPI']._serialized_end=1729
 # @@protoc_insertion_point(module_scope)

tracdap/rt/_impl/grpc/tracdap/api/internal/runtime_pb2.pyi

@@ -1,6 +1,7 @@
 from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as _object_id_pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import job_pb2 as _job_pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import object_pb2 as _object_pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import tag_update_pb2 as _tag_update_pb2
 from google.api import annotations_pb2 as _annotations_pb2
 from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
@@ -41,21 +42,38 @@ class RuntimeJobStatus(_message.Message):
     errorDetail: str
     def __init__(self, jobId: _Optional[_Union[_object_id_pb2.TagHeader, _Mapping]] = ..., statusCode: _Optional[_Union[_job_pb2.JobStatusCode, str]] = ..., statusMessage: _Optional[str] = ..., errorDetail: _Optional[str] = ...) -> None: ...
 
+class RuntimeJobResultAttrs(_message.Message):
+    __slots__ = ("attrs",)
+    ATTRS_FIELD_NUMBER: _ClassVar[int]
+    attrs: _containers.RepeatedCompositeFieldContainer[_tag_update_pb2.TagUpdate]
+    def __init__(self, attrs: _Optional[_Iterable[_Union[_tag_update_pb2.TagUpdate, _Mapping]]] = ...) -> None: ...
+
 class RuntimeJobResult(_message.Message):
-    __slots__ = ("jobId", "statusCode", "statusMessage", "results")
-    class ResultsEntry(_message.Message):
+    __slots__ = ("jobId", "resultId", "result", "objectIds", "objects", "attrs")
+    class ObjectsEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
         value: _object_pb2.ObjectDefinition
         def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_object_pb2.ObjectDefinition, _Mapping]] = ...) -> None: ...
+    class AttrsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: RuntimeJobResultAttrs
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[RuntimeJobResultAttrs, _Mapping]] = ...) -> None: ...
     JOBID_FIELD_NUMBER: _ClassVar[int]
-    STATUSCODE_FIELD_NUMBER: _ClassVar[int]
-    STATUSMESSAGE_FIELD_NUMBER: _ClassVar[int]
-    RESULTS_FIELD_NUMBER: _ClassVar[int]
+    RESULTID_FIELD_NUMBER: _ClassVar[int]
+    RESULT_FIELD_NUMBER: _ClassVar[int]
+    OBJECTIDS_FIELD_NUMBER: _ClassVar[int]
+    OBJECTS_FIELD_NUMBER: _ClassVar[int]
+    ATTRS_FIELD_NUMBER: _ClassVar[int]
     jobId: _object_id_pb2.TagHeader
-    statusCode: _job_pb2.JobStatusCode
-    statusMessage: str
-    results: _containers.MessageMap[str, _object_pb2.ObjectDefinition]
-    def __init__(self, jobId: _Optional[_Union[_object_id_pb2.TagHeader, _Mapping]] = ..., statusCode: _Optional[_Union[_job_pb2.JobStatusCode, str]] = ..., statusMessage: _Optional[str] = ..., results: _Optional[_Mapping[str, _object_pb2.ObjectDefinition]] = ...) -> None: ...
+    resultId: _object_id_pb2.TagHeader
+    result: _job_pb2.ResultDefinition
+    objectIds: _containers.RepeatedCompositeFieldContainer[_object_id_pb2.TagHeader]
+    objects: _containers.MessageMap[str, _object_pb2.ObjectDefinition]
+    attrs: _containers.MessageMap[str, RuntimeJobResultAttrs]
+    def __init__(self, jobId: _Optional[_Union[_object_id_pb2.TagHeader, _Mapping]] = ..., resultId: _Optional[_Union[_object_id_pb2.TagHeader, _Mapping]] = ..., result: _Optional[_Union[_job_pb2.ResultDefinition, _Mapping]] = ..., objectIds: _Optional[_Iterable[_Union[_object_id_pb2.TagHeader, _Mapping]]] = ..., objects: _Optional[_Mapping[str, _object_pb2.ObjectDefinition]] = ..., attrs: _Optional[_Mapping[str, RuntimeJobResultAttrs]] = ...) -> None: ...

tracdap/rt/_impl/grpc/tracdap/metadata/common_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/rt/_impl/grpc/tracdap/metadata/common.proto
-# Protobuf Python Version: 4.25.3
+# Protobuf Python Version: 4.25.5
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool

tracdap/rt/_impl/grpc/tracdap/metadata/config_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/rt/_impl/grpc/tracdap/metadata/config.proto
-# Protobuf Python Version: 4.25.3
+# Protobuf Python Version: 4.25.5
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool

tracdap/rt/_impl/grpc/tracdap/metadata/custom_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/rt/_impl/grpc/tracdap/metadata/custom.proto
-# Protobuf Python Version: 4.25.3
+# Protobuf Python Version: 4.25.5
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool

tracdap/rt/_impl/grpc/tracdap/metadata/data_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/rt/_impl/grpc/tracdap/metadata/data.proto
-# Protobuf Python Version: 4.25.3
+# Protobuf Python Version: 4.25.5
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -16,7 +16,7 @@ from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as tracdap_dot_rt_do
 from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_object__id__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n1tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\"\xe7\x01\n\x0b\x46ieldSchema\x12\x11\n\tfieldName\x18\x01 \x01(\t\x12\x12\n\nfieldOrder\x18\x02 \x01(\x11\x12.\n\tfieldType\x18\x03 \x01(\x0e\x32\x1b.tracdap.metadata.BasicType\x12\r\n\x05label\x18\x04 \x01(\t\x12\x13\n\x0b\x62usinessKey\x18\x05 \x01(\x08\x12\x13\n\x0b\x63\x61tegorical\x18\x06 \x01(\x08\x12\x14\n\x07notNull\x18\x08 \x01(\x08H\x00\x88\x01\x01\x12\x17\n\nformatCode\x18\x07 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_notNullB\r\n\x0b_formatCode\"<\n\x0bTableSchema\x12-\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1d.tracdap.metadata.FieldSchema\"\x9c\x02\n\x0bStructField\x12\x33\n\tfieldType\x18\x03 \x01(\x0b\x32 .tracdap.metadata.TypeDescriptor\x12\r\n\x05label\x18\x04 \x01(\t\x12\x13\n\x0b\x62usinessKey\x18\x05 \x01(\x08\x12\x13\n\x0b\x63\x61tegorical\x18\x06 \x01(\x08\x12\x14\n\x07notNull\x18\x08 \x01(\x08H\x00\x88\x01\x01\x12\x17\n\nformatCode\x18\x07 \x01(\tH\x01\x88\x01\x01\x12-\n\x0c\x64\x65\x66\x61ultValue\x18\t \x01(\x0b\x32\x17.tracdap.metadata.Value\x12\x17\n\nstructType\x18\n \x01(\tH\x02\x88\x01\x01\x42\n\n\x08_notNullB\r\n\x0b_formatCodeB\r\n\x0b_structType\"\xaf\x02\n\x0cStructSchema\x12:\n\x06\x66ields\x18\x01 \x03(\x0b\x32*.tracdap.metadata.StructSchema.FieldsEntry\x12\x42\n\nnamedTypes\x18\x02 \x03(\x0b\x32..tracdap.metadata.StructSchema.NamedTypesEntry\x1aL\n\x0b\x46ieldsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.StructField:\x02\x38\x01\x1aQ\n\x0fNamedTypesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.tracdap.metadata.StructSchema:\x02\x38\x01\"\xe5\x01\n\x10SchemaDefinition\x12\x30\n\nschemaType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.SchemaType\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12.\n\x05table\x18\x03 \x01(\x0b\x32\x1d.tracdap.metadata.TableSchemaH\x00\x12\x30\n\x06struct\x18\x04 \x01(\x0b\x32\x1e.tracdap.metadata.StructSchemaH\x00\x42\x0f\n\rschemaDetails\"\x81\x02\n\x07PartKey\x12\x11\n\topaqueKey\x18\x01 \x01(\t\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12+\n\npartValues\x18\x03 \x03(\x0b\x32\x17.tracdap.metadata.Value\x12\x32\n\x0cpartRangeMin\x18\x04 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x12\x32\n\x0cpartRangeMax\x18\x05 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x01\x88\x01\x01\x42\x0f\n\r_partRangeMinB\x0f\n\r_partRangeMax\"\xba\x04\n\x0e\x44\x61taDefinition\x12\x31\n\x08schemaId\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x12\x34\n\x06schema\x18\x02 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12:\n\x05parts\x18\x03 \x03(\x0b\x32+.tracdap.metadata.DataDefinition.PartsEntry\x12\x30\n\tstorageId\x18\x04 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x1a-\n\x05\x44\x65lta\x12\x12\n\ndeltaIndex\x18\x01 \x01(\r\x12\x10\n\x08\x64\x61taItem\x18\x02 \x01(\t\x1aQ\n\x04Snap\x12\x11\n\tsnapIndex\x18\x01 \x01(\r\x12\x36\n\x06\x64\x65ltas\x18\x02 \x03(\x0b\x32&.tracdap.metadata.DataDefinition.Delta\x1ag\n\x04Part\x12*\n\x07partKey\x18\x01 \x01(\x0b\x32\x19.tracdap.metadata.PartKey\x12\x33\n\x04snap\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Snap\x1aS\n\nPartsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Part:\x02\x38\x01\x42\x11\n\x0fschemaSpecifier*<\n\nSchemaType\x12\x17\n\x13SCHEMA_TYPE_NOT_SET\x10\x00\x12\t\n\x05TABLE\x10\x01\x12\n\n\x06STRUCT\x10\x02*?\n\x08PartType\x12\r\n\tPART_ROOT\x10\x00\x12\x11\n\rPART_BY_RANGE\x10\x01\x12\x11\n\rPART_BY_VALUE\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n1tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\"\xa9\x03\n\x0b\x46ieldSchema\x12\x11\n\tfieldName\x18\x01 \x01(\t\x12\x12\n\nfieldOrder\x18\x02 \x01(\x11\x12.\n\tfieldType\x18\x03 \x01(\x0e\x32\x1b.tracdap.metadata.BasicType\x12\r\n\x05label\x18\x04 \x01(\t\x12\x13\n\x0b\x62usinessKey\x18\x05 \x01(\x08\x12\x13\n\x0b\x63\x61tegorical\x18\x06 \x01(\x08\x12\x14\n\x07notNull\x18\x08 \x01(\x08H\x00\x88\x01\x01\x12\x17\n\nformatCode\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x32\n\x0c\x64\x65\x66\x61ultValue\x18\t \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x02\x88\x01\x01\x12\x16\n\tnamedType\x18\n \x01(\tH\x03\x88\x01\x01\x12\x16\n\tnamedEnum\x18\x0b \x01(\tH\x04\x88\x01\x01\x12/\n\x08\x63hildren\x18\x0c \x03(\x0b\x32\x1d.tracdap.metadata.FieldSchemaB\n\n\x08_notNullB\r\n\x0b_formatCodeB\x0f\n\r_defaultValueB\x0c\n\n_namedTypeB\x0c\n\n_namedEnum\"\x1c\n\nEnumValues\x12\x0e\n\x06values\x18\x01 \x03(\t\"<\n\x0bTableSchema\x12-\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1d.tracdap.metadata.FieldSchema\"\x9a\x04\n\x10SchemaDefinition\x12\x30\n\nschemaType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.SchemaType\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12.\n\x05table\x18\x03 \x01(\x0b\x32\x1d.tracdap.metadata.TableSchemaH\x00\x12-\n\x06\x66ields\x18\x05 \x03(\x0b\x32\x1d.tracdap.metadata.FieldSchema\x12\x46\n\nnamedTypes\x18\x06 \x03(\x0b\x32\x32.tracdap.metadata.SchemaDefinition.NamedTypesEntry\x12\x46\n\nnamedEnums\x18\x07 \x03(\x0b\x32\x32.tracdap.metadata.SchemaDefinition.NamedEnumsEntry\x1aU\n\x0fNamedTypesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinition:\x02\x38\x01\x1aO\n\x0fNamedEnumsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.metadata.EnumValues:\x02\x38\x01\x42\x0f\n\rschemaDetails\"\x81\x02\n\x07PartKey\x12\x11\n\topaqueKey\x18\x01 \x01(\t\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12+\n\npartValues\x18\x03 \x03(\x0b\x32\x17.tracdap.metadata.Value\x12\x32\n\x0cpartRangeMin\x18\x04 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x12\x32\n\x0cpartRangeMax\x18\x05 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x01\x88\x01\x01\x42\x0f\n\r_partRangeMinB\x0f\n\r_partRangeMax\"\xba\x04\n\x0e\x44\x61taDefinition\x12\x31\n\x08schemaId\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x12\x34\n\x06schema\x18\x02 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12:\n\x05parts\x18\x03 \x03(\x0b\x32+.tracdap.metadata.DataDefinition.PartsEntry\x12\x30\n\tstorageId\x18\x04 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x1a-\n\x05\x44\x65lta\x12\x12\n\ndeltaIndex\x18\x01 \x01(\r\x12\x10\n\x08\x64\x61taItem\x18\x02 \x01(\t\x1aQ\n\x04Snap\x12\x11\n\tsnapIndex\x18\x01 \x01(\r\x12\x36\n\x06\x64\x65ltas\x18\x02 \x03(\x0b\x32&.tracdap.metadata.DataDefinition.Delta\x1ag\n\x04Part\x12*\n\x07partKey\x18\x01 \x01(\x0b\x32\x19.tracdap.metadata.PartKey\x12\x33\n\x04snap\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Snap\x1aS\n\nPartsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Part:\x02\x38\x01\x42\x11\n\x0fschemaSpecifier*Y\n\nSchemaType\x12\x17\n\x13SCHEMA_TYPE_NOT_SET\x10\x00\x12\t\n\x05TABLE\x10\x01\x12\x10\n\x0cTABLE_SCHEMA\x10\x01\x12\x11\n\rSTRUCT_SCHEMA\x10\x02\x1a\x02\x10\x01*X\n\x08PartType\x12\r\n\tPART_ROOT\x10\x00\x12\x13\n\x0fNOT_PARTITIONED\x10\x00\x12\x11\n\rPART_BY_RANGE\x10\x01\x12\x11\n\rPART_BY_VALUE\x10\x02\x1a\x02\x10\x01\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -24,40 +24,42 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.rt._impl.grpc.tracd
 if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
-  _globals['_STRUCTSCHEMA_FIELDSENTRY']._options = None
-  _globals['_STRUCTSCHEMA_FIELDSENTRY']._serialized_options = b'8\001'
-  _globals['_STRUCTSCHEMA_NAMEDTYPESENTRY']._options = None
-  _globals['_STRUCTSCHEMA_NAMEDTYPESENTRY']._serialized_options = b'8\001'
+  _globals['_SCHEMATYPE']._options = None
+  _globals['_SCHEMATYPE']._serialized_options = b'\020\001'
+  _globals['_PARTTYPE']._options = None
+  _globals['_PARTTYPE']._serialized_options = b'\020\001'
+  _globals['_SCHEMADEFINITION_NAMEDTYPESENTRY']._options = None
+  _globals['_SCHEMADEFINITION_NAMEDTYPESENTRY']._serialized_options = b'8\001'
+  _globals['_SCHEMADEFINITION_NAMEDENUMSENTRY']._options = None
+  _globals['_SCHEMADEFINITION_NAMEDENUMSENTRY']._serialized_options = b'8\001'
   _globals['_DATADEFINITION_PARTSENTRY']._options = None
   _globals['_DATADEFINITION_PARTSENTRY']._serialized_options = b'8\001'
-  _globals['_SCHEMATYPE']._serialized_start=2132
-  _globals['_SCHEMATYPE']._serialized_end=2192
-  _globals['_PARTTYPE']._serialized_start=2194
-  _globals['_PARTTYPE']._serialized_end=2257
+  _globals['_SCHEMATYPE']._serialized_start=2072
+  _globals['_SCHEMATYPE']._serialized_end=2161
+  _globals['_PARTTYPE']._serialized_start=2163
+  _globals['_PARTTYPE']._serialized_end=2251
   _globals['_FIELDSCHEMA']._serialized_start=179
-  _globals['_FIELDSCHEMA']._serialized_end=410
-  _globals['_TABLESCHEMA']._serialized_start=412
-  _globals['_TABLESCHEMA']._serialized_end=472
-  _globals['_STRUCTFIELD']._serialized_start=475
-  _globals['_STRUCTFIELD']._serialized_end=759
-  _globals['_STRUCTSCHEMA']._serialized_start=762
-  _globals['_STRUCTSCHEMA']._serialized_end=1065
-  _globals['_STRUCTSCHEMA_FIELDSENTRY']._serialized_start=906
-  _globals['_STRUCTSCHEMA_FIELDSENTRY']._serialized_end=982
-  _globals['_STRUCTSCHEMA_NAMEDTYPESENTRY']._serialized_start=984
-  _globals['_STRUCTSCHEMA_NAMEDTYPESENTRY']._serialized_end=1065
-  _globals['_SCHEMADEFINITION']._serialized_start=1068
-  _globals['_SCHEMADEFINITION']._serialized_end=1297
-  _globals['_PARTKEY']._serialized_start=1300
-  _globals['_PARTKEY']._serialized_end=1557
-  _globals['_DATADEFINITION']._serialized_start=1560
-  _globals['_DATADEFINITION']._serialized_end=2130
-  _globals['_DATADEFINITION_DELTA']._serialized_start=1793
-  _globals['_DATADEFINITION_DELTA']._serialized_end=1838
-  _globals['_DATADEFINITION_SNAP']._serialized_start=1840
-  _globals['_DATADEFINITION_SNAP']._serialized_end=1921
-  _globals['_DATADEFINITION_PART']._serialized_start=1923
-  _globals['_DATADEFINITION_PART']._serialized_end=2026
-  _globals['_DATADEFINITION_PARTSENTRY']._serialized_start=2028
-  _globals['_DATADEFINITION_PARTSENTRY']._serialized_end=2111
+  _globals['_FIELDSCHEMA']._serialized_end=604
+  _globals['_ENUMVALUES']._serialized_start=606
+  _globals['_ENUMVALUES']._serialized_end=634
+  _globals['_TABLESCHEMA']._serialized_start=636
+  _globals['_TABLESCHEMA']._serialized_end=696
+  _globals['_SCHEMADEFINITION']._serialized_start=699
+  _globals['_SCHEMADEFINITION']._serialized_end=1237
+  _globals['_SCHEMADEFINITION_NAMEDTYPESENTRY']._serialized_start=1054
+  _globals['_SCHEMADEFINITION_NAMEDTYPESENTRY']._serialized_end=1139
+  _globals['_SCHEMADEFINITION_NAMEDENUMSENTRY']._serialized_start=1141
+  _globals['_SCHEMADEFINITION_NAMEDENUMSENTRY']._serialized_end=1220
+  _globals['_PARTKEY']._serialized_start=1240
+  _globals['_PARTKEY']._serialized_end=1497
+  _globals['_DATADEFINITION']._serialized_start=1500
+  _globals['_DATADEFINITION']._serialized_end=2070
+  _globals['_DATADEFINITION_DELTA']._serialized_start=1733
+  _globals['_DATADEFINITION_DELTA']._serialized_end=1778
+  _globals['_DATADEFINITION_SNAP']._serialized_start=1780
+  _globals['_DATADEFINITION_SNAP']._serialized_end=1861
+  _globals['_DATADEFINITION_PART']._serialized_start=1863
+  _globals['_DATADEFINITION_PART']._serialized_end=1966
+  _globals['_DATADEFINITION_PARTSENTRY']._serialized_start=1968
+  _globals['_DATADEFINITION_PARTSENTRY']._serialized_end=2051
 # @@protoc_insertion_point(module_scope)

tracdap/rt/_impl/grpc/tracdap/metadata/data_pb2.pyi

@@ -12,22 +12,26 @@ class SchemaType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     __slots__ = ()
     SCHEMA_TYPE_NOT_SET: _ClassVar[SchemaType]
     TABLE: _ClassVar[SchemaType]
-    STRUCT: _ClassVar[SchemaType]
+    TABLE_SCHEMA: _ClassVar[SchemaType]
+    STRUCT_SCHEMA: _ClassVar[SchemaType]
 
 class PartType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     __slots__ = ()
     PART_ROOT: _ClassVar[PartType]
+    NOT_PARTITIONED: _ClassVar[PartType]
     PART_BY_RANGE: _ClassVar[PartType]
     PART_BY_VALUE: _ClassVar[PartType]
 SCHEMA_TYPE_NOT_SET: SchemaType
 TABLE: SchemaType
-STRUCT: SchemaType
+TABLE_SCHEMA: SchemaType
+STRUCT_SCHEMA: SchemaType
 PART_ROOT: PartType
+NOT_PARTITIONED: PartType
 PART_BY_RANGE: PartType
 PART_BY_VALUE: PartType
 
 class FieldSchema(_message.Message):
-    __slots__ = ("fieldName", "fieldOrder", "fieldType", "label", "businessKey", "categorical", "notNull", "formatCode")
+    __slots__ = ("fieldName", "fieldOrder", "fieldType", "label", "businessKey", "categorical", "notNull", "formatCode", "defaultValue", "namedType", "namedEnum", "children")
     FIELDNAME_FIELD_NUMBER: _ClassVar[int]
     FIELDORDER_FIELD_NUMBER: _ClassVar[int]
     FIELDTYPE_FIELD_NUMBER: _ClassVar[int]
@@ -36,6 +40,10 @@ class FieldSchema(_message.Message):
     CATEGORICAL_FIELD_NUMBER: _ClassVar[int]
     NOTNULL_FIELD_NUMBER: _ClassVar[int]
     FORMATCODE_FIELD_NUMBER: _ClassVar[int]
+    DEFAULTVALUE_FIELD_NUMBER: _ClassVar[int]
+    NAMEDTYPE_FIELD_NUMBER: _ClassVar[int]
+    NAMEDENUM_FIELD_NUMBER: _ClassVar[int]
+    CHILDREN_FIELD_NUMBER: _ClassVar[int]
     fieldName: str
     fieldOrder: int
     fieldType: _type_pb2.BasicType
@@ -44,7 +52,17 @@ class FieldSchema(_message.Message):
     categorical: bool
     notNull: bool
     formatCode: str
-    def __init__(self, fieldName: _Optional[str] = ..., fieldOrder: _Optional[int] = ..., fieldType: _Optional[_Union[_type_pb2.BasicType, str]] = ..., label: _Optional[str] = ..., businessKey: bool = ..., categorical: bool = ..., notNull: bool = ..., formatCode: _Optional[str] = ...) -> None: ...
+    defaultValue: _type_pb2.Value
+    namedType: str
+    namedEnum: str
+    children: _containers.RepeatedCompositeFieldContainer[FieldSchema]
+    def __init__(self, fieldName: _Optional[str] = ..., fieldOrder: _Optional[int] = ..., fieldType: _Optional[_Union[_type_pb2.BasicType, str]] = ..., label: _Optional[str] = ..., businessKey: bool = ..., categorical: bool = ..., notNull: bool = ..., formatCode: _Optional[str] = ..., defaultValue: _Optional[_Union[_type_pb2.Value, _Mapping]] = ..., namedType: _Optional[str] = ..., namedEnum: _Optional[str] = ..., children: _Optional[_Iterable[_Union[FieldSchema, _Mapping]]] = ...) -> None: ...
+
+class EnumValues(_message.Message):
+    __slots__ = ("values",)
+    VALUES_FIELD_NUMBER: _ClassVar[int]
+    values: _containers.RepeatedScalarFieldContainer[str]
+    def __init__(self, values: _Optional[_Iterable[str]] = ...) -> None: ...
 
 class TableSchema(_message.Message):
     __slots__ = ("fields",)
@@ -52,59 +70,35 @@ class TableSchema(_message.Message):
     fields: _containers.RepeatedCompositeFieldContainer[FieldSchema]
     def __init__(self, fields: _Optional[_Iterable[_Union[FieldSchema, _Mapping]]] = ...) -> None: ...
 
-class StructField(_message.Message):
-    __slots__ = ("fieldType", "label", "businessKey", "categorical", "notNull", "formatCode", "defaultValue", "structType")
-    FIELDTYPE_FIELD_NUMBER: _ClassVar[int]
-    LABEL_FIELD_NUMBER: _ClassVar[int]
-    BUSINESSKEY_FIELD_NUMBER: _ClassVar[int]
-    CATEGORICAL_FIELD_NUMBER: _ClassVar[int]
-    NOTNULL_FIELD_NUMBER: _ClassVar[int]
-    FORMATCODE_FIELD_NUMBER: _ClassVar[int]
-    DEFAULTVALUE_FIELD_NUMBER: _ClassVar[int]
-    STRUCTTYPE_FIELD_NUMBER: _ClassVar[int]
-    fieldType: _type_pb2.TypeDescriptor
-    label: str
-    businessKey: bool
-    categorical: bool
-    notNull: bool
-    formatCode: str
-    defaultValue: _type_pb2.Value
-    structType: str
-    def __init__(self, fieldType: _Optional[_Union[_type_pb2.TypeDescriptor, _Mapping]] = ..., label: _Optional[str] = ..., businessKey: bool = ..., categorical: bool = ..., notNull: bool = ..., formatCode: _Optional[str] = ..., defaultValue: _Optional[_Union[_type_pb2.Value, _Mapping]] = ..., structType: _Optional[str] = ...) -> None: ...
-
-class StructSchema(_message.Message):
-    __slots__ = ("fields", "namedTypes")
-    class FieldsEntry(_message.Message):
+class SchemaDefinition(_message.Message):
+    __slots__ = ("schemaType", "partType", "table", "fields", "namedTypes", "namedEnums")
+    class NamedTypesEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
-        value: StructField
-        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[StructField, _Mapping]] = ...) -> None: ...
-    class NamedTypesEntry(_message.Message):
+        value: SchemaDefinition
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[SchemaDefinition, _Mapping]] = ...) -> None: ...
+    class NamedEnumsEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
-        value: StructSchema
-        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[StructSchema, _Mapping]] = ...) -> None: ...
-    FIELDS_FIELD_NUMBER: _ClassVar[int]
-    NAMEDTYPES_FIELD_NUMBER: _ClassVar[int]
-    fields: _containers.MessageMap[str, StructField]
-    namedTypes: _containers.MessageMap[str, StructSchema]
-    def __init__(self, fields: _Optional[_Mapping[str, StructField]] = ..., namedTypes: _Optional[_Mapping[str, StructSchema]] = ...) -> None: ...
-
-class SchemaDefinition(_message.Message):
-    __slots__ = ("schemaType", "partType", "table", "struct")
+        value: EnumValues
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[EnumValues, _Mapping]] = ...) -> None: ...
     SCHEMATYPE_FIELD_NUMBER: _ClassVar[int]
     PARTTYPE_FIELD_NUMBER: _ClassVar[int]
     TABLE_FIELD_NUMBER: _ClassVar[int]
-    STRUCT_FIELD_NUMBER: _ClassVar[int]
+    FIELDS_FIELD_NUMBER: _ClassVar[int]
+    NAMEDTYPES_FIELD_NUMBER: _ClassVar[int]
+    NAMEDENUMS_FIELD_NUMBER: _ClassVar[int]
     schemaType: SchemaType
     partType: PartType
     table: TableSchema
-    struct: StructSchema
-    def __init__(self, schemaType: _Optional[_Union[SchemaType, str]] = ..., partType: _Optional[_Union[PartType, str]] = ..., table: _Optional[_Union[TableSchema, _Mapping]] = ..., struct: _Optional[_Union[StructSchema, _Mapping]] = ...) -> None: ...
+    fields: _containers.RepeatedCompositeFieldContainer[FieldSchema]
+    namedTypes: _containers.MessageMap[str, SchemaDefinition]
+    namedEnums: _containers.MessageMap[str, EnumValues]
+    def __init__(self, schemaType: _Optional[_Union[SchemaType, str]] = ..., partType: _Optional[_Union[PartType, str]] = ..., table: _Optional[_Union[TableSchema, _Mapping]] = ..., fields: _Optional[_Iterable[_Union[FieldSchema, _Mapping]]] = ..., namedTypes: _Optional[_Mapping[str, SchemaDefinition]] = ..., namedEnums: _Optional[_Mapping[str, EnumValues]] = ...) -> None: ...
 
 class PartKey(_message.Message):
     __slots__ = ("opaqueKey", "partType", "partValues", "partRangeMin", "partRangeMax")

tracdap/rt/_impl/grpc/tracdap/metadata/file_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/rt/_impl/grpc/tracdap/metadata/file.proto
-# Protobuf Python Version: 4.25.3
+# Protobuf Python Version: 4.25.5
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool

tracdap/rt/_impl/grpc/tracdap/metadata/flow_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: tracdap/rt/_impl/grpc/tracdap/metadata/flow.proto
-# Protobuf Python Version: 4.25.3
+# Protobuf Python Version: 4.25.5
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool