tracdap-runtime 0.8.0b4__tar.gz → 0.8.0rc2__tar.gz

{tracdap_runtime-0.8.0b4/tracdap_runtime.egg-info → tracdap_runtime-0.8.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tracdap-runtime
-Version: 0.8.0b4
+Version: 0.8.0rc2
 Summary: Runtime package for building models on the TRAC Data & Analytics Platform
 Home-page: https://tracdap.finos.org/
 Author: Martin Traverse
@@ -46,6 +46,7 @@ Requires-Dist: azure-core==1.30.1; extra == "azure"
 Requires-Dist: azure-identity==1.16.1; extra == "azure"
 Requires-Dist: azure-storage-blob==12.19.1; extra == "azure"
 Requires-Dist: adlfs==2024.4.1; extra == "azure"
+Dynamic: license-file
 
 # TRAC Model Runtime for Python
 
@@ -66,8 +67,9 @@ Documentation for the TRAC platform is available on our website at
 The TRAC runtime for Python has these requirements:
 
 * Python: 3.9 up to 3.13
-* Pandas: 1.2 up to 2.2
-* PySpark 3.0 up to 3.5 (optional)
+* Pandas: 1.2 up to 2.2 (optional)
+* NumPy: 1.2 up to 2.2 (optional, required by Pandas)
+* Polars: 1.X (optional)
 
 3rd party libraries may impose additional constraints on supported versions of key libraries.
 For example, Pandas 1.5 is not available for Python 3.12 or 3.13, while NumPy 2.0 is only

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/README.md

@@ -17,8 +17,9 @@ Documentation for the TRAC platform is available on our website at
 The TRAC runtime for Python has these requirements:
 
 * Python: 3.9 up to 3.13
-* Pandas: 1.2 up to 2.2
-* PySpark 3.0 up to 3.5 (optional)
+* Pandas: 1.2 up to 2.2 (optional)
+* NumPy: 1.2 up to 2.2 (optional, required by Pandas)
+* Polars: 1.X (optional)
 
 3rd party libraries may impose additional constraints on supported versions of key libraries.
 For example, Pandas 1.5 is not available for Python 3.12 or 3.13, while NumPy 2.0 is only

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tracdap-runtime
-version = 0.8.0b4
+version = 0.8.0rc2
 description = Runtime package for building models on the TRAC Data & Analytics Platform
 long_description = file: README.md
 long_description_content_type = text/markdown

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/src/tracdap/rt/_impl/grpc/codec.py

@@ -24,7 +24,7 @@ import tracdap.rt._impl.grpc.tracdap.metadata.object_id_pb2 as object_id_pb2
 import tracdap.rt._impl.grpc.tracdap.metadata.object_pb2 as object_pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import model_pb2
 import tracdap.rt._impl.grpc.tracdap.metadata.data_pb2 as data_pb2
-import tracdap.rt._impl.grpc.tracdap.metadata.stoarge_pb2 as storage_pb2
+import tracdap.rt._impl.grpc.tracdap.metadata.storage_pb2 as storage_pb2
 
 from google.protobuf import message as _message
 

tracdap_runtime-0.8.0rc2/src/tracdap/rt/_impl/grpc/tracdap/metadata/config_pb2.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: tracdap/rt/_impl/grpc/tracdap/metadata/config.proto
+# Protobuf Python Version: 4.25.3
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@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 resource_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_resource__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3tracdap/rt/_impl/grpc/tracdap/metadata/config.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x35tracdap/rt/_impl/grpc/tracdap/metadata/resource.proto\"\xf8\x01\n\x0b\x43onfigEntry\x12\x13\n\x0b\x63onfigClass\x18\x01 \x01(\t\x12\x11\n\tconfigKey\x18\x02 \x01(\t\x12\x15\n\rconfigVersion\x18\x03 \x01(\x05\x12\x38\n\x0f\x63onfigTimestamp\x18\x04 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x16\n\x0eisLatestConfig\x18\x05 \x01(\x08\x12\x15\n\rconfigDeleted\x18\x06 \x01(\x08\x12\x35\n\x07\x64\x65tails\x18\x07 \x01(\x0b\x32\x1f.tracdap.metadata.ConfigDetailsH\x00\x88\x01\x01\x42\n\n\x08_details\"\x8a\x02\n\rConfigDetails\x12\x35\n\x0eobjectSelector\x18\x01 \x01(\x0b\x32\x1d.tracdap.metadata.TagSelector\x12\x30\n\nobjectType\x18\x02 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x35\n\nconfigType\x18\x03 \x01(\x0e\x32\x1c.tracdap.metadata.ConfigTypeH\x00\x88\x01\x01\x12\x39\n\x0cresourceType\x18\x04 \x01(\x0e\x32\x1e.tracdap.metadata.ResourceTypeH\x01\x88\x01\x01\x42\r\n\x0b_configTypeB\x0f\n\r_resourceType\"\xbf\x01\n\x10\x43onfigDefinition\x12\x30\n\nconfigType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ConfigType\x12\x46\n\nproperties\x18\x02 \x03(\x0b\x32\x32.tracdap.metadata.ConfigDefinition.PropertiesEntry\x1a\x31\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01*5\n\nConfigType\x12\x17\n\x13\x43ONFIG_TYPE_NOT_SET\x10\x00\x12\x0e\n\nPROPERTIES\x10\x01\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.config_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
+  _globals['_CONFIGDEFINITION_PROPERTIESENTRY']._options = None
+  _globals['_CONFIGDEFINITION_PROPERTIESENTRY']._serialized_options = b'8\001'
+  _globals['_CONFIGTYPE']._serialized_start=949
+  _globals['_CONFIGTYPE']._serialized_end=1002
+  _globals['_CONFIGENTRY']._serialized_start=236
+  _globals['_CONFIGENTRY']._serialized_end=484
+  _globals['_CONFIGDETAILS']._serialized_start=487
+  _globals['_CONFIGDETAILS']._serialized_end=753
+  _globals['_CONFIGDEFINITION']._serialized_start=756
+  _globals['_CONFIGDEFINITION']._serialized_end=947
+  _globals['_CONFIGDEFINITION_PROPERTIESENTRY']._serialized_start=898
+  _globals['_CONFIGDEFINITION_PROPERTIESENTRY']._serialized_end=947
+# @@protoc_insertion_point(module_scope)

tracdap_runtime-0.8.0rc2/src/tracdap/rt/_impl/grpc/tracdap/metadata/config_pb2.pyi

@@ -0,0 +1,62 @@
+from tracdap.rt._impl.grpc.tracdap.metadata import type_pb2 as _type_pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as _object_id_pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import resource_pb2 as _resource_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 typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class ConfigType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    CONFIG_TYPE_NOT_SET: _ClassVar[ConfigType]
+    PROPERTIES: _ClassVar[ConfigType]
+CONFIG_TYPE_NOT_SET: ConfigType
+PROPERTIES: ConfigType
+
+class ConfigEntry(_message.Message):
+    __slots__ = ("configClass", "configKey", "configVersion", "configTimestamp", "isLatestConfig", "configDeleted", "details")
+    CONFIGCLASS_FIELD_NUMBER: _ClassVar[int]
+    CONFIGKEY_FIELD_NUMBER: _ClassVar[int]
+    CONFIGVERSION_FIELD_NUMBER: _ClassVar[int]
+    CONFIGTIMESTAMP_FIELD_NUMBER: _ClassVar[int]
+    ISLATESTCONFIG_FIELD_NUMBER: _ClassVar[int]
+    CONFIGDELETED_FIELD_NUMBER: _ClassVar[int]
+    DETAILS_FIELD_NUMBER: _ClassVar[int]
+    configClass: str
+    configKey: str
+    configVersion: int
+    configTimestamp: _type_pb2.DatetimeValue
+    isLatestConfig: bool
+    configDeleted: bool
+    details: ConfigDetails
+    def __init__(self, configClass: _Optional[str] = ..., configKey: _Optional[str] = ..., configVersion: _Optional[int] = ..., configTimestamp: _Optional[_Union[_type_pb2.DatetimeValue, _Mapping]] = ..., isLatestConfig: bool = ..., configDeleted: bool = ..., details: _Optional[_Union[ConfigDetails, _Mapping]] = ...) -> None: ...
+
+class ConfigDetails(_message.Message):
+    __slots__ = ("objectSelector", "objectType", "configType", "resourceType")
+    OBJECTSELECTOR_FIELD_NUMBER: _ClassVar[int]
+    OBJECTTYPE_FIELD_NUMBER: _ClassVar[int]
+    CONFIGTYPE_FIELD_NUMBER: _ClassVar[int]
+    RESOURCETYPE_FIELD_NUMBER: _ClassVar[int]
+    objectSelector: _object_id_pb2.TagSelector
+    objectType: _object_id_pb2.ObjectType
+    configType: ConfigType
+    resourceType: _resource_pb2.ResourceType
+    def __init__(self, objectSelector: _Optional[_Union[_object_id_pb2.TagSelector, _Mapping]] = ..., objectType: _Optional[_Union[_object_id_pb2.ObjectType, str]] = ..., configType: _Optional[_Union[ConfigType, str]] = ..., resourceType: _Optional[_Union[_resource_pb2.ResourceType, str]] = ...) -> None: ...
+
+class ConfigDefinition(_message.Message):
+    __slots__ = ("configType", "properties")
+    class PropertiesEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: str
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    CONFIGTYPE_FIELD_NUMBER: _ClassVar[int]
+    PROPERTIES_FIELD_NUMBER: _ClassVar[int]
+    configType: ConfigType
+    properties: _containers.ScalarMap[str, str]
+    def __init__(self, configType: _Optional[_Union[ConfigType, str]] = ..., properties: _Optional[_Mapping[str, str]] = ...) -> None: ...

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/src/tracdap/rt/_impl/grpc/tracdap/metadata/object_id_pb2.py

@@ -15,7 +15,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'\n6tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\x98\x02\n\tTagHeader\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x15\n\robjectVersion\x18\x03 \x01(\x05\x12\x38\n\x0fobjectTimestamp\x18\x04 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x12\n\ntagVersion\x18\x05 \x01(\x05\x12\x35\n\x0ctagTimestamp\x18\x06 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x16\n\x0eisLatestObject\x18\x07 \x01(\x08\x12\x13\n\x0bisLatestTag\x18\x08 \x01(\x08\"\xb9\x02\n\x0bTagSelector\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x16\n\x0clatestObject\x18\x03 \x01(\x08H\x00\x12\x17\n\robjectVersion\x18\x04 \x01(\x05H\x00\x12\x35\n\nobjectAsOf\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x00\x12\x13\n\tlatestTag\x18\x06 \x01(\x08H\x01\x12\x14\n\ntagVersion\x18\x07 \x01(\x05H\x01\x12\x32\n\x07tagAsOf\x18\x08 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x01\x42\x10\n\x0eobjectCriteriaB\r\n\x0btagCriteria*\x88\x01\n\nObjectType\x12\x17\n\x13OBJECT_TYPE_NOT_SET\x10\x00\x12\x08\n\x04\x44\x41TA\x10\x01\x12\t\n\x05MODEL\x10\x02\x12\x08\n\x04\x46LOW\x10\x03\x12\x07\n\x03JOB\x10\x04\x12\x08\n\x04\x46ILE\x10\x05\x12\n\n\x06\x43USTOM\x10\x06\x12\x0b\n\x07STORAGE\x10\x07\x12\n\n\x06SCHEMA\x10\x08\x12\n\n\x06RESULT\x10\tB\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n6tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\x98\x02\n\tTagHeader\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x15\n\robjectVersion\x18\x03 \x01(\x05\x12\x38\n\x0fobjectTimestamp\x18\x04 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x12\n\ntagVersion\x18\x05 \x01(\x05\x12\x35\n\x0ctagTimestamp\x18\x06 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12\x16\n\x0eisLatestObject\x18\x07 \x01(\x08\x12\x13\n\x0bisLatestTag\x18\x08 \x01(\x08\"\xb9\x02\n\x0bTagSelector\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x10\n\x08objectId\x18\x02 \x01(\t\x12\x16\n\x0clatestObject\x18\x03 \x01(\x08H\x00\x12\x17\n\robjectVersion\x18\x04 \x01(\x05H\x00\x12\x35\n\nobjectAsOf\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x00\x12\x13\n\tlatestTag\x18\x06 \x01(\x08H\x01\x12\x14\n\ntagVersion\x18\x07 \x01(\x05H\x01\x12\x32\n\x07tagAsOf\x18\x08 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValueH\x01\x42\x10\n\x0eobjectCriteriaB\r\n\x0btagCriteria*\xa2\x01\n\nObjectType\x12\x17\n\x13OBJECT_TYPE_NOT_SET\x10\x00\x12\x08\n\x04\x44\x41TA\x10\x01\x12\t\n\x05MODEL\x10\x02\x12\x08\n\x04\x46LOW\x10\x03\x12\x07\n\x03JOB\x10\x04\x12\x08\n\x04\x46ILE\x10\x05\x12\n\n\x06\x43USTOM\x10\x06\x12\x0b\n\x07STORAGE\x10\x07\x12\n\n\x06SCHEMA\x10\x08\x12\n\n\x06RESULT\x10\t\x12\n\n\x06\x43ONFIG\x10\n\x12\x0c\n\x08RESOURCE\x10\x0b\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -24,7 +24,7 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
   _globals['_OBJECTTYPE']._serialized_start=727
-  _globals['_OBJECTTYPE']._serialized_end=863
+  _globals['_OBJECTTYPE']._serialized_end=889
   _globals['_TAGHEADER']._serialized_start=128
   _globals['_TAGHEADER']._serialized_end=408
   _globals['_TAGSELECTOR']._serialized_start=411

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/src/tracdap/rt/_impl/grpc/tracdap/metadata/object_id_pb2.pyi

@@ -18,6 +18,8 @@ class ObjectType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     STORAGE: _ClassVar[ObjectType]
     SCHEMA: _ClassVar[ObjectType]
     RESULT: _ClassVar[ObjectType]
+    CONFIG: _ClassVar[ObjectType]
+    RESOURCE: _ClassVar[ObjectType]
 OBJECT_TYPE_NOT_SET: ObjectType
 DATA: ObjectType
 MODEL: ObjectType
@@ -28,6 +30,8 @@ CUSTOM: ObjectType
 STORAGE: ObjectType
 SCHEMA: ObjectType
 RESULT: ObjectType
+CONFIG: ObjectType
+RESOURCE: ObjectType
 
 class TagHeader(_message.Message):
     __slots__ = ("objectType", "objectId", "objectVersion", "objectTimestamp", "tagVersion", "tagTimestamp", "isLatestObject", "isLatestTag")

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/src/tracdap/rt/_impl/grpc/tracdap/metadata/object_pb2.py

@@ -20,10 +20,12 @@ from tracdap.rt._impl.grpc.tracdap.metadata import flow_pb2 as tracdap_dot_rt_do
 from tracdap.rt._impl.grpc.tracdap.metadata import job_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_job__pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import file_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_file__pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import custom_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_custom__pb2
-from tracdap.rt._impl.grpc.tracdap.metadata import stoarge_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_stoarge__pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import storage_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_storage__pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import config_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_config__pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import resource_pb2 as tracdap_dot_rt_dot___impl_dot_grpc_dot_tracdap_dot_metadata_dot_resource__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3tracdap/rt/_impl/grpc/tracdap/metadata/object.proto\x12\x10tracdap.metadata\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\x1a\x32tracdap/rt/_impl/grpc/tracdap/metadata/model.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/flow.proto\x1a\x30tracdap/rt/_impl/grpc/tracdap/metadata/job.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/file.proto\x1a\x33tracdap/rt/_impl/grpc/tracdap/metadata/custom.proto\x1a\x34tracdap/rt/_impl/grpc/tracdap/metadata/stoarge.proto\"\xbd\x05\n\x10ObjectDefinition\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x30\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .tracdap.metadata.DataDefinitionH\x00\x12\x32\n\x05model\x18\x03 \x01(\x0b\x32!.tracdap.metadata.ModelDefinitionH\x00\x12\x30\n\x04\x66low\x18\x04 \x01(\x0b\x32 .tracdap.metadata.FlowDefinitionH\x00\x12.\n\x03job\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.JobDefinitionH\x00\x12\x30\n\x04\x66ile\x18\x06 \x01(\x0b\x32 .tracdap.metadata.FileDefinitionH\x00\x12\x34\n\x06\x63ustom\x18\x07 \x01(\x0b\x32\".tracdap.metadata.CustomDefinitionH\x00\x12\x36\n\x07storage\x18\x08 \x01(\x0b\x32#.tracdap.metadata.StorageDefinitionH\x00\x12\x34\n\x06schema\x18\t \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12\x34\n\x06result\x18\n \x01(\x0b\x32\".tracdap.metadata.ResultDefinitionH\x00\x12H\n\x0bobjectProps\x18\x64 \x03(\x0b\x32\x33.tracdap.metadata.ObjectDefinition.ObjectPropsEntry\x1aK\n\x10ObjectPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0c\n\ndefinitionB2\n\x1aorg.finos.tracdap.metadataB\x12ObjectProtoWrapperP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3tracdap/rt/_impl/grpc/tracdap/metadata/object.proto\x12\x10tracdap.metadata\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/data.proto\x1a\x32tracdap/rt/_impl/grpc/tracdap/metadata/model.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/flow.proto\x1a\x30tracdap/rt/_impl/grpc/tracdap/metadata/job.proto\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/file.proto\x1a\x33tracdap/rt/_impl/grpc/tracdap/metadata/custom.proto\x1a\x34tracdap/rt/_impl/grpc/tracdap/metadata/storage.proto\x1a\x33tracdap/rt/_impl/grpc/tracdap/metadata/config.proto\x1a\x35tracdap/rt/_impl/grpc/tracdap/metadata/resource.proto\"\xad\x06\n\x10ObjectDefinition\x12\x30\n\nobjectType\x18\x01 \x01(\x0e\x32\x1c.tracdap.metadata.ObjectType\x12\x30\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .tracdap.metadata.DataDefinitionH\x00\x12\x32\n\x05model\x18\x03 \x01(\x0b\x32!.tracdap.metadata.ModelDefinitionH\x00\x12\x30\n\x04\x66low\x18\x04 \x01(\x0b\x32 .tracdap.metadata.FlowDefinitionH\x00\x12.\n\x03job\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.JobDefinitionH\x00\x12\x30\n\x04\x66ile\x18\x06 \x01(\x0b\x32 .tracdap.metadata.FileDefinitionH\x00\x12\x34\n\x06\x63ustom\x18\x07 \x01(\x0b\x32\".tracdap.metadata.CustomDefinitionH\x00\x12\x36\n\x07storage\x18\x08 \x01(\x0b\x32#.tracdap.metadata.StorageDefinitionH\x00\x12\x34\n\x06schema\x18\t \x01(\x0b\x32\".tracdap.metadata.SchemaDefinitionH\x00\x12\x34\n\x06result\x18\n \x01(\x0b\x32\".tracdap.metadata.ResultDefinitionH\x00\x12\x34\n\x06\x63onfig\x18\x0b \x01(\x0b\x32\".tracdap.metadata.ConfigDefinitionH\x00\x12\x38\n\x08resource\x18\x0c \x01(\x0b\x32$.tracdap.metadata.ResourceDefinitionH\x00\x12H\n\x0bobjectProps\x18\x64 \x03(\x0b\x32\x33.tracdap.metadata.ObjectDefinition.ObjectPropsEntry\x1aK\n\x10ObjectPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\x42\x0c\n\ndefinitionB2\n\x1aorg.finos.tracdap.metadataB\x12ObjectProtoWrapperP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -33,8 +35,8 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataB\022ObjectProtoWrapperP\001'
   _globals['_OBJECTDEFINITION_OBJECTPROPSENTRY']._options = None
   _globals['_OBJECTDEFINITION_OBJECTPROPSENTRY']._serialized_options = b'8\001'
-  _globals['_OBJECTDEFINITION']._serialized_start=543
-  _globals['_OBJECTDEFINITION']._serialized_end=1244
-  _globals['_OBJECTDEFINITION_OBJECTPROPSENTRY']._serialized_start=1155
-  _globals['_OBJECTDEFINITION_OBJECTPROPSENTRY']._serialized_end=1230
+  _globals['_OBJECTDEFINITION']._serialized_start=651
+  _globals['_OBJECTDEFINITION']._serialized_end=1464
+  _globals['_OBJECTDEFINITION_OBJECTPROPSENTRY']._serialized_start=1375
+  _globals['_OBJECTDEFINITION_OBJECTPROPSENTRY']._serialized_end=1450
 # @@protoc_insertion_point(module_scope)

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/src/tracdap/rt/_impl/grpc/tracdap/metadata/object_pb2.pyi

@@ -6,7 +6,9 @@ from tracdap.rt._impl.grpc.tracdap.metadata import flow_pb2 as _flow_pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import job_pb2 as _job_pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import file_pb2 as _file_pb2
 from tracdap.rt._impl.grpc.tracdap.metadata import custom_pb2 as _custom_pb2
-from tracdap.rt._impl.grpc.tracdap.metadata import stoarge_pb2 as _stoarge_pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import storage_pb2 as _storage_pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import config_pb2 as _config_pb2
+from tracdap.rt._impl.grpc.tracdap.metadata import resource_pb2 as _resource_pb2
 from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
@@ -15,7 +17,7 @@ from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Opti
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class ObjectDefinition(_message.Message):
-    __slots__ = ("objectType", "data", "model", "flow", "job", "file", "custom", "storage", "schema", "result", "objectProps")
+    __slots__ = ("objectType", "data", "model", "flow", "job", "file", "custom", "storage", "schema", "result", "config", "resource", "objectProps")
     class ObjectPropsEntry(_message.Message):
         __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -33,6 +35,8 @@ class ObjectDefinition(_message.Message):
     STORAGE_FIELD_NUMBER: _ClassVar[int]
     SCHEMA_FIELD_NUMBER: _ClassVar[int]
     RESULT_FIELD_NUMBER: _ClassVar[int]
+    CONFIG_FIELD_NUMBER: _ClassVar[int]
+    RESOURCE_FIELD_NUMBER: _ClassVar[int]
     OBJECTPROPS_FIELD_NUMBER: _ClassVar[int]
     objectType: _object_id_pb2.ObjectType
     data: _data_pb2.DataDefinition
@@ -41,8 +45,10 @@ class ObjectDefinition(_message.Message):
     job: _job_pb2.JobDefinition
     file: _file_pb2.FileDefinition
     custom: _custom_pb2.CustomDefinition
-    storage: _stoarge_pb2.StorageDefinition
+    storage: _storage_pb2.StorageDefinition
     schema: _data_pb2.SchemaDefinition
     result: _job_pb2.ResultDefinition
+    config: _config_pb2.ConfigDefinition
+    resource: _resource_pb2.ResourceDefinition
     objectProps: _containers.MessageMap[str, _type_pb2.Value]
-    def __init__(self, objectType: _Optional[_Union[_object_id_pb2.ObjectType, str]] = ..., data: _Optional[_Union[_data_pb2.DataDefinition, _Mapping]] = ..., model: _Optional[_Union[_model_pb2.ModelDefinition, _Mapping]] = ..., flow: _Optional[_Union[_flow_pb2.FlowDefinition, _Mapping]] = ..., job: _Optional[_Union[_job_pb2.JobDefinition, _Mapping]] = ..., file: _Optional[_Union[_file_pb2.FileDefinition, _Mapping]] = ..., custom: _Optional[_Union[_custom_pb2.CustomDefinition, _Mapping]] = ..., storage: _Optional[_Union[_stoarge_pb2.StorageDefinition, _Mapping]] = ..., schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., result: _Optional[_Union[_job_pb2.ResultDefinition, _Mapping]] = ..., objectProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...
+    def __init__(self, objectType: _Optional[_Union[_object_id_pb2.ObjectType, str]] = ..., data: _Optional[_Union[_data_pb2.DataDefinition, _Mapping]] = ..., model: _Optional[_Union[_model_pb2.ModelDefinition, _Mapping]] = ..., flow: _Optional[_Union[_flow_pb2.FlowDefinition, _Mapping]] = ..., job: _Optional[_Union[_job_pb2.JobDefinition, _Mapping]] = ..., file: _Optional[_Union[_file_pb2.FileDefinition, _Mapping]] = ..., custom: _Optional[_Union[_custom_pb2.CustomDefinition, _Mapping]] = ..., storage: _Optional[_Union[_storage_pb2.StorageDefinition, _Mapping]] = ..., schema: _Optional[_Union[_data_pb2.SchemaDefinition, _Mapping]] = ..., result: _Optional[_Union[_job_pb2.ResultDefinition, _Mapping]] = ..., config: _Optional[_Union[_config_pb2.ConfigDefinition, _Mapping]] = ..., resource: _Optional[_Union[_resource_pb2.ResourceDefinition, _Mapping]] = ..., objectProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...

tracdap_runtime-0.8.0rc2/src/tracdap/rt/_impl/grpc/tracdap/metadata/resource_pb2.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: tracdap/rt/_impl/grpc/tracdap/metadata/resource.proto
+# Protobuf Python Version: 4.25.3
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+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'\n5tracdap/rt/_impl/grpc/tracdap/metadata/resource.proto\x12\x10tracdap.metadata\x1a\x36tracdap/rt/_impl/grpc/tracdap/metadata/object_id.proto\"\x86\x04\n\x12ResourceDefinition\x12\x34\n\x0cresourceType\x18\x01 \x01(\x0e\x32\x1e.tracdap.metadata.ResourceType\x12\x10\n\x08protocol\x18\x02 \x01(\t\x12\x18\n\x0bsubProtocol\x18\x03 \x01(\tH\x00\x88\x01\x01\x12T\n\x10publicProperties\x18\x04 \x03(\x0b\x32:.tracdap.metadata.ResourceDefinition.PublicPropertiesEntry\x12H\n\nproperties\x18\x05 \x03(\x0b\x32\x34.tracdap.metadata.ResourceDefinition.PropertiesEntry\x12\x42\n\x07secrets\x18\x06 \x03(\x0b\x32\x31.tracdap.metadata.ResourceDefinition.SecretsEntry\x1a\x37\n\x15PublicPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x31\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a.\n\x0cSecretsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x0e\n\x0c_subProtocol*k\n\x0cResourceType\x12\x19\n\x15RESOURCE_TYPE_NOT_SET\x10\x00\x12\x14\n\x10MODEL_REPOSITORY\x10\x01\x12\x14\n\x10INTERNAL_STORAGE\x10\x02\x12\x14\n\x10\x45XTERNAL_STORAGE\x10\x03\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.resource_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
+  _globals['_RESOURCEDEFINITION_PUBLICPROPERTIESENTRY']._options = None
+  _globals['_RESOURCEDEFINITION_PUBLICPROPERTIESENTRY']._serialized_options = b'8\001'
+  _globals['_RESOURCEDEFINITION_PROPERTIESENTRY']._options = None
+  _globals['_RESOURCEDEFINITION_PROPERTIESENTRY']._serialized_options = b'8\001'
+  _globals['_RESOURCEDEFINITION_SECRETSENTRY']._options = None
+  _globals['_RESOURCEDEFINITION_SECRETSENTRY']._serialized_options = b'8\001'
+  _globals['_RESOURCETYPE']._serialized_start=652
+  _globals['_RESOURCETYPE']._serialized_end=759
+  _globals['_RESOURCEDEFINITION']._serialized_start=132
+  _globals['_RESOURCEDEFINITION']._serialized_end=650
+  _globals['_RESOURCEDEFINITION_PUBLICPROPERTIESENTRY']._serialized_start=480
+  _globals['_RESOURCEDEFINITION_PUBLICPROPERTIESENTRY']._serialized_end=535
+  _globals['_RESOURCEDEFINITION_PROPERTIESENTRY']._serialized_start=537
+  _globals['_RESOURCEDEFINITION_PROPERTIESENTRY']._serialized_end=586
+  _globals['_RESOURCEDEFINITION_SECRETSENTRY']._serialized_start=588
+  _globals['_RESOURCEDEFINITION_SECRETSENTRY']._serialized_end=634
+# @@protoc_insertion_point(module_scope)

tracdap_runtime-0.8.0rc2/src/tracdap/rt/_impl/grpc/tracdap/metadata/resource_pb2.pyi

@@ -0,0 +1,56 @@
+from tracdap.rt._impl.grpc.tracdap.metadata import object_id_pb2 as _object_id_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 typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class ResourceType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    RESOURCE_TYPE_NOT_SET: _ClassVar[ResourceType]
+    MODEL_REPOSITORY: _ClassVar[ResourceType]
+    INTERNAL_STORAGE: _ClassVar[ResourceType]
+    EXTERNAL_STORAGE: _ClassVar[ResourceType]
+RESOURCE_TYPE_NOT_SET: ResourceType
+MODEL_REPOSITORY: ResourceType
+INTERNAL_STORAGE: ResourceType
+EXTERNAL_STORAGE: ResourceType
+
+class ResourceDefinition(_message.Message):
+    __slots__ = ("resourceType", "protocol", "subProtocol", "publicProperties", "properties", "secrets")
+    class PublicPropertiesEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: str
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    class PropertiesEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: str
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    class SecretsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: str
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    RESOURCETYPE_FIELD_NUMBER: _ClassVar[int]
+    PROTOCOL_FIELD_NUMBER: _ClassVar[int]
+    SUBPROTOCOL_FIELD_NUMBER: _ClassVar[int]
+    PUBLICPROPERTIES_FIELD_NUMBER: _ClassVar[int]
+    PROPERTIES_FIELD_NUMBER: _ClassVar[int]
+    SECRETS_FIELD_NUMBER: _ClassVar[int]
+    resourceType: ResourceType
+    protocol: str
+    subProtocol: str
+    publicProperties: _containers.ScalarMap[str, str]
+    properties: _containers.ScalarMap[str, str]
+    secrets: _containers.ScalarMap[str, str]
+    def __init__(self, resourceType: _Optional[_Union[ResourceType, str]] = ..., protocol: _Optional[str] = ..., subProtocol: _Optional[str] = ..., publicProperties: _Optional[_Mapping[str, str]] = ..., properties: _Optional[_Mapping[str, str]] = ..., secrets: _Optional[_Mapping[str, str]] = ...) -> None: ...

tracdap_runtime-0.8.0b4/src/tracdap/rt/_impl/grpc/tracdap/metadata/stoarge_pb2.py → tracdap_runtime-0.8.0rc2/src/tracdap/rt/_impl/grpc/tracdap/metadata/storage_pb2.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: tracdap/rt/_impl/grpc/tracdap/metadata/stoarge.proto
+# source: tracdap/rt/_impl/grpc/tracdap/metadata/storage.proto
 # Protobuf Python Version: 4.25.3
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
@@ -15,11 +15,11 @@ _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'\n4tracdap/rt/_impl/grpc/tracdap/metadata/stoarge.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\xd2\x02\n\x0bStorageCopy\x12\x12\n\nstorageKey\x18\x01 \x01(\t\x12\x13\n\x0bstoragePath\x18\x02 \x01(\t\x12\x15\n\rstorageFormat\x18\x03 \x01(\t\x12\x30\n\ncopyStatus\x18\x04 \x01(\x0e\x32\x1c.tracdap.metadata.CopyStatus\x12\x36\n\rcopyTimestamp\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12I\n\x0estorageOptions\x18\x06 \x03(\x0b\x32\x31.tracdap.metadata.StorageCopy.StorageOptionsEntry\x1aN\n\x13StorageOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\"\xdc\x01\n\x12StorageIncarnation\x12-\n\x06\x63opies\x18\x01 \x03(\x0b\x32\x1d.tracdap.metadata.StorageCopy\x12\x18\n\x10incarnationIndex\x18\x02 \x01(\x05\x12=\n\x14incarnationTimestamp\x18\x03 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12>\n\x11incarnationStatus\x18\x04 \x01(\x0e\x32#.tracdap.metadata.IncarnationStatus\"I\n\x0bStorageItem\x12:\n\x0cincarnations\x18\x01 \x03(\x0b\x32$.tracdap.metadata.StorageIncarnation\"\xe1\x02\n\x11StorageDefinition\x12\x45\n\tdataItems\x18\x01 \x03(\x0b\x32\x32.tracdap.metadata.StorageDefinition.DataItemsEntry\x12O\n\x0estorageOptions\x18\x03 \x03(\x0b\x32\x37.tracdap.metadata.StorageDefinition.StorageOptionsEntry\x1aO\n\x0e\x44\x61taItemsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.StorageItem:\x02\x38\x01\x1aN\n\x13StorageOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01J\x04\x08\x02\x10\x03R\rstorageFormat*L\n\nCopyStatus\x12\x17\n\x13\x43OPY_STATUS_NOT_SET\x10\x00\x12\x12\n\x0e\x43OPY_AVAILABLE\x10\x01\x12\x11\n\rCOPY_EXPUNGED\x10\x02*h\n\x11IncarnationStatus\x12\x1e\n\x1aINCARNATION_STATUS_NOT_SET\x10\x00\x12\x19\n\x15INCARNATION_AVAILABLE\x10\x01\x12\x18\n\x14INCARNATION_EXPUNGED\x10\x02\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n4tracdap/rt/_impl/grpc/tracdap/metadata/storage.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\xd2\x02\n\x0bStorageCopy\x12\x12\n\nstorageKey\x18\x01 \x01(\t\x12\x13\n\x0bstoragePath\x18\x02 \x01(\t\x12\x15\n\rstorageFormat\x18\x03 \x01(\t\x12\x30\n\ncopyStatus\x18\x04 \x01(\x0e\x32\x1c.tracdap.metadata.CopyStatus\x12\x36\n\rcopyTimestamp\x18\x05 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12I\n\x0estorageOptions\x18\x06 \x03(\x0b\x32\x31.tracdap.metadata.StorageCopy.StorageOptionsEntry\x1aN\n\x13StorageOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01\"\xdc\x01\n\x12StorageIncarnation\x12-\n\x06\x63opies\x18\x01 \x03(\x0b\x32\x1d.tracdap.metadata.StorageCopy\x12\x18\n\x10incarnationIndex\x18\x02 \x01(\x05\x12=\n\x14incarnationTimestamp\x18\x03 \x01(\x0b\x32\x1f.tracdap.metadata.DatetimeValue\x12>\n\x11incarnationStatus\x18\x04 \x01(\x0e\x32#.tracdap.metadata.IncarnationStatus\"I\n\x0bStorageItem\x12:\n\x0cincarnations\x18\x01 \x03(\x0b\x32$.tracdap.metadata.StorageIncarnation\"\xe1\x02\n\x11StorageDefinition\x12\x45\n\tdataItems\x18\x01 \x03(\x0b\x32\x32.tracdap.metadata.StorageDefinition.DataItemsEntry\x12O\n\x0estorageOptions\x18\x03 \x03(\x0b\x32\x37.tracdap.metadata.StorageDefinition.StorageOptionsEntry\x1aO\n\x0e\x44\x61taItemsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.metadata.StorageItem:\x02\x38\x01\x1aN\n\x13StorageOptionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01J\x04\x08\x02\x10\x03R\rstorageFormat*L\n\nCopyStatus\x12\x17\n\x13\x43OPY_STATUS_NOT_SET\x10\x00\x12\x12\n\x0e\x43OPY_AVAILABLE\x10\x01\x12\x11\n\rCOPY_EXPUNGED\x10\x02*h\n\x11IncarnationStatus\x12\x1e\n\x1aINCARNATION_STATUS_NOT_SET\x10\x00\x12\x19\n\x15INCARNATION_AVAILABLE\x10\x01\x12\x18\n\x14INCARNATION_EXPUNGED\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.stoarge_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.rt._impl.grpc.tracdap.metadata.storage_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/src/tracdap/rt/_version.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "0.8.0b4"
+__version__ = "0.8.0rc2"

tracdap_runtime-0.8.0rc2/src/tracdap/rt/api/__init__.py

@@ -0,0 +1,29 @@
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""
+TRAC model API for Python
+"""
+
+# 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
+from tracdap.rt.metadata import *  # noqa DOCGEN_REMOVE
+
+# static_api overrides some metadata types for backwards compatibility with pre-0.8 versions
+# Make sure it is last in the list
+from .constants import *
+from .model_api import *
+from .static_api import *
+

tracdap_runtime-0.8.0b4/src/tracdap/rt/api/__init__.py → tracdap_runtime-0.8.0rc2/src/tracdap/rt/api/constants.py

@@ -13,39 +13,45 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-"""
-TRAC model API for Python
-"""
+import tracdap.rt.metadata
 
-# 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
-from tracdap.rt.metadata import *  # noqa DOCGEN_REMOVE
 
-# static_api overrides some metadata types for backwards compatibility with pre-0.8 versions
-# Make sure it is last in the list
-from .file_types import *
-from .model_api import *
-from .static_api import *
+class CommonFileTypes:
+
+    """
+    A collection of common :py:class:`FileTypes <tracdap.rt.metadata.FileType>` to use as model inputs and outputs
+    """
+
+    TXT = tracdap.rt.metadata.FileType("txt", "text/plain")
+
+    JPG = tracdap.rt.metadata.FileType("jpg", "image/jpeg")
+    PNG = tracdap.rt.metadata.FileType("png", "image/png")
+    SVG  = tracdap.rt.metadata.FileType("svg", "image/svg+xml")
+
+    WORD = tracdap.rt.metadata.FileType("docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+    EXCEL = tracdap.rt.metadata.FileType("xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+    POWERPOINT = tracdap.rt.metadata.FileType("pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation")
+
 
 # Map basic types into the root of the API package
 
-BOOLEAN = BasicType.BOOLEAN
+BOOLEAN = tracdap.rt.metadata.BasicType.BOOLEAN
 """Synonym for :py:attr:`BasicType.BOOLEAN <tracdap.rt.metadata.BasicType.BOOLEAN>`"""
 
-INTEGER = BasicType.INTEGER
+INTEGER = tracdap.rt.metadata.BasicType.INTEGER
 """Synonym for :py:attr:`BasicType.INTEGER <tracdap.rt.metadata.BasicType.INTEGER>`"""
 
-FLOAT = BasicType.FLOAT
+FLOAT = tracdap.rt.metadata.BasicType.FLOAT
 """Synonym for :py:attr:`BasicType.FLOAT <tracdap.rt.metadata.BasicType.FLOAT>`"""
 
-DECIMAL = BasicType.DECIMAL
+DECIMAL = tracdap.rt.metadata.BasicType.DECIMAL
 """Synonym for :py:attr:`BasicType.DECIMAL <tracdap.rt.metadata.BasicType.DECIMAL>`"""
 
-STRING = BasicType.STRING
+STRING = tracdap.rt.metadata.BasicType.STRING
 """Synonym for :py:attr:`BasicType.STRING <tracdap.rt.metadata.BasicType.STRING>`"""
 
-DATE = BasicType.DATE
+DATE = tracdap.rt.metadata.BasicType.DATE
 """Synonym for :py:attr:`BasicType.DATE <tracdap.rt.metadata.BasicType.DATE>`"""
 
-DATETIME = BasicType.DATETIME
+DATETIME = tracdap.rt.metadata.BasicType.DATETIME
 """Synonym for :py:attr:`BasicType.DATETIME <tracdap.rt.metadata.BasicType.DATETIME>`"""

{tracdap_runtime-0.8.0b4 → tracdap_runtime-0.8.0rc2}/src/tracdap/rt/api/static_api.py

@@ -384,6 +384,14 @@ def load_schema(
 
 def define_file_type(extension: str, mime_type: str) -> FileType:
 
+    """
+    Define a :py:class:`FileType <tracdap.rt.metadata.FileType>` for use as a model input or output
+
+    :type extension: str
+    :type mime_type: str
+    :rtype: :py:class:`FileType <tracdap.rt.metadata.FileType>`
+    """
+
     sa = _StaticApiHook.get_instance()
     return sa.define_file_type(extension, mime_type)
 
@@ -394,6 +402,17 @@ def define_input(
         optional: bool = False, dynamic: bool = False,
         input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None):
 
+    """
+    Define a model input, which can be any type of dataset or file
+
+    :type requirement: :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>` | :py:class:`FileType <tracdap.rt.metadata.FileType>`
+    :type label: str | None
+    :type optional: bool
+    :type dynamic: bool
+    :type input_props: dict[str, :py:class:`Value <tracdap.rt.metadata.Value>`
+    :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
+    """
+
     sa = _StaticApiHook.get_instance()
     return sa.define_input(requirement, label=label, optional=optional, dynamic=dynamic, input_props=input_props)
 
@@ -404,6 +423,17 @@ def define_output(
         optional: bool = False, dynamic: bool = False,
         output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None):
 
+    """
+    Define a model output, which can be any type of dataset or file
+
+    :type requirement: :py:class:`SchemaDefinition <tracdap.rt.metadata.SchemaDefinition>` | :py:class:`FileType <tracdap.rt.metadata.FileType>`
+    :type label: str | None
+    :type optional: bool
+    :type dynamic: bool
+    :type output_props: dict[str, :py:class:`Value <tracdap.rt.metadata.Value>`
+    :rtype: :py:class:`ModelOutputSchema <tracdap.rt.metadata.ModelOutputSchema>`
+    """
+
     sa = _StaticApiHook.get_instance()
     return sa.define_output(requirement, label=label, optional=optional, dynamic=dynamic, output_props=output_props)
 
@@ -415,7 +445,7 @@ def define_input_table(
         -> ModelInputSchema:
 
     """
-    Define a model input with a table schema
+    Define a model input for a :py:class:`TableSchema <tracdap.rt.metadata.TableSchema>`
 
     Individual fields can be defined using :py:func:`define_field` or the shorthand alias :py:func:`F`.
     This function takes a number of fields, either as individual arguments or as a list, and uses them
@@ -460,7 +490,7 @@ def define_output_table(
         -> ModelOutputSchema:
 
     """
-    Define a model output with a table schema
+    Define a model output for a :py:class:`TableSchema <tracdap.rt.metadata.TableSchema>`
 
     Individual fields can be defined using :py:func:`define_field` or the shorthand alias :py:func:`F`.
     This function takes a number of fields, either as individual arguments or as a list, and uses them
@@ -502,6 +532,17 @@ def define_input_file(
         input_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
         -> ModelInputSchema:
 
+    """
+    Define a model input for a :py:class:`FileType <tracdap.rt.metadata.FileType>`
+
+    :type extension str
+    :type mime_type: sr
+    :type label: str | None
+    :type optional: bool
+    :type input_props: dict[str, Any] | None
+    :rtype: :py:class:`ModelInputSchema <tracdap.rt.metadata.ModelInputSchema>`
+    """
+
     file_type = define_file_type(extension, mime_type)
     return define_input(file_type, label=label, optional=optional, input_props=input_props)
 
@@ -512,6 +553,17 @@ def define_output_file(
         output_props: _tp.Optional[_tp.Dict[str, _tp.Any]] = None) \
         -> ModelOutputSchema:
 
+    """
+    Define a model output for a :py:class:`FileType <tracdap.rt.metadata.FileType>`
+
+    :type extension str
+    :type mime_type: sr
+    :type label: str | None
+    :type optional: bool
+    :type output_props: dict[str, Any] | None
+    :rtype: :py:class:`ModelOutputSchema <tracdap.rt.metadata.ModelOutputSchema>`
+    """
+
     file_type = define_file_type(extension, mime_type)
     return define_output(file_type, label=label, optional=optional, output_props=output_props)