Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ determine whether the queue was accessed by multiple clients. If
head](#/reference/request-queues/queue-head) operation.
",
};

private static Option<object?> Headers { get; } = new(
name: @"--headers")
{
Description = @"HTTP headers sent with the request.",
};

private static Option<global::Apify.RequestUserData?> UserData { get; } = new(
name: @"--user-data")
{
Description = @"Custom user data attached to the request. Can contain arbitrary fields.",
};
private static readonly RequestBaseOptionSet RequestBaseOptionSetOptions = RequestBaseOptionSet.Create();
private static Option<string?> Input { get; } = new(@"--input")
{
Description = "Load request JSON from a file path, '-' for stdin, or an inline JSON object/array string.",
Expand Down Expand Up @@ -88,6 +101,16 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
command.Arguments.Add(RequestId);
command.Options.Add(Forefront);
command.Options.Add(ClientKey);
command.Options.Add(Headers);
command.Options.Add(UserData); command.Options.Add(RequestBaseOptionSetOptions.UniqueKey);
command.Options.Add(RequestBaseOptionSetOptions.Url);
command.Options.Add(RequestBaseOptionSetOptions.Method);
command.Options.Add(RequestBaseOptionSetOptions.RetryCount);
command.Options.Add(RequestBaseOptionSetOptions.LoadedUrl);
command.Options.Add(RequestBaseOptionSetOptions.Payload);
command.Options.Add(RequestBaseOptionSetOptions.NoRetry);
command.Options.Add(RequestBaseOptionSetOptions.ErrorMessages);
command.Options.Add(RequestBaseOptionSetOptions.HandledAt);
command.Options.Add(Input);
command.Options.Add(RequestJson);
command.Options.Add(RequestFile);
Expand All @@ -97,26 +120,36 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
var hasRequestJson = result.GetResult(RequestJson) is not null;
var hasRequestFile = result.GetResult(RequestFile) is not null;
var specifiedCount = (hasInput ? 1 : 0) + (hasRequestJson ? 1 : 0) + (hasRequestFile ? 1 : 0);
if (specifiedCount != 1)
if (specifiedCount > 1)
{
result.AddError(@"Specify exactly one of --input, --request-json, or --request-file.");
result.AddError(@"Specify at most one of --input, --request-json, or --request-file.");
}
});

command.SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>
await CliRuntime.RunAsync(async () =>
{
var runId = parseResult.GetRequiredValue(RunId);
var requestId = parseResult.GetRequiredValue(RequestId);
var forefront = parseResult.GetValue(Forefront);
var clientKey = parseResult.GetValue(ClientKey);
var request = await CliRuntime.ReadRequestAsync<global::Apify.Request>(
var __requestBase = await CliRuntime.ReadRequestOrDefaultAsync<global::Apify.RequestBase>(
parseResult,
Input,
RequestJson,
RequestFile,
global::Apify.SourceGenerationContext.Default,
cancellationToken).ConfigureAwait(false);
var runId = parseResult.GetRequiredValue(RunId);
var requestId = parseResult.GetRequiredValue(RequestId);
var forefront = parseResult.GetValue(Forefront);
var clientKey = parseResult.GetValue(ClientKey);
var headers = CliRuntime.WasSpecified(parseResult, Headers) ? parseResult.GetValue(Headers) : (__requestBase is { } __HeadersBaseValue ? __HeadersBaseValue.Headers : default);
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);
var url = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Url) ? parseResult.GetValue(RequestBaseOptionSetOptions.Url) : (__requestBase is { } __UrlBaseValue ? __UrlBaseValue.Url : default);
var method = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Method) ? parseResult.GetValue(RequestBaseOptionSetOptions.Method) : (__requestBase is { } __MethodBaseValue ? __MethodBaseValue.Method : default);
var retryCount = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.RetryCount) ? parseResult.GetValue(RequestBaseOptionSetOptions.RetryCount) : (__requestBase is { } __RetryCountBaseValue ? __RetryCountBaseValue.RetryCount : default);
var loadedUrl = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.LoadedUrl) ? parseResult.GetValue(RequestBaseOptionSetOptions.LoadedUrl) : (__requestBase is { } __LoadedUrlBaseValue ? __LoadedUrlBaseValue.LoadedUrl : default);
var payload = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Payload) ? parseResult.GetValue(RequestBaseOptionSetOptions.Payload) : (__requestBase is { } __PayloadBaseValue ? __PayloadBaseValue.Payload : default);
var noRetry = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.NoRetry) ? parseResult.GetValue(RequestBaseOptionSetOptions.NoRetry) : (__requestBase is { } __NoRetryBaseValue ? __NoRetryBaseValue.NoRetry : default);
var errorMessages = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.ErrorMessages) ? parseResult.GetValue(RequestBaseOptionSetOptions.ErrorMessages) : (__requestBase is { } __ErrorMessagesBaseValue ? __ErrorMessagesBaseValue.ErrorMessages : default);
var handledAt = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.HandledAt) ? parseResult.GetValue(RequestBaseOptionSetOptions.HandledAt) : (__requestBase is { } __HandledAtBaseValue ? __HandledAtBaseValue.HandledAt : default);
using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false);


