refactor: Improve code quality by removing duplicate using statements and enhancing null safety in FunctionCostCalculationService

Author: nickna

Services/ConduitLLM.Admin/Services/LLMCacheManagementService.cs

@@ -18,6 +18,12 @@ public class LLMCacheManagementService : ILLMCacheManagementService
 
         private const string LLM_CACHE_SETTING_KEY = "LLM.Caching.Enabled";
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LLMCacheManagementService"/> class.
+        /// </summary>
+        /// <param name="globalSettingRepository">Repository for managing global settings.</param>
+        /// <param name="publishEndpoint">MassTransit publish endpoint for broadcasting cache configuration changes.</param>
+        /// <param name="logger">Logger instance for diagnostics and monitoring.</param>
         public LLMCacheManagementService(
             IGlobalSettingRepository globalSettingRepository,
             IPublishEndpoint publishEndpoint,

Shared/ConduitLLM.Configuration/Repositories/FunctionCostMappingRepository.cs

@@ -1,7 +1,5 @@
 using ConduitLLM.Configuration;
 using ConduitLLM.Configuration.Utilities;
-using ConduitLLM.Configuration;
-using ConduitLLM.Configuration.Utilities;
 using ConduitLLM.Functions.Entities;
 using ConduitLLM.Functions.Interfaces;
 using Microsoft.EntityFrameworkCore;

Shared/ConduitLLM.Configuration/Repositories/FunctionCostRepository.cs

@@ -1,7 +1,5 @@
 using ConduitLLM.Configuration;
 using ConduitLLM.Configuration.Utilities;
-using ConduitLLM.Configuration;
-using ConduitLLM.Configuration.Utilities;
 using ConduitLLM.Functions.Entities;
 using ConduitLLM.Functions.Interfaces;
 using Microsoft.EntityFrameworkCore;

Shared/ConduitLLM.Configuration/Repositories/FunctionExecutionRepository.cs

@@ -1,7 +1,5 @@
 using ConduitLLM.Configuration;
 using ConduitLLM.Configuration.Utilities;
-using ConduitLLM.Configuration;
-using ConduitLLM.Configuration.Utilities;
 using ConduitLLM.Functions.Entities;
 using ConduitLLM.Functions.Enums;
 using ConduitLLM.Functions.Interfaces;

Shared/ConduitLLM.Configuration/Repositories/ModelCostRepository.cs

@@ -1,6 +1,5 @@
 using ConduitLLM.Configuration.Entities;
 using ConduitLLM.Configuration.Utilities;
-using ConduitLLM.Configuration.Utilities;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;

Shared/ConduitLLM.Configuration/Repositories/VirtualKeyRepository.cs

@@ -1,6 +1,5 @@
 using ConduitLLM.Configuration.Entities;
 using ConduitLLM.Configuration.Utilities;
-using ConduitLLM.Configuration.Utilities;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;

Shared/ConduitLLM.Core/Conduit.cs

@@ -365,9 +365,9 @@ private async IAsyncEnumerable<ChatCompletionChunk> StreamChatCompletionWithFunc
                     }
 
                     // Accumulate tool calls from chunks
