Merge branch 'main' into run-clever

Author: jnioche

.github/workflows/generate_requirements_for_clever_cloud.yml

@@ -33,6 +33,8 @@ jobs:
       - name: Install dependencies
         run: poetry install
 
+      - name: Install the export plugin
+        run: poetry self add poetry-plugin-export
 
       - name: Export requirements.txt
         run: |

boaviztapi/data/archetypes/cloud/aws.csv

@@ -238,6 +238,24 @@ g5.12xlarge,48,192,3800,0,4,g5.48xlarge,
 g5.16xlarge,64,256,1900,0,1,g5.48xlarge,
 g5.24xlarge,96,384,3800,0,4,g5.48xlarge,
 g5.48xlarge,192,768,7600,0,8,g5.48xlarge,
+g6.xlarge,4,16,250,0,1,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6.2xlarge,8,32,450,0,1,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6.4xlarge,16,64,600,0,1,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6.8xlarge,32,128,900,0,1,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6.16xlarge,64,256,1880,0,1,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6.12xlarge,48,192,3760,0,4,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6.24xlarge,96,384,3760,0,4,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6.48xlarge,192,768,7520,0,8,g6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+g6e.xlarge,4,32,250,0,1,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+g6e.2xlarge,8,64,450,0,1,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+g6e.4xlarge,16,128,600,0,1,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+g6e.8xlarge,32,256,900,0,1,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+g6e.16xlarge,64,192,1900,0,1,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+g6e.12xlarge,48,384,3800,0,4,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+g6e.24xlarge,96,768,3800,0,4,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+g6e.48xlarge,192,1536,7600,0,8,g6e.48xlarge,https://aws.amazon.com/ec2/instance-types/g6e/
+gr6.4xlarge,16,64,600,0,1,gr6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
+gr6.8xlarge,32,128,900,0,1,gr6.48xlarge,https://aws.amazon.com/ec2/instance-types/g6/
 g5g.xlarge,4,8,0,0,1,g5g.metal,
 g5g.2xlarge,8,16,0,0,1,g5g.metal,
 g5g.4xlarge,16,32,0,0,1,g5g.metal,
@@ -1013,4 +1031,4 @@ i8g.8xlarge,32,256,7500,0,0,i8g.metal-24xl,
 i8g.12xlarge,48,384,11250,0,0,i8g.metal-24xl,
 i8g.16xlarge,64,512,15000,0,0,i8g.metal-24xl,
 i8g.24xlarge,96,768,22500,0,0,i8g.metal-24xl,
-i8g.metal-24xl,96,768,22500,0,0,i8g.metal-24xl,
+i8g.metal-24xl,96,768,22500,0,0,i8g.metal-24xl,

boaviztapi/data/archetypes/cloud/gcp.csv

@@ -2,4 +2,4 @@ provider.name,provider.description
 aws,Amazon Web Services
 azure,Microsoft Azure
 scaleway,Scaleway
-gcp, Google Cloud Platform
+gcp,Google Cloud Platform

boaviztapi/data/archetypes/cloud/providers.csv

@@ -76,6 +76,9 @@ c7gn.16xlarge,AWS,rack,1,,,Annapurna Labs Graviton3E,,4,32,0,0,0,0,0,,0,2;2;2,2.
 c7i.48xlarge,AWS,rack,6,,,Intel Xeon Platinum 8488C,,12,32,0,0,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 g5.48xlarge,AWS,rack,2,,,AMD EPYC 7R32,,24,32,2,3800,0,0,8,NVIDIA A10G,24,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 g5g.metal,AWS,rack,1,,,Annapurna Labs Graviton2,,4,32,0,0,0,0,2,NVIDIA T4G Tensor Core,16,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
+g6.48xlarge,AWS,rack,2,,,AMD EPYC 7R13,,24,32,8,940,0,0,8,NVIDIA L4,24,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM and PSU configuration were not verified
+g6e.48xlarge,AWS,rack,2,,,AMD EPYC 7R13,,6,256,4,1900,0,0,8,NVIDIA L40S,48,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM and PSU configuration were not verified
+gr6.48xlarge,AWS,rack,2,,,AMD EPYC 7R32,,1,256,2,450,0,0,1,NVIDIA L4,24,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM and PSU configuration were not verified
 hpc7g.16xlarge,AWS,rack,1,,,Annapurna Labs Graviton3,,4,32,0,0,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 i4g.16xlarge,AWS,rack,1,,,Annapurna Labs Graviton2,,16,32,4,3750,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 i4i.metal,AWS,rack,2,,,Intel Xeon Platinum 8375C,,32,32,8,3750,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
