aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/api/api/.gitignore3
-rw-r--r--backend/api/api/Services/DatasetService.cs4
-rw-r--r--backend/api/api/Services/FileService.cs2
-rw-r--r--backend/api/api/Services/FillAnEmptyDb.cs123
-rw-r--r--backend/api/api/Services/ModelService.cs2
-rw-r--r--backend/api/api/UploadedFiles/000000000000000000000000/diamonds.csv (renamed from backend/api/api/UploadedFiles/Igrannonica/diamonds.csv)0
-rw-r--r--backend/api/api/UploadedFiles/000000000000000000000000/iris.csv (renamed from backend/api/api/UploadedFiles/Igrannonica/iris.csv)0
-rw-r--r--backend/api/api/UploadedFiles/000000000000000000000000/titanic.csv (renamed from backend/api/api/UploadedFiles/Igrannonica/titanic.csv)0
8 files changed, 52 insertions, 82 deletions
diff --git a/backend/api/api/.gitignore b/backend/api/api/.gitignore
index 3c45979c..5bae0d7a 100644
--- a/backend/api/api/.gitignore
+++ b/backend/api/api/.gitignore
@@ -6,7 +6,8 @@
##Ignore contents for UploadedFiles Folder
PredictorFiles/*
UploadedFiles/*
-!UploadedFiles/Igrannonica
+!UploadedFiles/000000000000000000000000
+!PredictorFiles/000000000000000000000000
TempFiles/*
# User-specific files
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 6c2efe14..fe177d77 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -39,7 +39,7 @@ namespace api.Services
public List<Dataset> GetGuestDatasets()
{
//Join Igranonica public datasetove sa svim temp uploadanim datasetovima
- List<Dataset> datasets= _dataset.Find(dataset => dataset.uploaderId == "Igrannonica" && dataset.isPublic == true && dataset.isPreProcess).ToList();
+ List<Dataset> datasets= _dataset.Find(dataset => dataset.uploaderId == "000000000000000000000000" && dataset.isPublic == true && dataset.isPreProcess).ToList();
datasets.AddRange(_dataset.Find(dataset => dataset.uploaderId == "" && dataset.isPreProcess).ToList());
return datasets;
}
@@ -85,7 +85,7 @@ namespace api.Services
public string GetDatasetId(string fileId)
{
- Dataset dataset = _dataset.Find(dataset => dataset.fileId == fileId && dataset.uploaderId == "Igrannonica").FirstOrDefault();
+ Dataset dataset = _dataset.Find(dataset => dataset.fileId == fileId && dataset.uploaderId == "000000000000000000000000").FirstOrDefault();
return dataset._id;
}
diff --git a/backend/api/api/Services/FileService.cs b/backend/api/api/Services/FileService.cs
index 426f2624..ea3fe56e 100644
--- a/backend/api/api/Services/FileService.cs
+++ b/backend/api/api/Services/FileService.cs
@@ -45,7 +45,7 @@ namespace api.Services
public bool CheckDb()
{
FileModel? file = null;
- file = _file.Find(file => file.uploaderId == "Igrannonica").FirstOrDefault();
+ file = _file.Find(file => file.uploaderId == "000000000000000000000000").FirstOrDefault();
if (file != null)
return false;
diff --git a/backend/api/api/Services/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs
index 6d5683bd..216e1221 100644
--- a/backend/api/api/Services/FillAnEmptyDb.cs
+++ b/backend/api/api/Services/FillAnEmptyDb.cs
@@ -18,7 +18,7 @@ namespace api.Services
{
var database = mongoClient.GetDatabase(settings.DatabaseName);
- _fileService = new FileService(settings,mongoClient);
+ _fileService = new FileService(settings, mongoClient);
_datasetService = new DatasetService(settings, mongoClient);
_modelService = new ModelService(settings, mongoClient);
_experimentService = new ExperimentService(settings, mongoClient);
@@ -37,12 +37,12 @@ namespace api.Services
FileModel file = new FileModel();
string folderName = "UploadedFiles";
- var folderPath = Path.Combine(Directory.GetCurrentDirectory(), folderName, "Igrannonica");
+ var folderPath = Path.Combine(Directory.GetCurrentDirectory(), folderName, "000000000000000000000000");
var fullPath = Path.Combine(folderPath, "titanic.csv");
file._id = "";
file.type = ".csv";
- file.uploaderId = "Igrannonica";
+ file.uploaderId = "000000000000000000000000";
file.path = fullPath;
file.date = DateTime.Now;
@@ -52,7 +52,7 @@ namespace api.Services
Dataset dataset = new Dataset();
dataset._id = "";
- dataset.uploaderId = "Igrannonica";
+ dataset.uploaderId = "000000000000000000000000";
dataset.name = "Titanik dataset";
dataset.description = "Titanik dataset";
dataset.header = new string[] { "PassengerId", "Survived", "Pclass", "Name", "Sex", "Age", "SibSp", "Parch", "Ticket", "Fare", "Cabin", "Embarked" };
@@ -91,7 +91,7 @@ namespace api.Services
Model model = new Model();
model._id = "";
- model.uploaderId = "Igrannonica";
+ model.uploaderId = "000000000000000000000000";
model.name = "Model Titanik";
model.description = "Model Titanik";
model.dateCreated = DateTime.Now;
@@ -118,7 +118,7 @@ namespace api.Services
experiment.description = "Binarno klasifikacioni, label";
experiment.ModelIds = new string[] { }.ToList();
experiment.datasetId = _datasetService.GetDatasetId(dataset.fileId);
- experiment.uploaderId = "Igrannonica";
+ experiment.uploaderId = "000000000000000000000000";
experiment.inputColumns = new string[] { "Embarked" };
experiment.outputColumn = "Survived";
experiment.randomOrder = true;
@@ -134,29 +134,21 @@ namespace api.Services
_experimentService.Create(experiment);
- var experiment1 = _experimentService.Get(experiment._id);
- var dataset1 = _datasetService.GetOneDataset(experiment.datasetId);
- var filepath1 = _fileService.GetFilePath(dataset.fileId, "Igrannonica");
- var model1 = _modelService.GetOneModel(model._id);
-
-
- //_mlService.TrainModel(model1, experiment1, filepath1, dataset1, "Igrannonica");
-
/*
-
Predictor 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.uploaderId = "000000000000000000000000";
+ predictor.inputs = new string[] { "Embarked" };
+ predictor.output = "Survived";
predictor.isPublic = true;
predictor.accessibleByLink = true;
predictor.dateCreated = DateTime.Now;
- predictor.experimentId = "0";
- //izmeni experiment id
+ predictor.experimentId = experiment._id;//izmeni experiment id
+ predictor.modelId = _modelService.getModelId("000000000000000000000000");
+ predictor.h5FileId = ;
+ predictor.metrics = new Metric[] { };
+
_predictorService.Create(predictor);*/
@@ -167,17 +159,17 @@ namespace api.Services
fullPath = Path.Combine(folderPath, "diamonds.csv");
file._id = "";
file.type = ".csv";
- file.uploaderId = "Igrannonica";
+ file.uploaderId = "000000000000000000000000";
file.path = fullPath;
file.date = DateTime.Now;
_fileService.Create(file);
-
+
dataset = new Dataset();
dataset._id = "";
- dataset.uploaderId = "Igrannonica";
+ dataset.uploaderId = "000000000000000000000000";
dataset.name = "Diamonds dataset";
dataset.description = "Diamonds dataset";
dataset.fileId = _fileService.GetFileId(fullPath);
@@ -187,7 +179,7 @@ namespace api.Services
dataset.dateCreated = DateTime.Now;
dataset.lastUpdated = DateTime.Now;
dataset.delimiter = "";
- dataset.hasHeader = true;
+ dataset.hasHeader = true;
dataset.columnInfo = new[]
{
new ColumnInfo( "Unnamed: 0", true, 0, 26969.5f, 0, 53939, 26969.5f, new string[]{ }),
@@ -209,12 +201,12 @@ namespace api.Services
_datasetService.Create(dataset);
-
-
+
+
model = new Model();
model._id = "";
- model.uploaderId = "Igrannonica";
+ model.uploaderId = "000000000000000000000000";
model.name = "Diamonds model";
model.description = "Diamonds model";
model.dateCreated = DateTime.Now;
@@ -232,7 +224,7 @@ namespace api.Services
model.epochs = 5;
_modelService.Create(model);
-
+
experiment = new Experiment();
@@ -241,14 +233,14 @@ namespace api.Services
experiment.description = "Diamonds eksperiment";
experiment.ModelIds = new string[] { }.ToList();
experiment.datasetId = _datasetService.GetDatasetId(dataset.fileId);
- experiment.uploaderId = "Igrannonica";
+ experiment.uploaderId = "000000000000000000000000";
experiment.inputColumns = new string[] { "Unnamed: 0", "carat", "cut", "color", "clarity", "depth", "table", "x", "y", "z" };
experiment.outputColumn = "price";
experiment.randomOrder = true;
experiment.randomTestSet = true;
experiment.randomTestSetDistribution = 0.30000001192092896f;
experiment.nullValues = "delete_rows";
- experiment.nullValuesReplacers = new NullValues[] { };
+ experiment.nullValuesReplacers = new NullValues[] { };
experiment.encodings = new[]
{
new ColumnEncoding( "Unnamed: 0", "label" ),
@@ -265,30 +257,19 @@ namespace api.Services
};
_experimentService.Create(experiment);
-
- experiment1 = _experimentService.Get(experiment._id);
- dataset1 = _datasetService.GetOneDataset(experiment.datasetId);
- filepath1 = _fileService.GetFilePath(dataset.fileId, "Igrannonica");
- model1 = _modelService.GetOneModel(model._id);
- //_mlService.TrainModel(model1, experiment1, filepath1, dataset1, "Igrannonica");
/*
-
- 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.uploaderId = "000000000000000000000000";
+ predictor.inputs = new string[] { "Unnamed: 0", "carat", "cut", "color", "clarity", "depth", "table", "x", "y", "z" };
+ predictor.output = "price";
predictor.isPublic = true;
predictor.accessibleByLink = true;
predictor.dateCreated = DateTime.Now;
- predictor.experimentId = "0";
- //izmeni experiment id
+ predictor.experimentId = experiment._id;//izmeni experiment id
+ predictor.modelId = _modelService.getModelId("000000000000000000000000");
+ predictor.h5FileId = ;
+ predictor.metrics = new Metric[] { };*/
- _predictorService.Create(predictor);
- */
//--------------------------------------------------------------------
file = new FileModel();
@@ -296,7 +277,7 @@ namespace api.Services
fullPath = Path.Combine(folderPath, "iris.csv");
file._id = "";
file.type = ".csv";
- file.uploaderId = "Igrannonica";
+ file.uploaderId = "000000000000000000000000";
file.path = fullPath;
file.date = DateTime.Now;
@@ -306,7 +287,7 @@ namespace api.Services
dataset = new Dataset();
dataset._id = "";
- dataset.uploaderId = "Igrannonica";
+ dataset.uploaderId = "000000000000000000000000";
dataset.name = "Iris dataset";
dataset.description = "Iris dataset";
dataset.fileId = _fileService.GetFileId(fullPath);
@@ -331,11 +312,11 @@ namespace api.Services
_datasetService.Create(dataset);
-
+
model = new Model();
model._id = "";
- model.uploaderId = "Igrannonica";
+ model.uploaderId = "000000000000000000000000";
model.name = "Model Iris";
model.description = "Model Iris";
model.dateCreated = DateTime.Now;
@@ -353,7 +334,7 @@ namespace api.Services
model.epochs = 1;
_modelService.Create(model);
-
+
experiment = new Experiment();
@@ -362,14 +343,14 @@ namespace api.Services
experiment.description = "Iris eksperiment";
experiment.ModelIds = new string[] { }.ToList();
experiment.datasetId = _datasetService.GetDatasetId(dataset.fileId);
- experiment.uploaderId = "Igrannonica";
+ experiment.uploaderId = "000000000000000000000000";
experiment.inputColumns = new string[] { "sepal_length", "sepal_width", "petal_length", "petal_width" };
experiment.outputColumn = "class";
experiment.randomOrder = true;
experiment.randomTestSet = true;
experiment.randomTestSetDistribution = 0.20000000298023224f;
experiment.nullValues = "delete_rows";
- experiment.nullValuesReplacers = new NullValues[] { };
+ experiment.nullValuesReplacers = new NullValues[] { };
experiment.encodings = new[]
{
new ColumnEncoding( "sepal_length", "label" ),
@@ -378,33 +359,21 @@ namespace api.Services
new ColumnEncoding( "petal_width", "label" ),
new ColumnEncoding( "class", "label" )
};
-
- _experimentService.Create(experiment);
-
- experiment1 = _experimentService.Get(experiment._id);
- dataset1 = _datasetService.GetOneDataset(experiment.datasetId);
- filepath1 = _fileService.GetFilePath(dataset.fileId, "Igrannonica");
- model1 = _modelService.GetOneModel(model._id);
- //_mlService.TrainModel(model1, experiment1, filepath1, dataset1, "Igrannonica");
+ _experimentService.Create(experiment);
/*
- 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.uploaderId = "000000000000000000000000";
+ predictor.inputs = new string[] { "sepal_length", "sepal_width", "petal_length", "petal_width" };
+ predictor.output = "class";
predictor.isPublic = true;
predictor.accessibleByLink = true;
predictor.dateCreated = DateTime.Now;
- predictor.experimentId = "0";
- //izmeni experiment id
-
- _predictorService.Create(predictor);
+ predictor.experimentId = experiment._id;//izmeni experiment id
+ predictor.modelId = _modelService.getModelId("000000000000000000000000");
+ predictor.h5FileId = ;
+ predictor.metrics = new Metric[] { };*/
- */
}
diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs
index c35e5374..12297635 100644
--- a/backend/api/api/Services/ModelService.cs
+++ b/backend/api/api/Services/ModelService.cs
@@ -87,7 +87,7 @@ namespace api.Services
public bool CheckDb()
{
Model? model = null;
- model = _model.Find(model => model.uploaderId == "Igrannonica").FirstOrDefault();
+ model = _model.Find(model => model.uploaderId == "000000000000000000000000").FirstOrDefault();
if (model != null)
return false;
diff --git a/backend/api/api/UploadedFiles/Igrannonica/diamonds.csv b/backend/api/api/UploadedFiles/000000000000000000000000/diamonds.csv
index d28ac6c6..d28ac6c6 100644
--- a/backend/api/api/UploadedFiles/Igrannonica/diamonds.csv
+++ b/backend/api/api/UploadedFiles/000000000000000000000000/diamonds.csv
diff --git a/backend/api/api/UploadedFiles/Igrannonica/iris.csv b/backend/api/api/UploadedFiles/000000000000000000000000/iris.csv
index 0713e5cb..0713e5cb 100644
--- a/backend/api/api/UploadedFiles/Igrannonica/iris.csv
+++ b/backend/api/api/UploadedFiles/000000000000000000000000/iris.csv
diff --git a/backend/api/api/UploadedFiles/Igrannonica/titanic.csv b/backend/api/api/UploadedFiles/000000000000000000000000/titanic.csv
index 5cc466e9..5cc466e9 100644
--- a/backend/api/api/UploadedFiles/Igrannonica/titanic.csv
+++ b/backend/api/api/UploadedFiles/000000000000000000000000/titanic.csv
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 19:46:27 +0000