tracdap-runtime 0.8.0b1__py3-none-any.whl → 0.8.0b2__py3-none-any.whl

tracdap/rt/_exec/functions.py

@@ -13,11 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from __future__ import annotations
-
 import copy
 import datetime
 import abc
+import pathlib
 import random
 import dataclasses as dc  # noqa
 
@@ -29,6 +28,7 @@ import tracdap.rt._exec.graph_builder as _graph
 import tracdap.rt._impl.config_parser as _cfg_p  # noqa
 import tracdap.rt._impl.type_system as _types  # noqa
 import tracdap.rt._impl.data as _data  # noqa
+import tracdap.rt._impl.logging as _logging  # noqa
 import tracdap.rt._impl.storage as _storage  # noqa
 import tracdap.rt._impl.models as _models  # noqa
 import tracdap.rt._impl.util as _util  # noqa
@@ -228,11 +228,22 @@ class BuildJobResultFunc(NodeFunction[_config.JobResult]):
         job_result.jobId = self.node.job_id
         job_result.statusCode = meta.JobStatusCode.SUCCEEDED
 
+        if self.node.result_id is not None:
+
+            result_def = meta.ResultDefinition()
+            result_def.jobId = _util.selector_for(self.node.job_id)
+            result_def.statusCode = meta.JobStatusCode.SUCCEEDED
+
+            result_key = _util.object_key(self.node.result_id)
+            result_obj = meta.ObjectDefinition(objectType=meta.ObjectType.RESULT, result=result_def)
+
+            job_result.results[result_key] = result_obj
+
         # TODO: Handle individual failed results
 
-        for obj_id, node_id in self.node.outputs.objects.items():
+        for obj_key, node_id in self.node.outputs.objects.items():
             obj_def = _ctx_lookup(node_id, ctx)
-            job_result.results[obj_id] = obj_def
+            job_result.results[obj_key] = obj_def
 
         for bundle_id in self.node.outputs.bundles:
             bundle = _ctx_lookup(bundle_id, ctx)
@@ -242,9 +253,9 @@ class BuildJobResultFunc(NodeFunction[_config.JobResult]):
 
             runtime_outputs = _ctx_lookup(self.node.runtime_outputs, ctx)
 
-            for obj_id, node_id in runtime_outputs.objects.items():
+            for obj_key, node_id in runtime_outputs.objects.items():
                 obj_def = _ctx_lookup(node_id, ctx)
-                job_result.results[obj_id] = obj_def
+                job_result.results[obj_key] = obj_def
 
             for bundle_id in runtime_outputs.bundles:
                 bundle = _ctx_lookup(bundle_id, ctx)
@@ -253,37 +264,6 @@ class BuildJobResultFunc(NodeFunction[_config.JobResult]):
         return job_result
 
 
-class SaveJobResultFunc(NodeFunction[None]):
-
-    def __init__(self, node: SaveJobResultNode):
-        super().__init__()
-        self.node = node
-
-    def _execute(self, ctx: NodeContext) -> None:
-
-        job_result = _ctx_lookup(self.node.job_result_id, ctx)
-
-        if not self.node.result_spec.save_result:
-            return None
-
-        job_result_format = self.node.result_spec.result_format
-        job_result_str = _cfg_p.ConfigQuoter.quote(job_result, job_result_format)
-        job_result_bytes = bytes(job_result_str, "utf-8")
-
-        job_key = _util.object_key(job_result.jobId)
-        job_result_file = f"job_result_{job_key}.{self.node.result_spec.result_format}"
-        job_result_path = pathlib \
-            .Path(self.node.result_spec.result_dir) \
-            .joinpath(job_result_file)
-
-        _util.logger_for_object(self).info(f"Saving job result to [{job_result_path}]")
-
-        with open(job_result_path, "xb") as result_stream:
-            result_stream.write(job_result_bytes)
-
-        return None
-
-
 class DataViewFunc(NodeFunction[_data.DataView]):
 
     def __init__(self, node: DataViewNode):
@@ -633,8 +613,6 @@ class ImportModelFunc(NodeFunction[meta.ObjectDefinition]):
         self.node = node
         self._models = models
 
-        self._log = _util.logger_for_object(self)
-
     def _execute(self, ctx: NodeContext) -> meta.ObjectDefinition:
 
         model_stub = _model_def_for_import(self.node.import_details)
