tracdap-runtime 0.6.0rc3__tar.gz → 0.6.1.dev2__tar.gz

{tracdap_runtime-0.6.0rc3/tracdap_runtime.egg-info → tracdap_runtime-0.6.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tracdap-runtime
-Version: 0.6.0rc3
+Version: 0.6.1.dev2
 Summary: Runtime package for building models on the TRAC Data & Analytics Platform
 Home-page: https://tracdap.finos.org/
 Author: Martin Traverse
@@ -21,7 +21,7 @@ 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.2.0,>=1.2.0
+Requires-Dist: pandas<2.3.0,>=1.2.0
 Requires-Dist: numpy<2.0.0
 Provides-Extra: spark
 Requires-Dist: pyspark<3.6.0,>=3.0.0; extra == "spark"
@@ -58,7 +58,7 @@ 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.12
-* Pandas: 1.2 up to 2.1
+* 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.

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/README.md

@@ -17,7 +17,7 @@ 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.12
-* Pandas: 1.2 up to 2.1
+* 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.

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tracdap-runtime
-version = 0.6.0rc3
+version = 0.6.1.dev2
 description = Runtime package for building models on the TRAC Data & Analytics Platform
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -40,7 +40,7 @@ install_requires =
 	dulwich == 0.22.1
 	requests == 2.32.3
 	
-	pandas >= 1.2.0, < 2.2.0
+	pandas >= 1.2.0, < 2.3.0
 	numpy < 2.0.0
 
 [options.extras_require]

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3 → tracdap_runtime-0.6.1.dev2}/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.0rc3"
+__version__ = "0.6.1.dev2"

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/src/tracdap/rt/config/platform.py

@@ -116,6 +116,8 @@ class GatewayConfig:
 
     routes: _tp.List[RouteConfig] = _dc.field(default_factory=list)
 
+    redirects: _tp.List[WebServerRedirect] = _dc.field(default_factory=list)
+
 
 @_dc.dataclass
 class RouteConfig:

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/src/tracdap/rt/config/platform_pb2.py

