Dockerfile: fix entrypoint

for example 'oil' will now be allowed, previously it would have to be `1
spoon oil` when sometimes people don't know the amount

.woodpecker/containers.yaml

@@ -0,0 +1,15 @@
+when:
+  - event: push
+    branch: main
+
+steps:
+  - name: publish
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      platforms: linux/amd64,linux/arm64/v8
+      repo: git.comfy.city/emi/comfy-recipes
+      registry: git.comfy.city
+      tags: latest
+      username: ${CI_REPO_OWNER}
+      password:
+        from_secret: registry_token

Dockerfile

@@ -1,12 +1,11 @@
-FROM alpine:3.18 AS build
+FROM python:3.13-alpine AS build
 COPY . /build
 WORKDIR /build
-RUN apk add --no-cache python3 py3-build py3-hatchling && \
+RUN pip install build hatchling && \
     python3 -m build .
 
-FROM alpine:3.18
+FROM python:3.13-alpine
-COPY --from=build /build/dist/recipes-*-py3-none-any.whl /
+COPY --from=build /build/dist/ /mnt
-RUN apk add --no-cache python3 py3-pip && \
+RUN pip install /mnt/comfy_recipes-*-py3-none-any.whl && \
-    pip install /recipes-*-py3-none-any.whl && \
+    rm -r /mnt
-    apk del py3-pip
+ENTRYPOINT ["/usr/local/bin/recipes-cli"]
-ENTRYPOINT ["/usr/bin/recipes-cli"]

README.md

@@ -0,0 +1,43 @@
+# Comfy Recipes
+
+Comfy Recipes is a simple application that renders your recipes into HTML.
+
+Documentation is available at <https://comfy.city/comfy-recipes/docs>
+
+## Running
+```sh
+docker run -v ./recipes:/recipes git.comfy.city/Emi/comfy-recipes:latest build /recipes
+```
+
+## Building
+### Building the python package
+Make sure you have hatchling and build modules installed.
+```sh
+python3 -m build
+```
+
+The package can now be installed with
+```sh
+pip install dist/comfy-recipes-*-py3-none-any.whl
+```
+
+### Building the docker container
+```sh
+docker buildx build -t git.comfy.city/Emi/comfy-recipes:local .
+```
+
+The container can now be ran
+```sh
+docker run -v ./recipes:/recipes git.comfy.city/Emi/comfy-recipes:local build /recipes
+```
+
+### Building the documentation
+```sh
+cd docs
+mdbook build
+```
+
+Documentation can now be served with
+```sh
+mdbook serve
+```

comfyrecipes/builder.py

@@ -139,7 +139,8 @@ class Builder:
         def collect_unitnames(rec: parsing.Recipe) -> List[str]:
             results: List[str] = []
             for ing in rec.ingredients:
-                results.append(ing.unit.name)
+                if ing.unit is not None:
+                    results.append(ing.unit.name)
             return results
 
         unitnamelists = self.foreach_recipe(collect_unitnames)

comfyrecipes/cli.py

@@ -44,12 +44,14 @@ def main() -> None:
             (args.address, args.port), http.server.SimpleHTTPRequestHandler
         )
         print(f"serving at http://{args.address}:{args.port}")
+        print("THIS WEB SERVER IS ONLY MEANT FOR LOCAL TESTING, IT IS NOT SUITABLE FOR PRODUCTION")
         try:
             httpd.serve_forever()
         except KeyboardInterrupt:
             pass
     elif args.subcommand == "generate-units":
