Skip to content

Commit d573f4d

Browse files
HavenDVgithub-actions[bot]
HavenDV
and
github-actions[bot]
authored
feat: Updated OpenAPI spec (#77)
Co-authored-by: github-actions[bot] <dependabot@bot.com>
1 parent 838a6b1 commit d573f4d

21 files changed

Lines changed: 715 additions & 72 deletions

‎src/cli/Apify.CLI/Commands/DefaultRequestQueueActorRunRequestQueueRequestPutCommandApiCommand.g.cs‎

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,19 @@ determine whether the queue was accessed by multiple clients. If
3939
head](#/reference/request-queues/queue-head) operation.
4040
",
4141
};
42+
43+
private static Option<object?> Headers { get; } = new(
44+
name: @"--headers")
45+
{
46+
Description = @"HTTP headers sent with the request.",
47+
};
48+
49+
private static Option<global::Apify.RequestUserData?> UserData { get; } = new(
50+
name: @"--user-data")
51+
{
52+
Description = @"Custom user data attached to the request. Can contain arbitrary fields.",
53+
};
54+
private static readonly RequestBaseOptionSet RequestBaseOptionSetOptions = RequestBaseOptionSet.Create();
4255
private static Option<string?> Input { get; } = new(@"--input")
4356
{
4457
Description = "Load request JSON from a file path, '-' for stdin, or an inline JSON object/array string.",
@@ -88,6 +101,16 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
88101
command.Arguments.Add(RequestId);
89102
command.Options.Add(Forefront);
90103
command.Options.Add(ClientKey);
104+
command.Options.Add(Headers);
105+
command.Options.Add(UserData); command.Options.Add(RequestBaseOptionSetOptions.UniqueKey);
106+
command.Options.Add(RequestBaseOptionSetOptions.Url);
107+
command.Options.Add(RequestBaseOptionSetOptions.Method);
108+
command.Options.Add(RequestBaseOptionSetOptions.RetryCount);
109+
command.Options.Add(RequestBaseOptionSetOptions.LoadedUrl);
110+
command.Options.Add(RequestBaseOptionSetOptions.Payload);
111+
command.Options.Add(RequestBaseOptionSetOptions.NoRetry);
112+
command.Options.Add(RequestBaseOptionSetOptions.ErrorMessages);
113+
command.Options.Add(RequestBaseOptionSetOptions.HandledAt);
91114
command.Options.Add(Input);
92115
command.Options.Add(RequestJson);
93116
command.Options.Add(RequestFile);
@@ -97,26 +120,36 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
97120
var hasRequestJson = result.GetResult(RequestJson) is not null;
98121
var hasRequestFile = result.GetResult(RequestFile) is not null;
99122
var specifiedCount = (hasInput ? 1 : 0) + (hasRequestJson ? 1 : 0) + (hasRequestFile ? 1 : 0);
100-
if (specifiedCount != 1)
123+
if (specifiedCount > 1)
101124
{
102-
result.AddError(@"Specify exactly one of --input, --request-json, or --request-file.");
125+
result.AddError(@"Specify at most one of --input, --request-json, or --request-file.");
103126
}
104127
});
105128

