dcor-shared 1.0.1__tar.gz → 1.0.3__tar.gz

{dcor_shared-1.0.1 → dcor_shared-1.0.3}/CHANGELOG

@@ -1,3 +1,7 @@
+1.0.3
+ - enh: allow to specify resource name when creating test resource
+1.0.2
+ - ref: disable threading and use 1GiB threshold for multipart uploads
 1.0.1
  - enh: introduce `for_circles_only` kwarg for `iter_buckets`
 1.0.0

{dcor_shared-1.0.1 → dcor_shared-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcor_shared
-Version: 1.0.1
+Version: 1.0.3
 Summary: Functionalities shared by the DCOR CKAN extensions
 Author: Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>

{dcor_shared-1.0.1 → dcor_shared-1.0.3}/dcor_shared/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.1'
-__version_tuple__ = version_tuple = (1, 0, 1)
+__version__ = version = '1.0.3'
+__version_tuple__ = version_tuple = (1, 0, 3)

{dcor_shared-1.0.1 → dcor_shared-1.0.3}/dcor_shared/s3.py

@@ -13,6 +13,7 @@ from typing import List, Tuple
 import warnings
 
 import boto3
+from boto3.s3.transfer import TransferConfig
 from botocore.config import Config
 import botocore.exceptions
 
@@ -677,9 +678,17 @@ def upload_file(bucket_name, object_name, path, sha256=None, private=True,
                                            object_name=object_name)
 
     if perform_upload:
+        config = TransferConfig(
+            # 1GiB threshold for multipart uploads
+            multipart_threshold=1 * 1024 * 1024 * 1024,
+            multipart_chunksize=1 * 1024 * 1024 * 1024,
+            # Disable threads
+            use_threads=False
+        )
         s3_client.upload_file(Filename=str(path),
                               Bucket=bucket_name,
                               Key=object_name,
+                              Config=config,
                               # ExtraArgs={
                               # # verification of the upload (breaks OpenStack)
                               # "ChecksumAlgorithm": "SHA256",

{dcor_shared-1.0.1 → dcor_shared-1.0.3}/dcor_shared/testing.py

@@ -149,11 +149,14 @@ def make_resource_via_s3(
         resource_path: pathlib.Path | str,
         organization_id: str,
         dataset_id: str,
+        resource_name: str = None,
         private: bool = False,
         ret_dict: bool = False,
         ):
     """Upload a resource to S3 and register it with CKAN"""
     resource_path = pathlib.Path(resource_path)
+    if resource_name is None:
+        resource_name = resource_path.name
 
     user = factories.Sysadmin()
     create_context = {'ignore_auth': False,
@@ -175,7 +178,7 @@ def make_resource_via_s3(
         "match": {"id": dataset_id},
         "update__resources__extend": [{
             "id": rid,
-            "name": resource_path.name,
+            "name": resource_name,
             "s3_available": True,
             }]
         }

{dcor_shared-1.0.1 → dcor_shared-1.0.3}/dcor_shared.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcor_shared
-Version: 1.0.1
+Version: 1.0.3
 Summary: Functionalities shared by the DCOR CKAN extensions
 Author: Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>

{dcor_shared-1.0.1 → dcor_shared-1.0.3}/tests/test_testing.py

@@ -2,9 +2,12 @@ import pathlib
 import pytest
 
 import ckan.tests.factories as factories
+import ckan.tests.helpers as helpers
 import requests
 
-from dcor_shared.testing import make_dataset_via_s3
+from dcor_shared.testing import (
+    make_dataset_via_s3, make_resource_via_s3, activate_dataset
+)
 from dcor_shared import s3cc, sha256sum
 
 data_path = pathlib.Path(__file__).parent / "data"
@@ -47,3 +50,26 @@ def test_make_dataset_with_resource_via_s3(tmp_path):
 
     assert sha256sum(dl_path) == \
            "490efdf5d9bb4cd4b2a6bcf2fe54d4dc201c38530140bcb168980bf8bf846c73"
+
+    assert res_dict["name"] == "calibration_beads_47.rtdc"
+
+
+@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas')
+@pytest.mark.usefixtures('clean_db', 'with_request_context')
+def test_make_resource_via_s3_name(tmp_path):
+    # upload a *valid* [sic] .rtdc File (this is the control)
+    ds_dict = make_dataset_via_s3(
+        activate=False,
+        private=False,
+    )
+    rid = make_resource_via_s3(
+        resource_path=data_path / "calibration_beads_47.rtdc",
+        resource_name="peter.rtdc",
+        organization_id=ds_dict["organization"]["id"],
+        dataset_id=ds_dict["id"],
+        private=False,
+    )
+    activate_dataset(ds_dict["id"])
+
+    res_dict = helpers.call_action("resource_show", id=rid)
+    assert res_dict["name"] == "peter.rtdc"