Merge pull request #546 from betalgo/feature/Assistant-api-part-2

Feature/assistant api part 2
betalgo · May 1, 2024 · 9ef1395 · 9ef1395
2 parents b6a66c9 + 693f0f5
commit 9ef1395
Show file tree

Hide file tree

Showing 36 changed files with 1,206 additions and 42 deletions.
diff --git a/OpenAI.Playground/Program.cs b/OpenAI.Playground/Program.cs
@@ -65,7 +65,7 @@
 // Tools
 //await ChatCompletionTestHelper.RunChatFunctionCallTest(sdk);
 //await ChatCompletionTestHelper.RunChatFunctionCallTestAsStream(sdk);
-await BatchTestHelper.RunBatchOperationsTest(sdk);
+//await BatchTestHelper.RunBatchOperationsTest(sdk);
 
 // Whisper
 //await AudioTestHelper.RunSimpleAudioCreateTranscriptionTest(sdk);

diff --git a/OpenAI.SDK/EndpointProviders/AzureOpenAiEndpointProvider.cs b/OpenAI.SDK/EndpointProviders/AzureOpenAiEndpointProvider.cs
@@ -292,23 +292,6 @@ public string MessageList(string threadId, MessageListRequest? messageListReques
         return url;
     }
 
-    public string MessageFileRetrieve(string threadId, string messageId, string fileId)
-    {
-        return $"{Prefix}/threads/{threadId}/messages/{messageId}/files/{fileId}{AzureVersionQueryString}";
-    }
-
-    public string MessageFileList(string threadId, string messageId, MessageFileListRequest? messageFileListRequest)
-    {
-        var url = $"{Prefix}/threads/{threadId}/messages/{messageId}/files{AzureVersionQueryString}";
-
-        var query = messageFileListRequest?.GetQueryParameters();
-        if (!string.IsNullOrWhiteSpace(query))
-        {
-            url = $"{url}{query}";
-        }
-
-        return url;
-    }
 
     public string RunCreate(string threadId)
     {
@@ -371,6 +354,96 @@ public string RunStepList(string threadId, string runId, RunStepListRequest? run
         return url;
     }
 
+
+    public string VectorStoreCreate()
+    {
+        return $"{Prefix}/vector_stores{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreList(BaseListRequest baseListRequest)
+    {
+        var url = $"{Prefix}/vector_stores{AzureVersionQueryString}";
+
+        var query = baseListRequest?.GetQueryParameters();
+        if (!string.IsNullOrWhiteSpace(query))
+        {
+            url = $"{url}?{query}";
+        }
+
+        return url;
+    }
+
+    public string VectorStoreRetrieve(string vectorStoreId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreModify(string vectorStoreId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreDelete(string vectorStoreId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreFileCreate(string vectorStoreId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}/files{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreFileRetrieve(string vectorStoreId, string fileId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}/files/{fileId}{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreFileDelete(string vectorStoreId, string fileId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}/files/{fileId}{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreFileList(string vectorStoreId, BaseListRequest? baseListRequest)
+    {
+        var url = $"{Prefix}/vector_stores/{vectorStoreId}/files{AzureVersionQueryString}";
+
+        var query = baseListRequest?.GetQueryParameters();
+        if (!string.IsNullOrWhiteSpace(query))
+        {
+            url = $"{url}?{query}";
+        }
+
+        return url;
+    }
+
+    public string VectorStoreFileBatchCreate(string vectorStoreId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}/files/batches{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreFileBatchRetrieve(string vectorStoreId, string batchId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}/files/batches/{batchId}{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreFileBatchCancel(string vectorStoreId, string batchId)
+    {
+        return $"{Prefix}/vector_stores/{vectorStoreId}/files/batches/{batchId}/cancel{AzureVersionQueryString}";
+    }
+
+    public string VectorStoreFileBatchList(string vectorStoreId, string batchId, BaseListRequest? baseListRequest)
+    {
+        var url = $"{Prefix}/vector_stores/{vectorStoreId}/files/batches{AzureVersionQueryString}";
+
+        var query = baseListRequest?.GetQueryParameters();
+        if (!string.IsNullOrWhiteSpace(query))
+        {
+            url = $"{url}?{query}";
+        }
+
+        return url;
+    }
+
     public string FineTuningJobList()
     {
         return $"{Prefix}/fine_tuning/jobs{AzureVersionQueryString}";
@@ -395,4 +468,6 @@ private string Files()
     {
         return $"{Prefix}/files{AzureVersionQueryString}";
     }
+
+
 }
diff --git a/OpenAI.SDK/EndpointProviders/IOpenAiEndpointProvider.cs b/OpenAI.SDK/EndpointProviders/IOpenAiEndpointProvider.cs
@@ -55,8 +55,6 @@ internal interface IOpenAiEndpointProvider
     string MessageRetrieve(string threadId,string messageId);
     string MessageModify(string threadId, string messageId);
     string MessageList(string threadId, MessageListRequest? messageListRequest);
-    string MessageFileRetrieve(string threadId, string messageId, string fileId);
-    string MessageFileList(string threadId, string messageId, MessageFileListRequest? messageFileListRequest);
     string RunCreate(string threadId);
     string RunRetrieve(string threadId, string runId);
     string RunModify(string threadId, string runId);
@@ -66,4 +64,18 @@ internal interface IOpenAiEndpointProvider
     string ThreadAndRunCreate();
     string RunStepRetrieve(string threadId, string runId,string stepId);
     string RunStepList(string threadId, string runId, RunStepListRequest? runStepListRequest);
+    string VectorStoreCreate();
+    string VectorStoreList(BaseListRequest baseListRequest);
+    string VectorStoreRetrieve(string vectorStoreId);
+    string VectorStoreModify(string vectorStoreId);
+    string VectorStoreDelete(string vectorStoreId);
+    string VectorStoreFileCreate(string vectorStoreId);
+    string VectorStoreFileRetrieve(string vectorStoreId, string fileId);
+    string VectorStoreFileDelete(string vectorStoreId, string fileId);
+    string VectorStoreFileList(string vectorStoreId, BaseListRequest? baseListRequest);
+    string VectorStoreFileBatchCreate(string vectorStoreId);
+    string VectorStoreFileBatchRetrieve(string vectorStoreId, string batchId);
+    string VectorStoreFileBatchCancel(string vectorStoreId, string batchId);
+    string VectorStoreFileBatchList(string vectorStoreId, string batchId, BaseListRequest? baseListRequest);
+
 }
diff --git a/OpenAI.SDK/EndpointProviders/OpenAiEndpointProvider.cs b/OpenAI.SDK/EndpointProviders/OpenAiEndpointProvider.cs
@@ -1,4 +1,5 @@
 using System.Net;
+using System.Threading;
 using OpenAI.ObjectModels.RequestModels;
 
 namespace OpenAI.EndpointProviders;
@@ -298,25 +299,6 @@ public string MessageList(string threadId, MessageListRequest? messageListReques
 
         return url;
     }
-
-    public string MessageFileRetrieve(string threadId, string messageId, string fileId)
-    {
-        return $"{_apiVersion}/threads/{threadId}/messages/{messageId}/files/{fileId}";
-    }
-
-    public string MessageFileList(string threadId, string messageId, MessageFileListRequest? messageFileListRequest)
-    {
-        var url = $"{_apiVersion}/threads/{threadId}/messages/{messageId}/files";
-
-        var query = messageFileListRequest?.GetQueryParameters();
-        if (!string.IsNullOrWhiteSpace(query))
-        {
-            url = $"{url}?{query}";
-        }
-
-        return url;
-    }
-
     public string RunCreate(string threadId)
     {
         return $"{_apiVersion}/threads/{threadId}/runs";
@@ -377,4 +359,93 @@ public string RunStepList(string threadId, string runId, RunStepListRequest? run
 
         return url;
     }
+
+    public string VectorStoreCreate()
+    {
+        return $"{_apiVersion}/vector_stores";
+    }
+
+    public string VectorStoreList(BaseListRequest baseListRequest)
+    {
+        var url = $"{_apiVersion}/vector_stores";
+
+        var query = baseListRequest?.GetQueryParameters();
+        if (!string.IsNullOrWhiteSpace(query))
+        {
+            url = $"{url}?{query}";
+        }
+
+        return url;
+    }
+
+    public string VectorStoreRetrieve(string vectorStoreId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}";
+    }
+
+    public string VectorStoreModify(string vectorStoreId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}";
+    }
+
+    public string VectorStoreDelete(string vectorStoreId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}";
+    }
+
+    public string VectorStoreFileCreate(string vectorStoreId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}/files";
+    }
+
+    public string VectorStoreFileRetrieve(string vectorStoreId, string fileId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}/files/{fileId}";
+    }
+
+    public string VectorStoreFileDelete(string vectorStoreId, string fileId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}/files/{fileId}";
+    }
+
+    public string VectorStoreFileList(string vectorStoreId, BaseListRequest? baseListRequest)
+    {
+        var url = $"{_apiVersion}/vector_stores/{vectorStoreId}/files";
+
+        var query = baseListRequest?.GetQueryParameters();
+        if (!string.IsNullOrWhiteSpace(query))
+        {
+            url = $"{url}?{query}";
+        }
+
+        return url;
+    }
+
+    public string VectorStoreFileBatchCreate(string vectorStoreId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}/files/batches";
+    }
+
+    public string VectorStoreFileBatchRetrieve(string vectorStoreId, string batchId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}/files/batches/{batchId}";
+    }
+
+    public string VectorStoreFileBatchCancel(string vectorStoreId, string batchId)
+    {
+        return $"{_apiVersion}/vector_stores/{vectorStoreId}/files/batches/{batchId}/cancel";
+    }
+
+    public string VectorStoreFileBatchList(string vectorStoreId, string batchId,BaseListRequest? baseListRequest)
+    {
+        var url = $"{_apiVersion}/vector_stores/{vectorStoreId}/files/batches";
+
+        var query = baseListRequest?.GetQueryParameters();
+        if (!string.IsNullOrWhiteSpace(query))
+        {
+            url = $"{url}?{query}";
+        }
+
+        return url;
+    }
 }
diff --git a/OpenAI.SDK/Interfaces/IMessageService.cs b/OpenAI.SDK/Interfaces/IMessageService.cs
@@ -23,4 +23,13 @@ public interface IMessageService
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     Task<MessageListResponse> MessageList(string threadId, MessageListRequest? request = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Retrieve a message.
+    /// </summary>
+    Task<MessageResponse> GetMessage(string threadId, string messageId, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Modifies a message.
+    /// </summary>
+    Task<MessageResponse> ModifyMessage(string threadId, string messageId, ModifyMessageRequest requestBody, CancellationToken cancellationToken = default);
 }
diff --git a/OpenAI.SDK/Interfaces/IRunService.cs b/OpenAI.SDK/Interfaces/IRunService.cs
@@ -47,4 +47,24 @@ public interface IRunService
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     Task<RunResponse> RunSubmitToolOutputs(string threadId, string runId, SubmitToolOutputsToRunRequest request, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    ///     Modifies a run.
+    /// </summary>
+    /// <param name="threadId">The ID of the [thread](/docs/api-reference/threads) that was run.</param>
+    /// <param name="runId">The ID of the run to modify.</param>
+    /// <param name="request"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<RunResponse> RunModify(string threadId, string runId, RunModifyRequest request, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Create a thread and run it in one request.
+    /// </summary>
+    Task<RunResponse> CreateThreadAndRun(CreateThreadAndRunRequest requestBody, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Returns a list of runs belonging to a thread.
+    /// </summary>
+    Task<RunListResponse> ListRuns(string threadId, RunListRequest runListRequest, CancellationToken cancellationToken = default);
 }
diff --git a/OpenAI.SDK/Interfaces/IRunStepService.cs b/OpenAI.SDK/Interfaces/IRunStepService.cs
@@ -0,0 +1,27 @@
+using OpenAI.ObjectModels.RequestModels;
+using OpenAI.ObjectModels.ResponseModels;
+
+namespace OpenAI.Interfaces;
+
+public interface IRunStepService
+{
+    /// <summary>
+    ///     Returns a list of run steps belonging to a run.
+    /// </summary>
+    /// <param name="threadId">The ID of the thread the run and run steps belong to.</param>
+    /// <param name="runId">The ID of the run steps belong to.</param>
+    /// <param name="request">Paging</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns>A list of [run step](/docs/api-reference/runs/step-object) objects.</returns>
+    Task<RunStepListResponse> RunStepsList(string threadId, string runId, RunStepListRequest request, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    ///     Retrieves a run step.
+    /// </summary>
+    /// <param name="threadId">The ID of the thread to which the run and run step belongs.</param>
+    /// <param name="runId">The ID of the run to which the run step belongs.</param>
+    /// <param name="stepId">The ID of the run step to retrieve.</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns>The [run step](/docs/api-reference/runs/step-object) object matching the specified ID.</returns>
+    Task<RunStepResponse> RunStepRetrieve(string threadId, string runId, string stepId, CancellationToken cancellationToken = default);
+}
diff --git a/OpenAI.SDK/Interfaces/IThreadService.cs b/OpenAI.SDK/Interfaces/IThreadService.cs
@@ -28,4 +28,9 @@ public interface IThreadService
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     Task<DeletionStatusResponse> ThreadDelete(string threadId, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Modifies a thread.
+    /// </summary>
+    Task<ThreadResponse> ModifyThread(string threadId, ModifyThreadRequest requestBody, CancellationToken cancellationToken = default);
 }