Skip to content

Commit f7bb0ed

Browse files
committed
Merge branch 'master' into chore/bump-ui-lib
2 parents 00dd509 + 348594a commit f7bb0ed

File tree

164 files changed

+4832
-3484
lines changed

Some content is hidden

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

164 files changed

+4832
-3484
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
/sources/academy/ @honzajavorek
99

1010
# OpenAPI spec
11-
/apify-api/ @netmilk @janbuchar @fnesveda
11+
/apify-api/ @janbuchar @fnesveda

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,22 @@ preconfigured
8686

8787
[Mm]ultiselect
8888

89+
devs
8990
asyncio
90-
Langflow
9191
backlinks?
9292
captchas?
9393
Chatbot
9494
combinator
9595
deduplicating
96+
dev
9697
Fakestore
9798
Fandom('s)?
9899
IMDb
99100
influencers
100101
iPads?
101102
iPhones?
102103
jQuery
104+
Langflow
103105
learnings
104106
livestreams
105107
outro
@@ -119,3 +121,4 @@ upvote
119121
walkthroughs?
120122

121123
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:

.github/workflows/pr-previews.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Docs PR Previews
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, closed]
6+
7+
concurrency:
8+
cancel-in-progress: false
9+
group: 'docs-pr-previews-${{ github.event.pull_request.number }}'
10+
11+
jobs:
12+
trigger-preview:
13+
if: github.event.action != 'closed'
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Trigger preview
19+
run: gh workflow run apify_docs_pr.yml --repo apify/apify-docs-private --field pr-number=${{ github.event.pull_request.number }} --field original-repository=${{ github.repository }}
20+
env:
21+
GH_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
22+
23+
delete-preview:
24+
if: github.event.action == 'closed'
25+
26+
runs-on: ubuntu-latest
27+
28+
steps:
29+
- name: Delete preview
30+
run: gh workflow run apify_docs_pr.yml --repo apify/apify-docs-private --field pr-number=${{ github.event.pull_request.number }} --field original-repository=${{ github.repository }} --field action=delete
31+
env:
32+
GH_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}

apify-api/openapi/components/schemas/datasets/Dataset.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,27 @@ properties:
4747
type: string
4848
description: ''
4949
nullable: true
50+
schema:
51+
type: object
52+
nullable: true
53+
description: Defines the schema of items in your dataset, the full specification can be found in [Apify docs](/platform/actors/development/actor-definition/dataset-schema)
54+
example:
55+
actorSpecification: 1
56+
title: "My dataset"
57+
views:
58+
overview:
59+
title: "Overview"
60+
transformation:
61+
fields:
62+
- "linkUrl"
63+
display:
64+
component: "table"
65+
properties:
66+
linkUrl:
67+
label: "Link URL"
68+
format: "link"
5069
consoleUrl:
5170
type: string
5271
example: 'https://console.apify.com/storage/datasets/27TmTznX9YPeAYhkC'
72+
stats:
73+
$ref: ./DatasetStats.yaml
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
title: DatasetStats
2+
required:
3+
- readCount
4+
- writeCount
5+
- storageBytes
6+
type: object
7+
properties:
8+
readCount:
9+
type: number
10+
example: 22
11+
writeCount:
12+
type: number
13+
example: 3
14+
storageBytes:
15+
type: number
16+
example: 783
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/openapi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,8 @@ paths:
581581
$ref: 'paths/request-queues/request-queues@{queueId}.yaml'
582582
'/v2/request-queues/{queueId}/requests/batch':
583583
$ref: 'paths/request-queues/request-queues@{queueId}@requests@batch.yaml'
584+
'/v2/request-queues/{queueId}/requests/unlock':
585+
$ref: 'paths/request-queues/request-queues@{queueId}@requests@unlock.yaml'
584586
'/v2/request-queues/{queueId}/requests':
585587
$ref: 'paths/request-queues/request-queues@{queueId}@requests.yaml'
586588
'/v2/request-queues/{queueId}/requests/{requestId}':

0 commit comments

Comments
 (0)