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

tracdap/rt/_impl/data.py

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

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

@@ -16,7 +16,7 @@ from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as tracdap_dot_rt_do
 from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_object__id__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n1tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\"\xe7\x01\n\x0b\x46ieldSchema\x12\x11\n\tfieldName\x18\x01 \x01(\t\x12\x12\n\nfieldOrder\x18\x02 \x01(\x11\x12.\n\tfieldType\x18\x03 \x01(\x0e\x32\x1b.tracdap.metadata.BasicType\x12\r\n\x05label\x18\x04 \x01(\t\x12\x13\n\x0b\x62usinessKey\x18\x05 \x01(\x08\x12\x13\n\x0b\x63\x61tegorical\x18\x06 \x01(\x08\x12\x14\n\x07notNull\x18\x08 \x01(\x08H\x00\x88\x01\x01\x12\x17\n\nformatCode\x18\x07 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_notNullB\r\n\x0b_formatCode\"<\n\x0bTableSchema\x12-\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1d.tracdap.metadata.FieldSchema\"\xba\x01\n\x10SchemaDefinition\x12\x30\n\nschemaType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.SchemaType\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12.\n\x05table\x18\x03 \x01(\x0b\x32\x1d.tracdap.metadata.TableSchemaH\x00\x42\x16\n\x14schemaTypeDefinition\"\x81\x02\n\x07PartKey\x12\x11\n\topaqueKey\x18\x01 \x01(\t\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12+\n\npartValues\x18\x03 \x03(\x0b\x32\x17.tracdap.metadata.Value\x12\x32\n\x0cpartRangeMin\x18\x04 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x12\x32\n\x0cpartRangeMax\x18\x05 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x01\x88\x01\x01\x42\x0f\n\r_partRangeMinB\x0f\n\r_partRangeMax\"\xba\x04\n\x0e\x44\x61taDefinition\x12\x31\n\x08schemaId\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x12\x34\n\x06schema\x18\x02 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12:\n\x05parts\x18\x03 \x03(\x0b\x32+.tracdap.metadata.DataDefinition.PartsEntry\x12\x30\n\tstorageId\x18\x04 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x1a-\n\x05\x44\x65lta\x12\x12\n\ndeltaIndex\x18\x01 \x01(\r\x12\x10\n\x08\x64\x61taItem\x18\x02 \x01(\t\x1aQ\n\x04Snap\x12\x11\n\tsnapIndex\x18\x01 \x01(\r\x12\x36\n\x06\x64\x65ltas\x18\x02 \x03(\x0b\x32&.tracdap.metadata.DataDefinition.Delta\x1ag\n\x04Part\x12*\n\x07partKey\x18\x01 \x01(\x0b\x32\x19.tracdap.metadata.PartKey\x12\x33\n\x04snap\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Snap\x1aS\n\nPartsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Part:\x02\x38\x01\x42\x11\n\x0fschemaSpecifier*0\n\nSchemaType\x12\x17\n\x13SCHEMA_TYPE_NOT_SET\x10\x00\x12\t\n\x05TABLE\x10\x01*?\n\x08PartType\x12\r\n\tPART_ROOT\x10\x00\x12\x11\n\rPART_BY_RANGE\x10\x01\x12\x11\n\rPART_BY_VALUE\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n1tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\"\xe7\x01\n\x0b\x46ieldSchema\x12\x11\n\tfieldName\x18\x01 \x01(\t\x12\x12\n\nfieldOrder\x18\x02 \x01(\x11\x12.\n\tfieldType\x18\x03 \x01(\x0e\x32\x1b.tracdap.metadata.BasicType\x12\r\n\x05label\x18\x04 \x01(\t\x12\x13\n\x0b\x62usinessKey\x18\x05 \x01(\x08\x12\x13\n\x0b\x63\x61tegorical\x18\x06 \x01(\x08\x12\x14\n\x07notNull\x18\x08 \x01(\x08H\x00\x88\x01\x01\x12\x17\n\nformatCode\x18\x07 \x01(\tH\x01\x88\x01\x01\x42\n\n\x08_notNullB\r\n\x0b_formatCode\"<\n\x0bTableSchema\x12-\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x1d.tracdap.metadata.FieldSchema\"\xb3\x01\n\x10SchemaDefinition\x12\x30\n\nschemaType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.SchemaType\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12.\n\x05table\x18\x03 \x01(\x0b\x32\x1d.tracdap.metadata.TableSchemaH\x00\x42\x0f\n\rschemaDetails\"\x81\x02\n\x07PartKey\x12\x11\n\topaqueKey\x18\x01 \x01(\t\x12,\n\x08partType\x18\x02 \x01(\x0e\x32\x1a.tracdap.metadata.PartType\x12+\n\npartValues\x18\x03 \x03(\x0b\x32\x17.tracdap.metadata.Value\x12\x32\n\x0cpartRangeMin\x18\x04 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x12\x32\n\x0cpartRangeMax\x18\x05 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x01\x88\x01\x01\x42\x0f\n\r_partRangeMinB\x0f\n\r_partRangeMax\"\xba\x04\n\x0e\x44\x61taDefinition\x12\x31\n\x08schemaId\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelectorH\x00\x12\x34\n\x06schema\x18\x02 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12:\n\x05parts\x18\x03 \x03(\x0b\x32+.tracdap.metadata.DataDefinition.PartsEntry\x12\x30\n\tstorageId\x18\x04 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x1a-\n\x05\x44\x65lta\x12\x12\n\ndeltaIndex\x18\x01 \x01(\r\x12\x10\n\x08\x64\x61taItem\x18\x02 \x01(\t\x1aQ\n\x04Snap\x12\x11\n\tsnapIndex\x18\x01 \x01(\r\x12\x36\n\x06\x64\x65ltas\x18\x02 \x03(\x0b\x32&.tracdap.metadata.DataDefinition.Delta\x1ag\n\x04Part\x12*\n\x07partKey\x18\x01 \x01(\x0b\x32\x19.tracdap.metadata.PartKey\x12\x33\n\x04snap\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Snap\x1aS\n\nPartsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.tracdap.metadata.DataDefinition.Part:\x02\x38\x01\x42\x11\n\x0fschemaSpecifier*0\n\nSchemaType\x12\x17\n\x13SCHEMA_TYPE_NOT_SET\x10\x00\x12\t\n\x05TABLE\x10\x01*?\n\x08PartType\x12\r\n\tPART_ROOT\x10\x00\x12\x11\n\rPART_BY_RANGE\x10\x01\x12\x11\n\rPART_BY_VALUE\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -26,26 +26,26 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
   _globals['_DATADEFINITION_PARTSENTRY']._options = None
   _globals['_DATADEFINITION_PARTSENTRY']._serialized_options = b'8\001'