106129
command.SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>
107130
await CliRuntime.RunAsync(async () =>
108131
{
109-
var runId = parseResult.GetRequiredValue(RunId);
110-
var requestId = parseResult.GetRequiredValue(RequestId);
111-
var forefront = parseResult.GetValue(Forefront);
112-
var clientKey = parseResult.GetValue(ClientKey);
113-
var request = await CliRuntime.ReadRequestAsync<global::Apify.Request>(
132+
var __requestBase = await CliRuntime.ReadRequestOrDefaultAsync<global::Apify.RequestBase>(
114133
parseResult,
115134
Input,
116135
RequestJson,
117136
RequestFile,
118137
global::Apify.SourceGenerationContext.Default,
119138
cancellationToken).ConfigureAwait(false);
139+
var runId = parseResult.GetRequiredValue(RunId);
140+
var requestId = parseResult.GetRequiredValue(RequestId);
141+
var forefront = parseResult.GetValue(Forefront);
142+
var clientKey = parseResult.GetValue(ClientKey);
143+
var headers = CliRuntime.WasSpecified(parseResult, Headers) ? parseResult.GetValue(Headers) : (__requestBase is { } __HeadersBaseValue ? __HeadersBaseValue.Headers : default);
144+
var userData = CliRuntime.WasSpecified(parseResult, UserData) ? parseResult.GetValue(UserData) : (__requestBase is { } __UserDataBaseValue ? __UserDataBaseValue.UserData : default); var uniqueKey = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.UniqueKey) ? parseResult.GetValue(RequestBaseOptionSetOptions.UniqueKey) : (__requestBase is { } __UniqueKeyBaseValue ? __UniqueKeyBaseValue.UniqueKey : default);
145+
var url = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Url) ? parseResult.GetValue(RequestBaseOptionSetOptions.Url) : (__requestBase is { } __UrlBaseValue ? __UrlBaseValue.Url : default);
146+
var method = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Method) ? parseResult.GetValue(RequestBaseOptionSetOptions.Method) : (__requestBase is { } __MethodBaseValue ? __MethodBaseValue.Method : default);
147+
var retryCount = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.RetryCount) ? parseResult.GetValue(RequestBaseOptionSetOptions.RetryCount) : (__requestBase is { } __RetryCountBaseValue ? __RetryCountBaseValue.RetryCount : default);
148+
var loadedUrl = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.LoadedUrl) ? parseResult.GetValue(RequestBaseOptionSetOptions.LoadedUrl) : (__requestBase is { } __LoadedUrlBaseValue ? __LoadedUrlBaseValue.LoadedUrl : default);
149+
var payload = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Payload) ? parseResult.GetValue(RequestBaseOptionSetOptions.Payload) : (__requestBase is { } __PayloadBaseValue ? __PayloadBaseValue.Payload : default);
150+
var noRetry = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.NoRetry) ? parseResult.GetValue(RequestBaseOptionSetOptions.NoRetry) : (__requestBase is { } __NoRetryBaseValue ? __NoRetryBaseValue.NoRetry : default);
151+
var errorMessages = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.ErrorMessages) ? parseResult.GetValue(RequestBaseOptionSetOptions.ErrorMessages) : (__requestBase is { } __ErrorMessagesBaseValue ? __ErrorMessagesBaseValue.ErrorMessages : default);
152+
var handledAt = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.HandledAt) ? parseResult.GetValue(RequestBaseOptionSetOptions.HandledAt) : (__requestBase is { } __HandledAtBaseValue ? __HandledAtBaseValue.HandledAt : default);
120153
using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false);
121154

122155

@@ -125,7 +158,17 @@ await CliRuntime.RunAsync(async () =>
125158
requestId: requestId,
126159
forefront: forefront,
127160
clientKey: clientKey,
128-
request: request,
161+
headers: headers,
162+
userData: userData,
163+
uniqueKey: uniqueKey,
164+
url: url,
165+
method: method,
166+
retryCount: retryCount,
167+
loadedUrl: loadedUrl,
168+
payload: payload,
169+
noRetry: noRetry,
170+
errorMessages: errorMessages,
171+
handledAt: handledAt,
129172
cancellationToken: cancellationToken).ConfigureAwait(false);
130173

131174

‎src/cli/Apify.CLI/Commands/LastActorRunSDefaultRequestQueueActRunsLastRequestQueueRequestPutCommandApiCommand.g.cs‎

