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

tracdap/rt/_impl/data.py

@@ -74,17 +74,21 @@ class DataView:
 
     parts: tp.Dict[DataPartKey, tp.List[DataItem]]
 
+    @staticmethod
+    def create_empty() -> DataView:
+        return DataView(_meta.SchemaDefinition(), pa.schema([]), dict())
+
     @staticmethod
     def for_trac_schema(trac_schema: _meta.SchemaDefinition):
         arrow_schema = DataMapping.trac_to_arrow_schema(trac_schema)
         return DataView(trac_schema, arrow_schema, dict())
 
-    def is_empty(self) -> bool:
-        return self.parts is None or len(self.parts) == 0
+    def with_trac_schema(self, trac_schema: _meta.SchemaDefinition):
+        arrow_schema = DataMapping.trac_to_arrow_schema(trac_schema)
+        return DataView(trac_schema, arrow_schema, self.parts)
 
-    @staticmethod
-    def create_empty() -> DataView:
-        return DataView(_meta.SchemaDefinition(), pa.schema([]), dict())
+    def is_empty(self) -> bool:
+        return self.parts is None or not any(self.parts.values())
 
 
 class _DataInternal:
@@ -170,9 +174,29 @@ class DataMapping:
         pa.float16(): pd.Float32Dtype(),
         pa.float32(): pd.Float32Dtype(),
         pa.float64(): pd.Float64Dtype(),
+        pa.string(): pd.StringDtype(),
         pa.utf8(): pd.StringDtype()
     }
 
+    __ARROW_TO_TRAC_BASIC_TYPE_MAPPING = {
+        pa.bool_(): _meta.BasicType.BOOLEAN,
+        pa.int8(): _meta.BasicType.INTEGER,
+        pa.int16(): _meta.BasicType.INTEGER,
+        pa.int32(): _meta.BasicType.INTEGER,
+        pa.int64():_meta.BasicType.INTEGER,
+        pa.uint8(): _meta.BasicType.INTEGER,
+        pa.uint16(): _meta.BasicType.INTEGER,
+        pa.uint32(): _meta.BasicType.INTEGER,
+        pa.uint64(): _meta.BasicType.INTEGER,
+        pa.float16(): _meta.BasicType.FLOAT,
+        pa.float32(): _meta.BasicType.FLOAT,
+        pa.float64(): _meta.BasicType.FLOAT,
+        pa.string(): _meta.BasicType.STRING,
+        pa.utf8(): _meta.BasicType.STRING,
+        pa.date32(): _meta.BasicType.DATE,
+        pa.date64(): _meta.BasicType.DATE
+    }
+
     @staticmethod
     def arrow_to_python_type(arrow_type: pa.DataType) -> type:
 
@@ -265,6 +289,47 @@ class DataMapping:
             cls.__TRAC_DECIMAL_PRECISION,
             cls.__TRAC_DECIMAL_SCALE)
 
+    @classmethod
+    def arrow_to_trac_schema(cls, arrow_schema: pa.Schema) -> _meta.SchemaDefinition:
+
+        trac_fields = list(
+            cls.arrow_to_trac_field(i, arrow_schema.field(i))
+            for (i, f) in enumerate(arrow_schema.names))
+
+        return _meta.SchemaDefinition(
+            schemaType=_meta.SchemaType.TABLE,
+            partType=_meta.PartType.PART_ROOT,
+            table=_meta.TableSchema(trac_fields))
+
+    @classmethod
+    def arrow_to_trac_field(cls, field_index: int, field: pa.Field) -> _meta.FieldSchema:
+
+        field_type = cls.arrow_to_trac_type(field.type)
+        label = field.metadata["label"] if field.metadata and "label" in field.metadata else field.name
+
+        return _meta.FieldSchema(
+            field.name, field_index, field_type,
+            label=label,
+            businessKey=False,
+            notNull=not field.nullable,
+            categorical=False)
+
+    @classmethod
+    def arrow_to_trac_type(cls, arrow_type: pa.DataType) -> _meta.BasicType:
+
+        mapped_basic_type = cls.__ARROW_TO_TRAC_BASIC_TYPE_MAPPING.get(arrow_type)  # noqa
+
+        if mapped_basic_type is not None:
+            return mapped_basic_type
+
+        if pa.types.is_decimal(arrow_type):
+            return _meta.BasicType.DECIMAL
+
+        if pa.types.is_timestamp(arrow_type):
+            return _meta.BasicType.DATETIME
+
+        raise _ex.ETracInternal(f"No data type mapping available for Arrow type [{arrow_type}]")
+
     @classmethod
     def pandas_date_type(cls):
         return cls.__PANDAS_DATE_TYPE

