1.0.2 - Fixed issues with python & DP projects

Author: Tomansion

debiaiServer/api/v1/debiai/dataprovider.py

@@ -47,7 +47,6 @@ def format_data_provider_info(data_provider):
 
 
 def get_data_provider_info(dataProviderId):
-
     # As Parquet not yet supported we force json_block:
     if dataProviderId == "json_block":
         dataProviderId = "Python module Data Provider"

debiaiServer/api/v1/debiai/swagger.yaml

@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: 1.0.1
+  version: 1.0.2
   title: DebiAI_APPLICATION_PROJECT_BACKEND_API
   description: DebiAI backend api
   contact:

debiaiServer/api/v1/debiai/utils.py

@@ -2,7 +2,6 @@
 
 
 def freeze(o):
-
     if isinstance(o, dict):
         return frozenset({k: freeze(v) for k, v in o.items()}.items())
 

debiaiServer/api/v1/exploration/utils.py

@@ -288,10 +288,8 @@ def create_selection(
     # Extract the selected combinations from the exploration
     combinations = exploration.get("combinations", [])
     if not combinations:
-        raise ValueError(
-            f"No combinations found in exploration \
-{exploration_id} for project {project_id}"
-        )
+        raise ValueError(f"No combinations found in exploration \
+{exploration_id} for project {project_id}")
 
     # Filter the combinations based on the selected IDs
     selected_combinations = [

debiaiServer/api/v1/json_block_provider/dataprovider.py

@@ -16,7 +16,6 @@
 
 
 def get_data_providers_project():
-
     # Return a list of project overviews for a specific data provider
     data_provider = data_provider_manager.get_single_data_provider(dataProviderId)
 
@@ -37,6 +36,17 @@ def get_data_providers_project():
     return projects, 200
 
 
+def _flatten_column(col):
+    """Promote metadata.category and metadata.group to the top level of a column."""
+    flat = dict(col)
+    metadata = flat.get("metadata", {})
+    if "category" in metadata:
+        flat["category"] = metadata["category"]
+    if "group" in metadata:
+        flat["group"] = metadata["group"]
+    return flat
+
+
 def change_project_v1(project_info, column_info):
     v1_project_info = {
         "id": project_info["id"],
@@ -50,7 +60,7 @@ def change_project_v1(project_info, column_info):
             "nbSelections": project_info["nbSelections"],
             "nbSamples": project_info["nbSamples"],
         },
-        "columns": column_info,
+        "columns": [_flatten_column(c) for c in column_info],
         # "nbModels": project_info["nbModels"],
         # "nbSelections": project_info["nbSelections"],
         # "nbSamples": project_info["nbSamples"],
@@ -61,6 +71,11 @@ def change_project_v1(project_info, column_info):
         # "blockLevelInfo": projectBlockLevel, remove here, keep in the API for python module in V1
     }
 
+    # Include resultStructure only when it is defined
+    result_structure = project_info.get("resultStructure")
+    if result_structure is not None:
+        v1_project_info["resultStructure"] = result_structure
+
     return v1_project_info
 
 

debiaiServer/config/config.ini

@@ -45,7 +45,7 @@ cache_duration = 120
 # List all the web data providers you want to use
 # Format: data_provider_name = <Data provider URL>
 ; My_data_provider1 = http://localhost:3010/debiai
-; My_data_provider2 = http://localhost:3011/
+My_data_provider2 = http://localhost:8000/
 
 
 ### ALGO PROVIDERS ### (ref: https://debiai.irt-systemx.fr/algoProviders/)

debiaiServer/debiai_gui_utils.py

@@ -157,10 +157,8 @@ def build_parameters(args):
 
 
 def main():
-    parser = argparse.ArgumentParser(
-        description="""DebiAI GUI Command Line.
-Learn more about DebiAI at https://debiai.irt-systemx.fr/"""
-    )
+    parser = argparse.ArgumentParser(description="""DebiAI GUI Command Line.
+Learn more about DebiAI at https://debiai.irt-systemx.fr/""")
 
     # Version flag
     parser.add_argument(

debiaiServer/exploration/utils.py

@@ -307,10 +307,8 @@ def create_selection(
     # Extract the selected combinations from the exploration
     combinations = exploration.get("combinations", [])
     if not combinations:
-        raise ValueError(
-            f"No combinations found in exploration \
-{exploration_id} for project {project_id}"
-        )
+        raise ValueError(f"No combinations found in exploration \
+{exploration_id} for project {project_id}")
 
     # Filter the combinations based on the selected IDs
     selected_combinations = [

debiaiServer/modules/algoProviders/integratedAlgoProvider/algorithms/regressionErrorMetric.py

@@ -2,7 +2,6 @@
     get_input_from_inputs,
 )
 
-
 # This algorithm is a simple regression metric calculator
 # It takes a list of numbers corresponding to an error
 # and a ceil corresponding to the maximum acceptable error

debiaiServer/modules/dataProviders/dataProviderManager.py

@@ -114,7 +114,6 @@ def get_data_provider_list():
 
 
 def get_single_data_provider(id) -> WebDataProvider:
-
     # TODO For compatibility with v0 :
     if id == PYTHON_DATA_PROVIDER_NAME and python_data_provider_disabled:
         raise DataProviderException("Python module data provider is disabled", 403)