wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-12-20 11:32:58 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Simplified hashing function tpye hint and _hash_file_obj

Browse Source
This commit is contained in:
Jedrzej Kosinski 2025-12-18 15:43:01 -08:00
parent a6fed841b5
commit 07e85cecbd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/hashing.py
View File

@ -8,7 +8,7 @@ DEFAULT_CHUNK = 8 * 1024 *1024 # 8MB
# NOTE: this allows hashing different representations of a file-like object # NOTE: this allows hashing different representations of a file-like object
def blake3_hash( def blake3_hash(
fp: Union[str, bytes, os.PathLike[str], os.PathLike[bytes], IO[bytes]], fp: str | IO[bytes],
chunk_size: int = DEFAULT_CHUNK, chunk_size: int = DEFAULT_CHUNK,
) -> str: ) -> str:
""" """
@ -19,6 +19,7 @@ def blake3_hash(
``read``, ``seek``, and ``tell``. The function will seek to the start before ``read``, ``seek``, and ``tell``. The function will seek to the start before
reading and will attempt to restore the original position afterward. reading and will attempt to restore the original position afterward.
""" """
# duck typing to check if input is a file-like object
if hasattr(fp, "read"): if hasattr(fp, "read"):
return _hash_file_obj(fp, chunk_size) return _hash_file_obj(fp, chunk_size)
@ -27,7 +28,7 @@ def blake3_hash(
async def blake3_hash_async( async def blake3_hash_async(
fp: Union[str, bytes, os.PathLike[str], os.PathLike[bytes], IO[bytes]], fp: str | IO[bytes],
chunk_size: int = DEFAULT_CHUNK, chunk_size: int = DEFAULT_CHUNK,
) -> str: ) -> str:
"""Async wrapper for ``blake3_hash_sync``. """Async wrapper for ``blake3_hash_sync``.
@ -54,13 +55,11 @@ def _hash_file_obj(file_obj: IO, chunk_size: int = DEFAULT_CHUNK) -> str:
chunk_size = DEFAULT_CHUNK chunk_size = DEFAULT_CHUNK
# in case file object is already open and not at the beginning, track so can be restored after hashing # in case file object is already open and not at the beginning, track so can be restored after hashing
orig_pos = None orig_pos = file_obj.tell()
if hasattr(file_obj, "tell"):
orig_pos = file_obj.tell()
try: try:
if hasattr(file_obj, "seek"): # seek to the beginning before reading
# seek to the beginning before reading if orig_pos != 0:
file_obj.seek(0) file_obj.seek(0)
h = blake3() h = blake3()
@ -72,5 +71,5 @@ def _hash_file_obj(file_obj: IO, chunk_size: int = DEFAULT_CHUNK) -> str:
return h.hexdigest() return h.hexdigest()
finally: finally:
# restore original position in file object, if needed # restore original position in file object, if needed
if hasattr(file_obj, "seek") and orig_pos is not None: if orig_pos != 0:
file_obj.seek(orig_pos) file_obj.seek(orig_pos)