Lines changed: 52 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@ determine whether the queue was accessed by multiple clients. If
4545
head](#/reference/request-queues/queue-head) operation.
4646
",
4747
};
48+
49+
private static Option<object?> Headers { get; } = new(
50+
name: @"--headers")
51+
{
52+
Description = @"HTTP headers sent with the request.",
53+
};
54+
55+
private static Option<global::Apify.RequestUserData?> UserData { get; } = new(
56+
name: @"--user-data")
57+
{
58+
Description = @"Custom user data attached to the request. Can contain arbitrary fields.",
59+
};
60+
private static readonly RequestBaseOptionSet RequestBaseOptionSetOptions = RequestBaseOptionSet.Create();
4861
private static Option<string?> Input { get; } = new(@"--input")
4962
{
5063
Description = "Load request JSON from a file path, '-' for stdin, or an inline JSON object/array string.",
@@ -95,6 +108,16 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
95108
command.Options.Add(Status);
96109
command.Options.Add(Forefront);
97110
command.Options.Add(ClientKey);
111+
command.Options.Add(Headers);
112+
command.Options.Add(UserData); command.Options.Add(RequestBaseOptionSetOptions.UniqueKey);
113+
command.Options.Add(RequestBaseOptionSetOptions.Url);
114+
command.Options.Add(RequestBaseOptionSetOptions.Method);
115+
command.Options.Add(RequestBaseOptionSetOptions.RetryCount);
116+
command.Options.Add(RequestBaseOptionSetOptions.LoadedUrl);
117+
command.Options.Add(RequestBaseOptionSetOptions.Payload);
118+
command.Options.Add(RequestBaseOptionSetOptions.NoRetry);
119+
command.Options.Add(RequestBaseOptionSetOptions.ErrorMessages);
120+
command.Options.Add(RequestBaseOptionSetOptions.HandledAt);
98121
command.Options.Add(Input);
99122
command.Options.Add(RequestJson);
100123
command.Options.Add(RequestFile);
@@ -104,27 +127,37 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
104127
var hasRequestJson = result.GetResult(RequestJson) is not null;
105128
var hasRequestFile = result.GetResult(RequestFile) is not null;
106129
var specifiedCount = (hasInput ? 1 : 0) + (hasRequestJson ? 1 : 0) + (hasRequestFile ? 1 : 0);
107-
if (specifiedCount != 1)
130+
if (specifiedCount > 1)
108131
{
109-
result.AddError(@"Specify exactly one of --input, --request-json, or --request-file.");
132+
result.AddError(@"Specify at most one of --input, --request-json, or --request-file.");
110133
}
111134
});
112135

113136
command.SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>
114137
await CliRuntime.RunAsync(async () =>
115138
{
116-
var actorId = parseResult.GetRequiredValue(ActorId);
117-
var requestId = parseResult.GetRequiredValue(RequestId);
118-
var status = parseResult.GetValue(Status);
119-
var forefront = parseResult.GetValue(Forefront);
120-
var clientKey = parseResult.GetValue(ClientKey);
121-
var request = await CliRuntime.ReadRequestAsync<global::Apify.Request>(
139+
var __requestBase = await CliRuntime.ReadRequestOrDefaultAsync<global::Apify.RequestBase>(
122140
parseResult,
123141
Input,
124142
RequestJson,
125143
RequestFile,
126144
global::Apify.SourceGenerationContext.Default,
127145
cancellationToken).ConfigureAwait(false);
146+
var actorId = parseResult.GetRequiredValue(ActorId);
147+
var requestId = parseResult.GetRequiredValue(RequestId);
148+
var status = parseResult.GetValue(Status);
149+
var forefront = parseResult.GetValue(Forefront);
150+
var clientKey = parseResult.GetValue(ClientKey);
151+
var headers = CliRuntime.WasSpecified(parseResult, Headers) ? parseResult.GetValue(Headers) : (__requestBase is { } __HeadersBaseValue ? __HeadersBaseValue.Headers : default);
152+
var userData = CliRuntime.WasSpecified(parseResult, UserData) ? parseResult.GetValue(UserData) : (__requestBase is { } __UserDataBaseValue ? __UserDataBaseValue.UserData : default); var uniqueKey = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.UniqueKey) ? parseResult.GetValue(RequestBaseOptionSetOptions.UniqueKey) : (__requestBase is { } __UniqueKeyBaseValue ? __UniqueKeyBaseValue.UniqueKey : default);
153+
var url = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Url) ? parseResult.GetValue(RequestBaseOptionSetOptions.Url) : (__requestBase is { } __UrlBaseValue ? __UrlBaseValue.Url : default);
154+
var method = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Method) ? parseResult.GetValue(RequestBaseOptionSetOptions.Method) : (__requestBase is { } __MethodBaseValue ? __MethodBaseValue.Method : default);
155+
var retryCount = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.RetryCount) ? parseResult.GetValue(RequestBaseOptionSetOptions.RetryCount) : (__requestBase is { } __RetryCountBaseValue ? __RetryCountBaseValue.RetryCount : default);
156+
var loadedUrl = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.LoadedUrl) ? parseResult.GetValue(RequestBaseOptionSetOptions.LoadedUrl) : (__requestBase is { } __LoadedUrlBaseValue ? __LoadedUrlBaseValue.LoadedUrl : default);
157+
var payload = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Payload) ? parseResult.GetValue(RequestBaseOptionSetOptions.Payload) : (__requestBase is { } __PayloadBaseValue ? __PayloadBaseValue.Payload : default);
158+
var noRetry = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.NoRetry) ? parseResult.GetValue(RequestBaseOptionSetOptions.NoRetry) : (__requestBase is { } __NoRetryBaseValue ? __NoRetryBaseValue.NoRetry : default);
159+
var errorMessages = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.ErrorMessages) ? parseResult.GetValue(RequestBaseOptionSetOptions.ErrorMessages) : (__requestBase is { } __ErrorMessagesBaseValue ? __ErrorMessagesBaseValue.ErrorMessages : default);
160+
var handledAt = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.HandledAt) ? parseResult.GetValue(RequestBaseOptionSetOptions.HandledAt) : (__requestBase is { } __HandledAtBaseValue ? __HandledAtBaseValue.HandledAt : default);
128161
using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false);
129162

