feat: Improved pricing constants.

tryAGI · Apr 3, 2024 · 777256e · 777256e
1 parent 7ec88ba
commit 777256e
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 31 deletions.
diff --git a/src/libs/Directory.Build.props b/src/libs/Directory.Build.props
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <PropertyGroup Label="Nuget">
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>tryAGI and contributors</Authors>

diff --git a/src/libs/OpenAI.Constants/Chat/ChatModels.3.5.Turbo.Legacy.cs b/src/libs/OpenAI.Constants/Chat/ChatModels.3.5.Turbo.Legacy.cs
@@ -41,24 +41,24 @@ namespace OpenAI.Constants;
     public static ChatModels Gpt35Turbo_0613 { get; } = new(
         Id: Gpt35Turbo_0613Id,
         ContextLength: 4_096,
-        PricePerInputTokenInUsd: 0.0015 * 0.001,
-        PricePerOutputTokenInUsd: 0.0020 * 0.001);
+        PricePerInputTokenInUsd: 1.5 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 2.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt35Turbo_0301Id"/>
     [Obsolete("Marked as Legacy. Will be deprecated on June 13, 2024.")]
     public static ChatModels Gpt35Turbo_0301 { get; } = new(
         Id: Gpt35Turbo_0301Id,
         ContextLength: 4_096,
-        PricePerInputTokenInUsd: 0.0020 * 0.001,
-        PricePerOutputTokenInUsd: 0.0020 * 0.001);
+        PricePerInputTokenInUsd: 2.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 2.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt35Turbo_16k_0613Id"/>
     [Obsolete("Marked as Legacy. Will be deprecated on June 13, 2024.")]
     public static ChatModels Gpt35Turbo_16k_0613 { get; } = new(
         Id: Gpt35Turbo_16k_0613Id,
         ContextLength: 16_385,
-        PricePerInputTokenInUsd: 0.0030 * 0.001,
-        PricePerOutputTokenInUsd: 0.0040 * 0.001);
+        PricePerInputTokenInUsd: 3.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 4.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt35Turbo_16kId"/>
     [Obsolete("Marked as Legacy. Will be deprecated on June 13, 2024.")]

diff --git a/src/libs/OpenAI.Constants/Chat/ChatModels.3.5.Turbo.cs b/src/libs/OpenAI.Constants/Chat/ChatModels.3.5.Turbo.cs
@@ -39,29 +39,29 @@ namespace OpenAI.Constants;
     public static ChatModels Gpt35Turbo_1106 { get; } = new(
         Id: Gpt35Turbo_1106Id,
         ContextLength: 16_385,
-        PricePerInputTokenInUsd: 0.0010 * 0.001,
-        PricePerOutputTokenInUsd: 0.0020 * 0.001);
+        PricePerInputTokenInUsd: 1.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 2.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt35Turbo_0125Id"/>
     public static ChatModels Gpt35Turbo_0125 { get; } = new(
         Id: Gpt35Turbo_0125Id,
         ContextLength: 16_385,
-        PricePerInputTokenInUsd: 0.0005 * 0.001,
-        PricePerOutputTokenInUsd: 0.0015 * 0.001);
+        PricePerInputTokenInUsd: 0.5 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 1.5 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt35TurboInstructId"/>
     public static ChatModels Gpt35TurboInstruct { get; } = new(
         Id: Gpt35TurboInstructId,
         ContextLength: 4_096,
-        PricePerInputTokenInUsd: 0.0015 * 0.001,
-        PricePerOutputTokenInUsd: 0.0020 * 0.001);
+        PricePerInputTokenInUsd: 1.5 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 2.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt35TurboId"/>
     public static ChatModels Gpt35Turbo { get; } = Gpt35Turbo_0125 with
     {
         Id = Gpt35TurboId,
-        FineTuningPricePerTrainingTokenInUsd = 0.0080 * 0.001,
-        FineTuningPricePerInputTokenInUsd = 0.0030 * 0.001,
-        FineTuningPricePerOutputTokenInUsd = 0.0060 * 0.001,
+        FineTuningPricePerTrainingTokenInUsd = 8.0 * UsdPerMillionTokens,
+        FineTuningPricePerInputTokenInUsd = 3.0 * UsdPerMillionTokens,
+        FineTuningPricePerOutputTokenInUsd = 6.0 * UsdPerMillionTokens,
     };
 }
diff --git a/src/libs/OpenAI.Constants/Chat/ChatModels.4.32k.cs b/src/libs/OpenAI.Constants/Chat/ChatModels.4.32k.cs
@@ -21,8 +21,8 @@ namespace OpenAI.Constants;
     public static ChatModels Gpt4_32k_0613 { get; } = new(
         Id: Gpt4_32k_0613Id,
         ContextLength: 32_768,
-        PricePerInputTokenInUsd: 0.0600 * 0.001,
-        PricePerOutputTokenInUsd: 0.1200 * 0.001);
+        PricePerInputTokenInUsd: 60.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 120.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt4_32kId"/>
     public static ChatModels Gpt4_32k { get; } = Gpt4_32k_0613 with

diff --git a/src/libs/OpenAI.Constants/Chat/ChatModels.4.Turbo.cs b/src/libs/OpenAI.Constants/Chat/ChatModels.4.Turbo.cs
@@ -34,15 +34,15 @@ namespace OpenAI.Constants;
     public static ChatModels Gpt4_1106_Preview { get; } = new(
         Id: Gpt4_1106_PreviewId,
         ContextLength: 128_000,
-        PricePerInputTokenInUsd: 0.0100 * 0.001,
-        PricePerOutputTokenInUsd: 0.0300 * 0.001);
+        PricePerInputTokenInUsd: 10.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 30.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt4_0125_PreviewId"/>
     public static ChatModels Gpt4_0125_Preview { get; } = new(
         Id: Gpt4_0125_PreviewId,
         ContextLength: 128_000,
-        PricePerInputTokenInUsd: 0.0100 * 0.001,
-        PricePerOutputTokenInUsd: 0.0300 * 0.001);
+        PricePerInputTokenInUsd: 10.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 30.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt4TurboPreviewId"/>
     public static ChatModels Gpt4TurboPreview { get; } = Gpt4_0125_Preview with

