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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. tracdap/rt/_exec/actors.py +5 -4
  2. tracdap/rt/_exec/context.py +166 -74
  3. tracdap/rt/_exec/dev_mode.py +147 -71
  4. tracdap/rt/_exec/engine.py +224 -99
  5. tracdap/rt/_exec/functions.py +122 -80
  6. tracdap/rt/_exec/graph.py +23 -35
  7. tracdap/rt/_exec/graph_builder.py +250 -113
  8. tracdap/rt/_exec/runtime.py +24 -10
  9. tracdap/rt/_exec/server.py +4 -3
  10. tracdap/rt/_impl/config_parser.py +3 -2
  11. tracdap/rt/_impl/data.py +89 -16
  12. tracdap/rt/_impl/grpc/tracdap/metadata/file_pb2.py +3 -1
  13. tracdap/rt/_impl/grpc/tracdap/metadata/file_pb2.pyi +8 -0
  14. tracdap/rt/_impl/grpc/tracdap/metadata/job_pb2.py +64 -62
  15. tracdap/rt/_impl/grpc/tracdap/metadata/job_pb2.pyi +16 -2
  16. tracdap/rt/_impl/grpc/tracdap/metadata/model_pb2.py +27 -25
  17. tracdap/rt/_impl/grpc/tracdap/metadata/model_pb2.pyi +14 -4
  18. tracdap/rt/_impl/grpc/tracdap/metadata/object_id_pb2.py +3 -3
  19. tracdap/rt/_impl/grpc/tracdap/metadata/object_id_pb2.pyi +2 -0
  20. tracdap/rt/_impl/grpc/tracdap/metadata/object_pb2.py +4 -4
  21. tracdap/rt/_impl/grpc/tracdap/metadata/object_pb2.pyi +4 -2
  22. tracdap/rt/_impl/logging.py +195 -0
  23. tracdap/rt/_impl/models.py +11 -8
  24. tracdap/rt/_impl/repos.py +5 -3
  25. tracdap/rt/_impl/schemas.py +2 -2
  26. tracdap/rt/_impl/shim.py +3 -2
  27. tracdap/rt/_impl/static_api.py +53 -33
  28. tracdap/rt/_impl/storage.py +4 -3
  29. tracdap/rt/_impl/util.py +1 -111
  30. tracdap/rt/_impl/validation.py +57 -30
  31. tracdap/rt/_version.py +1 -1
  32. tracdap/rt/api/__init__.py +6 -3
  33. tracdap/rt/api/file_types.py +29 -0
  34. tracdap/rt/api/hook.py +15 -7
  35. tracdap/rt/api/model_api.py +16 -0
  36. tracdap/rt/api/static_api.py +211 -125
  37. tracdap/rt/config/__init__.py +6 -6
  38. tracdap/rt/config/common.py +11 -1
  39. tracdap/rt/config/platform.py +4 -6
  40. tracdap/rt/ext/plugins.py +2 -2
  41. tracdap/rt/launch/launch.py +9 -11
  42. tracdap/rt/metadata/__init__.py +11 -9
  43. tracdap/rt/metadata/file.py +8 -0
  44. tracdap/rt/metadata/job.py +16 -0
  45. tracdap/rt/metadata/model.py +12 -2
  46. tracdap/rt/metadata/object.py +2 -0
  47. tracdap/rt/metadata/object_id.py +2 -0
  48. {tracdap_runtime-0.7.0rc1.dist-info → tracdap_runtime-0.8.0b2.dist-info}/METADATA +15 -15
  49. {tracdap_runtime-0.7.0rc1.dist-info → tracdap_runtime-0.8.0b2.dist-info}/RECORD +52 -50
  50. {tracdap_runtime-0.7.0rc1.dist-info → tracdap_runtime-0.8.0b2.dist-info}/WHEEL +1 -1
  51. {tracdap_runtime-0.7.0rc1.dist-info → tracdap_runtime-0.8.0b2.dist-info}/LICENSE +0 -0
  52. {tracdap_runtime-0.7.0rc1.dist-info → tracdap_runtime-0.8.0b2.dist-info}/top_level.txt +0 -0
tracdap/rt/_impl/data.py CHANGED
@@ -14,6 +14,7 @@
14
14
  # limitations under the License.
15
15
 
16
16
  import abc
17
+ import copy
17
18
  import dataclasses as dc
18
19
  import typing as tp
19
20
  import datetime as dt
@@ -36,17 +37,54 @@ except ModuleNotFoundError:
36
37
  import tracdap.rt.api.experimental as _api
37
38
  import tracdap.rt.metadata as _meta
38
39
  import tracdap.rt.exceptions as _ex
39
- import tracdap.rt._impl.util as _util
40
+ import tracdap.rt._impl.logging as _log
40
41
 
41
42
 
42
43
  @dc.dataclass(frozen=True)
43
44
  class DataSpec:
44
45
 
46
+ object_type: _meta.ObjectType
45
47
  data_item: str
48
+
46
49
  data_def: _meta.DataDefinition
50
+ file_def: _meta.FileDefinition
47
51
  storage_def: _meta.StorageDefinition
48
52
  schema_def: tp.Optional[_meta.SchemaDefinition]
49
53
 
54
+ @staticmethod
55
+ def create_data_spec(
56
+ data_item: str,
57
+ data_def: _meta.DataDefinition,
58
+ storage_def: _meta.StorageDefinition,
59
+ schema_def: tp.Optional[_meta.SchemaDefinition] = None) -> "DataSpec":
60
+
61
+ return DataSpec(
62
+ _meta.ObjectType.DATA, data_item,
63
+ data_def,
64
+ storage_def=storage_def,
65
+ schema_def=schema_def,
66
+ file_def=None)
67
+
68
+ @staticmethod
69
+ def create_file_spec(
70
+ data_item: str,
71
+ file_def: _meta.FileDefinition,
72
+ storage_def: _meta.StorageDefinition) -> "DataSpec":
73
+
74
+ return DataSpec(
75
+ _meta.ObjectType.FILE, data_item,
76
+ file_def=file_def,
77
+ storage_def=storage_def,
78
+ data_def=None,
79
+ schema_def=None)
80
+
81
+ @staticmethod
82
+ def create_empty_spec(object_type: _meta.ObjectType):
83
+ return DataSpec(object_type, None, None, None, None, None)
84
+
85
+ def is_empty(self):
86
+ return self.data_item is None or len(self.data_item) == 0
87
+
50
88
 
51
89
  @dc.dataclass(frozen=True)
52
90
  class DataPartKey:
@@ -61,44 +99,79 @@ class DataPartKey:
61
99
  @dc.dataclass(frozen=True)
62
100
  class DataItem:
63
101
 
64
- schema: pa.Schema
102
+ object_type: _meta.ObjectType
103
+
104
+ schema: pa.Schema = None
65
105
  table: tp.Optional[pa.Table] = None
