From db8228d8f56c7f0bb1285a6f287346c37c6bdb32 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Thu, 30 May 2024 00:19:35 +0200 Subject: [PATCH] refactor: rename parse_json to to_json, rename parse_string to to_string --- modules/meta_parser.py | 12 ++++++------ modules/private_logger.py | 2 +- webui.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/meta_parser.py b/modules/meta_parser.py index 586e62da..23ec01ce 100644 --- a/modules/meta_parser.py +++ b/modules/meta_parser.py @@ -261,11 +261,11 @@ class MetadataParser(ABC): raise NotImplementedError @abstractmethod - def parse_json(self, metadata: dict | str) -> dict: + def to_json(self, metadata: dict | str) -> dict: raise NotImplementedError @abstractmethod - def parse_string(self, metadata: dict) -> str: + def to_string(self, metadata: dict) -> str: raise NotImplementedError def set_data(self, raw_prompt, full_prompt, raw_negative_prompt, full_negative_prompt, steps, base_model_name, @@ -328,7 +328,7 @@ class A1111MetadataParser(MetadataParser): 'version': 'Version' } - def parse_json(self, metadata: str) -> dict: + def to_json(self, metadata: str) -> dict: metadata_prompt = '' metadata_negative_prompt = '' @@ -422,7 +422,7 @@ class A1111MetadataParser(MetadataParser): return data - def parse_string(self, metadata: dict) -> str: + def to_string(self, metadata: dict) -> str: data = {k: v for _, k, v in metadata} width, height = eval(data['resolution']) @@ -502,7 +502,7 @@ class FooocusMetadataParser(MetadataParser): def get_scheme(self) -> MetadataScheme: return MetadataScheme.FOOOCUS - def parse_json(self, metadata: dict) -> dict: + def to_json(self, metadata: dict) -> dict: for key, value in metadata.items(): if value in ['', 'None']: continue @@ -517,7 +517,7 @@ class FooocusMetadataParser(MetadataParser): return metadata - def parse_string(self, metadata: list) -> str: + def to_string(self, metadata: list) -> str: for li, (label, key, value) in enumerate(metadata): # remove model folder paths from metadata if key.startswith('lora_combined_'): diff --git a/modules/private_logger.py b/modules/private_logger.py index eb8f0cc5..6fdb680c 100644 --- a/modules/private_logger.py +++ b/modules/private_logger.py @@ -27,7 +27,7 @@ def log(img, metadata, metadata_parser: MetadataParser | None = None, output_for date_string, local_temp_filename, only_name = generate_temp_filename(folder=path_outputs, extension=output_format) os.makedirs(os.path.dirname(local_temp_filename), exist_ok=True) - parsed_parameters = metadata_parser.parse_string(metadata.copy()) if metadata_parser is not None else '' + parsed_parameters = metadata_parser.to_string(metadata.copy()) if metadata_parser is not None else '' image = Image.fromarray(img) if output_format == OutputFormat.PNG.value: diff --git a/webui.py b/webui.py index de8cb126..6f08757d 100644 --- a/webui.py +++ b/webui.py @@ -713,7 +713,7 @@ with shared.gradio_root: parsed_parameters = {} else: metadata_parser = modules.meta_parser.get_metadata_parser(metadata_scheme) - parsed_parameters = metadata_parser.parse_json(parameters) + parsed_parameters = metadata_parser.to_json(parameters) return modules.meta_parser.load_parameter_button_click(parsed_parameters, state_is_generating)