@@ -16,7 +16,7 @@ from tracdap.metadata import common_pb2 as tracdap_dot_metadata_dot_common__pb2
 from tracdap.config import common_pb2 as tracdap_dot_config_dot_common__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dtracdap/config/platform.proto\x12\x0etracdap.config\x1a\x1dtracdap/metadata/common.proto\x1a\x1btracdap/config/common.proto\"\xa4\x08\n\x0ePlatformConfig\x12:\n\x06\x63onfig\x18\x01 \x03(\x0b\x32*.tracdap.config.PlatformConfig.ConfigEntry\x12\x32\n\x0cplatformInfo\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PlatformInfo\x12<\n\x0e\x61uthentication\x18\x05 \x01(\x0b\x32$.tracdap.config.AuthenticationConfig\x12\x30\n\x08metadata\x18\x06 \x01(\x0b\x32\x1e.tracdap.config.MetadataConfig\x12.\n\x07storage\x18\x07 \x01(\x0b\x32\x1d.tracdap.config.StorageConfig\x12\x46\n\x0crepositories\x18\x08 \x03(\x0b\x32\x30.tracdap.config.PlatformConfig.RepositoriesEntry\x12.\n\x08\x65xecutor\x18\t \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12.\n\x08jobCache\x18\x0c \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12<\n\x07tenants\x18\n \x03(\x0b\x32+.tracdap.config.PlatformConfig.TenantsEntry\x12\x37\n\twebServer\x18\x0b \x01(\x0b\x32\x1f.tracdap.config.WebServerConfigH\x00\x88\x01\x01\x12\x33\n\x07gateway\x18\r \x01(\x0b\x32\x1d.tracdap.config.GatewayConfigH\x01\x88\x01\x01\x12>\n\x08services\x18\x04 \x03(\x0b\x32,.tracdap.config.PlatformConfig.ServicesEntry\x12\x34\n\ndeployment\x18\x0e \x01(\x0b\x32 .tracdap.config.DeploymentConfig\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aQ\n\x11RepositoriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\x1aL\n\x0cTenantsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.TenantConfig:\x02\x38\x01\x1aN\n\rServicesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.config.ServiceConfig:\x02\x38\x01\x42\x0c\n\n_webServerB\n\n\x08_gateway\"r\n\x0eMetadataConfig\x12.\n\x08\x64\x61tabase\x18\x01 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12\x30\n\x06\x66ormat\x18\x02 \x01(\x0e\x32 .tracdap.metadata.MetadataFormat\"j\n\x0cTenantConfig\x12\x1a\n\rdefaultBucket\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x1a\n\rdefaultFormat\x18\x02 \x01(\tH\x01\x88\x01\x01\x42\x10\n\x0e_defaultBucketB\x10\n\x0e_defaultFormat\"\xc7\x01\n\x0fWebServerConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x31\n\x0b\x63ontentRoot\x18\x03 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12:\n\x0crewriteRules\x18\x04 \x03(\x0b\x32$.tracdap.config.WebServerRewriteRule\x12\x34\n\tredirects\x18\x05 \x03(\x0b\x32!.tracdap.config.WebServerRedirect\"6\n\x14WebServerRewriteRule\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\"C\n\x11WebServerRedirect\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x05\"Q\n\rGatewayConfig\x12\x13\n\x0bidleTimeout\x18\x01 \x01(\r\x12+\n\x06routes\x18\x02 \x03(\x0b\x32\x1b.tracdap.config.RouteConfig\"\xe4\x01\n\x0bRouteConfig\x12\x11\n\trouteName\x18\x01 \x01(\t\x12\x32\n\trouteType\x18\x02 \x01(\x0e\x32\x1f.tracdap.config.RoutingProtocol\x12\x32\n\tprotocols\x18\x03 \x03(\x0e\x32\x1f.tracdap.config.RoutingProtocol\x12+\n\x05match\x18\x05 \x01(\x0b\x32\x1c.tracdap.config.RoutingMatch\x12-\n\x06target\x18\x06 \x01(\x0b\x32\x1d.tracdap.config.RoutingTarget\"*\n\x0cRoutingMatch\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\t\"I\n\rRoutingTarget\x12\x0e\n\x06scheme\x18\x01 \x01(\t\x12\x0c\n\x04host\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\x12\x0c\n\x04path\x18\x04 \x01(\t\"N\n\rServiceConfig\x12\x14\n\x07\x65nabled\x18\x01 \x01(\x08H\x00\x88\x01\x01\x12\r\n\x05\x61lias\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\rB\n\n\x08_enabled\"D\n\x10\x44\x65ploymentConfig\x12\x30\n\x06layout\x18\x01 \x01(\x0e\x32 .tracdap.config.DeploymentLayout*S\n\x0fRoutingProtocol\x12\x14\n\x10PROTOCOL_NOT_SET\x10\x00\x12\x08\n\x04HTTP\x10\x01\x12\x08\n\x04GRPC\x10\x02\x12\x0c\n\x08GRPC_WEB\x10\x03\x12\x08\n\x04REST\x10\x04*K\n\x10\x44\x65ploymentLayout\x12\x12\n\x0eLAYOUT_NOT_SET\x10\x00\x12\x0b\n\x07SANDBOX\x10\x01\x12\n\n\x06HOSTED\x10\x02\x12\n\n\x06\x43USTOM\x10\x03\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dtracdap/config/platform.proto\x12\x0etracdap.config\x1a\x1dtracdap/metadata/common.proto\x1a\x1btracdap/config/common.proto\"\xa4\x08\n\x0ePlatformConfig\x12:\n\x06\x63onfig\x18\x01 \x03(\x0b\x32*.tracdap.config.PlatformConfig.ConfigEntry\x12\x32\n\x0cplatformInfo\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PlatformInfo\x12<\n\x0e\x61uthentication\x18\x05 \x01(\x0b\x32$.tracdap.config.AuthenticationConfig\x12\x30\n\x08metadata\x18\x06 \x01(\x0b\x32\x1e.tracdap.config.MetadataConfig\x12.\n\x07storage\x18\x07 \x01(\x0b\x32\x1d.tracdap.config.StorageConfig\x12\x46\n\x0crepositories\x18\x08 \x03(\x0b\x32\x30.tracdap.config.PlatformConfig.RepositoriesEntry\x12.\n\x08\x65xecutor\x18\t \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12.\n\x08jobCache\x18\x0c \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12<\n\x07tenants\x18\n \x03(\x0b\x32+.tracdap.config.PlatformConfig.TenantsEntry\x12\x37\n\twebServer\x18\x0b \x01(\x0b\x32\x1f.tracdap.config.WebServerConfigH\x00\x88\x01\x01\x12\x33\n\x07gateway\x18\r \x01(\x0b\x32\x1d.tracdap.config.GatewayConfigH\x01\x88\x01\x01\x12>\n\x08services\x18\x04 \x03(\x0b\x32,.tracdap.config.PlatformConfig.ServicesEntry\x12\x34\n\ndeployment\x18\x0e \x01(\x0b\x32 .tracdap.config.DeploymentConfig\x1a-\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1aQ\n\x11RepositoriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig:\x02\x38\x01\x1aL\n\x0cTenantsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.tracdap.config.TenantConfig:\x02\x38\x01\x1aN\n\rServicesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.tracdap.config.ServiceConfig:\x02\x38\x01\x42\x0c\n\n_webServerB\n\n\x08_gateway\"r\n\x0eMetadataConfig\x12.\n\x08\x64\x61tabase\x18\x01 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12\x30\n\x06\x66ormat\x18\x02 \x01(\x0e\x32 .tracdap.metadata.MetadataFormat\"j\n\x0cTenantConfig\x12\x1a\n\rdefaultBucket\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x1a\n\rdefaultFormat\x18\x02 \x01(\tH\x01\x88\x01\x01\x42\x10\n\x0e_defaultBucketB\x10\n\x0e_defaultFormat\"\xc7\x01\n\x0fWebServerConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x31\n\x0b\x63ontentRoot\x18\x03 \x01(\x0b\x32\x1c.tracdap.config.PluginConfig\x12:\n\x0crewriteRules\x18\x04 \x03(\x0b\x32$.tracdap.config.WebServerRewriteRule\x12\x34\n\tredirects\x18\x05 \x03(\x0b\x32!.tracdap.config.WebServerRedirect\"6\n\x14WebServerRewriteRule\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\"C\n\x11WebServerRedirect\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x05\"\x87\x01\n\rGatewayConfig\x12\x13\n\x0bidleTimeout\x18\x01 \x01(\r\x12+\n\x06routes\x18\x02 \x03(\x0b\x32\x1b.tracdap.config.RouteConfig\x12\x34\n\tredirects\x18\x03 \x03(\x0b\x32!.tracdap.config.WebServerRedirect\"\xe4\x01\n\x0bRouteConfig\x12\x11\n\trouteName\x18\x01 \x01(\t\x12\x32\n\trouteType\x18\x02 \x01(\x0e\x32\x1f.tracdap.config.RoutingProtocol\x12\x32\n\tprotocols\x18\x03 \x03(\x0e\x32\x1f.tracdap.config.RoutingProtocol\x12+\n\x05match\x18\x05 \x01(\x0b\x32\x1c.tracdap.config.RoutingMatch\x12-\n\x06target\x18\x06 \x01(\x0b\x32\x1d.tracdap.config.RoutingTarget\"*\n\x0cRoutingMatch\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\t\"I\n\rRoutingTarget\x12\x0e\n\x06scheme\x18\x01 \x01(\t\x12\x0c\n\x04host\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\r\x12\x0c\n\x04path\x18\x04 \x01(\t\"N\n\rServiceConfig\x12\x14\n\x07\x65nabled\x18\x01 \x01(\x08H\x00\x88\x01\x01\x12\r\n\x05\x61lias\x18\x02 \x01(\t\x12\x0c\n\x04port\x18\x03 \x01(\rB\n\n\x08_enabled\"D\n\x10\x44\x65ploymentConfig\x12\x30\n\x06layout\x18\x01 \x01(\x0e\x32 .tracdap.config.DeploymentLayout*S\n\x0fRoutingProtocol\x12\x14\n\x10PROTOCOL_NOT_SET\x10\x00\x12\x08\n\x04HTTP\x10\x01\x12\x08\n\x04GRPC\x10\x02\x12\x0c\n\x08GRPC_WEB\x10\x03\x12\x08\n\x04REST\x10\x04*K\n\x10\x44\x65ploymentLayout\x12\x12\n\x0eLAYOUT_NOT_SET\x10\x00\x12\x0b\n\x07SANDBOX\x10\x01\x12\n\n\x06HOSTED\x10\x02\x12\n\n\x06\x43USTOM\x10\x03\x42\x1c\n\x18org.finos.tracdap.configP\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -32,10 +32,10 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PLATFORMCONFIG_TENANTSENTRY']._serialized_options = b'8\001'
   _globals['_PLATFORMCONFIG_SERVICESENTRY']._options = None
   _globals['_PLATFORMCONFIG_SERVICESENTRY']._serialized_options = b'8\001'