66
106
  batches: tp.Optional[tp.List[pa.RecordBatch]] = None
67
107
 
68
108
  pandas: "tp.Optional[pandas.DataFrame]" = None
69
109
  pyspark: tp.Any = None
70
110
 
111
+ raw_bytes: bytes = None
112
+
71
113
  def is_empty(self) -> bool:
72
- return self.table is None and (self.batches is None or len(self.batches) == 0)
114
+ if self.object_type == _meta.ObjectType.FILE:
115
+ return self.raw_bytes is None or len(self.raw_bytes) == 0
116
+ else:
117
+ return self.table is None and (self.batches is None or len(self.batches) == 0)
73
118
 
74
119
  @staticmethod
75
- def create_empty() -> "DataItem":
76
- return DataItem(pa.schema([]))
120
+ def create_empty(object_type: _meta.ObjectType = _meta.ObjectType.DATA) -> "DataItem":
121
+ if object_type == _meta.ObjectType.DATA:
122
+ return DataItem(_meta.ObjectType.DATA, pa.schema([]))
123
+ else:
124
+ return DataItem(object_type)
125
+
126
+ @staticmethod
127
+ def for_file_content(raw_bytes: bytes):
128
+ return DataItem(_meta.ObjectType.FILE, raw_bytes=raw_bytes)
77
129
 
78
130
 
79
131
  @dc.dataclass(frozen=True)
80
132
  class DataView:
81
133
 
82
- trac_schema: _meta.SchemaDefinition
83
- arrow_schema: pa.Schema
134
+ object_type: _meta.ObjectType
84
135
 
85
- parts: tp.Dict[DataPartKey, tp.List[DataItem]]
136
+ trac_schema: _meta.SchemaDefinition = None
137
+ arrow_schema: pa.Schema = None
138
+
139
+ parts: tp.Dict[DataPartKey, tp.List[DataItem]] = None
140
+ file_item: tp.Optional[DataItem] = None
86
141
 
87
142
  @staticmethod
88
- def create_empty() -> "DataView":
89
- return DataView(_meta.SchemaDefinition(), pa.schema([]), dict())
143
+ def create_empty(object_type: _meta.ObjectType = _meta.ObjectType.DATA) -> "DataView":
144
+ if object_type == _meta.ObjectType.DATA:
145
+ return DataView(object_type, _meta.SchemaDefinition(), pa.schema([]), dict())
146
+ else:
147
+ return DataView(object_type)
90
148
 
91
149
  @staticmethod
92
150
  def for_trac_schema(trac_schema: _meta.SchemaDefinition):
93
151
  arrow_schema = DataMapping.trac_to_arrow_schema(trac_schema)
94
- return DataView(trac_schema, arrow_schema, dict())
152
+ return DataView(_meta.ObjectType.DATA, trac_schema, arrow_schema, dict())
153
+
154
+ @staticmethod
155
+ def for_file_item(file_item: DataItem):
156
+ return DataView(file_item.object_type, file_item=file_item)
95
157
 
96
158
  def with_trac_schema(self, trac_schema: _meta.SchemaDefinition):
97
159
  arrow_schema = DataMapping.trac_to_arrow_schema(trac_schema)
98
- return DataView(trac_schema, arrow_schema, self.parts)
160
+ return DataView(_meta.ObjectType.DATA, trac_schema, arrow_schema, self.parts)
161
+
162
+ def with_part(self, part_key: DataPartKey, part: DataItem):
163
+ new_parts = copy.copy(self.parts)
164
+ new_parts[part_key] = [part]
165
+ return DataView(self.object_type, self.trac_schema, self.arrow_schema, new_parts)
166
+
167
+ def with_file_item(self, file_item: DataItem):
168
+ return DataView(self.object_type, file_item=file_item)
99
169
 
100
170
  def is_empty(self) -> bool:
101
- return self.parts is None or not any(self.parts.values())
171
+ if self.object_type == _meta.ObjectType.FILE:
172
+ return self.file_item is None
173
+ else:
174
+ return self.parts is None or not any(self.parts.values())
102
175
 
103
176
 
104
177
  class _DataInternal:
@@ -115,7 +188,7 @@ class DataMapping:
115
188
  :py:class:`TypeMapping <tracdap.rt.impl.type_system.MetadataCodec>`.
116
189
  """
117
190
 
118
- __log = _util.logger_for_namespace(_DataInternal.__module__ + ".DataMapping")
191
+ __log = _log.logger_for_namespace(_DataInternal.__module__ + ".DataMapping")
119
192
 
120
193
  # Matches TRAC_ARROW_TYPE_MAPPING in ArrowSchema, tracdap-lib-data
121
194
 
@@ -293,7 +366,7 @@ class DataMapping:
293
366
  deltas = [*prior_deltas, item]
294
367
  parts = {**view.parts, part: deltas}
295
368
 
296
- return DataView(view.trac_schema, view.arrow_schema, parts)
369
+ return DataView(view.object_type, view.trac_schema, view.arrow_schema, parts=parts)
297
370
 
298
371
  @classmethod
299
372
  def view_to_arrow(cls, view: DataView, part: DataPartKey) -> pa.Table:
@@ -642,7 +715,7 @@ class DataConformance:
642
715
  Check and/or apply conformance between datasets and schemas.
643
716
  """
644
717
 
645
- __log = _util.logger_for_namespace(_DataInternal.__module__ + ".DataConformance")
718
+ __log = _log.logger_for_namespace(_DataInternal.__module__ + ".DataConformance")
646
719
 
647
720
  __E_FIELD_MISSING = \
648
721
  "Field [{field_name}] is missing from the data"
tracdap/rt/_impl/grpc/tracdap/metadata/file_pb2.py CHANGED
@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
15
15
  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
16
16
 
17
17
 
18
- DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n1tracdap/rt/_impl/grpc/tracdap/metadata/file.proto\x12\x10tracdap.metadata\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\"\x95\x01\n\x0e\x46ileDefinition\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\textension\x18\x02 \x01(\t\x12\x10\n\x08mimeType\x18\x03 \x01(\t\x12\x0c\n\x04size\x18\x04 \x01(\x04\x12\x30\n\tstorageId\x18\x05 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x10\n\x08\x64\x61taItem\x18\x06 \x01(\tB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
18
+ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n1tracdap/rt/_impl/grpc/tracdap/metadata/file.proto\x12\x10tracdap.metadata\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\"\x95\x01\n\x0e\x46ileDefinition\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\textension\x18\x02 \x01(\t\x12\x10\n\x08mimeType\x18\x03 \x01(\t\x12\x0c\n\x04size\x18\x04 \x01(\x04\x12\x30\n\tstorageId\x18\x05 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x10\n\x08\x64\x61taItem\x18\x06 \x01(\t\"/\n\x08\x46ileType\x12\x11\n\textension\x18\x01 \x01(\t\x12\x10\n\x08mimeType\x18\x02 \x01(\tB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
19
19
 
