Povezao treniranje modela.

8 files changed, 39 insertions, 12 deletions

diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index b997efa3..4bc094cd 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -14,22 +14,28 @@ namespace api.Controllers
     {
 
         private IMlConnectionService _mlService;
+        private readonly IDatasetService _datasetService;
+        private readonly IFileService _fileService;
         private readonly IModelService _modelService;
         private JwtToken jwtToken;
 
 
-        public ModelController(IMlConnectionService mlService, IModelService modelService, IConfiguration configuration)
+        public ModelController(IMlConnectionService mlService, IModelService modelService, IDatasetService datasetService, IFileService fileService, IConfiguration configuration)
         {
             _mlService = mlService;
             _modelService = modelService;
+            _datasetService = datasetService;
+            _fileService = fileService;
             jwtToken = new JwtToken(configuration);
         }
 
         [HttpPost("sendModel")]
         [Authorize(Roles = "User")]
-        public async Task<ActionResult<string>> Test([FromBody] object model)
+        public async Task<ActionResult<string>> Test([FromBody] Model model)
         {
-            var result = await _mlService.SendModelAsync(model);
+            var dataset = _datasetService.GetOneDataset(model.datasetId);
+            var filepath = _fileService.GetFilePath(dataset.fileId, dataset.username);
+            var result = await _mlService.SendModelAsync(model, filepath);
             return Ok(result);
         }
 
diff --git a/backend/api/api/Models/Model.cs b/backend/api/api/Models/Model.cs
index 5678daaf..2baab1c0 100644
--- a/backend/api/api/Models/Model.cs
+++ b/backend/api/api/Models/Model.cs
@@ -38,10 +38,13 @@ namespace api.Models
         public int batchSize { get; set; }
         // na izlazu je moguce da bude vise neurona (klasifikacioni problem sa vise od 2 klase)
         public int outputNeurons { get; set; }
-        public string inputLayerActivationFunction { get; set; }
-        public string hiddenLayerActivationFunction { get; set; }
+        public string[] hiddenLayerActivationFunctions { get; set; }
         public string outputLayerActivationFunction { get; set; }
 
+        public string[] metrics { get; set; }
+        public int epochs { get; set; }
 
+        public string nullValues { get; set; }
+        public string[] nullValuesReplacers { get; set; }
     }
 }
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 5e708d11..45ed18a9 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -61,6 +61,11 @@ namespace api.Services
         }
         //odraditi za pretragu getOne
 
+        public Dataset GetOneDataset(string id)
+        {
+            return _dataset.Find(dataset => dataset._id == id).FirstOrDefault();
+        }
+
         //ako je potrebno da se zameni name  ili ekstenzija
         public void Update(string username, string name, Dataset dataset)
         {
diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs
index be56f5cb..dbe43321 100644
--- a/backend/api/api/Services/IDatasetService.cs
+++ b/backend/api/api/Services/IDatasetService.cs
@@ -6,6 +6,7 @@ namespace api.Services
     public interface IDatasetService
     {
         Dataset GetOneDataset(string username, string name);
+        Dataset GetOneDataset(string id);
         List<Dataset> SearchDatasets(string name, string username);
         List<Dataset> GetMyDatasets(string username);
         List<Dataset> SortDatasets(string username, bool ascdsc, int latest);
diff --git a/backend/api/api/Services/IMlConnectionService.cs b/backend/api/api/Services/IMlConnectionService.cs
index f38fb50a..ee839d28 100644
--- a/backend/api/api/Services/IMlConnectionService.cs
+++ b/backend/api/api/Services/IMlConnectionService.cs
@@ -3,6 +3,6 @@ namespace api.Services
 {
     public interface IMlConnectionService
     {
-        Task<string> SendModelAsync(object model);
+        Task<string> SendModelAsync(object model, object dataset);
     }
 }
\ No newline at end of file
diff --git a/backend/api/api/Services/IModelService.cs b/backend/api/api/Services/IModelService.cs
index ee5c279f..637d09a3 100644
--- a/backend/api/api/Services/IModelService.cs
+++ b/backend/api/api/Services/IModelService.cs
@@ -6,6 +6,7 @@ namespace api.Services
 	public interface IModelService
 	{
         Model GetOneModel(string username, string name);
+        Model GetOneModel(string id);
         List<Model> GetMyModels(string username);
         List<Model> GetLatestModels(string username);
         //List<Model> GetPublicModels();
diff --git a/backend/api/api/Services/MlConnectionService.cs b/backend/api/api/Services/MlConnectionService.cs
index 9b167537..9c3b3fd8 100644
--- a/backend/api/api/Services/MlConnectionService.cs
+++ b/backend/api/api/Services/MlConnectionService.cs
@@ -6,13 +6,19 @@ namespace api.Services
 {
     public class MlConnectionService : IMlConnectionService
     {
-        public async Task<string> SendModelAsync(object model)
+        private RestClient client;
+
+        public MlConnectionService()
+        {
+            this.client = new RestClient("http://127.0.0.1:5543");
+        }
+
+        public async Task<string> SendModelAsync(object model, object dataset)
         {
-            RestClient client = new RestClient("http://localhost:5000");
-            var request = new RestRequest("data", Method.Post);
-            request.AddJsonBody(model);
-            var result = await client.ExecuteAsync(request);
-            return result.Content;//Response od ML microservisa
+            var request = new RestRequest("train", Method.Post);
+            request.AddJsonBody(new { model, dataset});
+            var result = await this.client.ExecuteAsync(request);
+            return result.Content; //Response od ML microservisa
         }
     }
 }
diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs
index f42219f5..eae8c78b 100644
--- a/backend/api/api/Services/ModelService.cs
+++ b/backend/api/api/Services/ModelService.cs
@@ -50,6 +50,11 @@ namespace api.Services
             return _model.Find(model => model.username == username && model.name == name).FirstOrDefault();
         }
 
+        public Model GetOneModel(string id)
+        {
+            return _model.Find(model => model._id == id).FirstOrDefault();
+        }
+
         public void Update(string username, string name, Model model)
         {
             _model.ReplaceOne(model => model.username == username && model.name == name, model);