-  _globals['_ROUTINGPROTOCOL']._serialized_start=2306
-  _globals['_ROUTINGPROTOCOL']._serialized_end=2389
-  _globals['_DEPLOYMENTLAYOUT']._serialized_start=2391
-  _globals['_DEPLOYMENTLAYOUT']._serialized_end=2466
+  _globals['_ROUTINGPROTOCOL']._serialized_start=2361
+  _globals['_ROUTINGPROTOCOL']._serialized_end=2444
+  _globals['_DEPLOYMENTLAYOUT']._serialized_start=2446
+  _globals['_DEPLOYMENTLAYOUT']._serialized_end=2521
   _globals['_PLATFORMCONFIG']._serialized_start=110
   _globals['_PLATFORMCONFIG']._serialized_end=1170
   _globals['_PLATFORMCONFIG_CONFIGENTRY']._serialized_start=858
@@ -56,16 +56,16 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_WEBSERVERREWRITERULE']._serialized_end=1652
   _globals['_WEBSERVERREDIRECT']._serialized_start=1654
   _globals['_WEBSERVERREDIRECT']._serialized_end=1721
-  _globals['_GATEWAYCONFIG']._serialized_start=1723
-  _globals['_GATEWAYCONFIG']._serialized_end=1804
-  _globals['_ROUTECONFIG']._serialized_start=1807
-  _globals['_ROUTECONFIG']._serialized_end=2035
-  _globals['_ROUTINGMATCH']._serialized_start=2037
-  _globals['_ROUTINGMATCH']._serialized_end=2079
-  _globals['_ROUTINGTARGET']._serialized_start=2081
-  _globals['_ROUTINGTARGET']._serialized_end=2154
-  _globals['_SERVICECONFIG']._serialized_start=2156
-  _globals['_SERVICECONFIG']._serialized_end=2234
-  _globals['_DEPLOYMENTCONFIG']._serialized_start=2236
-  _globals['_DEPLOYMENTCONFIG']._serialized_end=2304
+  _globals['_GATEWAYCONFIG']._serialized_start=1724
+  _globals['_GATEWAYCONFIG']._serialized_end=1859
+  _globals['_ROUTECONFIG']._serialized_start=1862
+  _globals['_ROUTECONFIG']._serialized_end=2090
+  _globals['_ROUTINGMATCH']._serialized_start=2092
+  _globals['_ROUTINGMATCH']._serialized_end=2134
+  _globals['_ROUTINGTARGET']._serialized_start=2136
+  _globals['_ROUTINGTARGET']._serialized_end=2209
+  _globals['_SERVICECONFIG']._serialized_start=2211
+  _globals['_SERVICECONFIG']._serialized_end=2289
+  _globals['_DEPLOYMENTCONFIG']._serialized_start=2291
+  _globals['_DEPLOYMENTCONFIG']._serialized_end=2359
 # @@protoc_insertion_point(module_scope)

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2/tracdap_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tracdap-runtime
-Version: 0.6.0rc3
+Version: 0.6.1.dev2
 Summary: Runtime package for building models on the TRAC Data & Analytics Platform
 Home-page: https://tracdap.finos.org/
 Author: Martin Traverse
