Commit 995a34a7 authored by Yoann HOUPERT's avatar Yoann HOUPERT

manage conflict

parents 2a9632ad 92329ddb
Pipeline #11598 passed with stage
in 1 minute and 4 seconds
......@@ -23,7 +23,7 @@ module.exports = config => {
const uuidv1 = require('uuid/v1');
return {
transcript: (wavFile, enhancementlCallback) => {
transcript: (wavFile, model, enhancementlCallback) => {
let port = config.port;
if (process.env.OFFLINE_PORT !== undefined) {
port = process.env.OFFLINE_PORT;
......@@ -45,7 +45,8 @@ module.exports = config => {
filename: myUuidString,
contentType: 'audio/x-wav'
}
}
},
model
},
encoding: null
};
......
......@@ -33,7 +33,7 @@ const routesFactory = config => {
const stt = require('../controller/speech-to-text')(config.gstreamer);
const offline = require('../controller/offline')(config.offline);
routes.post('/api/transcript', (req, res) => {
routes.post('/api/transcript/:model*?', (req, res) => {
if (!req.body) {
return res.status(badRequestCode).send('No files were uploaded.');
}
......@@ -41,6 +41,9 @@ const routesFactory = config => {
if (req.get('content-type') === undefined) {
return res.status(noContentTypeCode).send('No content type given');
}
if (req.params.model === undefined) {
req.params.model = 'uc1';
}
enhancer.enhancement(req.body, (err, response, body) => {
if (err) {
......@@ -50,7 +53,7 @@ const routesFactory = config => {
}
if (process.env.IS_OFFLINE === 'true' || (process.env.IS_OFFLINE === undefined && config.isOffline === true)) {
offline.transcript(body, (err, response, body) => {
offline.transcript(body, req.params.model, (err, response, body) => {
if (err) {
return res.status(interalServerCode).json({module: 'Offline transcription', error: 'Error during audio transcription', info: err.toString()});
} else if (response === undefined || body === undefined || response.statusCode !== successCode) {
......@@ -64,7 +67,6 @@ const routesFactory = config => {
const jsonStr = json.transcript.transcription;
let jsonResponse = {};
try {
const transcription = JSON.parse(json.transcript.transcription);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment