tracdap-runtime 0.6.0rc2__tar.gz → 0.6.1__tar.gz

{tracdap-runtime-0.6.0rc2/tracdap_runtime.egg-info → tracdap_runtime-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tracdap-runtime
-Version: 0.6.0rc2
+Version: 0.6.1
 Summary: Runtime package for building models on the TRAC Data & Analytics Platform
 Home-page: https://tracdap.finos.org/
 Author: Martin Traverse
@@ -13,30 +13,31 @@ Platform: any
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: <3.12,>=3.8
+Requires-Python: <3.13,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: protobuf==4.23.2
-Requires-Dist: pyarrow==13.0.0
-Requires-Dist: pyyaml==6.0.0
-Requires-Dist: dulwich==0.21.5
-Requires-Dist: requests==2.31.0
-Requires-Dist: pandas<1.6.0,>=1.2.0
+Requires-Dist: protobuf==4.25.3
+Requires-Dist: pyarrow==16.0.0
+Requires-Dist: pyyaml==6.0.1
+Requires-Dist: dulwich==0.22.1
+Requires-Dist: requests==2.32.3
+Requires-Dist: pandas<2.3.0,>=1.2.0
+Requires-Dist: numpy<2.0.0
 Provides-Extra: spark
-Requires-Dist: pyspark<3.5.0,>=3.0.0; extra == "spark"
+Requires-Dist: pyspark<3.6.0,>=3.0.0; extra == "spark"
 Provides-Extra: aws
-Requires-Dist: botocore==1.29.156; extra == "aws"
-Requires-Dist: boto3==1.26.156; extra == "aws"
+Requires-Dist: botocore==1.34.93; extra == "aws"
+Requires-Dist: boto3==1.34.93; extra == "aws"
 Provides-Extra: gcp
-Requires-Dist: google-auth==2.20.0; extra == "gcp"
-Requires-Dist: google-cloud-core==2.3.2; extra == "gcp"
-Requires-Dist: google-cloud-storage==2.9.0; extra == "gcp"
-Requires-Dist: gcsfs==2023.6.0; extra == "gcp"
+Requires-Dist: google-auth==2.29.0; extra == "gcp"
+Requires-Dist: google-cloud-core==2.4.1; extra == "gcp"
+Requires-Dist: google-cloud-storage==2.16.0; extra == "gcp"
+Requires-Dist: gcsfs==2024.3.1; extra == "gcp"
 Provides-Extra: azure
-Requires-Dist: azure-core==1.26.4; extra == "azure"
-Requires-Dist: azure-identity==1.13.0; extra == "azure"
-Requires-Dist: azure-storage-blob==12.16.0; extra == "azure"
-Requires-Dist: adlfs==2023.4.0; extra == "azure"
+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"
 
 # TRAC Model Runtime for Python
 
@@ -56,12 +57,12 @@ Documentation for the TRAC platform is available on our website at
 
 The TRAC runtime for Python has these requirements:
 
-* Python: 3.8 up to 3.11.x
-* Pandas: 1.2 up to 1.5.x
-* PySpark 3.0 up to 3.4.x (optional)
+* Python: 3.8 up to 3.12
+* Pandas: 1.2 up to 2.2
+* PySpark 3.0 up to 3.5 (optional)
 
 3rd party libraries may impose additional constraints on supported versions of Python, Pandas or PySpark.
-
+As of February 2024, the Python libraries for GCP do not yet support Python 3.12.
 
 ## Installing the runtime
 

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/README.md

@@ -16,12 +16,12 @@ Documentation for the TRAC platform is available on our website at
 
 The TRAC runtime for Python has these requirements:
 
-* Python: 3.8 up to 3.11.x
-* Pandas: 1.2 up to 1.5.x
-* PySpark 3.0 up to 3.4.x (optional)
+* Python: 3.8 up to 3.12
+* Pandas: 1.2 up to 2.2
+* PySpark 3.0 up to 3.5 (optional)
 
 3rd party libraries may impose additional constraints on supported versions of Python, Pandas or PySpark.
-
+As of February 2024, the Python libraries for GCP do not yet support Python 3.12.
 
 ## Installing the runtime
 

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tracdap-runtime
-version = 0.6.0rc2
+version = 0.6.1
 description = Runtime package for building models on the TRAC Data & Analytics Platform
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -32,32 +32,33 @@ packages =
 package_dir = 
 	tracdap = src/tracdap
 	tracdap.rt = src/tracdap/rt
-python_requires = >= 3.8, < 3.12
+python_requires = >= 3.8, < 3.13
 install_requires = 
-	protobuf == 4.23.2
-	pyarrow == 13.0.0
-	pyyaml == 6.0.0
-	dulwich == 0.21.5
-	requests == 2.31.0
+	protobuf == 4.25.3
+	pyarrow == 16.0.0
+	pyyaml == 6.0.1
+	dulwich == 0.22.1
+	requests == 2.32.3
 	
-	pandas >= 1.2.0, < 1.6.0
+	pandas >= 1.2.0, < 2.3.0
+	numpy < 2.0.0
 
 [options.extras_require]
 spark = 
-	pyspark >= 3.0.0, < 3.5.0
+	pyspark >= 3.0.0, < 3.6.0
 aws = 
-	botocore == 1.29.156
-	boto3 == 1.26.156
+	botocore == 1.34.93
+	boto3 == 1.34.93
 gcp = 
-	google-auth == 2.20.0
-	google-cloud-core == 2.3.2
-	google-cloud-storage == 2.9.0
-	gcsfs == 2023.6.0
+	google-auth == 2.29.0
+	google-cloud-core == 2.4.1
+	google-cloud-storage == 2.16.0
+	gcsfs == 2024.3.1
 azure = 
-	azure-core == 1.26.4
-	azure-identity == 1.13.0
-	azure-storage-blob == 12.16.0
-	adlfs == 2023.4.0
+	azure-core == 1.30.1
+	azure-identity == 1.16.1
+	azure-storage-blob == 12.19.1
+	adlfs == 2024.4.1
 
 [egg_info]
 tag_build = 

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_impl/data.py

@@ -74,11 +74,7 @@ class DataView:
 
 
 class _DataInternal:
-
-    @staticmethod
-    def float_dtype_check():
-        if "Float64Dtype" not in pd.__dict__:
-            raise _ex.EStartup("TRAC D.A.P. requires Pandas >= 1.2")
+    pass
 
 
 class DataMapping:
@@ -111,8 +107,40 @@ class DataMapping:
     }
 
     # Check the Pandas dtypes for handling floats are available before setting up the type mapping
