merge "Development" into "main"

src/FairPlayCombinedSln/FairPlayAdminPortal/Components/Pages/ConfigurationSecretsManage.razor

@@ -4,7 +4,6 @@
 @using FairPlayCombined.Common
 @using FairPlayCombined.Models.Common.ConfigurationSecret
 @using FairPlayCombined.Services.Common
-@using Microsoft.Azure.CognitiveServices.ContentModerator
 
 @inject IToastService toastService
 @inject ConfigurationSecretService configurationSecretService
@@ -141,32 +140,38 @@
             <FluentValidationMessage For="@( () => azureVideoIndexerSubscriptionIdConfiguration.Value)"></FluentValidationMessage>
         </div>
     }
-    @if (this.azureContentModeratorEndpointConfiguration != null &&
-    this.azureContentModeratorKeyConfiguration != null)
+    @if (this.googleGeminiKeyConfiguration != null)
     {
         <div>
-            <h3>Azure Content Moderator Configuration</h3>
-        </div>
-        <div>
-            <FluentLabel Typo="Typography.Body">@azureContentModeratorEndpointConfiguration.Name</FluentLabel>
-            <FluentTextField style="width:100%;" @bind-Value="this.azureContentModeratorEndpointConfiguration.Value"></FluentTextField>
-            <FluentValidationMessage For="@( () => azureContentModeratorEndpointConfiguration.Value)"></FluentValidationMessage>
+            <h3>Google Gemini Configuration</h3>
         </div>
         <div>
-            <FluentLabel Typo="Typography.Body">@azureContentModeratorKeyConfiguration.Name</FluentLabel>
-            <FluentTextField style="width:100%;" @bind-Value="this.azureContentModeratorKeyConfiguration.Value"></FluentTextField>
-            <FluentValidationMessage For="@( () => azureContentModeratorKeyConfiguration.Value)"></FluentValidationMessage>
+            <FluentLabel Typo="Typography.Body">@googleGeminiKeyConfiguration.Name</FluentLabel>
+            <FluentTextField style="width:100%;" @bind-Value="this.googleGeminiKeyConfiguration.Value"></FluentTextField>
+            <FluentValidationMessage For="@( () => googleGeminiKeyConfiguration.Value)"></FluentValidationMessage>
         </div>
     }
-    @if (this.googleGeminiKeyConfiguration != null)
+    @if (this.azureContentSafetyKeyConfiguration != null 
+    && this.azureContentSafetyEndpointConfiguration != null)
     {
         <div>
-            <h3>Google Gemini Configuration</h3>
+            <FluentLabel Typo="Typography.H3">
+                <FluentAnchor Href="https://learn.microsoft.com/en-us/azure/ai-services/content-safety/" Target="_blank">
+                    <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                Color="Color.Accent" Slot="start"></FluentIcon>
+                    Azure Content Safety Configuration
+                </FluentAnchor>
+            </FluentLabel>
         </div>
         <div>
-            <FluentLabel Typo="Typography.Body">@googleGeminiKeyConfiguration.Name</FluentLabel>
-            <FluentTextField style="width:100%;" @bind-Value="this.googleGeminiKeyConfiguration.Value"></FluentTextField>
-            <FluentValidationMessage For="@( () => googleGeminiKeyConfiguration.Value)"></FluentValidationMessage>
+            <FluentLabel Typo="Typography.Body">@azureContentSafetyEndpointConfiguration.Name</FluentLabel>
+            <FluentTextField style="width:100%;" TextFieldType="TextFieldType.Url" InputMode="InputMode.Url" @bind-Value="this.azureContentSafetyEndpointConfiguration.Value"></FluentTextField>
+            <FluentValidationMessage For="@( () => azureContentSafetyEndpointConfiguration.Value)"></FluentValidationMessage>
+        </div>
+        <div>
+            <FluentLabel Typo="Typography.Body">@azureContentSafetyKeyConfiguration.Name</FluentLabel>
+            <FluentTextField style="width:100%;" TextFieldType="TextFieldType.Text" InputMode="InputMode.Text" @bind-Value="this.azureContentSafetyKeyConfiguration.Value"></FluentTextField>
+            <FluentValidationMessage For="@( () => azureContentSafetyKeyConfiguration.Value)"></FluentValidationMessage>
         </div>
     }
     <div>