@@ -101,6 +104,7 @@ r7a.metal-48xl,AWS,rack,2,,,AMD EPYC 9R14,,48,32,0,0,0,0,0,,0,2;2;2,2.99;1;5,50;
 r7g.metal,AWS,rack,1,,,Annapurna Labs Graviton3,,16,32,0,0,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 r7gd.16xlarge,AWS,rack,1,,,Annapurna Labs Graviton3,,16,32,2,1900,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 r7iz.32xlarge,AWS,rack,2,,,Intel Xeon Gold 6455B,,32,32,0,0,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
+r7i.metal-48xl,AWS,rack,2,,,Intel Xeon Platinum 8488C,,6,256,0,0,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,
 trn1.32xlarge,AWS,rack,2,,,Intel Xeon Platinum 8375C,,16,32,4,1900,0,0,16,AWS Inferentia,32,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 vt1.24xlarge,AWS,rack,2,,,Intel Xeon Platinum 8259CL,,6,32,0,0,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified
 x2idn.metal,AWS,rack,2,,,Intel Xeon Platinum 8375C,,64,32,2,1900,0,0,0,,0,2;2;2,2.99;1;5,50;0;100,1,52560,0.33;0.2;0.6,RAM configuration was not verified

boaviztapi/data/archetypes/server.csv

@@ -1 +1 @@
-requests==2.32.3
+requests==2.32.4

boaviztapi/data/utils/complete_Scaleway_Instances/requirements.txt

@@ -24,23 +24,10 @@
 from boaviztapi.routers.cloud_router import cloud_router
 from boaviztapi.routers.terminal_router import terminal_router
 from boaviztapi.routers.utils_router import utils_router
+from boaviztapi.utils.get_version import get_version_from_pyproject
 
 from fastapi.responses import HTMLResponse
 
-def get_version_from_pyproject():
-    # List of potential locations for the pyproject.toml file
-    potential_paths = [
-        os.path.join(os.path.dirname(__file__), '../pyproject.toml'),
-        os.path.join(os.path.dirname(__file__), 'pyproject.toml'),
-    ]
-
-    for path in potential_paths:
-        if os.path.exists(path):
-            with open(path, 'r') as f:
-                return toml.loads(f.read())['tool']['poetry']['version']
-
-    # Raise an error if the file is not found in any of the locations
-    raise FileNotFoundError("pyproject.toml not found in expected locations")
 
 # Serverless frameworks adds a 'stage' prefix to the route used to serve applications
 # We have to manage it to expose openapi doc on aws and generate proper links.

boaviztapi/main.py

@@ -11,6 +11,7 @@
 from boaviztapi.routers.openapi_doc.descriptions import country_code, cpu_family, cpu_model_range, ssd_manufacturer, \
     ram_manufacturer, case_type, name_to_cpu, cpu_names, impacts_criteria
 from boaviztapi.service.factor_provider import get_available_countries
+from boaviztapi.utils.get_version import get_version_from_pyproject
 
 utils_router = APIRouter(
     prefix='/v1/utils',
@@ -26,8 +27,7 @@
 
 @utils_router.get('/version', description="Get the version of the API")
 async def version():
-    return toml.loads(open(os.path.join(os.path.dirname(__file__), '../../pyproject.toml'), 'r').read())['tool']['poetry'][
-    'version']
+    return get_version_from_pyproject()
 
 @utils_router.get('/country_code', description=country_code)
 async def utils_get_all_countries():

boaviztapi/routers/utils_router.py

@@ -50,10 +50,11 @@ def get_cloud_instance_archetype(archetype_name: str, provider: str) -> Union[di
 
 
 def get_archetype(archetype_name: str, csv_path: str) -> Union[dict, bool]:
-    reader = csv.DictReader(open(csv_path, encoding='utf-8'))
-    for row in reader:
-        if row["id"] == archetype_name:
-            return row2json(row)
+    with open(csv_path, encoding='utf-8') as csvfile:
+        reader = csv.DictReader(csvfile)
+        for row in reader:
+            if row["id"].strip() == archetype_name.strip():
+                return row2json(row)
     return False
 
 

boaviztapi/service/archetype.py

@@ -1,12 +1,11 @@
 import os
 from pathlib import Path
 
-import pandas as pd
 import yaml
 from boaviztapi import data_dir
 
 config_file = os.path.join(data_dir, 'factors.yml')
-impact_factors = yaml.safe_load(Path(config_file).read_text())
+impact_factors = yaml.load(Path(config_file).read_text(), Loader=yaml.CSafeLoader)
 
 
 def get_impact_factor(item, impact_type) -> dict: