Removed depreciated request calls

Author: Tomansion

Diff for: .gitignore

@@ -6,6 +6,7 @@ venv/
 dist/
 build/
 debiai_data/
+debiai_data_test/
 *.egg-info/
 
 # Dependency directories

Diff for: debiaiServer/controller/selection.py

@@ -35,7 +35,6 @@ def post_selection(dataProviderId, projectId, data):
             projectId,
             data["selectionName"],
             data["sampleHashList"],
-            data["requestId"] if "requestId" in data else None,
         )
         return "Selection added", 200
     except DataProviderException as e:

Diff for: debiaiServer/modules/dataProviders/pythonDataProvider/dataUtils/samples.py

@@ -94,36 +94,3 @@ def _block_to_array_recur(block):
             ret[i] = values + child_values[i]
 
         return ret
-
-
-# def projectSamplesGenerator(projectId):
-#     """
-#     Generator used to iterate over all samples in a project.
-#     Used by the 'createSelectionFromRequest' method
-#     """
-
-#     # Get the project block structure
-#     projectBlockStructure = projects.get_project_block_level_info(projectId)
-#     sampleLevel = len(projectBlockStructure) - 1
-
-#     rootBlocks = utils.listDir(DATA_PATH + projectId + "/blocks/")
-#     for rootBlock in rootBlocks:
-#         path = DATA_PATH + projectId + "/blocks/" + rootBlock + "/"
-#         yield from yieldSample(path,  0, [], sampleLevel, projectBlockStructure)
-#     print("end")
-
-
-# def yieldSample(path, level, sampleInfo, sampleLevel, blockLevelInfo):
-#     # TODO : optimizations : add in parameters the block that we need to open
-#     blockInfo = utils.readJsonFile(path + "info.json")
-#     sampleInfo.append(getBlockInfo(blockLevelInfo[level], blockInfo))
-
-#     if level == sampleLevel:
-#         # merge the dict into one
-#         yield {k: v for x in sampleInfo for k, v in x.items()}, blockInfo["id"]
-#     else:
-#         childrenBlockNames = utils.listDir(path)
-#         for name in childrenBlockNames:
-#             yield from yieldSample(path + name + "/",
-#                                    level + 1, sampleInfo, sampleLevel, blockLevelInfo)
-#             del sampleInfo[-1]

Diff for: debiaiServer/modules/dataProviders/pythonDataProvider/dataUtils/selections.py

@@ -35,9 +35,6 @@ def create_selection(project_id, selection_name, sample_ids, request_id=None):
         "samples": sample_ids,
     }
 
-    if request_id is not None:
-        selectionInfo["requestId"] = request_id
-
     os.mkdir(DATA_PATH + project_id + "/selections/" + selection_id)
     pythonModuleUtils.writeJsonFile(selectionInfoFilePath, selectionInfo)
     projects.update_project(project_id)
@@ -74,10 +71,6 @@ def get_selection(project_id, selectionId):
             "nbSamples": len(data["samples"]),
         }
 
-        # Add the request Id if it exist
-        if "requestId" in data:
-            ret["requestId"] = data["requestId"]
-
         return ret
 
 

Diff for: debiaiServer/swagger.yaml

@@ -693,13 +693,6 @@ paths:
                 description: List of the selection sample id (hash)
               selectionName:
                 type: string
-              requestDescription:
-                type: string
-                x-nullable: true
-              requestId:
-                type: string
-                description: Id of the request that has created the selection.
-                x-nullable: true
       responses:
         200:
           description: selection added
@@ -1586,7 +1579,7 @@ definitions:
             items:
               type: string
 
-  # Selections and requests
+  # Selections
   selection:
     allOf:
       - $ref: "#/definitions/artefact"
@@ -1597,30 +1590,6 @@ definitions:
           metadata:
             type: object
 
-  request:
-    allOf:
-      - $ref: "#/definitions/artefact"
-      - type: object
-        required:
-          - filters
-        properties:
-          filters:
-            type: array
-            items:
-              type: object
-              required:
-                - type
-                - columnLabel
-              properties:
-                type:
-                  type: string
-                columnLabel:
-                  type: string
-            description: Can be of type 'values' of 'intervals', 'values'
-              filters have a 'values' key that is a list of text or numbers
-              , 'intervals' filters have an 'interval' key that is a list of
-              {min, max} intervals
-
   # DataTypes
   dataType:
     type: object