aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/api/api/Controllers/FileController.cs45
-rw-r--r--backend/api/api/Controllers/ModelController.cs19
-rw-r--r--backend/api/api/Controllers/PredictorController.cs22
-rw-r--r--backend/api/api/Services/FileService.cs14
-rw-r--r--backend/api/api/Services/FillAnEmptyDb.cs25
-rw-r--r--backend/api/api/Services/IFileService.cs1
6 files changed, 109 insertions, 17 deletions
diff --git a/backend/api/api/Controllers/FileController.cs b/backend/api/api/Controllers/FileController.cs
index c5329d34..b36d9eb9 100644
--- a/backend/api/api/Controllers/FileController.cs
+++ b/backend/api/api/Controllers/FileController.cs
@@ -17,12 +17,12 @@ namespace api.Controllers
private readonly IConfiguration _configuration;
private IJwtToken _token;
private readonly IFileService _fileservice;
+
public FileController(IConfiguration configuration,IFileService fileService,IJwtToken token)
{
_configuration = configuration;
_token = token;
_fileservice = fileService;
-
}
[HttpPost("h5")]
@@ -148,6 +148,7 @@ namespace api.Controllers
return null;
}else
return BadRequest();
+
if (uploaderId == "")
{
folderName = "TempFiles";
@@ -263,5 +264,47 @@ namespace api.Controllers
}
+
+ [HttpGet("proba")]
+ public void AddFileToEmptyDb()
+ {
+ FileModel file = new FileModel();
+
+ string folderName = "UploadedFiles/Igrannonica";
+ var folderPath = Path.Combine(Directory.GetCurrentDirectory(), folderName, "Igrannonica");
+ var fullPath = Path.Combine(folderPath, "titanic.csv");
+
+ file._id = "";
+ file.type = ".csv";
+ file.uploaderId = "Igrannonica";
+ file.path = fullPath;
+ file.date = DateTime.Now;
+
+ _fileservice.Create(file);
+
+
+ file = new FileModel();
+
+ fullPath = Path.Combine(folderPath, "diamonds.csv");
+ file._id = "";
+ file.type = ".csv";
+ file.uploaderId = "Igrannonica";
+ file.path = fullPath;
+ file.date = DateTime.Now;
+
+ _fileservice.Create(file);
+
+
+ file = new FileModel();
+
+ fullPath = Path.Combine(folderPath, "IMDB-Movie-Data.csv");
+ file._id = "";
+ file.type = ".csv";
+ file.uploaderId = "Igrannonica";
+ file.path = fullPath;
+ file.date = DateTime.Now;
+
+ _fileservice.Create(file);
+ }
}
}
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index d2a0ceb5..727d4a10 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -175,9 +175,10 @@ namespace api.Controllers
}
}
+
- public void AddToEmptyDb()
+ public void AddToEmptyDb()
{
if (_modelService.CheckDb())
@@ -207,6 +208,10 @@ namespace api.Controllers
_modelService.Create(model);
+ model = new Model();
+
+ model._id = "";
+ model.username = "Igrannonica";
model.name = "Igrannonica model 2";
model.description = "Opis modela 2";
model.dateCreated = DateTime.Now;
@@ -220,14 +225,18 @@ namespace api.Controllers
model.hiddenLayers = 0;
model.batchSize = 0;
model.outputNeurons = 0;
- //model.hiddenLayerActivationFunctions[] =
+ model.hiddenLayerActivationFunctions = new string[] { "sigmoid" };
model.outputLayerActivationFunction = "";
- //model.metrics =
+ model.metrics = new string[] { };
model.epochs = 0;
model.isTrained = false;
_modelService.Create(model);
+ model = new Model();
+
+ model._id = "";
+ model.username = "Igrannonica";
model.name = "Igrannonica model 3";
model.description = "Opis modela 3";
model.dateCreated = DateTime.Now;
@@ -241,9 +250,9 @@ namespace api.Controllers
model.hiddenLayers = 0;
model.batchSize = 0;
model.outputNeurons = 0;
- //model.hiddenLayerActivationFunctions[] =
+ model.hiddenLayerActivationFunctions = new string[] { "sigmoid" };
model.outputLayerActivationFunction = "";
- //model.metrics =
+ model.metrics = new string[] { };
model.epochs = 0;
model.isTrained = false;
diff --git a/backend/api/api/Controllers/PredictorController.cs b/backend/api/api/Controllers/PredictorController.cs
index 00425959..bfb5283f 100644
--- a/backend/api/api/Controllers/PredictorController.cs
+++ b/backend/api/api/Controllers/PredictorController.cs
@@ -214,21 +214,33 @@ namespace api.Controllers
_predictorService.Create(predictor);
- predictor.name = "Igrannonica Predictor 2";
- predictor.description = "Opis predictora 2";
+ predictor = new Predictor();
+
+ predictor._id = "";
+ 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 3";
- predictor.description = "Opis predictora 3";
+
+ predictor = new Predictor();
+
+ predictor._id = "";
+ 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
diff --git a/backend/api/api/Services/FileService.cs b/backend/api/api/Services/FileService.cs
index 13f596d0..069bef90 100644
--- a/backend/api/api/Services/FileService.cs
+++ b/backend/api/api/Services/FileService.cs
@@ -40,6 +40,18 @@ namespace api.Services
{
return _file.Find(x=>x._id==id).FirstOrDefault();
}
-
+
+ public bool CheckDb()
+ {
+ FileModel? file = null;
+ file = _file.Find(file => file.uploaderId == "Igrannonica").FirstOrDefault();
+
+ if (file != null)
+ return false;
+ else
+ return true;
+
+
+ }
}
}
diff --git a/backend/api/api/Services/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs
index a1ef50ae..4c05bdc1 100644
--- a/backend/api/api/Services/FillAnEmptyDb.cs
+++ b/backend/api/api/Services/FillAnEmptyDb.cs
@@ -10,8 +10,10 @@ namespace api.Services
private readonly IMongoCollection<Model> _model;
private readonly IMongoCollection<Predictor> _predictor;
private readonly IDatasetService _datasetService;
+ private readonly IFileService _fileService;
- public FillAnEmptyDb(IUserStoreDatabaseSettings settings, IMongoClient mongoClient, IDatasetService datasetService)
+
+ public FillAnEmptyDb(IUserStoreDatabaseSettings settings, IMongoClient mongoClient, IDatasetService datasetService, IFileService fileService)
{
var database = mongoClient.GetDatabase(settings.DatabaseName);
_dataset = database.GetCollection<Dataset>(settings.DatasetCollectionName);
@@ -19,23 +21,24 @@ namespace api.Services
_predictor = database.GetCollection<Predictor>(settings.PredictorCollectionName);
_datasetService = datasetService;
-
+ _fileService = fileService;
}
public void AddToEmptyDb()
{
- if (_datasetService.CheckDb())
+ if (_fileService.CheckDb())
{
//prvo dodati fajl 3 csv-a
Dataset dataset = new Dataset();
+
dataset._id = "";
dataset.username = "Igrannonica";
dataset.name = "Titanik";
dataset.description = "Opis dataseta 1";
dataset.header = new string[] { "PassengerId", "Survived", "Pclass", "Name", "Sex", "Age", "SibSp", "Parch", "Ticket", "Fare", "Cabin", "Embarked" };
- dataset.fileId = "";//DODAAAAAJ
+ dataset.fileId = "";//DODAAAAAJ getFileId(username naziv fajla)
dataset.extension = ".csv";
dataset.isPublic = true;
dataset.accessibleByLink = true;
@@ -51,11 +54,17 @@ namespace api.Services
_datasetService.Create(dataset);
- dataset.name = "Igrannonica dataset 2";
+ dataset = new Dataset();
+
+ dataset._id = "";
+ dataset.username = "Igrannonica";
+ dataset.name = "Diamonds dataset 2";
dataset.description = "Opis dataseta 2";
dataset.header = new string[] { "PassengerId", "Survived", "Pclass", "Name", "Sex", "Age", "SibSp", "Parch", "Ticket", "Fare", "Cabin", "Embarked" };
dataset.fileId = "";
dataset.extension = ".csv";
+ dataset.isPublic = true;
+ dataset.accessibleByLink = true;
dataset.dateCreated = DateTime.Now;
dataset.lastUpdated = DateTime.Now;
dataset.delimiter = "";
@@ -68,11 +77,17 @@ namespace api.Services
_datasetService.Create(dataset);
+ dataset = new Dataset();
+
+ dataset._id = "";
+ dataset.username = "Igrannonica";
dataset.name = "Igrannonica dataset 3";
dataset.description = "Opis dataseta 3";
dataset.header = new string[] { "PassengerId", "Survived", "Pclass", "Name", "Sex", "Age", "SibSp", "Parch", "Ticket", "Fare", "Cabin", "Embarked" };
dataset.fileId = "";
dataset.extension = ".csv";
+ dataset.isPublic = true;
+ dataset.accessibleByLink = true;
dataset.dateCreated = DateTime.Now;
dataset.lastUpdated = DateTime.Now;
dataset.delimiter = "";
diff --git a/backend/api/api/Services/IFileService.cs b/backend/api/api/Services/IFileService.cs
index 01a1c410..d90a19bc 100644
--- a/backend/api/api/Services/IFileService.cs
+++ b/backend/api/api/Services/IFileService.cs
@@ -7,5 +7,6 @@ namespace api.Services
FileModel Create(FileModel file);
string GetFilePath(string id, string uploaderId);
public FileModel getFile(string id);
+ bool CheckDb();
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-20 04:15:25 +0000