-    __PANDAS_FLOAT_DTYPE_CHECK = _DataInternal.float_dtype_check()
-    __PANDAS_DATETIME_TYPE = pd.to_datetime([]).dtype
+    __PANDAS_VERSION_ELEMENTS = pd.__version__.split(".")
+    __PANDAS_MAJOR_VERSION = int(__PANDAS_VERSION_ELEMENTS[0])
+    __PANDAS_MINOR_VERSION = int(__PANDAS_VERSION_ELEMENTS[1])
+
+    if __PANDAS_MAJOR_VERSION == 2:
+
+        __PANDAS_DATE_TYPE = pd.to_datetime([dt.date(2000, 1, 1)]).as_unit(__TRAC_TIMESTAMP_UNIT).dtype
+        __PANDAS_DATETIME_TYPE = pd.to_datetime([dt.datetime(2000, 1, 1, 0, 0, 0)]).as_unit(__TRAC_TIMESTAMP_UNIT).dtype
+
+        @classmethod
+        def __pandas_datetime_type(cls, tz, unit):
+            if tz is None and unit is None:
+                return cls.__PANDAS_DATETIME_TYPE
+            _unit = unit if unit is not None else cls.__TRAC_TIMESTAMP_UNIT
+            if tz is None:
+                return pd.to_datetime([dt.datetime(2000, 1, 1, 0, 0, 0)]).as_unit(_unit).dtype
+            else:
+                return pd.DatetimeTZDtype(tz=tz, unit=_unit)
+
+    # Minimum supported version for Pandas is 1.2, when pd.Float64Dtype was introduced
+    elif __PANDAS_MAJOR_VERSION == 1 and __PANDAS_MINOR_VERSION >= 2:
+
+        __PANDAS_DATE_TYPE = pd.to_datetime([dt.date(2000, 1, 1)]).dtype
+        __PANDAS_DATETIME_TYPE = pd.to_datetime([dt.datetime(2000, 1, 1, 0, 0, 0)]).dtype
+
+        @classmethod
+        def __pandas_datetime_type(cls, tz, unit):  # noqa
+            if tz is None:
+                return cls.__PANDAS_DATETIME_TYPE
+            else:
+                return pd.DatetimeTZDtype(tz=tz)
+
+    else:
+        raise _ex.EStartup(f"Pandas version not supported: [{pd.__version__}]")
 
     # Only partial mapping is possible, decimal and temporal dtypes cannot be mapped this way
     __ARROW_TO_PANDAS_TYPE_MAPPING = {
@@ -224,8 +252,12 @@ class DataMapping:
             cls.__TRAC_DECIMAL_SCALE)
 
     @classmethod