@@ -651,13 +629,15 @@ class RunModelFunc(NodeFunction[Bundle[_data.DataView]]):
             self, node: RunModelNode,
             model_class: _api.TracModel.__class__,
             checkout_directory: pathlib.Path,
-            storage_manager: _storage.StorageManager):
+            storage_manager: _storage.StorageManager,
+            log_provider: _logging.LogProvider):
 
         super().__init__()
         self.node = node
         self.model_class = model_class
         self.checkout_directory = checkout_directory
         self.storage_manager = storage_manager
+        self.log_provider = log_provider
 
     def _execute(self, ctx: NodeContext) -> Bundle[_data.DataView]:
 
@@ -684,7 +664,7 @@ class RunModelFunc(NodeFunction[Bundle[_data.DataView]]):
             for storage_key in self.node.storage_access:
                 if self.storage_manager.has_file_storage(storage_key, external=True):
                     storage_impl = self.storage_manager.get_file_storage(storage_key, external=True)
-                    storage = _ctx.TracFileStorageImpl(storage_key, storage_impl, write_access, self.checkout_directory)
+                    storage = _ctx.TracFileStorageImpl(storage_key, storage_impl, write_access, self.checkout_directory, self.log_provider)
                     storage_map[storage_key] = storage
                 elif self.storage_manager.has_data_storage(storage_key, external=True):
                     storage_impl = self.storage_manager.get_data_storage(storage_key, external=True)
@@ -692,7 +672,7 @@ class RunModelFunc(NodeFunction[Bundle[_data.DataView]]):
                     if not isinstance(storage_impl, _storage.IDataStorageBase):
                         raise _ex.EStorageConfig(f"External storage for [{storage_key}] is using the legacy storage framework]")
                     converter = _data.DataConverter.noop()
-                    storage = _ctx.TracDataStorageImpl(storage_key, storage_impl, converter, write_access, self.checkout_directory)
+                    storage = _ctx.TracDataStorageImpl(storage_key, storage_impl, converter, write_access, self.checkout_directory, self.log_provider)
                     storage_map[storage_key] = storage
                 else:
                     raise _ex.EStorageConfig(f"External storage is not available: [{storage_key}]")
@@ -704,12 +684,12 @@ class RunModelFunc(NodeFunction[Bundle[_data.DataView]]):
             trac_ctx = _ctx.TracDataContextImpl(
                 self.node.model_def, self.model_class,
                 local_ctx, dynamic_outputs, storage_map,
-                self.checkout_directory)
+                self.checkout_directory, self.log_provider)
         else:
             trac_ctx = _ctx.TracContextImpl(
                 self.node.model_def, self.model_class,
                 local_ctx, dynamic_outputs,
-                self.checkout_directory)
+                self.checkout_directory, self.log_provider)
 
         try:
             model = self.model_class()
@@ -812,9 +792,10 @@ class FunctionResolver:
 
     __ResolveFunc = tp.Callable[['FunctionResolver', Node[_T]], NodeFunction[_T]]
 
-    def __init__(self, models: _models.ModelLoader, storage: _storage.StorageManager):
+    def __init__(self, models: _models.ModelLoader, storage: _storage.StorageManager, log_provider: _logging.LogProvider):
         self._models = models
         self._storage = storage
+        self._log_provider = log_provider
 
     def resolve_node(self, node: Node[_T]) -> NodeFunction[_T]:
 
@@ -850,7 +831,7 @@ class FunctionResolver:
         checkout_directory = self._models.model_load_checkout_directory(node.model_scope, node.model_def)
         storage_manager = self._storage if node.storage_access else None
 
