Merge pull request #242 from Boavizta/dev

Dev

Author: da-ekchajzer

Dockerfile

@@ -6,7 +6,10 @@ COPY . /app
 
 WORKDIR /app
 
-COPY dist/boaviztapi-$VERSION.tar.gz ./
+RUN python -m pip install --upgrade poetry wheel twine
+RUN poetry install --with dev
+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

Makefile

@@ -1,4 +1,5 @@
-CURRENT_VERSION := $(shell poetry version -s)
+CURRENT_VERSION := $(shell poetry version -s || sed -n '3s/.*version = "\(.*\)"/\1/p' pyproject.toml)
+TIMESTAMP := $(shell date "+%H.%M-%m-%d-%y")
 DOCKER_NAME := boavizta/boaviztapi:${CURRENT_VERSION}
 SEMVERS := major minor patch
 
@@ -40,3 +41,5 @@ distribute:
 docker-build:
 		docker build -t $(DOCKER_NAME) .  --build-arg VERSION=${CURRENT_VERSION}
 
+docker-build-development:
+		docker build -t boavizta/boaviztapi:${TIMESTAMP} .  --build-arg VERSION=${TIMESTAMP}

README.md

@@ -115,6 +115,12 @@ Run docker image
 docker run -p 5000:5000/tcp boavizta/boaviztapi:latest
 ```
 
+#### Alternative (if you don't have Python or Poetry)
+
+```sh
+make docker-build-development
+```
+
 ### Deploy to AWS as serverless application
 
 ⚠ This is currently not working , see  [Deployment as serverless application does not work · Issue #153 · Boavizta/boaviztapi](https://github.com/Boavizta/boaviztapi/issues/153)

boaviztapi/data/archetypes/cloud/aws.csv

@@ -72,7 +72,7 @@ AMD EPYC 7543P,Milan,EPYC (Zen 3 (Milan)),TSMC,2021-03-15,2.8 GHz,225.0,32.0,"33
 AMD EPYC 7551,Naples,,,,,,,,,,,,,,AMD,EPYC,https://github.com/cloud-carbon-footprint/cloud-carbon-coefficients/tree/main/data
 AMD EPYC 7551P,Naples,,,,,,,,,,,,,,AMD,EPYC,https://github.com/cloud-carbon-footprint/cloud-carbon-coefficients/tree/main/data
 AMD EPYC 7552,Rome,EPYC (Zen 2 (Rome)),TSMC,2019-08-07,2.2 GHz,200.0,48.0,"3,800 million",7.0,12x 74 mm²,416 mm2,14 nm,1304.0,io_die_size (416 mm2) + die_size (12x 74 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-7552.c2248
-AMD EPYC 7571,Naples,,,,,200.0,24.0,,,,,,,,AMD,EPYC,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
+AMD EPYC 7571,Naples,,,,2.2 GHz,200.0,24.0,,,,,,,,AMD,EPYC,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
 AMD EPYC 7573X,Milan-X,EPYC (Zen 3 (Milan)),TSMC,2022-03-22,2.8 GHz,280.0,32.0,"33,200 million",7.0,8x 81 mm²,416 mm²,12 nm,1064.0,io_die_size (416 mm²) + die_size (8x 81 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-7573x.c2760
 AMD EPYC 75F3,Milan,EPYC (Zen 3 (Milan)),TSMC,2021-03-15,2.95 GHz,280.0,32.0,"33,200 million",7.0,8x 81 mm²,416 mm²,12 nm,1064.0,io_die_size (416 mm²) + die_size (8x 81 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-75f3.c2378
 AMD EPYC 7601,Naples,,,,,,,,,,,,,,AMD,EPYC,https://github.com/cloud-carbon-footprint/cloud-carbon-coefficients/tree/main/data
@@ -91,8 +91,8 @@ AMD EPYC 7F32,Rome,EPYC (Zen 2 (Rome)),TSMC,2020-04-14,3.7 GHz,180.0,8.0,"3,800
 AMD EPYC 7F52,Rome,EPYC (Zen 2 (Rome)),TSMC,2020-04-14,3.5 GHz,155.0,16.0,"3,800 million",7.0,4x 74 mm²,416 mm2,14 nm,712.0,io_die_size (416 mm2) + die_size (4x 74 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-7f52.c2301
 AMD EPYC 7F72,Rome,EPYC (Zen 2 (Rome)),TSMC,2020-04-14,3.2 GHz,240.0,24.0,"3,800 million",7.0,6x 74 mm²,416 mm2,14 nm,860.0,io_die_size (416 mm2) + die_size (6x 74 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-7f72.c2302
 AMD EPYC 7H12,Rome,EPYC (Zen 2 (Rome)),TSMC,2019-09-18,2.6 GHz,280.0,64.0,"3,800 million",7.0,16x 74 mm²,416 mm2,14 nm,1600.0,io_die_size (416 mm2) + die_size (16x 74 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-7h12.c2244
-AMD EPYC 7R13,Milan,,,,,225.0,48.0,,7.0,,,,1064.0,Value of cpu_specs https://www.techpowerup.com/cpu-specs/epyc-7643.c2377,AMD,epyc,https://gadgetversus.com/processor/amd-epyc-7r13-specs/
-AMD EPYC 7R32,Rome,,,,,280.0,48.0,,,,,,1304.0,Value of cpu_specs https://www.techpowerup.com/cpu-specs/epyc-7552.c2248,AMD,EPYC,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
+AMD EPYC 7R13,Milan,,,,2.65 GHz,225.0,48.0,,7.0,,,,1064.0,Value of cpu_specs https://www.techpowerup.com/cpu-specs/epyc-7643.c2377,AMD,epyc,https://gadgetversus.com/processor/amd-epyc-7r13-specs/
+AMD EPYC 7R32,Rome,,,,2.8 GHz,280.0,48.0,,7.0,,,,1304.0,Value of cpu_specs https://www.techpowerup.com/cpu-specs/epyc-7552.c2248,AMD,EPYC,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
 AMD EPYC 9124,Genoa,EPYC (Zen 4 (Genoa)),TSMC,2022-11-10,3 GHz,200.0,16.0,"26,280 million",5.0,4x 72 mm²,397 mm²,6 nm,685.0,io_die_size (397 mm²) + die_size (4x 72 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-9124.c2917
 AMD EPYC 9174F,Genoa,EPYC (Zen 4 (Genoa)),TSMC,2022-11-10,4.1 GHz,320.0,16.0,"52,560 million",5.0,8x 72 mm²,397 mm²,6 nm,973.0,io_die_size (397 mm²) + die_size (8x 72 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-9174f.c2918
 AMD EPYC 9224,Genoa,EPYC (Zen 4 (Genoa)),TSMC,2022-11-10,2.5 GHz,200.0,24.0,"26,280 million",5.0,4x 72 mm²,397 mm²,6 nm,685.0,io_die_size (397 mm²) + die_size (4x 72 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-9224.c2919
@@ -111,6 +111,7 @@ AMD EPYC 9554P,Genoa,EPYC (Zen 4 (Genoa)),TSMC,2022-11-10,3.1 GHz,360.0,64.0,"52
 AMD EPYC 9634,Genoa,EPYC (Zen 4 (Genoa)),TSMC,2022-11-10,2.25 GHz,290.0,84.0,"78,840 million",5.0,12x 72 mm²,397 mm²,6 nm,1261.0,io_die_size (397 mm²) + die_size (12x 72 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-9634.c2932
 AMD EPYC 9654,Genoa,EPYC (Zen 4 (Genoa)),TSMC,2022-11-10,2.4 GHz,360.0,96.0,"78,840 million",5.0,12x 72 mm²,397 mm²,6 nm,1261.0,io_die_size (397 mm²) + die_size (12x 72 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-9654.c2933
 AMD EPYC 9654P,Genoa,EPYC (Zen 4 (Genoa)),TSMC,2022-11-10,2.4 GHz,360.0,96.0,"78,840 million",5.0,12x 72 mm²,397 mm²,6 nm,1261.0,io_die_size (397 mm²) + die_size (12x 72 mm²),AMD,EPYC,https://www.techpowerup.com/cpu-specs/epyc-9654p.c2934
+AMD EPYC 9R14,Genoa,EPYC (Zen 4 (Genoa)),TSMC,,3.7 GHz,280.0,96,,,,,,,,,,
 AMD EPYC Embedded 3101,Snowy Owl,EPYC Embedded (Zen (Snowy Owl)),GlobalFoundries,2018-02-21,2.1 GHz,35.0,4.0,"4,800 million",14.0,213 mm²,,,213.0,io_die_size () + die_size (213 mm²),AMD,EPYC Embedded,https://www.techpowerup.com/cpu-specs/epyc-embedded-3101.c3199
 AMD EPYC Embedded 3151,Snowy Owl,EPYC Embedded (Zen (Snowy Owl)),GlobalFoundries,2018-02-21,2.7 GHz,45.0,4.0,"4,800 million",14.0,213 mm²,,,213.0,io_die_size () + die_size (213 mm²),AMD,EPYC Embedded,https://www.techpowerup.com/cpu-specs/epyc-embedded-3151.c3200
 AMD EPYC Embedded 3201,Snowy Owl,EPYC Embedded (Zen (Snowy Owl)),GlobalFoundries,2018-02-21,1500 MHz,30.0,8.0,"4,800 million",14.0,213 mm²,,,213.0,io_die_size () + die_size (213 mm²),AMD,EPYC Embedded,https://www.techpowerup.com/cpu-specs/epyc-embedded-3201.c3201
@@ -357,8 +358,10 @@ AMD Ryzen Threadripper PRO 5955WX,Chagall PRO,Ryzen Threadripper (Zen 3 (Chagall
 AMD Ryzen Threadripper PRO 5965WX,Chagall PRO,Ryzen Threadripper (Zen 3 (Chagall)),TSMC,2022-03-08,3.8 GHz,280.0,24.0,"16,600 million",7.0,4x 81 mm²,416 mm²,14 nm,740.0,io_die_size (416 mm²) + die_size (4x 81 mm²),AMD,Ryzen Threadripper PRO,https://www.techpowerup.com/cpu-specs/ryzen-threadripper-pro-5965wx.c2721
 AMD Ryzen Threadripper PRO 5975WX,Chagall PRO,Ryzen Threadripper (Zen 3 (Chagall)),TSMC,2022-03-08,3.6 GHz,280.0,32.0,"16,600 million",7.0,4x 81 mm²,416 mm²,14 nm,740.0,io_die_size (416 mm²) + die_size (4x 81 mm²),AMD,Ryzen Threadripper PRO,https://www.techpowerup.com/cpu-specs/ryzen-threadripper-pro-5975wx.c2720
 AMD Ryzen Threadripper PRO 5995WX,Chagall PRO,Ryzen Threadripper (Zen 3 (Chagall)),TSMC,2022-03-08,2.7 GHz,280.0,64.0,"33,200 million",7.0,8x 81 mm²,416 mm²,14 nm,1064.0,io_die_size (416 mm²) + die_size (8x 81 mm²),AMD,Ryzen Threadripper PRO,https://www.techpowerup.com/cpu-specs/ryzen-threadripper-pro-5995wx.c2719
-Annapurna Labs Graviton,Graviton,,,,,40.0,16.0,,,,,,,,Annapurna Labs,Graviton,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
-Annapurna Labs Graviton2,Graviton2,,,,,150.0,64.0,,,,,,457.0,Value of cpu_manufacture https://en.wikichip.org/wiki/annapurna_labs/alpine/alc12b00,Annapurna Labs,Graviton2,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
+Annapurna Labs Graviton,Graviton,,,2018-11-01,2.3 GHz,40.0,16.0,,,,,,,,Annapurna Labs,Graviton,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
+Annapurna Labs Graviton2,Graviton2,,,2019-11-01,2.5 GHz,150.0,64.0,,,,,,457.0,Value of cpu_manufacture https://en.wikichip.org/wiki/annapurna_labs/alpine/alc12b00,Annapurna Labs,Graviton2,https://docs.google.com/spreadsheets/d/1DqYgQnEDLQVQm5acMAhLgHLD8xXCG9BIrk-_Nv6jF3k/edit#gid=224728652
+Annapurna Labs Graviton3,Graviton3,,,2021-11-01,2.6 GHz,220,64.0,,,,,,347.3,Sum of compute and memory controller and PCI controller die https://www.semianalysis.com/p/amazon-graviton-3-uses-chiplets-and,Annapurna Labs,Graviton3,
+Annapurna Labs Graviton3E,Graviton3E,,,,2.6 GHz,250,64.0,,,,,,347.3,Sum of compute and memory controller and PCI controller die https://www.semianalysis.com/p/amazon-graviton-3-uses-chiplets-and,Annapurna Labs,Graviton3,
 Intel Atom x7211E,Gracemont,Atom (Alder Lake-N),Intel,2023-01-03,1000 MHz,6.0,2.0,,10.0,,,,,io_die_size () + die_size (),Intel,Atom x,https://www.techpowerup.com/cpu-specs/atom-x7211e.c3012
 Intel Atom x7213E,Gracemont,Atom (Alder Lake-N),Intel,2023-01-03,1700 MHz,6.0,2.0,,10.0,,,,,io_die_size () + die_size (),Intel,Atom x,https://www.techpowerup.com/cpu-specs/atom-x7213e.c3011
 Intel Atom x7425E,Gracemont,Atom (Alder Lake-N),Intel,2023-01-03,1500 MHz,12.0,4.0,,10.0,,,,,io_die_size () + die_size (),Intel,Atom x,https://www.techpowerup.com/cpu-specs/atom-x7425e.c3013
@@ -1679,6 +1682,7 @@ Intel Xeon Platinum 8470N,Sapphire Rapids,Xeon Platinum (Sapphire Rapids-SP),Int
 Intel Xeon Platinum 8470Q,Sapphire Rapids,Xeon Platinum (Sapphire Rapids-SP),Intel,2023-01-10,2.1 GHz,350.0,52.0,,10.0,4x 477 mm²,,,1908.0,io_die_size () + die_size (4x 477 mm²),Intel,Xeon Platinum,https://www.techpowerup.com/cpu-specs/xeon-platinum-8470q.c3091
 Intel Xeon Platinum 8471N,Sapphire Rapids,Xeon Platinum (Sapphire Rapids-SP),Intel,2023-01-10,1800 MHz,300.0,52.0,,10.0,4x 477 mm²,,,1908.0,io_die_size () + die_size (4x 477 mm²),Intel,Xeon Platinum,https://www.techpowerup.com/cpu-specs/xeon-platinum-8471n.c3092
 Intel Xeon Platinum 8480+,Sapphire Rapids,Xeon Platinum (Sapphire Rapids-SP),Intel,2023-01-10,2000 MHz,350.0,56.0,,10.0,4x 477 mm²,,,1908.0,io_die_size () + die_size (4x 477 mm²),Intel,Xeon Platinum,https://www.techpowerup.com/cpu-specs/xeon-platinum-8480.c2958
+Intel Xeon Platinum 8488C,Sapphire Rapids,Xeon Platinum (Sapphire Rapids-SP),Intel,,2.4 GHz,385.0,48.0,,,,,,,,Intel,Xeon Platinum,
 Intel Xeon Platinum 8490H,Sapphire Rapids,Xeon Platinum (Sapphire Rapids-SP),Intel,2023-01-10,1900 MHz,350.0,60.0,,10.0,4x 477 mm²,,,1908.0,io_die_size () + die_size (4x 477 mm²),Intel,Xeon Platinum,https://www.techpowerup.com/cpu-specs/xeon-platinum-8490h.c2942
 Intel Xeon Platinum 9221,Cascade Lake-AP,Xeon Platinum (Cascade Lake-AP),Intel,2019-04-02,2.1 GHz,250.0,32.0,"8,000 million",14.0,,,,,io_die_size () + die_size (),Intel,Xeon Platinum,https://www.techpowerup.com/cpu-specs/xeon-platinum-9221.c2168
 Intel Xeon Platinum 9222,Cascade Lake-AP,Xeon Platinum (Cascade Lake-AP),Intel,2019-04-02,2.3 GHz,250.0,32.0,"8,000 million",14.0,,,,,io_die_size () + die_size (),Intel,Xeon Platinum,https://www.techpowerup.com/cpu-specs/xeon-platinum-9222.c2167