tracdap/rt/_impl/grpc/codec.py

@@ -15,6 +15,58 @@
 import enum
 import typing as tp
 
+import tracdap.rt.exceptions as ex
+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.data_pb2 as data_pb2
+import tracdap.rt._impl.grpc.tracdap.metadata.stoarge_pb2 as storage_pb2
+
+from google.protobuf import message as _message
+
+
+__METADATA_MAPPING = {
+    metadata.TypeDescriptor: type_pb2.TypeDescriptor,
+    metadata.Value: type_pb2.Value,
+    metadata.DecimalValue: type_pb2.DecimalValue,
+    metadata.DateValue: type_pb2.DateValue,
+    metadata.DatetimeValue: type_pb2.DatetimeValue,
+    metadata.ArrayValue: type_pb2.ArrayValue,
+    metadata.MapValue: type_pb2.MapValue,
+    metadata.TagHeader: object_id_pb2.TagHeader,
+    metadata.TagSelector: object_id_pb2.TagSelector,
+    metadata.ObjectDefinition: object_pb2.ObjectDefinition,
+    metadata.ModelDefinition: model_pb2.ModelDefinition,
+    metadata.ModelParameter: model_pb2.ModelParameter,
+    metadata.ModelInputSchema: model_pb2.ModelInputSchema,
+    metadata.ModelOutputSchema: model_pb2.ModelOutputSchema,
+    metadata.SchemaDefinition: data_pb2.SchemaDefinition,
+    metadata.TableSchema: data_pb2.TableSchema,
+    metadata.FieldSchema: data_pb2.FieldSchema,
+    metadata.PartKey: data_pb2.PartKey,
+    metadata.DataDefinition: data_pb2.DataDefinition,
+    metadata.DataDefinition.Part: data_pb2.DataDefinition.Part,
+    metadata.DataDefinition.Snap: data_pb2.DataDefinition.Snap,
+    metadata.DataDefinition.Delta: data_pb2.DataDefinition.Delta,
+    metadata.StorageDefinition: storage_pb2.StorageDefinition,
+    metadata.StorageIncarnation: storage_pb2.StorageIncarnation,
+    metadata.StorageCopy: storage_pb2.StorageCopy,
+    metadata.StorageItem: storage_pb2.StorageItem
+}
+
+
+_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:
 
@@ -35,10 +87,13 @@ def encode(obj: tp.Any) -> tp.Any:
         return list(map(encode, obj))
 
     if isinstance(obj, dict):
-        return dict(map(lambda kv: (kv[0], encode(kv[1])), obj.items()))
+        return dict((k, encode(v)) for k, v in obj.items())
+
+    msg_class = __METADATA_MAPPING.get(type(obj))
+
+    if msg_class is None:
+        raise ex.ETracInternal(f"No gRPC metadata mapping is available for type {type(obj).__name__}")
 
-    # Filter classes for TRAC domain objects (sanity check, not a watertight validation)
-    if hasattr(obj, "__module__") and "tracdap" in obj.__module__:
-        return dict(map(lambda kv: (kv[0], encode(kv[1])), obj.__dict__.items()))
+    attrs = dict((k, encode(v)) for k, v in obj.__dict__.items() if v is not None)
 
-    raise RuntimeError(f"Cannot encode object of type [{type(obj).__name__}] for gRPC")
+    return msg_class(**attrs)

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

