Skip to content

Commit aa1c930

Browse files
authored
Remove duplicate methods (#724)
1 parent 84286cd commit aa1c930

17 files changed

+48
-108
lines changed

api/OpenAI.net8.0.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5331,18 +5331,14 @@ public class OpenAIResponseClient {
53315331
public virtual ClientResult<ResponseDeletionResult> DeleteResponse(string responseId, CancellationToken cancellationToken = default);
53325332
public virtual Task<ClientResult> DeleteResponseAsync(string responseId, RequestOptions options);
53335333
public virtual Task<ClientResult<ResponseDeletionResult>> DeleteResponseAsync(string responseId, CancellationToken cancellationToken = default);
5334-
public virtual CollectionResult<ResponseItem> GetInputItems(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
5335-
public virtual CollectionResult GetInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options);
5336-
public virtual AsyncCollectionResult<ResponseItem> GetInputItemsAsync(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
5337-
public virtual AsyncCollectionResult GetInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options);
53385334
public virtual ClientResult GetResponse(string responseId, bool? stream, int? startingAfter, RequestOptions options);
53395335
public virtual ClientResult<OpenAIResponse> GetResponse(string responseId, CancellationToken cancellationToken = default);
53405336
public virtual Task<ClientResult> GetResponseAsync(string responseId, bool? stream, int? startingAfter, RequestOptions options);
53415337
public virtual Task<ClientResult<OpenAIResponse>> GetResponseAsync(string responseId, CancellationToken cancellationToken = default);
53425338
public virtual CollectionResult<ResponseItem> GetResponseInputItems(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
5343-
public virtual CollectionResult GetResponseInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options = null);
5339+
public virtual CollectionResult GetResponseInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options);
53445340
public virtual AsyncCollectionResult<ResponseItem> GetResponseInputItemsAsync(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
5345-
public virtual AsyncCollectionResult GetResponseInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options = null);
5341+
public virtual AsyncCollectionResult GetResponseInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options);
53465342
public virtual CollectionResult<StreamingResponseUpdate> GetResponseStreaming(string responseId, int? startingAfter = null, CancellationToken cancellationToken = default);
53475343
public virtual AsyncCollectionResult<StreamingResponseUpdate> GetResponseStreamingAsync(string responseId, int? startingAfter = null, CancellationToken cancellationToken = default);
53485344
}

api/OpenAI.netstandard2.0.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4703,18 +4703,14 @@ public class OpenAIResponseClient {
47034703
public virtual ClientResult<ResponseDeletionResult> DeleteResponse(string responseId, CancellationToken cancellationToken = default);
47044704
public virtual Task<ClientResult> DeleteResponseAsync(string responseId, RequestOptions options);
47054705
public virtual Task<ClientResult<ResponseDeletionResult>> DeleteResponseAsync(string responseId, CancellationToken cancellationToken = default);
4706-
public virtual CollectionResult<ResponseItem> GetInputItems(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
4707-
public virtual CollectionResult GetInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options);
4708-
public virtual AsyncCollectionResult<ResponseItem> GetInputItemsAsync(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
4709-
public virtual AsyncCollectionResult GetInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options);
47104706
public virtual ClientResult GetResponse(string responseId, bool? stream, int? startingAfter, RequestOptions options);
47114707
public virtual ClientResult<OpenAIResponse> GetResponse(string responseId, CancellationToken cancellationToken = default);
47124708
public virtual Task<ClientResult> GetResponseAsync(string responseId, bool? stream, int? startingAfter, RequestOptions options);
47134709
public virtual Task<ClientResult<OpenAIResponse>> GetResponseAsync(string responseId, CancellationToken cancellationToken = default);
47144710
public virtual CollectionResult<ResponseItem> GetResponseInputItems(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
4715-
public virtual CollectionResult GetResponseInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options = null);
4711+
public virtual CollectionResult GetResponseInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options);
47164712
public virtual AsyncCollectionResult<ResponseItem> GetResponseInputItemsAsync(string responseId, ResponseItemCollectionOptions options = null, CancellationToken cancellationToken = default);
4717-
public virtual AsyncCollectionResult GetResponseInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options = null);
4713+
public virtual AsyncCollectionResult GetResponseInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options);
47184714
public virtual CollectionResult<StreamingResponseUpdate> GetResponseStreaming(string responseId, int? startingAfter = null, CancellationToken cancellationToken = default);
47194715
public virtual AsyncCollectionResult<StreamingResponseUpdate> GetResponseStreamingAsync(string responseId, int? startingAfter = null, CancellationToken cancellationToken = default);
47204716
}

