thds.adls 3.2.20250604141224__py3-none-any.whl → 3.2.20250609172636__py3-none-any.whl

thds/adls/download.py

@@ -356,6 +356,7 @@ def download_or_use_verified(
         co, co_request, file_properties, dl_file_client = _prep_download_coroutine(
             fs_client, remote_key, local_path, md5b64, cache
         )
+        _dl_scope.enter(dl_file_client)  # on __exit__, will release the connection to the pool
         while True:
             if co_request == _IoRequest.FILE_PROPERTIES:
                 if not file_properties:
@@ -384,7 +385,11 @@ def download_or_use_verified(
         translate_azure_error(fs_client, remote_key, err)
 
 
+_async_dl_scope = scope.AsyncScope("adls.download.async")
+
+
 @_dl_scope.bound
+@_async_dl_scope.async_bound
 async def async_download_or_use_verified(
     fs_client: aio.FileSystemClient,
     remote_key: str,
@@ -397,6 +402,9 @@ async def async_download_or_use_verified(
         co, co_request, file_properties, dl_file_client = _prep_download_coroutine(
             fs_client, remote_key, local_path, md5b64, cache
         )
+        await _async_dl_scope.async_enter(
+            dl_file_client  # type: ignore[arg-type]
+        )  # on __aexit__, will release the connection to the pool
         while True:
             if co_request == _IoRequest.FILE_PROPERTIES:
                 if not file_properties:

thds/adls/file_properties.py

@@ -13,7 +13,10 @@ def is_directory(info: FileProperties) -> bool:
 
 
 def get_file_properties(fqn: AdlsFqn) -> FileProperties:
-    return get_global_fs_client(fqn.sa, fqn.container).get_file_client(fqn.path).get_file_properties()
+    with get_global_fs_client(fqn.sa, fqn.container).get_file_client(fqn.path) as file_client:
+        # The file client is a context manager to ensure proper resource cleanup
+        # and to avoid keeping connections open longer than necessary.
+        return file_client.get_file_properties()
 
 
 def get_blob_properties(fqn: AdlsFqn) -> BlobProperties:

thds/adls/resource/core.py

@@ -5,8 +5,8 @@ from thds.core import hashing, log, source
 from thds.core.hashing import b64
 
 from ..errors import blob_not_found_translation
+from ..file_properties import get_file_properties
 from ..fqn import AdlsFqn
-from ..global_client import get_global_fs_client
 from ..md5 import check_reasonable_md5b64
 
 logger = log.getLogger(__name__)
@@ -72,8 +72,6 @@ def get(fqn_or_uri: ty.Union[AdlsFqn, str]) -> AdlsHashedResource:
     """
     fqn = AdlsFqn.parse(fqn_or_uri) if isinstance(fqn_or_uri, str) else fqn_or_uri
     with blob_not_found_translation(fqn):
-        props = (
-            get_global_fs_client(fqn.sa, fqn.container).get_file_client(fqn.path).get_file_properties()
-        )
+        props = get_file_properties(fqn)
         assert props.content_settings.content_md5, "ADLS file has empty Content-MD5!"
         return AdlsHashedResource.of(fqn, b64(props.content_settings.content_md5))

thds/adls/resource/file_pointers.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 from thds.core.hashing import b64
 
-from ..global_client import get_global_fs_client
+from ..file_properties import get_file_properties
 from .core import AdlsHashedResource, parse, serialize
 
 _AZURE_PLACEHOLDER_SIZE_LIMIT = 4096
@@ -47,7 +47,7 @@ def resource_to_path(
 def validate_resource(srcfile: ty.Union[str, Path]) -> AdlsHashedResource:
     res = resource_from_path(srcfile)
     fqn, md5b64 = res
-    props = get_global_fs_client(fqn.sa, fqn.container).get_file_client(fqn.path).get_file_properties()
+    props = get_file_properties(fqn)
     md5 = props.content_settings.content_md5
     assert md5, f"{fqn} was incorrectly uploaded to ADLS without an MD5 embedded."
     assert md5b64 == b64(md5), f"You probably need to update the MD5 in {srcfile}"

thds/adls/resource/up_down.py

@@ -13,6 +13,7 @@ from .._upload import metadata_for_upload, upload_decision_and_settings
 from ..conf import UPLOAD_FILE_MAX_CONCURRENCY
 from ..download import download_or_use_verified
 from ..errors import BlobNotFoundError
+from ..file_properties import get_file_properties
 from ..fqn import AdlsFqn
 from ..global_client import get_global_blob_container_client, get_global_fs_client
 from ..ro_cache import Cache, global_cache
@@ -166,11 +167,7 @@ def upload(
 
 def verify_remote_md5(resource: AdlsHashedResource) -> bool:
     try:
-        props = (
-            get_global_fs_client(resource.fqn.sa, resource.fqn.container)
-            .get_file_client(resource.fqn.path)
-            .get_file_properties()
-        )
+        props = get_file_properties(resource.fqn)
         if props.content_settings.content_md5:
             return hashing.b64(props.content_settings.content_md5) == resource.md5b64
     except HttpResponseError:

{thds_adls-3.2.20250604141224.dist-info → thds_adls-3.2.20250609172636.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.adls
-Version: 3.2.20250604141224
+Version: 3.2.20250609172636
 Summary: ADLS tools
 Author-email: Trilliant Health <info@trillianthealth.com>
 License: MIT

{thds_adls-3.2.20250604141224.dist-info → thds_adls-3.2.20250609172636.dist-info}/RECORD

@@ -7,11 +7,11 @@ thds/adls/conf.py,sha256=q1SPrgb46NpobVzwt_Oyv71-BvsIbZLq9nRWS3LZjz0,1990
 thds/adls/copy.py,sha256=jUWbGvTpb4B3yRGS0nhGSbDzqRPzUqYgH0z1lFRJB3k,6365
 thds/adls/dbfs.py,sha256=pPAjbIZRKJsaXKQljDMUgqS_zy1yKeEZHGMueXbuv3g,2219
 thds/adls/defaults.py,sha256=GGq5Pn4r-8cX4bZItp4nnwWAAz7S07pzPoOegw0y5Fw,676
-thds/adls/download.py,sha256=dMcV1Q5BB3QkeXKeSwazdVE1DWM-kpfp_NCoIeaPYjE,18162
+thds/adls/download.py,sha256=c1GapH8e7H5AmGR7S2u6CJ-XqQaDdtVQ6tKIwjuMTio,18510
 thds/adls/download_lock.py,sha256=ttD2GhPNRnITNoV1XH2PvKbMsHppZirjy3RZ4P4kgKM,2826
 thds/adls/errors.py,sha256=B_rMsQvQnNmP_sf-x8kmGsv2vIeOh4G9kVbdNVyk350,1469
 thds/adls/etag.py,sha256=ct7jpHhNFcKzbekn5rZ3m6DhjK48A7qOZGwDiHkc-pc,242
-thds/adls/file_properties.py,sha256=V3VEjEG3PNyeQaJ159Kco5l7c2EiyjE0yygtmVVjd6E,1597
+thds/adls/file_properties.py,sha256=DYUu4zI_5amwTSMbhvUVimSEfEsfpgoqOawQ4Z4W-nY,1790
 thds/adls/fqn.py,sha256=0zHmHhBWN7GEfKRB3fBC1NVhaiIHHifBdCRanyT01X8,5822
 thds/adls/global_client.py,sha256=f4VJw5y_Yh__8gQUcdSYTh1aU6iEPlauMchVirSAwDQ,3716
 thds/adls/impl.py,sha256=4qa70w1sehzp60CI6lW82NLDK-lsM1uUfhPmZnYJaw0,42589
@@ -27,14 +27,14 @@ thds/adls/uri.py,sha256=pDH956p_VEHnjLLUnjWY6sGgRqksp9gdpc9KOW4gEP0,1205
 thds/adls/azcopy/__init__.py,sha256=nTNbgz2GcEiGeswYbAgy4oPhivnzl_5crF3HqCdWWiw,31
 thds/adls/azcopy/download.py,sha256=Fig6q-bRZBeoA5L-URl5BACfMH9-9_sc4T2sa9yiZyQ,6611
 thds/adls/resource/__init__.py,sha256=IZ7_aRf1b3jEp7wXOxqHop0gV2gUcf9SOLeEEjIWlCU,1669
-thds/adls/resource/core.py,sha256=BVM91xsZ_B_CoGTc9DDD3FnGy8g6X-9eFpa86ZCzuZI,2717
-thds/adls/resource/file_pointers.py,sha256=PLru_3lwut_ZvrX5Keu-wJkPOt5o7UGf-OOT4ixaXME,2049
-thds/adls/resource/up_down.py,sha256=3uNlTvm2gVhSyYdQTBwsGecOgwtINQfINckR-awwV0Y,9907
+thds/adls/resource/core.py,sha256=u6iaJAbnk88Xfn6SQBgITDnvHpEFdMjUtE_fOgebbTU,2627
+thds/adls/resource/file_pointers.py,sha256=2g5lUtauA5vCZ4-skxIdmLeOp4cLZ7Mtv-MAhq6nIsA,1983
+thds/adls/resource/up_down.py,sha256=eTQMbeqM6edfVz18uHXRiOe0oEzOAaW1TBvym6lctNM,9822
 thds/adls/tools/download.py,sha256=vvBO8lSDl9oPugv75qpCkoemT9pOM9BV6yeExlkyG08,1594
 thds/adls/tools/ls.py,sha256=OgEaIfTK359twlZIj-A0AW_nv81Z6zi0b9Tw6OJJfWA,1083
 thds/adls/tools/upload.py,sha256=eMk4pdug1aCMPDDWpIE3Zoq77i5APp9Uuh-sVCCDNJE,493
-thds_adls-3.2.20250604141224.dist-info/METADATA,sha256=zl0ZK_0FOqsg_etyjWg7qNkzfxpBDUfSVQpeFi5HwPA,543
-thds_adls-3.2.20250604141224.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_adls-3.2.20250604141224.dist-info/entry_points.txt,sha256=uTqreT1AIwqJboMfLv5w6sviM8mNbAkln765gIjzoA4,152
-thds_adls-3.2.20250604141224.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_adls-3.2.20250604141224.dist-info/RECORD,,
+thds_adls-3.2.20250609172636.dist-info/METADATA,sha256=LkbxgTwbHIptXGNJLjS1eMFUidt5FUzDz9NXhEyLdes,543
+thds_adls-3.2.20250609172636.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_adls-3.2.20250609172636.dist-info/entry_points.txt,sha256=uTqreT1AIwqJboMfLv5w6sviM8mNbAkln765gIjzoA4,152
+thds_adls-3.2.20250609172636.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_adls-3.2.20250609172636.dist-info/RECORD,,