tracdap-runtime 0.11.0rc2__tar.gz → 0.11.1.dev0__tar.gz

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/PKG-INFO

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

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tracdap-runtime
-version = 0.11.0rc2
+version = 0.11.1.dev0
 license = Apache-2.0
 platform = any
 description = Portable, production-grade models in Python

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/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.11.0rc2"
+__version__ = "0.11.1.dev0"

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/src/tracdap/rt/_impl/grpc/tracdap/metadata/common_pb2.py

@@ -22,9 +22,10 @@ _runtime_version.ValidateProtobufRuntimeVersion(
 _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'\n3tracdap/rt/_impl/grpc/tracdap/metadata/common.proto\x12\x10tracdap.metadata\"5\n\nTenantInfo\x12\x12\n\ntenantCode\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t*L\n\x0eMetadataFormat\x12\x1b\n\x17METADATA_FORMAT_NOT_SET\x10\x00\x12\t\n\x05PROTO\x10\x01\x12\x08\n\x04JSON\x10\x02\x12\x08\n\x04YAML\x10\x03*H\n\x0fMetadataVersion\x12\x1c\n\x18METADATA_VERSION_NOT_SET\x10\x00\x12\x06\n\x02V1\x10\x01\x12\x0b\n\x07\x43URRENT\x10\x01\x1a\x02\x10\x01\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3tracdap/rt/_impl/grpc/tracdap/metadata/common.proto\x12\x10tracdap.metadata\x1a\x31tracdap/rt/_impl/grpc/tracdap/metadata/type.proto\"\xc6\x01\n\nTenantInfo\x12\x12\n\ntenantCode\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x42\n\x0btenantProps\x18\x03 \x03(\x0b\x32-.tracdap.metadata.TenantInfo.TenantPropsEntry\x1aK\n\x10TenantPropsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.tracdap.metadata.Value:\x02\x38\x01*L\n\x0eMetadataFormat\x12\x1b\n\x17METADATA_FORMAT_NOT_SET\x10\x00\x12\t\n\x05PROTO\x10\x01\x12\x08\n\x04JSON\x10\x02\x12\x08\n\x04YAML\x10\x03*H\n\x0fMetadataVersion\x12\x1c\n\x18METADATA_VERSION_NOT_SET\x10\x00\x12\x06\n\x02V1\x10\x01\x12\x0b\n\x07\x43URRENT\x10\x01\x1a\x02\x10\x01\x42\x1e\n\x1aorg.finos.tracdap.metadataP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -34,10 +35,14 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._serialized_options = b'\n\032org.finos.tracdap.metadataP\001'
   _globals['_METADATAVERSION']._loaded_options = None
   _globals['_METADATAVERSION']._serialized_options = b'\020\001'
-  _globals['_METADATAFORMAT']._serialized_start=128
-  _globals['_METADATAFORMAT']._serialized_end=204
-  _globals['_METADATAVERSION']._serialized_start=206
-  _globals['_METADATAVERSION']._serialized_end=278
-  _globals['_TENANTINFO']._serialized_start=73
-  _globals['_TENANTINFO']._serialized_end=126
+  _globals['_TENANTINFO_TENANTPROPSENTRY']._loaded_options = None
+  _globals['_TENANTINFO_TENANTPROPSENTRY']._serialized_options = b'8\001'
+  _globals['_METADATAFORMAT']._serialized_start=325
+  _globals['_METADATAFORMAT']._serialized_end=401
+  _globals['_METADATAVERSION']._serialized_start=403
+  _globals['_METADATAVERSION']._serialized_end=475
+  _globals['_TENANTINFO']._serialized_start=125
+  _globals['_TENANTINFO']._serialized_end=323
+  _globals['_TENANTINFO_TENANTPROPSENTRY']._serialized_start=248
+  _globals['_TENANTINFO_TENANTPROPSENTRY']._serialized_end=323
 # @@protoc_insertion_point(module_scope)

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/src/tracdap/rt/_impl/grpc/tracdap/metadata/common_pb2.pyi

@@ -1,7 +1,10 @@
+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 typing import ClassVar as _ClassVar, Optional as _Optional
+from collections.abc import Mapping as _Mapping
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
@@ -26,9 +29,18 @@ V1: MetadataVersion
 CURRENT: MetadataVersion
 
 class TenantInfo(_message.Message):
-    __slots__ = ("tenantCode", "description")
+    __slots__ = ("tenantCode", "description", "tenantProps")
+    class TenantPropsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: _type_pb2.Value
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[_type_pb2.Value, _Mapping]] = ...) -> None: ...
     TENANTCODE_FIELD_NUMBER: _ClassVar[int]
     DESCRIPTION_FIELD_NUMBER: _ClassVar[int]
