Skip to content

Commit a1a0937

Browse files
ci(release): Automated merge from release/v2.11.0 workflow
Release `v2.11.0`
2 parents 316075f + 07fc0ac commit a1a0937

24 files changed

Lines changed: 1141 additions & 108 deletions

docker/README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ regarding FiftyOne Enterprise.
6262
- [:page_facing_up: Optional: Upload Run Logs](#page_facing_up-optional-upload-run-logs)
6363
- [:desktop_computer: GPU-Enabled Workloads](#desktop_computer-gpu-enabled-workloads)
6464
- [:bricks: Custom Plugin Images](#bricks-custom-plugin-images)
65+
- [:on: On-Demand Delegated Operator Executors](#on-on-demand-delegated-operator-executors)
6566
- [Step 8: Identity Provider (IdP) and Authentication (CAS)](#step-8-identity-provider-idp-and-authentication-cas)
6667
- [:information_source: IdP configuration](#information_source-idp-configuration)
6768
- [:hammer_and_wrench: Optional: CAS Customization Instructions](#hammer_and_wrench-optional-cas-customization-instructions)
@@ -192,7 +193,7 @@ You can override the default image used by any service in
192193
```yaml
193194
services:
194195
fiftyone-app:
195-
image: voxel51/fiftyone-app-torch:v2.10.2
196+
image: voxel51/fiftyone-app-torch:v2.11.0
196197
```
197198

198199
## :rocket: Step 4: Initial Deployment
@@ -438,6 +439,12 @@ and deploy **custom plugin images**. You can base them on
438439
- ML libraries (e.g. PyTorch, OpenCV)
439440
- Internal SDKs or models
440441

442+
### :on: On-Demand Delegated Operator Executors
443+
444+
FiftyOne Enterprise v2.11 introduces support for on-demand delegated operator
445+
executors for Databricks and Anyscale. Please refer to the
446+
[configuration documentation](https://github.com/voxel51/fiftyone-teams-app-deploy/blob/main/docs/configuring-on-demand-orchestrator.md).
447+
441448
## Step 8: Identity Provider (IdP) and Authentication (CAS)
442449

443450
### :information_source: IdP configuration
@@ -653,6 +660,7 @@ services:
653660
| `FIFTYONE_DEFAULT_APP_PORT` | The host port that `fiftyone-app` should bind to; the default is `5151` | Yes |
654661
| `FIFTYONE_ENCRYPTION_KEY` | Used to encrypt storage credentials in MongoDB | Yes |
655662
| `FIFTYONE_ENV` | GraphQL verbosity for the `fiftyone-teams-api` service; `production` will not log every GraphQL query, any other value will | No |
663+
| `FIFTYONE_LOGGING_FORMAT` | The format to use for log messages; `json` or `text`. The default is `text`. | No |
656664
| `FIFTYONE_PLUGINS_DIR` | Persistent directory inside the containers for plugins to be mounted to. `teams-api` must have write access to this directory, all plugin nodes must have read access to this directory. | No |
657665
| `FIFTYONE_SIGNED_URL_EXPIRATION` | Set the time-to-live for signed URLs generated by the application in hours. Set in the `fiftyone-app` service. | 24 |
658666
| `FIFTYONE_SNAPSHOTS_ARCHIVE_PATH` | Full path to network-mounted file system or a cloud storage path to use for snapshot archive storage. The default `None` means archival is disabled. | No |

docker/common-services.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
fiftyone-app-common:
4-
image: voxel51/fiftyone-app:v2.10.2
4+
image: voxel51/fiftyone-app:v2.11.0
55
environment:
66
API_URL: ${API_URL}
77
FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE: ${FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE}
@@ -32,15 +32,17 @@ services:
3232
restart: always
3333

3434
teams-api-common:
35-
image: voxel51/fiftyone-teams-api:v2.10.2
35+
image: voxel51/fiftyone-teams-api:v2.11.0
3636
environment:
37+
API_EXTERNAL_URL: ${FIFTYONE_API_URI}
3738
CAS_BASE_URL: ${CAS_BASE_URL:-http://teams-cas:3000/cas/api}
3839
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
3940
FIFTYONE_DATABASE_NAME: ${FIFTYONE_DATABASE_NAME}
4041
FIFTYONE_DATABASE_URI: ${FIFTYONE_DATABASE_URI}
4142
FIFTYONE_ENCRYPTION_KEY: ${FIFTYONE_ENCRYPTION_KEY}
4243
FIFTYONE_ENV: ${FIFTYONE_ENV}
4344
FIFTYONE_INTERNAL_SERVICE: true
45+
FIFTYONE_LOGGING_FORMAT: ${FIFTYONE_LOGGING_FORMAT:-text}
4446
GRAPHQL_DEFAULT_LIMIT: ${GRAPHQL_DEFAULT_LIMIT}
4547
LOGGING_LEVEL: ${API_LOGGING_LEVEL:-INFO}
4648
MONGO_DEFAULT_DB: ${FIFTYONE_DATABASE_NAME}
@@ -59,14 +61,13 @@ services:
5961
restart: always
6062

6163
teams-app-common:
62-
image: voxel51/fiftyone-teams-app:v2.10.2
64+
image: voxel51/fiftyone-teams-app:v2.11.0
6365
environment:
6466
API_URL: ${API_URL}
6567
APP_USE_HTTPS: ${APP_USE_HTTPS:-true}
66-
FIFTYONE_API_URI:
67-
${FIFTYONE_API_URI:-"Please contact your Admin for an API URI"}
68+
FIFTYONE_API_URI: ${FIFTYONE_API_URI:-"Please contact your Admin for an API URI"}
6869
FIFTYONE_APP_ALLOW_MEDIA_EXPORT: ${FIFTYONE_APP_ALLOW_MEDIA_EXPORT:-true}
69-
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 2.10.2
70+
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 2.11.0
7071
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
7172
FIFTYONE_SERVER_ADDRESS: ""
7273
FIFTYONE_SERVER_PATH_PREFIX: /api/proxy/fiftyone-teams
@@ -93,7 +94,7 @@ services:
9394
restart: always
9495

9596
teams-cas-common:
96-
image: voxel51/fiftyone-teams-cas:v2.10.2
97+
image: voxel51/fiftyone-teams-cas:v2.11.0
9798
environment:
9899
CAS_DATABASE_NAME: ${CAS_DATABASE_NAME:-cas}
99100
CAS_DEFAULT_USER_ROLE: ${CAS_DEFAULT_USER_ROLE:-GUEST}
@@ -128,7 +129,7 @@ services:
128129
read_only: true
129130

130131
teams-plugins-common:
131-
image: voxel51/fiftyone-app-torch:v2.10.2
132+
image: voxel51/fiftyone-app-torch:v2.11.0
132133
environment:
133134
API_URL: ${API_URL}
134135
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
@@ -155,7 +156,7 @@ services:
155156
restart: always
156157

157158
teams-do-common:
158-
image: voxel51/fiftyone-teams-cv-full:v2.10.2
159+
image: voxel51/fiftyone-teams-cv-full:v2.11.0
159160
deploy:
160161
replicas: ${FIFTYONE_DELEGATED_OPERATOR_WORKER_REPLICAS:-3}
161162
command: >

docker/docs/configuring-gpu-workloads.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ services:
6565
service: teams-do-common
6666

6767
teams-do-with-gpu:
68-
image: voxel51/fiftyone-teams-cv-full:v2.10.2
68+
image: voxel51/fiftyone-teams-cv-full:v2.11.0
6969
command: >
7070
/bin/sh -c "fiftyone delegated launch -t remote -n 'teams-do-with-gpu'"
7171
environment:

docker/docs/upgrading.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ quickstart 0.21.2
7878

7979
### From FiftyOne Enterprise Version 2.0.0 and Later
8080

81-
1. [Upgrade to FiftyOne Enterprise version 2.10.2](#upgrading-from-previous-versions)
81+
1. [Upgrade to FiftyOne Enterprise version 2.11.0](#upgrading-from-previous-versions)
8282
1. Voxel51 recommends upgrading all FiftyOne Enterprise SDK users to FiftyOne Enterprise
83-
version 2.10.2
83+
version 2.11.0
8484
1. Login to the FiftyOne Enterprise UI
8585
1. To obtain the CLI command to install the FiftyOne SDK associated with
8686
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
@@ -90,7 +90,7 @@ quickstart 0.21.2
9090
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
9191
```
9292

93-
1. To ensure that all datasets are now at version 1.5.2, run
93+
1. To ensure that all datasets are now at version 1.8.0, run
9494

9595
```shell
9696
fiftyone migrate --info
@@ -121,7 +121,7 @@ To utilize the prior image, update your `common-services.yaml` similar to the be
121121

122122
```yaml
123123
teams-do-common:
124-
image: voxel51/fiftyone-app:v2.10.2
124+
image: voxel51/fiftyone-app:v2.11.0
125125
```
126126
127127
#### FiftyOne Enterprise v2.2+ Delegated Operator Changes
@@ -156,7 +156,7 @@ Additionally,
156156

157157
### From FiftyOne Enterprise Versions 1.6.0 to 1.7.1
158158

159-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.10.2 _requires_ a license file.
159+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.11.0 _requires_ a license file.
160160
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
161161
> 2.0 or beyond.
162162
>
@@ -191,29 +191,29 @@ Additionally,
191191
mv license.key "${LOCAL_LICENSE_FILE_DIR}/license"
192192
```
193193

194-
1. [Upgrade to FiftyOne Enterprise version 2.10.2](#upgrading-from-previous-versions)
195-
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.10.2
194+
1. [Upgrade to FiftyOne Enterprise version 2.11.0](#upgrading-from-previous-versions)
195+
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.11.0
196196
1. Login to the FiftyOne Enterprise UI
197197
1. To obtain the CLI command to install the FiftyOne SDK associated with
198198
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
199199
1. Upgrade all the datasets
200-
> **NOTE**: Any FiftyOne SDK less than 2.10.2
200+
> **NOTE**: Any FiftyOne SDK less than 2.11.0
201201
> will lose connectivity at this point.
202-
> Upgrading to `fiftyone==2.10.2` is required.
202+
> Upgrading to `fiftyone==2.11.0` is required.
203203

204204
```shell
205205
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
206206
```
207207

208-
1. To ensure that all datasets are now at version 1.5.2, run
208+
1. To ensure that all datasets are now at version 1.8.0, run
209209

210210
```shell
211211
fiftyone migrate --info
212212
```
213213

214214
### From FiftyOne Enterprise Version 1.1.0 and Before Version 1.6.0
215215

216-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.10.2 _requires_
216+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.11.0 _requires_
217217
> your users to log in after the upgrade is complete.
218218
> This will interrupt active workflows in the FiftyOne Enterprise Hosted Web App.
219219
> You should coordinate this upgrade carefully with your end-users.
@@ -231,7 +231,7 @@ Additionally,
231231

232232
---
233233

234-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.10.2 _requires_ a license file.
234+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.11.0 _requires_ a license file.
235235
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
236236
> 2.0 or beyond.
237237
>
@@ -283,21 +283,21 @@ Additionally,
283283
unset FIFTYONE_DATABASE_ADMIN
284284
```
285285

286-
1. [Upgrade to FiftyOne Enterprise version 2.10.2](#upgrading-from-previous-versions)
287-
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.10.2
286+
1. [Upgrade to FiftyOne Enterprise version 2.11.0](#upgrading-from-previous-versions)
287+
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.11.0
288288
1. Login to the FiftyOne Enterprise UI
289289
1. To obtain the CLI command to install the FiftyOne SDK associated with
290290
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
291291
1. Upgrade all the datasets
292-
> **NOTE**: Any FiftyOne SDK less than 2.10.2
292+
> **NOTE**: Any FiftyOne SDK less than 2.11.0
293293
> will lose connectivity at this point.
294-
> Upgrading to `fiftyone==2.10.2` is required.
294+
> Upgrading to `fiftyone==2.11.0` is required.
295295

296296
```shell
297297
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
298298
```
299299

300-
1. To ensure that all datasets are now at version 1.5.2, run
300+
1. To ensure that all datasets are now at version 1.8.0, run
301301

302302
```shell
303303
fiftyone migrate --info
@@ -322,14 +322,14 @@ Additionally,
322322

323323
---
324324

325-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.10.2 _requires_ your users to
325+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.11.0 _requires_ your users to
326326
> log in after the upgrade is complete.
327327
> This will interrupt active workflows in the FiftyOne Enterprise Hosted Web App.
328328
> You should coordinate this upgrade carefully with your end-users.
329329

330330
---
331331

332-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.10.2 _requires_ a license file.
332+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.11.0 _requires_ a license file.
333333
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
334334
> 2.0 or beyond.
335335
>
@@ -360,18 +360,18 @@ Additionally,
360360
1. Update your web server routes to include routing
361361
`/cas/*` traffic to the `teams-cas` service.
362362
Please see our [example nginx configurations](../) for more information.
363-
1. [Upgrade to FiftyOne Enterprise v2.10.2](#upgrading-from-previous-versions)
363+
1. [Upgrade to FiftyOne Enterprise v2.11.0](#upgrading-from-previous-versions)
364364
with `FIFTYONE_DATABASE_ADMIN=true`
365365
(this is not the default for this release).
366366
> **NOTE**: FiftyOne SDK users will lose access to the FiftyOne
367-
> Enterprise Database at this step until they upgrade to `fiftyone==2.10.2`
367+
> Enterprise Database at this step until they upgrade to `fiftyone==2.11.0`
368368

369-
1. Upgrade your FiftyOne SDKs to version 2.10.2
369+
1. Upgrade your FiftyOne SDKs to version 2.11.0
370370
1. Login to the FiftyOne Enterprise UI
371371
1. To obtain the CLI command to install the FiftyOne SDK associated
372372
with your FiftyOne Enterprise version, navigate to
373373
`Account > Install FiftyOne`
374-
1. Confirm that datasets have been migrated to version 1.5.2
374+
1. Confirm that datasets have been migrated to version 1.8.0
375375

376376
```shell
377377
fiftyone migrate --info

docker/internal-auth/env.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This should be the URL your end-users will connect to
22
BASE_URL=https://example.fiftyone.ai
33

4-
# This should be set to the URI your end-users will use to connect to the API
4+
# This should be set to the URI your end-users and external orchestrators will use to connect to the API
55
# This could be the same as BASE_URL if you are using path-based routing
66
FIFTYONE_API_URI=https://example-api.fiftyone.ai
77

docker/legacy-auth/env.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ AUTH0_SECRET=
44
# This should be the URL your end-users will connect to
55
AUTH0_BASE_URL=https://example.fiftyone.ai
66

7-
# This should be set to the URI your end-users will use to connect to the API
7+
# This should be set to the URI your end-users and external orchestrators will use to connect to the API
88
# This could be the same as AUTH0_BASE_URL if you are using path-based routing
99
FIFTYONE_API_URI=https://example-api.fiftyone.ai
1010

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!-- markdownlint-disable no-inline-html line-length -->
2+
<!-- markdownlint-disable-next-line first-line-heading -->
3+
<div align="center">
4+
<p align="center">
5+
6+
<img alt="Voxel51 Logo" src="https://user-images.githubusercontent.com/25985824/106288517-2422e000-6216-11eb-871d-26ad2e7b1e59.png" height="55px"> &nbsp;
7+
<img alt="Voxel51 FiftyOne" src="https://user-images.githubusercontent.com/25985824/106288518-24bb7680-6216-11eb-8f10-60052c519586.png" height="50px">
8+
9+
</p>
10+
</div>
11+
<!-- markdownlint-enable no-inline-html line-length -->
12+
13+
---
14+
15+
# Configuring On-Demand Orchestrators
16+
17+
As of FiftyOne Enterprise v2.11.0, delegated operations can be run on-demand
18+
in select external compute platforms (orchestrators).
19+
20+
This is the list of supported orchestrators and their configuration guides:
21+
22+
- [Anyscale](./orchestrators/configuring-anyscale-orchestrator.md)
23+
- [Databricks](./orchestrators/configuring-databricks-orchestrator.md)

docs/custom-plugins.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ With a Dockerfile like this, you could use the following commands to
4646
build, and publish, your image to your internal registry
4747

4848
```shell
49-
FIFTYONE_ENTERPRISE_VERSION=v2.10.2
49+
FIFTYONE_ENTERPRISE_VERSION=v2.11.0
5050
docker buildx build --push \
5151
--build-arg FIFTYONE_ENTERPRISE_IMAGE_NAME="voxel51/fiftyone-app:${FIFTYONE_ENTERPRISE_VERSION}" \
5252
-t your-internal-registry/fiftyone-app-internal:${FIFTYONE_ENTERPRISE_VERSION} .
@@ -63,7 +63,7 @@ After your custom plugins image is built, you can add it to your
6363
```yaml
6464
services:
6565
teams-plugins:
66-
image: your-internal-registry/fiftyone-app-internal:v2.10.2
66+
image: your-internal-registry/fiftyone-app-internal:v2.11.0
6767
```
6868
6969
Please see

0 commit comments

Comments
 (0)