diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | backend/api/api/Controllers/PredictorController.cs | 1 | ||||
| -rw-r--r-- | backend/microservice/api/controller.py | 56 |
3 files changed, 29 insertions, 29 deletions
@@ -9,3 +9,4 @@ backend/microservice/temp/ backend/microservice/api/__pycache__/ production/app/node_modules/ production/app/dist/ +backend/microservice/api/temp/ diff --git a/backend/api/api/Controllers/PredictorController.cs b/backend/api/api/Controllers/PredictorController.cs index 481334e9..64907dac 100644 --- a/backend/api/api/Controllers/PredictorController.cs +++ b/backend/api/api/Controllers/PredictorController.cs @@ -155,6 +155,7 @@ namespace api.Controllers public async Task<ActionResult<Predictor>> Post([FromBody] Predictor predictor) { var user=_userService.GetUserByUsername(predictor.username); + predictor.dateCreated = DateTime.Now.ToUniversalTime(); var model = _modelService.GetOneModel(predictor.modelId); if (model == null || user==null) return BadRequest("Model not found or user doesnt exist"); diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py index 88e84624..e6515e7b 100644 --- a/backend/microservice/api/controller.py +++ b/backend/microservice/api/controller.py @@ -2,7 +2,6 @@ from cmath import log from dataclasses import dataclass from distutils.command.upload import upload from gc import callbacks -from xmlrpc.client import DateTime import flask from flask import request, jsonify import newmlservice @@ -11,25 +10,24 @@ import pandas as pd import json import requests import config -from datetime import datetime app = flask.Flask(__name__) app.config["DEBUG"] = True app.config["SERVER_NAME"] = config.hostIP -@dataclass -class Predictor: - _id : str - username: str - inputs : list - output : str - isPublic: bool - accessibleByLink: bool - dateCreated: DateTime - experimentId: str - modelId: str - h5FileId: str - metrics: list +#@dataclass +#class Predictor: +# _id : str + # username: str + # inputs : list + # output : str + # isPublic: bool + # accessibleByLink: bool + # dateCreated: DateTime + # experimentId: str + # modelId: str + # h5FileId: str + # metrics: list class train_callback(tf.keras.callbacks.Callback): @@ -77,23 +75,23 @@ def train(): fileId=r.text m = [] for attribute, value in result.items(): - m.append({"Name" : attribute, "JsonValue" : jsonify(value)}) - predictor = Predictor( - _id = "", - username = paramsModel["username"], - inputs = paramsExperiment["inputColumns"], - output = paramsExperiment["outputColumn"], - isPublic = False, - accessibleByLink = False, - dateCreated = datetime.now(), - experimentId = paramsExperiment["_id"], - modelId = paramsModel["_id"], - h5FileId = fileId, - metrics = m - ) + m.append({"Name" : attribute, "JsonValue" : value}) + predictor = { + "_id" : "", + "username" : paramsModel["username"], + "inputs" : paramsExperiment["inputColumns"], + "output" : paramsExperiment["outputColumn"], + "isPublic" : False, + "accessibleByLink" : False, + "experimentId" : paramsExperiment["_id"], + "modelId" : paramsModel["_id"], + "h5FileId" : fileId, + "metrics" : m + } print(predictor) url = config.api_url + "/Predictor/add" r = requests.post(url, json=predictor).text + print(r) return r @app.route('/predict', methods = ['POST']) |