20
20
  _globals = globals()
21
21
  _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -25,4 +25,6 @@ if _descriptor._USE_C_DESCRIPTORS == False:
25
25
  _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
26
26
  _globals['_FILEDEFINITION']._serialized_start=128
27
27
  _globals['_FILEDEFINITION']._serialized_end=277
28
+ _globals['_FILETYPE']._serialized_start=279
29
+ _globals['_FILETYPE']._serialized_end=326
28
30
  # @@protoc_insertion_point(module_scope)
tracdap/rt/_impl/grpc/tracdap/metadata/file_pb2.pyi CHANGED
@@ -20,3 +20,11 @@ class FileDefinition(_message.Message):
20
20
  storageId: _object_id_pb2.TagSelector
21
21
  dataItem: str
22
22
  def __init__(self, name: _Optional[str] = ..., extension: _Optional[str] = ..., mimeType: _Optional[str] = ..., size: _Optional[int] = ..., storageId: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., dataItem: _Optional[str] = ...) -> None: ...
23
+
24
+ class FileType(_message.Message):
25
+ __slots__ = ("extension", "mimeType")
26
+ EXTENSION_FIELD_NUMBER: _ClassVar[int]
27
+ MIMETYPE_FIELD_NUMBER: _ClassVar[int]
28
+ extension: str
29
+ mimeType: str
30
+ def __init__(self, extension: _Optional[str] = ..., mimeType: _Optional[str] = ...) -> None: ...
tracdap/rt/_impl/grpc/tracdap/metadata/job_pb2.py CHANGED
@@ -17,7 +17,7 @@ from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as tracdap_dot_
17
17
  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
18
18
 
19
19
 
