tracdap-runtime 0.12.0.dev2__tar.gz → 0.12.0.dev3__tar.gz

{tracdap_runtime-0.12.0.dev2/tracdap_runtime.egg-info → tracdap_runtime-0.12.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tracdap-runtime
-Version: 0.12.0.dev2
+Version: 0.12.0.dev3
 Summary: Portable, production-grade models in Python
 Home-page: https://www.fintrac.co.uk/
 Author: Martin Traverse

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tracdap-runtime
-version = 0.12.0.dev2
+version = 0.12.0.dev3
 license = Apache-2.0
 platform = any
 description = Portable, production-grade models in Python

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/__init__.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "0.12.0.dev2"
+__version__ = "0.12.0.dev3"

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/_impl/exec/dev_mode.py

@@ -647,18 +647,67 @@ class DevModeTranslator:
                 model_parameter = cls._infer_parameter(node_name, targets, job_def, job_config)
                 updated_flow.parameters[node_name] = model_parameter
 
-            if node.nodeType == _meta.FlowNodeType.INPUT_NODE and node_name not in flow.inputs:
+            if node.nodeType == _meta.FlowNodeType.INPUT_NODE:
                 targets = edges_by_source.get(node_name) or []
-                model_input = cls._infer_input_schema(node_name, targets, job_def, job_config)
-                updated_flow.inputs[node_name] = model_input
+                declared_input = flow.inputs.get(node_name)
+                if declared_input is not None:
+                    cls._check_declared_type("Input", node_name, declared_input, targets, lambda model: model.inputs, job_def, job_config)
+                if declared_input is None or cls._is_type_only(declared_input):
+                    model_input = cls._infer_input_schema(node_name, targets, job_def, job_config)
+                    updated_flow.inputs[node_name] = cls._apply_type_only(declared_input, model_input, "inputProps")
 
-            if node.nodeType == _meta.FlowNodeType.OUTPUT_NODE and node_name not in flow.outputs:
+            if node.nodeType == _meta.FlowNodeType.OUTPUT_NODE:
                 sources = edges_by_target.get(node_name) or []
-                model_output = cls._infer_output_schema(node_name, sources, job_def, job_config)
-                updated_flow.outputs[node_name] = model_output
+                declared_output = flow.outputs.get(node_name)
+                if declared_output is not None:
+                    cls._check_declared_type("Output", node_name, declared_output, sources, lambda model: model.outputs, job_def, job_config)
+                if declared_output is None or cls._is_type_only(declared_output):
+                    model_output = cls._infer_output_schema(node_name, sources, job_def, job_config)
+                    updated_flow.outputs[node_name] = cls._apply_type_only(declared_output, model_output, "outputProps")
 
         return updated_flow
 
+    @classmethod
+    def _check_declared_type(
+            cls, socket_kind: str, node_name: str, declared, sockets: tp.List[_meta.FlowSocket],
+            socket_func: tp.Callable[[_meta.ModelDefinition], dict],
+            job_def: _meta.JobDefinition, job_config: _cfg.JobConfig):
+
+        # Same wording as the object type checks in the platform's job validation
+        for socket in sockets:
+            model_selector = job_def.runFlow.models.get(socket.node)
+            if model_selector is None:
+                continue
+            model_obj = _util.get_job_metadata(model_selector, job_config)
+            model_socket = socket_func(model_obj.model).get(socket.socket)
+            if model_socket is not None and model_socket.objectType != declared.objectType:
+                err = f"{socket_kind} [{node_name}] is not the right object type" \
+                      + f" (expected {declared.objectType.name}, got {model_socket.objectType.name})"
+                cls._log.error(err)
+                raise _ex.EJobValidation(err)
+
+    @staticmethod
+    def _is_type_only(declared: tp.Union[_meta.ModelInputSchema, _meta.ModelOutputSchema]) -> bool:
+        return declared.schema is None and declared.fileType is None
+
+    @staticmethod
+    def _apply_type_only(declared, inferred, props_field: str):
+
+        # A type-only declaration keeps its label and props, everything else comes from inference
+        if declared is None:
+            return inferred
+
+        schema = copy.copy(inferred)
+
+        if declared.label is not None:
+            schema.label = declared.label
+
+        declared_props = getattr(declared, props_field)
+        if declared_props:
+            setattr(schema, props_field, {**(getattr(inferred, props_field) or {}), **declared_props})
+
+        return schema
+
     @classmethod
     def _infer_resource(
             cls, resource_name: str, targets: tp.List[_meta.FlowSocket],

tracdap_runtime-0.12.0.dev3/src/tracdap/rt/_impl/grpc/tracdap/metadata/job_pb2.py

@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: tracdap/rt/_impl/grpc/tracdap/metadata/job.proto
+# Protobuf Python Version: 6.30.2
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    30,
+    2,
+    '',
+    'tracdap/rt/_impl/grpc/tracdap/metadata/job.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+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
+from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_object__id__pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import tag_update_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_tag__update__pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import data_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_data__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\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\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.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\"\x80\x04\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\x35\n\tlogFileId\x18\x04 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x88\x01\x01\x12@\n\x07outputs\x18\x05 \x03(\x0b\x32/.tracdap.metadata.ResultDefinition.OutputsEntry\x12\x46\n\nplacements\x18\x06 \x03(\x0b\x32\x32.tracdap.metadata.ResultDefinition.PlacementsEntry\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\x1aT\n\x0fPlacementsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x30\n\x05value\x18\x02 \x01(\x0b\x32!.tracdap.metadata.PlacementRecord:\x02\x38\x01\x42\x0c\n\n_logFileId\"\xbb\x01\n\x0fPlacementRecord\x12-\n\x06\x64\x61taId\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x34\n\x08location\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ExternalLocation\x12\x0e\n\x06\x66ormat\x18\x03 \x01(\t\x12\x10\n\x08mimeType\x18\x04 \x01(\t\x12\x0c\n\x04size\x18\x05 \x01(\x03\x12\x13\n\x0b\x63ontentHash\x18\x06 \x01(\t\"\xc2\x07\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?\n\tresources\x18\x07 \x03(\x0b\x32,.tracdap.metadata.RunModelJob.ResourcesEntry\x12\x30\n\x0boutputAttrs\x18\x06 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x12I\n\x0eperOutputAttrs\x18\x08 \x03(\x0b\x32\x31.tracdap.metadata.RunModelJob.PerOutputAttrsEntry\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\x1a\x30\n\x0eResourcesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aV\n\x13PerOutputAttrsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12.\n\x05value\x18\x02 \x01(\x0b\x32\x1f.tracdap.metadata.TagUpdateList:\x02\x38\x01\"\xdf\x08\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>\n\tresources\x18\x08 \x03(\x0b\x32+.tracdap.metadata.RunFlowJob.ResourcesEntry\x12\x30\n\x0boutputAttrs\x18\x07 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x12H\n\x0eperOutputAttrs\x18\n \x03(\x0b\x32\x30.tracdap.metadata.RunFlowJob.PerOutputAttrsEntry\x12\x1b\n\x13\x65xportStorageAccess\x18\t \x03(\t\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\x1a\x30\n\x0eResourcesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aV\n\x13PerOutputAttrsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12.\n\x05value\x18\x02 \x01(\x0b\x32\x1f.tracdap.metadata.TagUpdateList:\x02\x38\x01\"\x9e\x02\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.TagUpdate\x12\x36\n\npriorModel\x18\t \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x01\x88\x01\x01\x42\x0f\n\r_packageGroupB\r\n\x0b_priorModel\"\x82\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\x30\n\x0boutputAttrs\x18\x08 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x12?\n\x08\x63\x61ptures\x18\n \x03(\x0b\x32-.tracdap.metadata.ImportDataJob.CapturesEntry\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\x1aP\n\rCapturesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12.\n\x05value\x18\x02 \x01(\x0b\x32\x1f.tracdap.metadata.CaptureSource:\x02\x38\x01J\x04\x08\x07\x10\x08J\x04\x08\t\x10\nR\x07importsR\x0bimportAttrs\"\xea\x02\n\rCaptureSource\x12\x36\n\x08location\x18\x01 \x01(\x0b\x32\".tracdap.metadata.ExternalLocationH\x00\x12;\n\x0cschemaSource\x18\x04 \x01(\x0e\x32%.tracdap.metadata.CaptureSchemaSource\x12\x31\n\x08schemaId\x18\x05 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x01\x12\x34\n\x06schema\x18\x06 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x01\x12.\n\tdataAttrs\x18\x08 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate\x12.\n\tfileAttrs\x18\t \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdateB\x08\n\x06sourceB\x11\n\x0fschemaSpecifier\"\xd7\x01\n\x10\x45xternalLocation\x12\x12\n\nstorageKey\x18\x01 \x01(\t\x12\x13\n\x0bstoragePath\x18\x02 \x01(\t\x12\x10\n\x08protocol\x18\x03 \x01(\t\x12P\n\x0flocationDetails\x18\x04 \x03(\x0b\x32\x37.tracdap.metadata.ExternalLocation.LocationDetailsEntry\x1a\x36\n\x14LocationDetailsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xf1\x02\n\rExportDataJob\x12\x43\n\nplacements\x18\t \x03(\x0b\x32/.tracdap.metadata.ExportDataJob.PlacementsEntry\x12>\n\x11placementConflict\x18\n \x01(\x0e\x32#.tracdap.metadata.PlacementConflict\x1aT\n\x0fPlacementsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x30\n\x05value\x18\x02 \x01(\x0b\x32!.tracdap.metadata.PlacementTarget:\x02\x38\x01J\x04\x08\x01\x10\x02J\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04J\x04\x08\x04\x10\x05J\x04\x08\x05\x10\x06J\x04\x08\x06\x10\x07J\x04\x08\x07\x10\x08J\x04\x08\x08\x10\tR\x05modelR\nparametersR\x06inputsR\x07outputsR\x0cpriorOutputsR\rstorageAccessR\x07\x65xportsR\x0boutputAttrs\"\x82\x01\n\x0fPlacementTarget\x12/\n\x06\x64\x61taId\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x12\x34\n\x08location\x18\x03 \x01(\x0b\x32\".tracdap.metadata.ExternalLocationB\x08\n\x06source\"\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\n\x13\x43\x61ptureSchemaSource\x12!\n\x1d\x43\x41PTURE_SCHEMA_SOURCE_NOT_SET\x10\x00\x12\x1b\n\x17\x43\x41PTURE_SCHEMA_DECLARED\x10\x01\x12\x17\n\x13\x43\x41PTURE_SCHEMA_FILE\x10\x02*v\n\x11PlacementConflict\x12\x1e\n\x1aPLACEMENT_CONFLICT_NOT_SET\x10\x00\x12\x14\n\x10PLACEMENT_SUFFIX\x10\x01\x12\x17\n\x13PLACEMENT_OVERWRITE\x10\x02\x12\x12\n\x0ePLACEMENT_FAIL\x10\x03*\\\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)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.rt._impl.grpc.tracdap.metadata.job_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
+  _globals['_RESULTDEFINITION_OUTPUTSENTRY']._loaded_options = None
+  _globals['_RESULTDEFINITION_OUTPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_RESULTDEFINITION_PLACEMENTSENTRY']._loaded_options = None
+  _globals['_RESULTDEFINITION_PLACEMENTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNMODELJOB_PARAMETERSENTRY']._loaded_options = None
+  _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNMODELJOB_INPUTSENTRY']._loaded_options = None
+  _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNMODELJOB_OUTPUTSENTRY']._loaded_options = None
+  _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._loaded_options = None
+  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNMODELJOB_RESOURCESENTRY']._loaded_options = None
+  _globals['_RUNMODELJOB_RESOURCESENTRY']._serialized_options = b'8\001'
+  _globals['_RUNMODELJOB_PEROUTPUTATTRSENTRY']._loaded_options = None
+  _globals['_RUNMODELJOB_PEROUTPUTATTRSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._loaded_options = None
+  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNFLOWJOB_INPUTSENTRY']._loaded_options = None
+  _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._loaded_options = None
+  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._loaded_options = None
+  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNFLOWJOB_MODELSENTRY']._loaded_options = None
+  _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_options = b'8\001'
+  _globals['_RUNFLOWJOB_RESOURCESENTRY']._loaded_options = None
+  _globals['_RUNFLOWJOB_RESOURCESENTRY']._serialized_options = b'8\001'
+  _globals['_RUNFLOWJOB_PEROUTPUTATTRSENTRY']._loaded_options = None
+  _globals['_RUNFLOWJOB_PEROUTPUTATTRSENTRY']._serialized_options = b'8\001'
+  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._loaded_options = None
+  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_options = b'8\001'
+  _globals['_IMPORTDATAJOB_INPUTSENTRY']._loaded_options = None
+  _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._loaded_options = None
+  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._loaded_options = None
+  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_options = b'8\001'
+  _globals['_IMPORTDATAJOB_CAPTURESENTRY']._loaded_options = None
+  _globals['_IMPORTDATAJOB_CAPTURESENTRY']._serialized_options = b'8\001'
+  _globals['_EXTERNALLOCATION_LOCATIONDETAILSENTRY']._loaded_options = None
+  _globals['_EXTERNALLOCATION_LOCATIONDETAILSENTRY']._serialized_options = b'8\001'
+  _globals['_EXPORTDATAJOB_PLACEMENTSENTRY']._loaded_options = None
+  _globals['_EXPORTDATAJOB_PLACEMENTSENTRY']._serialized_options = b'8\001'
+  _globals['_JOBTYPE']._serialized_start=6133
+  _globals['_JOBTYPE']._serialized_end=6260
+  _globals['_JOBSTATUSCODE']._serialized_start=6263
+  _globals['_JOBSTATUSCODE']._serialized_end=6447
+  _globals['_CAPTURESCHEMASOURCE']._serialized_start=6449
+  _globals['_CAPTURESCHEMASOURCE']._serialized_end=6559
+  _globals['_PLACEMENTCONFLICT']._serialized_start=6561
+  _globals['_PLACEMENTCONFLICT']._serialized_end=6679
+  _globals['_JOBGROUPTYPE']._serialized_start=6681
+  _globals['_JOBGROUPTYPE']._serialized_end=6773
+  _globals['_JOBDEFINITION']._serialized_start=286
+  _globals['_JOBDEFINITION']._serialized_end=723
+  _globals['_RESULTDEFINITION']._serialized_start=726
+  _globals['_RESULTDEFINITION']._serialized_end=1238
+  _globals['_RESULTDEFINITION_OUTPUTSENTRY']._serialized_start=1061
+  _globals['_RESULTDEFINITION_OUTPUTSENTRY']._serialized_end=1138
+  _globals['_RESULTDEFINITION_PLACEMENTSENTRY']._serialized_start=1140
+  _globals['_RESULTDEFINITION_PLACEMENTSENTRY']._serialized_end=1224
+  _globals['_PLACEMENTRECORD']._serialized_start=1241
+  _globals['_PLACEMENTRECORD']._serialized_end=1428
+  _globals['_RUNMODELJOB']._serialized_start=1431
+  _globals['_RUNMODELJOB']._serialized_end=2393
+  _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_start=1940
+  _globals['_RUNMODELJOB_PARAMETERSENTRY']._serialized_end=2014
+  _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_start=2016
+  _globals['_RUNMODELJOB_INPUTSENTRY']._serialized_end=2092
+  _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_start=1061
+  _globals['_RUNMODELJOB_OUTPUTSENTRY']._serialized_end=1138
+  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_start=2173
+  _globals['_RUNMODELJOB_PRIOROUTPUTSENTRY']._serialized_end=2255
+  _globals['_RUNMODELJOB_RESOURCESENTRY']._serialized_start=2257
+  _globals['_RUNMODELJOB_RESOURCESENTRY']._serialized_end=2305
+  _globals['_RUNMODELJOB_PEROUTPUTATTRSENTRY']._serialized_start=2307
+  _globals['_RUNMODELJOB_PEROUTPUTATTRSENTRY']._serialized_end=2393
+  _globals['_RUNFLOWJOB']._serialized_start=2396
+  _globals['_RUNFLOWJOB']._serialized_end=3515
+  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_start=1940
+  _globals['_RUNFLOWJOB_PARAMETERSENTRY']._serialized_end=2014
+  _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_start=2016
+  _globals['_RUNFLOWJOB_INPUTSENTRY']._serialized_end=2092
+  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_start=1061
+  _globals['_RUNFLOWJOB_OUTPUTSENTRY']._serialized_end=1138
+  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_start=2173
+  _globals['_RUNFLOWJOB_PRIOROUTPUTSENTRY']._serialized_end=2255
+  _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_start=3301
+  _globals['_RUNFLOWJOB_MODELSENTRY']._serialized_end=3377
+  _globals['_RUNFLOWJOB_RESOURCESENTRY']._serialized_start=2257
+  _globals['_RUNFLOWJOB_RESOURCESENTRY']._serialized_end=2305
+  _globals['_RUNFLOWJOB_PEROUTPUTATTRSENTRY']._serialized_start=2307
+  _globals['_RUNFLOWJOB_PEROUTPUTATTRSENTRY']._serialized_end=2393
+  _globals['_IMPORTMODELJOB']._serialized_start=3518
+  _globals['_IMPORTMODELJOB']._serialized_end=3804
+  _globals['_IMPORTDATAJOB']._serialized_start=3807
+  _globals['_IMPORTDATAJOB']._serialized_end=4705
+  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_start=1940
+  _globals['_IMPORTDATAJOB_PARAMETERSENTRY']._serialized_end=2014
+  _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_start=2016
+  _globals['_IMPORTDATAJOB_INPUTSENTRY']._serialized_end=2092
+  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_start=1061
+  _globals['_IMPORTDATAJOB_OUTPUTSENTRY']._serialized_end=1138
+  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_start=2173
+  _globals['_IMPORTDATAJOB_PRIOROUTPUTSENTRY']._serialized_end=2255
+  _globals['_IMPORTDATAJOB_CAPTURESENTRY']._serialized_start=4591
+  _globals['_IMPORTDATAJOB_CAPTURESENTRY']._serialized_end=4671
+  _globals['_CAPTURESOURCE']._serialized_start=4708
+  _globals['_CAPTURESOURCE']._serialized_end=5070
+  _globals['_EXTERNALLOCATION']._serialized_start=5073
+  _globals['_EXTERNALLOCATION']._serialized_end=5288
+  _globals['_EXTERNALLOCATION_LOCATIONDETAILSENTRY']._serialized_start=5234
+  _globals['_EXTERNALLOCATION_LOCATIONDETAILSENTRY']._serialized_end=5288
+  _globals['_EXPORTDATAJOB']._serialized_start=5291
+  _globals['_EXPORTDATAJOB']._serialized_end=5660
+  _globals['_EXPORTDATAJOB_PLACEMENTSENTRY']._serialized_start=5441
+  _globals['_EXPORTDATAJOB_PLACEMENTSENTRY']._serialized_end=5525
+  _globals['_PLACEMENTTARGET']._serialized_start=5663
+  _globals['_PLACEMENTTARGET']._serialized_end=5793
+  _globals['_JOBGROUP']._serialized_start=5796
+  _globals['_JOBGROUP']._serialized_end=5995
+  _globals['_SEQUENTIALJOBGROUP']._serialized_start=5997
+  _globals['_SEQUENTIALJOBGROUP']._serialized_end=6064
+  _globals['_PARALLELJOBGROUP']._serialized_start=6066
+  _globals['_PARALLELJOBGROUP']._serialized_end=6131
+# @@protoc_insertion_point(module_scope)

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/_impl/grpc/tracdap/metadata/job_pb2.pyi

@@ -149,7 +149,7 @@ class PlacementRecord(_message.Message):
     def __init__(self, dataId: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., location: _Optional[_Union[ExternalLocation, _Mapping]] = ..., format: _Optional[str] = ..., mimeType: _Optional[str] = ..., size: _Optional[int] = ..., contentHash: _Optional[str] = ...) -> None: ...
 
 class RunModelJob(_message.Message):
-    __slots__ = ("model", "parameters", "inputs", "outputs", "priorOutputs", "resources", "outputAttrs")
+    __slots__ = ("model", "parameters", "inputs", "outputs", "priorOutputs", "resources", "outputAttrs", "perOutputAttrs")
     class ParametersEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -185,6 +185,13 @@ class RunModelJob(_message.Message):
         key: str
         value: str
         def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    class PerOutputAttrsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: _tag_update_pb2.TagUpdateList
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_tag_update_pb2.TagUpdateList, _Mapping]] = ...) -> None: ...
     MODEL_FIELD_NUMBER: _ClassVar[int]
     PARAMETERS_FIELD_NUMBER: _ClassVar[int]
     INPUTS_FIELD_NUMBER: _ClassVar[int]
