aboutsummaryrefslogtreecommitdiff
path: root/backend/api
diff options
context:
space:
mode:
Diffstat (limited to 'backend/api')
-rw-r--r--backend/api/api/Controllers/DatasetController.cs20
-rw-r--r--backend/api/api/Controllers/ModelController.cs40
-rw-r--r--backend/api/api/Models/Model.cs6
-rw-r--r--backend/api/api/Models/Predictor.cs47
-rw-r--r--backend/api/api/Program.cs2
-rw-r--r--backend/api/api/Services/DatasetService.cs12
-rw-r--r--backend/api/api/Services/FillAnEmptyDb.cs13
-rw-r--r--backend/api/api/Services/MlConnectionService.cs13
-rw-r--r--backend/api/api/appsettings.json10
9 files changed, 75 insertions, 88 deletions
diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index e4741412..849d9884 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -144,7 +144,6 @@ namespace api.Controllers
[Authorize(Roles = "User,Guest")]
public async Task<ActionResult<Dataset>> Post([FromBody] Dataset dataset)
{
- Console.WriteLine("PROBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
string uploaderId = getUserId();
dataset.uploaderId = uploaderId;
@@ -196,7 +195,7 @@ namespace api.Controllers
string ext = ".csv";
- //nesto
+
//Check Directory
if (!Directory.Exists(folderPath))
@@ -279,19 +278,4 @@ namespace api.Controllers
}
}
-}
-
-/*
-{
- "_id": "",
- "name": "name",
- "description": "description",
- "header" : ["ag","rt"],
- "fileId" : "652",
- "extension": "csb",
- "isPublic" : true,
- "accessibleByLink": true,
- "dateCreated": "dateCreated",
- "lastUpdated" : "proba12"
-}
-*/ \ No newline at end of file
+} \ No newline at end of file
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index 39eb7830..be30ae6f 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -211,6 +211,8 @@ namespace api.Controllers
return BadRequest("Bad parameters!");*/
model.uploaderId = getUserId();
+ model.dateCreated = DateTime.Now;
+ model.lastUpdated = DateTime.Now;
var existingModel = _modelService.GetOneModel(model.uploaderId, model.name);
@@ -232,6 +234,44 @@ namespace api.Controllers
}
}
+ // POST api/<ModelController>/stealModel
+ [HttpPost("stealModel")]
+ [Authorize(Roles = "User,Guest")]
+ public ActionResult<Model> StealModel([FromBody] Model model)//, bool overwrite)
+ {
+ bool overwrite = false;
+ //username="" ako je GUEST
+ //Experiment e = _experimentService.Get(model.experimentId); umesto 1 ide e.inputColumns.Length TODO!!!!!!!!!!!!!!!!!
+ //model.inputNeurons = e.inputColumns.Length;
+ /*if (_modelService.CheckHyperparameters(1, model.hiddenLayerNeurons, model.hiddenLayers, model.outputNeurons) == false)
+ return BadRequest("Bad parameters!");*/
+
+ model.uploaderId = getUserId();
+ model._id = "";
+ model.dateCreated = DateTime.Now;
+ model.lastUpdated = DateTime.Now;
+ model.isPublic = false;
+
+ var existingModel = _modelService.GetOneModel(model.uploaderId, model.name);
+
+
+ if (existingModel != null && !overwrite && model.validationSize < 1 && model.validationSize > 0)
+ return NotFound($"Model already exisits or validation size is not between 0-1");
+ else
+ {
+ //_modelService.Create(model);
+ //return Ok();
+ if (existingModel == null)
+ _modelService.Create(model);
+ else
+ {
+ _modelService.Replace(model);
+ }
+
+ return CreatedAtAction(nameof(Get), new { id = model._id }, model);
+ }
+ }
+
// PUT api/<ModelController>/{name}
[HttpPut("{name}")]
[Authorize(Roles = "User,Guest")]
diff --git a/backend/api/api/Models/Model.cs b/backend/api/api/Models/Model.cs
index a807316f..bbbf201e 100644
--- a/backend/api/api/Models/Model.cs
+++ b/backend/api/api/Models/Model.cs
@@ -14,18 +14,14 @@ namespace api.Models
public string name { get; set; }
public string description { get; set; }
- //datetime
public DateTime dateCreated { get; set; }
public DateTime lastUpdated { get; set; }
- //proveriti id
- //public string experimentId { get; set; }
//Neural net training
public string type { get; set; }
public string optimizer { get; set; }
public string lossFunction { get; set; }
- //public int inputNeurons { get; set; }
public int hiddenLayers { get; set; }
public string batchSize { get; set; }
public string learningRate { get; set; }
@@ -36,8 +32,6 @@ namespace api.Models
public string[] metrics { get; set; }
public int epochs { get; set; }
- //public bool isTrained { get; set; }
- //public NullValues[] nullValues { get; set; }
public bool randomOrder { get; set; }
public bool randomTestSet { get; set; }
public float randomTestSetDistribution { get; set; }
diff --git a/backend/api/api/Models/Predictor.cs b/backend/api/api/Models/Predictor.cs
index 530257b2..5a7b5eda 100644
--- a/backend/api/api/Models/Predictor.cs
+++ b/backend/api/api/Models/Predictor.cs
@@ -18,38 +18,25 @@ namespace api.Models
public string experimentId { get; set; }
public string modelId { get; set; }
public string h5FileId { get; set; }
- public Metric[] metrics { get; set; }
- public Metric[] finalMetrics { get; set; }
- }
- public class Metric
+ //public Metric[] metrics { get; set; }
+
+ public float[] metricsLoss { get; set; }
+ public float[] metricsValLoss { get; set; }
+ public float[] metricsAcc { get; set; }
+ public float[] metricsValAcc { get; set; }
+ public float[] metricsMae { get; set; }
+ public float[] metricsValMae { get; set; }
+ public float[] metricsMse { get; set; }
+ public float[] metricsValMse { get; set; }
+ //public Metric[] finalMetrics { get; set; }
+ }
+
+ /*public class Metric
{
string Name { get; set; }
string JsonValue { get; set; }
- }
-
-}
-
-/**
-* Paste one or more documents here
-
-{
- "_id": {
- "$oid": "625dc348b7856ace8a6f8702"
-
- },
- "uploaderId" : "6242ea59486c664208d4255c",
- "inputs": ["proba",
- "proba2",
- "proba3"
- ],
- "output" : "izlaz",
- "isPublic" : true,
- "accessibleByLink" : true,
- "dateCreated" : "2022-04-11T20:33:26.937+00:00",
- "experimentId" : "Neki id eksperimenta",
- "modelId" : "Neki id eksperimenta",
- "h5FileId" : "Neki id eksperimenta",
- "metrics" : [{ }]
-}*/ \ No newline at end of file
+ }*/
+
+} \ No newline at end of file
diff --git a/backend/api/api/Program.cs b/backend/api/api/Program.cs
index cf64d58d..5977e843 100644
--- a/backend/api/api/Program.cs
+++ b/backend/api/api/Program.cs
@@ -37,7 +37,7 @@ builder.Services.AddScoped<IFileService, FileService>();
builder.Services.AddScoped<IJwtToken, JwtToken>();
builder.Services.AddScoped<IExperimentService, ExperimentService>();
builder.Services.AddHostedService<TempFileService>();
-builder.Services.AddHostedService<FillAnEmptyDb>();
+//builder.Services.AddHostedService<FillAnEmptyDb>();
//Ml Api Ip Filter
builder.Services.AddScoped<MlApiCheckActionFilter>(container =>
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index f38a363b..0b84721e 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -104,16 +104,6 @@ namespace api.Services
return dataset._id;
}
- /*
-public bool CheckDb()
-{
- Dataset? dataset = null;
- dataset = _dataset.Find(dataset => dataset.username == "igrannonica").FirstOrDefault();
-
- if (dataset != null)
- return false;
- else
- return true;
-}*/
+
}
}
diff --git a/backend/api/api/Services/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs
index 811e723a..cd35dc78 100644
--- a/backend/api/api/Services/FillAnEmptyDb.cs
+++ b/backend/api/api/Services/FillAnEmptyDb.cs
@@ -54,7 +54,7 @@ namespace api.Services
dataset._id = "";
dataset.uploaderId = "000000000000000000000000";
- dataset.name = "Titanik dataset(public)";
+ dataset.name = "Titanik dataset (public)";
dataset.description = "Titanik dataset";
dataset.fileId = _fileService.GetFileId(fullPath);
dataset.extension = ".csv";
@@ -277,6 +277,7 @@ namespace api.Services
model.lossFunction = "sparse_categorical_crossentropy";
model.hiddenLayers = 5;
model.batchSize = "64";
+ model.learningRate = "1";
model.outputNeurons = 0;
model.layers = new[]
{
@@ -368,7 +369,7 @@ namespace api.Services
dataset._id = "";
dataset.uploaderId = "000000000000000000000000";
dataset.name = "IMDB-Movie-Data Dataset (public)";
- dataset.description = "IMDB-Movie-Data Dataset(public)";
+ dataset.description = "IMDB-Movie-Data Dataset (public)";
dataset.fileId = _fileService.GetFileId(fullPath);
dataset.extension = ".csv";
dataset.isPublic = true;
@@ -421,8 +422,8 @@ namespace api.Services
model._id = "";
model.uploaderId = "000000000000000000000000";
- model.name = "IMDB model";
- model.description = "IMDB model";
+ model.name = "IMDB model (public)";
+ model.description = "IMDB model (public)";
model.dateCreated = DateTime.Now;
model.lastUpdated = DateTime.Now;
model.type = "regresioni";
@@ -579,8 +580,8 @@ namespace api.Services
model._id = "";
model.uploaderId = "000000000000000000000000";
- model.name = "Churn model";
- model.description = "Churn model";
+ model.name = "Churn model (public)";
+ model.description = "Churn model (public)";
model.dateCreated = DateTime.Now;
model.lastUpdated = DateTime.Now;
model.type = "binarni-klasifikacioni";
diff --git a/backend/api/api/Services/MlConnectionService.cs b/backend/api/api/Services/MlConnectionService.cs
index 0ecdb1af..6a307e0d 100644
--- a/backend/api/api/Services/MlConnectionService.cs
+++ b/backend/api/api/Services/MlConnectionService.cs
@@ -63,19 +63,6 @@ namespace api.Services
foreach (var connection in ChatHub.getAllConnectionsOfUser(id))
await _ichat.Clients.Client(connection).SendAsync("NotifyDataset",newDataset.name,newDataset._id);
-
- string proba = "";
-
- for (int i = 0; i < newDataset.cMatrix.Length; i++)
- {
- proba = i +" ";
- for (int j = 0; j < newDataset.cMatrix[i].Length; j++)
- proba += newDataset.cMatrix[i][j] + "f, ";
-
- Console.WriteLine(proba);
- proba = "";
- }
-
return;
}
diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json
index 44d63ac3..b502efeb 100644
--- a/backend/api/api/appsettings.json
+++ b/backend/api/api/appsettings.json
@@ -16,22 +16,26 @@
"UserStoreDatabaseSettings": {
/* LocalHost*/
- /*"ConnectionString": "mongodb://127.0.0.1:27017/",
+ "ConnectionString": "mongodb://127.0.0.1:27017/",
"DatabaseName": "si_project",
"CollectionName": "users",
"DatasetCollectionName": "Dataset",
"ModelCollectionName": "Model",
"PredictorCollectionName": "Predictor",
"FilesCollectionName": "Files",
- "ExperimentCollectionName": "Experiment"*/
+ "ExperimentCollectionName": "Experiment"
+ /*
"ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority",
+
+ "ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority",
+ 529394dd526811e059dfb5f8f76597ffd90b2fea
"DatabaseName": "si_db",
"CollectionName": "users",
"DatasetCollectionName": "Dataset",
"ModelCollectionName": "Model",
"PredictorCollectionName": "Predictor",
"FilesCollectionName": "Files",
- "ExperimentCollectionName": "Experiment"
+ "ExperimentCollectionName": "Experiment" */
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-20 03:06:10 +0000