Merge branch 'main' of https://github.com/openai/openai-dotnet into shreja/Issue_447_ResponseAnnotation

Author: ShivangiReja

api/OpenAI.net8.0.cs

@@ -15,16 +15,6 @@ union DotNetResponseReasoningEffortLevel {
   ReasoningEffort,
 }
 
-@access(Access.public)
-@usage(Usage.input | Usage.output)
-union DotNetResponseWebSearchContextSize {
-  // WebSearchPreviewTool.search_context_size,
-  low: "low",
-
-  medium: "medium",
-  high: "high",
-}
-
 // ResponseFormat
 
 @access(Access.public)

api/OpenAI.netstandard2.0.cs

@@ -6,20 +6,6 @@ using TypeSpec.Http;
 
 namespace OpenAI;
 
-@access(Access.public)
-@usage(Usage.input | Usage.output)
-@discriminator("type")
-model DotnetResponseWebSearchLocation {
-  ...Location;
-}
-
-@access(Access.public)
-@usage(Usage.input | Usage.output)
-model DotnetResponseWebSearchApproximateLocation
-  extends DotnetResponseWebSearchLocation {
-  ...ApproximateLocation;
-}
-
 @access(Access.public)
 @usage(Usage.input | Usage.output)
 model DotNetItemReferenceItemResource extends ItemResource {

specification/client/models/common.models.tsp

@@ -30,3 +30,10 @@ using Azure.ClientGenerator.Core;
 @@visibility(WebSearchToolCallItemResource.status, Lifecycle.Read);
 
 @@visibility(ResponsesMessageItemResource.status, Lifecycle.Read);
+
+@@clientName(FileSearchTool.max_num_results, "MaxResultCount");
+
+@@clientName(FunctionTool.name, "FunctionName");
+@@clientName(FunctionTool.description, "FunctionDescription");
+@@clientName(FunctionTool.parameters, "FunctionParameters");
+@@clientName(FunctionTool.strict, "StrictModeEnabled");

specification/client/models/responses.models.tsp

@@ -83,6 +83,13 @@ public AssistantClient(AuthenticationPolicy authenticationPolicy, OpenAIClientOp
         _threadSubClient = new(Pipeline, options);
     }
 
+    /// <summary>
+    /// Gets the endpoint URI for the service.
+    /// </summary>
+    [Experimental("OPENAI001")]
+    public Uri Endpoint => _endpoint;
+
+
     // CUSTOM:
     // - Used a custom pipeline.
     // - Demoted the endpoint parameter to be a property in the options class.
@@ -114,7 +121,7 @@ public virtual async Task<ClientResult<Assistant>> CreateAssistantAsync(string m
         options ??= new();
         options.Model = model;
 
-         ClientResult protocolResult = await CreateAssistantAsync(options?.ToBinaryContent(), cancellationToken.ToRequestOptions()).ConfigureAwait(false);
+        ClientResult protocolResult = await CreateAssistantAsync(options?.ToBinaryContent(), cancellationToken.ToRequestOptions()).ConfigureAwait(false);
         return ClientResult.FromValue((Assistant)protocolResult, protocolResult.GetRawResponse());
     }
 
@@ -130,7 +137,7 @@ public virtual ClientResult<Assistant> CreateAssistant(string model, AssistantCr
         options.Model = model;
 
         ClientResult protocolResult = CreateAssistant(options?.ToBinaryContent(), cancellationToken.ToRequestOptions());
-         return ClientResult.FromValue((Assistant)protocolResult, protocolResult.GetRawResponse());
+        return ClientResult.FromValue((Assistant)protocolResult, protocolResult.GetRawResponse());
     }
 
     /// <summary>
@@ -319,7 +326,7 @@ public virtual ClientResult<AssistantDeletionResult> DeleteAssistant(string assi
     public virtual async Task<ClientResult<AssistantThread>> CreateThreadAsync(ThreadCreationOptions options = null, CancellationToken cancellationToken = default)
     {
         ClientResult protocolResult = await CreateThreadAsync(options?.ToBinaryContent(), cancellationToken.ToRequestOptions()).ConfigureAwait(false);
-        return ClientResult.FromValue((AssistantThread)protocolResult, protocolResult.GetRawResponse());;
+        return ClientResult.FromValue((AssistantThread)protocolResult, protocolResult.GetRawResponse()); ;
     }
 
     /// <summary>
@@ -717,7 +724,7 @@ public virtual ClientResult<ThreadRun> CreateRun(string threadId, string assista
         options.Stream = null;
 
         ClientResult protocolResult = CreateRun(threadId, options?.ToBinaryContent(), cancellationToken.ToRequestOptions());
-       return ClientResult.FromValue((ThreadRun)protocolResult, protocolResult.GetRawResponse());
+        return ClientResult.FromValue((ThreadRun)protocolResult, protocolResult.GetRawResponse());
     }
 
     /// <summary>

specification/client/responses.client.tsp

@@ -116,6 +116,12 @@ protected internal AudioClient(ClientPipeline pipeline, string model, OpenAIClie
     [Experimental("OPENAI001")]
     public string Model => _model;
 
+    /// <summary>
+    /// Gets the endpoint URI for the service.
+    /// </summary>
+    [Experimental("OPENAI001")]
+    public Uri Endpoint => _endpoint;
+
     #region GenerateSpeech
 
     /// <summary> Generates a life-like, spoken audio recording of the input text. </summary>

src/Custom/Assistants/AssistantClient.cs

@@ -95,6 +95,12 @@ protected internal BatchClient(ClientPipeline pipeline, OpenAIClientOptions opti
         _endpoint = OpenAIClient.GetEndpoint(options);
     }
 
+    /// <summary>
+    /// Gets the endpoint URI for the service.
+    /// </summary>
+    [Experimental("OPENAI001")]
+    public Uri Endpoint => _endpoint;
+
     internal virtual CreateBatchOperation CreateCreateBatchOperation(string batchId, string status, PipelineResponse response)
     {
         return new CreateBatchOperation(this, _endpoint, batchId, status, response);

src/Custom/Audio/AudioClient.cs

@@ -124,6 +124,12 @@ protected internal ChatClient(ClientPipeline pipeline, string model, OpenAIClien
     [Experimental("OPENAI001")]
     public string Model => _model;
 
+    /// <summary>
+    /// Gets the endpoint URI for the service.
+    /// </summary>
+    [Experimental("OPENAI001")]
+    public Uri Endpoint => _endpoint;
+
     /// <summary> Generates a completion for the given chat. </summary>
     /// <param name="messages"> The messages comprising the chat so far. </param>
     /// <param name="options"> The options to configure the chat completion. </param>

src/Custom/Batch/BatchClient.cs

@@ -77,4 +77,10 @@ protected internal ContainerClient(ClientPipeline pipeline, OpenAIClientOptions
         _endpoint = OpenAIClient.GetEndpoint(options);
     }
 
+    /// <summary>
+    /// Gets the endpoint URI for the service.
+    /// </summary>
+    [Experimental("OPENAI001")]
+    public Uri Endpoint => _endpoint;
+
 }