thds.adls 4.1.20250718170943__py3-none-any.whl → 4.1.20250721144539__py3-none-any.whl

thds/adls/download.py

@@ -158,6 +158,12 @@ IoRequest = ty.Union[_IoRequest, azcopy.download.DownloadRequest]
 IoResponse = ty.Union[FileProperties, None]
 
 
+def _assert_fp(fp: ty.Optional[FileProperties], fqn: AdlsFqn) -> None:
+    assert fp, f"FileProperties for {fqn} should not be None."
+    assert fp.name, f"FileProperties for {fqn} should have a name."
+    assert fp.name == fqn.path, (fp, fqn)
+
+
 _dl_scope = scope.Scope("adls.download")
 
 
@@ -218,6 +224,7 @@ def _download_or_use_verified_cached_coroutine(  # noqa: C901
         # expectations from ADLS itself.
         file_properties = yield _IoRequest.FILE_PROPERTIES
         if file_properties:
+            _assert_fp(file_properties, fqn)
             # critically, we expect the _first_ one in this list to be the fastest to verify.
             expected_hash = next(iter(hashes.extract_hashes_from_props(file_properties).values()), None)
 
@@ -247,6 +254,7 @@ def _download_or_use_verified_cached_coroutine(  # noqa: C901
 
     logger.debug("Unable to find a cached version anywhere that we looked...")
     file_properties = yield _IoRequest.FILE_PROPERTIES
+    _assert_fp(file_properties, fqn)
 
     # if any of the remote hashes match the expected hash, verify that one.
     # otherwise, verify the first remote hash in the list, since that's the fastest one.
@@ -286,19 +294,14 @@ def _prep_download_coroutine(
     local_path: StrOrPath,
     expected_hash: ty.Optional[hashing.Hash] = None,
     cache: ty.Optional[Cache] = None,
-) -> ty.Tuple[
-    ty.Generator[IoRequest, IoResponse, _FileResult],
-    IoRequest,
-    ty.Optional[FileProperties],
-    DataLakeFileClient,
-]:
+) -> ty.Tuple[ty.Generator[IoRequest, IoResponse, _FileResult], IoRequest, DataLakeFileClient]:
     co = _download_or_use_verified_cached_coroutine(
         AdlsFqn(ty.cast(str, fs_client.account_name), fs_client.file_system_name, remote_key),
         local_path,
         expected_hash=expected_hash,
         cache=cache,
     )
-    return co, co.send(None), None, fs_client.get_file_client(remote_key)
+    return co, co.send(None), fs_client.get_file_client(remote_key)
 
 
 def _excs_to_retry() -> ty.Callable[[Exception], bool]:
@@ -349,14 +352,16 @@ def download_or_use_verified(
     """
     file_properties = None
     try:
-        co, co_request, file_properties, dl_file_client = _prep_download_coroutine(
+        co, co_request, dl_file_client = _prep_download_coroutine(
             fs_client, remote_key, local_path, expected_hash, cache
         )
+        assert dl_file_client.path_name == remote_key
         _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:
                     # only fetch these if they haven't already been requested
+                    assert dl_file_client.path_name == remote_key
                     file_properties = dl_file_client.get_file_properties()
                 co_request = co.send(file_properties)
             elif isinstance(co_request, azcopy.download.DownloadRequest):
@@ -399,7 +404,7 @@ async def async_download_or_use_verified(
 ) -> ty.Optional[Path]:
     file_properties = None
     try:
-        co, co_request, file_properties, dl_file_client = _prep_download_coroutine(
+        co, co_request, dl_file_client = _prep_download_coroutine(
             fs_client, remote_key, local_path, expected_hash, cache
         )
         await _async_dl_scope.async_enter(dl_file_client)  # type: ignore[arg-type]

{thds_adls-4.1.20250718170943.dist-info → thds_adls-4.1.20250721144539.dist-info}/METADATA

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

{thds_adls-4.1.20250718170943.dist-info → thds_adls-4.1.20250721144539.dist-info}/RECORD

@@ -7,7 +7,7 @@ thds/adls/conf.py,sha256=nTw3X1ilC3A_905jZH-rWXFsESeHAKQn5IghvfX2VIo,1991
 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=pL-i4Zq020Fb4oHgZ01EEFAEV27a7VqFBDqrF2UVgcg,18863
+thds/adls/download.py,sha256=VmvkI3c0bAxVF2B7dBqHpSL18a701ddFNFCwpJSfdF4,19223
 thds/adls/download_lock.py,sha256=tgT48l4C5_qmArGeq05gl7VlxT22dZBH2Xwxx0itE9o,3176
 thds/adls/errors.py,sha256=6NMLHtVNsWBRDXaes9yzHj9cwKOD9t1dwL4BltdtjhU,1895
 thds/adls/etag.py,sha256=ct7jpHhNFcKzbekn5rZ3m6DhjK48A7qOZGwDiHkc-pc,242
@@ -35,8 +35,8 @@ thds/adls/azcopy/upload.py,sha256=RQLDJzS6qsMM12t5bykWJWBXs0UrmImrEFnPMxX2UlM,27
 thds/adls/tools/download.py,sha256=CW2cWbCRdUqisVVVoqqvqk5Ved7pPGTkwnZj3uV0jy4,1587
 thds/adls/tools/ls.py,sha256=OgEaIfTK359twlZIj-A0AW_nv81Z6zi0b9Tw6OJJfWA,1083
 thds/adls/tools/upload.py,sha256=5WyWkpuVp2PETZ3O3ODlq8LXszSHU73ZMnIDZXPJdC8,442
-thds_adls-4.1.20250718170943.dist-info/METADATA,sha256=63BOl1GjMnjkbbJWw3RTODULnxG0pvZqEgAtRuYYapg,587
-thds_adls-4.1.20250718170943.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_adls-4.1.20250718170943.dist-info/entry_points.txt,sha256=uTqreT1AIwqJboMfLv5w6sviM8mNbAkln765gIjzoA4,152
-thds_adls-4.1.20250718170943.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_adls-4.1.20250718170943.dist-info/RECORD,,
+thds_adls-4.1.20250721144539.dist-info/METADATA,sha256=ovHWIocl-mvVUUpe6czc-fcySpppzdGEv2JizzcDv_I,587
+thds_adls-4.1.20250721144539.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_adls-4.1.20250721144539.dist-info/entry_points.txt,sha256=uTqreT1AIwqJboMfLv5w6sviM8mNbAkln765gIjzoA4,152
+thds_adls-4.1.20250721144539.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_adls-4.1.20250721144539.dist-info/RECORD,,