Add dynamic components in the Infrastructure tab

config.py

@@ -10,7 +10,7 @@ OBLIGATORY_FIELDS = [
     "taskType", "taskFamily", "taskStage", "algorithmName", "dataType",
     "volume", "volumeUnit", "nbRequest", "measurementMethod", "unit",
     "powerConsumption", "os", "language", "infraType", "componentName",
-    "nbComponent", "country", "hashAlgorithm", "cryptographicAlgorithm", "value"
+    "nbComponent", "country", "hashAlgorithm", "cryptographicAlgorithm", "ecryptedValue"
 ]
 
 # Dropdown Options

services/huggingface.py

@@ -53,7 +53,6 @@ def create_flattened_data(data):
 
     # Handle inference properties
     inference_props = data.get("task", {}).get("dataset", [{}])[0].get("inferenceProperties", [])
-    print("Extracted inference properties:", inference_props)
 
     # Process inference properties
     inference_data = []
@@ -76,6 +75,30 @@ def create_flattened_data(data):
     nbWordsOutput_str = ", ".join([str(p["nbWordsOutput"]) for p in inference_data if p.get("nbWordsOutput")]) if inference_data else None
     contextWindowSize_str = ", ".join([str(p["contextWindowSize"]) for p in inference_data if p.get("contextWindowSize")]) if inference_data else None
     cache_str = ", ".join([str(p["cache"]) for p in inference_data if p.get("cache")]) if inference_data else None
+
+    # Handle components
+    components = data.get("infrastructure", {}).get("components", [])
+    component_data = []
+    for comp in components:
+        if comp:  
+            component_data.append({
+                "componentName": comp.get("componentName"),
+                "nbComponent": comp.get("nbComponent"),
+                "memorySize": comp.get("memorySize"),
+                "manufacturer": comp.get("manufacturer"),
+                "family": comp.get("family"),
+                "series": comp.get("series"),
+                "share": comp.get("share")
+            })
+
+    componentName_str = ", ".join([str(p["componentName"]) for p in component_data if p.get("componentName")]) if component_data else None
+    nbComponent_str = ", ".join([str(p["nbComponent"]) for p in component_data if p.get("nbComponent")]) if component_data else None
+    memorySize_str = ", ".join([str(p["memorySize"]) for p in component_data if p.get("memorySize")]) if component_data else None
+    manufacturer_infra_str = ", ".join([str(p["manufacturer"]) for p in component_data if p.get("manufacturer")]) if component_data else None
+    family_str = ", ".join([str(p["family"]) for p in component_data if p.get("family")]) if component_data else None
+    series_str = ", ".join([str(p["series"]) for p in component_data if p.get("series")]) if component_data else None
+    share_str = ", ".join([str(p["share"]) for p in component_data if p.get("share")]) if component_data else None
+
     return {
         # Header
         "licensing": [data["header"]["licensing"]],
@@ -150,13 +173,13 @@ def create_flattened_data(data):
         "infraType": [data["infrastructure"]["infraType"]],
         "cloudProvider": [data["infrastructure"]["cloudProvider"]],
         "cloudInstance": [data["infrastructure"]["cloudInstance"]],
-        "componentName": [data["infrastructure"]["components"][0]["componentName"]],
-        "nbComponent": [data["infrastructure"]["components"][0]["nbComponent"]],
-        "memorySize": [data["infrastructure"]["components"][0]["memorySize"]],
-        "manufacturer_infra": [data["infrastructure"]["components"][0]["manufacturer"]],
-        "family": [data["infrastructure"]["components"][0]["family"]],
-        "series": [data["infrastructure"]["components"][0]["series"]],
-        "share": [data["infrastructure"]["components"][0]["share"]],
+        "componentName": [componentName_str],
+        "nbComponent": [nbComponent_str],
+        "memorySize": [memorySize_str],
+        "manufacturer_infra": [manufacturer_infra_str],
+        "family": [family_str],
+        "series": [series_str],
+        "share": [share_str],
         
         # Environment
         "country": [data["environment"]["country"]],
@@ -173,5 +196,5 @@ def create_flattened_data(data):
         # Hash
         "hashAlgorithm": [data["$hash"]["hashAlgorithm"]],
         "cryptographicAlgorithm": [data["$hash"]["cryptographicAlgorithm"]],
-        "value": [data["$hash"]["value"]]
+        "value": [data["$hash"]["ecryptedValue"]]
     }

services/json_generator.py