codegen/generator/src/Visitors/PaginationVisitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ public class PaginationVisitor : ScmLibraryVisitor
8888
("ContainerFileResource", "ContainerFileCollectionOptions", _paginationParamsToReplace)
8989
},
9090
{
91-
"GetInputItems",
91+
"GetResponseInputItems",
9292
("ResponseItem", "ResponseItemCollectionOptions", _paginationParamsToReplace)
9393
},
9494
{
95-
"GetInputItemsAsync",
95+
"GetResponseInputItemsAsync",
9696
("ResponseItem", "ResponseItemCollectionOptions", _paginationParamsToReplace)
9797
},
9898
{

specification/client/responses.client.tsp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ using Azure.ClientGenerator.Core;
6969

7070
@@clientName(MCPToolFilter.read_only, "IsReadOnly");
7171

72+
@@clientName(Responses.listInputItems, "GetResponseInputItems");
73+
7274
// ------------ Streaming ------------
7375

7476
@@alternateType(ResponseFunctionCallArgumentsDoneEvent.arguments, unknown);

src/Custom/Responses/OpenAIResponseClient.Protocol.cs

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,4 @@ public virtual ClientResult GetResponse(string responseId, bool? stream, int? st
3232
PipelineResponse protocolResponse = Pipeline.ProcessMessage(message, options);
3333
return ClientResult.FromResponse(protocolResponse);
3434
}
35-
36-
public virtual AsyncCollectionResult GetResponseInputItemsAsync(
37-
string responseId,
38-
int? limit,
39-
string order,
40-
string after,
41-
string before,
42-
RequestOptions options = null)
43-
{
44-
Argument.AssertNotNull(responseId, nameof(responseId));
45-
46-
return new AsyncResponseItemCollectionResult(this, responseId, limit, order, after, before, options);
47-
}
48-
49-
public virtual CollectionResult GetResponseInputItems(
50-
string responseId,
51-
int? limit,
52-
string order,
53-
string after,
54-
string before,
55-
RequestOptions options = null)
56-
{
57-
Argument.AssertNotNull(responseId, nameof(responseId));
58-
59-
return new ResponseItemCollectionResult(this, responseId, limit, order, after, before, options);
60-
}
6135
}

src/Custom/Responses/OpenAIResponseClient.cs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -266,34 +266,6 @@ public virtual CollectionResult<StreamingResponseUpdate> GetResponseStreaming(st
266266
cancellationToken);
267267
}
268268

269-
public virtual AsyncCollectionResult<ResponseItem> GetResponseInputItemsAsync(string responseId, ResponseItemCollectionOptions options = default, CancellationToken cancellationToken = default)
270-
{
271-
Argument.AssertNotNullOrEmpty(responseId, nameof(responseId));
272-
273-
AsyncCollectionResult result = GetResponseInputItemsAsync(responseId, options?.PageSizeLimit, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions());
274-
275-
if (result is not AsyncCollectionResult<ResponseItem> responsesItemCollection)
276-
{
277-
throw new InvalidOperationException("Failed to cast protocol return type to expected collection type 'AsyncCollectionResult<ResponsesItem>'.");
278-
}
279-
280-
return responsesItemCollection;
281-
}
282-
283-
public virtual CollectionResult<ResponseItem> GetResponseInputItems(string responseId, ResponseItemCollectionOptions options = default, CancellationToken cancellationToken = default)
284-
{
285-
Argument.AssertNotNullOrEmpty(responseId, nameof(responseId));
286-
287-
CollectionResult result = GetResponseInputItems(responseId, options?.PageSizeLimit, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions());
288-
289-
if (result is not CollectionResult<ResponseItem> responsesItemCollection)
290-
{
291-
throw new InvalidOperationException("Failed to cast protocol return type to expected collection type 'CollectionResult<ResponsesItem>'.");
292-
}
293-
294-
return responsesItemCollection;
295-
}
296-
297269
public virtual async Task<ClientResult<ResponseDeletionResult>> DeleteResponseAsync(string responseId, CancellationToken cancellationToken = default)
298270
{
299271
Argument.AssertNotNullOrEmpty(responseId, nameof(responseId));

src/Custom/Responses/Pagination/Internal/AsyncResponseItemCollectionResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task<ClientResult> GetNextPageAsync(ClientResult result)
8383

8484
internal virtual async Task<ClientResult> GetResponsesAsync(string responseId, int? limit, string? order, string? after, string? before, RequestOptions? options)
8585
{
86-
using PipelineMessage message = _parentClient.CreateGetInputItemsRequest(responseId, limit, order, after, before, options);
86+
using PipelineMessage message = _parentClient.CreateGetResponseInputItemsRequest(responseId, limit, order, after, before, options);
8787
return ClientResult.FromResponse(await _parentClient.Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
8888
}
8989
}

src/Custom/Responses/Pagination/Internal/ResponseItemCollectionResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static bool HasNextPage(ClientResult result)
9191

9292
internal virtual ClientResult GetResponseInputItems(string responseId, int? limit, string? order, string? after, string? before, RequestOptions? options)
9393
{
94-
using PipelineMessage message = _parentClient.CreateGetInputItemsRequest(responseId, limit, order, after, before, options);
94+
using PipelineMessage message = _parentClient.CreateGetResponseInputItemsRequest(responseId, limit, order, after, before, options);
9595
return ClientResult.FromResponse(_parentClient.Pipeline.ProcessMessage(message, options));
9696
}
9797
}