@@ -227,15 +232,16 @@
     private ConfigurationSecretModel? azureVideoIndexerSubscriptionIdConfiguration => allConfigurationSecrets?
     .SingleOrDefault(p => p.Name == FairPlayCombined.Common.Constants.ConfigurationSecretsKeys.AZURE_VIDEOINDEXER_SUBSCRIPTION_ID_KEY);
 
-    private ConfigurationSecretModel? azureContentModeratorEndpointConfiguration => allConfigurationSecrets?
-    .SingleOrDefault(p => p.Name == FairPlayCombined.Common.Constants.ConfigurationSecretsKeys.AZURE_CONTENT_MODERATOR_ENDPOINT_KEY);
-
-    private ConfigurationSecretModel? azureContentModeratorKeyConfiguration => allConfigurationSecrets?
-    .SingleOrDefault(p => p.Name == FairPlayCombined.Common.Constants.ConfigurationSecretsKeys.AZURE_CONTENT_MODERATOR_KEY_KEY);
-
     private ConfigurationSecretModel? googleGeminiKeyConfiguration => allConfigurationSecrets?
     .SingleOrDefault(p => p.Name == FairPlayCombined.Common.Constants.ConfigurationSecretsKeys.GOOGLE_GEMINI_KEY_KEY);
 
+    private ConfigurationSecretModel? azureContentSafetyEndpointConfiguration => allConfigurationSecrets?
+    .SingleOrDefault(p => p.Name == FairPlayCombined.Common.Constants.ConfigurationSecretsKeys.AZURE_CONTENT_SAFETY_ENDPOINT_KEY);
+
+    private ConfigurationSecretModel? azureContentSafetyKeyConfiguration => allConfigurationSecrets?
+    .SingleOrDefault(p => p.Name == FairPlayCombined.Common.Constants.ConfigurationSecretsKeys.AZURE_CONTENT_SAFETY_KEY_KEY);
+
+
     private ExternalServicesHealthModel[]? externalServicesHealthModels;
     private readonly CancellationTokenSource cancellationTokenSource = new();
     private bool IsBusy { get; set; }
@@ -323,25 +329,25 @@
                     Name = Constants.ConfigurationSecretsKeys.AZURE_VIDEOINDEXER_SUBSCRIPTION_ID_KEY
                 });
         }
-        if (this.azureContentModeratorEndpointConfiguration is null)
+        if (this.googleGeminiKeyConfiguration is null)
         {
             this.allConfigurationSecrets!.Add(new ConfigurationSecretModel()
                 {
-                    Name = Constants.ConfigurationSecretsKeys.AZURE_CONTENT_MODERATOR_ENDPOINT_KEY
+                    Name = Constants.ConfigurationSecretsKeys.GOOGLE_GEMINI_KEY_KEY
                 });
         }
-        if (this.azureContentModeratorKeyConfiguration is null)
+        if (this.azureContentSafetyEndpointConfiguration is null)
         {
             this.allConfigurationSecrets!.Add(new ConfigurationSecretModel()
                 {
-                    Name = Constants.ConfigurationSecretsKeys.AZURE_CONTENT_MODERATOR_KEY_KEY
+                    Name = Constants.ConfigurationSecretsKeys.AZURE_CONTENT_SAFETY_ENDPOINT_KEY
                 });
         }
-        if (this.googleGeminiKeyConfiguration is null)
+        if (this.azureContentSafetyKeyConfiguration is null)
         {
             this.allConfigurationSecrets!.Add(new ConfigurationSecretModel()
                 {
-                    Name = Constants.ConfigurationSecretsKeys.GOOGLE_GEMINI_KEY_KEY
+                    Name = Constants.ConfigurationSecretsKeys.AZURE_CONTENT_SAFETY_KEY_KEY
                 });
         }
         StateHasChanged();
@@ -354,11 +360,7 @@
         ExternalServicesConfigurationModel externalServicesConfigurationModel = new()
             {
                 AzureOpenDeploymentName = this.azureOpenAIDeploymentNameConfiguration!.Value,
-                OpenAIClient = new Azure.AI.OpenAI.OpenAIClient(openAIApiKey: this.azureOpenAIKeyConfiguration!.Value),
-                ContentModeratorClient = new(new ApiKeyServiceClientCredentials(this.azureContentModeratorKeyConfiguration!.Value))
-                {
-                    Endpoint = this.azureContentModeratorEndpointConfiguration!.Value
-                }
+                OpenAIClient = new Azure.AI.OpenAI.OpenAIClient(openAIApiKey: this.azureOpenAIKeyConfiguration!.Value)
             };
         ExternalServicesHealthService externalServicesHealthService = new ExternalServicesHealthService(externalServicesConfigurationModel);
         this.externalServicesHealthModels = await externalServicesHealthService.CheckServicesHealthAsync(this.cancellationTokenSource.Token);

