diff --git a/Components/Pages/Index.razor b/Components/Pages/Index.razor index 68dc2cd..d158f86 100644 --- a/Components/Pages/Index.razor +++ b/Components/Pages/Index.razor @@ -1,6 +1,6 @@ @page "/" @page "/menu/{topic?}" -@inherits SharedDisplayLogic +@inherits MainPageBase @using BLAIzor.Models @using BLAIzor.Services @using BLAIzor.Components.Partials @@ -10,21 +10,15 @@ @using System.Net @using System.Text.Json @using Sidio.Sitemap.Blazor -@* @inject AIService ChatGptService *@ @rendermode InteractiveServer -@* @inject IJSRuntime jsRuntime; *@ -@* @inject IConfiguration configuration *@ @inject ContentService _contentService -@* @inject ContentEditorService _contentEditorService *@ -@* @inject ScopedContentService _scopedContentService *@ -@* @inject IEmailSender _emailService *@ @inject NavigationManager _navigationManager @inject IHttpContextAccessor HttpContextAccessor @inject DesignTemplateService DesignTemplateService @inject CssTemplateService CssTemplateService @inject CssInjectorService CssService -@* @inject HttpClient Http *@ @attribute [Sitemap] +
@@ -264,7 +258,7 @@ // Load the CSS template for the selected brand from the database var designTemplate = await DesignTemplateService.GetByIdAsync((int)SiteInfo.TemplateId!); var cssTemplate = await CssTemplateService.GetByDesignTemplateIdAsync((int)SiteInfo.TemplateId); - CollectionName = designTemplate.QDrandCollectionName; + TemplateCollectionName = designTemplate.QDrandCollectionName; if (cssTemplate != null) { @@ -284,11 +278,11 @@ if(!string.IsNullOrWhiteSpace(topic)) { UserInput = topic; - await ChatGptService.ProcessContentRequest(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, CollectionName, Menu, true); + await ChatGptService.ProcessContentRequest(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, Menu, true); } else { - await ChatGptService.GetChatGptWelcomeMessage(SessionId, SiteId, Menu); + await ChatGptService.GetChatGptWelcomeMessage(SessionId, SiteId, TemplateCollectionName, Menu); } // HtmlContent = await ChatGptService.GetChatGptWelcomeMessage(); // UserInput = "Sumerize for me, what is this website about, and what can I do on this website?"; @@ -413,7 +407,7 @@ var menu = await GetMenuList(SiteId); HtmlContent.Clear(); string input = "Please tell me more about: " + UserInput; - await ChatGptService.ProcessUserIntent(SessionId, input, SiteId, (int)SiteInfo.TemplateId!, CollectionName, menu); + await ChatGptService.ProcessUserIntent(SessionId, input, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, menu); UserInput = string.Empty; } } diff --git a/Components/Pages/SharedDisplayLogic.cs b/Components/Pages/MainPageBase.cs similarity index 94% rename from Components/Pages/SharedDisplayLogic.cs rename to Components/Pages/MainPageBase.cs index 1401d32..3794794 100644 --- a/Components/Pages/SharedDisplayLogic.cs +++ b/Components/Pages/MainPageBase.cs @@ -12,7 +12,7 @@ using UglyToad.PdfPig.DocumentLayoutAnalysis; namespace BLAIzor.Components.Pages { - public class SharedDisplayLogic : ComponentBase + public class MainPageBase : ComponentBase { public string SelectedBrandName = "default"; [Inject] protected ScopedContentService _scopedContentService { get; set; } @@ -22,10 +22,10 @@ namespace BLAIzor.Components.Pages [Inject] protected IJSRuntime jsRuntime { get; set; } [Inject] protected AIService ChatGptService { get; set; } - public static readonly Dictionary _instances = new(); + public static readonly Dictionary _instances = new(); public string SessionId; - public static SharedDisplayLogic myHome; + public static MainPageBase myHome; public int SiteId; public SiteInfo SiteInfo; @@ -33,7 +33,7 @@ namespace BLAIzor.Components.Pages public string TextContent = ""; public string StatusContent = ""; public string UserInput = string.Empty; - public string CollectionName = "html_snippets"; + public string TemplateCollectionName = "html_snippets"; public bool VoiceEnabled; public bool TTSEnabled; @@ -123,9 +123,9 @@ namespace BLAIzor.Components.Pages var requestJson = JsonSerializer.Serialize(requestContent); string voiceId; - if (SiteInfo.voiceId != null) + if (SiteInfo.VoiceId != null) { - voiceId = SiteInfo.voiceId; + voiceId = SiteInfo.VoiceId; } else { @@ -199,7 +199,7 @@ namespace BLAIzor.Components.Pages { HtmlContent.Clear(); var menu = await GetMenuList(SiteId); - await ChatGptService.ProcessUserIntent(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, CollectionName, menu); + await ChatGptService.ProcessUserIntent(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, menu); UserInput = string.Empty; } } @@ -214,11 +214,11 @@ namespace BLAIzor.Components.Pages var menuItem = (await GetMenuItems(SiteId)).Where(m => m.Name == input).FirstOrDefault(); if (menuItem == null) { - await ChatGptService.ProcessContentRequest(SessionId, input, SiteId, (int)SiteInfo.TemplateId!, CollectionName, menu, forceUnmodified); + await ChatGptService.ProcessContentRequest(SessionId, input, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, menu, forceUnmodified); } else { - await ChatGptService.ProcessContentRequest(SessionId, menuItem, SiteId, (int)SiteInfo.TemplateId!, CollectionName, menu, forceUnmodified); + await ChatGptService.ProcessContentRequest(SessionId, menuItem, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, menu, forceUnmodified); } UserInput = string.Empty; } @@ -302,7 +302,7 @@ namespace BLAIzor.Components.Pages Console.WriteLine("Button clicked!"); var menu = await GetMenuList(SiteId); HtmlContent.Clear(); - await ChatGptService.ProcessUserIntent(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, CollectionName, menu); + await ChatGptService.ProcessUserIntent(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, menu); UserInput = string.Empty; } diff --git a/Components/Pages/Preview.razor b/Components/Pages/Preview.razor index a60e458..bc0ab3e 100644 --- a/Components/Pages/Preview.razor +++ b/Components/Pages/Preview.razor @@ -1,6 +1,6 @@ @page "/preview/{siteid:int}" @page "/preview/{siteid:int}/{topic?}" -@inherits SharedDisplayLogic +@inherits MainPageBase @using BLAIzor.Models @using BLAIzor.Services @using Google.Cloud.Speech.V1 @@ -10,21 +10,14 @@ @using System.Text.Json @using System.Net -@* @inject AIService ChatGptService *@ @rendermode InteractiveServer -@* @inject IJSRuntime jsRuntime; *@ -@* @inject IConfiguration configuration *@ @inject ContentService _contentService -@* @inject ContentEditorService _contentEditorService *@ -@* @inject ScopedContentService _scopedContentService *@ @inject IEmailSender _emailService @inject NavigationManager _navigationManager @inject IHttpContextAccessor HttpContextAccessor @inject DesignTemplateService DesignTemplateService @inject CssTemplateService CssTemplateService @inject CssInjectorService CssService -@* @inject HttpClient Http *@ -
@@ -99,9 +92,7 @@ @{ if (!string.IsNullOrEmpty(HtmlContent.ToString())) { - //
- // @((MarkupString)HtmlContent.ToString()) - //
+ if (isEmailFormVisible) {
@@ -330,7 +321,7 @@ // Load the CSS template for the selected brand from the database var designTemplate = await DesignTemplateService.GetByIdAsync((int)SiteInfo.TemplateId!); var cssTemplate = await CssTemplateService.GetByDesignTemplateIdAsync((int)SiteInfo.TemplateId); - CollectionName = designTemplate.QDrandCollectionName; + TemplateCollectionName = designTemplate.QDrandCollectionName; if (cssTemplate != null) { @@ -354,11 +345,11 @@ if (!string.IsNullOrWhiteSpace(topic)) { UserInput = topic; - await ChatGptService.ProcessContentRequest(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, CollectionName, Menu, true); + await ChatGptService.ProcessContentRequest(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, Menu, true); } else { - await ChatGptService.GetChatGptWelcomeMessage(SessionId, SiteId, Menu); + await ChatGptService.GetChatGptWelcomeMessage(SessionId, SiteId, TemplateCollectionName, Menu); } } @@ -429,7 +420,7 @@ { HtmlContent.Clear(); var menu = await GetMenuList(SiteId); - await ChatGptService.ProcessUserIntent(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, CollectionName, menu); + await ChatGptService.ProcessUserIntent(SessionId, UserInput, SiteId, (int)SiteInfo.TemplateId!, TemplateCollectionName, menu); UserInput = string.Empty; } } diff --git a/Components/Partials/GenerateFromDocument.razor b/Components/Partials/GenerateFromDocument.razor index a337b78..d14465a 100644 --- a/Components/Partials/GenerateFromDocument.razor +++ b/Components/Partials/GenerateFromDocument.razor @@ -60,7 +60,7 @@ else if (ExtractedMenuItems.Any()) }
- +
} @@ -101,7 +101,7 @@ else if (ExtractedMenuItems.Any())
- + } else if (!string.IsNullOrEmpty(ErrorMessage)) @@ -163,6 +163,7 @@ else if (!string.IsNullOrEmpty(ErrorMessage)) if (selectedPoint != null) { model.Content = selectedPoint.result.payload.content; + model.ContentDescription = selectedPoint.result.payload.description; Console.Write($"Found point: {selectedPoint.result.payload.content}"); } @@ -246,6 +247,7 @@ else if (!string.IsNullOrEmpty(ErrorMessage)) if (item != null) { //item.MenuItem. + item.MenuItem.Name = updatedItem.MenuItem.Name; item.Content = updatedItem.Content; } } @@ -287,10 +289,12 @@ else if (!string.IsNullOrEmpty(ErrorMessage)) foreach (var menuItemToReorder in menuItems) { menuItemToReorder.SortOrder = menuItems.IndexOf(menuItemToReorder); + Console.WriteLine($"{menuItemToReorder.Name}, {menuItemToReorder.SortOrder}"); } foreach (var extractedMenuItemToReorder in ExtractedMenuItems) { extractedMenuItemToReorder.MenuItem.SortOrder = ExtractedMenuItems.IndexOf(extractedMenuItemToReorder); + Console.WriteLine($"{extractedMenuItemToReorder.MenuItem.Name}, {extractedMenuItemToReorder.MenuItem.SortOrder}"); } JSRuntime.InvokeVoidAsync("eval", $"document.querySelector('.my-class').classList.remove('my-class')"); })); diff --git a/Components/Partials/GenerateFromScratch.razor b/Components/Partials/GenerateFromScratch.razor index 174c2d3..d2c6cf8 100644 --- a/Components/Partials/GenerateFromScratch.razor +++ b/Components/Partials/GenerateFromScratch.razor @@ -62,7 +62,7 @@ else if (extractedMenuItems.Any())
- +
} } @@ -77,7 +77,7 @@ else if (extractedMenuItems.Any())
- + } @@ -133,6 +133,7 @@ else if (!string.IsNullOrEmpty(errorMessage)) if (selectedPoint != null) { model.Content = selectedPoint.result.payload.content; + model.ContentDescription = selectedPoint.result.payload.description; Console.Write($"Found point: {selectedPoint.result.payload.content}"); } @@ -182,6 +183,7 @@ else if (!string.IsNullOrEmpty(errorMessage)) var newItem = new MenuItemModel("New menu item", ""); //TODO Fix extractedMenuItems.Add(newItem); + isLoading = false; } diff --git a/Components/Partials/MapsComponent.razor b/Components/Partials/MapsComponent.razor new file mode 100644 index 0000000..c0ba0a9 --- /dev/null +++ b/Components/Partials/MapsComponent.razor @@ -0,0 +1,54 @@ +@using Microsoft.JSInterop +@inject IJSRuntime JSRuntime + + + + + + + + + { { "disableDoubleClickZoom", true } }) + Zoom=@zoom Center=@(new GoogleMapPosition() { Lat = 42.6977, Lng = 23.3219 }) MapClick=@OnMapClick MarkerClick=@OnMarkerClick> + + + + @if (showMadridMarker) + { + + } + + + + + +@code { + int zoom = 3; + bool showMadridMarker; + EventConsole console; + RadzenGoogleMap map; + + void OnMapClick(GoogleMapClickEventArgs args) + { + console.Log($"Map clicked at Lat: {args.Position.Lat}, Lng: {args.Position.Lng}"); + } + + async Task OnMarkerClick(RadzenGoogleMapMarker marker) + { + var message = $"Custom information about {marker.Title}"; + + var code = $@" +var map = Radzen['{map.UniqueID}'].instance; +var marker = map.markers.find(m => m.title == '{marker.Title}'); +if(window.infoWindow) {{window.infoWindow.close();}} +window.infoWindow = new google.maps.InfoWindow({{content: '{message}'}}); +setTimeout(() => window.infoWindow.open(map, marker), 200); +"; + + await JSRuntime.InvokeVoidAsync("eval", code); + } + + // Custom marker label + string Label => "\n\n\n"; + +} \ No newline at end of file diff --git a/Components/Partials/MenuItemContentEditor.razor b/Components/Partials/MenuItemContentEditor.razor index 85499bb..17a4f24 100644 --- a/Components/Partials/MenuItemContentEditor.razor +++ b/Components/Partials/MenuItemContentEditor.razor @@ -6,7 +6,7 @@ @inject CustomAuthenticationStateProvider CustomAuthProvider
- + @{ if (!string.IsNullOrEmpty(WordFile)) { @@ -17,14 +17,20 @@ } @* *@ - - - - - - +
- + +
+
+ + + + + +
+ + + @* *@ @if (IsLoading) {

Loading content...

@@ -40,15 +46,17 @@ private bool IsLoading = false; private string GeneratedContent = string.Empty; + // private string Description = string.Empty; private string? userId; private string? userName; private AuthenticationState? authState; - EventConsole console; + //EventConsole console; protected override async Task OnParametersSetAsync() { GeneratedContent = MenuItem.Content; + // Description = MenuItem.ContentDescription; authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); if (authState.User.Identity?.IsAuthenticated == true) { @@ -103,33 +111,33 @@ async Task OnPaste(HtmlEditorPasteEventArgs args) { - console.Log($"Paste: {args.Html}"); + // console.Log($"Paste: {args.Html}"); MenuItem.Content = args.Html; await OnContentUpdated.InvokeAsync(MenuItem); } async Task OnChange(string html) { - console.Log($"Change: {html}"); + // console.Log($"Change: {html}"); MenuItem.Content = html; await OnContentUpdated.InvokeAsync(MenuItem); } async Task OnInput(string html) { - console.Log($"Input: {html}"); + // console.Log($"Input: {html}"); MenuItem.Content = html; await OnContentUpdated.InvokeAsync(MenuItem); } void OnExecute(HtmlEditorExecuteEventArgs args) { - console.Log($"Execute: {args.CommandName}"); + //console.Log($"Execute: {args.CommandName}"); } void OnUploadComplete(UploadCompleteEventArgs args) { - console.Log($"Upload complete: {args.RawResponse}"); + //console.Log($"Upload complete: {args.RawResponse}"); } private async Task HandleFileUpload(InputFileChangeEventArgs e) @@ -167,7 +175,7 @@ } catch (Exception ex) { - console.Log($"Error uploading files: {ex.Message}"); + // console.Log($"Error uploading files: {ex.Message}"); } finally { diff --git a/Migrations/20250615203806_EmbeddingServiceAndDefaultLanguage.Designer.cs b/Migrations/20250615203806_EmbeddingServiceAndDefaultLanguage.Designer.cs new file mode 100644 index 0000000..5ecd7f8 --- /dev/null +++ b/Migrations/20250615203806_EmbeddingServiceAndDefaultLanguage.Designer.cs @@ -0,0 +1,645 @@ +// +using System; +using BLAIzor.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace BLAIzor.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20250615203806_EmbeddingServiceAndDefaultLanguage")] + partial class EmbeddingServiceAndDefaultLanguage + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("BLAIzor.Models.CssTemplate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CssContent") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DesignTemplateId") + .HasColumnType("int"); + + b.Property("LastUpdated") + .HasColumnType("datetime2"); + + b.HasKey("Id"); + + b.HasIndex("DesignTemplateId") + .IsUnique(); + + b.ToTable("CssTemplates"); + }); + + modelBuilder.Entity("BLAIzor.Models.DesignTemplate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeprecated") + .HasColumnType("bit"); + + b.Property("IsPrivate") + .HasColumnType("bit"); + + b.Property("IsPublished") + .HasColumnType("bit"); + + b.Property("QDrandCollectionName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Status") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Tags") + .HasColumnType("nvarchar(max)"); + + b.Property("TemplateName") + .HasColumnType("nvarchar(max)"); + + b.Property("TemplatePhotoUrl") + .HasColumnType("nvarchar(max)"); + + b.Property("UpdatedAt") + .HasColumnType("datetime2"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.Property("Version") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("DesignTemplates"); + + b.HasData( + new + { + Id = 1, + CreatedAt = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), + Description = "The default template", + IsDeprecated = false, + IsPrivate = false, + IsPublished = false, + QDrandCollectionName = "html_snippets", + Status = "Draft", + Tags = "system", + TemplateName = "Default Site", + TemplatePhotoUrl = "/images/default-logo.png", + UserId = "0988758e-e16c-4c2c-8c1e-efa3ac5f0274", + Version = 1 + }); + }); + + modelBuilder.Entity("BLAIzor.Models.FormDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("JsonDefinition") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("SiteInfoId") + .HasColumnType("int"); + + b.Property("Slug") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("Version") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("SiteInfoId", "Slug") + .IsUnique(); + + b.ToTable("FormDefinitions"); + }); + + modelBuilder.Entity("BLAIzor.Models.MenuItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("PointId") + .HasColumnType("int"); + + b.Property("QdrantPointId") + .HasColumnType("uniqueidentifier"); + + b.Property("ShowInMainMenu") + .HasColumnType("bit"); + + b.Property("SiteInfoId") + .HasColumnType("int"); + + b.Property("SortOrder") + .HasColumnType("int"); + + b.Property("StoredHtml") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("SiteInfoId"); + + b.ToTable("MenuItems"); + }); + + modelBuilder.Entity("BLAIzor.Models.SiteInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("BackgroundVideo") + .HasColumnType("nvarchar(max)"); + + b.Property("BrandLogoUrl") + .HasColumnType("nvarchar(max)"); + + b.Property("DefaultColor") + .HasColumnType("nvarchar(max)"); + + b.Property("DefaultLanguage") + .HasColumnType("nvarchar(max)"); + + b.Property("DefaultUrl") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DomainUrl") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("EmbeddingService") + .HasColumnType("nvarchar(max)"); + + b.Property("Entity") + .HasColumnType("nvarchar(max)"); + + b.Property("IsPublished") + .HasColumnType("bit"); + + b.Property("Persona") + .HasColumnType("nvarchar(max)"); + + b.Property("STTActive") + .HasColumnType("bit"); + + b.Property("SiteDescription") + .HasColumnType("nvarchar(max)"); + + b.Property("SiteName") + .HasColumnType("nvarchar(max)"); + + b.Property("TTSActive") + .HasColumnType("bit"); + + b.Property("TemplateId") + .HasColumnType("int"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.Property("VoiceId") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("TemplateId"); + + b.HasIndex("UserId"); + + b.ToTable("SiteInfos"); + + b.HasData( + new + { + Id = 1, + BrandLogoUrl = "/images/default-logo.png", + DefaultColor = "#FFFFFF", + DefaultUrl = "https://ai.poppixel.cloud", + DomainUrl = "poppixel.cloud", + IsPublished = false, + STTActive = false, + SiteName = "Default Site", + TTSActive = false, + TemplateId = 1, + UserId = "0988758e-e16c-4c2c-8c1e-efa3ac5f0274" + }); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex") + .HasFilter("[NormalizedName] IS NOT NULL"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("nvarchar(max)"); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(max)"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .HasColumnType("nvarchar(450)"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("bit"); + + b.Property("LockoutEnabled") + .HasColumnType("bit"); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("PasswordHash") + .HasColumnType("nvarchar(max)"); + + b.Property("PhoneNumber") + .HasColumnType("nvarchar(max)"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("bit"); + + b.Property("SecurityStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("TwoFactorEnabled") + .HasColumnType("bit"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex") + .HasFilter("[NormalizedUserName] IS NOT NULL"); + + b.ToTable("AspNetUsers", (string)null); + + b.HasData( + new + { + Id = "0988758e-e16c-4c2c-8c1e-efa3ac5f0274", + AccessFailedCount = 0, + ConcurrencyStamp = "a2836246-0303-4370-b283-e53a9a3f2813", + Email = "adam.g@aycode.com", + EmailConfirmed = true, + LockoutEnabled = false, + NormalizedEmail = "ADAM.G@AYCODE.COM", + NormalizedUserName = "ADAM.G@AYCODE.COM", + PasswordHash = "AQAAAAIAAYagAAAAEChxKCu+ReGvcZFR/6kPASbpnQdMp1MJuepeRyR4bfHTkUk8SfNAqmckGXvuw+GaGA==", + PhoneNumberConfirmed = false, + SecurityStamp = "7ecf121a-b0e7-4e30-a1f1-299eeaf0a9cc", + TwoFactorEnabled = false, + UserName = "adam.g@aycode.com" + }); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("nvarchar(max)"); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(max)"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ProviderKey") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("nvarchar(450)"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("nvarchar(450)"); + + b.Property("RoleId") + .HasColumnType("nvarchar(450)"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("nvarchar(450)"); + + b.Property("LoginProvider") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("Name") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("BLAIzor.Models.CssTemplate", b => + { + b.HasOne("BLAIzor.Models.DesignTemplate", "DesignTemplate") + .WithOne("CssTemplate") + .HasForeignKey("BLAIzor.Models.CssTemplate", "DesignTemplateId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("DesignTemplate"); + }); + + modelBuilder.Entity("BLAIzor.Models.DesignTemplate", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("BLAIzor.Models.FormDefinition", b => + { + b.HasOne("BLAIzor.Models.SiteInfo", "SiteInfo") + .WithMany("FormDefinitions") + .HasForeignKey("SiteInfoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("SiteInfo"); + }); + + modelBuilder.Entity("BLAIzor.Models.MenuItem", b => + { + b.HasOne("BLAIzor.Models.SiteInfo", "SiteInfo") + .WithMany("MenuItems") + .HasForeignKey("SiteInfoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("SiteInfo"); + }); + + modelBuilder.Entity("BLAIzor.Models.SiteInfo", b => + { + b.HasOne("BLAIzor.Models.DesignTemplate", "Template") + .WithMany("Sites") + .HasForeignKey("TemplateId") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Template"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("BLAIzor.Models.DesignTemplate", b => + { + b.Navigation("CssTemplate") + .IsRequired(); + + b.Navigation("Sites"); + }); + + modelBuilder.Entity("BLAIzor.Models.SiteInfo", b => + { + b.Navigation("FormDefinitions"); + + b.Navigation("MenuItems"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20250615203806_EmbeddingServiceAndDefaultLanguage.cs b/Migrations/20250615203806_EmbeddingServiceAndDefaultLanguage.cs new file mode 100644 index 0000000..bf8b01e --- /dev/null +++ b/Migrations/20250615203806_EmbeddingServiceAndDefaultLanguage.cs @@ -0,0 +1,83 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace BLAIzor.Migrations +{ + /// + public partial class EmbeddingServiceAndDefaultLanguage : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "voiceId", + table: "SiteInfos", + newName: "VoiceId"); + + migrationBuilder.AddColumn( + name: "BackgroundVideo", + table: "SiteInfos", + type: "nvarchar(max)", + nullable: true); + + migrationBuilder.AddColumn( + name: "DefaultLanguage", + table: "SiteInfos", + type: "nvarchar(max)", + nullable: true); + + migrationBuilder.AddColumn( + name: "EmbeddingService", + table: "SiteInfos", + type: "nvarchar(max)", + nullable: true); + + migrationBuilder.AlterColumn( + name: "StoredHtml", + table: "MenuItems", + type: "nvarchar(max)", + nullable: true, + oldClrType: typeof(string), + oldType: "nvarchar(max)"); + + migrationBuilder.UpdateData( + table: "SiteInfos", + keyColumn: "Id", + keyValue: 1, + columns: new[] { "BackgroundVideo", "DefaultLanguage", "EmbeddingService" }, + values: new object[] { null, null, null }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "BackgroundVideo", + table: "SiteInfos"); + + migrationBuilder.DropColumn( + name: "DefaultLanguage", + table: "SiteInfos"); + + migrationBuilder.DropColumn( + name: "EmbeddingService", + table: "SiteInfos"); + + migrationBuilder.RenameColumn( + name: "VoiceId", + table: "SiteInfos", + newName: "voiceId"); + + migrationBuilder.AlterColumn( + name: "StoredHtml", + table: "MenuItems", + type: "nvarchar(max)", + nullable: false, + defaultValue: "", + oldClrType: typeof(string), + oldType: "nvarchar(max)", + oldNullable: true); + } + } +} diff --git a/Migrations/ApplicationDbContextModelSnapshot.cs b/Migrations/ApplicationDbContextModelSnapshot.cs index 3cd8d80..afa0370 100644 --- a/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Migrations/ApplicationDbContextModelSnapshot.cs @@ -193,7 +193,6 @@ namespace BLAIzor.Migrations .HasColumnType("int"); b.Property("StoredHtml") - .IsRequired() .HasColumnType("nvarchar(max)"); b.HasKey("Id"); @@ -211,12 +210,18 @@ namespace BLAIzor.Migrations SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("BackgroundVideo") + .HasColumnType("nvarchar(max)"); + b.Property("BrandLogoUrl") .HasColumnType("nvarchar(max)"); b.Property("DefaultColor") .HasColumnType("nvarchar(max)"); + b.Property("DefaultLanguage") + .HasColumnType("nvarchar(max)"); + b.Property("DefaultUrl") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -225,6 +230,9 @@ namespace BLAIzor.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("EmbeddingService") + .HasColumnType("nvarchar(max)"); + b.Property("Entity") .HasColumnType("nvarchar(max)"); @@ -253,7 +261,7 @@ namespace BLAIzor.Migrations .IsRequired() .HasColumnType("nvarchar(450)"); - b.Property("voiceId") + b.Property("VoiceId") .HasColumnType("nvarchar(max)"); b.HasKey("Id"); diff --git a/Models/HtmlSnippet.cs b/Models/HtmlSnippet.cs index 123727d..23d4cfc 100644 --- a/Models/HtmlSnippet.cs +++ b/Models/HtmlSnippet.cs @@ -20,6 +20,7 @@ public string? Variant { get; set; } // 👈 NEW: e.g. "image-left", "image-right", "no-image" public string SampleHtml { get; set; } //for design purposes public List Slots { get; set; } // e.g. ["title", "subtitle", "image", "cta"] + public float[] Vectors { get; set; } } diff --git a/Models/MenuItem.cs b/Models/MenuItem.cs index f2cc33e..f193dd2 100644 --- a/Models/MenuItem.cs +++ b/Models/MenuItem.cs @@ -17,7 +17,7 @@ namespace BLAIzor.Models public bool ShowInMainMenu { get; set; } = false; - public string StoredHtml { get; set; } + public string? StoredHtml { get; set; } public Guid? QdrantPointId { get; set; } diff --git a/Models/MenuItemModel.cs b/Models/MenuItemModel.cs index de121bf..41e593d 100644 --- a/Models/MenuItemModel.cs +++ b/Models/MenuItemModel.cs @@ -7,6 +7,7 @@ namespace BLAIzor.Models { public MenuItem MenuItem { get; set; } public string Content { get; set; } = string.Empty; + public string ContentDescription { get; set; } = string.Empty; public MenuItemModel(string name) { diff --git a/Models/SiteInfo.cs b/Models/SiteInfo.cs index 1483f99..292397d 100644 --- a/Models/SiteInfo.cs +++ b/Models/SiteInfo.cs @@ -27,10 +27,13 @@ namespace BLAIzor.Models public int? TemplateId { get; set; } public bool TTSActive { get; set; } = false; public bool STTActive { get; set; } = false; - public string? voiceId { get; set; } + public string? VoiceId { get; set; } public string? Persona { get; set; } public string? Entity { get; set; } + public string? DefaultLanguage { get; set; } + public string? BackgroundVideo { get; set; } + public string? EmbeddingService { get; set; } // Navigation property for IdentityUser public IdentityUser User { get; set; } diff --git a/Models/WebPageContent.cs b/Models/WebPageContent.cs index c9ac459..1be90e3 100644 --- a/Models/WebPageContent.cs +++ b/Models/WebPageContent.cs @@ -11,6 +11,7 @@ namespace BLAIzor.Models public string Name { get; set; } public string Description { get; set; } public string Content { get; set; } + public float[] Vectors { get; set; } public DateTime LastUpdated { get; set; } } } diff --git a/Program.cs b/Program.cs index afe7236..62f7adb 100644 --- a/Program.cs +++ b/Program.cs @@ -48,6 +48,7 @@ builder.Services.AddSingleton(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services .AddHttpContextAccessor() @@ -64,6 +65,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddHostedService(); builder.Services.AddServerSideBlazor().AddCircuitOptions(options => options.DetailedErrors = true).AddHubOptions(options => { diff --git a/Services/AIService.cs b/Services/AIService.cs index 56b0059..ac44748 100644 --- a/Services/AIService.cs +++ b/Services/AIService.cs @@ -23,6 +23,8 @@ using Microsoft.DotNet.Scaffolding.Shared; using System.Xml.XPath; using Azure.Identity; using BLAIzor.Helpers; +using System.Collections; +using Qdrant.Client.Grpc; namespace BLAIzor.Services { @@ -32,34 +34,38 @@ namespace BLAIzor.Services private readonly ContentService _contentService; private readonly ScopedContentService _scopedContentService; private readonly OpenAIEmbeddingService _openAIEmbeddingService; + private readonly LocalEmbeddingService _localEmbeddingService; private readonly OpenAIApiService _openAIApiService; private readonly OpenAiRealtimeService _openAIRealtimeService; private readonly DeepSeekApiService _deepSeekApiService; private readonly CerebrasAPIService _cerebrasAPIService; private readonly QDrantService _qDrantService; - private readonly NavigationManager _navigationManager; + private readonly NavigationManager _navigationManager; + private readonly LocalVectorSearchService _localVectorSearchService; public static IConfiguration? _configuration; - public AIService(HttpClient httpClient, ContentService contentService, ScopedContentService scopedContentService, QDrantService qDrantService, OpenAIEmbeddingService openAIEmbeddingService, OpenAIApiService openAIApiService, DeepSeekApiService deepSeekApiService, OpenAiRealtimeService openAIRealtimeService, CerebrasAPIService cerebrasAPIService, NavigationManager navigationManager, IConfiguration? configuration) + public AIService(HttpClient httpClient, ContentService contentService, ScopedContentService scopedContentService, QDrantService qDrantService, OpenAIEmbeddingService openAIEmbeddingService, LocalEmbeddingService localEmbeddingService, OpenAIApiService openAIApiService, DeepSeekApiService deepSeekApiService, OpenAiRealtimeService openAIRealtimeService, CerebrasAPIService cerebrasAPIService, NavigationManager navigationManager, IConfiguration? configuration, LocalVectorSearchService localVectorSearchService) { _httpClient = httpClient; _contentService = contentService; _scopedContentService = scopedContentService; _qDrantService = qDrantService; _openAIEmbeddingService = openAIEmbeddingService; + _localEmbeddingService = localEmbeddingService; _openAIApiService = openAIApiService; _deepSeekApiService = deepSeekApiService; _openAIRealtimeService = openAIRealtimeService; _cerebrasAPIService = cerebrasAPIService; _navigationManager = navigationManager; + _localVectorSearchService = localVectorSearchService; _configuration = configuration; _openAIApiService.RegisterCallback(HandleActionInvoked, HandleFinishedInvoked, HandleErrorInvoked); _cerebrasAPIService.RegisterCallback(HandleActionInvoked, HandleFinishedInvoked, HandleErrorInvoked); - _openAIRealtimeService.RegisterCallback(HandleActionInvoked); + _openAIRealtimeService.RegisterCallback(HandleActionInvoked); } private const string OpenAiEndpoint = "https://api.openai.com/v1/chat/completions"; @@ -77,6 +83,9 @@ namespace BLAIzor.Services private string GetAiSettings() => _configuration?.GetSection("AiSettings")?.GetValue("Provider") ?? string.Empty; + private string GetAiEmbeddingSettings() => + _configuration?.GetSection("AiSettings")?.GetValue("EmbeddingService") ?? string.Empty; + private void HandleActionInvoked(string sessionId, string streamedHtmlContent) { OnContentReceived?.Invoke(sessionId, streamedHtmlContent); @@ -107,7 +116,7 @@ namespace BLAIzor.Services } - public async Task GetChatGptWelcomeMessage(string sessionId, int SiteId, string menuList = "") + public async Task GetChatGptWelcomeMessage(string sessionId, int SiteId, string templateCollectionName, string menuList = "") { string currentUri = _navigationManager.Uri; //Console.Write($"\n\n SessionId: {sessionId}\n\n"); @@ -131,21 +140,22 @@ namespace BLAIzor.Services { siteEntity = site.Entity; } - else { + else + { siteEntity = "brand or company"; } - string systemMessage = "You are a helpful, " + Mood + " assistant that welcomes the user speaking in the name of the " + siteEntity + " described by the content, on a website of " + _scopedContentService.SelectedBrandName + " in " + _scopedContentService.SelectedLanguage + ". Use the following content: `" + - extractedText + "` " + - //"and generate a short" +Mood+ "but kind marketing-oriented welcome message and introduction of the brand for the user, constructed as simple Bootstrap HTML codeblock with a

tagged title and a paragraph." + - "and generate a" + Mood + " marketing-oriented welcome message and a summary of the content and introduction of the brand for the user, aiming to explain clearly, what does the company/person offer, constructed as simple Bootstrap HTML
codeblock with a

tagged title and a paragraph." + - "If there is any logo, or not logo but main brand image in the document use that url, and add that as a bootstrap responsive ('img-fluid py-3') image, with the maximum height of 30vh." + - //"In the end of your answer, always add in a new row: 'If you have any questions, you can simply ask either by typing in the message box, or by clicking the microphone icon on the top of the page. '"+ - "Here is a list of topics " + menuList + - ", make a new bootstrap clearfix and after that make a clickable bootstrap styled (btn btn-primary) button from each of the determined topics, " + - "that calls the javascript function 'callAI({the name of the topic})' on click. " + - "Do not include anything else than the html title and text elements, no css, no scripts, no head or other tags." + - "Do not mark your answer with ```html or any other mark."; + string systemMessage = "You are a helpful, " + Mood + " assistant that welcomes the user speaking in the name of the " + siteEntity + " described by the content, on a website of " + _scopedContentService.SelectedBrandName + " in " + _scopedContentService.SelectedLanguage + ". Use the following content: `" + + extractedText + "` " + + //"and generate a short" +Mood+ "but kind marketing-oriented welcome message and introduction of the brand for the user, constructed as simple Bootstrap HTML codeblock with a

tagged title and a paragraph." + + "and generate a" + Mood + " marketing-oriented welcome message and a summary of the content and introduction of the brand for the user, aiming to explain clearly, what does the company/person offer, constructed as simple Bootstrap HTML
codeblock with a

tagged title and a paragraph." + + "If there is any logo, or not logo but main brand image in the document use that url, and add that as a bootstrap responsive ('img-fluid py-3') image, with the maximum height of 30vh." + + //"In the end of your answer, always add in a new row: 'If you have any questions, you can simply ask either by typing in the message box, or by clicking the microphone icon on the top of the page. '"+ + "Here is a list of topics " + menuList + + ", make a new bootstrap clearfix and after that make a clickable bootstrap styled (btn btn-primary) button from each of the determined topics, " + + "that calls the javascript function 'callAI({the name of the topic})' on click. " + + "Do not include anything else than the html title and text elements, no css, no scripts, no head or other tags." + + "Do not mark your answer with ```html or any other mark."; string userMessage = "Hello"; string streamedHtmlContent = string.Empty; @@ -176,7 +186,8 @@ namespace BLAIzor.Services //_scopedContentService.CurrentDOM = streamedHtmlContent; ////Console.Write("Answer: " + streamedHtmlContent); //return streamedHtmlContent; - + _scopedContentService.AvailableTemplateSnippets = await GetSnippetsForDisplay(sessionId, templateCollectionName); + _scopedContentService.AvailableSiteContent = await GetAllContentForCaching(sessionId, "Site" + SiteId); } public async Task ProcessUserIntent(string sessionId, string userPrompt, int siteId, int templateId, string collectionName, string menuList = "") @@ -281,37 +292,61 @@ namespace BLAIzor.Services float[] vector = []; OnStatusChangeReceived?.Invoke(sessionId, "Determining search vectors"); - vector = await _openAIEmbeddingService.GenerateEmbeddingAsync(requestedMenu); - OnStatusChangeReceived?.Invoke(sessionId, "Looking up content in the knowledge database"); - var pointId = await _qDrantService.QueryContentAsync(siteId, vector, 3); - - - if (pointId.Length > 0) + var embeddingServiceProvider = GetAiEmbeddingSettings(); + if (embeddingServiceProvider == "local") { - foreach (var item in pointId) - { - string qDrantData = await _qDrantService.GetContentAsync(siteId, item); - QDrantGetContentPointResult _selectedPoint = new QDrantGetContentPointResult(); - - if (qDrantData != null) - { - _selectedPoint = JsonConvert.DeserializeObject(qDrantData)!; - } - extractedText += _selectedPoint.result.payload.name + ": " + _selectedPoint.result.payload.content + ", "; - } - + vector = await _localEmbeddingService.GenerateEmbeddingAsync(requestedMenu); } else { - extractedText = "VECTOR ERROR: ZERO INFORMATION FOUND"; + vector = await _openAIEmbeddingService.GenerateEmbeddingAsync(requestedMenu); + } + OnStatusChangeReceived?.Invoke(sessionId, "Looking up content in the knowledge database"); + + //no cache + if (_scopedContentService.AvailableTemplateSnippets == null) + { + + var pointId = await _qDrantService.QueryContentAsync(siteId, vector, 3); + + if (pointId.Length > 0) + { + foreach (var item in pointId) + { + string qDrantData = await _qDrantService.GetContentAsync(siteId, item); + QDrantGetContentPointResult _selectedPoint = new QDrantGetContentPointResult(); + + if (qDrantData != null) + { + _selectedPoint = JsonConvert.DeserializeObject(qDrantData)!; + } + extractedText += _selectedPoint.result.payload.name + ": " + _selectedPoint.result.payload.content + ", "; + } + + } + else + { + extractedText = "VECTOR ERROR: ZERO INFORMATION FOUND"; + } + } + //cached content + else + { + var points = _scopedContentService.AvailableSiteContent; + var resultContent = _localVectorSearchService.SearchContent(vector, points, 3); + + foreach (var item in resultContent) + { + extractedText += item.Name + ": " + item.Content + ", "; + } } - + Console.WriteLine($"Points from cache or qdrant: {extractedText}"); string contentJson = await GetContentFromQuery(sessionId, - "Enhance this text if needed, making its style and grammar suitable to be displayed as the content of a webpage", + requestedMenu, extractedText, forceUnmodified); - + Console.WriteLine($"AI representation: {contentJson}"); await ProcessContent(sessionId, contentJson, templateId, collectionName); } @@ -442,10 +477,11 @@ namespace BLAIzor.Services string removedNumbers = TextHelper.ReplaceNumbersAndSpecialCharacters(fixedResult.Text); Console.WriteLine(removedNumbers); OnTextContentAvailable?.Invoke(sessionId, removedNumbers); - List snippets = await GetSnippetsForDisplay(sessionId, collectionName); + //List snippets = await GetSnippetsForDisplay(sessionId, collectionName); + List snippets = _scopedContentService.AvailableTemplateSnippets; //await DisplayLayoutPlanFromContent(sessionId, fixedResult.Text, snippets, fixedResult.Topics, fixedResult.Photos); var result = await DisplayLayoutPlanFromContent(sessionId, fixedResult.Text, snippets, fixedResult.Topics, fixedResult.Photos); - if (result == null) result = new LayoutPlan(); + if (result == null) result = new LayoutPlan(); await DisplayHtml(sessionId, result, snippets, fixedResult.Topics); //OnContentReceived?.Invoke(sessionId, result.Blocks.Count.ToString()); } @@ -502,7 +538,7 @@ namespace BLAIzor.Services "Step 3: " + "- Turn the following content into a nice informative webpage content (DO NOT REMOVE URLS, PHOTO URLS though).\r\n " + "- Start with the page title.\r\n" + - "- Structure it nicely without leaving out any information.\r\n " + + "- Structure the text nicely without missing any information.\r\n " + //"*** CONTENT START *** {" + extractedText + "} *** CONTENT END ***.\r\n" + "**Style and Image Handling**:\r\n" + "- Make sure the json is valid json." + @@ -525,7 +561,7 @@ namespace BLAIzor.Services "Step 1: Start with defining above mentioned key topics of the initial document, and making the list of them. " + "Step 2: After that add the above mentioned relevant image urls list." + "Step 3: " + - "- Base a detailed, but not lengthy response solely on the initial document provided below. " + + "- Base a detailed response solely on the initial document provided below. " + "- In your response, summarize ALL relevant information in the document, that is connected to the question." + "*** CONTENT START *** {" + extractedText + "} *** CONTENT END ***.\r\n" + "- For missing information: Inform the user and ask if you can help with something else. " + @@ -718,30 +754,80 @@ namespace BLAIzor.Services //start with embeddings float[] vector = []; OnStatusChangeReceived?.Invoke(sessionId, "Determining search vectors"); - vector = await _openAIEmbeddingService.GenerateEmbeddingAsync(userPrompt); - OnStatusChangeReceived?.Invoke(sessionId, "Looking up content in the knowledge database"); - var pointId = await _qDrantService.QueryContentAsync(siteId, vector, 3); - - string extractedText = "Sections: "; - if (pointId.Length > 0) + var embeddingServiceProvider = GetAiEmbeddingSettings(); + if (embeddingServiceProvider == "local") { - foreach (var item in pointId) - { - string qDrantData = await _qDrantService.GetContentAsync(siteId, item); - QDrantGetContentPointResult selectedPoint = new QDrantGetContentPointResult(); - - if (qDrantData != null) - { - selectedPoint = JsonConvert.DeserializeObject(qDrantData)!; - } - extractedText += selectedPoint.result.payload.name + ": " + selectedPoint.result.payload.content + ", "; - } - + vector = await _localEmbeddingService.GenerateEmbeddingAsync(userPrompt); } else { - extractedText = "VECTOR ERROR: ZERO INFORMATION FOUND"; + vector = await _openAIEmbeddingService.GenerateEmbeddingAsync(userPrompt); } + OnStatusChangeReceived?.Invoke(sessionId, "Looking up content in the knowledge database"); + + + string extractedText = "Sections: "; + + + //var pointId = await _qDrantService.QueryContentAsync(siteId, vector, 3); + + //if (pointId.Length > 0) + //{ + // foreach (var item in pointId) + // { + // string qDrantData = await _qDrantService.GetContentAsync(siteId, item); + // QDrantGetContentPointResult selectedPoint = new QDrantGetContentPointResult(); + + // if (qDrantData != null) + // { + // selectedPoint = JsonConvert.DeserializeObject(qDrantData)!; + // } + // extractedText += selectedPoint.result.payload.name + ": " + selectedPoint.result.payload.content + ", "; + // } + + //} + //else + //{ + // extractedText = "VECTOR ERROR: ZERO INFORMATION FOUND"; + //} + + if (_scopedContentService.AvailableTemplateSnippets == null) + { + + var pointId = await _qDrantService.QueryContentAsync(siteId, vector, 3); + + if (pointId.Length > 0) + { + foreach (var item in pointId) + { + string qDrantData = await _qDrantService.GetContentAsync(siteId, item); + QDrantGetContentPointResult _selectedPoint = new QDrantGetContentPointResult(); + + if (qDrantData != null) + { + _selectedPoint = JsonConvert.DeserializeObject(qDrantData)!; + } + extractedText += _selectedPoint.result.payload.name + ": " + _selectedPoint.result.payload.content + ", "; + } + + } + else + { + extractedText = "VECTOR ERROR: ZERO INFORMATION FOUND"; + } + } + //cached content + else + { + var points = _scopedContentService.AvailableSiteContent; + var resultContent = _localVectorSearchService.SearchContent(vector, points, 3); + + foreach (var item in resultContent) + { + extractedText += item.Name + ": " + item.Content + ", "; + } + } + _workingContent = extractedText.Replace("\"", "'"); //Console.Write("\r \n GetJsonResultFromQuery: Working content: " + _workingContent + "\r \n"); @@ -827,6 +913,39 @@ namespace BLAIzor.Services return interMediateResult; } + public async Task> GetAllContentForCaching(string sessionId, string siteContentcollectionName) + { + _apiKey = GetApiKey(); + OnStatusChangeReceived?.Invoke(sessionId, "Looking up the UI template elements for you"); + + List contentSnippets = new List(); + + var snippetscount = await _qDrantService.GetCollectionCount(siteContentcollectionName); + for (int j = 0; j < snippetscount; j++) + { + var snippet = await _qDrantService.GetSnippetAsync(j, siteContentcollectionName); + QDrantGetContentPointResult x = JsonConvert.DeserializeObject(snippet); + + contentSnippets.Add(new WebPageContent + { + Id = x.result.payload.id, + UId = x.result.payload.uid, + Name = x.result.payload.name, + SiteId = x.result.payload.siteId, + Description = x.result.payload.description, + Type = x.result.payload.type, + Content = x.result.payload.content, + Vectors = x.result.GetFloatVector(), + LastUpdated = x.result.payload.lastUpdated + }); + //availableSnippetList += ("- " + x.result.payload.Name + ": " + x.result.payload.Description + ".\r\n"); + } + ////Console.Write(availableSnippetList); + //OnStatusChangeReceived?.Invoke(sessionId, "Loading UI elements from the design database"); + return contentSnippets; + + } + public async Task> GetSnippetsForDisplay(string sessionId, string collectionName) { _apiKey = GetApiKey(); @@ -841,15 +960,18 @@ namespace BLAIzor.Services var snippet = await _qDrantService.GetSnippetAsync(j, collectionName); QDrantGetPointResult x = JsonConvert.DeserializeObject(snippet); - snippets.Add(new HtmlSnippet { Id = x.result.payload.Id, - Name = x.result.payload.Name, - Description = x.result.payload.Description, + snippets.Add(new HtmlSnippet + { + Id = x.result.payload.Id, + Name = x.result.payload.Name, + Description = x.result.payload.Description, Type = x.result.payload.Type, Variant = x.result.payload.Variant, Tags = x.result.payload.Tags, Slots = x.result.payload.Slots, Html = x.result.payload.Html, - SampleHtml = x.result.payload.SampleHtml + SampleHtml = x.result.payload.SampleHtml, + Vectors = x.result.GetFloatVector() }); //availableSnippetList += ("- " + x.result.payload.Name + ": " + x.result.payload.Description + ".\r\n"); } @@ -965,7 +1087,9 @@ namespace BLAIzor.Services StringBuilder lst = new StringBuilder("You are a helpful assistant generating HTML content in " + _scopedContentService.SelectedLanguage + " using Bootstrap. \n\n" + "### Rules to Follow: \n" + "- Please generate clean and structured HTML that goes between the menu and the footer of a Bootstrap5 webpage.\n" + - "- DO NOT include ``, ``, or `