@@ -18,7 +18,7 @@ from tracdap.rt._impl.grpc.tracdap.metadata import object_pb2 as tracdap_dot_rt_
 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\"/\n\x0fListJobsRequest\x12\x12\n\x05limit\x18\x01 \x01(\rH\x00\x88\x01\x01\x42\x08\n\x06_limit\"A\n\x10ListJobsResponse\x12-\n\x04jobs\x18\x01 \x03(\x0b\x32\x1f.tracdap.api.internal.JobStatus\"f\n\x15\x42\x61tchJobStatusRequest\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\"\x83\x01\n\tJobStatus\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\"\xa0\x02\n\x0e\x42\x61tchJobResult\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\x42\n\x07results\x18\x04 \x03(\x0b\x32\x31.tracdap.api.internal.BatchJobResult.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\xff\x02\n\x0eTracRuntimeApi\x12m\n\x08listJobs\x12%.tracdap.api.internal.ListJobsRequest\x1a&.tracdap.api.internal.ListJobsResponse\"\x12\x82\xd3\xe4\x93\x02\x0c\x12\n/list-jobs\x12z\n\x0cgetJobStatus\x12+.tracdap.api.internal.BatchJobStatusRequest\x1a\x1f.tracdap.api.internal.JobStatus\"\x1c\x82\xd3\xe4\x93\x02\x16\x12\x14/job-status/{jobKey}\x12\x81\x01\n\rgetJobDetails\x12+.tracdap.api.internal.BatchJobStatusRequest\x1a$.tracdap.api.internal.BatchJobResult\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/job-details/{jobKey}B\"\n\x1eorg.finos.tracdap.api.internalP\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\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}B\"\n\x1eorg.finos.tracdap.api.internalP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -26,26 +26,26 @@ _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.internalP\001'
-  _globals['_BATCHJOBRESULT_RESULTSENTRY']._options = None
-  _globals['_BATCHJOBRESULT_RESULTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNTIMEJOBRESULT_RESULTSENTRY']._options = None
+  _globals['_RUNTIMEJOBRESULT_RESULTSENTRY']._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['getJobDetails']._options = None
-  _globals['_TRACRUNTIMEAPI'].methods_by_name['getJobDetails']._serialized_options = b'\202\323\344\223\002\027\022\025/job-details/{jobKey}'
-  _globals['_LISTJOBSREQUEST']._serialized_start=271
-  _globals['_LISTJOBSREQUEST']._serialized_end=318
-  _globals['_LISTJOBSRESPONSE']._serialized_start=320
-  _globals['_LISTJOBSRESPONSE']._serialized_end=385
-  _globals['_BATCHJOBSTATUSREQUEST']._serialized_start=387
-  _globals['_BATCHJOBSTATUSREQUEST']._serialized_end=489
-  _globals['_JOBSTATUS']._serialized_start=492
-  _globals['_JOBSTATUS']._serialized_end=623
-  _globals['_BATCHJOBRESULT']._serialized_start=626
-  _globals['_BATCHJOBRESULT']._serialized_end=914
-  _globals['_BATCHJOBRESULT_RESULTSENTRY']._serialized_start=832
-  _globals['_BATCHJOBRESULT_RESULTSENTRY']._serialized_end=914
-  _globals['_TRACRUNTIMEAPI']._serialized_start=917
-  _globals['_TRACRUNTIMEAPI']._serialized_end=1300
+  _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
 # @@protoc_insertion_point(module_scope)

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

@@ -9,19 +9,19 @@ from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Map
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class ListJobsRequest(_message.Message):
+class RuntimeListJobsRequest(_message.Message):
     __slots__ = ("limit",)
     LIMIT_FIELD_NUMBER: _ClassVar[int]
     limit: int
     def __init__(self, limit: _Optional[int] = ...) -> None: ...
 
-class ListJobsResponse(_message.Message):
+class RuntimeListJobsResponse(_message.Message):
     __slots__ = ("jobs",)
     JOBS_FIELD_NUMBER: _ClassVar[int]
