Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Major - Added Support for model and dataset upload #22

Merged
merged 1 commit into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
DATABASE_URL=mongodb://localhost:27017/isee
EXPLAINER_URL=https://explainers
MODELAPI_URL=https://models
JWT_SECRET="CHANGE_THIS"
JWT_EXPIRE=3600

Expand Down
9 changes: 9 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ require('dotenv').config();
const cors = require('cors')
const express = require('express');
const mongoose = require('mongoose');
const fileUpload = require('express-fileupload');

const mongoString = process.env.DATABASE_URL;

mongoose.connect(mongoString);
Expand Down Expand Up @@ -32,8 +34,15 @@ const cbr_cycle = require('./src/routes/cbr_cycle');

const app = express();
const PORT = process.env.PORT || 3000;

// enable files upload
app.use(fileUpload({
createParentPath: true
}));

app.use(express.json());
app.use(cors());

app.use(function (req, res, next) {
res.header(
"Access-Control-Allow-Headers",
Expand Down
52 changes: 52 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"cors": "^2.8.5",
"dotenv": "^16.0.1",
"express": "^4.18.1",
"express-fileupload": "^1.4.0",
"jsonwebtoken": "^8.5.1",
"moment": "^2.29.3",
"mongoose": "^6.3.5",
Expand Down
102 changes: 102 additions & 0 deletions src/controllers/usecase.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
const Usecase = require("../models/usecase");
const Tree = require("../models/tree");
const axios = require('axios');
var FormData = require('form-data');
var fs = require('fs');
const MODELAPI_URL = process.env.MODELAPI_URL;

module.exports.create = async (req, res) => {
const data = new Usecase(req.body)
Expand Down Expand Up @@ -225,6 +228,105 @@ module.exports.updateSettings = async (req, res) => {
}
}

module.exports.updateModel = async (req, res) => {
try {
const id = req.params.id;
const options = { new: true };

let updatedData = {
mode: req.body.mode,
backend: req.body.backend,
attributes: req.body.attributes,
completed: req.body.completed,
source_file: '',
dataset_file: ''
}

let source_file = req.files.source_file;
let dataset_file = req.files.dataset_file;

const path_source = __dirname + "/tmp/" + source_file.name;
const path_dataset = __dirname + "/tmp/" + dataset_file.name;

await source_file.mv(path_source)
await dataset_file.mv(path_dataset)
const RAND = ''; // FOR DEV

// Handle Model Upload
var data_source = new FormData();
const model_params = {
"alias": id + RAND,
"backend": 'sklearn',// FUTURE UPDATE
"model_task": "classification", // FUTURE UPDATE
"dataset_type": "Tabular", // FUTURE UPDATE
"attributes": JSON.parse(updatedData.attributes)
}
data_source.append('id', id + RAND);
data_source.append('info', JSON.stringify(model_params));
data_source.append('file', fs.createReadStream(path_source));

// console.log(data_source)
let method = "POST";

if (updatedData.completed == 'true') {
console.log(updatedData.completed)
method = "PUT";
}

var upload_source = {
method: method,
url: MODELAPI_URL + 'upload_model',
headers: {
'Accept': '*/*',
'Accept-Language': 'en-US,en;q=0.9',
'Connection': 'keep-alive',
'Content-Type': 'application/json',
...data_source.getHeaders()
},
data: data_source
};

let response = await axios(upload_source)

console.log(response.data)
// Handle Dataset Upload
var data_dataset = new FormData();
data_dataset.append('id', id + RAND);
data_dataset.append('file', fs.createReadStream(path_dataset));

var upload_dataset = {
method: 'post',
url: MODELAPI_URL + 'dataset',
headers: {
...data_dataset.getHeaders()
},
data: data_dataset
};

const responsedataset = await axios(upload_dataset);
console.log(responsedataset.data)
updatedData["dataset_file"] = responsedataset.data
updatedData["source_file"] = response.data
updatedData["completed"] = true; // FORCE COMPLETE AFTER UPLOAD TO PREVENT UPDATES

const result = await Usecase.findByIdAndUpdate(id, { model: updatedData }, options);
if (result) {
fs.unlink(path_source, function () {
console.log("File was deleted")
});
fs.unlink(path_dataset, function () {
console.log("File was deleted")
});
res.send(updatedData);
} else {
res.status(404).json({ message: "Usecase not found" });
}
} catch (error) {
console.log(error)
res.status(400).json({ message: error.message })
}
}

module.exports.list = async (req, res) => {
try {
const data = await Usecase.find({ company: req.companyId });
Expand Down
3 changes: 3 additions & 0 deletions src/routes/usecases.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ router.get('/', usecasectrl.list);
// Update Settings
router.patch('/:id/settings', [isCompanyUsecase], usecasectrl.updateSettings);

// Update Model
router.patch('/:id/model', [isCompanyUsecase], usecasectrl.updateModel);

// Update published state
router.patch('/:id/publish', [isCompanyUsecase], usecasectrl.updatePublish);

Expand Down