Skip to content

We finished ticket #55, adjusted the CICD to deploy if the VM is shut…#66

Merged
timn21 merged 1 commit into
mainfrom
feature/grocery-service-client-merge
Jun 15, 2026
Merged

We finished ticket #55, adjusted the CICD to deploy if the VM is shut…#66
timn21 merged 1 commit into
mainfrom
feature/grocery-service-client-merge

Conversation

@JonathanPschl

@JonathanPschl JonathanPschl commented Jun 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

Closes #55 #56 . Adds recipe → grocery-list merging across the client and grocery-service,
hardens the Gen AI categorization output, and makes the Azure deploy resilient to a
powered-off VM.

Changes

Recipe merging (#55)

  • grocery-service: new POST /api/grocery-list/merge endpoint. Reads the selected
    recipes, delegates dedup/quantity-summing to gen-ai's /api/ai/merge, and persists the
    result as a new grocery list linked to its source recipes via grocery_list_recipes.

  • client: generated dishes are now saved as a recipe only; grocery lists are created
    later by selecting 2+ recipes on the Recipes page and merging. Adds a merge bar with
    checkboxes, success/error banners, and a "saved to Recipes" confirmation on Home.

Gen AI categorization fixes

  • Prompt now generates ingredients for a bare dish name (never returns an empty list)
    and emits the coarse category tokens verbatim.
  • temperature: 0 for deterministic, consistent categorization.
  • GroceryItemMapper: alias table maps legacy/drifting category labels (e.g. "Dairy & Eggs",
    "Dry Goods & Pasta") onto the enum instead of silently collapsing to OTHER.

CI/CD & infra

  • deploy-azure.yml: az vm start step (idempotent) so deploys work when the VM was
    deallocated to save cost.
  • outputs.tf: expose resource_group_name / vm_name for the start step.
  • site.yml: defer fact-gathering until after wait_for_connection so Ansible doesn't fail
    SSHing into a just-booted host.

… off, bugfixed the output of Logos to confirm with the backend.

@timn21 timn21 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code lgtm

@timn21 timn21 merged commit f30cff0 into main Jun 15, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Make Recipe Items selectable in the UI and add add a merge button

2 participants