jableader
4c3f370ddc
commit 4189d9f824f681b480f797b109e963762eb22e9c
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:41:57 2025 +1100
Openapi complete
commit bebf8c30cba0b85a889198fe44879614065a0c34
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:35:39 2025 +1100
Removed unversioned api
commit dd9cc2eae75d66fceebe14c918c3ed8498376ee6
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:07:03 2025 +1100
Spec updates
commit b993c4530688f79ea983278283f984e9d8e83860
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:01:50 2025 +1100
docs(spec): update doof-back-spec with v1 RFC7807 422, reusable Problem* responses, and shopping/current aliasing; tests passing; openapi.json refreshed
commit 30bac7e57367b14ce924667a7955845de949d779
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:00:13 2025 +1100
openapi polish
commit eb7f7f224f7085fa5b3fadc7716db0ebb7f47eb0
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:54:52 2025 +1100
OpenAPI reusable responses: Added components.responses for `Problem400`, `Problem404`, and `Problem422`; v1 routes reference these consistently.
- Units enum: Exposed advisory enum in schema for `Ingredient.unit` using existing units list (no runtime enforcement).
commit 037037e17d684a89b264f2406377970a0de7ec99
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:43:01 2025 +1100
Add `total` counts to v1 page responses for recipes/persons; push persons name filter into SQL for v1 when `q` is provided.
commit 07e7735076aae8cbd04bb10f9aa324c1a3d80ae4
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:40:17 2025 +1100
Add parameter descriptions for `cursor`, `limit`, and `q` on v1 list endpoints; include example `Page` envelopes in 200 responses.
commit e5bf9396b0fe870501d1b4712cba2555dd2ef9b1
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:36:27 2025 +1100
DB pagination
commit 782315cd2a0c18cc50e4deaf28e7ec6e4b58c6e2
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:29:38 2025 +1100
camelcase tests
commit b207c33e2844c00fc9e531fb9cf8c07a3f5cd543
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:24:57 2025 +1100
OpenAPI enrichment, Error responses
commit dc84681ab743008e5cd8bec7f3ccb0d05b557518
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:16:39 2025 +1100
v1 tests: Added basic tests to assert `Page` envelopes and RFC7807 responses for v1 endpoints without affecting legacy tests.
commit 1524b7a98ffe04af11c2731c8125ac9348751cff
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:14:51 2025 +1100
Pagination
commit 92e91d7acf15c09b14bc76f7b16a7a47e65129ec
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:03:50 2025 +1100
Use middleware for naming case changes
commit c68f964f9b8e3d8f8ef020661e747e0990459c81
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:00:09 2025 +1100
Openapi gen
78 lines
2.3 KiB
Python
78 lines
2.3 KiB
Python
import re
|
|
from typing import Optional
|
|
|
|
from ingredients import match_existing_products, parse_ingredient_from_nlp
|
|
from persons import Person
|
|
from recipes.db import (
|
|
Recipe as Recipe,
|
|
find_recipe_by_id as find_recipe_by_id,
|
|
find_recipes_by_name as find_recipes_by_name,
|
|
find_recipes_by_name_paged as find_recipes_by_name_paged,
|
|
get_all as get_all,
|
|
get_all_paged as get_all_paged,
|
|
compute_prev_cursor as compute_prev_cursor,
|
|
count_all as count_all,
|
|
count_by_name as count_by_name,
|
|
hide_recipe as hide_recipe,
|
|
insert_recipe as insert_recipe,
|
|
load_recipe_ingredients as load_recipe_ingredients,
|
|
row_to_recipe as row_to_recipe,
|
|
)
|
|
from recipes.scraping import scrape_recipe_ldata as _scrape_recipe_ldata
|
|
|
|
|
|
async def parse_recipe(conn, created_by: Person, url: str) -> Optional[Recipe]:
|
|
ldata = await _scrape_recipe_ldata(url)
|
|
if ldata:
|
|
return await _get_recipe_from_ldata(conn, url, ldata, created_by)
|
|
return None
|
|
|
|
|
|
def find_yield(recipe_ldata: dict) -> int:
|
|
if "recipeYield" in recipe_ldata:
|
|
yield_vals = recipe_ldata["recipeYield"]
|
|
if not isinstance(yield_vals, list):
|
|
yield_vals = [yield_vals]
|
|
|
|
for val in yield_vals:
|
|
try:
|
|
return int(val)
|
|
except ValueError:
|
|
pass
|
|
|
|
for val in yield_vals:
|
|
match = re.match(r"(\d+)", val)
|
|
if match:
|
|
return int(match.group(1))
|
|
|
|
return 4
|
|
|
|
|
|
async def _get_recipe_from_ldata(conn, url: str, ldata: dict, created_by: Person) -> Recipe:
|
|
ingredients = [
|
|
parse_ingredient_from_nlp(ingredient) for ingredient in ldata["recipeIngredient"]
|
|
]
|
|
ingredients = await match_existing_products(conn, ingredients)
|
|
name = ldata["name"] if "name" in ldata else url
|
|
images = ldata["image"] if "image" in ldata else []
|
|
serves = find_yield(ldata)
|
|
|
|
if isinstance(images, list) and len(images) > 0 and isinstance(images[0], dict):
|
|
images = [image["url"] for image in images]
|
|
|
|
if isinstance(images, dict):
|
|
images = [images["url"]]
|
|
|
|
if isinstance(images, str):
|
|
images = [images]
|
|
|
|
return Recipe(
|
|
id=0,
|
|
name=name,
|
|
link=url,
|
|
serves=serves,
|
|
image_urls=images,
|
|
ingredients=ingredients,
|
|
created_by=created_by,
|
|
created_by_id=created_by.id,
|
|
)
|