-    jobs: _containers.RepeatedCompositeFieldContainer[JobStatus]
-    def __init__(self, jobs: _Optional[_Iterable[_Union[JobStatus, _Mapping]]] = ...) -> None: ...
+    jobs: _containers.RepeatedCompositeFieldContainer[RuntimeJobStatus]
+    def __init__(self, jobs: _Optional[_Iterable[_Union[RuntimeJobStatus, _Mapping]]] = ...) -> None: ...
 
-class BatchJobStatusRequest(_message.Message):
+class RuntimeJobInfoRequest(_message.Message):
     __slots__ = ("jobSelector", "jobKey")
     JOBSELECTOR_FIELD_NUMBER: _ClassVar[int]
     JOBKEY_FIELD_NUMBER: _ClassVar[int]
@@ -29,17 +29,19 @@ class BatchJobStatusRequest(_message.Message):
     jobKey: str
     def __init__(self, jobSelector: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., jobKey: _Optional[str] = ...) -> None: ...
 
-class JobStatus(_message.Message):
-    __slots__ = ("jobId", "statusCode", "statusMessage")
+class RuntimeJobStatus(_message.Message):
+    __slots__ = ("jobId", "statusCode", "statusMessage", "errorDetail")
     JOBID_FIELD_NUMBER: _ClassVar[int]
     STATUSCODE_FIELD_NUMBER: _ClassVar[int]
     STATUSMESSAGE_FIELD_NUMBER: _ClassVar[int]
+    ERRORDETAIL_FIELD_NUMBER: _ClassVar[int]
     jobId: _object_id_pb2.TagHeader
     statusCode: _job_pb2.JobStatusCode
     statusMessage: str
-    def __init__(self, jobId: _Optional[_Union[_object_id_pb2.TagHeader, _Mapping]] = ..., statusCode: _Optional[_Union[_job_pb2.JobStatusCode, str]] = ..., statusMessage: _Optional[str] = ...) -> None: ...
+    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 BatchJobResult(_message.Message):
+class RuntimeJobResult(_message.Message):
     __slots__ = ("jobId", "statusCode", "statusMessage", "results")
     class ResultsEntry(_message.Message):
         __slots__ = ("key", "value")

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

