sl-shared-assets 5.1.2__tar.gz → 6.0.0__tar.gz

{sl_shared_assets-5.1.2 → sl_shared_assets-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sl-shared-assets
-Version: 5.1.2
+Version: 6.0.0
 Summary: Provides data acquisition and processing assets shared between Sun (NeuroAI) lab libraries.
 Project-URL: Homepage, https://github.com/Sun-Lab-NBB/sl-shared-assets
 Project-URL: Documentation, https://sl-shared-assets-api-docs.netlify.app/
@@ -686,12 +686,10 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Typing :: Typed
-Requires-Python: >=3.11
+Requires-Python: <3.14,>=3.13
 Requires-Dist: appdirs<2,>=1
 Requires-Dist: ataraxis-base-utilities<4,>=3
 Requires-Dist: ataraxis-data-structures<4,>=3

{sl_shared_assets-5.1.2 → sl_shared_assets-6.0.0}/pyproject.toml

@@ -1,16 +1,16 @@
 # Defines the build system used for the project.
 [build-system]
-requires = ["hatchling==1.27.0"]
+requires = ["hatchling>=1,<2"]
 build-backend = "hatchling.build"
 
 # Project metdata section. Provides the genral ID information about the project.
 [project]
 name = "sl-shared-assets"
-version = "5.1.2"
+version = "6.0.0"
 description = "Provides data acquisition and processing assets shared between Sun (NeuroAI) lab libraries."
 readme = "README.md"
 license = { file = "LICENSE" }
-requires-python = ">=3.11"
+requires-python = ">=3.13,<3.14"
 authors = [
     { name = "Ivan Kondratyev" },
     { name = "Kushaan Gupta" },
@@ -31,8 +31,6 @@ classifiers = [
     # License
     "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
     # Supported Python Versions
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     # Supported OS systems
     "Operating System :: OS Independent",
@@ -101,7 +99,7 @@ packages = ["src/sl_shared_assets"]
 [tool.ruff]
 line-length = 120         # The maximum column length is set to 120 for this project.
 indent-width = 4          # Same as black, indents are 4 spaces
-target-version = "py311"  # Targets the lowest supported version of python
+target-version = "py313"  # Targets the lowest supported version of python
 src = ["src"]             # The name of the source directory
 
 # Excludes 'service' .py files, such as the sphinx configuration file, from linting.

{sl_shared_assets-5.1.2 → sl_shared_assets-6.0.0}/src/sl_shared_assets/command_line_interfaces/configure.py

@@ -15,7 +15,7 @@ from ..data_classes import (
 )
 
 # Ensures that displayed CLICK help messages are formatted according to the lab standard.
-CONTEXT_SETTINGS = dict(max_content_width=120)  # or any width you want
+CONTEXT_SETTINGS = dict(max_content_width=120)
 
 
 @click.group("manage", context_settings=CONTEXT_SETTINGS)

{sl_shared_assets-5.1.2 → sl_shared_assets-6.0.0}/src/sl_shared_assets/server/pipeline.py

@@ -342,6 +342,9 @@ class ProcessingTracker(YamlConfig):
                 self._complete = True
                 self._encountered_error = False
                 self._save_state()
+            else:
+                # Otherwise, updates the completed job counter, but does not change any other state variables.
+                self._save_state()
 
     def abort(self) -> None:
         """Resets the pipeline tracker file to the default state.
@@ -524,11 +527,22 @@ class ProcessingPipeline:
         # to the server.
         elif tracker.is_running:
             self._pipeline_stage += 1
-            self._submit_jobs()
+
+            # If the incremented stage is not a valid stage, the pipeline has actually been aborted and the tracker file
+            # does not properly reflect this state. Sets the internal state tracker appropriately and resets (removes)
+            # the tracker file from the server to prevent deadlocking further runtimes
+            if self._pipeline_stage not in self.jobs.keys():
+                sh.rmtree(self.local_tracker_path.parent)  # Removes local temporary data
+                self.pipeline_status = ProcessingStatus.ABORTED
+                self.server.remove(remote_path=self.remote_tracker_path, is_dir=False)
+            else:
+                # Otherwise, submits the next batch of jobs to the server.
+                self._submit_jobs()
 
         # The final and the rarest state: the pipeline was aborted before it finished the runtime. Generally, this state
         # should not be encountered during most runtimes.
         else:
+            sh.rmtree(self.local_tracker_path.parent)  # Removes local temporary data
             self.pipeline_status = ProcessingStatus.ABORTED
 
     def _submit_jobs(self) -> None:

{sl_shared_assets-5.1.2 → sl_shared_assets-6.0.0}/src/sl_shared_assets/tools/packaging_tools.py

@@ -115,7 +115,7 @@ def calculate_directory_checksum(
         results = []
         if not batch:
             with tqdm(
-                total=len(files), desc=f"Calculating checksum for {Path(*directory.parts[-6:])}", unit="files"
+                total=len(files), desc=f"Calculating checksum for {Path(*directory.parts[-6:])}", unit="file"
             ) as pbar:
                 for future in as_completed(future_to_path):
                     results.append(future.result())

{sl_shared_assets-5.1.2 → sl_shared_assets-6.0.0}/tox.ini

@@ -29,7 +29,7 @@ description =
     Runs static code formatting, style, and typing checkers. Mypy may not always work properly until py.typed marker is
     added the first time the 'stubs' task is executed.
 extras = dev
-basepython = py311
+basepython = py313
 commands =
     automation-cli purge-stubs
     ruff check --select I,NPY,FLY,ERA,PTH,N,FURB,TRY,RUF,UP,ARG --fix