Expand All @@ -125,7 +158,17 @@ await CliRuntime.RunAsync(async () =>
requestId: requestId,
forefront: forefront,
clientKey: clientKey,
request: request,
headers: headers,
userData: userData,
uniqueKey: uniqueKey,
url: url,
method: method,
retryCount: retryCount,
loadedUrl: loadedUrl,
payload: payload,
noRetry: noRetry,
errorMessages: errorMessages,
handledAt: handledAt,
cancellationToken: cancellationToken).ConfigureAwait(false);


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@ determine whether the queue was accessed by multiple clients. If
head](#/reference/request-queues/queue-head) operation.
",
};

private static Option<object?> Headers { get; } = new(
name: @"--headers")
{
Description = @"HTTP headers sent with the request.",
};

private static Option<global::Apify.RequestUserData?> UserData { get; } = new(
name: @"--user-data")
{
Description = @"Custom user data attached to the request. Can contain arbitrary fields.",
};
private static readonly RequestBaseOptionSet RequestBaseOptionSetOptions = RequestBaseOptionSet.Create();
private static Option<string?> Input { get; } = new(@"--input")
{
Description = "Load request JSON from a file path, '-' for stdin, or an inline JSON object/array string.",
Expand Down Expand Up @@ -95,6 +108,16 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
command.Options.Add(Status);
command.Options.Add(Forefront);
command.Options.Add(ClientKey);
command.Options.Add(Headers);
command.Options.Add(UserData); command.Options.Add(RequestBaseOptionSetOptions.UniqueKey);
command.Options.Add(RequestBaseOptionSetOptions.Url);
command.Options.Add(RequestBaseOptionSetOptions.Method);
command.Options.Add(RequestBaseOptionSetOptions.RetryCount);
command.Options.Add(RequestBaseOptionSetOptions.LoadedUrl);
command.Options.Add(RequestBaseOptionSetOptions.Payload);
command.Options.Add(RequestBaseOptionSetOptions.NoRetry);
command.Options.Add(RequestBaseOptionSetOptions.ErrorMessages);
command.Options.Add(RequestBaseOptionSetOptions.HandledAt);
command.Options.Add(Input);
command.Options.Add(RequestJson);
command.Options.Add(RequestFile);
Expand All @@ -104,27 +127,37 @@ [Update request](/api/v2/request-queue-request-put) endpoint.
var hasRequestJson = result.GetResult(RequestJson) is not null;
var hasRequestFile = result.GetResult(RequestFile) is not null;
var specifiedCount = (hasInput ? 1 : 0) + (hasRequestJson ? 1 : 0) + (hasRequestFile ? 1 : 0);
if (specifiedCount != 1)
if (specifiedCount > 1)
{
result.AddError(@"Specify exactly one of --input, --request-json, or --request-file.");
result.AddError(@"Specify at most one of --input, --request-json, or --request-file.");
}
});