-        return RunModelFunc(node, model_class, checkout_directory, storage_manager)
+        return RunModelFunc(node, model_class, checkout_directory, storage_manager, self._log_provider)
 
     __basic_node_mapping: tp.Dict[Node.__class__, NodeFunction.__class__] = {
 
@@ -861,7 +842,6 @@ class FunctionResolver:
         DataViewNode: DataViewFunc,
         DataItemNode: DataItemFunc,
         BuildJobResultNode: BuildJobResultFunc,
-        SaveJobResultNode: SaveJobResultFunc,
         DataResultNode: DataResultFunc,
         StaticValueNode: StaticValueFunc,
         RuntimeOutputsNode: RuntimeOutputsFunc,

tracdap/rt/_exec/graph.py

@@ -13,7 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import pathlib
 import typing as tp
 import dataclasses as dc
 
@@ -182,15 +181,6 @@ class JobOutputs:
     bundles: tp.List[NodeId[ObjectBundle]] = dc.field(default_factory=list)
 
 
-# TODO: Where does this go?
-@dc.dataclass(frozen=True)
-class JobResultSpec:
-
-    save_result: bool = False
-    result_dir: tp.Union[str, pathlib.Path] = None
-    result_format: str = None
-
-
 # ----------------------------------------------------------------------------------------------------------------------
 #  NODE DEFINITIONS
 # ----------------------------------------------------------------------------------------------------------------------
@@ -402,6 +392,7 @@ class RuntimeOutputsNode(Node[JobOutputs]):
 @_node_type
 class BuildJobResultNode(Node[cfg.JobResult]):
 
+    result_id: meta.TagHeader
     job_id: meta.TagHeader
 
     outputs: JobOutputs
@@ -414,16 +405,6 @@ class BuildJobResultNode(Node[cfg.JobResult]):
         return {node_id: DependencyType.HARD for node_id in dep_ids}
 
 
-@_node_type
-class SaveJobResultNode(Node[None]):
-
-    job_result_id: NodeId[cfg.JobResult]
-    result_spec: JobResultSpec
-
-    def _node_dependencies(self) -> tp.Dict[NodeId, DependencyType]:
-        return {self.job_result_id: DependencyType.HARD}
-
-
 @_node_type
 class ChildJobNode(Node[cfg.JobResult]):
 

tracdap/rt/_exec/graph_builder.py

@@ -35,11 +35,10 @@ class GraphBuilder:
 
     __JOB_BUILD_FUNC = tp.Callable[[meta.JobDefinition, NodeId], GraphSection]
 
-    def __init__(self, sys_config: config.RuntimeConfig, job_config: config.JobConfig, result_spec: JobResultSpec):
+    def __init__(self, sys_config: config.RuntimeConfig, job_config: config.JobConfig):
 
         self._sys_config = sys_config
         self._job_config = job_config
-        self._result_spec = result_spec
 
         self._job_key = _util.object_key(job_config.jobId)
         self._job_namespace = NodeNamespace(self._job_key)
@@ -48,7 +47,7 @@ class GraphBuilder:
 
     def _child_builder(self, job_id: meta.TagHeader) -> "GraphBuilder":
 
-        builder = GraphBuilder(self._sys_config, self._job_config, JobResultSpec(save_result=False))
+        builder = GraphBuilder(self._sys_config, self._job_config)
         builder._job_key = _util.object_key(job_id)
         builder._job_namespace = NodeNamespace(builder._job_key)
 
@@ -585,6 +584,27 @@ class GraphBuilder:
             file_key=resolved_output_key,
             storage_key=resolved_storage_key)
 
+    @classmethod
+    def build_output_file_and_storage(cls, output_key, file_type: meta.FileType, sys_config: cfg.RuntimeConfig, job_config: cfg.JobConfig):
+
+        # TODO: Review and de-dupe building of output metadata
+        # Responsibility for assigning outputs could perhaps move from orchestrator to runtime
+
+        output_storage_key = f"{output_key}:STORAGE"
+
+        output_id = job_config.resultMapping[output_key]
+        output_storage_id = job_config.resultMapping[output_storage_key]
+
+        timestamp = _dt.datetime.fromisoformat(output_id.objectTimestamp.isoDatetime)
+        data_item = f"file/{output_id.objectId}/version-{output_id.objectVersion}"
+        storage_key = sys_config.storage.defaultBucket
+        storage_path = f"file/FILE-{output_id.objectId}/version-{output_id.objectVersion}/{output_key}.{file_type.extension}"
+
+        file_def = cls.build_file_def(output_key, file_type, output_storage_id, data_item)
+        storage_def = cls.build_storage_def(data_item, storage_key, storage_path, file_type.mimeType, timestamp)
+
+        return file_def, storage_def
+
     @classmethod
     def build_runtime_outputs(cls, output_names: tp.List[str], job_namespace: NodeNamespace):
 
@@ -693,15 +713,16 @@ class GraphBuilder:
             explicit_deps: tp.Optional[tp.List[NodeId]] = None) \
             -> GraphSection:
 
