mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-10 19:57:42 +08:00
Remove unused enable_safetensors parameter from extract_file_metadata
Some checks failed
Python Linting / Run Ruff (push) Has been cancelled
Python Linting / Run Pylint (push) Has been cancelled
Build package / Build Test (3.10) (push) Has been cancelled
Build package / Build Test (3.11) (push) Has been cancelled
Build package / Build Test (3.12) (push) Has been cancelled
Build package / Build Test (3.13) (push) Has been cancelled
Build package / Build Test (3.14) (push) Has been cancelled
Some checks failed
Python Linting / Run Ruff (push) Has been cancelled
Python Linting / Run Pylint (push) Has been cancelled
Build package / Build Test (3.10) (push) Has been cancelled
Build package / Build Test (3.11) (push) Has been cancelled
Build package / Build Test (3.12) (push) Has been cancelled
Build package / Build Test (3.13) (push) Has been cancelled
Build package / Build Test (3.14) (push) Has been cancelled
Amp-Thread-ID: https://ampcode.com/threads/T-019ccb0b-2980-74fc-b62f-5fce0f658d8e Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
parent
7f00f48c96
commit
ad5604fb0b
@ -314,7 +314,6 @@ def build_asset_specs(
|
|||||||
metadata = extract_file_metadata(
|
metadata = extract_file_metadata(
|
||||||
abs_p,
|
abs_p,
|
||||||
stat_result=stat_p,
|
stat_result=stat_p,
|
||||||
enable_safetensors=True,
|
|
||||||
relative_filename=rel_fname,
|
relative_filename=rel_fname,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -435,7 +434,6 @@ def enrich_asset(
|
|||||||
metadata = extract_file_metadata(
|
metadata = extract_file_metadata(
|
||||||
file_path,
|
file_path,
|
||||||
stat_result=stat_p,
|
stat_result=stat_p,
|
||||||
enable_safetensors=True,
|
|
||||||
relative_filename=rel_fname,
|
relative_filename=rel_fname,
|
||||||
)
|
)
|
||||||
if metadata:
|
if metadata:
|
||||||
|
|||||||
@ -278,18 +278,16 @@ def _extract_safetensors_metadata(
|
|||||||
def extract_file_metadata(
|
def extract_file_metadata(
|
||||||
abs_path: str,
|
abs_path: str,
|
||||||
stat_result: os.stat_result | None = None,
|
stat_result: os.stat_result | None = None,
|
||||||
enable_safetensors: bool = True,
|
|
||||||
relative_filename: str | None = None,
|
relative_filename: str | None = None,
|
||||||
) -> ExtractedMetadata:
|
) -> ExtractedMetadata:
|
||||||
"""Extract metadata from a file using tier 1 and optionally tier 2 methods.
|
"""Extract metadata from a file using tier 1 and tier 2 methods.
|
||||||
|
|
||||||
Tier 1 (always): Filesystem metadata from path and stat
|
Tier 1: Filesystem metadata from path and stat
|
||||||
Tier 2 (optional): Safetensors header parsing if applicable
|
Tier 2: Safetensors header parsing if applicable
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
abs_path: Absolute path to the file
|
abs_path: Absolute path to the file
|
||||||
stat_result: Optional pre-fetched stat result (saves a syscall)
|
stat_result: Optional pre-fetched stat result (saves a syscall)
|
||||||
enable_safetensors: Whether to parse safetensors headers (tier 2)
|
|
||||||
relative_filename: Optional relative filename to use instead of basename
|
relative_filename: Optional relative filename to use instead of basename
|
||||||
(e.g., "flux/123/model.safetensors" for model paths)
|
(e.g., "flux/123/model.safetensors" for model paths)
|
||||||
|
|
||||||
@ -318,7 +316,7 @@ def extract_file_metadata(
|
|||||||
meta.content_length = stat_result.st_size
|
meta.content_length = stat_result.st_size
|
||||||
|
|
||||||
# Tier 2: Safetensors header (if applicable and enabled)
|
# Tier 2: Safetensors header (if applicable and enabled)
|
||||||
if enable_safetensors and ext.lower() in SAFETENSORS_EXTENSIONS:
|
if ext.lower() in SAFETENSORS_EXTENSIONS:
|
||||||
header = _read_safetensors_header(abs_path)
|
header = _read_safetensors_header(abs_path)
|
||||||
if header:
|
if header:
|
||||||
try:
|
try:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user