-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: keep original file from v1 branch
- Loading branch information
Showing
1 changed file
with
36 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,51 +1,51 @@ | ||
from tornado import httpserver | ||
from tornado import gen | ||
from tornado.ioloop import IOLoop | ||
import tornado.web | ||
from tornado.escape import json_decode, json_encode | ||
from ..entities.prediction_request import PredictionRequest | ||
from ..entities.dataset import Dataset | ||
from ..entities.dataentry import DataEntry | ||
from ..helpers import model_decoder | ||
import numpy as np | ||
|
||
|
||
def decode(request): | ||
json_request = json_decode(request.body) | ||
pred_request = PredictionRequest(json_request['dataset'], json_request['rawModel'], json_request['additionalInfo']) | ||
|
||
print("Dataset structure:") | ||
print(pred_request.dataset) | ||
|
||
input_series = pred_request.additionalInfo['fromUser']['inputSeries'] | ||
independentFeatures = pred_request.additionalInfo['independentFeatures'] | ||
from typing import Dict, Any | ||
|
||
# def decode(request): | ||
# json_request = json_decode(request.body) | ||
# pred_request = PredictionRequest(json_request['dataset'], json_request['rawModel'], json_request['additionalInfo']) | ||
# input_series = pred_request.additionalInfo['fromUser']['inputSeries'] | ||
# independentFeatures = pred_request.additionalInfo['independentFeatures'] | ||
# shorted = [] | ||
# actualIndepFeatKeys = [] | ||
# # pred_request.dataset.features['key'] | ||
# for actual in input_series: | ||
# for key in independentFeatures: | ||
# if actual == independentFeatures[key]: | ||
# for feature in pred_request.dataset['features']: | ||
# if feature['name'] == actual: | ||
# shorted.append(feature['key']) | ||
# # shorted.append(key) | ||
# dataEntryAll = [] | ||
# for dataEntry in pred_request.dataset['dataEntry']: | ||
# dataEntryToInsert = [] | ||
# for key in shorted: | ||
# dataEntryToInsert.append(dataEntry['values'][key]) | ||
# dataEntryAll.append(dataEntryToInsert) | ||
# return dataEntryAll | ||
|
||
|
||
def decode(dataset, additionl_info): | ||
input_series = additionl_info['fromUser']['inputSeries'] | ||
independentFeatures = additionl_info['independentFeatures'] | ||
shorted = [] | ||
|
||
actualIndepFeatKeys = [] | ||
# pred_request.dataset.features['key'] | ||
for actual in input_series: | ||
for key in independentFeatures: | ||
if actual == independentFeatures[key]: | ||
for feature in pred_request.dataset['features']: | ||
for feature in dataset['features']: | ||
if feature['name'] == actual: | ||
shorted.append(feature['key']) | ||
|
||
print("Shorted keys:", shorted) | ||
|
||
# shorted.append(key) | ||
dataEntryAll = [] | ||
dataEntry = pred_request.dataset['dataEntry'] | ||
print("DataEntry structure:", dataEntry) | ||
|
||
if isinstance(dataEntry, dict) and 'values' in dataEntry: | ||
values = dataEntry['values'] | ||
for dataEntry in dataset['dataEntry']: | ||
dataEntryToInsert = [] | ||
for key in shorted: | ||
print(f"Accessing key: {key}, type: {type(key)}") | ||
value = values.get(str(key)) | ||
print(f"Retrieved value: {value}") | ||
if value is not None: | ||
dataEntryToInsert.append(value) | ||
dataEntryToInsert.append(dataEntry['values'][key]) | ||
dataEntryAll.append(dataEntryToInsert) | ||
else: | ||
print(f"Unexpected dataEntry structure: {dataEntry}") | ||
|
||
print(f"DataEntryAll: {dataEntryAll}") | ||
return dataEntryAll | ||
return dataEntryAll |