cleanup

samples/support-center/SupportCenter.ApiService/Agents/Conversation/Conversation.cs

@@ -3,9 +3,8 @@
 using Microsoft.Extensions.AI;
 using SupportCenter.ApiService.Events;
 using SupportCenter.ApiService.Extensions;
-using SupportCenter.ApiService.Options;
 using SupportCenter.ApiService.SignalRHub;
-using static SupportCenter.ApiService.Options.Consts;
+using static SupportCenter.ApiService.Consts;
 
 namespace SupportCenter.ApiService.Agents.Conversation;
 [ImplicitStreamSubscription(OrleansNamespace)]

samples/support-center/SupportCenter.ApiService/Agents/CustomerInfo/CustomerInfo.cs

@@ -4,8 +4,7 @@
 using SupportCenter.ApiService.Data.CosmosDb;
 using SupportCenter.ApiService.Events;
 using SupportCenter.ApiService.Extensions;
-using SupportCenter.ApiService.Options;
-using static SupportCenter.ApiService.Options.Consts;
+using static SupportCenter.ApiService.Consts;
 
 namespace SupportCenter.ApiService.Agents.CustomerInfo;
 

samples/support-center/SupportCenter.ApiService/Agents/Discount/Discount.cs

@@ -2,17 +2,16 @@
 using Microsoft.AI.Agents.Orleans;
 using Microsoft.Extensions.AI;
 using SupportCenter.ApiService.Events;
-using SupportCenter.ApiService.Options;
-using static SupportCenter.ApiService.Options.Consts;
+using static SupportCenter.ApiService.Consts;
 
 namespace SupportCenter.ApiService.Agents.Discount;
 
