Merge branch 'main' into issue-1248

Author: waldekmastykarz

DevProxy.Abstractions/LanguageModel/PricesData.cs

@@ -9,6 +9,7 @@ namespace DevProxy.Abstractions.LanguageModel;
 public class ModelPrices
 {
     public double Input { get; set; }
+    public double CachedInput { get; set; }
     public double Output { get; set; }
 }
 
@@ -44,7 +45,7 @@ public bool TryGetModelPrices(string modelName, out ModelPrices? prices)
         return false;
     }
 
-    public (double Input, double Output) CalculateCost(string modelName, long inputTokens, long outputTokens)
+    public (double Input, double Output) CalculateCost(string modelName, long inputTokens, long outputTokens, long cachedInputTokens = 0)
     {
         if (!TryGetModelPrices(modelName, out var prices))
         {
@@ -53,8 +54,13 @@ public bool TryGetModelPrices(string modelName, out ModelPrices? prices)
 
         Debug.Assert(prices != null, "Prices data should not be null here.");
 
-        // Prices in the data are per 1M tokens
-        var inputCost = prices.Input * (inputTokens / 1_000_000.0);
+        // Prices in the data are per 1M tokens.
+        // When no cached input price is configured, fall back to the
+        // regular input price so all tokens are billed correctly.
+        var effectiveCachedPrice = prices.CachedInput > 0 ? prices.CachedInput : prices.Input;
+        var regularInputTokens = inputTokens - cachedInputTokens;
+        var inputCost = (prices.Input * (regularInputTokens / 1_000_000.0))
+            + (effectiveCachedPrice * (cachedInputTokens / 1_000_000.0));
         var outputCost = prices.Output * (outputTokens / 1_000_000.0);
 
         return (inputCost, outputCost);

DevProxy.Abstractions/Utils/ProxyUtils.cs

@@ -10,6 +10,7 @@
 using System.Collections.ObjectModel;
 using System.Reflection;
 using System.Text.Encodings.Web;
+using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
@@ -42,6 +43,23 @@ public static class ProxyUtils
 
     // doesn't end with a path separator
     public static string? AppFolder => Path.GetDirectoryName(AppContext.BaseDirectory);
+
+    /// <summary>
+    /// Gets the path to the user data folder for Dev Proxy.
+    /// On macOS: ~/Library/Application Support/dev-proxy/
+    /// On Linux: ~/.config/dev-proxy/ (or $XDG_CONFIG_HOME/dev-proxy/)
+    /// On Windows: %LocalAppData%\dev-proxy\
+    /// </summary>
+    public static string DataFolder
+    {
+        get
+        {
+            var basePath = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                ? Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
+                : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+            return Path.Combine(basePath, "dev-proxy");
+        }
+    }
     public static JsonSerializerOptions JsonSerializerOptions { get; } = new()
     {
         DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
@@ -175,6 +193,7 @@ public static string ReplacePathTokens(string? path)
             return path ?? string.Empty;
         }
 
+        path = path.Replace("~dataFolder", DataFolder, StringComparison.OrdinalIgnoreCase);
         return path.Replace("~appFolder", AppFolder, StringComparison.OrdinalIgnoreCase);
     }
 

DevProxy.Plugins/Inspection/LanguageModelPricingLoader.cs

@@ -40,11 +40,18 @@ protected override void LoadData(string fileContents)
                     if (modelProperty.Value.TryGetProperty("input", out var inputElement) &&
                         modelProperty.Value.TryGetProperty("output", out var outputElement))
                     {
-                        pricesData[modelName] = new()
+                        var modelPrices = new ModelPrices
                         {
                             Input = inputElement.GetDouble(),
                             Output = outputElement.GetDouble()
                         };
+
+                        if (modelProperty.Value.TryGetProperty("cached_input", out var cachedInputElement))
+                        {
+                            modelPrices.CachedInput = cachedInputElement.GetDouble();
+                        }
+
+                        pricesData[modelName] = modelPrices;
                     }
                 }
 

DevProxy.Plugins/Inspection/OpenAITelemetryPlugin.cs

@@ -931,7 +931,8 @@ private void RecordUsageMetrics(Activity activity, OpenAIRequest request, OpenAI
             return;
         }
 
-        var (inputCost, outputCost) = Configuration.Prices.CalculateCost(response.Model, usage.PromptTokens, usage.CompletionTokens);
+        var cachedTokens = usage.PromptTokensDetails?.CachedTokens ?? 0L;
+        var (inputCost, outputCost) = Configuration.Prices.CalculateCost(response.Model, usage.PromptTokens, usage.CompletionTokens, cachedTokens);
 
         if (inputCost > 0)
         {
@@ -1042,7 +1043,8 @@ private List<OpenAITelemetryPluginReportModelUsageInformation> GetReportModelUsa
             return usagePerModel;
         }
 