@@ -192,6 +199,7 @@ class RunModelJob(_message.Message):
     PRIOROUTPUTS_FIELD_NUMBER: _ClassVar[int]
     RESOURCES_FIELD_NUMBER: _ClassVar[int]
     OUTPUTATTRS_FIELD_NUMBER: _ClassVar[int]
+    PEROUTPUTATTRS_FIELD_NUMBER: _ClassVar[int]
     model: _object_id_pb2.TagSelector
     parameters: _containers.MessageMap[str, _type_pb2.Value]
     inputs: _containers.MessageMap[str, _object_id_pb2.TagSelector]
@@ -199,10 +207,11 @@ class RunModelJob(_message.Message):
     priorOutputs: _containers.MessageMap[str, _object_id_pb2.TagSelector]
     resources: _containers.ScalarMap[str, str]
     outputAttrs: _containers.RepeatedCompositeFieldContainer[_tag_update_pb2.TagUpdate]
-    def __init__(self, model: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., parameters: _Optional[_Mapping[str, _type_pb2.Value]] = ..., inputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., outputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., priorOutputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., resources: _Optional[_Mapping[str, str]] = ..., outputAttrs: _Optional[_Iterable[_Union[_tag_update_pb2.TagUpdate, _Mapping]]] = ...) -> None: ...
+    perOutputAttrs: _containers.MessageMap[str, _tag_update_pb2.TagUpdateList]
+    def __init__(self, model: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., parameters: _Optional[_Mapping[str, _type_pb2.Value]] = ..., inputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., outputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., priorOutputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., resources: _Optional[_Mapping[str, str]] = ..., outputAttrs: _Optional[_Iterable[_Union[_tag_update_pb2.TagUpdate, _Mapping]]] = ..., perOutputAttrs: _Optional[_Mapping[str, _tag_update_pb2.TagUpdateList]] = ...) -> None: ...
 
 class RunFlowJob(_message.Message):