@@ -36,18 +36,18 @@ class TracRuntimeApiStub(object):
         """
         self.listJobs = channel.unary_unary(
                 '/tracdap.api.internal.TracRuntimeApi/listJobs',
-                request_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.ListJobsRequest.SerializeToString,
-                response_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.ListJobsResponse.FromString,
+                request_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeListJobsRequest.SerializeToString,
+                response_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeListJobsResponse.FromString,
                 _registered_method=True)
         self.getJobStatus = channel.unary_unary(
                 '/tracdap.api.internal.TracRuntimeApi/getJobStatus',
-                request_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobStatusRequest.SerializeToString,
-                response_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.JobStatus.FromString,
+                request_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobInfoRequest.SerializeToString,
+                response_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobStatus.FromString,
                 _registered_method=True)
-        self.getJobDetails = channel.unary_unary(
-                '/tracdap.api.internal.TracRuntimeApi/getJobDetails',
-                request_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobStatusRequest.SerializeToString,
-                response_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobResult.FromString,
+        self.getJobResult = channel.unary_unary(
+                '/tracdap.api.internal.TracRuntimeApi/getJobResult',
+                request_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobInfoRequest.SerializeToString,
+                response_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobResult.FromString,
                 _registered_method=True)
 
 
@@ -66,7 +66,7 @@ class TracRuntimeApiServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def getJobDetails(self, request, context):
+    def getJobResult(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -77,18 +77,18 @@ def add_TracRuntimeApiServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'listJobs': grpc.unary_unary_rpc_method_handler(
                     servicer.listJobs,
-                    request_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.ListJobsRequest.FromString,
-                    response_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.ListJobsResponse.SerializeToString,
+                    request_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeListJobsRequest.FromString,
+                    response_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeListJobsResponse.SerializeToString,
             ),
             'getJobStatus': grpc.unary_unary_rpc_method_handler(
                     servicer.getJobStatus,
-                    request_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobStatusRequest.FromString,
-                    response_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.JobStatus.SerializeToString,
+                    request_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobInfoRequest.FromString,
+                    response_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobStatus.SerializeToString,
             ),
-            'getJobDetails': grpc.unary_unary_rpc_method_handler(
-                    servicer.getJobDetails,
-                    request_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobStatusRequest.FromString,
-                    response_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobResult.SerializeToString,
+            'getJobResult': grpc.unary_unary_rpc_method_handler(
+                    servicer.getJobResult,
+                    request_deserializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobInfoRequest.FromString,
+                    response_serializer=tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobResult.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -116,8 +116,8 @@ class TracRuntimeApi(object):
             request,
             target,
             '/tracdap.api.internal.TracRuntimeApi/listJobs',
-            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.ListJobsRequest.SerializeToString,
-            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.ListJobsResponse.FromString,
+            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeListJobsRequest.SerializeToString,
+            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeListJobsResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -143,8 +143,8 @@ class TracRuntimeApi(object):
             request,
             target,
             '/tracdap.api.internal.TracRuntimeApi/getJobStatus',
-            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobStatusRequest.SerializeToString,
-            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.JobStatus.FromString,
+            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobInfoRequest.SerializeToString,
+            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobStatus.FromString,
             options,
             channel_credentials,
             insecure,
@@ -156,7 +156,7 @@ class TracRuntimeApi(object):
             _registered_method=True)
 
     @staticmethod
-    def getJobDetails(request,
+    def getJobResult(request,
             target,
             options=(),
             channel_credentials=None,
@@ -169,9 +169,9 @@ class TracRuntimeApi(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/tracdap.api.internal.TracRuntimeApi/getJobDetails',
-            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobStatusRequest.SerializeToString,
-            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.BatchJobResult.FromString,
+            '/tracdap.api.internal.TracRuntimeApi/getJobResult',
+            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobInfoRequest.SerializeToString,
+            tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_api_dot_internal_dot_runtime__pb2.RuntimeJobResult.FromString,
             options,
             channel_credentials,
             insecure,

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

@@ -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\"\xba\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\x42\x16\n\x14schemaTypeDefinition\"\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*0\n\nSchemaType\x12\x17\n\x13SCHEMA_TYPE_NOT_SET\x10\x00\x12\t\n\x05TABLE\x10\x01*?\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\"\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\"\xb3\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\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*0\n\nSchemaType\x12\x17\n\x13SCHEMA_TYPE_NOT_SET\x10\x00\x12\t\n\x05TABLE\x10\x01*?\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')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -26,26 +26,26 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
   _globals['_DATADEFINITION_PARTSENTRY']._options = None
   _globals['_DATADEFINITION_PARTSENTRY']._serialized_options = b'8\001'
-  _globals['_SCHEMATYPE']._serialized_start=1496
-  _globals['_SCHEMATYPE']._serialized_end=1544
-  _globals['_PARTTYPE']._serialized_start=1546
-  _globals['_PARTTYPE']._serialized_end=1609
+  _globals['_SCHEMATYPE']._serialized_start=1489
+  _globals['_SCHEMATYPE']._serialized_end=1537
+  _globals['_PARTTYPE']._serialized_start=1539
+  _globals['_PARTTYPE']._serialized_end=1602
   _globals['_FIELDSCHEMA']._serialized_start=179
   _globals['_FIELDSCHEMA']._serialized_end=410
   _globals['_TABLESCHEMA']._serialized_start=412
   _globals['_TABLESCHEMA']._serialized_end=472
   _globals['_SCHEMADEFINITION']._serialized_start=475
-  _globals['_SCHEMADEFINITION']._serialized_end=661
-  _globals['_PARTKEY']._serialized_start=664
-  _globals['_PARTKEY']._serialized_end=921
-  _globals['_DATADEFINITION']._serialized_start=924
-  _globals['_DATADEFINITION']._serialized_end=1494
-  _globals['_DATADEFINITION_DELTA']._serialized_start=1157
-  _globals['_DATADEFINITION_DELTA']._serialized_end=1202
-  _globals['_DATADEFINITION_SNAP']._serialized_start=1204
-  _globals['_DATADEFINITION_SNAP']._serialized_end=1285
-  _globals['_DATADEFINITION_PART']._serialized_start=1287
-  _globals['_DATADEFINITION_PART']._serialized_end=1390
-  _globals['_DATADEFINITION_PARTSENTRY']._serialized_start=1392
-  _globals['_DATADEFINITION_PARTSENTRY']._serialized_end=1475
+  _globals['_SCHEMADEFINITION']._serialized_end=654
+  _globals['_PARTKEY']._serialized_start=657
+  _globals['_PARTKEY']._serialized_end=914
+  _globals['_DATADEFINITION']._serialized_start=917
+  _globals['_DATADEFINITION']._serialized_end=1487
+  _globals['_DATADEFINITION_DELTA']._serialized_start=1150
+  _globals['_DATADEFINITION_DELTA']._serialized_end=1195
+  _globals['_DATADEFINITION_SNAP']._serialized_start=1197
+  _globals['_DATADEFINITION_SNAP']._serialized_end=1278
+  _globals['_DATADEFINITION_PART']._serialized_start=1280
+  _globals['_DATADEFINITION_PART']._serialized_end=1383
+  _globals['_DATADEFINITION_PARTSENTRY']._serialized_start=1385
+  _globals['_DATADEFINITION_PARTSENTRY']._serialized_end=1468
 # @@protoc_insertion_point(module_scope)

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

@@ -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 data_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_data__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n2tracdap/rt/_impl/grpc/tracdap/metadata/model.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\"\x99\x01\n\x0eModelParameter\x12\x33\n\tparamType\x18\x01 \x01(\x0b\x32 .tracdap.metadata.TypeDescriptor\x12\r\n\x05label\x18\x02 \x01(\t\x12\x32\n\x0c\x64\x65\x66\x61ultValue\x18\x03 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x42\x0f\n\r_defaultValue\"v\n\x10ModelInputSchema\x12\x32\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinition\x12\x12\n\x05label\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x10\n\x08optional\x18\x03 \x01(\x08\x42\x08\n\x06_label\"w\n\x11ModelOutputSchema\x12\x32\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinition\x12\x12\n\x05label\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x10\n\x08optional\x18\x03 \x01(\x08\x42\x08\n\x06_label\"\x9e\x06\n\x0fModelDefinition\x12\x10\n\x08language\x18\x01 \x01(\t\x12\x12\n\nrepository\x18\x02 \x01(\t\x12\x19\n\x0cpackageGroup\x18\n \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07package\x18\x0b \x01(\t\x12\x0f\n\x07version\x18\x06 \x01(\t\x12\x12\n\nentryPoint\x18\x05 \x01(\t\x12\x11\n\x04path\x18\x03 \x01(\tH\x01\x88\x01\x01\x12\x45\n\nparameters\x18\x07 \x03(\x0b\x32\x31.tracdap.metadata.ModelDefinition.ParametersEntry\x12=\n\x06inputs\x18\x08 \x03(\x0b\x32-.tracdap.metadata.ModelDefinition.InputsEntry\x12?\n\x07outputs\x18\t \x03(\x0b\x32..tracdap.metadata.ModelDefinition.OutputsEntry\x12Q\n\x10staticAttributes\x18\x0c \x03(\x0b\x32\x37.tracdap.metadata.ModelDefinition.StaticAttributesEntry\x1aS\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .tracdap.metadata.ModelParameter:\x02\x38\x01\x1aQ\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ModelInputSchema:\x02\x38\x01\x1aS\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x32\n\x05value\x18\x02 \x01(\x0b\x32#.tracdap.metadata.ModelOutputSchema:\x02\x38\x01\x1aP\n\x15StaticAttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0f\n\r_packageGroupB\x07\n\x05_pathB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n2tracdap/rt/_impl/grpc/tracdap/metadata/model.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\"\xab\x02\n\x0eModelParameter\x12\x33\n\tparamType\x18\x01 \x01(\x0b\x32 .tracdap.metadata.TypeDescriptor\x12\r\n\x05label\x18\x02 \x01(\t\x12\x32\n\x0c\x64\x65\x66\x61ultValue\x18\x03 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x12\x44\n\nparamProps\x18\x04 \x03(\x0b\x32\x30.tracdap.metadata.ModelParameter.ParamPropsEntry\x1aJ\n\x0fParamPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0f\n\r_defaultValue\"\x9b\x02\n\x10ModelInputSchema\x12\x32\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinition\x12\x12\n\x05label\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x10\n\x08optional\x18\x03 \x01(\x08\x12\x0f\n\x07\x64ynamic\x18\x05 \x01(\x08\x12\x46\n\ninputProps\x18\x04 \x03(\x0b\x32\x32.tracdap.metadata.ModelInputSchema.InputPropsEntry\x1aJ\n\x0fInputPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x08\n\x06_label\"\xa0\x02\n\x11ModelOutputSchema\x12\x32\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinition\x12\x12\n\x05label\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x10\n\x08optional\x18\x03 \x01(\x08\x12\x0f\n\x07\x64ynamic\x18\x05 \x01(\x08\x12I\n\x0boutputProps\x18\x04 \x03(\x0b\x32\x34.tracdap.metadata.ModelOutputSchema.OutputPropsEntry\x1aK\n\x10OutputPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x08\n\x06_label\"\x9e\x06\n\x0fModelDefinition\x12\x10\n\x08language\x18\x01 \x01(\t\x12\x12\n\nrepository\x18\x02 \x01(\t\x12\x19\n\x0cpackageGroup\x18\n \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07package\x18\x0b \x01(\t\x12\x0f\n\x07version\x18\x06 \x01(\t\x12\x12\n\nentryPoint\x18\x05 \x01(\t\x12\x11\n\x04path\x18\x03 \x01(\tH\x01\x88\x01\x01\x12\x45\n\nparameters\x18\x07 \x03(\x0b\x32\x31.tracdap.metadata.ModelDefinition.ParametersEntry\x12=\n\x06inputs\x18\x08 \x03(\x0b\x32-.tracdap.metadata.ModelDefinition.InputsEntry\x12?\n\x07outputs\x18\t \x03(\x0b\x32..tracdap.metadata.ModelDefinition.OutputsEntry\x12Q\n\x10staticAttributes\x18\x0c \x03(\x0b\x32\x37.tracdap.metadata.ModelDefinition.StaticAttributesEntry\x1aS\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .tracdap.metadata.ModelParameter:\x02\x38\x01\x1aQ\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ModelInputSchema:\x02\x38\x01\x1aS\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x32\n\x05value\x18\x02 \x01(\x0b\x32#.tracdap.metadata.ModelOutputSchema:\x02\x38\x01\x1aP\n\x15StaticAttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0f\n\r_packageGroupB\x07\n\x05_pathB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -24,6 +24,12 @@ _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['_MODELPARAMETER_PARAMPROPSENTRY']._options = None
+  _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_options = b'8\001'
+  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._options = None
+  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_options = b'8\001'
+  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._options = None
+  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_options = b'8\001'
   _globals['_MODELDEFINITION_PARAMETERSENTRY']._options = None
   _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_options = b'8\001'
   _globals['_MODELDEFINITION_INPUTSENTRY']._options = None
@@ -33,19 +39,25 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._options = None
   _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_options = b'8\001'
   _globals['_MODELPARAMETER']._serialized_start=175
-  _globals['_MODELPARAMETER']._serialized_end=328
-  _globals['_MODELINPUTSCHEMA']._serialized_start=330
-  _globals['_MODELINPUTSCHEMA']._serialized_end=448
-  _globals['_MODELOUTPUTSCHEMA']._serialized_start=450
-  _globals['_MODELOUTPUTSCHEMA']._serialized_end=569
-  _globals['_MODELDEFINITION']._serialized_start=572
-  _globals['_MODELDEFINITION']._serialized_end=1370
-  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_start=1011
-  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_end=1094
-  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_start=1096
-  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_end=1177
-  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_start=1179
-  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_end=1262
-  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_start=1264
-  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_end=1344
+  _globals['_MODELPARAMETER']._serialized_end=474
+  _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_start=383
+  _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_end=457
+  _globals['_MODELINPUTSCHEMA']._serialized_start=477
+  _globals['_MODELINPUTSCHEMA']._serialized_end=760
+  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_start=676
+  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_end=750
+  _globals['_MODELOUTPUTSCHEMA']._serialized_start=763
+  _globals['_MODELOUTPUTSCHEMA']._serialized_end=1051
+  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_start=966
+  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_end=1041
+  _globals['_MODELDEFINITION']._serialized_start=1054
+  _globals['_MODELDEFINITION']._serialized_end=1852
+  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_start=1493
+  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_end=1576
+  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_start=1578
+  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_end=1659
+  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_start=1661
+  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_end=1744
+  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_start=1746
+  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_end=1826
 # @@protoc_insertion_point(module_scope)

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

@@ -8,34 +8,65 @@ from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Opti
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class ModelParameter(_message.Message):
-    __slots__ = ("paramType", "label", "defaultValue")
+    __slots__ = ("paramType", "label", "defaultValue", "paramProps")
+    class ParamPropsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: _type_pb2.Value
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
     PARAMTYPE_FIELD_NUMBER: _ClassVar[int]
     LABEL_FIELD_NUMBER: _ClassVar[int]
     DEFAULTVALUE_FIELD_NUMBER: _ClassVar[int]
+    PARAMPROPS_FIELD_NUMBER: _ClassVar[int]
     paramType: _type_pb2.TypeDescriptor
     label: str
     defaultValue: _type_pb2.Value
-    def __init__(self, paramType: _Optional[_Union[_type_pb2.TypeDescriptor, _Mapping]] = ..., label: _Optional[str] = ..., defaultValue: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
+    paramProps: _containers.MessageMap[str, _type_pb2.Value]
+    def __init__(self, paramType: _Optional[_Union[_type_pb2.TypeDescriptor, _Mapping]] = ..., label: _Optional[str] = ..., defaultValue: _Optional[_Union[_type_pb2.Value, _Mapping]] = ..., paramProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
 
 class ModelInputSchema(_message.Message):
-    __slots__ = ("schema", "label", "optional")
+    __slots__ = ("schema", "label", "optional", "dynamic", "inputProps")
+    class InputPropsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: _type_pb2.Value
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
     SCHEMA_FIELD_NUMBER: _ClassVar[int]
     LABEL_FIELD_NUMBER: _ClassVar[int]
     OPTIONAL_FIELD_NUMBER: _ClassVar[int]
+    DYNAMIC_FIELD_NUMBER: _ClassVar[int]
+    INPUTPROPS_FIELD_NUMBER: _ClassVar[int]
     schema: _data_pb2.SchemaDefinition
     label: str
     optional: bool
-    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ...) -> None: ...
+    dynamic: bool
+    inputProps: _containers.MessageMap[str, _type_pb2.Value]
+    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., dynamic: bool = ..., inputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
 
 class ModelOutputSchema(_message.Message):
-    __slots__ = ("schema", "label", "optional")
+    __slots__ = ("schema", "label", "optional", "dynamic", "outputProps")
+    class OutputPropsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: _type_pb2.Value
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
     SCHEMA_FIELD_NUMBER: _ClassVar[int]
     LABEL_FIELD_NUMBER: _ClassVar[int]
     OPTIONAL_FIELD_NUMBER: _ClassVar[int]
+    DYNAMIC_FIELD_NUMBER: _ClassVar[int]
+    OUTPUTPROPS_FIELD_NUMBER: _ClassVar[int]
     schema: _data_pb2.SchemaDefinition
     label: str
     optional: bool
-    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ...) -> None: ...
+    dynamic: bool
+    outputProps: _containers.MessageMap[str, _type_pb2.Value]
+    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., dynamic: bool = ..., outputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
 
 class ModelDefinition(_message.Message):
     __slots__ = ("language", "repository", "packageGroup", "package", "version", "entryPoint", "path", "parameters", "inputs", "outputs", "staticAttributes")