dsw-storage 4.21.0__tar.gz → 4.22.0__tar.gz

{dsw_storage-4.21.0/dsw_storage.egg-info → dsw_storage-4.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-storage
-Version: 4.21.0
+Version: 4.22.0
 Summary: Library for managing DSW S3 storage
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: minio
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.21.0
+Requires-Dist: dsw-config==4.22.0
 Dynamic: license-file
 
 # Data Stewardship Wizard: Storage

{dsw_storage-4.21.0 → dsw_storage-4.22.0}/dsw/storage/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.21.0~12713f1',
-    built_at='2025-08-05 09:20:46Z',
-    sha='12713f1988c2a33d5c40dd2cb899cdac7be35668',
+    version='v4.22.0~dffe6c1',
+    built_at='2025-09-02 13:01:16Z',
+    sha='dffe6c10e47b8795a0d27d495d1c0c0a5d4a76fb',
     branch='HEAD',
-    tag='v4.21.0',
+    tag='v4.22.0',
 )

{dsw_storage-4.21.0 → dsw_storage-4.22.0}/dsw/storage/s3storage.py

@@ -91,7 +91,55 @@ class S3Storage:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def download_file(self, *, file_name: str, target_path: pathlib.Path) -> bool:
+    def download_questionnaire_file(self, *, tenant_uuid: str, questionnaire_uuid: str,
+                                    file_uuid: str, target_path: pathlib.Path) -> bool:
+        return self._download_file(
+            tenant_uuid=tenant_uuid,
+            file_name=f'questionnaire-files/{questionnaire_uuid}/{file_uuid}',
+            target_path=target_path,
+        )
+
+    @tenacity.retry(
+        reraise=True,
+        wait=tenacity.wait_exponential(multiplier=RETRY_S3_MULTIPLIER),
+        stop=tenacity.stop_after_attempt(RETRY_S3_TRIES),
+        before=tenacity.before_log(LOG, logging.DEBUG),
+        after=tenacity.after_log(LOG, logging.DEBUG),
+    )
+    def download_template_asset(self, *, tenant_uuid: str, template_id: str,
+                                file_name: str, target_path: pathlib.Path) -> bool:
+        return self._download_file(
+            tenant_uuid=tenant_uuid,
+            file_name=f'templates/{template_id}/{file_name}',
+            target_path=target_path,
+        )
+
+    @tenacity.retry(
+        reraise=True,
+        wait=tenacity.wait_exponential(multiplier=RETRY_S3_MULTIPLIER),
+        stop=tenacity.stop_after_attempt(RETRY_S3_TRIES),
+        before=tenacity.before_log(LOG, logging.DEBUG),
+        after=tenacity.after_log(LOG, logging.DEBUG),
+    )
+    def download_locale(self, *, tenant_uuid: str, locale_id: str,
+                        file_name: str, target_path: pathlib.Path) -> bool:
+        return self._download_file(
+            tenant_uuid=tenant_uuid,
+            file_name=f'locales/{locale_id}/{file_name}',
+            target_path=target_path,
+        )
+
+    @tenacity.retry(
+        reraise=True,
+        wait=tenacity.wait_exponential(multiplier=RETRY_S3_MULTIPLIER),
+        stop=tenacity.stop_after_attempt(RETRY_S3_TRIES),
+        before=tenacity.before_log(LOG, logging.DEBUG),
+        after=tenacity.after_log(LOG, logging.DEBUG),
+    )
+    def _download_file(self, *, tenant_uuid: str, file_name: str,
+                       target_path: pathlib.Path) -> bool:
+        if self.multi_tenant:
+            file_name = f'{tenant_uuid}/{file_name}'
         try:
             self.client.fget_object(
                 bucket_name=self.cfg.bucket,

{dsw_storage-4.21.0 → dsw_storage-4.22.0/dsw_storage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-storage
-Version: 4.21.0
+Version: 4.22.0
 Summary: Library for managing DSW S3 storage
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: minio
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.21.0
+Requires-Dist: dsw-config==4.22.0
 Dynamic: license-file
 
 # Data Stewardship Wizard: Storage

dsw_storage-4.22.0/dsw_storage.egg-info/requires.txt

@@ -0,0 +1,3 @@
+minio
+tenacity
+dsw-config==4.22.0

{dsw_storage-4.21.0 → dsw_storage-4.22.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-storage'
-version = "4.21.0"
+version = "4.22.0"
 description = 'Library for managing DSW S3 storage'
 readme = 'README.md'
 keywords = ['dsw', 's3', 'bucket', 'storage']
@@ -26,7 +26,7 @@ dependencies = [
     'minio',
     'tenacity',
     # DSW
-    "dsw-config==4.21.0",
+    "dsw-config==4.22.0",
 ]
 
 [project.urls]

dsw_storage-4.21.0/dsw_storage.egg-info/requires.txt

@@ -1,3 +0,0 @@
-minio
-tenacity
-dsw-config==4.21.0