20
- DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n0tracdap/rt/_impl/grpc/tracdap/metadata/job.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x37tracdap/rt/_impl/grpc/tracdap/metadata/tag_update.proto\"\x84\x03\n\rJobDefinition\x12*\n\x07jobType\x18\x01 \x01(\x0e\x32\x19.tracdap.metadata.JobType\x12\x31\n\x08runModel\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.RunModelJobH\x00\x12/\n\x07runFlow\x18\x03 \x01(\x0b\x32\x1c.tracdap.metadata.RunFlowJobH\x00\x12\x37\n\x0bimportModel\x18\x04 \x01(\x0b\x32 .tracdap.metadata.ImportModelJobH\x00\x12\x35\n\nimportData\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.ImportDataJobH\x00\x12\x35\n\nexportData\x18\x06 \x01(\x0b\x32\x1f.tracdap.metadata.ExportDataJobH\x00\x12.\n\x08jobGroup\x18\x07 \x01(\x0b\x32\x1a.tracdap.metadata.JobGroupH\x00\x42\x0c\n\njobDetails\"\xac\x05\n\x0bRunModelJob\x12,\n\x05model\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x41\n\nparameters\x18\x02 \x03(\x0b\x32-.tracdap.metadata.RunModelJob.ParametersEntry\x12\x39\n\x06inputs\x18\x03 \x03(\x0b\x32).tracdap.metadata.RunModelJob.InputsEntry\x12;\n\x07outputs\x18\x04 \x03(\x0b\x32*.tracdap.metadata.RunModelJob.OutputsEntry\x12\x45\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32/.tracdap.metadata.RunModelJob.PriorOutputsEntry\x12\x30\n\x0boutputAttrs\x18\x06 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xae\x06\n\nRunFlowJob\x12+\n\x04\x66low\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12@\n\nparameters\x18\x02 \x03(\x0b\x32,.tracdap.metadata.RunFlowJob.ParametersEntry\x12\x38\n\x06inputs\x18\x03 \x03(\x0b\x32(.tracdap.metadata.RunFlowJob.InputsEntry\x12:\n\x07outputs\x18\x04 \x03(\x0b\x32).tracdap.metadata.RunFlowJob.OutputsEntry\x12\x44\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32..tracdap.metadata.RunFlowJob.PriorOutputsEntry\x12\x38\n\x06models\x18\x06 \x03(\x0b\x32(.tracdap.metadata.RunFlowJob.ModelsEntry\x12\x30\n\x0boutputAttrs\x18\x07 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aL\n\x0bModelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xd7\x01\n\x0eImportModelJob\x12\x10\n\x08language\x18\x01 \x01(\t\x12\x12\n\nrepository\x18\x02 \x01(\t\x12\x19\n\x0cpackageGroup\x18\x07 \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07package\x18\x08 \x01(\t\x12\x0f\n\x07version\x18\x05 \x01(\t\x12\x12\n\nentryPoint\x18\x04 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12/\n\nmodelAttrs\x18\x06 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdateB\x0f\n\r_packageGroup\"\x8d\x07\n\rImportDataJob\x12,\n\x05model\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x43\n\nparameters\x18\x02 \x03(\x0b\x32/.tracdap.metadata.ImportDataJob.ParametersEntry\x12;\n\x06inputs\x18\x03 \x03(\x0b\x32+.tracdap.metadata.ImportDataJob.InputsEntry\x12=\n\x07outputs\x18\x04 \x03(\x0b\x32,.tracdap.metadata.ImportDataJob.OutputsEntry\x12G\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32\x31.tracdap.metadata.ImportDataJob.PriorOutputsEntry\x12\x15\n\rstorageAccess\x18\x06 \x03(\t\x12=\n\x07imports\x18\x07 \x03(\x0b\x32,.tracdap.metadata.ImportDataJob.ImportsEntry\x12\x30\n\x0boutputAttrs\x18\x08 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x12\x30\n\x0bimportAttrs\x18\t \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cImportsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xdb\x06\n\rExportDataJob\x12,\n\x05model\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x43\n\nparameters\x18\x02 \x03(\x0b\x32/.tracdap.metadata.ExportDataJob.ParametersEntry\x12;\n\x06inputs\x18\x03 \x03(\x0b\x32+.tracdap.metadata.ExportDataJob.InputsEntry\x12=\n\x07outputs\x18\x04 \x03(\x0b\x32,.tracdap.metadata.ExportDataJob.OutputsEntry\x12G\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32\x31.tracdap.metadata.ExportDataJob.PriorOutputsEntry\x12\x15\n\rstorageAccess\x18\x06 \x03(\t\x12=\n\x07\x65xports\x18\x07 \x03(\x0b\x32,.tracdap.metadata.ExportDataJob.ExportsEntry\x12\x30\n\x0boutputAttrs\x18\x08 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0c\x45xportsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xc7\x01\n\x08JobGroup\x12\x34\n\x0cjobGroupType\x18\x01 \x01(\x0e\x32\x1e.tracdap.metadata.JobGroupType\x12:\n\nsequential\x18\x02 \x01(\x0b\x32$.tracdap.metadata.SequentialJobGroupH\x00\x12\x36\n\x08parallel\x18\x03 \x01(\x0b\x32\".tracdap.metadata.ParallelJobGroupH\x00\x42\x11\n\x0fjobGroupDetails\"C\n\x12SequentialJobGroup\x12-\n\x04jobs\x18\x01 \x03(\x0b\x32\x1f.tracdap.metadata.JobDefinition\"A\n\x10ParallelJobGroup\x12-\n\x04jobs\x18\x01 \x03(\x0b\x32\x1f.tracdap.metadata.JobDefinition*\x7f\n\x07JobType\x12\x14\n\x10JOB_TYPE_NOT_SET\x10\x00\x12\r\n\tRUN_MODEL\x10\x01\x12\x0c\n\x08RUN_FLOW\x10\x02\x12\x10\n\x0cIMPORT_MODEL\x10\x03\x12\x0f\n\x0bIMPORT_DATA\x10\x04\x12\x0f\n\x0b\x45XPORT_DATA\x10\x05\x12\r\n\tJOB_GROUP\x10\x06*\xb8\x01\n\rJobStatusCode\x12\x1b\n\x17JOB_STATUS_CODE_NOT_SET\x10\x00\x12\r\n\tPREPARING\x10\x01\x12\r\n\tVALIDATED\x10\x02\x12\x0b\n\x07PENDING\x10\x03\x12\n\n\x06QUEUED\x10\x04\x12\r\n\tSUBMITTED\x10\x05\x12\x0b\n\x07RUNNING\x10\x06\x12\r\n\tFINISHING\x10\x07\x12\r\n\tSUCCEEDED\x10\x08\x12\n\n\x06\x46\x41ILED\x10\t\x12\r\n\tCANCELLED\x10\n*\\\n\x0cJobGroupType\x12\x1a\n\x16JOB_GROUP_TYPE_NOT_SET\x10\x00\x12\x18\n\x14SEQUENTIAL_JOB_GROUP\x10\x01\x12\x16\n\x12PARALLEL_JOB_GROUP\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
20
+ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n0tracdap/rt/_impl/grpc/tracdap/metadata/job.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x37tracdap/rt/_impl/grpc/tracdap/metadata/tag_update.proto\"\xb5\x03\n\rJobDefinition\x12*\n\x07jobType\x18\x01 \x01(\x0e\x32\x19.tracdap.metadata.JobType\x12\x31\n\x08runModel\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.RunModelJobH\x00\x12/\n\x07runFlow\x18\x03 \x01(\x0b\x32\x1c.tracdap.metadata.RunFlowJobH\x00\x12\x37\n\x0bimportModel\x18\x04 \x01(\x0b\x32 .tracdap.metadata.ImportModelJobH\x00\x12\x35\n\nimportData\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.ImportDataJobH\x00\x12\x35\n\nexportData\x18\x06 \x01(\x0b\x32\x1f.tracdap.metadata.ExportDataJobH\x00\x12.\n\x08jobGroup\x18\x07 \x01(\x0b\x32\x1a.tracdap.metadata.JobGroupH\x00\x12/\n\x08resultId\x18\x08 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorB\x0c\n\njobDetails\"\xbe\x01\n\x10ResultDefinition\x12,\n\x05jobId\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x33\n\nstatusCode\x18\x02 \x01(\x0e\x32\x1f.tracdap.metadata.JobStatusCode\x12\x15\n\rstatusMessage\x18\x03 \x01(\t\x12\x30\n\tlogFileId\x18\x04 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\"\xac\x05\n\x0bRunModelJob\x12,\n\x05model\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x41\n\nparameters\x18\x02 \x03(\x0b\x32-.tracdap.metadata.RunModelJob.ParametersEntry\x12\x39\n\x06inputs\x18\x03 \x03(\x0b\x32).tracdap.metadata.RunModelJob.InputsEntry\x12;\n\x07outputs\x18\x04 \x03(\x0b\x32*.tracdap.metadata.RunModelJob.OutputsEntry\x12\x45\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32/.tracdap.metadata.RunModelJob.PriorOutputsEntry\x12\x30\n\x0boutputAttrs\x18\x06 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xae\x06\n\nRunFlowJob\x12+\n\x04\x66low\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12@\n\nparameters\x18\x02 \x03(\x0b\x32,.tracdap.metadata.RunFlowJob.ParametersEntry\x12\x38\n\x06inputs\x18\x03 \x03(\x0b\x32(.tracdap.metadata.RunFlowJob.InputsEntry\x12:\n\x07outputs\x18\x04 \x03(\x0b\x32).tracdap.metadata.RunFlowJob.OutputsEntry\x12\x44\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32..tracdap.metadata.RunFlowJob.PriorOutputsEntry\x12\x38\n\x06models\x18\x06 \x03(\x0b\x32(.tracdap.metadata.RunFlowJob.ModelsEntry\x12\x30\n\x0boutputAttrs\x18\x07 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aL\n\x0bModelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xd7\x01\n\x0eImportModelJob\x12\x10\n\x08language\x18\x01 \x01(\t\x12\x12\n\nrepository\x18\x02 \x01(\t\x12\x19\n\x0cpackageGroup\x18\x07 \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07package\x18\x08 \x01(\t\x12\x0f\n\x07version\x18\x05 \x01(\t\x12\x12\n\nentryPoint\x18\x04 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12/\n\nmodelAttrs\x18\x06 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdateB\x0f\n\r_packageGroup\"\x8d\x07\n\rImportDataJob\x12,\n\x05model\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x43\n\nparameters\x18\x02 \x03(\x0b\x32/.tracdap.metadata.ImportDataJob.ParametersEntry\x12;\n\x06inputs\x18\x03 \x03(\x0b\x32+.tracdap.metadata.ImportDataJob.InputsEntry\x12=\n\x07outputs\x18\x04 \x03(\x0b\x32,.tracdap.metadata.ImportDataJob.OutputsEntry\x12G\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32\x31.tracdap.metadata.ImportDataJob.PriorOutputsEntry\x12\x15\n\rstorageAccess\x18\x06 \x03(\t\x12=\n\x07imports\x18\x07 \x03(\x0b\x32,.tracdap.metadata.ImportDataJob.ImportsEntry\x12\x30\n\x0boutputAttrs\x18\x08 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x12\x30\n\x0bimportAttrs\x18\t \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cImportsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xdb\x06\n\rExportDataJob\x12,\n\x05model\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x43\n\nparameters\x18\x02 \x03(\x0b\x32/.tracdap.metadata.ExportDataJob.ParametersEntry\x12;\n\x06inputs\x18\x03 \x03(\x0b\x32+.tracdap.metadata.ExportDataJob.InputsEntry\x12=\n\x07outputs\x18\x04 \x03(\x0b\x32,.tracdap.metadata.ExportDataJob.OutputsEntry\x12G\n\x0cpriorOutputs\x18\x05 \x03(\x0b\x32\x31.tracdap.metadata.ExportDataJob.PriorOutputsEntry\x12\x15\n\rstorageAccess\x18\x06 \x03(\t\x12=\n\x07\x65xports\x18\x07 \x03(\x0b\x32,.tracdap.metadata.ExportDataJob.ExportsEntry\x12\x30\n\x0boutputAttrs\x18\x08 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x1aJ\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x1aL\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aR\n\x11PriorOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\x1aM\n\x0c\x45xportsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector:\x02\x38\x01\"\xc7\x01\n\x08JobGroup\x12\x34\n\x0cjobGroupType\x18\x01 \x01(\x0e\x32\x1e.tracdap.metadata.JobGroupType\x12:\n\nsequential\x18\x02 \x01(\x0b\x32$.tracdap.metadata.SequentialJobGroupH\x00\x12\x36\n\x08parallel\x18\x03 \x01(\x0b\x32\".tracdap.metadata.ParallelJobGroupH\x00\x42\x11\n\x0fjobGroupDetails\"C\n\x12SequentialJobGroup\x12-\n\x04jobs\x18\x01 \x03(\x0b\x32\x1f.tracdap.metadata.JobDefinition\"A\n\x10ParallelJobGroup\x12-\n\x04jobs\x18\x01 \x03(\x0b\x32\x1f.tracdap.metadata.JobDefinition*\x7f\n\x07JobType\x12\x14\n\x10JOB_TYPE_NOT_SET\x10\x00\x12\r\n\tRUN_MODEL\x10\x01\x12\x0c\n\x08RUN_FLOW\x10\x02\x12\x10\n\x0cIMPORT_MODEL\x10\x03\x12\x0f\n\x0bIMPORT_DATA\x10\x04\x12\x0f\n\x0b\x45XPORT_DATA\x10\x05\x12\r\n\tJOB_GROUP\x10\x06*\xb8\x01\n\rJobStatusCode\x12\x1b\n\x17JOB_STATUS_CODE_NOT_SET\x10\x00\x12\r\n\tPREPARING\x10\x01\x12\r\n\tVALIDATED\x10\x02\x12\x0b\n\x07PENDING\x10\x03\x12\n\n\x06QUEUED\x10\x04\x12\r\n\tSUBMITTED\x10\x05\x12\x0b\n\x07RUNNING\x10\x06\x12\r\n\tFINISHING\x10\x07\x12\r\n\tSUCCEEDED\x10\x08\x12\n\n\x06\x46\x41ILED\x10\t\x12\r\n\tCANCELLED\x10\n*\\\n\x0cJobGroupType\x12\x1a\n\x16JOB_GROUP_TYPE_NOT_SET\x10\x00\x12\x18\n\x14SEQUENTIAL_JOB_GROUP\x10\x01\x12\x16\n\x12PARALLEL_JOB_GROUP\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
21
21
 