src/Generated/OpenAIResponseClient.RestClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ internal virtual PipelineMessage CreateCancelResponseRequest(string responseId,
8484
return message;
8585
}
8686

87-
internal virtual PipelineMessage CreateGetInputItemsRequest(string responseId, int? limit, string order, string after, string before, RequestOptions options)
87+
internal virtual PipelineMessage CreateGetResponseInputItemsRequest(string responseId, int? limit, string order, string after, string before, RequestOptions options)
8888
{
8989
ClientUriBuilder uri = new ClientUriBuilder();
9090
uri.Reset(_endpoint);

src/Generated/OpenAIResponseClient.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ public virtual async Task<ClientResult> CancelResponseAsync(string responseId, R
7777
return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
7878
}
7979

80-
public virtual CollectionResult GetInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options)
80+
public virtual CollectionResult GetResponseInputItems(string responseId, int? limit, string order, string after, string before, RequestOptions options)
8181
{
8282
Argument.AssertNotNullOrEmpty(responseId, nameof(responseId));
8383

84-
return new OpenAIResponseClientGetInputItemsCollectionResult(
84+
return new OpenAIResponseClientGetResponseInputItemsCollectionResult(
8585
this,
8686
responseId,
8787
limit,
@@ -91,11 +91,11 @@ public virtual CollectionResult GetInputItems(string responseId, int? limit, str
9191
options);
9292
}
9393

94-
public virtual AsyncCollectionResult GetInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options)
94+
public virtual AsyncCollectionResult GetResponseInputItemsAsync(string responseId, int? limit, string order, string after, string before, RequestOptions options)
9595
{
9696
Argument.AssertNotNullOrEmpty(responseId, nameof(responseId));
9797

98-
return new OpenAIResponseClientGetInputItemsAsyncCollectionResult(
98+
return new OpenAIResponseClientGetResponseInputItemsAsyncCollectionResult(
9999
this,
100100
responseId,
101101
limit,
@@ -105,11 +105,11 @@ public virtual AsyncCollectionResult GetInputItemsAsync(string responseId, int?
105105
options);
106106
}
107107

108-
public virtual CollectionResult<ResponseItem> GetInputItems(string responseId, ResponseItemCollectionOptions options = default, CancellationToken cancellationToken = default)
108+
public virtual CollectionResult<ResponseItem> GetResponseInputItems(string responseId, ResponseItemCollectionOptions options = default, CancellationToken cancellationToken = default)
109109
{
110110
Argument.AssertNotNullOrEmpty(responseId, nameof(responseId));
111111

112-
return new OpenAIResponseClientGetInputItemsCollectionResultOfT(
112+
return new OpenAIResponseClientGetResponseInputItemsCollectionResultOfT(
113113
this,
114114
responseId,
115115
options?.PageSizeLimit,
@@ -119,11 +119,11 @@ public virtual CollectionResult<ResponseItem> GetInputItems(string responseId, R
119119
cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null);
120120
}
121121

122-
public virtual AsyncCollectionResult<ResponseItem> GetInputItemsAsync(string responseId, ResponseItemCollectionOptions options = default, CancellationToken cancellationToken = default)
122+
public virtual AsyncCollectionResult<ResponseItem> GetResponseInputItemsAsync(string responseId, ResponseItemCollectionOptions options = default, CancellationToken cancellationToken = default)
123123
{
124124
Argument.AssertNotNullOrEmpty(responseId, nameof(responseId));
125125

126-
return new OpenAIResponseClientGetInputItemsAsyncCollectionResultOfT(
126+
return new OpenAIResponseClientGetResponseInputItemsAsyncCollectionResultOfT(
127127
this,
128128
responseId,
129129
options?.PageSizeLimit,

0 commit comments

Comments
 (0)