@@ -32,24 +32,39 @@ def generate_json(
     """Generate JSON data from form inputs."""
     # Process hyperparameters
     hyperparameters = []
-    for name, value in zip(hyperparameter_names, hyperparameter_values):
-        if name and value:
-            hyperparameters.append({
-                "name": name,
-                "value": value
-            })
-
+    max_length = max(len(hyperparameter_names), len(hyperparameter_values))
+    for i in range(max_length):
+        hyperparameters.append({
+            "name": hyperparameter_names[i] if i < len(hyperparameter_names) and hyperparameter_names[i] else "",
+            "value": hyperparameter_values[i] if i < len(hyperparameter_values) and hyperparameter_values[i] else ""
+        })
+        
     # Process inference properties
     inference_props_list = []
-    for i in range(len(nbRequest)):
+    max_length = max(len(nbRequest), len(nbTokensInput), len(nbWordsInput), len(nbTokensOutput), len(nbWordsOutput), len(contextWindowSize), len(cache))
+    for i in range(max_length):
         inference_props_list.append({
-            "nbRequest": nbRequest[i],
-            "nbTokensInput": nbTokensInput[i],
-            "nbWordsInput": nbWordsInput[i],
-            "nbTokensOutput": nbTokensOutput[i],
-            "nbWordsOutput": nbWordsOutput[i],
-            "contextWindowSize": contextWindowSize[i],
-            "cache": cache[i]
+            "nbRequest": nbRequest[i] if i < len(nbRequest) and nbRequest[i] else "",
+            "nbTokensInput": nbTokensInput[i] if i < len(nbTokensInput) and nbTokensInput[i] else "",
+            "nbWordsInput": nbWordsInput[i] if i < len(nbWordsInput) and nbWordsInput[i] else "",
+            "nbTokensOutput": nbTokensOutput[i] if i < len(nbTokensOutput) and nbTokensOutput[i] else "",
+            "nbWordsOutput": nbWordsOutput[i] if i < len(nbWordsOutput) and nbWordsOutput[i] else "",
+            "contextWindowSize": contextWindowSize[i] if i < len(contextWindowSize) and contextWindowSize[i] else "",
+            "cache": cache[i] if i < len(cache) and cache[i] else ""
+        })
+
+    # Process components
+    components_list = []
+    max_length = max(len(componentName), len(nbComponent), len(memorySize), len(manufacturer_infra), len(family), len(series), len(share))
+    for i in range(max_length):
+        components_list.append({
+            "componentName": componentName[i] if i < len(componentName) and componentName[i] else "",
+            "nbComponent": nbComponent[i] if i < len(nbComponent) and nbComponent[i] else "",
+            "memorySize": memorySize[i] if i < len(memorySize) and memorySize[i] else "",
+            "manufacturer": manufacturer_infra[i] if i < len(manufacturer_infra) and manufacturer_infra[i] else "",
+            "family": family[i] if i < len(family) and family[i] else "",
+            "series": series[i] if i < len(series) and series[i] else "",
+            "share": share[i] if i < len(share) and share[i] else ""
         })
     
     data = {
@@ -137,17 +152,7 @@ def generate_json(
             "infraType": infraType,
             "cloudProvider": cloudProvider,
             "cloudInstance": cloudInstance,
-            "components": [
-                {
-                    "componentName": componentName,
-                    "nbComponent": nbComponent,
-                    "memorySize": memorySize,
-                    "manufacturer": manufacturer_infra,
-                    "family": family,
-                    "series": series,
-                    "share": share
-                }
-            ]
+            "components": components_list
         },
         "environment": {
             "country": country,
@@ -162,7 +167,7 @@ def generate_json(
         "$hash": {
             "hashAlgorithm": hashAlgorithm,
             "cryptographicAlgorithm": cryptographicAlgorithm,
-            "value": value_hash
+            "ecryptedValue": value_hash
         }
     }
 

ui/form_components.py

@@ -280,13 +280,49 @@ def create_infrastructure_tab():
         )
         cloudProvider = gr.Textbox(label="Cloud Provider", info="(name of your cloud provider)")
         cloudInstance = gr.Textbox(label="Cloud Instance", info="(name of your cloud instance)")
-        componentName = gr.Textbox(label="Component Name", info="Required field<br>(type of subsystem part)")
-        nbComponent = gr.Textbox(label="Number of Components", info="Required field<br>(number of items of this component)")
-        memorySize = gr.Textbox(label="Memory Size", info="(size of memory in Gbytes)")
-        manufacturer_infra = gr.Textbox(label="Manufacturer", info="(name of the manufacturer)")
-        family = gr.Textbox(label="Family", info="(family of this component)")
-        series = gr.Textbox(label="Series", info="(series of this component)")
-        share = gr.Textbox(label="Share", info="(percentage of equipment used)")
+        with gr.Accordion("Components"):
+            _, componentName, nbComponent, memorySize, manufacturer_infra, family, series, share, add_component_btn = create_dynamic_section(
+                section_name="Component",
+                fields_config=[
+                    {
+                        "type": gr.Textbox,
+                        "label": "Component Name",
+                        "info": "Required field<br>(type of subsystem part)",
+                    },
+                    {
+                        "type": gr.Textbox,
+                        "label": "Number of Components",
+                        "info": "Required field<br>(number of items of this component)",
+                    },
+                    {
+                        "type": gr.Textbox,
+                        "label": "Memory Size",
+                        "info": "(size of memory in Gbytes)",
+                    },
+                    {
+                        "type": gr.Textbox,
+                        "label": "Manufacturer",
+                        "info": "(name of the manufacturer)",
+                    },
+                    {
+                        "type": gr.Textbox,
+                        "label": "Family",
+                        "info": "(family of this component)",
+                    },
+                    {
+                        "type": gr.Textbox,
+                        "label": "Series",
+                        "info": "(series of this component)",
+                    },
+                    {
+                        "type": gr.Textbox,
+                        "label": "Share",
+                        "info": "(percentage of equipment used)",
+                    }
+                ],
+                initial_count=0,
+                layout="column"
+            )
         
         return [
             infraType, cloudProvider, cloudInstance, componentName,