Skip to content

Commit 5320269

Browse files
authored
Merge branch 'master' into feat/pr-previews
2 parents 8051271 + 3b171eb commit 5320269

File tree

96 files changed

+3389
-2919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3389
-2919
lines changed

.github/styles/config/vocabularies/Docs/accept.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,4 @@ upvote
121121
walkthroughs?
122122

123123
ul
124+
[Aa]gno

.github/workflows/lychee.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Run Lychee Link Checker
3737
id: lychee
38-
uses: lycheeverse/lychee-action@v2.4.0
38+
uses: lycheeverse/lychee-action@v2.4.1
3939
env:
4040
GITHUB_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
4141
with:
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
title: EffectivePlatformFeature
2+
required:
3+
- isEnabled
4+
- disabledReason
5+
- disabledReasonType
6+
- isTrial
7+
- trialExpirationAt
8+
type: object
9+
properties:
10+
isEnabled:
11+
type: boolean
12+
example: true
13+
disabledReason:
14+
type: string
15+
example: "The \"Selected public Actors for developers\" feature is not enabled for your account. Please upgrade your plan or contact support@apify.com"
16+
nullable: true
17+
disabledReasonType:
18+
type: string
19+
example: "DISABLED"
20+
nullable: true
21+
isTrial:
22+
type: boolean
23+
example: false
24+
trialExpirationAt:
25+
type: string
26+
example: "2025-01-01T14:00:00.000Z"
27+
nullable: true
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
title: EffectivePlatformFeatures
2+
required:
3+
- ACTORS
4+
- STORAGE
5+
- SCHEDULER
6+
- PROXY
7+
- PROXY_EXTERNAL_ACCESS
8+
- PROXY_RESIDENTIAL
9+
- PROXY_SERPS
10+
- WEBHOOKS
11+
- ACTORS_PUBLIC_ALL
12+
- ACTORS_PUBLIC_DEVELOPER
13+
type: object
14+
properties:
15+
ACTORS:
16+
$ref: './EffectivePlatformFeature.yaml'
17+
STORAGE:
18+
$ref: './EffectivePlatformFeature.yaml'
19+
SCHEDULER:
20+
$ref: './EffectivePlatformFeature.yaml'
21+
PROXY:
22+
$ref: './EffectivePlatformFeature.yaml'
23+
PROXY_EXTERNAL_ACCESS:
24+
$ref: './EffectivePlatformFeature.yaml'
25+
PROXY_RESIDENTIAL:
26+
$ref: './EffectivePlatformFeature.yaml'
27+
PROXY_SERPS:
28+
$ref: './EffectivePlatformFeature.yaml'
29+
WEBHOOKS:
30+
$ref: './EffectivePlatformFeature.yaml'
31+
ACTORS_PUBLIC_ALL:
32+
$ref: './EffectivePlatformFeature.yaml'
33+
ACTORS_PUBLIC_DEVELOPER:
34+
$ref: './EffectivePlatformFeature.yaml'

apify-api/openapi/components/schemas/users/UserPrivateInfo.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ required:
66
- email
77
- proxy
88
- plan
9+
- effectivePlatformFeatures
10+
- createdAt
11+
- isPaying
912
type: object
1013
properties:
1114
id:
@@ -23,3 +26,11 @@ properties:
2326
$ref: ./Proxy.yaml
2427
plan:
2528
$ref: ./Plan.yaml
29+
effectivePlatformFeatures:
30+
$ref: ./EffectivePlatformFeatures.yaml
31+
createdAt:
32+
type: string
33+
example: "2022-11-29T14:48:29.381Z"
34+
isPaying:
35+
type: boolean
36+
example: true

apify-api/openapi/paths/actor-runs/actor-runs@{runId}.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ get:
8888
The maximum number of seconds the server waits for the run to finish. By
8989
default it is `0`, the maximum value is `60`. <!--
9090
MAX_ACTOR_JOB_ASYNC_WAIT_SECS -->
91-
If the build finishes in time then the returned run object will have a terminal status (e.g. `SUCCEEDED`),
91+
If the run finishes in time then the returned run object will have a terminal status (e.g. `SUCCEEDED`),
9292
otherwise it will have a transitional status (e.g. `RUNNING`).
9393
style: form
9494
explode: true

apify-api/openapi/paths/actor-tasks/actor-tasks@{actorTaskId}@runs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ post:
231231
description: |
232232
The maximum number of seconds the server waits for the run to finish. By
233233
default, it is `0`, the maximum value is `60`. <!-- MAX_ACTOR_JOB_ASYNC_WAIT_SECS -->
234-
If the build finishes in time then the returned run object will have a
234+
If the run finishes in time then the returned run object will have a
235235
terminal status (e.g. `SUCCEEDED`),
236236
otherwise it will have a transitional status (e.g. `RUNNING`).
237237
style: form

apify-api/openapi/paths/actors/acts@{actorId}@runs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ post:
224224
description: |
225225
The maximum number of seconds the server waits for the run to finish. By
226226
default, it is `0`, the maximum value is `60`. <!-- MAX_ACTOR_JOB_ASYNC_WAIT_SECS -->
227-
If the build finishes in time then the returned run object will have a terminal status (e.g. `SUCCEEDED`),
227+
If the run finishes in time then the returned run object will have a terminal status (e.g. `SUCCEEDED`),
228228
otherwise it will have a transitional status (e.g. `RUNNING`).
229229
style: form
230230
explode: true

apify-api/openapi/paths/actors/acts@{actorId}@runs@{runId}.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ get:
3838
description: |
3939
The maximum number of seconds the server waits for the run to finish. By
4040
default it is `0`, the maximum value is `60`. <!-- MAX_ACTOR_JOB_ASYNC_WAIT_SECS -->
41-
If the build finishes in time then the returned run object will have a terminal status (e.g. `SUCCEEDED`),
41+
If the run finishes in time then the returned run object will have a terminal status (e.g. `SUCCEEDED`),
4242
otherwise it will have a transitional status (e.g. `RUNNING`).
4343
style: form
4444
explode: true

apify-api/openapi/paths/logs/logs@{buildOrRunId}.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@ get:
4040
schema:
4141
type: boolean
4242
example: false
43+
- name: raw
44+
in: query
45+
description: |
46+
If `true` or `1`, the logs will be kept verbatim. By default, the API removes
47+
ANSI escape codes from the logs, keeping only printable characters.
48+
required: false
49+
style: form
50+
explode: true
51+
schema:
52+
type: boolean
53+
example: false
4354
responses:
4455
'200':
4556
description: ''

0 commit comments

Comments
 (0)