-                    if (chunk.Choices?.Count > 0 && chunk.Choices[0].Delta?.ToolCalls != null)
+                    if (chunk.Choices?.Count > 0 && chunk.Choices[0].Delta?.ToolCalls is { } toolCalls)
                     {
-                        foreach (var toolCallChunk in chunk.Choices[0].Delta.ToolCalls)
+                        foreach (var toolCallChunk in toolCalls)
                         {
                             if (!accumulatedToolCalls.ContainsKey(toolCallChunk.Index))
                             {

Shared/ConduitLLM.Core/Services/BatchOperations/BatchSpendUpdateOperation.cs

@@ -34,7 +34,7 @@ public BatchSpendUpdateOperation(
         /// <param name="idempotencyToken">Optional token to prevent duplicate processing</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Result of the batch operation</returns>
-        public virtual async Task<BatchOperationResult> ExecuteAsync(
+        public new virtual async Task<BatchOperationResult> ExecuteAsync(
             List<SpendUpdateItem> spendUpdates,
             int virtualKeyId,
             string? idempotencyToken = null,

Shared/ConduitLLM.Functions/Services/FunctionCostCalculationService.Estimation.cs

@@ -268,13 +268,13 @@ private decimal EstimateExaHybridCost(ExaHybridPricingConfig config, Dictionary<
 
         // 1. Estimate search cost (assume neural for conservatism)
         decimal searchEstimate;
-        if (requestedResults <= (config.SearchCosts.Neural.Tier1.MaxResults ?? 25))
+        if (requestedResults <= (config.SearchCosts?.Neural?.Tier1.MaxResults ?? 25))
         {
-            searchEstimate = config.SearchCosts.Neural.Tier1.Cost;
+            searchEstimate = config.SearchCosts?.Neural?.Tier1.Cost ?? 0m;
         }
         else
         {
-            searchEstimate = config.SearchCosts.Neural.Tier2.Cost;
+            searchEstimate = config.SearchCosts?.Neural?.Tier2.Cost ?? 0m;
         }
         totalEstimate += searchEstimate;
 

Shared/ConduitLLM.Functions/Services/FunctionCostCalculationService.Hybrid.cs

@@ -143,43 +143,43 @@ private decimal CalculateExaSearchCost(ExaHybridPricingConfig config, FunctionEx
         {
             case "neural":
                 // Determine tier based on result count
-                if (resultCount <= (config.SearchCosts.Neural.Tier1.MaxResults ?? 25))
+                if (resultCount <= (config.SearchCosts?.Neural?.Tier1.MaxResults ?? 25))
                 {
-                    searchCost = config.SearchCosts.Neural.Tier1.Cost;
+                    searchCost = config.SearchCosts?.Neural?.Tier1.Cost ?? 0m;
                     _logger.LogDebug("Neural search tier 1 (1-{Max} results): ${Cost}",
-                        config.SearchCosts.Neural.Tier1.MaxResults ?? 25, searchCost);
+                        config.SearchCosts?.Neural?.Tier1.MaxResults ?? 25, searchCost);
                 }
                 else
                 {
-                    searchCost = config.SearchCosts.Neural.Tier2.Cost;
+                    searchCost = config.SearchCosts?.Neural?.Tier2.Cost ?? 0m;
                     _logger.LogDebug("Neural search tier 2 ({Min}+ results): ${Cost}",
-                        (config.SearchCosts.Neural.Tier1.MaxResults ?? 25) + 1, searchCost);
+                        (config.SearchCosts?.Neural?.Tier1.MaxResults ?? 25) + 1, searchCost);
                 }
                 break;
 
             case "keyword":
-                searchCost = config.SearchCosts.Keyword.Cost;
+                searchCost = config.SearchCosts?.Keyword?.Cost ?? 0m;
                 _logger.LogDebug("Keyword search (any results): ${Cost}", searchCost);
                 break;
 
             case "auto":
                 // Auto mode: use conservative estimate (keyword pricing by default, or neural tier 1 if configured)
-                if (config.SearchCosts.Auto?.FallbackToKeyword == true)
+                if (config.SearchCosts?.Auto?.FallbackToKeyword == true)
                 {
-                    searchCost = config.SearchCosts.Keyword.Cost;
+                    searchCost = config.SearchCosts?.Keyword?.Cost ?? 0m;
                     _logger.LogDebug("Auto search (fallback to keyword pricing): ${Cost}", searchCost);
                 }
                 else
                 {
                     // Conservative: assume neural tier 1
-                    searchCost = config.SearchCosts.Neural.Tier1.Cost;
+                    searchCost = config.SearchCosts?.Neural?.Tier1.Cost ?? 0m;
                     _logger.LogDebug("Auto search (fallback to neural tier 1 pricing): ${Cost}", searchCost);
                 }
                 break;
 
             default:
                 _logger.LogWarning("Unknown search type '{SearchType}', defaulting to keyword pricing", searchType);
-                searchCost = config.SearchCosts.Keyword.Cost;
+                searchCost = config.SearchCosts?.Keyword?.Cost ?? 0m;
                 break;
         }