feat(JAQPOT-163): update inference request structure

src/entities/prediction_request.py

@@ -4,17 +4,15 @@
 
 class PredictionRequest:
 
-    def __init__(self, dataset, model, rawModel, additionalInfo=None, doaMatrix=None):
+    def __init__(self, dataset, model, doaMatrix=None):
         self.dataset = dataset
         self.model = model
-        self.rawModel = rawModel
-        self.additionalInfo = additionalInfo
+        self.rawModel = model.rawModel
+        self.additionalInfo = model.additionalInfo
         self.doaMatrix = doaMatrix
 
 
 class PredictionRequestPydantic(BaseModel):
     dataset: Any
     model: Any
-    additionalInfo: Any
     doaMatrix: Any = None
-    rawModel: Any

src/handlers/predict.py

@@ -3,7 +3,7 @@
 
 
 def model_post_handler(request: PredictionRequestPydantic):
-    model = model_decoder.decode(request.rawModel)
+    model = model_decoder.decode(request.model['rawModel'])
     data_entry_all = json_to_predreq.decode(request)
     _ = model(data_entry_all)
 

src/helpers/json_to_predreq.py

@@ -1,5 +1,9 @@
 def decode(request):
     dataset = request.dataset
-    data_entries = dataset['input']
-    data_entry_all = [item['values'][0] for item in data_entries]
-    return data_entry_all
+    model = request.model
+
+    keys = [feature['key'] for feature in model['independentFeatures']]
+    transformed_values = [[data[key] for key in keys] for data in dataset['input']]
+
+    # TODO fix to support multiple rows
+    return transformed_values[0]