-    __slots__ = ("flow", "parameters", "inputs", "outputs", "priorOutputs", "models", "resources", "outputAttrs", "exportStorageAccess")
+    __slots__ = ("flow", "parameters", "inputs", "outputs", "priorOutputs", "models", "resources", "outputAttrs", "perOutputAttrs", "exportStorageAccess")
     class ParametersEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -245,6 +254,13 @@ class RunFlowJob(_message.Message):
         key: str
         value: str
         def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    class PerOutputAttrsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: _tag_update_pb2.TagUpdateList
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_tag_update_pb2.TagUpdateList, _Mapping]] = ...) -> None: ...
     FLOW_FIELD_NUMBER: _ClassVar[int]
     PARAMETERS_FIELD_NUMBER: _ClassVar[int]
     INPUTS_FIELD_NUMBER: _ClassVar[int]
@@ -253,6 +269,7 @@ class RunFlowJob(_message.Message):
     MODELS_FIELD_NUMBER: _ClassVar[int]
     RESOURCES_FIELD_NUMBER: _ClassVar[int]
     OUTPUTATTRS_FIELD_NUMBER: _ClassVar[int]
+    PEROUTPUTATTRS_FIELD_NUMBER: _ClassVar[int]
     EXPORTSTORAGEACCESS_FIELD_NUMBER: _ClassVar[int]
     flow: _object_id_pb2.TagSelector
     parameters: _containers.MessageMap[str, _type_pb2.Value]
