diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/api/api/Controllers/ModelController.cs | 5 | ||||
| -rw-r--r-- | backend/api/api/Models/Experiment.cs | 1 | ||||
| -rw-r--r-- | backend/api/api/Models/Model.cs | 2 | ||||
| -rw-r--r-- | backend/api/api/Services/TempRemovalService.cs | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs index 625054d4..618b15e8 100644 --- a/backend/api/api/Controllers/ModelController.cs +++ b/backend/api/api/Controllers/ModelController.cs @@ -35,7 +35,7 @@ namespace api.Controllers [HttpPost("sendModel")] [Authorize(Roles = "User,Guest")] - public async Task<ActionResult<string>> Test([FromBody] Model model) + public async Task<ActionResult<string>> Test([FromBody] string modelId,string experimentId) { string uploaderId; var header = Request.Headers[HeaderNames.Authorization]; @@ -49,9 +49,10 @@ namespace api.Controllers } else return BadRequest(); - var experiment=_experimentService.Get(model.experimentId); + var experiment=_experimentService.Get(experimentId); var dataset = _datasetService.GetOneDataset(experiment.datasetId); var filepath = _fileService.GetFilePath(dataset.fileId, uploaderId); + var model = _modelService.GetOneModel(modelId); _mlService.TrainModel(model,experiment,filepath);//To do Obavestiti korisnika kada se model istrenira return Ok(); } diff --git a/backend/api/api/Models/Experiment.cs b/backend/api/api/Models/Experiment.cs index e3ca6194..d5ce7627 100644 --- a/backend/api/api/Models/Experiment.cs +++ b/backend/api/api/Models/Experiment.cs @@ -10,6 +10,7 @@ namespace api.Models public string _id { get; set; } public string name { get; set; } public string description { get; set; } + public List<string> ModelIds { get; set; } public string datasetId { get; set; } public string uploaderId { get; set; } public string[] inputColumns { get; set; } diff --git a/backend/api/api/Models/Model.cs b/backend/api/api/Models/Model.cs index b169dddf..f0e4d346 100644 --- a/backend/api/api/Models/Model.cs +++ b/backend/api/api/Models/Model.cs @@ -18,7 +18,7 @@ namespace api.Models public DateTime dateCreated { get; set; } public DateTime lastUpdated { get; set; } //proveriti id - public string experimentId { get; set; } + //public string experimentId { get; set; } //Neural net training diff --git a/backend/api/api/Services/TempRemovalService.cs b/backend/api/api/Services/TempRemovalService.cs index d72dc89e..e7f366a3 100644 --- a/backend/api/api/Services/TempRemovalService.cs +++ b/backend/api/api/Services/TempRemovalService.cs @@ -35,10 +35,11 @@ namespace api.Services foreach(var experiment in experiments) { DeleteExperiment(experiment._id); - List<Model> models = _model.Find(model => model.experimentId == experiment._id && model.username == "").ToList(); - foreach (var model in models) + foreach(var modelId in experiment.ModelIds) { - DeleteModel(model._id); + var delModel=_model.Find(model=> modelId== model._id && model.username=="").FirstOrDefault(); + if(delModel!= null) + DeleteModel(delModel._id); } } } |