thds.adls 4.1.20250709231508__py3-none-any.whl → 4.1.20250715190539__py3-none-any.whl

thds/adls/source_tree.py

@@ -6,25 +6,21 @@ from azure.storage.blob import BlobProperties, ContainerClient
 from thds.core import hashing
 from thds.core.source.tree import SourceTree
 
-from . import fqn, global_client, source, uri
+from . import fqn, global_client, hashes, source, uri
 
 
 @dataclass
 class BlobMeta:
     path: str
     size: int
-    md5: ty.Optional[hashing.Hash]
+    hash: ty.Optional[hashing.Hash]
 
 
 def to_blob_meta(blob_props: BlobProperties) -> BlobMeta:
     return BlobMeta(
         blob_props.name,
         blob_props.size,
-        (
-            hashing.Hash("md5", bytes(blob_props.content_settings.content_md5))
-            if blob_props.content_settings.content_md5
-            else None
-        ),
+        next(iter(hashes.extract_hashes_from_props(blob_props).values()), None),
     )
 
 
@@ -34,10 +30,11 @@ def to_blob_meta(blob_props: BlobProperties) -> BlobMeta:
 def list_blob_meta(
     container_client: ContainerClient, root_dir: str, match_suffix: str = ""
 ) -> ty.List[BlobMeta]:
-    """Gets the path (relative to the SA/container root), size, and MD5 hash of all blobs in a directory."""
+    """Gets the path (relative to the SA/container root), size, and _a_ hash (if available) of all blobs in a directory."""
     return [
         to_blob_meta(blob_props)
-        for blob_props in container_client.list_blobs(name_starts_with=root_dir)
+        for blob_props in container_client.list_blobs(name_starts_with=root_dir, include=["metadata"])
+        # `list_blobs` does not include metadata by default, so we need to explicitly specify including it
         if blob_props.size > 0
         # container client lists directories as blobs with size 0
         and blob_props.name.endswith(match_suffix)
@@ -54,7 +51,7 @@ def from_path(adls_path: uri.UriIsh, match_suffix: str = "") -> SourceTree:
     container_root = root_fqn.root()
     return SourceTree(
         sources=[
-            source.from_adls(container_root / blob_meta.path, hash=blob_meta.md5)
+            source.from_adls(container_root / blob_meta.path, hash=blob_meta.hash)
             for blob_meta in list_blob_meta(container_client, root_fqn.path, match_suffix=match_suffix)
         ],
         higher_logical_root=fqn.split(root_fqn)[-1],

{thds_adls-4.1.20250709231508.dist-info → thds_adls-4.1.20250715190539.dist-info}/METADATA

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

{thds_adls-4.1.20250709231508.dist-info → thds_adls-4.1.20250715190539.dist-info}/RECORD

@@ -23,7 +23,7 @@ thds/adls/ro_cache.py,sha256=P-UVFZhqnE5wojqYmRVWZcqjl-pM1xVMm9VAm3nXlnA,4769
 thds/adls/sas_tokens.py,sha256=mArbB_GYohevOmArw_1gKqVUWpv6kG8Hsbvdrhbtnbg,1957
 thds/adls/shared_credential.py,sha256=-x42aXoIM001KW59oS8PpuXQd4-F2vg-1gB6OMHlpk4,4602
 thds/adls/source.py,sha256=8HVMYuxDn1XYGwFFSBowMlvQ6r2Jm2CQlpu4h85JvsE,2559
-thds/adls/source_tree.py,sha256=yP_v2XrKxXqUOdZ-x8kqHhBFAuur3AlAq3zi4hHj4AE,2235
+thds/adls/source_tree.py,sha256=exBi7jNrOyj9nH5rzxZmZOqhRW9WXnmZLdLt4weoXYc,2292
 thds/adls/upload.py,sha256=MRHK9Am-x5FKBPh1SXLTbPC1r0Xk0bGWNU8CcNuUMLo,6602
 thds/adls/uri.py,sha256=9MXuW_KfpPvzBc4ERxuTJ3vvi_6yr7e1kMAW9mx2zXM,1414
 thds/adls/azcopy/__init__.py,sha256=qn2dmT92EHcrtaQ8uwRoUgvtF6Fu3NQbhZItOBdIBmY,45
@@ -35,8 +35,8 @@ thds/adls/azcopy/upload.py,sha256=0l5FzV9IgZ2iQhm4eKZjTdw4SO17bHd8VnwcTev1lUs,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.20250709231508.dist-info/METADATA,sha256=arD-CkKjjLZ9CmzD0gMWTYrB-DXJO0uyVFdDU5X3seg,587
-thds_adls-4.1.20250709231508.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_adls-4.1.20250709231508.dist-info/entry_points.txt,sha256=uTqreT1AIwqJboMfLv5w6sviM8mNbAkln765gIjzoA4,152
-thds_adls-4.1.20250709231508.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_adls-4.1.20250709231508.dist-info/RECORD,,
+thds_adls-4.1.20250715190539.dist-info/METADATA,sha256=htqlyixo6qU6vvdT5DdQ8oqw8cuKyBYGYxR3tGzc7Hg,587
+thds_adls-4.1.20250715190539.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_adls-4.1.20250715190539.dist-info/entry_points.txt,sha256=uTqreT1AIwqJboMfLv5w6sviM8mNbAkln765gIjzoA4,152
+thds_adls-4.1.20250715190539.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_adls-4.1.20250715190539.dist-info/RECORD,,