+    TENANTPROPS_FIELD_NUMBER: _ClassVar[int]
     tenantCode: str
     description: str
-    def __init__(self, tenantCode: _Optional[str] = ..., description: _Optional[str] = ...) -> None: ...
+    tenantProps: _containers.MessageMap[str, _type_pb2.Value]
+    def __init__(self, tenantCode: _Optional[str] = ..., description: _Optional[str] = ..., tenantProps: _Optional[_Mapping[str, _type_pb2.Value]] = ...) -> None: ...

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/src/tracdap/rt/api/__init__.py

@@ -17,7 +17,7 @@
 TRAC model API for Python
 """
 
-__version__ = "0.11.0rc2"
+__version__ = "0.11.1.dev0"
 
 # 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.11.0rc2 → tracdap_runtime-0.11.1.dev0}/src/tracdap/rt/api/static_api.py

@@ -1013,6 +1013,6 @@ def declare_output_table(
     :display: False
     """
 
-    print("TRAC Warning: declare_output_table() is deprecated, please use define_output_table()", file==sys.stderr)
+    print("TRAC Warning: declare_output_table() is deprecated, please use define_output_table()", file=sys.stderr)
 
     return define_output_table(*fields)

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/src/tracdap/rt/metadata/common.py

@@ -4,6 +4,9 @@ import typing as _tp  # noqa
 import dataclasses as _dc  # noqa
 import enum as _enum  # noqa
 
+from .type import *  # noqa
+
+
 class MetadataFormat(_enum.Enum):
 
     """
@@ -55,3 +58,11 @@ class TenantInfo:
     description: "str" = ""
 
     """* A short description of the tenant, suitable for displaying to users in lists."""
+
+    tenantProps: "_tp.Dict[str, Value]" = _dc.field(default_factory=dict)
+
+    """
+    Properties a deployment adds to the tenant, for display.
+    
+    TRAC itself does not set any tenant properties.
+    """

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/tracdap_runtime.egg-info/PKG-INFO

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

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/src/tracdap/rt/config/__init__.py

@@ -1,5 +1,10 @@
 # Code generated by TRAC
 
+from .tenant import TenantConfigMap
+from .tenant import TenantConfig
+
+from .job import JobConfig
+
 from .common import _ConfigFile
 from .common import PluginConfig
 from .common import PlatformInfo
@@ -7,10 +12,7 @@ from .common import ServiceConfig
 
 from .runtime import RuntimeConfig
 
-from .job import JobConfig
-
-from .tenant import TenantConfigMap
-from .tenant import TenantConfig
+from .dynamic import DynamicConfig
 
 from .platform import RoutingProtocol
 from .platform import ServicesLayout
@@ -24,5 +26,3 @@ from .platform import DeploymentConfig
 
 from .result import JobResultAttrs
 from .result import JobResult
-
-from .dynamic import DynamicConfig

{tracdap_runtime-0.11.0rc2 → tracdap_runtime-0.11.1.dev0}/src/tracdap/rt/metadata/__init__.py

@@ -13,6 +13,15 @@ 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
@@ -26,30 +35,6 @@ 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 .config import ConfigType
-from .config import ConfigEntry
-from .config import ConfigDetails
-from .config import ConfigDefinition
-from .config import PlatformConfigEntry
-
-from .custom import CustomDefinition
-
 from .tag_update import TagOperation
 from .tag_update import TagUpdate
 
@@ -73,6 +58,22 @@ 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 .storage import CopyStatus
 from .storage import IncarnationStatus
 from .storage import StorageLayout
@@ -81,16 +82,11 @@ from .storage import StorageIncarnation
 from .storage import StorageItem
 from .storage import StorageDefinition
 
-from .common import MetadataFormat
-from .common import MetadataVersion
-from .common import TenantInfo
-
-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 .config import ConfigType
+from .config import ConfigEntry
+from .config import ConfigDetails
+from .config import ConfigDefinition
+from .config import PlatformConfigEntry
 
 from .flow import FlowNodeType
 from .flow import FlowNode
@@ -101,3 +97,7 @@ from .flow import FlowDefinition
 from .object import ObjectDefinition
 
 from .tag import Tag
+
+from .common import MetadataFormat
+from .common import MetadataVersion
+from .common import TenantInfo