@@ -262,8 +279,9 @@ class RunFlowJob(_message.Message):
     models: _containers.MessageMap[str, _object_id_pb2.TagSelector]
     resources: _containers.ScalarMap[str, str]
     outputAttrs: _containers.RepeatedCompositeFieldContainer[_tag_update_pb2.TagUpdate]
+    perOutputAttrs: _containers.MessageMap[str, _tag_update_pb2.TagUpdateList]
     exportStorageAccess: _containers.RepeatedScalarFieldContainer[str]
-    def __init__(self, flow: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., parameters: _Optional[_Mapping[str, _type_pb2.Value]] = ..., inputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., outputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., priorOutputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., models: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., resources: _Optional[_Mapping[str, str]] = ..., outputAttrs: _Optional[_Iterable[_Union[_tag_update_pb2.TagUpdate, _Mapping]]] = ..., exportStorageAccess: _Optional[_Iterable[str]] = ...) -> None: ...
+    def __init__(self, flow: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., parameters: _Optional[_Mapping[str, _type_pb2.Value]] = ..., inputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., outputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., priorOutputs: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., models: _Optional[_Mapping[str, _object_id_pb2.TagSelector]] = ..., resources: _Optional[_Mapping[str, str]] = ..., outputAttrs: _Optional[_Iterable[_Union[_tag_update_pb2.TagUpdate, _Mapping]]] = ..., perOutputAttrs: _Optional[_Mapping[str, _tag_update_pb2.TagUpdateList]] = ..., exportStorageAccess: _Optional[_Iterable[str]] = ...) -> None: ...
 
 class ImportModelJob(_message.Message):
     __slots__ = ("language", "repository", "packageGroup", "package", "version", "entryPoint", "path", "modelAttrs", "priorModel")

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/_impl/grpc/tracdap/metadata/tag_update_pb2.py