@@ -21,7 +21,7 @@ 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.2.0,>=1.2.0
+Requires-Dist: pandas<2.3.0,>=1.2.0
 Requires-Dist: numpy<2.0.0
 Provides-Extra: spark
 Requires-Dist: pyspark<3.6.0,>=3.0.0; extra == "spark"
@@ -58,7 +58,7 @@ 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.12
-* Pandas: 1.2 up to 2.1
+* 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.

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/tracdap_runtime.egg-info/requires.txt

@@ -3,7 +3,7 @@ pyarrow==16.0.0
 pyyaml==6.0.1
 dulwich==0.22.1
 requests==2.32.3
-pandas<2.2.0,>=1.2.0
+pandas<2.3.0,>=1.2.0
 numpy<2.0.0
 
 [aws]

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/src/tracdap/rt/config/__init__.py

@@ -6,6 +6,9 @@ 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
@@ -24,7 +27,4 @@ from .platform import DeploymentConfig
 from .result import TagUpdateList
 from .result import JobResult
 
-from .runtime import RuntimeConfig
-from .runtime import SparkSettings
-
 from .job import JobConfig

{tracdap_runtime-0.6.0rc3 → tracdap_runtime-0.6.1.dev2}/src/tracdap/rt/metadata/__init__.py

@@ -1,5 +1,7 @@
 # Code generated by TRAC
 