-        if not args.force and os.path.isfile(args.directory + "/units.yaml"):
+        os.chdir(args.directory)
+        if not args.force and os.path.isfile("units.yaml"):
             print(
                 "units.yaml already exists, pass --force if you want to overwrite it",
                 file=sys.stderr,
@@ -58,7 +60,8 @@ def main() -> None:
         else:
             builder.generate_units()
     elif args.subcommand == "generate-ingredients":
-        if not args.force and os.path.isfile(args.directory + "/ingredients.yaml"):
+        os.chdir(args.directory)
+        if not args.force and os.path.isfile("ingredients.yaml"):
             print(
                 "ingredients.yaml already exists, pass --force if you want to overwrite it",
                 file=sys.stderr,

comfyrecipes/parsing.py

@@ -1,5 +1,6 @@
 from abc import abstractmethod
 import collections
+import re
 from typing import Any, Dict, List, Optional, Self
 
 import comfyrecipes.settings as settings
@@ -178,8 +179,8 @@ class IngredientInstance(Element):
         self,
         ctx: Context,
         name: str,
-        amount: float,
+        amount: Optional[float],
-        unit: Unit,
+        unit: Optional[Unit],
         alternatives: List["IngredientInstance"],
         note: str,
         price: Optional["PriceDB"],
@@ -193,7 +194,38 @@ class IngredientInstance(Element):
         self.price = price
 
     @classmethod
-    def from_dict(cls, ctx: Context, dct: Dict[str, Any]) -> Self:
+    def from_dict(cls, ctx: Context, dct: str | Dict[str, Any]) -> Self:
+        if isinstance(dct, str):
+            string = dct.strip()
+            p = re.compile(r"^(?:([0-9\.]+) ([a-zA-Z]+) )+([\w ]+)(?: \((.*)\))?$")
+            match = p.match(string)
+
+            amount = float(1)
+            unit = ctx.default_unit
+            name = string
+            note = None
+            if match is not None:
+                amount = float(match.group(1))
+                unitstr = match.group(2)
+                if unit is not None:
+                    unitx = ctx.units.get(unitstr)
+                    if unitx is None:
+                        ctx.issues.error(issues.ISSUE_UNKNOWN_UNIT, f"unknown unit {unitstr}")
+                    else:
+                        unit = unitx
+                name = match.group(3)
+                note = match.group(4)
+            if note is None:
+                note = ""
+            return cls(
+                ctx=ctx,
+                name=name,
+                amount=amount,
+                unit=unit,
+                alternatives=[],
+                note=note,
+                price=None,
+            )
         name = dct["name"]
 
         ingredient = ctx.ingredients.get(name)
@@ -258,7 +290,7 @@ class Recipe(Element):
         source: Optional[SafeHTML],
         ingredients: List[IngredientInstance],
         subrecipes: List["Recipe"],
-        price: Optional["PriceDB"],
+        price: Optional["MultiPriceDB"],
         stepsections: List[StepSection],
     ) -> None:
         super().__init__(ctx)
@@ -286,7 +318,7 @@ class Recipe(Element):
                 rp = Recipe.from_dict(ctx, partdct)
                 subrecipes.append(rp)
 
-        price: Optional[PriceDB] = None
+        price: Optional[MultiPriceDB] = None
         pricex: float = 0
         ingswithprice = 0
         ingswithoutprice = 0
@@ -304,16 +336,22 @@ class Recipe(Element):
                 # we don't know how to convert currencies yet
                 currency = None
                 break
-        if currency is None or ingswithoutprice != 0 or len(ingredients) == 0:
+        if currency is None or len(ingredients) == 0:
             price = None
         else:
-            price = PriceDB(
+            pricedb = PriceDB(
                 ctx=ctx,
                 price=pricex,
                 amount=1,
                 unit=ctx.default_unit,
                 currency=currency,
             )
+            price = MultiPriceDB(
+                ctx=ctx,
+                pricedb=pricedb,
+                item_count=len(ingredients),
+                item_prices_missing=ingswithoutprice,
+            )
 
         stepsections: List[StepSection] = []
         if "steps" in dct:
@@ -533,7 +571,7 @@ class PriceDB(Element):
         price: float,
         amount: float,
         unit: Unit,
-        currency: Optional[str],
+        currency: str,
     ) -> None:
         super().__init__(ctx)
         self.price = price
@@ -560,4 +598,19 @@ class PriceDB(Element):
         currency = ctx.settings.default_currency
         if "currency" in dct:
             currency = dct["currency"]
+        if currency is None:
+            raise RuntimeError("currency not specified and default_currency is also not set")
         return cls(ctx=ctx, price=price, amount=amount, unit=unit, currency=currency)
+
+class MultiPriceDB(Element):
+    def __init__(
+        self,
+        ctx: Context,
+        pricedb: PriceDB,
+        item_count: int,
+        item_prices_missing: int,
+    ) -> None:
+        super().__init__(ctx)
+        self.pricedb = pricedb
+        self.item_count = item_count
+        self.item_prices_missing = item_prices_missing

comfyrecipes/schemas/recipe.json

@@ -13,17 +13,22 @@
         "ingredients": {
             "type": "array",
             "items": {
-                "$id": "https://example.com/ingredient.json",
+                "oneOf": [
-                "type": "object",
+                    { "type": "string" },
-                "additionalProperties": false,
+                    {
-                "required": [ "name" ],
+                        "$id": "https://example.com/ingredient.json",
-                "properties": {
+                        "type": "object",
-                    "name": { "type": "string" },
+                        "additionalProperties": false,
-                    "amount": { "type": "number" },
+                        "required": [ "name" ],
-                    "unit": { "type": "string" },
+                        "properties": {
-                    "or": { "items": { "$ref": "/ingredient.json" } },
+                            "name": { "type": "string" },
-                    "note": { "type": "string" }
+                            "amount": { "type": "number" },
-                }
+                            "unit": { "type": "string" },
+                            "or": { "items": { "$ref": "/ingredient.json" } },
+                            "note": { "type": "string" }
+                        }
+                    }
+                ]
             }
         },
         "steps": {

comfyrecipes/templates/base.html

@@ -1,12 +1,24 @@
 {% macro price(price) -%}
 {% if price != None and price is defined and price.price is defined %}{{price.price|round(1)|numprint}}{%else%}?{% endif %} {{price.currency}}
 {%- endmacro %}
+{% macro multiprice(multiprice, shortform) -%}
+{% if multiprice != None and multiprice.pricedb != None and multiprice.pricedb is defined and multiprice.pricedb.price is defined -%}
+{{multiprice.pricedb.price|round(1)|numprint}}
+{%else%}
+?
+{%- endif %}
+ {{multiprice.pricedb.currency}}
+{%if multiprice.item_prices_missing != 0 and not shortform%}
+({{multiprice.item_prices_missing}}/{{multiprice.item_count}} prices missing)
+{%endif%}
+{%- endmacro %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>{% block title %}{% endblock %}</title>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
 </head>
 <body>
     {% block body %}{% endblock %}

comfyrecipes/templates/index.html

@@ -3,6 +3,6 @@
 {%block body %}
     <h1>Recipes</h1>
     {% for recipe in recipes %}
-    <li>{% if recipe.price != None %}{{price(recipe.price)}} {%endif%}<a href="{{ recipe.outpath }}">{{ recipe.title }}</a></li>
+    <li>{% if recipe.price != None %}{{multiprice(recipe.price, true)}} {%endif%}<a href="{{ recipe.outpath }}">{{ recipe.title }}</a></li>
     {% endfor %}
 {%endblock%}

comfyrecipes/templates/recipe.html

@@ -1,6 +1,11 @@
 {% extends "base.html" %}
 {% macro ingredientpart(ing) -%}
-{% if recipe.price != None %}{{price(ing.price)}} {%endif%}{{ing.amount|amountprint}} {{ing["unit"].name}} {{ ing.name }} {{ing.note}}
+{% if ing.price != None %}{{price(ing.price)}} {%endif%}
+{% if ing.amount != None %} {{ing.amount|amountprint}}
+{% if ing.unit != None %} {{ing.unit.name}}{% endif %}
+{%endif%}
+ {{ ing.name }}
+{% if ing.note != "" %} {{ing.note}}{% endif %}
 {%- endmacro %}
 
 {% macro ingredient(ing) -%}
@@ -24,7 +29,10 @@
 {% for ing in rec.ingredients %}
     <li>{{ingredient(ing)}}</li>
 {% endfor %}
-{% if rec.price != None %}price: {{price(rec.price)}}{%endif%}
+{% if rec.price != None %}
+<br>
+price: {{multiprice(rec.price)}}
+{%endif%}
 {% endif %}
 {% if rec.stepsections|length != 0 %}
     <h3>Steps</h3>

pyproject.toml

@@ -3,13 +3,13 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "recipes"
+name = "comfy-recipes"
 version = "0.0.1"
 description = "Smart recipe static site generator"
 authors = [{ name = "Emi Vasilek", email = "emi.vasilek@gmail.com" }]
 keywords = ["recipes", "recipe", "static site generator"]
 requires-python = ">= 3.8"
-dependencies = ["jsonschema", "jinja2", "PyYAML", "mistune", "lxml"]
+dependencies = ["jsonschema", "jinja2", "PyYAML", "mistune", "lxml", "lxml_html_clean"]
 classifiers = [
   "Development Status :: 3 - Alpha",
   "Programming Language :: Python",
@@ -17,9 +17,10 @@ classifiers = [
 license = { file = "LICENSE" }
 
 [project.urls]
-Homepage = "https://codeberg.org/comfy.city/recipes"
+Homepage = "https://git.comfy.city/Emi/comfy-recipes"
-Repository = "https://codeberg.org/comfy.city/recipes.git"
+Repository = "https://git.comfy.city/Emi/comfy-recipes.git"
-Issues = "https://codeberg.org/comfy.city/recipes/issues"
+Issues = "https://git.comfy.city/Emi/comfy-recipes/issues"
+Documentation = "https://comfy.city/comfy-recipes/docs"
 
 [project.scripts]
 recipes-cli = "comfyrecipes.cli:main"