-  _globals['_SCHEMATYPE']._serialized_start=1496
-  _globals['_SCHEMATYPE']._serialized_end=1544
-  _globals['_PARTTYPE']._serialized_start=1546
-  _globals['_PARTTYPE']._serialized_end=1609
+  _globals['_SCHEMATYPE']._serialized_start=1489
+  _globals['_SCHEMATYPE']._serialized_end=1537
+  _globals['_PARTTYPE']._serialized_start=1539
+  _globals['_PARTTYPE']._serialized_end=1602
   _globals['_FIELDSCHEMA']._serialized_start=179
   _globals['_FIELDSCHEMA']._serialized_end=410
   _globals['_TABLESCHEMA']._serialized_start=412
   _globals['_TABLESCHEMA']._serialized_end=472
   _globals['_SCHEMADEFINITION']._serialized_start=475
-  _globals['_SCHEMADEFINITION']._serialized_end=661
-  _globals['_PARTKEY']._serialized_start=664
-  _globals['_PARTKEY']._serialized_end=921
-  _globals['_DATADEFINITION']._serialized_start=924
-  _globals['_DATADEFINITION']._serialized_end=1494
-  _globals['_DATADEFINITION_DELTA']._serialized_start=1157
-  _globals['_DATADEFINITION_DELTA']._serialized_end=1202
-  _globals['_DATADEFINITION_SNAP']._serialized_start=1204
-  _globals['_DATADEFINITION_SNAP']._serialized_end=1285
-  _globals['_DATADEFINITION_PART']._serialized_start=1287
-  _globals['_DATADEFINITION_PART']._serialized_end=1390
-  _globals['_DATADEFINITION_PARTSENTRY']._serialized_start=1392
-  _globals['_DATADEFINITION_PARTSENTRY']._serialized_end=1475
+  _globals['_SCHEMADEFINITION']._serialized_end=654
+  _globals['_PARTKEY']._serialized_start=657
+  _globals['_PARTKEY']._serialized_end=914
+  _globals['_DATADEFINITION']._serialized_start=917
+  _globals['_DATADEFINITION']._serialized_end=1487
+  _globals['_DATADEFINITION_DELTA']._serialized_start=1150
+  _globals['_DATADEFINITION_DELTA']._serialized_end=1195
+  _globals['_DATADEFINITION_SNAP']._serialized_start=1197
+  _globals['_DATADEFINITION_SNAP']._serialized_end=1278
+  _globals['_DATADEFINITION_PART']._serialized_start=1280
+  _globals['_DATADEFINITION_PART']._serialized_end=1383
+  _globals['_DATADEFINITION_PARTSENTRY']._serialized_start=1385
+  _globals['_DATADEFINITION_PARTSENTRY']._serialized_end=1468
 # @@protoc_insertion_point(module_scope)

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

