mirror of
https://github.com/leon-ai/leon.git
synced 2024-12-18 14:21:32 +03:00
feat(server): expose queries over HTTP
This commit is contained in:
parent
115f9c1645
commit
b6428d0384
@ -26,10 +26,18 @@ class Brain {
|
|||||||
log.success('New instance')
|
log.success('New instance')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get socket () {
|
||||||
|
return this._socket
|
||||||
|
}
|
||||||
|
|
||||||
set socket (newSocket) {
|
set socket (newSocket) {
|
||||||
this._socket = newSocket
|
this._socket = newSocket
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get tts () {
|
||||||
|
return this._tts
|
||||||
|
}
|
||||||
|
|
||||||
set tts (newTts) {
|
set tts (newTts) {
|
||||||
this._tts = newTts
|
this._tts = newTts
|
||||||
}
|
}
|
||||||
@ -259,8 +267,11 @@ class Brain {
|
|||||||
const executionTime = executionTimeEnd - executionTimeStart
|
const executionTime = executionTimeEnd - executionTimeStart
|
||||||
|
|
||||||
resolve({
|
resolve({
|
||||||
|
queryId,
|
||||||
|
lang: langs[process.env.LEON_LANG].short,
|
||||||
|
...obj,
|
||||||
speeches,
|
speeches,
|
||||||
executionTime
|
executionTime // In ms, module execution time only
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -55,19 +55,27 @@ class Nlu {
|
|||||||
* pick-up the right classification
|
* pick-up the right classification
|
||||||
* and extract entities
|
* and extract entities
|
||||||
*/
|
*/
|
||||||
async process (query) {
|
process (query, opts) {
|
||||||
|
const processingTimeStart = Date.now()
|
||||||
|
|
||||||
|
return new Promise(async (resolve, reject) => {
|
||||||
log.title('NLU')
|
log.title('NLU')
|
||||||
log.info('Processing...')
|
log.info('Processing...')
|
||||||
|
|
||||||
|
opts = opts || {
|
||||||
|
mute: false // Close Leon mouth e.g. over HTTP
|
||||||
|
}
|
||||||
query = string.ucfirst(query)
|
query = string.ucfirst(query)
|
||||||
|
|
||||||
if (Object.keys(this.nlp).length === 0) {
|
if (Object.keys(this.nlp).length === 0) {
|
||||||
|
if (!opts.mute) {
|
||||||
this.brain.talk(`${this.brain.wernicke('random_errors')}!`)
|
this.brain.talk(`${this.brain.wernicke('random_errors')}!`)
|
||||||
this.brain.socket.emit('is-typing', false)
|
this.brain.socket.emit('is-typing', false)
|
||||||
|
}
|
||||||
|
|
||||||
log.error('The NLP model is missing, please rebuild the project or if you are in dev run: npm run train')
|
const msg = 'The NLP model is missing, please rebuild the project or if you are in dev run: npm run train'
|
||||||
|
log.error(msg)
|
||||||
return false
|
return reject(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
const lang = langs[process.env.LEON_LANG].short
|
const lang = langs[process.env.LEON_LANG].short
|
||||||
@ -107,13 +115,22 @@ class Nlu {
|
|||||||
const fallback = Nlu.fallback(obj, langs[process.env.LEON_LANG].fallbacks)
|
const fallback = Nlu.fallback(obj, langs[process.env.LEON_LANG].fallbacks)
|
||||||
|
|
||||||
if (fallback === false) {
|
if (fallback === false) {
|
||||||
|
if (!opts.mute) {
|
||||||
this.brain.talk(`${this.brain.wernicke('random_unknown_queries')}.`, true)
|
this.brain.talk(`${this.brain.wernicke('random_unknown_queries')}.`, true)
|
||||||
this.brain.socket.emit('is-typing', false)
|
this.brain.socket.emit('is-typing', false)
|
||||||
|
}
|
||||||
|
|
||||||
log.title('NLU')
|
log.title('NLU')
|
||||||
log.warning('Query not found')
|
const msg = 'Query not found'
|
||||||
|
log.warning(msg)
|
||||||
|
|
||||||
return false
|
const processingTimeEnd = Date.now()
|
||||||
|
const processingTime = processingTimeEnd - processingTimeStart
|
||||||
|
|
||||||
|
return resolve({
|
||||||
|
processingTime,
|
||||||
|
message: msg
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
obj = fallback
|
obj = fallback
|
||||||
@ -130,18 +147,33 @@ class Nlu {
|
|||||||
)
|
)
|
||||||
} catch (e) /* istanbul ignore next */ {
|
} catch (e) /* istanbul ignore next */ {
|
||||||
log[e.type](e.obj.message)
|
log[e.type](e.obj.message)
|
||||||
|
|
||||||
|
if (!opts.mute) {
|
||||||
this.brain.talk(`${this.brain.wernicke(e.code, '', e.data)}!`)
|
this.brain.talk(`${this.brain.wernicke(e.code, '', e.data)}!`)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Inject action entities with the others if there is
|
// Inject action entities with the others if there is
|
||||||
await this.brain.execute(obj)
|
const data = await this.brain.execute(obj, { mute: opts.mute })
|
||||||
|
const processingTimeEnd = Date.now()
|
||||||
|
const processingTime = processingTimeEnd - processingTimeStart
|
||||||
|
|
||||||
|
return resolve({
|
||||||
|
processingTime, // In ms, total time
|
||||||
|
...data,
|
||||||
|
nluProcessingTime: processingTime - data.executionTime // In ms, NLU processing time only
|
||||||
|
})
|
||||||
} catch (e) /* istanbul ignore next */ {
|
} catch (e) /* istanbul ignore next */ {
|
||||||
log[e.type](e.obj.message)
|
log[e.type](e.obj.message)
|
||||||
|
|
||||||
|
if (!opts.mute) {
|
||||||
this.brain.socket.emit('is-typing', false)
|
this.brain.socket.emit('is-typing', false)
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return reject(e.obj)
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -82,18 +82,14 @@ const generatePackagesRoutes = () => {
|
|||||||
package: pkg,
|
package: pkg,
|
||||||
module,
|
module,
|
||||||
action,
|
action,
|
||||||
execution_time: 0, // ms
|
|
||||||
speeches: []
|
speeches: []
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { speeches, executionTime } = await brain.execute(obj, { mute: true })
|
const data = await brain.execute(obj, { mute: true })
|
||||||
|
|
||||||
reply.send({
|
reply.send({
|
||||||
...responseData,
|
...data,
|
||||||
entities,
|
|
||||||
speeches,
|
|
||||||
execution_time: executionTime,
|
|
||||||
success: true
|
success: true
|
||||||
})
|
})
|
||||||
} catch (e) /* istanbul ignore next */ {
|
} catch (e) /* istanbul ignore next */ {
|
||||||
@ -102,7 +98,7 @@ const generatePackagesRoutes = () => {
|
|||||||
reply.send({
|
reply.send({
|
||||||
...responseData,
|
...responseData,
|
||||||
speeches: e.speeches,
|
speeches: e.speeches,
|
||||||
execution_time: e.executionTime,
|
executionTime: e.executionTime,
|
||||||
error: e.obj.message,
|
error: e.obj.message,
|
||||||
success: false
|
success: false
|
||||||
})
|
})
|
||||||
@ -222,13 +218,32 @@ const bootstrap = async () => {
|
|||||||
root: join(__dirname, '..', '..', '..', 'app', 'dist'),
|
root: join(__dirname, '..', '..', '..', 'app', 'dist'),
|
||||||
prefix: '/'
|
prefix: '/'
|
||||||
})
|
})
|
||||||
fastify.get('/', (_request, reply) => {
|
fastify.get('/', (request, reply) => {
|
||||||
reply.sendFile('index.html')
|
reply.sendFile('index.html')
|
||||||
})
|
})
|
||||||
|
|
||||||
fastify.register(infoPlugin, { apiVersion })
|
fastify.register(infoPlugin, { apiVersion })
|
||||||
fastify.register(downloadsPlugin, { apiVersion })
|
fastify.register(downloadsPlugin, { apiVersion })
|
||||||
|
|
||||||
|
fastify.post('/core/query', async (request, reply) => {
|
||||||
|
const { query } = request.body
|
||||||
|
|
||||||
|
try {
|
||||||
|
const data = await nlu.process(query, { mute: true })
|
||||||
|
|
||||||
|
reply.send({
|
||||||
|
...data,
|
||||||
|
success: true
|
||||||
|
})
|
||||||
|
} catch (e) {
|
||||||
|
reply.statusCode = 500
|
||||||
|
reply.send({
|
||||||
|
error: e.message,
|
||||||
|
success: false
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
if (process.env.PACKAGES_OVER_HTTP === 'true') {
|
if (process.env.PACKAGES_OVER_HTTP === 'true') {
|
||||||
generatePackagesRoutes()
|
generatePackagesRoutes()
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user