-[ImplicitStreamSubscription(Consts.OrleansNamespace)]
+[ImplicitStreamSubscription(OrleansNamespace)]
 public class Discount : AiAgent<DiscountState>
 {
     private readonly ILogger<Discount> _logger;
 
-    protected override string Namespace => Consts.OrleansNamespace;
+    protected override string Namespace => OrleansNamespace;
 
     public Discount([PersistentState("state", "messages")] IPersistentState<AgentState<DiscountState>> state,
         ILogger<Discount> logger,

samples/support-center/SupportCenter.ApiService/Agents/Dispatcher/Dispatcher.cs

@@ -5,7 +5,7 @@
 using SupportCenter.ApiService.Events;
 using SupportCenter.ApiService.Extensions;
 using System.Reflection;
-using static SupportCenter.ApiService.Options.Consts;
+using static SupportCenter.ApiService.Consts;
 
 namespace SupportCenter.ApiService.Agents.Dispatcher;
 

samples/support-center/SupportCenter.ApiService/Agents/Invoice/Invoice.cs

@@ -3,7 +3,7 @@
 using Microsoft.Extensions.AI;
 using SupportCenter.ApiService.Events;
 using SupportCenter.ApiService.Extensions;
-using static SupportCenter.ApiService.Options.Consts;
+using static SupportCenter.ApiService.Consts;
 
 namespace SupportCenter.ApiService.Agents.Invoice;
 

samples/support-center/SupportCenter.ApiService/Agents/QnA/QnA.cs

@@ -3,8 +3,7 @@
 using Microsoft.Extensions.AI;
 using SupportCenter.ApiService.Events;
 using SupportCenter.ApiService.Extensions;
-using SupportCenter.ApiService.Options;
-using static SupportCenter.ApiService.Options.Consts;
+using static SupportCenter.ApiService.Consts;
 
 namespace SupportCenter.ApiService.Agents.QnA;
 [ImplicitStreamSubscription(OrleansNamespace)]

samples/support-center/SupportCenter.ApiService/Agents/SignalR/SignalR.cs

@@ -4,7 +4,7 @@
 using SupportCenter.ApiService.Extensions;
 using SupportCenter.ApiService.SignalRHub;
 using System.Collections.Concurrent;
-using static SupportCenter.ApiService.Options.Consts;
+using static SupportCenter.ApiService.Consts;
 
 namespace SupportCenter.ApiService.Agents.SignalR;
 

samples/support-center/SupportCenter.ApiService/Consts.cs

@@ -0,0 +1,8 @@
+namespace SupportCenter.ApiService
+{
+    public static class Consts
+    {
+        public const string OrleansNamespace = "SupportCenter";
+        public const string Gpt4oMini = "gpt-4o-mini";
+    }
+}

samples/support-center/SupportCenter.ApiService/Controllers/Interactions.cs

@@ -1,7 +1,6 @@
 using Microsoft.AI.Agents.Abstractions;
 using Microsoft.AspNetCore.Mvc;
 using SupportCenter.ApiService.Events;
-using SupportCenter.ApiService.Options;
 
 namespace SupportCenter.ApiService.Controllers
 {

samples/support-center/SupportCenter.ApiService/Data/CosmosDb/CosmosDbRepository.cs

@@ -1,48 +1,34 @@
 using Microsoft.Azure.Cosmos;
 using SupportCenter.ApiService.Data.Entities;
-using SupportCenter.ApiService.Options;
 
 namespace SupportCenter.ApiService.Data.CosmosDb
 {
-    public abstract class CosmosDbRepository<TEntity, TOptions>
-        where TEntity : Entity
-        where TOptions : CosmosDbOptions
+    public abstract class CosmosDbRepository<T>(CosmosClient client, ILogger<CosmosDbRepository<T>> logger)
+        where T : Entity
     {
-        protected readonly ILogger Logger;
-        protected readonly Container Container;
-
-        protected CosmosDbRepository(TOptions options, ILogger logger)
+        protected Container GetContainer()
         {
-            Logger = logger;
-            CosmosDbOptions configuration = options;
-
-            var containerConfiguration = configuration.Containers?.FirstOrDefault(c => c.EntityName == typeof(TEntity).Name)
-                ?? throw new InvalidOperationException($"Container configuration for {typeof(TEntity).Name} not found.");
-
-            var client = new CosmosClient(configuration.AccountUri, configuration.AccountKey);
-            client.CreateDatabaseIfNotExistsAsync(containerConfiguration.DatabaseName);
-
-            var database = client.GetDatabase(containerConfiguration.DatabaseName);
-            database.CreateContainerIfNotExistsAsync(containerConfiguration.ContainerName, containerConfiguration.PartitionKey ?? "/partitionKey");
-
-            Container = database.GetContainer(containerConfiguration.ContainerName);
+            var database = client.GetDatabase("supportcenter");
+            var container = database.GetContainer("items");
+            return container;
         }
-
         public async Task<TOutput> GetItemAsync<TOutput>(string id, string partitionKey)
         {
-            TOutput item = await Container.ReadItemAsync<TOutput>(id: id, partitionKey: new PartitionKey(partitionKey));
+            var container = GetContainer();
+            TOutput item = await container.ReadItemAsync<TOutput>(id: id, partitionKey: new PartitionKey(partitionKey));
             return item;
         }
 
-        public async Task InsertItemAsync(TEntity entity)
+        public async Task InsertItemAsync(T entity)
         {
             try
             {
-                var response = await Container.CreateItemAsync(entity, new PartitionKey(entity.GetPartitionKeyValue()));
+                var container = GetContainer();
+                var response = await container.CreateItemAsync(entity, new PartitionKey(entity.GetPartitionKeyValue()));
             }
             catch (Exception ex)
             {
-                Logger.LogCritical(
+                logger.LogCritical(
                     ex,
                     "An error occurred. MethodName: {methodName} ErrorMessage: {errorMessage}",
                     nameof(InsertItemAsync),
@@ -53,9 +39,10 @@ public async Task InsertItemAsync(TEntity entity)
             }
         }
 
-        public async Task UpsertItemAsync(TEntity entity)
+        public async Task UpsertItemAsync(T entity)
         {
-            await Container.UpsertItemAsync(entity, new PartitionKey(entity.GetPartitionKeyValue()));
+            var container = GetContainer();
+            await container.UpsertItemAsync(entity, new PartitionKey(entity.GetPartitionKeyValue()));
         }
     }
 }

samples/support-center/SupportCenter.ApiService/Data/CosmosDb/CustomerRepository.cs

@@ -1,20 +1,16 @@
 using Microsoft.Azure.Cosmos;
-using Microsoft.Extensions.Options;
 using SupportCenter.ApiService.Data.CosmosDb.Entities;
-using SupportCenter.ApiService.Options;
 
 namespace SupportCenter.ApiService.Data.CosmosDb
 {
-    public class CustomerRepository : CosmosDbRepository<Customer, CosmosDbOptions>, ICustomerRepository
+    public class CustomerRepository(CosmosClient client, ILogger<CustomerRepository> logger) : CosmosDbRepository<Customer>(client,logger), ICustomerRepository
     {
-        public CustomerRepository(IOptions<CosmosDbOptions> options, ILogger<CustomerRepository> logger)
-            : base(options.Value, logger) { }
-
         public async Task<Customer?> GetCustomerByIdAsync(string customerId)
         {
+            var container = GetContainer();
             var query = new QueryDefinition("SELECT * FROM c WHERE c.id = @customerId")
                 .WithParameter("@customerId", customerId);
-            var iterator = Container.GetItemQueryIterator<Customer?>(query);
+            var iterator = container.GetItemQueryIterator<Customer?>(query);
             Customer? customer = null;
             while (iterator.HasMoreResults)
             {
@@ -26,8 +22,9 @@ public CustomerRepository(IOptions<CosmosDbOptions> options, ILogger<CustomerRep
 
         public async Task<IEnumerable<Customer>> GetCustomersAsync()
         {
+            var container = GetContainer();
             var query = new QueryDefinition("SELECT * FROM c");
-            var iterator = Container.GetItemQueryIterator<Customer>(query);
+            var iterator = container.GetItemQueryIterator<Customer>(query);
             var customers = new List<Customer>();
             while (iterator.HasMoreResults)
             {