update assistant api

Geeksltd · Feb 26, 2024 · f1b8a56 · f1b8a56
1 parent 75c75f5
commit f1b8a56
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/Olive.Gpt/AssistantApi.cs b/Olive.Gpt/AssistantApi.cs
@@ -3,21 +3,24 @@
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Olive.Gpt.ApiDto;
 using Olive.Gpt.AssistantDto;
 
 namespace Olive.Gpt
 {
     public class AssistantApi
     {
-        readonly JsonSerializerSettings _settings = new() { NullValueHandling = NullValueHandling.Ignore };
+        readonly JsonSerializerSettings _settings = new() { NullValueHandling = NullValueHandling.Ignore};
         readonly HttpClient _client = new(CreateForgivingHandler()) { Timeout = 60.Seconds() };
 
         public AssistantApi(string apiKey)
         {
             _client.DefaultRequestHeaders.Authorization = new("Bearer", apiKey);
             _client.DefaultRequestHeaders.Add("User-Agent", "olive/dotnet_openai_api");
             _client.DefaultRequestHeaders.Add("OpenAI-Beta", "assistants=v1");
+
+            _settings.Converters.Add(new StringEnumConverter());
         }
 
         static HttpClientHandler CreateForgivingHandler() => new()
@@ -28,7 +31,8 @@ public AssistantApi(string apiKey)
 
         public async Task<string> CreateNewAssistant(OpenAiCreateAssistantDto assistantDto)
         {
-            var payload = new StringContent(JsonConvert.SerializeObject(assistantDto), Encoding.UTF8, "application/json");
+            var data = JsonConvert.SerializeObject(assistantDto, _settings);
+            var payload = new StringContent(data, Encoding.UTF8, "application/json");
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Post, "https://api.openai.com/v1/assistants") { Content = payload };
             var response = await _client.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead);
@@ -46,7 +50,8 @@ public async Task<string> CreateNewAssistant(OpenAiCreateAssistantDto assistantD
 
         public async Task<string> EditAssistant(string assistantId,OpenAiCreateAssistantDto assistantDto)
         {
-            var payload = new StringContent(JsonConvert.SerializeObject(assistantDto), Encoding.UTF8, "application/json");
+            var data = JsonConvert.SerializeObject(assistantDto, _settings);
+            var payload = new StringContent(data, Encoding.UTF8, "application/json");
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Post, $"https://api.openai.com/v1/assistants/{assistantId}") { Content = payload };
             var response = await _client.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead);

diff --git a/Olive.Gpt/AssistantDto/OpenAiAssistantTools.cs b/Olive.Gpt/AssistantDto/OpenAiAssistantTools.cs
@@ -6,6 +6,8 @@ public enum OpenAiAssistantTools
 {
     [EnumMember(Value = "code_interpreter")]
     CodeInterpreter,
+    [EnumMember(Value = "retrieval")]
     Retrieval, 
+    [EnumMember(Value = "function")]
     Function
 }
diff --git a/Olive.Gpt/AssistantDto/OpenAiCreateAssistantDto.cs b/Olive.Gpt/AssistantDto/OpenAiCreateAssistantDto.cs
@@ -5,10 +5,22 @@ namespace Olive.Gpt.AssistantDto;
 
 public class OpenAiCreateAssistantDto
 {
+    [JsonProperty("model")]
     public string Model { get; set; }
+    [JsonProperty("name")]
     public string Name { get; set; }
+    [JsonProperty("description")]
     public string Description { get; set; }
+    [JsonProperty("instructions")]
     public string Instructions { get; set; }
-    public OpenAiAssistantTools[] Tools{ get; set; }
+    [JsonProperty("tools")]
+    public OpenAiAssistantToolsDto[] Tools{ get; set; }
+    [JsonProperty("metadata")]
     public Dictionary<string,string> Metadata { get; set; }
-}
+}
+
+public class OpenAiAssistantToolsDto
+{
+    [JsonProperty("type")]
+    public OpenAiAssistantTools Type{ get; set; }
+}
diff --git a/Olive.Gpt/Olive.Gpt.csproj b/Olive.Gpt/Olive.Gpt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.126</Version>
+    <Version>1.0.127</Version>
   </PropertyGroup>
 
   <ItemGroup>