-        build_result_id = NodeId.of("trac_job_result", self._job_namespace, cfg.JobResult)
+        result_id = self._job_config.resultMapping.get("trac_job_result")
+        result_node_id = NodeId.of("trac_job_result", self._job_namespace, cfg.JobResult)
 
         if objects is not None:
 
             results_inputs = set(objects.values())
 
             build_result_node = BuildJobResultNode(
-                build_result_id, self._job_config.jobId,
-                outputs = JobOutputs(objects=objects),
+                result_node_id, result_id, self._job_config.jobId,
+                outputs=JobOutputs(objects=objects),
                 explicit_deps=explicit_deps)
 
         elif bundles is not None:
@@ -709,23 +730,16 @@ class GraphBuilder:
             results_inputs = set(bundles)
 
             build_result_node = BuildJobResultNode(
-                build_result_id, self._job_config.jobId,
-                outputs = JobOutputs(bundles=bundles),
+                result_node_id, result_id, self._job_config.jobId,
+                outputs=JobOutputs(bundles=bundles),
                 explicit_deps=explicit_deps)
 
         else:
             raise _ex.EUnexpected()
 
-        if self._result_spec.save_result:
-            save_result_id = NodeId("trac_save_result", self._job_namespace)
-            save_result_node = SaveJobResultNode(save_result_id, build_result_id, self._result_spec)
-            result_nodes = {build_result_id: build_result_node, save_result_id: save_result_node}
-            job_result_id = save_result_id
-        else:
-            result_nodes = {build_result_id: build_result_node}
-            job_result_id = build_result_id
+        result_nodes = {result_node_id: build_result_node}
 
-        return GraphSection(result_nodes, inputs=results_inputs, must_run=[job_result_id])
+        return GraphSection(result_nodes, inputs=results_inputs, must_run=[result_node_id])
 
     def build_model_or_flow_with_context(
             self, namespace: NodeNamespace, model_or_flow_name: str,

tracdap/rt/_exec/runtime.py

@@ -33,11 +33,12 @@ import tracdap.rt._exec.actors as _actors
 import tracdap.rt._exec.engine as _engine
 import tracdap.rt._exec.dev_mode as _dev_mode
 import tracdap.rt._impl.config_parser as _cparse  # noqa
-import tracdap.rt._impl.util as _util  # noqa
+import tracdap.rt._impl.guard_rails as _guard  # noqa
+import tracdap.rt._impl.logging as _log  # noqa
 import tracdap.rt._impl.models as _models  # noqa
 import tracdap.rt._impl.storage as _storage  # noqa
 import tracdap.rt._impl.static_api as _static_api  # noqa
-import tracdap.rt._impl.guard_rails as _guard  # noqa
+import tracdap.rt._impl.util as _util  # noqa
 import tracdap.rt._version as _version
 
 
@@ -83,8 +84,8 @@ class TracRuntime:
         if isinstance(scratch_dir, str):
             scratch_dir = pathlib.Path(scratch_dir)
 
-        _util.configure_logging()
-        self._log = _util.logger_for_object(self)
+        _log.configure_logging()
+        self._log = _log.logger_for_object(self)
         self._log.info(f"TRAC D.A.P. Python Runtime {trac_version}")
 
         self._sys_config = sys_config if isinstance(sys_config, _cfg.RuntimeConfig) else None

tracdap/rt/_exec/server.py

@@ -21,6 +21,7 @@ import tracdap.rt.config as config
 import tracdap.rt.exceptions as ex
 import tracdap.rt._exec.actors as actors
 import tracdap.rt._impl.grpc.codec as codec  # noqa
+import tracdap.rt._impl.logging as logging  # noqa
 import tracdap.rt._impl.util as util  # noqa
 
 # Check whether gRPC is installed before trying to load any of the generated modules
@@ -44,7 +45,7 @@ class RuntimeApiServer(runtime_grpc.TracRuntimeApiServicer):
 
     def __init__(self, system: actors.ActorSystem, port: int):
 
-        self.__log = util.logger_for_object(self)
+        self.__log = logging.logger_for_object(self)
 
         self.__system = system
         self.__engine_id = system.main_id()
@@ -158,7 +159,7 @@ class ApiAgent(actors.ThreadsafeActor):
 
     def __init__(self):
         super().__init__()
-        self._log = util.logger_for_object(self)
+        self._log = logging.logger_for_object(self)
         self._event_loop = asyncio.get_event_loop()
         self.__start_signal = asyncio.Event()
 
@@ -258,7 +259,7 @@ class ApiRequest(actors.ThreadsafeActor, tp.Generic[_T_REQUEST, _T_RESPONSE]):
             self.threadsafe().stop()
 
 
-ApiRequest._log = util.logger_for_class(ApiRequest)
+ApiRequest._log = logging.logger_for_class(ApiRequest)
 
 
 class ListJobsRequest(ApiRequest[runtime_pb2.RuntimeListJobsRequest, runtime_pb2.RuntimeListJobsResponse]):

tracdap/rt/_impl/config_parser.py

@@ -32,6 +32,7 @@ import tracdap.rt.config as _config
 import tracdap.rt.exceptions as _ex
 import tracdap.rt.ext.plugins as _plugins
 import tracdap.rt.ext.config as _config_ext
+import tracdap.rt._impl.logging as _logging
 import tracdap.rt._impl.util as _util
 
 import yaml
@@ -103,7 +104,7 @@ class ConfigManager:
             return raw_url
 
     def __init__(self, root_dir_url: _urlp.ParseResult, root_file_url: tp.Optional[_urlp.ParseResult]):
-        self._log = _util.logger_for_object(self)
+        self._log = _logging.logger_for_object(self)
         self._root_dir_url = root_dir_url
         self._root_file_url = root_file_url
 
@@ -294,7 +295,7 @@ class ConfigParser(tp.Generic[_T]):
     }
 
     def __init__(self, config_class: _T.__class__, dev_mode_locations: tp.List[str] = None):
