Skip to content

Commit df2fd0b

Browse files
authored
Hotfix/documentation (#254)
Documentation updates
2 parents 864cf04 + 278d330 commit df2fd0b

6 files changed

Lines changed: 115 additions & 151 deletions

File tree

.env.dist

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
# ===========================================================
2+
# Environment variables for odtp
3+
# Setup options:
4+
# - [COMPOSE] `docker compose` (recommended)
5+
# - [DEV] `docker compose -f compose.dev.yml` (for development)
6+
# - [VM] server setup with poetry
7+
# ===========================================================
8+
9+
# ===========================================================
10+
# Credentials with other services
11+
# - needed for all setup methods
12+
# ===========================================================
13+
14+
# Credentials github
15+
# your github token
16+
GITHUB_TOKEN=
17+
18+
# ===========================================================
19+
# Credentials that you can choose on setup
20+
# - needed for all setup methods
21+
# ===========================================================
22+
23+
# Credentials S3
24+
ODTP_ACCESS_KEY=
25+
ODTP_SECRET_KEY=
26+
27+
# mongodb user and password
28+
MONGO_DB_USER=
29+
MONGO_DB_PASSWORD=
30+
31+
# mongoexpress user and password
32+
MONGO_EXPRESS_USER=
33+
MONGO_EXPRESS_PASSWORD=
34+
35+
# ===========================================================
36+
# Database names
37+
# - needed for all setup methods
38+
# ===========================================================
39+
40+
# odtp db instance in the mongo db: "odtp"
41+
ODTP_MONGO_DB=odtp
42+
43+
# s3 bucket name: "odtp"
44+
ODTP_BUCKET_NAME=odtp
45+
46+
# ===========================================================
47+
# ODTP Path is where the dashboard will store users,
48+
# digital twins and executions
49+
# - needed for all setup methods
50+
# ===========================================================
51+
52+
# path where your executions run and the digital twins are stored
53+
ODTP_PATH=
54+
55+
# ===========================================================
56+
# Volumes to persist database content
57+
# these must match path on your local computer
58+
# - only needed for setup methods [COMPOSE], [DEV]
59+
# ===========================================================
60+
61+
# path where s3 data is stored
62+
MINIO_PATH=
63+
64+
# path where mongodb content is stored
65+
MONGODB_PATH=
66+
67+
# ===========================================================
68+
# Operational settings: change only if needed
69+
# - needed for all setup methods
70+
# ===========================================================
71+
72+
# Dashboard parameters
73+
ODTP_DASHBOARD_PORT=8003
74+
ODTP_DASHBOARD_RELOAD=False
75+
76+
# Log level
77+
ODTP_LOG_LEVEL=ERROR
78+
RUN_LOG_LEVEL=INFO
79+
80+
# Set to False if your docker installation does not allow the flag --gpus all
81+
# Set to True in case you want to use GPUs
82+
ALLOW_DOCKER_GPUS=False
83+
84+
# ===========================================================
85+
# Development settings: only needed for development
86+
# setup with compose.dev.yml:
87+
# `docker compose -f compose.dev.yml`
88+
# - only needed for setup method [DEV]
89+
# ===========================================================
90+
91+
# Local path on your computer to your odtp installation
92+
APP_PATH=
93+
94+
# Install the package in editable mode.
95+
PIP_INSTALL_ARGS="--editable"
96+
97+
# ===========================================================
98+
# Service URLS
99+
# - only needed for setup method [VM]
100+
# ===========================================================
101+
102+
# mongo url: example "mongodb://localhost:27017/"
103+
ODTP_MONGO_SERVER=
104+
105+
# S3 server url: example: "https://s3.epfl.ch"
106+
ODTP_S3_SERVER=

.env.dist.compose

Lines changed: 0 additions & 47 deletions
This file was deleted.

.env.dist.compose.dev

Lines changed: 0 additions & 54 deletions
This file was deleted.

.env.dist.local

Lines changed: 0 additions & 42 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
__pycache__/
22
.DS_Store
33
.env*
4-
!.env.dist.*
4+
!.env.dist
55
.nicegui
66
.local
77
odtp/odtp.log

CHANGELOG.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
- gui: gui allows now to deprecate workflows, executions and component versions. Deprecated items are
1414
no longer offered in selects. Items can be deprecated and also reactivated
1515
- env: an additional env variable is added ALLOW_DOCKER_GPUS that must be set to false if the used Docker
16-
version does not allow GPU settings such as
16+
version does not allow GPU settings such as `--gpus`
17+
1718
- v0.4.0
1819
- gui: the general workflow for the user was improved (new Items are selected automatically for example)
1920
- gui: validation has been implemented in the forms to make sure data that is entered will be valid
@@ -46,7 +47,7 @@
4647
- hotfix ODTP port in docker compose
4748

4849
- v0.2.6: Bugs correction
49-
- Missing `ODTP_PATH` in `compose.yml`.
50+
- Missing `ODTP_PATH` in `compose.yml`.
5051

5152
- v0.2.5: Bugs corrections and new features
5253
- Components tags parsing
@@ -60,22 +61,22 @@
6061

6162
- v.0.2.3: Feature
6263
- Expose dashboard parameters: port and reload
63-
64+
6465
- v.0.2.2: Bugs correction
6566
- Including submodules when cloning file
6667

6768
- v.0.2.1: Add docker compose for easy setup
6869
- add compose.yml: it can be build with `docker compose up`
6970
- check `.env` file with `docker compose config`
70-
- remove data mockup
71+
- remove data mockup
7172
- environment variables now loaded from the environment
7273

7374
- v.0.2.0: Improvements in database and files management.
74-
- New MongoDB Schema supporting users, digital twins, executions, and steps.
75+
- New MongoDB Schema supporting users, digital twins, executions, and steps.
7576
- Setup uses pyproject.toml and set up method changed to poetry
7677
- mongodb access function modified so that they can be used by both the GIU and the CLI
77-
- CLI refactored with methods for creating and managing digital twins, and executions.
78-
- Automatic preparation of project folders for executions.
78+
- CLI refactored with methods for creating and managing digital twins, and executions.
79+
- Automatic preparation of project folders for executions.
7980
- S3 uploading of outputs from each component.
8081
- Switch UI from Streamlit to Nicegui
8182

0 commit comments

Comments
 (0)