From 832441e86d4caeca78208309680c3ab2eb2fef15 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sun, 4 Feb 2024 19:26:10 +0100 Subject: [PATCH] chore: loosen strict type for parse_json, fix indent --- modules/meta_parser.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/meta_parser.py b/modules/meta_parser.py index 60a999cb..19d24fc4 100644 --- a/modules/meta_parser.py +++ b/modules/meta_parser.py @@ -203,7 +203,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 @@ -502,11 +502,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