-        var (inputCost, outputCost) = Configuration.Prices.CalculateCost(response.Model, usage.PromptTokens, usage.CompletionTokens);
+        var cachedTokens = usage.PromptTokensDetails?.CachedTokens ?? 0L;
+        var (inputCost, outputCost) = Configuration.Prices.CalculateCost(response.Model, usage.PromptTokens, usage.CompletionTokens, cachedTokens);
 
         if (inputCost > 0)
         {

DevProxy/Commands/ConfigCommand.cs

@@ -106,7 +106,7 @@ internal static async Task<int> RunValidateStandaloneAsync(string[] args)
 
         using var loggerFactory = LoggerFactory.Create(builder =>
         {
-            builder
+            _ = builder
                 .SetMinimumLevel(LogLevel.Information)
                 .AddConsole(consoleOptions =>
                 {
@@ -215,17 +215,9 @@ private async Task DownloadConfigAsync(string configId, OutputFormat outputForma
     {
         try
         {
-            var appFolder = ProxyUtils.AppFolder;
-            if (string.IsNullOrEmpty(appFolder) || !Directory.Exists(appFolder))
-            {
-                if (outputFormat == OutputFormat.Text)
-                {
-                    _logger.LogError("App folder {AppFolder} not found", appFolder);
-                }
-                return;
-            }
+            var dataFolder = ProxyUtils.DataFolder;
 
-            var configFolderPath = Path.Combine(appFolder, "config");
+            var configFolderPath = Path.Combine(dataFolder, "configs");
             _logger.LogDebug("Checking if config folder {ConfigFolderPath} exists...", configFolderPath);
             if (!Directory.Exists(configFolderPath))
             {
@@ -235,7 +227,7 @@ private async Task DownloadConfigAsync(string configId, OutputFormat outputForma
             }
 
             _logger.LogDebug("Getting target folder path for config {ConfigId}...", configId);
-            var targetFolderPath = GetTargetFolderPath(appFolder, configId);
+            var targetFolderPath = GetTargetFolderPath(dataFolder, configId);
             _logger.LogDebug("Creating target folder {TargetFolderPath}...", targetFolderPath);
             _ = Directory.CreateDirectory(targetFolderPath);
 
@@ -287,7 +279,7 @@ private async Task DownloadConfigAsync(string configId, OutputFormat outputForma
                 {
                     if (_logger.IsEnabled(LogLevel.Information))
                     {
-                        _logger.LogInformation("  devproxy --config-file \"{ConfigFile}\"", configFile.Replace(appFolder, "~appFolder", StringComparison.OrdinalIgnoreCase));
+                        _logger.LogInformation("  devproxy --config-file \"{ConfigFile}\"", configFile.Replace(dataFolder, "~dataFolder", StringComparison.OrdinalIgnoreCase));
                     }
                 }
             }
@@ -298,7 +290,7 @@ private async Task DownloadConfigAsync(string configId, OutputFormat outputForma
                 {
                     if (_logger.IsEnabled(LogLevel.Information))
                     {
-                        _logger.LogInformation("  devproxy --mock-file \"{MockFile}\"", mockFile.Replace(appFolder, "~appFolder", StringComparison.OrdinalIgnoreCase));
+                        _logger.LogInformation("  devproxy --mock-file \"{MockFile}\"", mockFile.Replace(dataFolder, "~dataFolder", StringComparison.OrdinalIgnoreCase));
                     }
                 }
             }
@@ -332,13 +324,13 @@ private ProxyConfigInfo GetConfigInfo(string configFolder)
         var configInfo = new ProxyConfigInfo();
 
         _logger.LogDebug("Getting list of config files in {ConfigFolder}...", configFolder);
-        
+
         // Get both JSON and YAML files
         var jsonFiles = Directory.GetFiles(configFolder, "*.json");
         var yamlFiles = Directory.GetFiles(configFolder, "*.yaml");
         var ymlFiles = Directory.GetFiles(configFolder, "*.yml");
         var allConfigFiles = jsonFiles.Concat(yamlFiles).Concat(ymlFiles).ToArray();
-        
+
         if (allConfigFiles.Length == 0)
         {
             _logger.LogDebug("No config files found");
@@ -350,7 +342,7 @@ private ProxyConfigInfo GetConfigInfo(string configFolder)
             _logger.LogDebug("Reading file {ConfigFile}...", configFile);
 
             var fileContents = File.ReadAllText(configFile);
-            
+
             // Check for plugins marker (case-insensitive)
             // For JSON: "plugins":
             // For YAML: plugins:
@@ -561,9 +553,9 @@ private string GetTargetFileName(string name)
         }
     }
 
-    private static string GetTargetFolderPath(string appFolder, string configId)
+    private static string GetTargetFolderPath(string dataFolder, string configId)
     {
-        var baseFolder = Path.Combine(appFolder, "config", configId);
+        var baseFolder = Path.Combine(dataFolder, "configs", configId);
         var newFolder = baseFolder;
         var i = 1;
         while (Directory.Exists(newFolder))
@@ -701,7 +693,7 @@ private static async Task<int> ValidateConfigCoreAsync(
             if (configDoc.RootElement.TryGetProperty("plugins", out var pluginsElement) &&
                 pluginsElement.ValueKind == JsonValueKind.Array)
             {
-                ValidatePlugins(pluginsElement, configFileDirectory, errors, warnings, pluginNames);
+                ValidatePlugins(pluginsElement, configFileDirectory, errors, pluginNames);
             }
             else
             {
@@ -737,7 +729,6 @@ private static void ValidatePlugins(
         JsonElement pluginsElement,
         string configFileDirectory,
         List<ValidationMessage> errors,
-        List<ValidationMessage> warnings,
         List<string> pluginNames)
     {
         var hasEnabledPlugins = false;

DevProxy/Commands/DevProxyCommand.cs

@@ -33,7 +33,7 @@ sealed class DevProxyCommand : RootCommand
     internal static readonly Option<string?> ConfigFileOption = new(ConfigFileOptionName, "-c")
     {
         HelpName = "config-file",
-        Description = "Path to config file. If not specified, Dev Proxy searches for devproxyrc.jsonc or devproxyrc.json in the current directory, then in a .devproxy/ directory, then under the ~appFolder location. Supports ~appFolder token."
+        Description = "Path to config file. If not specified, Dev Proxy searches for devproxyrc.jsonc or devproxyrc.json in the current directory, then in a .devproxy/ directory, then under the ~appFolder location. Supports ~appFolder and ~dataFolder tokens."
     };
     internal const string NoFirstRunOptionName = "--no-first-run";
     internal const string NoWatchOptionName = "--no-watch";