Skip to content

Commit 551aee7

Browse files
JonnyTranJonnyTran
committed
Merge branch 'develop'
2 parents 042b897 + 54ee356 commit 551aee7

2,392 files changed

Lines changed: 92796 additions & 70652 deletions

File tree

Some content is hidden

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

‎.devcontainer/devcontainer.json‎

Lines changed: 102 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,108 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
22
// README at: https://github.com/devcontainers/templates/tree/main/src/anaconda
33
{
4-
"name": "Tilt on K8s for full-stack development",
5-
6-
"build": {
7-
"context": ".",
8-
"dockerfile": "Dockerfile"
9-
},
10-
11-
"customizations": {
12-
"vscode": {
13-
"extensions": [
14-
"GitHub.copilot",
15-
"GitHub.copilot-chat",
16-
"github.vscode-github-actions",
17-
"ms-python.python",
18-
"usernamehw.errorlens",
19-
"charliermarsh.ruff",
20-
"ms-toolsai.jupyter",
21-
"eamodio.gitlens",
22-
"tilt-dev.tiltfile",
23-
"Vue.volar",
24-
"ms-kubernetes-tools.vscode-kubernetes-tools",
25-
"firsttris.vscode-jest-runner"
26-
]
4+
"name": "Tilt on K8s for full-stack development",
5+
"build": {
6+
"context": ".",
7+
"dockerfile": "Dockerfile"
278
},
28-
"settings": {
29-
"python.testing.pytestEnabled": true,
30-
"python.testing.cwd": "${workspaceFolder}/tests",
31-
"python.envFile": "${workspaceFolder}/extralit/.env.test",
32-
"python.testing.pytestArgs": [ "-vs", "--disable-warnings" ],
33-
"python.defaultInterpreterPath": "/opt/conda/bin/python",
34-
"python.condaPath": "/usr/local/bin/micromamba",
35-
"search.exclude": {
36-
"argilla-server/src/argilla_server/static/": true,
37-
"argilla-frontend/dist/": true,
38-
"_nuxt/": true,
39-
"node_modules/": true,
40-
".venv/": true
41-
},
42-
"files.watcherExclude": {
43-
"argilla-server/src/argilla_server/static/": true,
44-
"argilla-frontend/dist/": true,
45-
"_nuxt/": true,
46-
"node_modules/": true,
47-
".venv/": true
48-
},
49-
"[javascript]": {
50-
"editor.tabSize": 2
51-
},
52-
"jest.pathToJest": "npm test --",
53-
"jest.autoRun": {
54-
"watch": true,
55-
"onSave": "test-file"
56-
},
57-
"jest.runAllTestsFirst": false,
58-
"jest.showCoverageOnLoad": true,
59-
"jest.testExplorer": {
60-
"enabled": true
61-
}
62-
}
63-
},
64-
65-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
66-
"forwardPorts": [
67-
10350,
68-
5005,
69-
6443,
70-
3000
71-
],
72-
73-
"remoteEnv": {
74-
"WCS_HTTP_URL": "${localEnv:WCS_HTTP_URL}",
75-
"WCS_GRPC_URL": "${localEnv:WCS_GRPC_URL}",
76-
"WCS_API_KEY": "${localEnv:WCS_API_KEY}",
77-
"ARGILLA_DATABASE_URL": "${localEnv:ARGILLA_DATABASE_URL}",
78-
"S3_ENDPOINT": "${localEnv:S3_ENDPOINT}",
79-
"S3_ACCESS_KEY": "${localEnv:S3_ACCESS_KEY}",
80-
"S3_SECRET_KEY": "${localEnv:S3_SECRET_KEY}",
81-
"OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}"
82-
},
83-
84-
// Features to add to the dev container. More info: https://containers.dev/features.
85-
"features": {
86-
// Add Docker-in-Docker support. A Debian base requires the proprietary Docker engine.
87-
"ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {
88-
"version": "latest",
89-
"moby": "false"
9+
"customizations": {
10+
"vscode": {
11+
"extensions": [
12+
"GitHub.copilot",
13+
"GitHub.copilot-chat",
14+
"github.vscode-github-actions",
15+
"ms-python.python",
16+
"usernamehw.errorlens",
17+
"charliermarsh.ruff",
18+
"ms-toolsai.jupyter",
19+
"eamodio.gitlens",
20+
"tilt-dev.tiltfile",
21+
"Vue.volar",
22+
"ms-kubernetes-tools.vscode-kubernetes-tools",
23+
"firsttris.vscode-jest-runner"
24+
]
25+
},
26+
"settings": {
27+
"python.testing.pytestEnabled": true,
28+
"python.testing.cwd": "${workspaceFolder}/tests",
29+
"python.envFile": "${workspaceFolder}/extralit/.env.test",
30+
"python.testing.pytestArgs": [
31+
"-vs",
32+
"--disable-warnings"
33+
],
34+
"python.defaultInterpreterPath": "/opt/conda/bin/python",
35+
"python.condaPath": "/usr/local/bin/micromamba",
36+
"search.exclude": {
37+
"extralit-server/src/extralit_server/static/": true,
38+
"extralit-frontend/dist/": true,
39+
"_nuxt/": true,
40+
"node_modules/": true,
41+
".venv/": true
42+
},
43+
"files.watcherExclude": {
44+
"extralit-server/src/extralit_server/static/": true,
45+
"extralit-frontend/dist/": true,
46+
"_nuxt/": true,
47+
"node_modules/": true,
48+
".venv/": true
49+
},
50+
"[javascript]": {
51+
"editor.tabSize": 2
52+
},
53+
"jest.pathToJest": "npm test --",
54+
"jest.autoRun": {
55+
"watch": true,
56+
"onSave": "test-file"
57+
},
58+
"jest.runAllTestsFirst": false,
59+
"jest.showCoverageOnLoad": true,
60+
"jest.testExplorer": {
61+
"enabled": true
62+
}
63+
}
64+
},
65+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
66+
"forwardPorts": [
67+
10350,
68+
5005,
69+
6443,
70+
3000
71+
],
72+
"remoteEnv": {
73+
"WCS_HTTP_URL": "${localEnv:WCS_HTTP_URL}",
74+
"WCS_GRPC_URL": "${localEnv:WCS_GRPC_URL}",
75+
"WCS_API_KEY": "${localEnv:WCS_API_KEY}",
76+
"EXTRALIT_DATABASE_URL": "${localEnv:EXTRALIT_DATABASE_URL}",
77+
"S3_ENDPOINT": "${localEnv:S3_ENDPOINT}",
78+
"S3_ACCESS_KEY": "${localEnv:S3_ACCESS_KEY}",
79+
"S3_SECRET_KEY": "${localEnv:S3_SECRET_KEY}",
80+
"OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}"
9081
},
91-
92-
// Add Kubernetes support with k3d and the kubectl, and helm CLI tools.
93-
"ghcr.io/rio/features/k3d:1.1.0": {},
94-
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1.2.0": {},
95-
96-
// Add python support with micromamba and some packages
97-
"ghcr.io/mamba-org/devcontainer-features/micromamba": {
98-
"autoActivate": true,
99-
"channels": "conda-forge huggingface defaults",
100-
"packages": "python==3.10.14 uvicorn uv pdm ipykernel pre-commit pyparsing!=3.0.5 pytest pytest-cov pytest-mock pytest-asyncio==0.21.1 pytest-env factory_boy~=3.2.1 pandoc==2.12 ipython<8.0.0 nodejs==18.16.1 pandoc==2.12 pytest-randomly>=3.15.0",
101-
"envFile": "",
102-
"envName": "base"
82+
// Features to add to the dev container. More info: https://containers.dev/features.
83+
"features": {
84+
// Add Docker-in-Docker support. A Debian base requires the proprietary Docker engine.
85+
"ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {
86+
"version": "latest",
87+
"moby": "false"
88+
},
89+
// Add Kubernetes support with k3d and the kubectl, and helm CLI tools.
90+
"ghcr.io/rio/features/k3d:1.1.0": {},
91+
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1.2.0": {},
92+
// Add python support with micromamba and some packages
93+
"ghcr.io/mamba-org/devcontainer-features/micromamba": {
94+
"autoActivate": true,
95+
"channels": "conda-forge huggingface defaults",
96+
"packages": "python==3.10.14 uvicorn uv pdm ipykernel pre-commit pyparsing!=3.0.5 pytest pytest-cov pytest-mock pytest-asyncio==0.21.1 pytest-env factory_boy~=3.2.1 pandoc==2.12 ipython<8.0.0 nodejs==18.16.1 pandoc==2.12 pytest-randomly>=3.15.0",
97+
"envFile": "",
98+
"envName": "base"
99+
},
103100
},
104-
105-
},
106-
107-
"postCreateCommand": "/workspace/setup.sh",
108-
"postStopCommand": "tilt down",
109-
110-
"hostRequirements": {
111-
"cpus": 4,
112-
"memory": "16gb",
113-
"storage": "32gb"
114-
}
115-
}
101+
"postCreateCommand": "/workspace/setup.sh",
102+
"postStopCommand": "tilt down",
103+
"hostRequirements": {
104+
"cpus": 4,
105+
"memory": "16gb",
106+
"storage": "32gb"
107+
}
108+
}

‎.devcontainer/docker-compose/.env.dev‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
S3_ENDPOINT=http://localhost:9000
2-
S3_ACCESS_KEY=access_key
3-
S3_SECRET_KEY=secret_key
2+
S3_ACCESS_KEY=minioadmin
3+
S3_SECRET_KEY=minioadmin
44

5-
MINIO_ACCESS_KEY=access_key
6-
MINIO_SECRET_KEY=secret_key
5+
MINIO_ACCESS_KEY=minioadmin
6+
MINIO_SECRET_KEY=minioadmin
77

88
WCS_HTTP_URL=localhost
99
WCS_GRPC_URL=localhost

0 commit comments

Comments
 (0)