From 238319b9e17bcab1c5cd841d76a137ae4904a27f Mon Sep 17 00:00:00 2001 From: Emi Vasilek Date: Tue, 21 Nov 2023 03:13:36 +0100 Subject: [PATCH] black format --- comfyrecipes/__main__.py | 1 + comfyrecipes/builder.py | 3 +++ comfyrecipes/cli.py | 14 +++++++++++--- comfyrecipes/issues.py | 1 + comfyrecipes/parsing.py | 8 +++++++- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/comfyrecipes/__main__.py b/comfyrecipes/__main__.py index aac9305..672799a 100644 --- a/comfyrecipes/__main__.py +++ b/comfyrecipes/__main__.py @@ -1,2 +1,3 @@ import comfyrecipes.cli + comfyrecipes.cli.main() diff --git a/comfyrecipes/builder.py b/comfyrecipes/builder.py index 9b8c33e..abdebf5 100644 --- a/comfyrecipes/builder.py +++ b/comfyrecipes/builder.py @@ -12,6 +12,7 @@ import comfyrecipes.parsing as parsing T = TypeVar("T") + class Builder: def __init__(self) -> None: self.jinjaenv = jinja2.Environment( @@ -140,6 +141,7 @@ class Builder: for ing in rec.ingredients: results.append(ing.unit.name) return results + unitnamelists = self.foreach_recipe(collect_unitnames) unitnamesset: Set[str] = set() for unitnamelst in unitnamelists: @@ -163,6 +165,7 @@ class Builder: for ing in rec.ingredients: results.append(ing.name) return results + ingredientnamelists = self.foreach_recipe(collect_ingnames) ingredientnamesset: Set[str] = set() for ingredientnamelst in ingredientnamelists: diff --git a/comfyrecipes/cli.py b/comfyrecipes/cli.py index e1eb943..6a48b8b 100644 --- a/comfyrecipes/cli.py +++ b/comfyrecipes/cli.py @@ -27,7 +27,9 @@ def main() -> None: parser_generate_ingredients = subparsers.add_parser("generate-ingredients") parser_generate_ingredients.add_argument("directory", type=str) - parser_generate_ingredients.add_argument("--force", dest="force", action="store_true") + parser_generate_ingredients.add_argument( + "--force", dest="force", action="store_true" + ) args = parser.parse_args() @@ -48,13 +50,19 @@ def main() -> None: pass elif args.subcommand == "generate-units": if not args.force and os.path.isfile(args.directory + "/units.yaml"): - print("units.yaml already exists, pass --force if you want to overwrite it", file=sys.stderr) + print( + "units.yaml already exists, pass --force if you want to overwrite it", + file=sys.stderr, + ) ret = 1 else: builder.generate_units() elif args.subcommand == "generate-ingredients": if not args.force and os.path.isfile(args.directory + "/ingredients.yaml"): - print("ingredients.yaml already exists, pass --force if you want to overwrite it", file=sys.stderr) + print( + "ingredients.yaml already exists, pass --force if you want to overwrite it", + file=sys.stderr, + ) ret = 1 else: builder.generate_ingredients() diff --git a/comfyrecipes/issues.py b/comfyrecipes/issues.py index 1ca2bbb..94b329b 100644 --- a/comfyrecipes/issues.py +++ b/comfyrecipes/issues.py @@ -6,6 +6,7 @@ ISSUE_DUPLICATE_UNITS = "duplicate-units" ISSUE_KNOWN_PRICE_UNKNOWN_CONVERSION = "known-price-unknown-conversion" ISSUE_UNKNOWN_UNIT = "unknown-unit" + class Issue: def __init__(self, id: str, msg: str) -> None: self.id = id diff --git a/comfyrecipes/parsing.py b/comfyrecipes/parsing.py index 5fb5833..da2327b 100644 --- a/comfyrecipes/parsing.py +++ b/comfyrecipes/parsing.py @@ -68,6 +68,7 @@ class Context: jsonschema.validate(instance=settingsdct, schema=settingsschema) self.settings.load(settingsdct) + class Element: def __init__(self, ctx: Context) -> None: self.ctx = ctx @@ -76,6 +77,7 @@ class Element: def from_dict(cls, ctx: Context, dct: Dict[str, Any]) -> Self: return cls(ctx) + class Unit(Element): def __init__( self, @@ -119,7 +121,6 @@ class Unit(Element): self.conversions = conversions - class AUnits: def __init__(self, ctx: Context) -> None: self.ctx = ctx @@ -171,6 +172,7 @@ class Units(AUnits): f"units.yaml: {unitname} should only have one entry, found {num}", ) + class IngredientInstance(Element): def __init__( self, @@ -236,6 +238,7 @@ class IngredientInstance(Element): price=price, ) + class StepSection(Element): def __init__(self, ctx: Context, title: str, steps: List[str]) -> None: self.title = title @@ -245,6 +248,7 @@ class StepSection(Element): def from_dict(cls, ctx: Context, dct: Dict[str, Any]) -> Self: return cls(ctx, dct["section"], dct["steps"]) + class Recipe(Element): def __init__( self, @@ -334,6 +338,7 @@ class Recipe(Element): stepsections=stepsections, ) + class Conversion(Element): def __init__( self, ctx: Context, fromunit: Unit, tounit: Unit, ratio: float @@ -354,6 +359,7 @@ class Conversion(Element): raise RuntimeError(f"unit {dct['to']} doesn't exist") return cls(ctx, fromunit, tounit, dct["ratio"]) + class Ingredient(Element): def __init__( self,