run codegen

frontend/lib/api/types/admin.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script
@@ -117,6 +117,7 @@ export interface CustomPageBase {
 export interface RecipeCategoryResponse {
   name: string;
   id: string;
+  groupId?: string | null;
   slug: string;
   recipes?: RecipeSummary[];
 }
@@ -149,18 +150,21 @@ export interface RecipeSummary {
 }
 export interface RecipeCategory {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
   [k: string]: unknown;
 }
 export interface RecipeTag {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
   [k: string]: unknown;
 }
 export interface RecipeTool {
   id: string;
+  groupId?: string | null;
   name: string;
   slug: string;
   householdsWithTool?: string[];

frontend/lib/api/types/analytics.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script

frontend/lib/api/types/cookbook.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script
@@ -41,65 +41,6 @@ export interface QueryFilterJSONPart {
   value?: string | string[] | null;
   [k: string]: unknown;
 }
-export interface RecipeCookBook {
-  name: string;
-  description?: string;
-  slug?: string | null;
-  position?: number;
-  public?: boolean;
-  queryFilterString?: string;
-  groupId: string;
-  householdId: string;
-  id: string;
-  queryFilter?: QueryFilterJSON;
-  recipes: RecipeSummary[];
-}
-export interface RecipeSummary {
-  id?: string | null;
-  userId?: string;
-  householdId?: string;
-  groupId?: string;
-  name?: string | null;
-  slug?: string;
-  image?: unknown;
-  recipeServings?: number;
-  recipeYieldQuantity?: number;
-  recipeYield?: string | null;
-  totalTime?: string | null;
-  prepTime?: string | null;
-  cookTime?: string | null;
-  performTime?: string | null;
-  description?: string | null;
-  recipeCategory?: RecipeCategory[] | null;
-  tags?: RecipeTag[] | null;
-  tools?: RecipeTool[];
-  rating?: number | null;
-  orgURL?: string | null;
-  dateAdded?: string | null;
-  dateUpdated?: string | null;
-  createdAt?: string | null;
-  updatedAt?: string | null;
-  lastMade?: string | null;
-}
-export interface RecipeCategory {
-  id?: string | null;
-  name: string;
-  slug: string;
-  [k: string]: unknown;
-}
-export interface RecipeTag {
-  id?: string | null;
-  name: string;
-  slug: string;
-  [k: string]: unknown;
-}
-export interface RecipeTool {
-  id: string;
-  name: string;
-  slug: string;
-  householdsWithTool?: string[];
-  [k: string]: unknown;
-}
 export interface SaveCookBook {
   name: string;
   description?: string;

frontend/lib/api/types/group.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script

frontend/lib/api/types/household.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script
@@ -166,6 +166,7 @@ export interface GroupRecipeActionOut {
 export interface GroupRecipeActionPayload {
   action: GroupRecipeActionOut;
   content: unknown;
+  recipeScale: number;
 }
 export interface HouseholdCreate {
   groupId?: string | null;
@@ -587,18 +588,21 @@ export interface RecipeSummary {
 }
 export interface RecipeCategory {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
   [k: string]: unknown;
 }
 export interface RecipeTag {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
   [k: string]: unknown;
 }
 export interface RecipeTool {
   id: string;
+  groupId?: string | null;
   name: string;
   slug: string;
   householdsWithTool?: string[];

frontend/lib/api/types/labels.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script

frontend/lib/api/types/meal-plan.ts

@@ -1,12 +1,10 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script
 */
 
-import type { HouseholdSummary } from "./household";
-
 export type PlanEntryType = "breakfast" | "lunch" | "dinner" | "side";
 export type PlanRulesDay = "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday" | "unset";
 export type PlanRulesType = "breakfast" | "lunch" | "dinner" | "side" | "unset";
@@ -44,9 +42,6 @@ export interface PlanRulesOut {
   householdId: string;
   id: string;
   queryFilter?: QueryFilterJSON;
-  categories?: RecipeCategory[];
-  tags?: RecipeTag[];
-  households?: HouseholdSummary[];
 }
 export interface QueryFilterJSON {
   parts?: QueryFilterJSONPart[];
@@ -108,18 +103,21 @@ export interface RecipeSummary {
 }
 export interface RecipeCategory {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
   [k: string]: unknown;
 }
 export interface RecipeTag {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
   [k: string]: unknown;
 }
 export interface RecipeTool {
   id: string;
+  groupId?: string | null;
   name: string;
   slug: string;
   householdsWithTool?: string[];

frontend/lib/api/types/recipe.ts

@@ -19,6 +19,7 @@ export interface AssignCategories {
 export interface CategoryBase {
   name: string;
   id: string;
+  groupId?: string | null;
   slug: string;
 }
 export interface AssignSettings {
@@ -40,6 +41,7 @@ export interface AssignTags {
 export interface TagBase {
   name: string;
   id: string;
+  groupId?: string | null;
   slug: string;
 }
 export interface CategoryIn {
@@ -48,8 +50,8 @@ export interface CategoryIn {
 export interface CategoryOut {
   name: string;
   id: string;
-  slug: string;
   groupId: string;
+  slug: string;
 }
 export interface CategorySave {
   name: string;
@@ -97,11 +99,13 @@ export interface CreateRecipeBulk {
 }
 export interface RecipeCategory {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
 }
 export interface RecipeTag {
   id?: string | null;
+  groupId?: string | null;
   name: string;
   slug: string;
 }
@@ -223,7 +227,7 @@ export interface Recipe {
   groupId?: string;
   name?: string | null;
   slug?: string;
-  image?: string;
+  image?: unknown;
   recipeServings?: number;
   recipeYieldQuantity?: number;
   recipeYield?: string | null;
@@ -255,6 +259,7 @@ export interface Recipe {
 }
 export interface RecipeTool {
   id: string;
+  groupId?: string | null;
   name: string;
   slug: string;
   householdsWithTool?: string[];
@@ -293,6 +298,7 @@ export interface UserBase {
 export interface RecipeCategoryResponse {
   name: string;
   id: string;
+  groupId?: string | null;
   slug: string;
   recipes?: RecipeSummary[];
 }
@@ -399,6 +405,7 @@ export interface RecipeSuggestionResponseItem {
 export interface RecipeTagResponse {
   name: string;
   id: string;
+  groupId?: string | null;
   slug: string;
   recipes?: RecipeSummary[];
 }
@@ -447,12 +454,14 @@ export interface RecipeToolOut {
   name: string;
   householdsWithTool?: string[];
   id: string;
+  groupId: string;
   slug: string;
 }
 export interface RecipeToolResponse {
   name: string;
   householdsWithTool?: string[];
   id: string;
+  groupId: string;
   slug: string;
   recipes?: RecipeSummary[];
 }

frontend/lib/api/types/reports.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script

frontend/lib/api/types/response.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script

frontend/lib/api/types/user.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 /* This file was automatically generated from pydantic models by running pydantic2ts.
 /* Do not modify it by hand - just update the pydantic models and then re-run the script
@@ -63,6 +63,7 @@ export interface GroupInDB {
 export interface CategoryBase {
   name: string;
   id: string;
+  groupId?: string | null;
   slug: string;
 }
 export interface ReadWebhook {
@@ -197,7 +198,6 @@ export interface UserBase {
   canManage?: boolean;
   canManageHousehold?: boolean;
   canOrganize?: boolean;
-  advancedOptions?: boolean;
 }
 export interface UserIn {
   id?: string | null;

tests/utils/api_routes/__init__.py

@@ -173,8 +173,6 @@ units = "/api/units"
 """`/api/units`"""
 units_merge = "/api/units/merge"
 """`/api/units/merge`"""
-users = "/api/users"
-"""`/api/users`"""
 users_api_tokens = "/api/users/api-tokens"
 """`/api/users/api-tokens`"""
 users_forgot_password = "/api/users/forgot-password"