22
22
  _globals = globals()
23
23
  _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -63,66 +63,68 @@ if _descriptor._USE_C_DESCRIPTORS == False:
63
63
  _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_options = b'8\001'
64
64
  _globals['_EXPORTDATAJOB_EXPORTSENTRY']._options = None
65
65
  _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_options = b'8\001'
66
- _globals['_JOBTYPE']._serialized_start=4459
67
- _globals['_JOBTYPE']._serialized_end=4586
68
- _globals['_JOBSTATUSCODE']._serialized_start=4589
69
- _globals['_JOBSTATUSCODE']._serialized_end=4773
70
- _globals['_JOBGROUPTYPE']._serialized_start=4775
71
- _globals['_JOBGROUPTYPE']._serialized_end=4867
66
+ _globals['_JOBTYPE']._serialized_start=4701
67
+ _globals['_JOBTYPE']._serialized_end=4828
68
+ _globals['_JOBSTATUSCODE']._serialized_start=4831
69
+ _globals['_JOBSTATUSCODE']._serialized_end=5015
70
+ _globals['_JOBGROUPTYPE']._serialized_start=5017
71
+ _globals['_JOBGROUPTYPE']._serialized_end=5109
72
72
  _globals['_JOBDEFINITION']._serialized_start=235
73
- _globals['_JOBDEFINITION']._serialized_end=623
74
- _globals['_RUNMODELJOB']._serialized_start=626
75
- _globals['_RUNMODELJOB']._serialized_end=1310
76
- _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_start=995
77
- _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_end=1069
78
- _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_start=1071
79
- _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_end=1147
80
- _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_start=1149
81
- _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_end=1226
82
- _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
83
- _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
84
- _globals['_RUNFLOWJOB']._serialized_start=1313
85
- _globals['_RUNFLOWJOB']._serialized_end=2127
86
- _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_start=995
87
- _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_end=1069
88
- _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_start=1071
89
- _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_end=1147
90
- _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_start=1149
91
- _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_end=1226
92
- _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
93
- _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
94
- _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_start=2051
95
- _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_end=2127
96
- _globals['_IMPORTMODELJOB']._serialized_start=2130
97
- _globals['_IMPORTMODELJOB']._serialized_end=2345
98
- _globals['_IMPORTDATAJOB']._serialized_start=2348
99
- _globals['_IMPORTDATAJOB']._serialized_end=3257
100
- _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_start=995
101
- _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1069
102
- _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_start=1071
103
- _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_end=1147
104
- _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1149
105
- _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1226
106
- _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
107
- _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
108
- _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_start=3180
109
- _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_end=3257
110
- _globals['_EXPORTDATAJOB']._serialized_start=3260
111
- _globals['_EXPORTDATAJOB']._serialized_end=4119
112
- _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_start=995
113
- _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1069
114
- _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_start=1071
115
- _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_end=1147
116
- _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1149
117
- _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1226
118
- _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
119
- _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
120
- _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_start=4042
121
- _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_end=4119
122
- _globals['_JOBGROUP']._serialized_start=4122
123
- _globals['_JOBGROUP']._serialized_end=4321
124
- _globals['_SEQUENTIALJOBGROUP']._serialized_start=4323
125
- _globals['_SEQUENTIALJOBGROUP']._serialized_end=4390
126
- _globals['_PARALLELJOBGROUP']._serialized_start=4392
127
- _globals['_PARALLELJOBGROUP']._serialized_end=4457
73
+ _globals['_JOBDEFINITION']._serialized_end=672
74
+ _globals['_RESULTDEFINITION']._serialized_start=675
75
+ _globals['_RESULTDEFINITION']._serialized_end=865
76
+ _globals['_RUNMODELJOB']._serialized_start=868
77
+ _globals['_RUNMODELJOB']._serialized_end=1552
78
+ _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_start=1237
79
+ _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_end=1311
80
+ _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_start=1313
81
+ _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_end=1389
82
+ _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_start=1391
83
+ _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_end=1468
84
+ _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
85
+ _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
86
+ _globals['_RUNFLOWJOB']._serialized_start=1555
87
+ _globals['_RUNFLOWJOB']._serialized_end=2369
88
+ _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_start=1237
89
+ _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_end=1311
90
+ _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_start=1313
91
+ _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_end=1389
92
+ _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_start=1391
93
+ _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_end=1468
94
+ _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
95
+ _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
96
+ _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_start=2293
97
+ _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_end=2369
98
+ _globals['_IMPORTMODELJOB']._serialized_start=2372
99
+ _globals['_IMPORTMODELJOB']._serialized_end=2587
100
+ _globals['_IMPORTDATAJOB']._serialized_start=2590
101
+ _globals['_IMPORTDATAJOB']._serialized_end=3499
102
+ _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_start=1237
103
+ _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1311
104
+ _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_start=1313
105
+ _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_end=1389
106
+ _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1391
107
+ _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1468
108
+ _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
109
+ _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
110
+ _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_start=3422
111
+ _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_end=3499
112
+ _globals['_EXPORTDATAJOB']._serialized_start=3502
113
+ _globals['_EXPORTDATAJOB']._serialized_end=4361
114
+ _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_start=1237
115
+ _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1311
116
+ _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_start=1313
117
+ _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_end=1389
118
+ _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1391
119
+ _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1468
120
+ _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
121
+ _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
122
+ _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_start=4284
123
+ _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_end=4361
124
+ _globals['_JOBGROUP']._serialized_start=4364
125
+ _globals['_JOBGROUP']._serialized_end=4563
126
+ _globals['_SEQUENTIALJOBGROUP']._serialized_start=4565
127
+ _globals['_SEQUENTIALJOBGROUP']._serialized_end=4632
128
+ _globals['_PARALLELJOBGROUP']._serialized_start=4634
129
+ _globals['_PARALLELJOBGROUP']._serialized_end=4699
128
130
  # @@protoc_insertion_point(module_scope)
