Skip to content

Offer #1013 remove force from nlu #4

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.

Sign up for GitHub

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

Open
offerakrabi wants to merge 3 commits into
base: pre-release
Choose a base branch
from
Open

Offer #1013 remove force from nlu #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53a3655
unexposed factory, exposed init function instead
offerakrabi Jan 25, 2018
d340e7d
removed the force parameter from all nlu engines' init function
offerakrabi Jan 25, 2018
d5cdc86
Merge branch 'pre-release' into offer_#1013_remove_force_from_nlu
offerakrabi Jan 30, 2018
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
14 changes: 13 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,23 @@ const intentity = require('./lib/nlu/intentity');
const nlu = require('./lib/nlu/nlu');
const logger = require('./lib/logger.js');

function init(manifest) {
factory.getNLUs(manifest).then(updatedManifest => {
if (updatedManifest.nlu.regexp) {
updatedManifest.intents = require('../../res/nlu/intents');
}
handler.manifest = updatedManifest;
factory.createAll(updatedManifest).then(function (engines) {
handler.engines = engines;
});
});
}

// Server is exported for testing purposes
module.exports = {
handler: handler,
server: server,
factory: factory,
init: init,
intentity: intentity,
nlu: nlu,
logger: logger
Expand Down
6 changes: 3 additions & 3 deletions lib/nlu/bundles/engines/regexp/nlu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ class Nlu extends Base {
this.patterns = [];
}

init(resource, force) {
init(resource) {
var self = this;
return new Promise((resolve, reject) => {
load(self, resource, true, (err, result) => {
load(self, resource, (err, result) => {
resolve(self);
});
});
Expand Down Expand Up @@ -69,7 +69,7 @@ class Nlu extends Base {

}

function load(self, resource, force, cb) {
function load(self, resource, cb) {
// Load the regular expression resource
resource.intents.forEach(intent => {
if (intent.visibility !== 'gone') {
Expand Down
6 changes: 3 additions & 3 deletions lib/nlu/bundles/engines/wcs/nlu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ class Nlu extends Base {
this.workspace = {};
}

init(resource, force) {
init(resource) {
return new Promise((resolve, reject) => {
load(this, resource, force, (err, result) => {
load(this, resource, (err, result) => {
if (err) {
logger.error(err);
reject();
Expand Down Expand Up @@ -76,7 +76,7 @@ class Nlu extends Base {
}
}

function load(self, resource, force, cb) {
function load(self, resource, cb) {
// Bind to existing workspace or create new one with specified content
Object.keys(resource.workspace).forEach(language => {
if (resource.workspace[language].workspace_id) {
Expand Down
3 changes: 1 addition & 2 deletions lib/nlu/nlu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ class Nlu {
/**
* initialization function - will be called once (in the index.js file) when loading the skill
* @param resource - this is the nlu resource configuration file (you get it by calling manifest.nlu['nlu type'])
* @param force - deprecated
*/
init(resource, force) {
init(resource) {
}

/**
Expand Down