diff --git a/src/libs/OpenAI.Constants/Chat/ChatModels.4.Vision.cs b/src/libs/OpenAI.Constants/Chat/ChatModels.4.Vision.cs
@@ -23,8 +23,8 @@ namespace OpenAI.Constants;
     public static ChatModels Gpt4_1106_VisionPreview { get; } = new(
         Gpt4_1106_VisionPreviewId,
         ContextLength: 128_000,
-        PricePerInputTokenInUsd: 0.0100 * 0.001,
-        PricePerOutputTokenInUsd: 0.0300 * 0.001);
+        PricePerInputTokenInUsd: 10.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 30.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt4VisionPreviewId"/>
     public static ChatModels Gpt4VisionPreview { get; } = Gpt4_1106_VisionPreview with

diff --git a/src/libs/OpenAI.Constants/Chat/ChatModels.4.cs b/src/libs/OpenAI.Constants/Chat/ChatModels.4.cs
@@ -21,8 +21,8 @@ namespace OpenAI.Constants;
     public static ChatModels Gpt4_0613 { get; } = new(
         Id: Gpt4_0613Id,
         ContextLength: 8_192,
-        PricePerInputTokenInUsd: 0.0300 * 0.001,
-        PricePerOutputTokenInUsd: 0.0600 * 0.001);
+        PricePerInputTokenInUsd: 30.0 * UsdPerMillionTokens,
+        PricePerOutputTokenInUsd: 60.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Gpt4Id"/>
     public static ChatModels Gpt4 { get; } = Gpt4_0613 with

diff --git a/src/libs/OpenAI.Constants/Embedding/EmbeddingModels.V2.cs b/src/libs/OpenAI.Constants/Embedding/EmbeddingModels.V2.cs
@@ -19,5 +19,5 @@ namespace OpenAI.Constants;
     public static EmbeddingModels Ada002 { get; } = new(
         Id: Ada002Id,
         MaxInputTokens: 8_191,
-        PricePerTokenInUsd: 0.00010 * 0.001);
+        PricePerTokenInUsd: 0.10 * UsdPerMillionTokens);
 }
diff --git a/src/libs/OpenAI.Constants/Embedding/EmbeddingModels.V3.cs b/src/libs/OpenAI.Constants/Embedding/EmbeddingModels.V3.cs
@@ -35,11 +35,11 @@ namespace OpenAI.Constants;
     public static EmbeddingModels Version3Small { get; } = new(
         Id: Version3SmallId,
         MaxInputTokens: 8_191,
-        PricePerTokenInUsd: 0.00002 * 0.001);
+        PricePerTokenInUsd: 0.02 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Version3LargeId"/>
     public static EmbeddingModels Version3Large { get; } = new(
         Id: Version3LargeId,
         MaxInputTokens: 8_191,
-        PricePerTokenInUsd: 0.00013 * 0.001);
+        PricePerTokenInUsd: 0.13 * UsdPerMillionTokens);
 }
diff --git a/src/libs/OpenAI.Constants/Helpers/InternalConstants.cs b/src/libs/OpenAI.Constants/Helpers/InternalConstants.cs
@@ -0,0 +1,22 @@
+namespace OpenAI.Constants.Helpers;
+
+/// <summary>
+/// Internal constants used by the OpenAI SDK.
+/// </summary>
+public static class InternalConstants
+{
+    /// <summary>
+    /// Just a constant for 1e-3.
+    /// </summary>
+    public const double UsdPerThousandTokens = 1e-3;
+
+    /// <summary>
+    /// Just a constant for 1e-6.
+    /// </summary>
+    public const double UsdPerMillionTokens = 1e-6;
+
+    /// <summary>
+    /// Just a constant for 1e-9.
+    /// </summary>
+    public const double UsdPerBillionTokens = 1e-9;
+}
diff --git a/src/libs/OpenAI.Constants/OpenAI.Constants.csproj b/src/libs/OpenAI.Constants/OpenAI.Constants.csproj
@@ -19,6 +19,10 @@
     </Description>
     <PackageTags>openai;constants;prices;pricing;gpt-3.5;gpt-4;chatgpt;vision;audio;embedding;moderation;image;chat</PackageTags>
   </PropertyGroup>
+
+  <ItemGroup Label="Usings">
+    <Using Include="OpenAI.Constants.Helpers.InternalConstants" Static="true" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="PolySharp" Version="1.13.2">

diff --git a/src/libs/OpenAI.Constants/TextToSpeech/TextToSpeechModels.Values.cs b/src/libs/OpenAI.Constants/TextToSpeech/TextToSpeechModels.Values.cs
@@ -18,10 +18,10 @@ namespace OpenAI.Constants;
     /// <inheritdoc cref="Tts1Id"/>
     public static TextToSpeechModels Tts1 { get; } = new(
         Id: Tts1Id,
-        PricePerCharacterInUsd: 0.015 * 0.001);
+        PricePerCharacterInUsd: 15.0 * UsdPerMillionTokens);
 
     /// <inheritdoc cref="Tts1HdId"/>
     public static TextToSpeechModels Tts1Hd { get; } = new(
         Id: Tts1HdId,
-        PricePerCharacterInUsd: 0.030 * 0.001);
+        PricePerCharacterInUsd: 30.0 * UsdPerMillionTokens);
 }