-        self._log = _util.logger_for_object(self)
+        self._log = _logging.logger_for_object(self)
         self._config_class = config_class
         self._dev_mode_locations = dev_mode_locations or []
         self._errors = []

tracdap/rt/_impl/data.py

@@ -37,7 +37,7 @@ except ModuleNotFoundError:
 import tracdap.rt.api.experimental as _api
 import tracdap.rt.metadata as _meta
 import tracdap.rt.exceptions as _ex
-import tracdap.rt._impl.util as _util
+import tracdap.rt._impl.logging as _log
 
 
 @dc.dataclass(frozen=True)
@@ -188,7 +188,7 @@ class DataMapping:
     :py:class:`TypeMapping <tracdap.rt.impl.type_system.MetadataCodec>`.
     """
 
-    __log = _util.logger_for_namespace(_DataInternal.__module__ + ".DataMapping")
+    __log = _log.logger_for_namespace(_DataInternal.__module__ + ".DataMapping")
 
     # Matches TRAC_ARROW_TYPE_MAPPING in ArrowSchema, tracdap-lib-data
 
@@ -715,7 +715,7 @@ class DataConformance:
     Check and/or apply conformance between datasets and schemas.
     """
 
-    __log = _util.logger_for_namespace(_DataInternal.__module__ + ".DataConformance")
+    __log = _log.logger_for_namespace(_DataInternal.__module__ + ".DataConformance")
 
     __E_FIELD_MISSING = \
         "Field [{field_name}] is missing from the data"

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

@@ -17,7 +17,7 @@ from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as tracdap_dot_
 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
 
 
-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')
+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')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -63,66 +63,68 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_options = b'8\001'
   _globals['_EXPORTDATAJOB_EXPORTSENTRY']._options = None
   _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_options = b'8\001'
-  _globals['_JOBTYPE']._serialized_start=4459
-  _globals['_JOBTYPE']._serialized_end=4586
-  _globals['_JOBSTATUSCODE']._serialized_start=4589
-  _globals['_JOBSTATUSCODE']._serialized_end=4773
-  _globals['_JOBGROUPTYPE']._serialized_start=4775
-  _globals['_JOBGROUPTYPE']._serialized_end=4867
+  _globals['_JOBTYPE']._serialized_start=4701
+  _globals['_JOBTYPE']._serialized_end=4828
+  _globals['_JOBSTATUSCODE']._serialized_start=4831
+  _globals['_JOBSTATUSCODE']._serialized_end=5015
+  _globals['_JOBGROUPTYPE']._serialized_start=5017
+  _globals['_JOBGROUPTYPE']._serialized_end=5109
   _globals['_JOBDEFINITION']._serialized_start=235
