diff options
Diffstat (limited to 'backend/api')
-rw-r--r-- | backend/api/api/Controllers/DatasetController.cs | 75 | ||||
-rw-r--r-- | backend/api/api/Controllers/FileController.cs | 1 | ||||
-rw-r--r-- | backend/api/api/Controllers/ModelController.cs | 38 | ||||
-rw-r--r-- | backend/api/api/Controllers/PredictorController.cs | 51 | ||||
-rw-r--r-- | backend/api/api/Program.cs | 6 | ||||
-rw-r--r-- | backend/api/api/Services/DatasetService.cs | 11 | ||||
-rw-r--r-- | backend/api/api/Services/IDatasetService.cs | 1 | ||||
-rw-r--r-- | backend/api/api/Services/IModelService.cs | 1 | ||||
-rw-r--r-- | backend/api/api/Services/ModelService.cs | 11 |
9 files changed, 193 insertions, 2 deletions
diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs index 5f01c867..39e4e36e 100644 --- a/backend/api/api/Controllers/DatasetController.cs +++ b/backend/api/api/Controllers/DatasetController.cs @@ -180,6 +180,81 @@ namespace api.Controllers } } + + public void AddToEmptyDb() + { + + if (_datasetService.CheckDb()) + { + + Dataset dataset = new Dataset(); + + dataset.username = "igrannonica"; + dataset.name = "Igrannonica dataset 1"; + dataset.description = "Opis dataseta 1"; + //dataset.header = "" + dataset.fileId = ""; + dataset.extension = ""; + dataset.isPublic = true; + dataset.accessibleByLink = true; + dataset.dateCreated = DateTime.Now; + dataset.lastUpdated = DateTime.Now; + + dataset.delimiter = ""; + dataset.hasHeader = true; + //dataset.columnInfo = ; + dataset.nullCols = 0; + dataset.nullRows = 0; + dataset.isPreProcess = true; + + + _datasetService.Create(dataset); + + dataset.username = "igrannonica"; + dataset.name = "Igrannonica dataset 2"; + dataset.description = "Opis dataseta 2"; + //dataset.header = "" + dataset.fileId = ""; + dataset.extension = ""; + dataset.dateCreated = DateTime.Now; + dataset.lastUpdated = DateTime.Now; + + dataset.delimiter = ""; + dataset.hasHeader = true; + //dataset.columnInfo = ; + dataset.nullCols = 0; + dataset.nullRows = 0; + dataset.isPreProcess = true; + + + _datasetService.Create(dataset); + + dataset.username = "igrannonica"; + dataset.name = "Igrannonica dataset 1"; + dataset.description = "Opis dataseta 1"; + //dataset.header = "" + dataset.fileId = ""; + dataset.extension = ""; + dataset.dateCreated = DateTime.Now; + dataset.lastUpdated = DateTime.Now; + + dataset.delimiter = ""; + dataset.hasHeader = true; + //dataset.columnInfo = ; + dataset.nullCols = 0; + dataset.nullRows = 0; + dataset.isPreProcess = true; + + + _datasetService.Create(dataset); + + + + + } + + } + // PUT api/<DatasetController>/{name} [HttpPut("{name}")] [Authorize(Roles = "User")] diff --git a/backend/api/api/Controllers/FileController.cs b/backend/api/api/Controllers/FileController.cs index daff0d44..c5329d34 100644 --- a/backend/api/api/Controllers/FileController.cs +++ b/backend/api/api/Controllers/FileController.cs @@ -130,6 +130,7 @@ namespace api.Controllers [HttpPost("Csv")] [Authorize(Roles = "User,Guest")] + [DisableRequestSizeLimit] public async Task<ActionResult<string>> CsvUpload([FromForm]IFormFile file) { diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs index eb40bf43..ac287a20 100644 --- a/backend/api/api/Controllers/ModelController.cs +++ b/backend/api/api/Controllers/ModelController.cs @@ -175,6 +175,44 @@ namespace api.Controllers } } + + + public void AddToEmptyDb() + { + + if (_modelService.CheckDefaultModels()) + { + Model model = new Model(); + + model.username = "igrannonica"; + model.name = "Igrannonica model 1"; + model.description = "Opis modela 1"; + model.dateCreated = DateTime.Now; + model.lastUpdated = DateTime.Now; + model.experimentId = ""; + model.type = ""; + model.encoding = ""; + model.optimizer = ""; + model.lossFunction = ""; + model.hiddenLayerNeurons = 0; + model.hiddenLayers = 0; + model.batchSize = 0; + model.outputNeurons = 0; + //model.hiddenLayerActivationFunctions[] = + model.outputLayerActivationFunction = ""; + //model.metrics = + model.epochs = 0; + model.isTrained = false; + + _modelService.Create(model); + + //dodaj javne datasetove + } + + } + + + // PUT api/<ModelController>/{name} [HttpPut("{name}")] [Authorize(Roles = "User")] diff --git a/backend/api/api/Controllers/PredictorController.cs b/backend/api/api/Controllers/PredictorController.cs index 8feef725..ce5cd112 100644 --- a/backend/api/api/Controllers/PredictorController.cs +++ b/backend/api/api/Controllers/PredictorController.cs @@ -191,6 +191,57 @@ namespace api.Controllers } } + + public void AddToEmptyDb() + { + + List<Predictor> predictors; + + if (_predictorService.GetPublicPredictors() == null) + { + Predictor predictor = new Predictor(); + + predictor.username = "igrannonica"; + predictor.name = "Igrannonica Predictor 1"; + predictor.description = "Opis predictora 1"; + //predictor.inputs = { 1, 3, 5, 7, 9 }; + predictor.output = "s"; + predictor.isPublic = true; + predictor.accessibleByLink = true; + predictor.dateCreated = DateTime.Now; + predictor.experimentId = "0"; + //izmeni experiment id + + _predictorService.Create(predictor); + + + predictor.name = "Igrannonica Predictor 2"; + predictor.description = "Opis predictora 2"; + //predictor.inputs = { 1, 3, 5, 7, 9 }; + predictor.output = "s"; + predictor.dateCreated = DateTime.Now; + predictor.experimentId = "0"; + //izmeni experiment id + + + _predictorService.Create(predictor); + + predictor.name = "Igrannonica Predictor 3"; + predictor.description = "Opis predictora 3"; + //predictor.inputs = { 1, 3, 5, 7, 9 }; + predictor.output = "s"; + predictor.dateCreated = DateTime.Now; + predictor.experimentId = "0"; + //izmeni experiment id + + _predictorService.Create(predictor); + + //dodaj javne datasetove + } + + } + + // POST api/<PredictorController>/usepredictor {predictor,inputs} [HttpPost("usepredictor/{id}")] [Authorize(Roles = "User,Guest")] diff --git a/backend/api/api/Program.cs b/backend/api/api/Program.cs index 7d5d0c45..43fd5cd6 100644 --- a/backend/api/api/Program.cs +++ b/backend/api/api/Program.cs @@ -4,6 +4,7 @@ using api.Interfaces; using api.Models; using api.Services; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; using MongoDB.Driver; @@ -55,6 +56,11 @@ builder.Services.AddAuthentication( }; }); +builder.Services.Configure<FormOptions>(x => +{ + x.ValueLengthLimit = int.MaxValue; + x.MultipartBodyLengthLimit = int.MaxValue; +}); builder.Services.AddControllers(); diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs index bcdb086e..3650a756 100644 --- a/backend/api/api/Services/DatasetService.cs +++ b/backend/api/api/Services/DatasetService.cs @@ -83,6 +83,15 @@ namespace api.Services _dataset.ReplaceOne(x=>x._id==dataset._id, dataset); } - + public bool CheckDb() + { + Dataset? dataset = null; + dataset = _dataset.Find(model => model.username == "igrannonica").FirstOrDefault(); + + if (dataset != null) + return false; + else + return true; + } } } diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs index 89856c5b..eeb95c3b 100644 --- a/backend/api/api/Services/IDatasetService.cs +++ b/backend/api/api/Services/IDatasetService.cs @@ -16,5 +16,6 @@ namespace api.Services void Delete(string username, string name); public List<Dataset> GetGuestDatasets(); public void Update(Dataset dataset); + bool CheckDb(); } } diff --git a/backend/api/api/Services/IModelService.cs b/backend/api/api/Services/IModelService.cs index 86aa5b56..4486af8c 100644 --- a/backend/api/api/Services/IModelService.cs +++ b/backend/api/api/Services/IModelService.cs @@ -16,6 +16,7 @@ namespace api.Services public void Update(string id, Model model); void Delete(string username, string name); bool CheckHyperparameters(int inputNeurons, int hiddenLayerNeurons, int hiddenLayers, int outputNeurons); + bool CheckDefaultModels(); } } diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs index daba2855..db002cea 100644 --- a/backend/api/api/Services/ModelService.cs +++ b/backend/api/api/Services/ModelService.cs @@ -80,7 +80,16 @@ namespace api.Services return false; } - + public bool CheckDefaultModels() + { + Model? model = null; + model = _model.Find(model => model.username == "igrannonica").FirstOrDefault(); + + if (model != null) + return false; + else + return true; + } } } |