-    def pandas_datetime_type(cls):
-        return cls.__PANDAS_DATETIME_TYPE
+    def pandas_date_type(cls):
+        return cls.__PANDAS_DATE_TYPE
+
+    @classmethod
+    def pandas_datetime_type(cls, tz=None, unit=None):
+        return cls.__pandas_datetime_type(tz, unit)
 
     @classmethod
     def view_to_pandas(
@@ -297,6 +329,7 @@ class DataMapping:
         else:
             DataConformance.check_duplicate_fields(table.schema.names, False)
 
+        # Use Arrow's built-in function to convert to Pandas
         return table.to_pandas(
 
             # Mapping for arrow -> pandas types for core types
@@ -463,7 +496,7 @@ class DataConformance:
 
                 table_column: pa.Array = table.column(table_index)
 
-                pandas_type = pandas_types[table_index] \
+                pandas_type = pandas_types.iloc[table_index] \
                     if pandas_types is not None \
                     else None
 
@@ -691,16 +724,20 @@ class DataConformance:
     @classmethod
     def _coerce_date(cls, vector: pa.Array, field: pa.Field, pandas_type=None) -> pa.Array:
 
-        # Allow casting date32 -> date64, both range and precision are greater so there is no data loss
+        # The bit-width restriction could be removed here
+        # For date types there is never loss of precision and pa.cast will raise an error on overflow
+        # Impact to client code is unlikely, still this change should happen with a TRAC minor version update
         if pa.types.is_date(vector.type):
             if field.type.bit_width >= vector.type.bit_width:
                 return pc.cast(vector, field.type)
 
-        # Special handling for Pandas/NumPy date values
-        # These are encoded as np.datetime64[ns] in Pandas -> pa.timestamp64[ns] in Arrow
-        # Only allow this conversion if the vector is coming from Pandas with datetime type
-        if pandas_type == DataMapping.pandas_datetime_type():
-            if pa.types.is_timestamp(vector.type) and vector.type.unit == "ns":
+        # Special handling for date values coming from Pandas/NumPy
+        # Only allow these conversions if the vector is supplied with Pandas type info
+        # For Pandas 1.x, dates are always encoded as np.datetime64[ns]
+        # For Pandas 2.x dates are still np.datetime64 but can be in s, ms, us or ns
+        # This conversion will not apply to dates held in Pandas using the Python date object types
+        if pandas_type is not None:
+            if pa.types.is_timestamp(vector.type) and pd.api.types.is_datetime64_any_dtype(pandas_type):
                 return pc.cast(vector, field.type)
 
         error_message = cls._format_error(cls.__E_WRONG_DATA_TYPE, vector, field)

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_impl/models.py

@@ -44,21 +44,24 @@ class ModelLoader:
         self.__log = _util.logger_for_object(self)
 
         self.__scratch_dir = scratch_dir.joinpath("models")
-        self.__scratch_dir.mkdir(exist_ok=True, parents=False, mode=0o750)
-
         self.__repos = _repos.RepositoryManager(sys_config)
         self.__scopes: tp.Dict[str, ModelLoader._ScopeState] = dict()
 
+        safe_scratch_dir = _util.windows_unc_path(self.__scratch_dir)
+        safe_scratch_dir.mkdir(exist_ok=True, parents=False, mode=0o750)
+
     def create_scope(self, scope: str):
 
         try:
 
             self.__log.info(f"Creating model scope [{scope}]")
 
-            scope_scratch_dir = self.__scratch_dir.joinpath(scope)
-            scope_scratch_dir.mkdir(exist_ok=False, parents=False, mode=0o750)
+            scope_dir = self.__scratch_dir.joinpath(scope)
 
-            scope_state = ModelLoader._ScopeState(scope_scratch_dir)
+            safe_scope_dir = _util.windows_unc_path(scope_dir)
+            safe_scope_dir.mkdir(exist_ok=False, parents=False, mode=0o750)
+
+            scope_state = ModelLoader._ScopeState(scope_dir)
             self.__scopes[scope] = scope_state
 
         except FileExistsError as e:
@@ -152,7 +155,9 @@ class ModelLoader:
         # What gets cached is the checkout, which may contain multiple packages depending on the repo type
 
         else:
-            checkout_dir.mkdir(mode=0o750, parents=True, exist_ok=False)
+            safe_checkout_dir = _util.windows_unc_path(checkout_dir)
+            safe_checkout_dir.mkdir(mode=0o750, parents=True, exist_ok=False)
+
             package_dir = repo.do_checkout(model_def, checkout_dir)
 
             scope_state.code_cache[code_cache_key] = checkout_dir
@@ -189,7 +194,7 @@ class ModelLoader:
 
         try:
 
-            model: _api.TracModel = object.__new__(model_class)
+            model: _api.TracModel = _api.TracModel.__new__(model_class)
             model_class.__init__(model)
 
             attributes = model.define_attributes()

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_impl/storage.py

@@ -214,6 +214,10 @@ class CommonFileStorage(IFileStorage):
         fs_impl = "arrow"
         fs_root = fs.base_path
 
+        # On Windows, sanitise UNC root paths for logging
+        if _util.is_windows() and fs_root.startswith("//?/"):
+            fs_root = fs_root[4:]
+
         # If this is an FSSpec implementation, take the protocol from FSSpec as the FS type
         base_fs = fs.base_fs
         if isinstance(base_fs, pa_fs.PyFileSystem):

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_impl/util.py

@@ -264,27 +264,25 @@ def get_args(metaclass: type):
 
 def try_clean_dir(dir_path: pathlib.Path, remove: bool = False) -> bool:
 
+    normalized_path = windows_unc_path(dir_path)
+
+    return __try_clean_dir(normalized_path, remove)
+
+
+def __try_clean_dir(normalized_path, remove):
+
     clean_ok = True
-    normalized_path = dir_path.resolve()
 
     for item in normalized_path.iterdir():
 
         if item.is_dir():
-            clean_ok &= try_clean_dir(item, remove=True)
+            clean_ok &= __try_clean_dir(item, remove=True)
 
         else:
             try:
-                # Windows MAX_PATH = 260 characters, including the drive letter and terminating nul character
-                # In Python the path string does not include a nul, so we need to limit to 259 characters
-                if is_windows() and len(str(item)) >= 259 and not str(item).startswith("\\\\?\\"):
-                    unc_item = pathlib.Path("\\\\?\\" + str(item))
-                    unc_item.unlink()
-                    return True
-                else:
-                    item.unlink()
-                    return True
+                item.unlink()
             except Exception as e:  # noqa
-                return False
+                clean_ok = False
 
     if remove:
         try:
@@ -294,6 +292,16 @@ def try_clean_dir(dir_path: pathlib.Path, remove: bool = False) -> bool:
             return False
 
 
+def windows_unc_path(path: pathlib.Path) -> pathlib.Path:
+
+    # Convert a path to its UNC form on Windows
+
+    if is_windows() and not str(path).startswith("\\\\?\\"):
+        return pathlib.Path("\\\\?\\" + str(path.resolve()))
+    else:
+        return path
+
+
 def error_details_from_trace(trace: tb.StackSummary):
     last_frame = trace[len(trace) - 1]
     filename = pathlib.PurePath(last_frame.filename).name

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_plugins/_helpers.py

@@ -18,6 +18,7 @@
 # And we don't want to put them .ext, those are public APIs that need to be maintained
 
 import logging
+import pathlib
 import platform
 import urllib.parse
 import typing as tp
@@ -180,6 +181,16 @@ def is_windows():
     return __IS_WINDOWS
 
 
+def windows_unc_path(path: pathlib.Path) -> pathlib.Path:
+
+    # Convert a path to its UNC form on Windows
+
+    if is_windows() and not str(path).startswith("\\\\?\\"):
+        return pathlib.Path("\\\\?\\" + str(path.resolve()))
+    else:
+        return path
+
+
 def logger_for_object(obj: object) -> logging.Logger:
     return logger_for_class(obj.__class__)
 

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_plugins/repo_git.py

@@ -93,6 +93,11 @@ class GitRepository(IModelRepository):
 
         self._log.info(f"Checkout mechanism: [native]")
 
+        # Using windows_safe_path() to create UNC paths does not always work with Windows native Git
+        # So, use the regular checkout_dir, and set core.longpaths = true once the repo is created
+        # This will fail if the path for the repo config file exceeds the Windows MAX_PATH length
+        # I.e. checkout_dir/.git/config
+
         git_cli = ["git", "-C", str(checkout_dir)]
 
         git_cmds = [
@@ -169,7 +174,8 @@ class GitRepository(IModelRepository):
 
         self._log.info("=> git init")
 
-        repo = git_repo.Repo.init(str(checkout_dir))
+        safe_checkout_dir = _helpers.windows_unc_path(checkout_dir)
+        repo = git_repo.Repo.init(str(safe_checkout_dir))
         self._apply_config_from_properties(repo)
 
         # Set up origin

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_plugins/repo_pypi.py

@@ -98,8 +98,9 @@ class PyPiRepository(IModelRepository):
 
         self._log.info(f"Downloaded [{len(content) / 1024:.1f}] KB in [{elapsed.total_seconds():.1f}] seconds")
 
+        safe_checkout_dir = _helpers.windows_unc_path(checkout_dir)
         download_whl = zipfile.ZipFile(io.BytesIO(download_req.content))
-        download_whl.extractall(checkout_dir)
+        download_whl.extractall(safe_checkout_dir)
 
         self._log.info(f"Unpacked [{len(download_whl.filelist)}] files")
         self._log.info(f"PyPI checkout succeeded for {model_def.package} {model_def.version}")

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/_plugins/storage_local.py

@@ -61,7 +61,9 @@ class LocalStorageProvider(IStorageProvider):
 
     def get_arrow_native(self) -> afs.SubTreeFileSystem:
         root_fs = afs.LocalFileSystem()
-        return afs.SubTreeFileSystem(str(self._root_path), root_fs)
+        # Use a UNC root path on Windows to avoid max path length issues
+        sub_tree_path = _helpers.windows_unc_path(self._root_path)
+        return afs.SubTreeFileSystem(str(sub_tree_path), root_fs)
 
     def get_file_storage(self) -> IFileStorage:
 
@@ -140,10 +142,9 @@ class LocalFileStorage(IFileStorage):
         self._properties = config.properties
         self._options = options  # Not used
 
-        self._root_path = LocalStorageProvider.check_root_path(self._properties, self._log)
-
-    def _get_root(self):
-        return self._root_path
+        # Use a UNC root path on Windows to avoid max path length issues
+        self._raw_root_path = LocalStorageProvider.check_root_path(self._properties, self._log)
+        self._root_path = _helpers.windows_unc_path(self._raw_root_path)
 
     def exists(self, storage_path: str) -> bool:
 
@@ -358,8 +359,12 @@ class LocalFileStorage(IFileStorage):
             if relative_path.is_absolute():
                 raise ex.EStorageValidation(f"Storage path is not relative: {operation_name} [{storage_path}]")
 
-            root_path = self._root_path
-            absolute_path = self._root_path.joinpath(relative_path).resolve(False)
+            # UNC paths on Windows have different behaviour for join / resolve
+            # Work on the raw path, then convert back to UNC afterward
+            # For other OSes, this is a no-op
+
+            root_path = self._raw_root_path
+            absolute_path = self._raw_root_path.joinpath(relative_path).resolve(False)
 
             # is_relative_to only supported in Python 3.9+, we need to support 3.7
             if absolute_path != root_path and root_path not in absolute_path.parents:
@@ -368,7 +373,7 @@ class LocalFileStorage(IFileStorage):
             if absolute_path == root_path and not allow_root_dir:
                 raise ex.EStorageValidation(f"Illegal operation for storage root: {operation_name} [{storage_path}]")
 
-            return absolute_path
+            return _helpers.windows_unc_path(absolute_path)
 
         except ValueError as e:
 

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/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.0rc2"
+__version__ = "0.6.1"

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/config/__init__.py

@@ -4,32 +4,27 @@ from .common import _ConfigFile
 from .common import PluginConfig
 from .common import PlatformInfo
 from .common import AuthenticationConfig
+from .common import StorageConfig
 
+from .runtime import RuntimeConfig
+from .runtime import SparkSettings
+
+from .platform import RoutingProtocol
+from .platform import DeploymentLayout
 from .platform import PlatformConfig
 from .platform import MetadataConfig
-from .platform import StorageConfig
 from .platform import TenantConfig
 from .platform import WebServerConfig
 from .platform import WebServerRewriteRule
 from .platform import WebServerRedirect
-from .platform import InstantMap
-from .platform import InstanceConfig
-from .platform import ServiceMap
+from .platform import GatewayConfig
+from .platform import RouteConfig
+from .platform import RoutingMatch
+from .platform import RoutingTarget
 from .platform import ServiceConfig
-
-from .runtime import RuntimeConfig
-from .runtime import SparkSettings
+from .platform import DeploymentConfig
 
 from .result import TagUpdateList
 from .result import JobResult
 
 from .job import JobConfig
-
-from .gateway import GwProtocol
-from .gateway import GwRestMapping
-from .gateway import GatewayConfig
-from .gateway import GwRoute
-from .gateway import GwMatch
-from .gateway import GwTarget
-from .gateway import GwServiceMap
-from .gateway import GwService

{tracdap-runtime-0.6.0rc2 → tracdap_runtime-0.6.1}/src/tracdap/rt/config/common.py

@@ -56,3 +56,13 @@ class AuthenticationConfig:
     systemTicketDuration: int = None
 
     systemTicketRefresh: int = None
+
+
+@_dc.dataclass
+class StorageConfig:
+
+    buckets: _tp.Dict[str, PluginConfig] = _dc.field(default_factory=dict)
+
+    defaultBucket: str = None
+
+    defaultFormat: str = None

tracdap_runtime-0.6.1/src/tracdap/rt/config/common_pb2.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: tracdap/config/common.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()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1btracdap/config/common.proto\x12\x0etracdap.config\"u\n\x0b_ConfigFile\x12\x37\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\'.tracdap.config._ConfigFile.ConfigEntry\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x81\x02\n\x0cPluginConfig\x12\x10\n\x08protocol\x18\x01 \x01(\t\x12@\n\nproperties\x18\x02 \x03(\x0b\x32,.tracdap.config.PluginConfig.PropertiesEntry\x12:\n\x07secrets\x18\x03 \x03(\x0b\x32).tracdap.config.PluginConfig.SecretsEntry\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\"\xb8\x01\n\x0cPlatformInfo\x12\x13\n\x0b\x65nvironment\x18\x01 \x01(\t\x12\x12\n\nproduction\x18\x02 \x01(\x08\x12H\n\x0e\x64\x65ploymentInfo\x18\x03 \x03(\x0b\x32\x30.tracdap.config.PlatformInfo.DeploymentInfoEntry\x1a\x35\n\x13\x44\x65ploymentInfoEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xba\x02\n\x14\x41uthenticationConfig\x12\x11\n\tjwtIssuer\x18\x01 \x01(\t\x12\x11\n\tjwtExpiry\x18\x02 \x01(\x11\x12\x10\n\x08jwtLimit\x18\x06 \x01(\x11\x12\x12\n\njwtRefresh\x18\x07 \x01(\x11\x12\x33\n\x08provider\x18\x03 \x01(\x0b\x32\x1c.tracdap.config.PluginConfigH\x00\x88\x01\x01\x12\x13\n\x0b\x64isableAuth\x18\x04 \x01(\x08\x12\x16\n\x0e\x64isableSigning\x18\x05 \x01(\x08\x12\x14\n\x0csystemUserId\x18\x08 \x01(\t\x12\x16\n\x0esystemUserName\x18\t \x01(\t\x12\x1c\n\x14systemTicketDuration\x18\n \x01(\x11\x12\x1b\n\x13systemTicketRefresh\x18\x0b \x01(\x11\x42\x0b\n\t_provider\"\xc8\x01\n\rStorageConfig\x12;\n\x07\x62uckets\x18\x01 \x03(\x0b\x32*.tracdap.config.StorageConfig.BucketsEntry\x12\x15\n\rdefaultBucket\x18\x02 \x01(\t\x12\x15\n\rdefaultFormat\x18\x03 \x01(\t\x1aL\n\x0c\x42ucketsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tracdap.config.common_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\030org.finos.tracdap.configP\001'
+  _globals['__CONFIGFILE_CONFIGENTRY']._options = None
+  _globals['__CONFIGFILE_CONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._options = None
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._serialized_options = b'8\001'
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._options = None
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._serialized_options = b'8\001'
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._options = None
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._serialized_options = b'8\001'
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._options = None
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._serialized_options = b'8\001'
+  _globals['__CONFIGFILE']._serialized_start=47
+  _globals['__CONFIGFILE']._serialized_end=164
+  _globals['__CONFIGFILE_CONFIGENTRY']._serialized_start=119
+  _globals['__CONFIGFILE_CONFIGENTRY']._serialized_end=164
+  _globals['_PLUGINCONFIG']._serialized_start=167
+  _globals['_PLUGINCONFIG']._serialized_end=424
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._serialized_start=327
+  _globals['_PLUGINCONFIG_PROPERTIESENTRY']._serialized_end=376
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._serialized_start=378
+  _globals['_PLUGINCONFIG_SECRETSENTRY']._serialized_end=424
+  _globals['_PLATFORMINFO']._serialized_start=427
+  _globals['_PLATFORMINFO']._serialized_end=611
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._serialized_start=558
+  _globals['_PLATFORMINFO_DEPLOYMENTINFOENTRY']._serialized_end=611
+  _globals['_AUTHENTICATIONCONFIG']._serialized_start=614
+  _globals['_AUTHENTICATIONCONFIG']._serialized_end=928
+  _globals['_STORAGECONFIG']._serialized_start=931
+  _globals['_STORAGECONFIG']._serialized_end=1131
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._serialized_start=1055
+  _globals['_STORAGECONFIG_BUCKETSENTRY']._serialized_end=1131
+# @@protoc_insertion_point(module_scope)