src/FairPlayCombinedSln/FairPlayAdminPortal/FairPlayAdminPortal.csproj

@@ -22,18 +22,21 @@
     <None Remove="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.1.23557.2" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.5.1-preview.24080.3" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.5.0" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.5.0" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
+    <PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.4.24218.6" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.7.1" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.7.0" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.24.0.89429">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0-preview.4.24219.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-preview.4.24219.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.4.24217.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.4.24217.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.2.24128.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FairPlayCombined.Common\FairPlayCombined.Common.csproj" />

src/FairPlayCombinedSln/FairPlayAdminPortal/Program.cs

@@ -52,24 +52,23 @@
 .AddDefaultTokenProviders();
 
 builder.Services.AddTransient<IUserProviderService, UserProviderService>();
-builder.Services.AddTransient<DbContextOptions<FairPlayCombinedDbContext>>(sp =>
+
+builder.Services.AddDbContext<FairPlayCombinedDbContext>((sp, builder) =>
 {
     IUserProviderService userProviderService = sp.GetRequiredService<IUserProviderService>();
-    DbContextOptionsBuilder<FairPlayCombinedDbContext> optionsBuilder = new();
-    optionsBuilder.AddInterceptors(new SaveChangesInterceptor(userProviderService));
-    optionsBuilder.UseSqlServer(connectionString,
+    builder.AddInterceptors(new SaveChangesInterceptor(userProviderService));
+    builder.UseSqlServer(connectionString,
         sqlServerOptionsAction =>
         {
             sqlServerOptionsAction.UseNetTopologySuite();
             sqlServerOptionsAction.EnableRetryOnFailure(maxRetryCount: 3,
                 maxRetryDelay: TimeSpan.FromSeconds(30),
                 errorNumbersToAdd: null);
         });
-    return optionsBuilder.Options;
-});
-builder.AddSqlServerDbContext<FairPlayCombinedDbContext>(connectionName: "FairPlayCombinedDb");
-builder.Services.AddDbContextFactory<FairPlayCombinedDbContext>();
+}, contextLifetime: ServiceLifetime.Transient, optionsLifetime: ServiceLifetime.Transient);
 
+builder.Services.AddDbContextFactory<FairPlayCombinedDbContext>();
+builder.EnrichSqlServerDbContext<FairPlayCombinedDbContext>();
 builder.Services.AddMemoryCache();
 builder.Services.AddTransient<UserManager<ApplicationUser>, CustomUserManager>();
 builder.Services.AddSingleton<IEmailSender<ApplicationUser>, IdentityNoOpEmailSender>();

src/FairPlayCombinedSln/FairPlayBudget/FairPlayBudget.csproj

@@ -7,14 +7,17 @@
     <Configurations>Debug;Release;Debug_Enable_Paid_Tests</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.1.23557.2" />
-    <PackageReference Include="Blazored.Toast" Version="4.1.0" />
+    <PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.4.24218.6" />
+    <PackageReference Include="Blazored.Toast" Version="4.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.DataAnnotations.Validation" Version="3.2.0-rc1.20223.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.2.24128.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.0-preview.4.24219.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0-preview.4.24219.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-preview.4.24219.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.4.24217.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.4.24217.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FairPlayCombined.Common\FairPlayCombined.Common.csproj" />

src/FairPlayCombinedSln/FairPlayCombined.AutomatedTests/FairPlayCombined.AutomatedTests.csproj

@@ -21,18 +21,17 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Azure.AI.ContentSafety" Version="1.0.0" />
-    <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.15" />
-    <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24080-01" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.0-preview.24164.4" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.0-preview.24164.4" />
-    <PackageReference Include="Microsoft.Playwright.MSTest" Version="1.42.0" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.16" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.Playwright.MSTest" Version="1.43.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Testcontainers.MsSql" Version="3.8.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0-preview.2.24128.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0-preview.4.24219.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FairPlayCombined.Services.AI\FairPlayCombined.Services.AI.csproj" />