From b2986e12621f525eecdf06e07d444e2f3bc15fe2 Mon Sep 17 00:00:00 2001 From: Gustavo Hidalgo Date: Sat, 7 Feb 2026 20:42:55 -0500 Subject: [PATCH] Fix AI imports and namespaces --- CHANGELOG.md | 10 ++++++++++ docker-compose.yml | 4 ++-- src/CookTime/Models/BrandedNutritionData.cs | 2 +- src/CookTime/Models/Contracts/CategoryDto.cs | 2 +- src/CookTime/Models/Contracts/ComponentDto.cs | 2 +- src/CookTime/Models/Contracts/IngredientDto.cs | 2 +- .../Models/Contracts/IngredientInternalUpdate.cs | 2 +- .../Models/Contracts/IngredientRequirementDto.cs | 2 +- src/CookTime/Models/Contracts/NutritionDataDto.cs | 2 +- src/CookTime/Models/Contracts/PagedResult.cs | 2 +- src/CookTime/Models/Contracts/RecipeCreateDto.cs | 2 +- src/CookTime/Models/Contracts/RecipeDetailDto.cs | 2 +- src/CookTime/Models/Contracts/RecipeGenerationDto.cs | 2 +- src/CookTime/Models/Contracts/RecipeListDto.cs | 2 +- src/CookTime/Models/Contracts/RecipeStepDto.cs | 2 +- src/CookTime/Models/Contracts/ReviewDto.cs | 2 +- src/CookTime/Models/Contracts/SitemapRecipeDto.cs | 2 +- src/CookTime/Models/NutritionFacts.cs | 2 +- src/CookTime/Models/StandardReferenceNutritionData.cs | 2 +- src/CookTime/Models/TodaysTenDetails.cs | 4 ++-- src/CookTime/Models/USDANutritionData.cs | 2 +- src/CookTime/Models/Unit.cs | 2 +- src/CookTime/Program.cs | 11 +++++------ src/CookTime/Properties/launchSettings.json | 2 +- src/CookTime/Routes/Admin.cs | 6 +++--- src/CookTime/Routes/Lists.cs | 6 +++--- src/CookTime/Routes/RecipeGeneration.cs | 7 +++---- src/CookTime/Routes/Sitemap.cs | 4 ++-- src/CookTime/Services/AIRecipeService.cs | 8 ++++---- src/CookTime/Services/CookTimeDB.cs | 4 ++-- src/CookTime/Services/GoogleAuth.cs | 2 +- src/CookTime/Services/Loader.cs | 4 ++-- src/CookTime/Services/Migrations.cs | 2 +- src/CookTime/Services/NutritionService.cs | 6 +++--- src/CookTime/appsettings.Development.json | 2 +- src/CookTimeTests/TestBase.cs | 2 +- src/CookTimeTests/TestNutrition.cs | 4 ++-- src/CookTimeTests/TestRecipeLists.cs | 2 +- src/CookTimeTests/TestRecipeSerialization.cs | 2 +- src/CookTimeTests/TestRecipes.cs | 2 +- 40 files changed, 70 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82bb0248..1f48f98c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2026-02-07 + +### Fixed + +- Fix resource path for embedded prompts + +### Changed + +- Normalize namespace named to `CookTime`. + ## 2026-01-01 ### Added diff --git a/docker-compose.yml b/docker-compose.yml index 192bce9b..d528486a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,8 +52,8 @@ services: - ${API_SOURCE_MOUNT:-./src/CookTime}:/src - ${API_OBJ_MOUNT:-api-obj}:/src/obj - ${API_BIN_MOUNT:-api-bin}:/src/bin - - ~/.microsoft/usersecrets:/root/.microsoft/usersecrets:ro - - ~/.azure:/root/.azure + - ${HOME}/.microsoft/usersecrets:/root/.microsoft/usersecrets:ro + - ${HOME}/.azure:/root/.azure command: ["dotnet", "watch", "run", "--non-interactive"] webapp: diff --git a/src/CookTime/Models/BrandedNutritionData.cs b/src/CookTime/Models/BrandedNutritionData.cs index 12b080f6..dbf08c68 100644 --- a/src/CookTime/Models/BrandedNutritionData.cs +++ b/src/CookTime/Models/BrandedNutritionData.cs @@ -1,4 +1,4 @@ -namespace babe_algorithms.Models; +namespace CookTime.Models; public class BrandedNutritionData : USDANutritionData diff --git a/src/CookTime/Models/Contracts/CategoryDto.cs b/src/CookTime/Models/Contracts/CategoryDto.cs index 09fb715b..e90f9912 100644 --- a/src/CookTime/Models/Contracts/CategoryDto.cs +++ b/src/CookTime/Models/Contracts/CategoryDto.cs @@ -1,4 +1,4 @@ -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class CategoryDto { diff --git a/src/CookTime/Models/Contracts/ComponentDto.cs b/src/CookTime/Models/Contracts/ComponentDto.cs index c906e9b1..bf2e28a1 100644 --- a/src/CookTime/Models/Contracts/ComponentDto.cs +++ b/src/CookTime/Models/Contracts/ComponentDto.cs @@ -1,4 +1,4 @@ -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class ComponentDto { diff --git a/src/CookTime/Models/Contracts/IngredientDto.cs b/src/CookTime/Models/Contracts/IngredientDto.cs index 759233b4..8727baf3 100644 --- a/src/CookTime/Models/Contracts/IngredientDto.cs +++ b/src/CookTime/Models/Contracts/IngredientDto.cs @@ -1,4 +1,4 @@ -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class IngredientDto { diff --git a/src/CookTime/Models/Contracts/IngredientInternalUpdate.cs b/src/CookTime/Models/Contracts/IngredientInternalUpdate.cs index a0520922..47b2b8e3 100644 --- a/src/CookTime/Models/Contracts/IngredientInternalUpdate.cs +++ b/src/CookTime/Models/Contracts/IngredientInternalUpdate.cs @@ -1,6 +1,6 @@ // #nullable enable -// namespace babe_algorithms.Models; +// namespace CookTime.Models; // public record IngredientInternalUpdate // { diff --git a/src/CookTime/Models/Contracts/IngredientRequirementDto.cs b/src/CookTime/Models/Contracts/IngredientRequirementDto.cs index a7527f1f..b97146eb 100644 --- a/src/CookTime/Models/Contracts/IngredientRequirementDto.cs +++ b/src/CookTime/Models/Contracts/IngredientRequirementDto.cs @@ -1,4 +1,4 @@ -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class IngredientRequirementDto { diff --git a/src/CookTime/Models/Contracts/NutritionDataDto.cs b/src/CookTime/Models/Contracts/NutritionDataDto.cs index fa7b5c0d..d1e855ae 100644 --- a/src/CookTime/Models/Contracts/NutritionDataDto.cs +++ b/src/CookTime/Models/Contracts/NutritionDataDto.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class NutritionDataDto { diff --git a/src/CookTime/Models/Contracts/PagedResult.cs b/src/CookTime/Models/Contracts/PagedResult.cs index 86a24f64..caa49186 100644 --- a/src/CookTime/Models/Contracts/PagedResult.cs +++ b/src/CookTime/Models/Contracts/PagedResult.cs @@ -1,4 +1,4 @@ -namespace babe_algorithms.ViewComponents; +namespace CookTime.ViewComponents; using System; using System.Collections.Generic; diff --git a/src/CookTime/Models/Contracts/RecipeCreateDto.cs b/src/CookTime/Models/Contracts/RecipeCreateDto.cs index 8d307844..edfa7ee1 100644 --- a/src/CookTime/Models/Contracts/RecipeCreateDto.cs +++ b/src/CookTime/Models/Contracts/RecipeCreateDto.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class RecipeCreateDto { diff --git a/src/CookTime/Models/Contracts/RecipeDetailDto.cs b/src/CookTime/Models/Contracts/RecipeDetailDto.cs index 596a0634..41f7cf2f 100644 --- a/src/CookTime/Models/Contracts/RecipeDetailDto.cs +++ b/src/CookTime/Models/Contracts/RecipeDetailDto.cs @@ -1,4 +1,4 @@ -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class RecipeDetailDto { diff --git a/src/CookTime/Models/Contracts/RecipeGenerationDto.cs b/src/CookTime/Models/Contracts/RecipeGenerationDto.cs index 90b570fc..a4f1f591 100644 --- a/src/CookTime/Models/Contracts/RecipeGenerationDto.cs +++ b/src/CookTime/Models/Contracts/RecipeGenerationDto.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; /// /// Result of AI-powered recipe generation, including the draft recipe and ingredient match metadata. diff --git a/src/CookTime/Models/Contracts/RecipeListDto.cs b/src/CookTime/Models/Contracts/RecipeListDto.cs index 6f6ef738..e52bc787 100644 --- a/src/CookTime/Models/Contracts/RecipeListDto.cs +++ b/src/CookTime/Models/Contracts/RecipeListDto.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class RecipeListDto { diff --git a/src/CookTime/Models/Contracts/RecipeStepDto.cs b/src/CookTime/Models/Contracts/RecipeStepDto.cs index a3bb154f..914d3715 100644 --- a/src/CookTime/Models/Contracts/RecipeStepDto.cs +++ b/src/CookTime/Models/Contracts/RecipeStepDto.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class RecipeStepDto { diff --git a/src/CookTime/Models/Contracts/ReviewDto.cs b/src/CookTime/Models/Contracts/ReviewDto.cs index 919e5d6f..4b4c9eba 100644 --- a/src/CookTime/Models/Contracts/ReviewDto.cs +++ b/src/CookTime/Models/Contracts/ReviewDto.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public record ReviewViewDto { diff --git a/src/CookTime/Models/Contracts/SitemapRecipeDto.cs b/src/CookTime/Models/Contracts/SitemapRecipeDto.cs index 3bf6b90b..a54a31b8 100644 --- a/src/CookTime/Models/Contracts/SitemapRecipeDto.cs +++ b/src/CookTime/Models/Contracts/SitemapRecipeDto.cs @@ -1,4 +1,4 @@ -namespace BabeAlgorithms.Models.Contracts; +namespace CookTime.Models.Contracts; public class SitemapRecipeDto { diff --git a/src/CookTime/Models/NutritionFacts.cs b/src/CookTime/Models/NutritionFacts.cs index 4fff2f27..957275ac 100644 --- a/src/CookTime/Models/NutritionFacts.cs +++ b/src/CookTime/Models/NutritionFacts.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace babe_algorithms.Models; +namespace CookTime.Models; /// /// DTO for presenting nutrition information diff --git a/src/CookTime/Models/StandardReferenceNutritionData.cs b/src/CookTime/Models/StandardReferenceNutritionData.cs index bb4b52ae..fec4b9d0 100644 --- a/src/CookTime/Models/StandardReferenceNutritionData.cs +++ b/src/CookTime/Models/StandardReferenceNutritionData.cs @@ -1,7 +1,7 @@ using System.Text.Json.Nodes; using System.Text.RegularExpressions; -namespace babe_algorithms.Models; +namespace CookTime.Models; public class StandardReferenceNutritionData : USDANutritionData { diff --git a/src/CookTime/Models/TodaysTenDetails.cs b/src/CookTime/Models/TodaysTenDetails.cs index bc88ee7f..5ca5dd2f 100644 --- a/src/CookTime/Models/TodaysTenDetails.cs +++ b/src/CookTime/Models/TodaysTenDetails.cs @@ -1,8 +1,8 @@ using System.Text.RegularExpressions; -using BabeAlgorithms.Models.Contracts; +using CookTime.Models.Contracts; -namespace babe_algorithms.Models; +namespace CookTime.Models; // public partial class TodaysTenDetails // { diff --git a/src/CookTime/Models/USDANutritionData.cs b/src/CookTime/Models/USDANutritionData.cs index 2429a3d5..b18f54e4 100644 --- a/src/CookTime/Models/USDANutritionData.cs +++ b/src/CookTime/Models/USDANutritionData.cs @@ -1,4 +1,4 @@ -namespace babe_algorithms.Models; +namespace CookTime.Models; public abstract class USDANutritionData { diff --git a/src/CookTime/Models/Unit.cs b/src/CookTime/Models/Unit.cs index d41513a3..0c124aa8 100644 --- a/src/CookTime/Models/Unit.cs +++ b/src/CookTime/Models/Unit.cs @@ -1,4 +1,4 @@ -namespace babe_algorithms.Models; +namespace CookTime.Models; public enum Unit { diff --git a/src/CookTime/Program.cs b/src/CookTime/Program.cs index c0bfbbdb..7f741e72 100644 --- a/src/CookTime/Program.cs +++ b/src/CookTime/Program.cs @@ -2,12 +2,11 @@ using System.Security.Claims; using Azure.Identity; using Azure.Storage.Blobs; -using babe_algorithms.Models; -using babe_algorithms.Services; -using babe_algorithms.ViewComponents; -using BabeAlgorithms.Models.Contracts; -using BabeAlgorithms.Routes; -using BabeAlgorithms.Services; +using CookTime.Models; +using CookTime.Models.Contracts; +using CookTime.Routes; +using CookTime.Services; +using CookTime.ViewComponents; using Npgsql; var builder = WebApplication.CreateBuilder(args); diff --git a/src/CookTime/Properties/launchSettings.json b/src/CookTime/Properties/launchSettings.json index 009768a2..cbbe10f3 100644 --- a/src/CookTime/Properties/launchSettings.json +++ b/src/CookTime/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "babe_algorithms": { + "CookTime": { "commandName": "Project", "dotnetRunMessages": true, "hotReloadProfile": "aspnetcore", diff --git a/src/CookTime/Routes/Admin.cs b/src/CookTime/Routes/Admin.cs index b9d515d4..adbe5bfa 100644 --- a/src/CookTime/Routes/Admin.cs +++ b/src/CookTime/Routes/Admin.cs @@ -1,8 +1,8 @@ -using BabeAlgorithms.Models.Contracts; -using BabeAlgorithms.Services; +using CookTime.Models.Contracts; +using CookTime.Services; using Npgsql; -namespace BabeAlgorithms.Routes; +namespace CookTime.Routes; public static class AdminRoutes { diff --git a/src/CookTime/Routes/Lists.cs b/src/CookTime/Routes/Lists.cs index ca450bcb..7953cced 100644 --- a/src/CookTime/Routes/Lists.cs +++ b/src/CookTime/Routes/Lists.cs @@ -1,7 +1,7 @@ -using BabeAlgorithms.Models.Contracts; -using BabeAlgorithms.Services; +using CookTime.Models.Contracts; +using CookTime.Services; -namespace BabeAlgorithms.Routes; +namespace CookTime.Routes; public static class ListRoutes { diff --git a/src/CookTime/Routes/RecipeGeneration.cs b/src/CookTime/Routes/RecipeGeneration.cs index baf7771d..2c543c3b 100644 --- a/src/CookTime/Routes/RecipeGeneration.cs +++ b/src/CookTime/Routes/RecipeGeneration.cs @@ -1,8 +1,7 @@ -using babe_algorithms.Services; -using BabeAlgorithms.Models.Contracts; -using BabeAlgorithms.Services; +using CookTime.Models.Contracts; +using CookTime.Services; -namespace BabeAlgorithms.Routes; +namespace CookTime.Routes; public static class RecipeGenerationRoutes { diff --git a/src/CookTime/Routes/Sitemap.cs b/src/CookTime/Routes/Sitemap.cs index 06d18307..0d7f94c9 100644 --- a/src/CookTime/Routes/Sitemap.cs +++ b/src/CookTime/Routes/Sitemap.cs @@ -1,8 +1,8 @@ using System.Text; -using BabeAlgorithms.Services; +using CookTime.Services; using Microsoft.Extensions.Caching.Memory; -namespace BabeAlgorithms.Routes; +namespace CookTime.Routes; public static class SitemapRoutes { diff --git a/src/CookTime/Services/AIRecipeService.cs b/src/CookTime/Services/AIRecipeService.cs index caa2d692..3bff5fa8 100644 --- a/src/CookTime/Services/AIRecipeService.cs +++ b/src/CookTime/Services/AIRecipeService.cs @@ -1,6 +1,6 @@ using System.Reflection; using System.Text.Json; -using BabeAlgorithms.Models.Contracts; +using CookTime.Models.Contracts; using ChatClient = OpenAI.Chat.ChatClient; using ChatMessage = OpenAI.Chat.ChatMessage; using SystemChatMessage = OpenAI.Chat.SystemChatMessage; @@ -9,7 +9,7 @@ using ChatResponseFormat = OpenAI.Chat.ChatResponseFormat; using ChatCompletionOptions = OpenAI.Chat.ChatCompletionOptions; -namespace BabeAlgorithms.Services; +namespace CookTime.Services; public class AIRecipeService { @@ -37,8 +37,8 @@ public AIRecipeService( _logger = logger; // Load embedded resources - _systemPrompt = LoadEmbeddedResource("BabeAlgorithms.Resources.RecipeGenerationPrompt.txt"); - var schemaJson = LoadEmbeddedResource("BabeAlgorithms.Resources.RecipeGenerationSchema.json"); + _systemPrompt = LoadEmbeddedResource("CookTime.Resources.RecipeGenerationPrompt.txt"); + var schemaJson = LoadEmbeddedResource("CookTime.Resources.RecipeGenerationSchema.json"); _jsonSchema = BinaryData.FromString(schemaJson); } diff --git a/src/CookTime/Services/CookTimeDB.cs b/src/CookTime/Services/CookTimeDB.cs index d0bc1be2..18452a09 100644 --- a/src/CookTime/Services/CookTimeDB.cs +++ b/src/CookTime/Services/CookTimeDB.cs @@ -1,8 +1,8 @@ -using BabeAlgorithms.Models.Contracts; +using CookTime.Models.Contracts; using Npgsql; using NpgsqlTypes; -namespace BabeAlgorithms.Services; +namespace CookTime.Services; public class CookTimeDB(NpgsqlDataSource dataSource) { diff --git a/src/CookTime/Services/GoogleAuth.cs b/src/CookTime/Services/GoogleAuth.cs index be0a859d..271cefca 100644 --- a/src/CookTime/Services/GoogleAuth.cs +++ b/src/CookTime/Services/GoogleAuth.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.HttpOverrides; using Npgsql; -namespace babe_algorithms.Services; +namespace CookTime.Services; public record UpdateProfileRequest(string DisplayName); diff --git a/src/CookTime/Services/Loader.cs b/src/CookTime/Services/Loader.cs index 97fa3b75..cf249060 100644 --- a/src/CookTime/Services/Loader.cs +++ b/src/CookTime/Services/Loader.cs @@ -1,9 +1,9 @@ using Azure.Storage.Blobs; -using babe_algorithms.Models; +using CookTime.Models; using Npgsql; using NpgsqlTypes; -namespace babe_algorithms.Services; +namespace CookTime.Services; public static class Loader { diff --git a/src/CookTime/Services/Migrations.cs b/src/CookTime/Services/Migrations.cs index 1d755ffe..6abe5c5b 100644 --- a/src/CookTime/Services/Migrations.cs +++ b/src/CookTime/Services/Migrations.cs @@ -1,6 +1,6 @@ using Npgsql; -namespace babe_algorithms.Services; +namespace CookTime.Services; public static class Migrations { diff --git a/src/CookTime/Services/NutritionService.cs b/src/CookTime/Services/NutritionService.cs index 46c724ab..ad93b632 100644 --- a/src/CookTime/Services/NutritionService.cs +++ b/src/CookTime/Services/NutritionService.cs @@ -1,8 +1,8 @@ -using babe_algorithms.Models; -using BabeAlgorithms.Models.Contracts; +using CookTime.Models; +using CookTime.Models.Contracts; using Npgsql; -namespace babe_algorithms.Services; +namespace CookTime.Services; public class NutritionService(NpgsqlDataSource dataSource) { diff --git a/src/CookTime/appsettings.Development.json b/src/CookTime/appsettings.Development.json index 0882a6a2..94172647 100644 --- a/src/CookTime/appsettings.Development.json +++ b/src/CookTime/appsettings.Development.json @@ -12,7 +12,7 @@ }, "Google": { "BaseUrl": "http://localhost:3000", - "ClientId": "local-dev", + "ClientId": "353874716986-1d51jgsuha25453g2q1cr2ke551jufig.apps.googleusercontent.com", "ClientSecret": "local-dev" }, "OpenAI": { diff --git a/src/CookTimeTests/TestBase.cs b/src/CookTimeTests/TestBase.cs index 3d41a7ee..63d9fca1 100644 --- a/src/CookTimeTests/TestBase.cs +++ b/src/CookTimeTests/TestBase.cs @@ -1,4 +1,4 @@ -using BabeAlgorithms.Services; +using CookTime.Services; using Npgsql; namespace CookTime.Test; diff --git a/src/CookTimeTests/TestNutrition.cs b/src/CookTimeTests/TestNutrition.cs index c2e1e6af..f53c10e1 100644 --- a/src/CookTimeTests/TestNutrition.cs +++ b/src/CookTimeTests/TestNutrition.cs @@ -1,5 +1,5 @@ -using BabeAlgorithms.Models.Contracts; -using babe_algorithms.Services; +using CookTime.Models.Contracts; +using CookTime.Services; using Npgsql; using NpgsqlTypes; diff --git a/src/CookTimeTests/TestRecipeLists.cs b/src/CookTimeTests/TestRecipeLists.cs index 45a0d30d..905619c3 100644 --- a/src/CookTimeTests/TestRecipeLists.cs +++ b/src/CookTimeTests/TestRecipeLists.cs @@ -1,4 +1,4 @@ -using BabeAlgorithms.Models.Contracts; +using CookTime.Models.Contracts; using Npgsql; namespace CookTime.Test; diff --git a/src/CookTimeTests/TestRecipeSerialization.cs b/src/CookTimeTests/TestRecipeSerialization.cs index df99556e..1b6536cc 100644 --- a/src/CookTimeTests/TestRecipeSerialization.cs +++ b/src/CookTimeTests/TestRecipeSerialization.cs @@ -1,5 +1,5 @@ using System.Text.Json; -using BabeAlgorithms.Models.Contracts; +using CookTime.Models.Contracts; namespace CookTime.Test; diff --git a/src/CookTimeTests/TestRecipes.cs b/src/CookTimeTests/TestRecipes.cs index 60c45464..b5180168 100644 --- a/src/CookTimeTests/TestRecipes.cs +++ b/src/CookTimeTests/TestRecipes.cs @@ -1,4 +1,4 @@ -using BabeAlgorithms.Models.Contracts; +using CookTime.Models.Contracts; namespace CookTime.Test;