Skip to content

Commit

Permalink
Merge branch 'dev' into dev-clever
Browse files Browse the repository at this point in the history
  • Loading branch information
da-ekchajzer committed Oct 23, 2024
2 parents 299b3ed + f1e367a commit 52aa6b6
Show file tree
Hide file tree
Showing 19 changed files with 271 additions and 390 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_client_sdk_with_poetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
python -m pip install --upgrade poetry wheel twine
- id: cache-pipenv
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.local/share/virtualenvs
key: ${{ runner.os }}-pipenv-${{ hashFiles('**/Pipfile.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
python -m pip install --upgrade poetry wheel
- id: cache-pipenv
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.local/share/virtualenvs
key: ${{ runner.os }}-pipenv-${{ hashFiles('**/Pipfile.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN poetry build
RUN PROJECT_VERSION=$(poetry version -s) && cp /app/dist/boaviztapi-$PROJECT_VERSION.tar.gz ./boaviztapi-$VERSION.tar.gz
RUN pip install boaviztapi-$VERSION.tar.gz && cp $(which uvicorn) /app

FROM gcr.io/distroless/python3
FROM python:$PY_VERSION-slim AS run-env
# Python 3 surrogate unicode handling
# @see https://click.palletsprojects.com/en/7.x/python3/
ENV LC_ALL=C.UTF-8
Expand Down
12 changes: 6 additions & 6 deletions boaviztapi/data/archetypes/cloud/aws.csv
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,12 @@ inf2.xlarge,4,16,0,0,1,inf2.48xlarge,
inf2.8xlarge,32,128,0,0,1,inf2.48xlarge,
inf2.24xlarge,96,384,0,0,6,inf2.48xlarge,
inf2.48xlarge,192,768,0,0,12,inf2.48xlarge,
is4gen.medium,1,6,937,0,0,is4gen.8xlarge,
is4gen.large,2,12,1875,0,0,is4gen.8xlarge,
is4gen.xlarge,4,24,3750,0,0,is4gen.8xlarge,
is4gen.2xlarge,8,48,7500,0,0,is4gen.8xlarge,
is4gen.4xlarge,16,96,15000,0,0,is4gen.8xlarge,
is4gen.8xlarge,32,192,30000,0,0,is4gen.8xlarge,
is4gen.medium,1,6,937,0,0,is4gen.metal,
is4gen.large,2,12,1875,0,0,is4gen.metal,
is4gen.xlarge,4,24,3750,0,0,is4gen.metal,
is4gen.2xlarge,8,48,7500,0,0,is4gen.metal,
is4gen.4xlarge,16,96,15000,0,0,is4gen.metal,
is4gen.8xlarge,32,192,30000,0,0,is4gen.metal,
db.m1.medium,1,3.75,0,0,0,platform_aws_m1,https://aws.amazon.com/ec2/previous-generation/
m1.medium,1,3.75,410,0,0,platform_aws_m1,https://aws.amazon.com/ec2/previous-generation/
db.m1.small,1,1.7,0,0,0,platform_aws_m1,https://aws.amazon.com/ec2/previous-generation/
Expand Down
322 changes: 1 addition & 321 deletions boaviztapi/data/archetypes/cloud/azure.csv

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions boaviztapi/data/archetypes/cloud/providers.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
provider.name,provider.description
aws,Amazon Web Services
azure,Microsoft Azure
scaleway,Scaleway
70 changes: 70 additions & 0 deletions boaviztapi/data/archetypes/cloud/scaleway.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
id,vcpu,memory,ssd_storage,hdd_storage,gpu_units,platform,source
coparm1-16c-64g,16,64,10,0,0,scw_coparm1.base,
coparm1-2c-8g,2,8,10,0,0,scw_coparm1.base,
coparm1-32c-128g,32,128,10,0,0,scw_coparm1.base,
coparm1-4c-16g,4,16,10,0,0,scw_coparm1.base,
coparm1-8c-32g,8,32,10,0,0,scw_coparm1.base,
dev1-l,4,8,10,0,0,scw_dev1.base,
dev1-m,3,4,10,0,0,scw_dev1.base,
dev1-s,2,2,10,0,0,scw_dev1.base,
dev1-xl,4,12,10,0,0,scw_dev1.base,
ent1-2xl,96,384,10,0,0,scw_ent1.base,
ent1-l,32,128,10,0,0,scw_ent1.base,
ent1-m,16,64,10,0,0,scw_ent1.base,
ent1-s,8,32,10,0,0,scw_ent1.base,
ent1-xl,64,256,10,0,0,scw_ent1.base,
ent1-xs,4,16,10,0,0,scw_ent1.base,
ent1-xxs,2,8,10,0,0,scw_ent1.base,
gp1-l,32,128,10,0,0,scw_gp1.base,
gp1-m,16,64,10,0,0,scw_gp1.base,
gp1-s,8,32,10,0,0,scw_gp1.base,
gp1-viz,8,32,10,0,0,scw_gp1.base,
gp1-xl,48,256,10,0,0,scw_gp1.base,
gp1-xs,4,16,10,0,0,scw_gp1.base,
gpu-3070-s,8,16,10,0,1,scw_renders.base,
h100-1-80g,24,240,10,0,1,scw_h100.base,
h100-1-m,24,240,10,0,1,scw_h100.base,
h100-2-80g,48,480,10,0,2,scw_h100.base,
h100-2-m,48,480,10,0,2,scw_h100.base,
l4-1-24g,8,48,10,0,1,scw_l4.base,
l4-2-24g,16,96,10,0,2,scw_l4.base,
l4-4-24g,32,192,10,0,4,scw_l4.base,
l4-8-24g,64,384,10,0,8,scw_l4.base,
l40s-1-48g,8,96,10,0,1,scw_l4.base,
l40s-2-48g,16,192,10,0,2,scw_l4.base,
l40s-4-48g,32,384,10,0,4,scw_l4.base,
l40s-8-48g,64,768,10,0,8,scw_l4.base,
play2-micro,4,8,10,0,0,scw_play2.base,
play2-nano,2,4,10,0,0,scw_play2.base,
play2-pico,1,2,10,0,0,scw_play2.base,
pop2-16c-64g,16,64,10,0,0,scw_pop2.base,
pop2-16c-64g-win,16,64,10,0,0,scw_pop2.base,
pop2-2c-8g,2,8,10,0,0,scw_pop2.base,
pop2-2c-8g-win,2,8,10,0,0,scw_pop2.base,
pop2-32c-128g,32,128,10,0,0,scw_pop2.base,
pop2-32c-128g-win,32,128,10,0,0,scw_pop2.base,
pop2-4c-16g,4,16,10,0,0,scw_pop2.base,
pop2-4c-16g-win,4,16,10,0,0,scw_pop2.base,
pop2-64c-256g,64,256,10,0,0,scw_pop2.base,
pop2-8c-32g,8,32,10,0,0,scw_pop2.base,
pop2-8c-32g-win,8,32,10,0,0,scw_pop2.base,
pop2-hc-16c-32g,16,32,10,0,0,scw_pop2hc.base,
pop2-hc-2c-4g,2,4,10,0,0,scw_pop2hc.base,
pop2-hc-32c-64g,32,64,10,0,0,scw_pop2hc.base,
pop2-hc-4c-8g,4,8,10,0,0,scw_pop2hc.base,
pop2-hc-64c-128g,64,128,10,0,0,scw_pop2hc.base,
pop2-hc-8c-16g,8,16,10,0,0,scw_pop2hc.base,
pop2-hm-16c-128g,16,128,10,0,0,scw_pop2hm.base,
pop2-hm-2c-16g,2,16,10,0,0,scw_pop2hm.base,
pop2-hm-32c-256g,32,256,10,0,0,scw_pop2hm.base,
pop2-hm-4c-32g,4,32,10,0,0,scw_pop2hm.base,
pop2-hm-64c-512g,64,512,10,0,0,scw_pop2hm.base,
pop2-hm-8c-64g,8,64,10,0,0,scw_pop2hm.base,
pop2-hn-10,4,8,10,0,0,scw_pop2.base,
pop2-hn-3,2,4,10,0,0,scw_pop2.base,
pop2-hn-5,4,8,10,0,0,scw_pop2.base,
pro2-l,32,128,10,0,0,scw_pro2.base,
pro2-m,16,64,10,0,0,scw_pro2.base,
pro2-s,8,32,10,0,0,scw_pro2.base,
pro2-xs,4,16,10,0,0,scw_pro2.base,
pro2-xxs,2,8,10,0,0,scw_pro2.base,
Loading

0 comments on commit 52aa6b6

Please sign in to comment.