feat: Updated.

tryAGI · May 22, 2024 · afebfce · afebfce
1 parent cf12bad
commit afebfce
Show file tree

Hide file tree

Showing 13 changed files with 1,101 additions and 248 deletions.
diff --git a/Replicate.sln b/Replicate.sln
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Replicate", "src\libs\Repli
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Replicate.IntegrationTests", "src\tests\Replicate.IntegrationTests\Replicate.IntegrationTests.csproj", "{592ADBC9-C951-4AF7-A163-B6C63B970B19}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Replicate.Models", "src\libs\Replicate.Models\Replicate.Models.csproj", "{B5C719C1-9F51-4874-9FBF-2D62CCCDBD1B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,13 +42,18 @@ Global
 		{592ADBC9-C951-4AF7-A163-B6C63B970B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{592ADBC9-C951-4AF7-A163-B6C63B970B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{592ADBC9-C951-4AF7-A163-B6C63B970B19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5C719C1-9F51-4874-9FBF-2D62CCCDBD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5C719C1-9F51-4874-9FBF-2D62CCCDBD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5C719C1-9F51-4874-9FBF-2D62CCCDBD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5C719C1-9F51-4874-9FBF-2D62CCCDBD1B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0028BC85-0064-4CE8-A21A-C1F5E922BD59} = {61E7E11E-4558-434C-ACE8-06316A3097B3}
 		{592ADBC9-C951-4AF7-A163-B6C63B970B19} = {AAA11B78-2764-4520-A97E-46AA7089A588}
+		{B5C719C1-9F51-4874-9FBF-2D62CCCDBD1B} = {61E7E11E-4558-434C-ACE8-06316A3097B3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CED9A020-DBA5-4BE6-8096-75E528648EC1}

diff --git a/docs/openapi.json b/docs/openapi.json
diff --git a/src/libs/Directory.Build.props b/src/libs/Directory.Build.props
@@ -46,4 +46,12 @@
     <AnalysisMode>All</AnalysisMode>
   </PropertyGroup>
 
+<!--  <PropertyGroup Label="Trimmable" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">-->
+<!--    <IsAotCompatible>true</IsAotCompatible>-->
+<!--    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>-->
+<!--    <IsTrimmable>true</IsTrimmable>-->
+<!--    <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>-->
+<!--    <TrimmerSingleWarn>false</TrimmerSingleWarn>-->
+<!--  </PropertyGroup>-->
+
 </Project>
diff --git a/src/libs/Replicate.Models/Replicate.Models.csproj b/src/libs/Replicate.Models/Replicate.Models.csproj
@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net4.6.2;net6.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Using Include="System.Text.Json" />
+  </ItemGroup>
+
+  <PropertyGroup Label="Nuget">
+    <PackageId>tryAGI.Replicate.Models</PackageId>
+    <Description>Generated C# SDK based on Replicate OpenAPI specification.</Description>
+    <PackageTags>api;client;sdk;dotnet;swagger;openapi;specification;replicate;generated;nswag</PackageTags>
+  </PropertyGroup>
+
+  <PropertyGroup Label="OpenApiGenerator">
+    <OpenApiGenerator_Namespace>Replicate</OpenApiGenerator_Namespace>
+    <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
+    <OpenApiGenerator_GenerateModels>true</OpenApiGenerator_GenerateModels>
+    <OpenApiGenerator_GenerateSuperTypeForJsonSerializerContext>true</OpenApiGenerator_GenerateSuperTypeForJsonSerializerContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)../../../docs/openapi.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="OpenApiGenerator" Version="0.7.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="PolySharp" Version="1.14.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net4.6.2'">
+    <Reference Include="System.Net.Http" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/libs/Replicate/Extensions/StringExtensions.cs b/src/libs/Replicate/Extensions/StringExtensions.cs
diff --git a/src/libs/Replicate/Helpers/ApiHelpers.cs b/src/libs/Replicate/Helpers/ApiHelpers.cs
diff --git a/src/libs/Replicate/RecommendedModelIds.cs b/src/libs/Replicate/RecommendedModelIds.cs
diff --git a/src/libs/Replicate/Replicate.csproj b/src/libs/Replicate/Replicate.csproj
@@ -1,25 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net4.6.2;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net4.6.2;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <Using Include="System.Text.Json" />
+    <Using Include="System.Net.Http" />
   </ItemGroup>
 
   <PropertyGroup Label="Nuget">
     <PackageId>tryAGI.Replicate</PackageId>
     <Description>Generated C# SDK based on Replicate OpenAPI specification.</Description>
     <PackageTags>api;client;sdk;dotnet;swagger;openapi;specification;replicate;generated;nswag</PackageTags>
   </PropertyGroup>
-
+
+  <PropertyGroup Label="OpenApiGenerator">
+    <OpenApiGenerator_Namespace>Replicate</OpenApiGenerator_Namespace>
+    <OpenApiGenerator_ClassName>ReplicateApi</OpenApiGenerator_ClassName>
+    <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
+    <OpenApiGenerator_GenerateMethods>true</OpenApiGenerator_GenerateMethods>
+    <OpenApiGenerator_GenerateConstructors>true</OpenApiGenerator_GenerateConstructors>
+    <OpenApiGenerator_MethodNamingConvention>OperationIdWithDots</OpenApiGenerator_MethodNamingConvention>
+<!--    <OpenApiGenerator_JsonSerializerContext>Replicate.SourceGenerationContext</OpenApiGenerator_JsonSerializerContext>-->
+  </PropertyGroup>
+
   <ItemGroup>
-    <AdditionalFiles Include="$(SolutionDir)docs\openapi.nswag" />
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)../../../docs/openapi.json" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="H.NSwag.Generator" Version="14.0.7.76">
+    <PackageReference Include="OpenApiGenerator" Version="0.7.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -32,13 +43,19 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net4.6.2'">
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Replicate.Models\Replicate.Models.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/libs/Replicate/ReplicateApi.Authorization.cs b/src/libs/Replicate/ReplicateApi.Authorization.cs
diff --git a/src/libs/Replicate/ReplicateApi.Constructors.cs b/src/libs/Replicate/ReplicateApi.Constructors.cs
diff --git a/src/libs/Replicate/SourceGenerationContext.cs b/src/libs/Replicate/SourceGenerationContext.cs
@@ -0,0 +1,7 @@
+using System.Text.Json.Serialization;
+
+namespace Replicate;
+
+[JsonSourceGenerationOptions(DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(OpenApiGeneratorTrimmableSupport))]
+internal sealed partial class SourceGenerationContext : JsonSerializerContext;
diff --git a/src/tests/Replicate.IntegrationTests/Replicate.IntegrationTests.csproj b/src/tests/Replicate.IntegrationTests/Replicate.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="Base packages">

diff --git a/src/tests/Replicate.IntegrationTests/Tests.cs b/src/tests/Replicate.IntegrationTests/Tests.cs
@@ -1,6 +1,4 @@
-using Replicate;
-
-namespace tryAGI.OpenAI.IntegrationTests;
+namespace Replicate.IntegrationTests;
 
 [TestClass]
 public class GeneralTests
@@ -12,12 +10,15 @@ public async Task Generate()
             Environment.GetEnvironmentVariable("REPLICATE_API_KEY") ??
             throw new AssertInconclusiveException("REPLICATE_API_KEY environment variable is not found.");
 
-        using var client = new HttpClient();
-        var api = new ReplicateApi(apiKey, client);
-        await api.Predictions_createAsync(new Body2
-        {
-            Input = "",
-            Stream = false
-        });
+        using var api = new ReplicateApi();
+        api.AuthorizeUsingBearer(apiKey);
+
+        await api.CreatePredictionsAsync(
+            input: new
+            {
+                prompt = "I forgot how to kill a process in Linux, can you help?",
+                assistant = "Sure! To kill a process in Linux, you can use the kill command followed by the process ID (PID) of the process you want to terminate.",
+            },
+            version: "b063023ee937f28e922982abdbf97b041ffe34ad3b35a53d33e1d74bb19b36c4");
     }
 }