command.SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>
await CliRuntime.RunAsync(async () =>
{
var actorId = parseResult.GetRequiredValue(ActorId);
var requestId = parseResult.GetRequiredValue(RequestId);
var status = parseResult.GetValue(Status);
var forefront = parseResult.GetValue(Forefront);
var clientKey = parseResult.GetValue(ClientKey);
var request = await CliRuntime.ReadRequestAsync<global::Apify.Request>(
var __requestBase = await CliRuntime.ReadRequestOrDefaultAsync<global::Apify.RequestBase>(
parseResult,
Input,
RequestJson,
RequestFile,
global::Apify.SourceGenerationContext.Default,
cancellationToken).ConfigureAwait(false);
var actorId = parseResult.GetRequiredValue(ActorId);
var requestId = parseResult.GetRequiredValue(RequestId);
var status = parseResult.GetValue(Status);
var forefront = parseResult.GetValue(Forefront);
var clientKey = parseResult.GetValue(ClientKey);
var headers = CliRuntime.WasSpecified(parseResult, Headers) ? parseResult.GetValue(Headers) : (__requestBase is { } __HeadersBaseValue ? __HeadersBaseValue.Headers : default);
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);
var url = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Url) ? parseResult.GetValue(RequestBaseOptionSetOptions.Url) : (__requestBase is { } __UrlBaseValue ? __UrlBaseValue.Url : default);
var method = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Method) ? parseResult.GetValue(RequestBaseOptionSetOptions.Method) : (__requestBase is { } __MethodBaseValue ? __MethodBaseValue.Method : default);
var retryCount = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.RetryCount) ? parseResult.GetValue(RequestBaseOptionSetOptions.RetryCount) : (__requestBase is { } __RetryCountBaseValue ? __RetryCountBaseValue.RetryCount : default);
var loadedUrl = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.LoadedUrl) ? parseResult.GetValue(RequestBaseOptionSetOptions.LoadedUrl) : (__requestBase is { } __LoadedUrlBaseValue ? __LoadedUrlBaseValue.LoadedUrl : default);
var payload = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.Payload) ? parseResult.GetValue(RequestBaseOptionSetOptions.Payload) : (__requestBase is { } __PayloadBaseValue ? __PayloadBaseValue.Payload : default);
var noRetry = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.NoRetry) ? parseResult.GetValue(RequestBaseOptionSetOptions.NoRetry) : (__requestBase is { } __NoRetryBaseValue ? __NoRetryBaseValue.NoRetry : default);
var errorMessages = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.ErrorMessages) ? parseResult.GetValue(RequestBaseOptionSetOptions.ErrorMessages) : (__requestBase is { } __ErrorMessagesBaseValue ? __ErrorMessagesBaseValue.ErrorMessages : default);
var handledAt = CliRuntime.WasSpecified(parseResult, RequestBaseOptionSetOptions.HandledAt) ? parseResult.GetValue(RequestBaseOptionSetOptions.HandledAt) : (__requestBase is { } __HandledAtBaseValue ? __HandledAtBaseValue.HandledAt : default);
using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false);


Expand All @@ -134,7 +167,17 @@ await CliRuntime.RunAsync(async () =>
status: status,
forefront: forefront,
clientKey: clientKey,
request: request,
headers: headers,
userData: userData,
uniqueKey: uniqueKey,
url: url,
method: method,
retryCount: retryCount,
loadedUrl: loadedUrl,
payload: payload,
noRetry: noRetry,
errorMessages: errorMessages,
handledAt: handledAt,
cancellationToken: cancellationToken).ConfigureAwait(false);


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ internal static partial class LastActorRunSLogActRunsLastLogGetCommandApiCommand
Description = @"Actor ID or a tilde-separated owner's username and Actor name.",
};

private static Option<string?> Status { get; } = new(
name: @"--status")
{
Description = @"Filter for the run status.",
};

private static Option<bool?> Stream { get; } = CliRuntime.CreateNullableBoolOption(
name: @"--stream",
description: @"If `true` or `1` then the logs will be streamed as long as the run or build is running.
Expand Down Expand Up @@ -57,6 +63,7 @@ Retrieves last Actor run's logs.
This endpoint is a shortcut for getting last Actor run's log. Same as [Get log](/api/v2/log-get) endpoint.
");
command.Arguments.Add(ActorId);
command.Options.Add(Status);
command.Options.Add(Stream);
command.Options.Add(Download);
command.Options.Add(Raw);
Expand All @@ -66,6 +73,7 @@ Retrieves last Actor run's logs.
await CliRuntime.RunAsync(async () =>
{
var actorId = parseResult.GetRequiredValue(ActorId);
var status = parseResult.GetValue(Status);
var stream = parseResult.GetValue(Stream);
var download = parseResult.GetValue(Download);
var raw = parseResult.GetValue(Raw);
Expand All @@ -74,6 +82,7 @@ await CliRuntime.RunAsync(async () =>

var response = await client.LastActorRunSLog.ActRunsLastLogGetAsync(
actorId: actorId,
status: status,
stream: stream,
download: download,
raw: raw,
Expand Down
Loading