tracdap/rt/_impl/grpc/tracdap/metadata/job_pb2.pyi CHANGED
@@ -61,7 +61,7 @@ SEQUENTIAL_JOB_GROUP: JobGroupType
61
61
  PARALLEL_JOB_GROUP: JobGroupType
62
62
 
63
63
  class JobDefinition(_message.Message):
64
- __slots__ = ("jobType", "runModel", "runFlow", "importModel", "importData", "exportData", "jobGroup")
64
+ __slots__ = ("jobType", "runModel", "runFlow", "importModel", "importData", "exportData", "jobGroup", "resultId")
65
65
  JOBTYPE_FIELD_NUMBER: _ClassVar[int]
66
66
  RUNMODEL_FIELD_NUMBER: _ClassVar[int]
67
67
  RUNFLOW_FIELD_NUMBER: _ClassVar[int]
@@ -69,6 +69,7 @@ class JobDefinition(_message.Message):
69
69
  IMPORTDATA_FIELD_NUMBER: _ClassVar[int]
70
70
  EXPORTDATA_FIELD_NUMBER: _ClassVar[int]
71
71
  JOBGROUP_FIELD_NUMBER: _ClassVar[int]
72
+ RESULTID_FIELD_NUMBER: _ClassVar[int]
72
73
  jobType: JobType
73
74
  runModel: RunModelJob
74
75
  runFlow: RunFlowJob
@@ -76,7 +77,20 @@ class JobDefinition(_message.Message):
76
77
  importData: ImportDataJob
77
78
  exportData: ExportDataJob
78
79
  jobGroup: JobGroup
79
- def __init__(self, jobType: _Optional[_Union[JobType, str]] = ..., runModel: _Optional[_Union[RunModelJob, _Mapping]] = ..., runFlow: _Optional[_Union[RunFlowJob, _Mapping]] = ..., importModel: _Optional[_Union[ImportModelJob, _Mapping]] = ..., importData: _Optional[_Union[ImportDataJob, _Mapping]] = ..., exportData: _Optional[_Union[ExportDataJob, _Mapping]] = ..., jobGroup: _Optional[_Union[JobGroup, _Mapping]] = ...) -> None: ...
80
+ resultId: _object_id_pb2.TagSelector
81
+ def __init__(self, jobType: _Optional[_Union[JobType, str]] = ..., runModel: _Optional[_Union[RunModelJob, _Mapping]] = ..., runFlow: _Optional[_Union[RunFlowJob, _Mapping]] = ..., importModel: _Optional[_Union[ImportModelJob, _Mapping]] = ..., importData: _Optional[_Union[ImportDataJob, _Mapping]] = ..., exportData: _Optional[_Union[ExportDataJob, _Mapping]] = ..., jobGroup: _Optional[_Union[JobGroup, _Mapping]] = ..., resultId: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ...) -> None: ...
82
+
83
+ class ResultDefinition(_message.Message):
84
+ __slots__ = ("jobId", "statusCode", "statusMessage", "logFileId")
85
+ JOBID_FIELD_NUMBER: _ClassVar[int]
86
+ STATUSCODE_FIELD_NUMBER: _ClassVar[int]
87
+ STATUSMESSAGE_FIELD_NUMBER: _ClassVar[int]
88
+ LOGFILEID_FIELD_NUMBER: _ClassVar[int]
89
+ jobId: _object_id_pb2.TagSelector
90
+ statusCode: JobStatusCode
91
+ statusMessage: str
92
+ logFileId: _object_id_pb2.TagSelector
93
+ def __init__(self, jobId: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., statusCode: _Optional[_Union[JobStatusCode, str]] = ..., statusMessage: _Optional[str] = ..., logFileId: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ...) -> None: ...
80
94
 
81
95
  class RunModelJob(_message.Message):
82
96
  __slots__ = ("model", "parameters", "inputs", "outputs", "priorOutputs", "outputAttrs")
tracdap/rt/_impl/grpc/tracdap/metadata/model_pb2.py CHANGED
@@ -13,10 +13,12 @@ _sym_db = _symbol_database.Default()
13
13
 
14
14
 
15
15
  from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_type__pb2
16
+ 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
16
17
  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
18
+ from tracdap.rt._impl.grpc.tracdap.metadata import file_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_file__pb2
17
19
 
18
20
 
