Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/add-metadata-to-files' of github.com:mashb1t/Fooocus into feature/add-metadata-to-files

Browse Source
This commit is contained in:
Manuel Schmid
2024-02-18 16:15:56 +01:00
parent f93dd6edcc 832441e86d
commit 692a2e4369
61 changed files with 2048 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/meta_parser.py
+8 -8
View File
@@ -26,7 +26,7 @@ def load_parameter_button_click(raw_metadata: dict | str, is_generating: bool):
loaded_parameter_dict = json.loads(raw_metadata)
assert isinstance(loaded_parameter_dict, dict)
results = [True, 1]
results = [len(loaded_parameter_dict) > 0, 1]
get_str('prompt', 'Prompt', loaded_parameter_dict, results)
get_str('negative_prompt', 'Negative Prompt', loaded_parameter_dict, results)
@@ -39,7 +39,7 @@ def load_parameter_button_click(raw_metadata: dict | str, is_generating: bool):
get_float('sharpness', 'Sharpness', loaded_parameter_dict, results)
get_adm_guidance('adm_guidance', 'ADM Guidance', loaded_parameter_dict, results)
get_str('refiner_swap_method', 'Refiner Swap Method', loaded_parameter_dict, results)
get_str('adaptive_cfg', 'CFG Mimicking from TSNR', loaded_parameter_dict, results)
get_float('adaptive_cfg', 'CFG Mimicking from TSNR', loaded_parameter_dict, results)
get_str('base_model', 'Base Model', loaded_parameter_dict, results)
get_str('refiner_model', 'Refiner Model', loaded_parameter_dict, results)
get_float('refiner_switch', 'Refiner Switch', loaded_parameter_dict, results)
@@ -204,7 +204,7 @@ class MetadataParser(ABC):
raise NotImplementedError
@abstractmethod
def parse_json(self, metadata: dict) -> dict:
def parse_json(self, metadata: dict | str) -> dict:
raise NotImplementedError
@abstractmethod
@@ -503,11 +503,11 @@ def read_info_from_image(filepath) -> tuple[str | None, dict, MetadataScheme | N
except ValueError:
metadata_scheme = None
# broad fallback
if metadata_scheme is None and isinstance(parameters, dict):
metadata_scheme = MetadataScheme.FOOOCUS
# broad fallback
if isinstance(parameters, dict):
metadata_scheme = MetadataScheme.FOOOCUS
if metadata_scheme is None and isinstance(parameters, str):
metadata_scheme = MetadataScheme.A1111
if isinstance(parameters, str):
metadata_scheme = MetadataScheme.A1111
return parameters, items, metadata_scheme