130163

@@ -134,7 +167,17 @@ await CliRuntime.RunAsync(async () =>
134167
status: status,
135168
forefront: forefront,
136169
clientKey: clientKey,
137-
request: request,
170+
headers: headers,
171+
userData: userData,
172+
uniqueKey: uniqueKey,
173+
url: url,
174+
method: method,
175+
retryCount: retryCount,
176+
loadedUrl: loadedUrl,
177+
payload: payload,
178+
noRetry: noRetry,
179+
errorMessages: errorMessages,
180+
handledAt: handledAt,
138181
cancellationToken: cancellationToken).ConfigureAwait(false);
139182

140183

‎src/cli/Apify.CLI/Commands/LastActorRunSLogActRunsLastLogGetCommandApiCommand.g.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ internal static partial class LastActorRunSLogActRunsLastLogGetCommandApiCommand
1313
Description = @"Actor ID or a tilde-separated owner's username and Actor name.",
1414
};
1515

16+
private static Option<string?> Status { get; } = new(
17+
name: @"--status")
18+
{
19+
Description = @"Filter for the run status.",
20+
};
21+
1622
private static Option<bool?> Stream { get; } = CliRuntime.CreateNullableBoolOption(
1723
name: @"--stream",
1824
description: @"If `true` or `1` then the logs will be streamed as long as the run or build is running.
@@ -57,6 +63,7 @@ Retrieves last Actor run's logs.
5763
This endpoint is a shortcut for getting last Actor run's log. Same as [Get log](/api/v2/log-get) endpoint.
5864
");
5965
command.Arguments.Add(ActorId);
66+
command.Options.Add(Status);
6067
command.Options.Add(Stream);
6168
command.Options.Add(Download);
6269
command.Options.Add(Raw);
@@ -66,6 +73,7 @@ Retrieves last Actor run's logs.
6673
await CliRuntime.RunAsync(async () =>
6774
{
6875
var actorId = parseResult.GetRequiredValue(ActorId);
76+
var status = parseResult.GetValue(Status);
6977
var stream = parseResult.GetValue(Stream);
7078
var download = parseResult.GetValue(Download);
7179
var raw = parseResult.GetValue(Raw);
@@ -74,6 +82,7 @@ await CliRuntime.RunAsync(async () =>
7482

7583
var response = await client.LastActorRunSLog.ActRunsLastLogGetAsync(
7684
actorId: actorId,
85+
status: status,
7786
stream: stream,
7887
download: download,
7988
raw: raw,

0 commit comments

Comments
 (0)