19
- 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\"\xce\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\x12.\n\tmodelType\x18\r \x01(\x0e\x32\x1b.tracdap.metadata.ModelType\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_path*M\n\tModelType\x12\x12\n\x0eSTANDARD_MODEL\x10\x00\x12\x15\n\x11\x44\x41TA_IMPORT_MODEL\x10\x01\x12\x15\n\x11\x44\x41TA_EXPORT_MODEL\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
21
+ 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\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/file.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\"\x8e\x03\n\x10ModelInputSchema\x12\x30\n\nobjectType\x18\x06 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x34\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12.\n\x08\x66ileType\x18\x07 \x01(\x0b\x32\x1a.tracdap.metadata.FileTypeH\x00\x12\x12\n\x05label\x18\x02 \x01(\tH\x01\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\r\n\x0brequirementB\x08\n\x06_label\"\x93\x03\n\x11ModelOutputSchema\x12\x30\n\nobjectType\x18\x06 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x34\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12.\n\x08\x66ileType\x18\x07 \x01(\x0b\x32\x1a.tracdap.metadata.FileTypeH\x00\x12\x12\n\x05label\x18\x02 \x01(\tH\x01\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\r\n\x0brequirementB\x08\n\x06_label\"\xce\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\x12.\n\tmodelType\x18\r \x01(\x0e\x32\x1b.tracdap.metadata.ModelType\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_path*M\n\tModelType\x12\x12\n\x0eSTANDARD_MODEL\x10\x00\x12\x15\n\x11\x44\x41TA_IMPORT_MODEL\x10\x01\x12\x15\n\x11\x44\x41TA_EXPORT_MODEL\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
20
22
 
21
23
  _globals = globals()
22
24
  _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -38,28 +40,28 @@ if _descriptor._USE_C_DESCRIPTORS == False:
38
40
  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_options = b'8\001'
39
41
  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._options = None
40
42
  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_options = b'8\001'
41
- _globals['_MODELTYPE']._serialized_start=1902
42
- _globals['_MODELTYPE']._serialized_end=1979
43
- _globals['_MODELPARAMETER']._serialized_start=175
44
- _globals['_MODELPARAMETER']._serialized_end=474
45
- _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_start=383
46
- _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_end=457
47
- _globals['_MODELINPUTSCHEMA']._serialized_start=477
48
- _globals['_MODELINPUTSCHEMA']._serialized_end=760
49
- _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_start=676
50
- _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_end=750
51
- _globals['_MODELOUTPUTSCHEMA']._serialized_start=763
52
- _globals['_MODELOUTPUTSCHEMA']._serialized_end=1051
53
- _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_start=966
54
- _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_end=1041
55
- _globals['_MODELDEFINITION']._serialized_start=1054
56
- _globals['_MODELDEFINITION']._serialized_end=1900
57
- _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_start=1541
58
- _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_end=1624
59
- _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_start=1626
60
- _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_end=1707
61
- _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_start=1709
62
- _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_end=1792
63
- _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_start=1794
64
- _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_end=1874
43
+ _globals['_MODELTYPE']._serialized_start=2239
44
+ _globals['_MODELTYPE']._serialized_end=2316
45
+ _globals['_MODELPARAMETER']._serialized_start=282
46
+ _globals['_MODELPARAMETER']._serialized_end=581
47
+ _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_start=490
48
+ _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_end=564
49
+ _globals['_MODELINPUTSCHEMA']._serialized_start=584
50
+ _globals['_MODELINPUTSCHEMA']._serialized_end=982
51
+ _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_start=883
52
+ _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_end=957
53
+ _globals['_MODELOUTPUTSCHEMA']._serialized_start=985
54
+ _globals['_MODELOUTPUTSCHEMA']._serialized_end=1388
55
+ _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_start=1288
56
+ _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_end=1363
57
+ _globals['_MODELDEFINITION']._serialized_start=1391
58
+ _globals['_MODELDEFINITION']._serialized_end=2237
59
+ _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_start=1878
60
+ _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_end=1961
61
+ _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_start=1963
62
+ _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_end=2044
63
+ _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_start=2046
64
+ _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_end=2129
65
+ _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_start=2131
66
+ _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_end=2211
65
67
  # @@protoc_insertion_point(module_scope)
tracdap/rt/_impl/grpc/tracdap/metadata/model_pb2.pyi CHANGED
@@ -1,5 +1,7 @@
1
1
  from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as _type_pb2
2
+ from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as _object_id_pb2
2
3
  from tracdap.rt._impl.grpc.tracdap.metadata import data_pb2 as _data_pb2
4
+ from tracdap.rt._impl.grpc.tracdap.metadata import file_pb2 as _file_pb2
3
5
  from google.protobuf.internal import containers as _containers
4
6
  from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
5
7
  from google.protobuf import descriptor as _descriptor
@@ -37,7 +39,7 @@ class ModelParameter(_message.Message):
37
39
  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: ...
38
40
 
39
41
  class ModelInputSchema(_message.Message):
40
- __slots__ = ("schema", "label", "optional", "dynamic", "inputProps")
42
+ __slots__ = ("objectType", "schema", "fileType", "label", "optional", "dynamic", "inputProps")
41
43
  class InputPropsEntry(_message.Message):
42
44
  __slots__ = ("key", "value")
43
45
  KEY_FIELD_NUMBER: _ClassVar[int]
@@ -45,20 +47,24 @@ class ModelInputSchema(_message.Message):
45
47
  key: str
46
48
  value: _type_pb2.Value
47
49
  def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
50
+ OBJECTTYPE_FIELD_NUMBER: _ClassVar[int]
48
51
  SCHEMA_FIELD_NUMBER: _ClassVar[int]
52
+ FILETYPE_FIELD_NUMBER: _ClassVar[int]
49
53
  LABEL_FIELD_NUMBER: _ClassVar[int]
50
54
  OPTIONAL_FIELD_NUMBER: _ClassVar[int]
51
55
  DYNAMIC_FIELD_NUMBER: _ClassVar[int]
52
56
  INPUTPROPS_FIELD_NUMBER: _ClassVar[int]
57
+ objectType: _object_id_pb2.ObjectType
53
58
  schema: _data_pb2.SchemaDefinition
59
+ fileType: _file_pb2.FileType
54
60
  label: str
55
61
  optional: bool
56
62
  dynamic: bool
57
63
  inputProps: _containers.MessageMap[str, _type_pb2.Value]