@@ -25,7 +25,7 @@ _sym_db = _symbol_database.Default()
 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
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n7tracdap/rt/_impl/grpc/tracdap/metadata/tag_update.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\x87\x01\n\tTagUpdate\x12\x31\n\toperation\x18\x01 \x01(\x0e\x32\x1e.tracdap.metadata.TagOperation\x12\x10\n\x08\x61ttrName\x18\x02 \x01(\t\x12+\n\x05value\x18\x03 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x42\x08\n\x06_value*\x9e\x01\n\x0cTagOperation\x12\x1a\n\x16\x43REATE_OR_REPLACE_ATTR\x10\x00\x12\x19\n\x15\x43REATE_OR_APPEND_ATTR\x10\x01\x12\x0f\n\x0b\x43REATE_ATTR\x10\x02\x12\x10\n\x0cREPLACE_ATTR\x10\x03\x12\x0f\n\x0b\x41PPEND_ATTR\x10\x04\x12\x0f\n\x0b\x44\x45LETE_ATTR\x10\x05\x12\x12\n\x0e\x43LEAR_ALL_ATTR\x10\x06\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n7tracdap/rt/_impl/grpc/tracdap/metadata/tag_update.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\x87\x01\n\tTagUpdate\x12\x31\n\toperation\x18\x01 \x01(\x0e\x32\x1e.tracdap.metadata.TagOperation\x12\x10\n\x08\x61ttrName\x18\x02 \x01(\t\x12+\n\x05value\x18\x03 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x42\x08\n\x06_value\";\n\rTagUpdateList\x12*\n\x05\x61ttrs\x18\x01 \x03(\x0b\x32\x1b.tracdap.metadata.TagUpdate*\x9e\x01\n\x0cTagOperation\x12\x1a\n\x16\x43REATE_OR_REPLACE_ATTR\x10\x00\x12\x19\n\x15\x43REATE_OR_APPEND_ATTR\x10\x01\x12\x0f\n\x0b\x43REATE_ATTR\x10\x02\x12\x10\n\x0cREPLACE_ATTR\x10\x03\x12\x0f\n\x0b\x41PPEND_ATTR\x10\x04\x12\x0f\n\x0b\x44\x45LETE_ATTR\x10\x05\x12\x12\n\x0e\x43LEAR_ALL_ATTR\x10\x06\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -33,8 +33,10 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.rt._impl.grpc.tracd
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
-  _globals['_TAGOPERATION']._serialized_start=267
-  _globals['_TAGOPERATION']._serialized_end=425
+  _globals['_TAGOPERATION']._serialized_start=328
+  _globals['_TAGOPERATION']._serialized_end=486
   _globals['_TAGUPDATE']._serialized_start=129
   _globals['_TAGUPDATE']._serialized_end=264
+  _globals['_TAGUPDATELIST']._serialized_start=266
+  _globals['_TAGUPDATELIST']._serialized_end=325
 # @@protoc_insertion_point(module_scope)

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/_impl/grpc/tracdap/metadata/tag_update_pb2.pyi

@@ -1,8 +1,9 @@
 from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as _type_pb2
+from google.protobuf.internal import containers as _containers
 from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
-from collections.abc import Mapping as _Mapping
+from collections.abc import Iterable as _Iterable, Mapping as _Mapping
 from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
 DESCRIPTOR: _descriptor.FileDescriptor
@@ -33,3 +34,9 @@ class TagUpdate(_message.Message):
     attrName: str
     value: _type_pb2.Value
     def __init__(self, operation: _Optional[_Union[TagOperation, str]] = ..., attrName: _Optional[str] = ..., value: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
+
+class TagUpdateList(_message.Message):
+    __slots__ = ("attrs",)
+    ATTRS_FIELD_NUMBER: _ClassVar[int]
+    attrs: _containers.RepeatedCompositeFieldContainer[TagUpdate]
+    def __init__(self, attrs: _Optional[_Iterable[_Union[TagUpdate, _Mapping]]] = ...) -> None: ...

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/api/__init__.py

@@ -17,7 +17,7 @@
 TRAC model API for Python
 """
 
-__version__ = "0.12.0.dev2"
+__version__ = "0.12.0.dev3"
 
 # Make metadata classes available to client code when importing the API package
 # Remove this import when generating docs, so metadata classes are only documented once

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/metadata/__init__.py

@@ -13,15 +13,6 @@ from .object_id import ObjectType
 from .object_id import TagHeader
 from .object_id import TagSelector
 
-from .search import SearchOperator
-from .search import LogicalOperator
-from .search import SearchTerm
-from .search import LogicalExpression
-from .search import SearchExpression
-from .search import SearchParameters
-
-from .custom import CustomDefinition
-
 from .data import SchemaType
 from .data import PartType
 from .data import FieldSchema
@@ -35,8 +26,38 @@ from .data import DataSnapshot
 from .data import DataPartition
 from .data import DataDefinition
 
+from .file import FileDefinition
+from .file import FileType
+
+from .resource import ResourceType
+from .resource import ResourceDefinition
+from .resource import CredentialDefinition
+from .resource import IdentityDefinition
+
+from .model import ModelType
+from .model import ModelParameter
+from .model import ModelInputSchema
+from .model import ModelOutputSchema
+from .model import ModelResource
+from .model import ModelSystemDetails
+from .model import ModelDefinition
+
+from .search import SearchOperator
+from .search import LogicalOperator
+from .search import SearchTerm
+from .search import LogicalExpression
+from .search import SearchExpression
+from .search import SearchParameters
+
 from .tag_update import TagOperation
 from .tag_update import TagUpdate
+from .tag_update import TagUpdateList
+
+from .flow import FlowNodeType
+from .flow import FlowNode
+from .flow import FlowSocket
+from .flow import FlowEdge
+from .flow import FlowDefinition
 
 from .job import JobType
 from .job import JobStatusCode
@@ -58,21 +79,7 @@ from .job import JobGroup
 from .job import SequentialJobGroup
 from .job import ParallelJobGroup
 
-from .file import FileDefinition
-from .file import FileType
-
-from .resource import ResourceType
-from .resource import ResourceDefinition
-from .resource import CredentialDefinition
-from .resource import IdentityDefinition
-
-from .model import ModelType
-from .model import ModelParameter
-from .model import ModelInputSchema
-from .model import ModelOutputSchema
-from .model import ModelResource
-from .model import ModelSystemDetails
-from .model import ModelDefinition
+from .custom import CustomDefinition
 
 from .storage import CopyStatus
 from .storage import IncarnationStatus
@@ -88,16 +95,10 @@ from .config import ConfigDetails
 from .config import ConfigDefinition
 from .config import PlatformConfigEntry
 
-from .flow import FlowNodeType
-from .flow import FlowNode
-from .flow import FlowSocket
-from .flow import FlowEdge
-from .flow import FlowDefinition
-
 from .object import ObjectDefinition
 
-from .tag import Tag
-
 from .common import MetadataFormat
 from .common import MetadataVersion
 from .common import TenantInfo
+
+from .tag import Tag

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/metadata/flow.py

@@ -136,6 +136,22 @@ class FlowDefinition:
 
     inputs: "_tp.Dict[str, ModelInputSchema]" = _dc.field(default_factory=dict)
 
+    """
+    Explicit declarations for the flow's input nodes
+    
+    Inputs can be left undeclared, in which case TRAC infers them from the models they connect to.
+    An input declared with only its object type (and optionally a label and props) is checked against
+    that type, and the rest of its schema is inferred. An input declared in full, with a schema or file type,
+    is used as it is. If any inputs are declared, every input node must be declared.
+    """
+
     outputs: "_tp.Dict[str, ModelOutputSchema]" = _dc.field(default_factory=dict)
 
+    """
+    Explicit declarations for the flow's output nodes
+    
+    Outputs can be undeclared, declared with only their object type, or declared in full, as for inputs.
+    If any outputs are declared, every output node must be declared.
+    """
+
     resources: "_tp.Dict[str, ModelResource]" = _dc.field(default_factory=dict)

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/metadata/job.py

@@ -212,6 +212,8 @@ class RunModelJob:
 
     outputAttrs: "_tp.List[TagUpdate]" = _dc.field(default_factory=list)
 
+    perOutputAttrs: "_tp.Dict[str, TagUpdateList]" = _dc.field(default_factory=dict)
+
 
 @_dc.dataclass
 class RunFlowJob:
@@ -234,6 +236,8 @@ class RunFlowJob:
 
     outputAttrs: "_tp.List[TagUpdate]" = _dc.field(default_factory=list)
 
+    perOutputAttrs: "_tp.Dict[str, TagUpdateList]" = _dc.field(default_factory=dict)
+
     exportStorageAccess: "_tp.List[str]" = _dc.field(default_factory=list)
 
 

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3}/src/tracdap/rt/metadata/tag_update.py

@@ -128,3 +128,23 @@ class TagUpdate:
     .. seealso::
         :py:obj:`Value <metadata.Value>`
     """
+
+
+@_dc.dataclass
+class TagUpdateList:
+
+    """
+    A list of tag updates, where updates are grouped by a key.
+    
+    Protobuf map values can't be repeated, so a map from a key to its tag updates
+    uses this message as the value. For example, the tags for each output of a job
+    are held as a map from output name to a tag update list.
+    
+    .. seealso::
+        :py:obj:`RunModelJob <RunModelJob>`,
+        :py:obj:`RunFlowJob <RunFlowJob>`
+    """
+
+    attrs: "_tp.List[TagUpdate]" = _dc.field(default_factory=list)
+
+    """Tag updates for the key this list belongs to"""

{tracdap_runtime-0.12.0.dev2 → tracdap_runtime-0.12.0.dev3/tracdap_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tracdap-runtime
-Version: 0.12.0.dev2
+Version: 0.12.0.dev3
 Summary: Portable, production-grade models in Python
 Home-page: https://www.fintrac.co.uk/
 Author: Martin Traverse