-  _globals['_JOBDEFINITION']._serialized_end=623
-  _globals['_RUNMODELJOB']._serialized_start=626
-  _globals['_RUNMODELJOB']._serialized_end=1310
-  _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_start=995
-  _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_end=1069
-  _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_start=1071
-  _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_end=1147
-  _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_start=1149
-  _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_end=1226
-  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
-  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
-  _globals['_RUNFLOWJOB']._serialized_start=1313
-  _globals['_RUNFLOWJOB']._serialized_end=2127
-  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_start=995
-  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_end=1069
-  _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_start=1071
-  _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_end=1147
-  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_start=1149
-  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_end=1226
-  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
-  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
-  _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_start=2051
-  _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_end=2127
-  _globals['_IMPORTMODELJOB']._serialized_start=2130
-  _globals['_IMPORTMODELJOB']._serialized_end=2345
-  _globals['_IMPORTDATAJOB']._serialized_start=2348
-  _globals['_IMPORTDATAJOB']._serialized_end=3257
-  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_start=995
-  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1069
-  _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_start=1071
-  _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_end=1147
-  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1149
-  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1226
-  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
-  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
-  _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_start=3180
-  _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_end=3257
-  _globals['_EXPORTDATAJOB']._serialized_start=3260
-  _globals['_EXPORTDATAJOB']._serialized_end=4119
-  _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_start=995
-  _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1069
-  _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_start=1071
-  _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_end=1147
-  _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1149
-  _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1226
-  _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1228
-  _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1310
-  _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_start=4042
-  _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_end=4119
-  _globals['_JOBGROUP']._serialized_start=4122
-  _globals['_JOBGROUP']._serialized_end=4321
-  _globals['_SEQUENTIALJOBGROUP']._serialized_start=4323
-  _globals['_SEQUENTIALJOBGROUP']._serialized_end=4390
-  _globals['_PARALLELJOBGROUP']._serialized_start=4392
-  _globals['_PARALLELJOBGROUP']._serialized_end=4457
+  _globals['_JOBDEFINITION']._serialized_end=672
+  _globals['_RESULTDEFINITION']._serialized_start=675
+  _globals['_RESULTDEFINITION']._serialized_end=865
+  _globals['_RUNMODELJOB']._serialized_start=868
+  _globals['_RUNMODELJOB']._serialized_end=1552
+  _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_start=1237
+  _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_end=1311
+  _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_start=1313
+  _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_end=1389
+  _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_start=1391
+  _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_end=1468
+  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
+  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
+  _globals['_RUNFLOWJOB']._serialized_start=1555
+  _globals['_RUNFLOWJOB']._serialized_end=2369
+  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_start=1237
+  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_end=1311
+  _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_start=1313
+  _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_end=1389
+  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_start=1391
+  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_end=1468
+  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
+  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
+  _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_start=2293
+  _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_end=2369
+  _globals['_IMPORTMODELJOB']._serialized_start=2372
+  _globals['_IMPORTMODELJOB']._serialized_end=2587
+  _globals['_IMPORTDATAJOB']._serialized_start=2590
+  _globals['_IMPORTDATAJOB']._serialized_end=3499
+  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_start=1237
+  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1311
+  _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_start=1313
+  _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_end=1389
+  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1391
+  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1468
+  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
+  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
+  _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_start=3422
+  _globals['_IMPORTDATAJOB_IMPORTSENTRY']._serialized_end=3499
+  _globals['_EXPORTDATAJOB']._serialized_start=3502
+  _globals['_EXPORTDATAJOB']._serialized_end=4361
+  _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_start=1237
+  _globals['_EXPORTDATAJOB_PARAMETERSENTRY']._serialized_end=1311
+  _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_start=1313
+  _globals['_EXPORTDATAJOB_INPUTSENTRY']._serialized_end=1389
+  _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1391
+  _globals['_EXPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1468
+  _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=1470
+  _globals['_EXPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=1552
+  _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_start=4284
+  _globals['_EXPORTDATAJOB_EXPORTSENTRY']._serialized_end=4361
+  _globals['_JOBGROUP']._serialized_start=4364
+  _globals['_JOBGROUP']._serialized_end=4563
+  _globals['_SEQUENTIALJOBGROUP']._serialized_start=4565
+  _globals['_SEQUENTIALJOBGROUP']._serialized_end=4632
+  _globals['_PARALLELJOBGROUP']._serialized_start=4634
+  _globals['_PARALLELJOBGROUP']._serialized_end=4699
 # @@protoc_insertion_point(module_scope)