58
- 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: ...
64
+ def __init__(self, objectType: _Optional[_Union[_object_id_pb2.ObjectType, str]] = ..., schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., fileType: _Optional[_Union[_file_pb2.FileType, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., dynamic: bool = ..., inputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
59
65
 
60
66
  class ModelOutputSchema(_message.Message):
61
- __slots__ = ("schema", "label", "optional", "dynamic", "outputProps")
67
+ __slots__ = ("objectType", "schema", "fileType", "label", "optional", "dynamic", "outputProps")
62
68
  class OutputPropsEntry(_message.Message):
63
69
  __slots__ = ("key", "value")
64
70
  KEY_FIELD_NUMBER: _ClassVar[int]
@@ -66,17 +72,21 @@ class ModelOutputSchema(_message.Message):
66
72
  key: str
67
73
  value: _type_pb2.Value
68
74
  def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
75
+ OBJECTTYPE_FIELD_NUMBER: _ClassVar[int]
69
76
  SCHEMA_FIELD_NUMBER: _ClassVar[int]
77
+ FILETYPE_FIELD_NUMBER: _ClassVar[int]
70
78
  LABEL_FIELD_NUMBER: _ClassVar[int]
71
79
  OPTIONAL_FIELD_NUMBER: _ClassVar[int]
72
80
  DYNAMIC_FIELD_NUMBER: _ClassVar[int]
73
81
  OUTPUTPROPS_FIELD_NUMBER: _ClassVar[int]
82
+ objectType: _object_id_pb2.ObjectType
74
83
  schema: _data_pb2.SchemaDefinition
84
+ fileType: _file_pb2.FileType
75
85
  label: str
76
86
  optional: bool
77
87
  dynamic: bool
78
88
  outputProps: _containers.MessageMap[str, _type_pb2.Value]
79
- 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: ...
89
+ def __init__(self, objectType: _Optional[_Union[_object_id_pb2.ObjectType, str]] = ..., schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., fileType: _Optional[_Union[_file_pb2.FileType, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., dynamic: bool = ..., outputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
80
90
 
81
91
  class ModelDefinition(_message.Message):
82
92
  __slots__ = ("language", "repository", "packageGroup", "package", "version", "entryPoint", "path", "parameters", "inputs", "outputs", "staticAttributes", "modelType")
tracdap/rt/_impl/grpc/tracdap/metadata/object_id_pb2.py CHANGED
@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
15
15
  from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_type__pb2
16
16
 
17
17
 
18
- DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n6tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\x98\x02\n\tTagHeader\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x15\n\robjectVersion\x18\x03 \x01(\x05\x12\x38\n\x0fobjectTimestamp\x18\x04 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x12\n\ntagVersion\x18\x05 \x01(\x05\x12\x35\n\x0ctagTimestamp\x18\x06 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x16\n\x0eisLatestObject\x18\x07 \x01(\x08\x12\x13\n\x0bisLatestTag\x18\x08 \x01(\x08\"\xb9\x02\n\x0bTagSelector\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x16\n\x0clatestObject\x18\x03 \x01(\x08H\x00\x12\x17\n\robjectVersion\x18\x04 \x01(\x05H\x00\x12\x35\n\nobjectAsOf\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x00\x12\x13\n\tlatestTag\x18\x06 \x01(\x08H\x01\x12\x14\n\ntagVersion\x18\x07 \x01(\x05H\x01\x12\x32\n\x07tagAsOf\x18\x08 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x01\x42\x10\n\x0eobjectCriteriaB\r\n\x0btagCriteria*|\n\nObjectType\x12\x17\n\x13OBJECT_TYPE_NOT_SET\x10\x00\x12\x08\n\x04\x44\x41TA\x10\x01\x12\t\n\x05MODEL\x10\x02\x12\x08\n\x04\x46LOW\x10\x03\x12\x07\n\x03JOB\x10\x04\x12\x08\n\x04\x46ILE\x10\x05\x12\n\n\x06\x43USTOM\x10\x06\x12\x0b\n\x07STORAGE\x10\x07\x12\n\n\x06SCHEMA\x10\x08\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
18
+ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n6tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\x98\x02\n\tTagHeader\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x15\n\robjectVersion\x18\x03 \x01(\x05\x12\x38\n\x0fobjectTimestamp\x18\x04 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x12\n\ntagVersion\x18\x05 \x01(\x05\x12\x35\n\x0ctagTimestamp\x18\x06 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x16\n\x0eisLatestObject\x18\x07 \x01(\x08\x12\x13\n\x0bisLatestTag\x18\x08 \x01(\x08\"\xb9\x02\n\x0bTagSelector\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x16\n\x0clatestObject\x18\x03 \x01(\x08H\x00\x12\x17\n\robjectVersion\x18\x04 \x01(\x05H\x00\x12\x35\n\nobjectAsOf\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x00\x12\x13\n\tlatestTag\x18\x06 \x01(\x08H\x01\x12\x14\n\ntagVersion\x18\x07 \x01(\x05H\x01\x12\x32\n\x07tagAsOf\x18\x08 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x01\x42\x10\n\x0eobjectCriteriaB\r\n\x0btagCriteria*\x88\x01\n\nObjectType\x12\x17\n\x13OBJECT_TYPE_NOT_SET\x10\x00\x12\x08\n\x04\x44\x41TA\x10\x01\x12\t\n\x05MODEL\x10\x02\x12\x08\n\x04\x46LOW\x10\x03\x12\x07\n\x03JOB\x10\x04\x12\x08\n\x04\x46ILE\x10\x05\x12\n\n\x06\x43USTOM\x10\x06\x12\x0b\n\x07STORAGE\x10\x07\x12\n\n\x06SCHEMA\x10\x08\x12\n\n\x06RESULT\x10\tB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
19
19
 
20
20
  _globals = globals()
21
21
  _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -23,8 +23,8 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.rt._impl.grpc.tracd
23
23
  if _descriptor._USE_C_DESCRIPTORS == False:
24
24
  _globals['DESCRIPTOR']._options = None
25
25
  _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
26
- _globals['_OBJECTTYPE']._serialized_start=726
27
- _globals['_OBJECTTYPE']._serialized_end=850
26
+ _globals['_OBJECTTYPE']._serialized_start=727
27
+ _globals['_OBJECTTYPE']._serialized_end=863
28
28
  _globals['_TAGHEADER']._serialized_start=128
29
29
  _globals['_TAGHEADER']._serialized_end=408
30
30
  _globals['_TAGSELECTOR']._serialized_start=411
tracdap/rt/_impl/grpc/tracdap/metadata/object_id_pb2.pyi CHANGED
@@ -17,6 +17,7 @@ class ObjectType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
17
17
  CUSTOM: _ClassVar[ObjectType]
18
18
  STORAGE: _ClassVar[ObjectType]
19
19
  SCHEMA: _ClassVar[ObjectType]
20
+ RESULT: _ClassVar[ObjectType]
20
21
  OBJECT_TYPE_NOT_SET: ObjectType
21
22
  DATA: ObjectType
22
23
  MODEL: ObjectType
@@ -26,6 +27,7 @@ FILE: ObjectType
26
27
  CUSTOM: ObjectType
27
28
  STORAGE: ObjectType
28
29
  SCHEMA: ObjectType
30
+ RESULT: ObjectType
29
31
 
30
32
  class TagHeader(_message.Message):
31
33
  __slots__ = ("objectType", "objectId", "objectVersion", "objectTimestamp", "tagVersion", "tagTimestamp", "isLatestObject", "isLatestTag")