@@ -16,7 +16,7 @@ from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as tracdap_dot_rt_do
 from tracdap.rt._impl.grpc.tracdap.metadata import data_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_data__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n2tracdap/rt/_impl/grpc/tracdap/metadata/model.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\"\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\"\x8a\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\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\"\x8f\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\x12I\n\x0boutputProps\x18\x04 \x03(\x0b\x32\x34.tracdap.metadata.ModelOutputSchema.OutputPropsEntry\x1aK\n\x10OutputPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x08\n\x06_label\"\x9e\x06\n\x0fModelDefinition\x12\x10\n\x08language\x18\x01 \x01(\t\x12\x12\n\nrepository\x18\x02 \x01(\t\x12\x19\n\x0cpackageGroup\x18\n \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07package\x18\x0b \x01(\t\x12\x0f\n\x07version\x18\x06 \x01(\t\x12\x12\n\nentryPoint\x18\x05 \x01(\t\x12\x11\n\x04path\x18\x03 \x01(\tH\x01\x88\x01\x01\x12\x45\n\nparameters\x18\x07 \x03(\x0b\x32\x31.tracdap.metadata.ModelDefinition.ParametersEntry\x12=\n\x06inputs\x18\x08 \x03(\x0b\x32-.tracdap.metadata.ModelDefinition.InputsEntry\x12?\n\x07outputs\x18\t \x03(\x0b\x32..tracdap.metadata.ModelDefinition.OutputsEntry\x12Q\n\x10staticAttributes\x18\x0c \x03(\x0b\x32\x37.tracdap.metadata.ModelDefinition.StaticAttributesEntry\x1aS\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .tracdap.metadata.ModelParameter:\x02\x38\x01\x1aQ\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ModelInputSchema:\x02\x38\x01\x1aS\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x32\n\x05value\x18\x02 \x01(\x0b\x32#.tracdap.metadata.ModelOutputSchema:\x02\x38\x01\x1aP\n\x15StaticAttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0f\n\r_packageGroupB\x07\n\x05_pathB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n2tracdap/rt/_impl/grpc/tracdap/metadata/model.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\"\xab\x02\n\x0eModelParameter\x12\x33\n\tparamType\x18\x01 \x01(\x0b\x32 .tracdap.metadata.TypeDescriptor\x12\r\n\x05label\x18\x02 \x01(\t\x12\x32\n\x0c\x64\x65\x66\x61ultValue\x18\x03 \x01(\x0b\x32\x17.tracdap.metadata.ValueH\x00\x88\x01\x01\x12\x44\n\nparamProps\x18\x04 \x03(\x0b\x32\x30.tracdap.metadata.ModelParameter.ParamPropsEntry\x1aJ\n\x0fParamPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0f\n\r_defaultValue\"\x9b\x02\n\x10ModelInputSchema\x12\x32\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinition\x12\x12\n\x05label\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x10\n\x08optional\x18\x03 \x01(\x08\x12\x0f\n\x07\x64ynamic\x18\x05 \x01(\x08\x12\x46\n\ninputProps\x18\x04 \x03(\x0b\x32\x32.tracdap.metadata.ModelInputSchema.InputPropsEntry\x1aJ\n\x0fInputPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x08\n\x06_label\"\xa0\x02\n\x11ModelOutputSchema\x12\x32\n\x06schema\x18\x01 \x01(\x0b\x32\".tracdap.metadata.SchemaDefinition\x12\x12\n\x05label\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x10\n\x08optional\x18\x03 \x01(\x08\x12\x0f\n\x07\x64ynamic\x18\x05 \x01(\x08\x12I\n\x0boutputProps\x18\x04 \x03(\x0b\x32\x34.tracdap.metadata.ModelOutputSchema.OutputPropsEntry\x1aK\n\x10OutputPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x08\n\x06_label\"\x9e\x06\n\x0fModelDefinition\x12\x10\n\x08language\x18\x01 \x01(\t\x12\x12\n\nrepository\x18\x02 \x01(\t\x12\x19\n\x0cpackageGroup\x18\n \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07package\x18\x0b \x01(\t\x12\x0f\n\x07version\x18\x06 \x01(\t\x12\x12\n\nentryPoint\x18\x05 \x01(\t\x12\x11\n\x04path\x18\x03 \x01(\tH\x01\x88\x01\x01\x12\x45\n\nparameters\x18\x07 \x03(\x0b\x32\x31.tracdap.metadata.ModelDefinition.ParametersEntry\x12=\n\x06inputs\x18\x08 \x03(\x0b\x32-.tracdap.metadata.ModelDefinition.InputsEntry\x12?\n\x07outputs\x18\t \x03(\x0b\x32..tracdap.metadata.ModelDefinition.OutputsEntry\x12Q\n\x10staticAttributes\x18\x0c \x03(\x0b\x32\x37.tracdap.metadata.ModelDefinition.StaticAttributesEntry\x1aS\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .tracdap.metadata.ModelParameter:\x02\x38\x01\x1aQ\n\x0bInputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".tracdap.metadata.ModelInputSchema:\x02\x38\x01\x1aS\n\x0cOutputsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x32\n\x05value\x18\x02 \x01(\x0b\x32#.tracdap.metadata.ModelOutputSchema:\x02\x38\x01\x1aP\n\x15StaticAttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0f\n\r_packageGroupB\x07\n\x05_pathB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -43,21 +43,21 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_start=383
   _globals['_MODELPARAMETER_PARAMPROPSENTRY']._serialized_end=457
   _globals['_MODELINPUTSCHEMA']._serialized_start=477
-  _globals['_MODELINPUTSCHEMA']._serialized_end=743
-  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_start=659
-  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_end=733
-  _globals['_MODELOUTPUTSCHEMA']._serialized_start=746
-  _globals['_MODELOUTPUTSCHEMA']._serialized_end=1017
-  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_start=932
-  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_end=1007
-  _globals['_MODELDEFINITION']._serialized_start=1020
-  _globals['_MODELDEFINITION']._serialized_end=1818
-  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_start=1459
-  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_end=1542
-  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_start=1544
-  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_end=1625
-  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_start=1627
-  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_end=1710
-  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_start=1712
-  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_end=1792
+  _globals['_MODELINPUTSCHEMA']._serialized_end=760
+  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_start=676
+  _globals['_MODELINPUTSCHEMA_INPUTPROPSENTRY']._serialized_end=750
+  _globals['_MODELOUTPUTSCHEMA']._serialized_start=763
+  _globals['_MODELOUTPUTSCHEMA']._serialized_end=1051
+  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_start=966
+  _globals['_MODELOUTPUTSCHEMA_OUTPUTPROPSENTRY']._serialized_end=1041
+  _globals['_MODELDEFINITION']._serialized_start=1054
+  _globals['_MODELDEFINITION']._serialized_end=1852
+  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_start=1493
+  _globals['_MODELDEFINITION_PARAMETERSENTRY']._serialized_end=1576
+  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_start=1578
+  _globals['_MODELDEFINITION_INPUTSENTRY']._serialized_end=1659
+  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_start=1661
+  _globals['_MODELDEFINITION_OUTPUTSENTRY']._serialized_end=1744
+  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_start=1746
+  _globals['_MODELDEFINITION_STATICATTRIBUTESENTRY']._serialized_end=1826
 # @@protoc_insertion_point(module_scope)

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

@@ -27,7 +27,7 @@ class ModelParameter(_message.Message):
     def __init__(self, paramType: _Optional[_Union[_type_pb2.TypeDescriptor, _Mapping]] = ..., label: _Optional[str] = ..., defaultValue: _Optional[_Union[_type_pb2.Value, _Mapping]] = ..., paramProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
 
 class ModelInputSchema(_message.Message):
-    __slots__ = ("schema", "label", "optional", "inputProps")
+    __slots__ = ("schema", "label", "optional", "dynamic", "inputProps")
     class InputPropsEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -38,15 +38,17 @@ class ModelInputSchema(_message.Message):
     SCHEMA_FIELD_NUMBER: _ClassVar[int]
     LABEL_FIELD_NUMBER: _ClassVar[int]
     OPTIONAL_FIELD_NUMBER: _ClassVar[int]
+    DYNAMIC_FIELD_NUMBER: _ClassVar[int]
     INPUTPROPS_FIELD_NUMBER: _ClassVar[int]
     schema: _data_pb2.SchemaDefinition
     label: str
     optional: bool
+    dynamic: bool
     inputProps: _containers.MessageMap[str, _type_pb2.Value]
-    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., inputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
+    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., dynamic: bool = ..., inputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
 
 class ModelOutputSchema(_message.Message):
-    __slots__ = ("schema", "label", "optional", "outputProps")
+    __slots__ = ("schema", "label", "optional", "dynamic", "outputProps")
     class OutputPropsEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -57,12 +59,14 @@ class ModelOutputSchema(_message.Message):
     SCHEMA_FIELD_NUMBER: _ClassVar[int]
     LABEL_FIELD_NUMBER: _ClassVar[int]
     OPTIONAL_FIELD_NUMBER: _ClassVar[int]
+    DYNAMIC_FIELD_NUMBER: _ClassVar[int]
     OUTPUTPROPS_FIELD_NUMBER: _ClassVar[int]
     schema: _data_pb2.SchemaDefinition
     label: str
     optional: bool
+    dynamic: bool
     outputProps: _containers.MessageMap[str, _type_pb2.Value]
-    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., outputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
+    def __init__(self, schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., label: _Optional[str] = ..., optional: bool = ..., dynamic: bool = ..., outputProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
 
 class ModelDefinition(_message.Message):
     __slots__ = ("language", "repository", "packageGroup", "package", "version", "entryPoint", "path", "parameters", "inputs", "outputs", "staticAttributes")

tracdap/rt/_impl/static_api.py

@@ -154,33 +154,49 @@ class StaticApiImpl(_StaticApiHook):
 
     def define_input_table(
             self, *fields: _tp.Union[_meta.FieldSchema, _tp.List[_meta.FieldSchema]],
-            label: _tp.Optional[str] = None,
-            optional: bool = False,
+            label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
             input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
             -> _meta.ModelInputSchema:
 
         _val.validate_signature(
             self.define_input_table, *fields,
-            label=label, optional=optional,
+            label=label, optional=optional, dynamic=dynamic,
             input_props=input_props)
 
-        schema_def = self.define_schema(*fields, schema_type=_meta.SchemaType.TABLE)
-        return _meta.ModelInputSchema(schema=schema_def, label=label, optional=optional, inputProps=input_props)
+        # Do not define details for dynamic schemas
+
+        if dynamic:
+            schema_def = _meta.SchemaDefinition(_meta.SchemaType.TABLE)
+        else:
+            schema_def = self.define_schema(*fields, schema_type=_meta.SchemaType.TABLE)
+
+        return _meta.ModelInputSchema(
+            schema=schema_def, label=label,
+            optional=optional, dynamic=dynamic,
+            inputProps=input_props)
 
     def define_output_table(
             self, *fields: _tp.Union[_meta.FieldSchema, _tp.List[_meta.FieldSchema]],
-            label: _tp.Optional[str] = None,
-            optional: bool = False,
+            label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
             output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
             -> _meta.ModelOutputSchema:
 
         _val.validate_signature(
             self.define_output_table, *fields,
-            label=label, optional=optional,
+            label=label, optional=optional, dynamic=dynamic,
             output_props=output_props)
 
-        schema_def = self.define_schema(*fields, schema_type=_meta.SchemaType.TABLE)
-        return _meta.ModelOutputSchema(schema=schema_def, label=label, optional=optional, outputProps=output_props)
+        # Do not define details for dynamic schemas
+
+        if dynamic:
+            schema_def = _meta.SchemaDefinition(_meta.SchemaType.TABLE)
+        else:
+            schema_def = self.define_schema(*fields, schema_type=_meta.SchemaType.TABLE)
+
+        return _meta.ModelOutputSchema(
+            schema=schema_def, label=label,
+            optional=optional, dynamic=dynamic,
+            outputProps=output_props)
 
     @staticmethod
     def _build_named_dict(

tracdap/rt/_impl/validation.py

@@ -38,7 +38,7 @@ def check_type(expected_type: tp.Type, value: tp.Any) -> bool:
 
 
 def quick_validate_model_def(model_def: meta.ModelDefinition):
-    _StaticValidator.quick_validate_model_def(model_def)
+    StaticValidator.quick_validate_model_def(model_def)
 
 
 class _TypeValidator:
@@ -233,7 +233,7 @@ class _TypeValidator:
         return type_var.__name__
 
 
-class _StaticValidator:
+class StaticValidator:
 
     __identifier_pattern = re.compile("\\A[a-zA-Z_]\\w*\\Z", re.ASCII)
     __reserved_identifier_pattern = re.compile("\\A(_|trac_)", re.ASCII)
@@ -301,6 +301,28 @@ class _StaticValidator:
         cls._check_inputs_or_outputs(model_def.inputs)
         cls._check_inputs_or_outputs(model_def.outputs)
 
+    @classmethod
+    def quick_validate_schema(cls, schema: meta.SchemaDefinition):
+
+        if schema.schemaType != meta.SchemaType.TABLE:
+            cls._fail(f"Unsupported schema type [{schema.schemaType}]")
+
+        if schema.partType != meta.PartType.PART_ROOT:
+            cls._fail(f"Unsupported partition type [{schema.partType}]")
+
+        if schema.table is None or schema.table.fields is None or len(schema.table.fields) == 0:
+            cls._fail(f"Table schema does not define any fields")
+
+        fields = schema.table.fields
+        field_names = list(map(lambda f: f.fieldName, fields))
+        property_type = f"field"
+
+        cls._valid_identifiers(field_names, property_type)
+        cls._case_insensitive_duplicates(field_names, property_type)
+
+        for field in fields:
+            cls._check_single_field(field, property_type)
+
     @classmethod
     def _check_label(cls, label, param_name):
         if label is not None:
@@ -330,10 +352,20 @@ class _StaticValidator:
 
             cls._log.info(f"Checking {input_name}")
 
+            if input_schema.dynamic:
+                if input_schema.schema and input_schema.schema.table:
+                    error = "Dynamic schemas must have schema.table = None"
+                    cls._fail(f"Invalid schema for [{input_name}]: {error}")
+                else:
+                    continue
+
             fields = input_schema.schema.table.fields
             field_names = list(map(lambda f: f.fieldName, fields))
             property_type = f"field in [{input_name}]"
 
+            if len(fields) == 0:
+                cls._fail(f"Invalid schema for [{input_name}]: No fields defined")
+
             cls._valid_identifiers(field_names, property_type)
             cls._case_insensitive_duplicates(field_names, property_type)
 
@@ -375,8 +407,9 @@ class _StaticValidator:
         if field.categorical and field.fieldType != meta.BasicType.STRING:
             cls._fail(f"Invalid {property_type}: [{field.fieldName}] fieldType {field.fieldType} used as categorical")
 
-        if field.businessKey and not field.notNull:
-            cls._fail(f"Invalid {property_type}: [{field.fieldName}] is a business key but not_null = False")
+        # Do not require notNull = True for business keys here
+        # Instead setting businessKey = True will cause notNull = True to be set during normalization
+        # This agrees with the semantics in platform API and CSV schema loader
 
     @classmethod
     def _valid_identifiers(cls, keys, property_type):

tracdap/rt/_version.py

@@ -12,4 +12,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "0.6.3"
+__version__ = "0.6.4"

tracdap/rt/api/hook.py

@@ -121,8 +121,7 @@ class _StaticApiHook:
     @_abc.abstractmethod
     def define_input_table(
             self, *fields: _tp.Union[_meta.FieldSchema, _tp.List[_meta.FieldSchema]],
-            label: _tp.Optional[str] = None,
-            optional: bool = False,
+            label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
             input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
             -> _meta.ModelInputSchema:
 
@@ -131,8 +130,7 @@ class _StaticApiHook:
     @_abc.abstractmethod
     def define_output_table(
             self, *fields: _tp.Union[_meta.FieldSchema, _tp.List[_meta.FieldSchema]],
-            label: _tp.Optional[str] = None,
-            optional: bool = False,
+            label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
             output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
             -> _meta.ModelOutputSchema:
 

tracdap/rt/api/model_api.py

@@ -100,13 +100,26 @@ class TracContext:
         """
         Get the schema of a model input or output
 
-        The schema of an input or output can be retrieved and examined at runtime using this method.
-        Inputs must be defined in :py:meth:`TracModel.define_inputs`
-        and outputs in :py:meth:`TracModel.define_outputs`.
-        Input and output names are case-sensitive.
-
-        In the current version of the runtime all model inputs and outputs are defined statically,
-        :py:meth:`get_schema` will return the schema as it was defined.
+        Use this method to get the :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>`
+        for any input or output of the current model.
+        For datasets with static schemas, this will be the same schema that was defined in the
+        :py:class:`TracModel <tracdap.rt.api.TracModel>` methods
+        :py:meth:`define_inputs() <tracdap.rt.api.TracModel.define_inputs>` and
+        :py:meth:`define_outputs() <tracdap.rt.api.TracModel.define_outputs>`.
+
+        For inputs with dynamic schemas, the schema of the provided input dataset will be returned.
+        For outputs with dynamic schemas the schema must be set by calling
+        :py:meth:`put_schema() <tracdap.rt.api.TracContext.put_schema>`, after which this method
+        will return that schema. Calling :py:meth:`get_schema() <tracdap.rt.api.TracContext.get_schema>`
+        for a dynamic output before the schema is set will result in a runtime validation error.
+
+        For optional inputs, use :py:meth:`has_dataset() <tracdap.rt.api.TracContext.has_dataset>`
+        to check whether the input was provided. Calling :py:meth:`get_schema() <tracdap.rt.api.TracContext.get_schema>`
+        for an optional input that was not provided will always result in a validation error,
+        regardless of whether the input using a static or dynamic schema. For optional outputs
+        :py:meth:`get_schema() <tracdap.rt.api.TracContext.get_schema>` can be called, with the
+        normal proviso that dynamic schemas must first be set by calling
+        :py:meth:`put_schema() <tracdap.rt.api.TracContext.put_schema>`.
 
         Attempting to retrieve the schema for a dataset that is not defined as a model input or output
         will result in a runtime validation error, even if that dataset exists in the job config and
@@ -152,6 +165,36 @@ class TracContext:
         """
         pass
 
+    @_abc.abstractmethod
+    def put_schema(self, dataset_name: str, schema: SchemaDefinition):
+
+        """
+        Set the schema of a dynamic model output
+
+        For outputs marked as dynamic, a :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>`
+        must be supplied before attempting to save the data. TRAC API functions are available to help with
+        building schemas, such as :py:func:`trac.F() <tracdap.rt.api.F>` to define fields or
+        :py:func:`load_schema() <tracdap.rt.api.load_schema>` to load predefined schemas.
+        Once a schema has been set, it can be retrieved by calling
+        :py:meth:`get_schema() <tracdap.rt.api.TracContext.get_schema>` as normal.
+        If :py:meth:`put_schema() <tracdap.rt.api.TracContext.put_schema>` is called for an optional
+        output the model must also supply data for that output, otherwise TRAC will report a runtime
+        validation error after the model completes.
+
+        Each schema can only be set once and the schema will be validated using the normal
+        validation rules. If validation fails this method will raise
+        :py:class:`ERuntimeValidation <tracdap.rt.exceptions.ERuntimeValidation>`.
+        Attempting to set the schema for a dataset that is not defined as a dynamic model output
+        for the current model will result in a runtime validation error.
+
+        :param dataset_name: The name of the output to set the schema for
+        :param schema: A TRAC schema definition to use for the named output
+        :type schema: :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>`
+        :raises: :py:class:`ERuntimeValidation <tracdap.rt.exceptions.ERuntimeValidation>`
+        """
+
+        pass
+
     @_abc.abstractmethod
     def put_pandas_table(self, dataset_name: str, dataset: pandas.DataFrame):
 

tracdap/rt/api/static_api.py

@@ -451,8 +451,7 @@ def load_schema(
 
 def define_input_table(
         *fields: _tp.Union[FieldSchema, _tp.List[FieldSchema]],
-        label: _tp.Optional[str] = None,
-        optional: bool = False,
+        label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
         input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
         -> ModelInputSchema:
 
@@ -469,6 +468,7 @@ def define_input_table(
     :param fields: A set of fields to make up a :py:class:`TableSchema <tracdap.rt.metadata.TableSchema>`
     :param label: An optional label (of type str) for a model input schema. Default value: None.
     :param optional: Mark this input as an optional model input
+    :param dynamic: Mark this input as a dynamic model input (the list of fields must be empty)
     :param input_props: Associate key-value properties with this input (not used by the TRAC engine)
     :return: A model input schema, suitable for returning from :py:meth:`TracModel.define_inputs`
 
@@ -476,12 +476,16 @@ def define_input_table(
                   List[:py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>`]
     :type label: Optional[str]
     :type optional: bool
+    :type dynamic: bool
     :type input_props: Optional[Dict[str, Any]]
     :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
     """
 
     sa = _StaticApiHook.get_instance()
-    return sa.define_input_table(*fields, label=label, optional=optional, input_props=input_props)
+
+    return sa.define_input_table(
+        *fields, label=label, optional=optional, dynamic=dynamic,
+        input_props=input_props)
 
 
 def declare_input_table(
@@ -507,8 +511,7 @@ def declare_input_table(
 
 def define_output_table(
         *fields: _tp.Union[FieldSchema, _tp.List[FieldSchema]],
-        label: _tp.Optional[str] = None,
-        optional: bool = False,
+        label: _tp.Optional[str] = None, optional: bool = False, dynamic: bool = False,
         output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
         -> ModelOutputSchema:
 
@@ -525,6 +528,7 @@ def define_output_table(
     :param fields: A set of fields to make up a :py:class:`TableSchema <tracdap.rt.metadata.TableSchema>`
     :param label: An optional label (of type str) for a model output schema. Default value: None.
     :param optional: Mark this output as an optional model output
+    :param dynamic: Mark this output as a dynamic model output (the list of fields must be empty)
     :param output_props: Associate key-value properties with this output (not used by the TRAC engine)
     :return: A model output schema, suitable for returning from :py:meth:`TracModel.define_outputs`
 
@@ -532,12 +536,16 @@ def define_output_table(
                   List[:py:class:`FieldSchema <tracdap.rt.metadata.FieldSchema>`]
     :type label: Optional[str]
     :type optional: bool
+    :type dynamic: bool
     :type output_props: Optional[Dict[str, Any]]
     :rtype: :py:class:`ModelOutputSchema <tracdap.rt.metadata.ModelOutputSchema>`
     """
 
     sa = _StaticApiHook.get_instance()
-    return sa.define_output_table(*fields, label=label, optional=optional, output_props=output_props)
+
+    return sa.define_output_table(
+        *fields, label=label, optional=optional, dynamic=dynamic,
+        output_props=output_props)
 
 
 def declare_output_table(