Skip to content

Commit d0382fb

Browse files
christotheschristothes
committed
fixups
1 parent db51a23 commit d0382fb

12 files changed

+94
-259
lines changed

‎api/OpenAI.net8.0.cs‎

Lines changed: 8 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5095,6 +5095,7 @@ public class ContainerFileCitationMessageAnnotation : ResponseMessageAnnotation,
50955095
[Experimental("OPENAI001")]
50965096
public class CreateResponseOptions : IJsonModel<CreateResponseOptions>, IPersistableModel<CreateResponseOptions> {
50975097
public CreateResponseOptions(IEnumerable<ResponseItem> inputItems, string model);
5098+
public CreateResponseOptions(IEnumerable<ResponseItem> inputItems);
50985099
public IList<Includable> IncludedProperties { get; }
50995100
public IList<ResponseItem> InputItems { get; }
51005101
public string Instructions { get; set; }
@@ -5464,14 +5465,14 @@ public class ImageGenerationToolInputImageMask : IJsonModel<ImageGenerationToolI
54645465
public override readonly string ToString();
54655466
}
54665467
[Experimental("OPENAI001")]
5467-
<<<<<<< HEAD
54685468
public enum Includable {
54695469
FileSearchCallResults = 0,
54705470
MessageInputImageImageUrl = 1,
54715471
ComputerCallOutputOutputImageUrl = 2,
54725472
ReasoningEncryptedContent = 3,
54735473
CodeInterpreterCallOutputs = 4
5474-
=======
5474+
}
5475+
[Experimental("OPENAI001")]
54755476
public readonly partial struct IncludedResponseProperty : IEquatable<IncludedResponseProperty> {
54765477
public IncludedResponseProperty(string value);
54775478
public static IncludedResponseProperty CodeInterpreterCallOutputs { get; }
@@ -5489,7 +5490,6 @@ public enum Includable {
54895490
public static implicit operator IncludedResponseProperty?(string value);
54905491
public static bool operator !=(IncludedResponseProperty left, IncludedResponseProperty right);
54915492
public override readonly string ToString();
5492-
>>>>>>> upstream/main
54935493
}
54945494
[Experimental("OPENAI001")]
54955495
public class McpTool : ResponseTool, IJsonModel<McpTool>, IPersistableModel<McpTool> {
@@ -5645,8 +5645,6 @@ public enum MessageStatus {
56455645
Incomplete = 2
56465646
}
56475647
[Experimental("OPENAI001")]
5648-
<<<<<<< HEAD
5649-
=======
56505648
public class OpenAIResponse : IJsonModel<OpenAIResponse>, IPersistableModel<OpenAIResponse> {
56515649
public bool? BackgroundModeEnabled { get; }
56525650
public DateTimeOffset CreatedAt { get; }
@@ -5683,50 +5681,6 @@ public class OpenAIResponse : IJsonModel<OpenAIResponse>, IPersistableModel<Open
56835681
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
56845682
}
56855683
[Experimental("OPENAI001")]
5686-
public class OpenAIResponseClient {
5687-
protected OpenAIResponseClient();
5688-
protected internal OpenAIResponseClient(ClientPipeline pipeline, string model, OpenAIClientOptions options);
5689-
public OpenAIResponseClient(string model, ApiKeyCredential credential, OpenAIClientOptions options);
5690-
public OpenAIResponseClient(string model, ApiKeyCredential credential);
5691-
public OpenAIResponseClient(string model, AuthenticationPolicy authenticationPolicy, OpenAIClientOptions options);
5692-
public OpenAIResponseClient(string model, AuthenticationPolicy authenticationPolicy);
5693-
public OpenAIResponseClient(string model, string apiKey);
5694-
[Experimental("OPENAI001")]
5695-
public Uri Endpoint { get; }
5696-
[Experimental("OPENAI001")]
5697-
public string Model { get; }
5698-
public ClientPipeline Pipeline { get; }
5699-
public virtual ClientResult CancelResponse(string responseId, RequestOptions options);
5700-
public virtual ClientResult<OpenAIResponse> CancelResponse(string responseId, CancellationToken cancellationToken = default);
5701-
public virtual Task<ClientResult> CancelResponseAsync(string responseId, RequestOptions options);
5702-
public virtual Task<ClientResult<OpenAIResponse>> CancelResponseAsync(string responseId, CancellationToken cancellationToken = default);
5703-
public virtual ClientResult CreateResponse(BinaryContent content, RequestOptions options = null);
5704-
public virtual ClientResult<OpenAIResponse> CreateResponse(IEnumerable<ResponseItem> inputItems, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5705-
public virtual ClientResult<OpenAIResponse> CreateResponse(string userInputText, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5706-
public virtual Task<ClientResult> CreateResponseAsync(BinaryContent content, RequestOptions options = null);
5707-
public virtual Task<ClientResult<OpenAIResponse>> CreateResponseAsync(IEnumerable<ResponseItem> inputItems, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5708-
public virtual Task<ClientResult<OpenAIResponse>> CreateResponseAsync(string userInputText, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5709-
public virtual CollectionResult<StreamingResponseUpdate> CreateResponseStreaming(IEnumerable<ResponseItem> inputItems, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5710-
public virtual CollectionResult<StreamingResponseUpdate> CreateResponseStreaming(string userInputText, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5711-
public virtual AsyncCollectionResult<StreamingResponseUpdate> CreateResponseStreamingAsync(IEnumerable<ResponseItem> inputItems, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5712-
public virtual AsyncCollectionResult<StreamingResponseUpdate> CreateResponseStreamingAsync(string userInputText, ResponseCreationOptions options = null, CancellationToken cancellationToken = default);
5713-
public virtual ClientResult DeleteResponse(string responseId, RequestOptions options);
5714-
public virtual ClientResult<ResponseDeletionResult> DeleteResponse(string responseId, CancellationToken cancellationToken = default);
5715-
public virtual Task<ClientResult> DeleteResponseAsync(string responseId, RequestOptions options);
5716-
public virtual Task<ClientResult<ResponseDeletionResult>> DeleteResponseAsync(string responseId, CancellationToken cancellationToken = default);
5717-
public virtual ClientResult GetResponse(string responseId, IEnumerable<IncludedResponseProperty> include, bool? stream, int? startingAfter, bool? includeObfuscation, RequestOptions options);
5718-
public virtual ClientResult<OpenAIResponse> GetResponse(string responseId, IEnumerable<IncludedResponseProperty> include = null, CancellationToken cancellationToken = default);
5719-
public virtual Task<ClientResult> GetResponseAsync(string responseId, IEnumerable<IncludedResponseProperty> include, bool? stream, int? startingAfter, bool? includeObfuscation, RequestOptions options);
5720-
public virtual Task<ClientResult<OpenAIResponse>> GetResponseAsync(string responseId, IEnumerable<IncludedResponseProperty> include = null, CancellationToken cancellationToken = default);
5721-
public virtual CollectionResult<ResponseItem> GetResponseInputItems(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
5722-
public virtual CollectionResult GetResponseInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options);
5723-
public virtual AsyncCollectionResult<ResponseItem> GetResponseInputItemsAsync(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
5724-
public virtual AsyncCollectionResult GetResponseInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options);
5725-
public virtual CollectionResult<StreamingResponseUpdate> GetResponseStreaming(string responseId, IEnumerable<IncludedResponseProperty> include = null, int? startingAfter = null, bool? includeObfuscation = null, CancellationToken cancellationToken = default);
5726-
public virtual AsyncCollectionResult<StreamingResponseUpdate> GetResponseStreamingAsync(string responseId, IEnumerable<IncludedResponseProperty> include = null, int? startingAfter = null, bool? includeObfuscation = null, CancellationToken cancellationToken = default);
5727-
}
5728-
[Experimental("OPENAI001")]
5729-
>>>>>>> upstream/main
57305684
public static class OpenAIResponsesModelFactory {
57315685
public static MessageResponseItem MessageResponseItem(string id = null, MessageRole role = MessageRole.Assistant, MessageStatus? status = null);
57325686
public static ReasoningResponseItem ReasoningResponseItem(string id = null, string encryptedContent = null, ReasoningStatus? status = null, IEnumerable<ReasoningSummaryPart> summaryParts = null);
@@ -5820,8 +5774,6 @@ public enum ResponseContentPartKind {
58205774
Refusal = 5
58215775
}
58225776
[Experimental("OPENAI001")]
5823-
<<<<<<< HEAD
5824-
=======
58255777
public class ResponseCreationOptions : IJsonModel<ResponseCreationOptions>, IPersistableModel<ResponseCreationOptions> {
58265778
public bool? BackgroundModeEnabled { get; set; }
58275779
public string EndUserId { get; set; }
@@ -5850,7 +5802,6 @@ public class ResponseCreationOptions : IJsonModel<ResponseCreationOptions>, IPer
58505802
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
58515803
}
58525804
[Experimental("OPENAI001")]
5853-
>>>>>>> upstream/main
58545805
public class ResponseDeletionResult : IJsonModel<ResponseDeletionResult>, IPersistableModel<ResponseDeletionResult> {
58555806
public bool Deleted { get; }
58565807
public string Id { get; }
@@ -6193,8 +6144,11 @@ public class ResponsesClient {
61936144
public virtual Task<ClientResult> DeleteResponseAsync(string responseId, RequestOptions options);
61946145
public virtual Task<ClientResult<ResponseDeletionResult>> DeleteResponseAsync(string responseId, CancellationToken cancellationToken = default);
61956146
public virtual ClientResult<ResponseResult> GetResponse(GetResponseOptions options, CancellationToken cancellationToken = default);
6147+
public virtual ClientResult GetResponse(string responseId, IEnumerable<IncludedResponseProperty> include, bool? stream, int? startingAfter, bool? includeObfuscation, RequestOptions options);
6148+
public virtual ClientResult<OpenAIResponse> GetResponse(string responseId, IEnumerable<IncludedResponseProperty> include = null, CancellationToken cancellationToken = default);
61966149
public virtual ClientResult GetResponse(string responseId, bool? stream, int? startingAfter, RequestOptions options);
61976150
public virtual Task<ClientResult<ResponseResult>> GetResponseAsync(GetResponseOptions options, CancellationToken cancellationToken = default);
6151+
public virtual Task<ClientResult> GetResponseAsync(string responseId, IEnumerable<IncludedResponseProperty> include, bool? stream, int? startingAfter, bool? includeObfuscation, RequestOptions options);
61986152
public virtual Task<ClientResult> GetResponseAsync(string responseId, bool? stream, int? startingAfter, RequestOptions options);
61996153
public virtual ClientResult<ResponseItemCollection> GetResponseInputItems(GetResponseInputItemsOptions options = default, CancellationToken cancellationToken = default);
62006154
public virtual CollectionResult<ResponseItem> GetResponseInputItems(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
@@ -6203,7 +6157,9 @@ public class ResponsesClient {
62036157
public virtual AsyncCollectionResult<ResponseItem> GetResponseInputItemsAsync(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
62046158
public virtual AsyncCollectionResult GetResponseInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options);
62056159
public virtual CollectionResult<StreamingResponseUpdate> GetResponseStreaming(GetResponseOptions options, CancellationToken cancellationToken = default);
6160+
public virtual CollectionResult<StreamingResponseUpdate> GetResponseStreaming(string responseId, IEnumerable<IncludedResponseProperty> include = null, int? startingAfter = null, bool? includeObfuscation = null, CancellationToken cancellationToken = default);
62066161
public virtual AsyncCollectionResult<StreamingResponseUpdate> GetResponseStreamingAsync(GetResponseOptions options, CancellationToken cancellationToken = default);
6162+
public virtual AsyncCollectionResult<StreamingResponseUpdate> GetResponseStreamingAsync(string responseId, IEnumerable<IncludedResponseProperty> include = null, int? startingAfter = null, bool? includeObfuscation = null, CancellationToken cancellationToken = default);
62076163
}
62086164
[Experimental("OPENAI001")]
62096165
public readonly partial struct ResponseServiceTier : IEquatable<ResponseServiceTier> {

0 commit comments

Comments
 (0)