+from .custom import CustomDefinition
+
 from .common import MetadataFormat
 from .common import MetadataVersion
 from .common import TenantInfo
@@ -17,12 +19,10 @@ 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 .file import FileDefinition
+
+from .tag_update import TagOperation
+from .tag_update import TagUpdate
 
 from .data import SchemaType
 from .data import PartType
@@ -32,29 +32,31 @@ from .data import SchemaDefinition
 from .data import PartKey
 from .data import DataDefinition
 
-from .file import FileDefinition
-
-from .stoarge import CopyStatus
-from .stoarge import IncarnationStatus
-from .stoarge import StorageCopy
-from .stoarge import StorageIncarnation
-from .stoarge import StorageItem
-from .stoarge import StorageDefinition
-
-from .tag_update import TagOperation
-from .tag_update import TagUpdate
-
 from .model import ModelParameter
 from .model import ModelInputSchema
 from .model import ModelOutputSchema
 from .model import ModelDefinition
 
+from .search import SearchOperator
+from .search import LogicalOperator
+from .search import SearchTerm
+from .search import LogicalExpression
+from .search import SearchExpression
+from .search import SearchParameters
+
 from .flow import FlowNodeType
 from .flow import FlowNode
 from .flow import FlowSocket
 from .flow import FlowEdge
 from .flow import FlowDefinition
 
+from .stoarge import CopyStatus
+from .stoarge import IncarnationStatus
+from .stoarge import StorageCopy
+from .stoarge import StorageIncarnation
+from .stoarge import StorageItem
+from .stoarge import StorageDefinition
+
 from .job import JobType
 from .job import JobStatusCode
 from .job import JobDefinition
@@ -62,8 +64,6 @@ from .job import RunModelJob
 from .job import RunFlowJob
 from .job import ImportModelJob
 
-from .custom import CustomDefinition
-
 from .object import ObjectDefinition
 
 from .tag import Tag