Skip to content

Commit 7b36edb

Browse files
chughtschughts
authored
Merge pull request #107 from watson-developer-cloud/master
Rebasing
2 parents 8b01cc6 + fb9f9c9 commit 7b36edb

21 files changed

Lines changed: 176 additions & 67 deletions

File tree

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ Node-RED Watson Nodes for IBM Bluemix
77

88
<a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
99

10+
### New in version 0.5.6
11+
- User Agent added to following nodes: Conversation, Conversation Workspace Manager,
12+
Discovery, Discovery Query Builder, Document Conversion, Language Translator,
13+
Language Translator Utility, Language Indentify, Natural Language Classifier,
14+
Natural Language Understanding, Personality Insights, Retrieve and Rank,
15+
Similarity Search, Speech to Text, STT Corpus Builder, Text to Speech,
16+
TTS Corpus Builder, Tone Analyzer, Visual Recognition
17+
1018
### New in version 0.5.5
1119
- Discovery Query Builder was not picking up searchable fields.
1220
- Personality Insights Node reset to use '2016-10-20' version
@@ -18,7 +26,7 @@ Node-RED Watson Nodes for IBM Bluemix
1826
msg.nlu_options.language, msg.nlu_options.entity_model and msg.nlu_options.relations_model.
1927
- Trade-off Analytics Node moved to the deprecated list.
2028
- Migrated Visual Recognition and Visual Recognition Util nodes to use promises, and
21-
ensure that all error responses are reported.
29+
ensure that all error responses are reported.
2230

2331
### New in version 0.5.4
2432
- Fix for Service / Name conflicts in Document Conversion Node

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-red-node-watson",
3-
"version": "0.5.5",
3+
"version": "0.5.6",
44
"description": "A collection of Node-RED nodes for IBM Watson services",
55
"dependencies": {
66
"alchemy-api": "^1.3.0",

‎services/conversation/v1-workspace-manager.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
module.exports = function (RED) {
1818
const SERVICE_IDENTIFIER = 'conversation';
19-
var temp = require('temp'),
19+
var pkg = require('../../package.json'),
20+
temp = require('temp'),
2021
fs = require('fs'),
2122
serviceutils = require('../../utilities/service-utils'),
2223
payloadutils = require('../../utilities/payload-utils'),
@@ -283,7 +284,10 @@ module.exports = function (RED) {
283284
var conv = new ConversationV1({
284285
username: username,
285286
password: password,
286-
version_date: '2017-02-03'
287+
version_date: '2017-02-03',
288+
headers: {
289+
'User-Agent': pkg.name + '-' + pkg.version
290+
}
287291
});
288292

289293
node.status({fill:'blue', shape:'dot', text:'executing'});

‎services/conversation/v1.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
module.exports = function (RED) {
1818
const SERVICE_IDENTIFIER = 'conversation';
19-
var ConversationV1 = require('watson-developer-cloud/conversation/v1'),
19+
var pkg = require('../../package.json'),
20+
ConversationV1 = require('watson-developer-cloud/conversation/v1'),
2021
serviceutils = require('../../utilities/service-utils'),
2122
service = null, sUsername = null, sPassword = null;
2223

@@ -145,7 +146,10 @@ module.exports = function (RED) {
145146
node.service = new ConversationV1({
146147
username: userName,
147148
password: passWord,
148-
version_date: '2017-02-03'
149+
version_date: '2017-02-03',
150+
headers: {
151+
'User-Agent': pkg.name + '-' + pkg.version
152+
}
149153
});
150154
return true;
151155
}

‎services/discovery/v1-query-builder.js‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
module.exports = function (RED) {
1818

1919
const SERVICE_IDENTIFIER = 'discovery';
20-
var discoveryutils = require('./discovery-utils'),
20+
var pkg = require('../../package.json'),
21+
discoveryutils = require('./discovery-utils'),
2122
DiscoveryV1 = require('watson-developer-cloud/discovery/v1'),
2223
serviceutils = require('../../utilities/service-utils'),
2324
dservice = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
@@ -40,7 +41,10 @@ module.exports = function (RED) {
4041
var discovery = new DiscoveryV1({
4142
username: sUsername ? sUsername : req.query.un,
4243
password: sPassword ? sPassword : req.query.pwd,
43-
version_date: '2017-04-27'
44+
version_date: '2017-04-27',
45+
headers: {
46+
'User-Agent': pkg.name + '-' + pkg.version
47+
}
4448
});
4549

4650
discovery.getEnvironments({}, function (err, response) {
@@ -57,7 +61,10 @@ module.exports = function (RED) {
5761
var discovery = new DiscoveryV1({
5862
username: sUsername ? sUsername : req.query.un,
5963
password: sPassword ? sPassword : req.query.pwd,
60-
version_date: '2017-04-27'
64+
version_date: '2017-04-27',
65+
headers: {
66+
'User-Agent': pkg.name + '-' + pkg.version
67+
}
6168
});
6269

6370
discovery.getCollections({
@@ -77,7 +84,10 @@ module.exports = function (RED) {
7784
var discovery = new DiscoveryV1({
7885
username: sUsername ? sUsername : req.query.un,
7986
password: sPassword ? sPassword : req.query.pwd,
80-
version_date: '2017-04-27'
87+
version_date: '2017-04-27',
88+
headers: {
89+
'User-Agent': pkg.name + '-' + pkg.version
90+
}
8191
});
8292

8393
discovery.query({

‎services/discovery/v1.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
module.exports = function (RED) {
1818

1919
const SERVICE_IDENTIFIER = 'discovery';
20-
var discoveryutils = require('./discovery-utils'),
20+
var pkg = require('../../package.json'),
21+
discoveryutils = require('./discovery-utils'),
2122
DiscoveryV1 = require('watson-developer-cloud/discovery/v1'),
2223
serviceutils = require('../../utilities/service-utils'),
2324
dservice = serviceutils.getServiceCreds(SERVICE_IDENTIFIER),
@@ -137,7 +138,10 @@ module.exports = function (RED) {
137138
var discovery = new DiscoveryV1({
138139
username: username,
139140
password: password,
140-
version_date: '2017-04-27'
141+
version_date: '2017-04-27',
142+
headers: {
143+
'User-Agent': pkg.name + '-' + pkg.version
144+
}
141145
});
142146

143147
switch (method) {

‎services/document_conversion/v1.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
* limitations under the License.
1515
**/
1616
module.exports = function(RED) {
17-
var temp = require('temp'),
17+
var pkg = require('../../package.json'),
18+
temp = require('temp'),
1819
fs = require('fs'),
1920
isDocx = require('is-docx'),
2021
serviceutils = require('../../utilities/service-utils'),
@@ -48,7 +49,10 @@ module.exports = function(RED) {
4849
var document_conversion = new DocumentConversionV1({
4950
username: node.username,
5051
password: node.password,
51-
version_date: '2015-12-01'
52+
version_date: '2015-12-01',
53+
headers: {
54+
'User-Agent': pkg.name + '-' + pkg.version
55+
}
5256
});
5357

5458
document_conversion.convert({

‎services/language_translator/v2.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ module.exports = function (RED) {
2323
// user who, when he errenously enters bad credentials, can't figure out why
2424
// the edited ones are not being taken.
2525
const SERVICE_IDENTIFIER = 'language-translator';
26-
var LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
26+
var pkg = require('../../package.json'),
27+
LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
2728
//cfenv = require('cfenv'),
2829
serviceutils = require('../../utilities/service-utils'),
2930
fs = require('fs'),
@@ -59,7 +60,10 @@ module.exports = function (RED) {
5960
username: sUsername ? sUsername : req.query.un,
6061
password: sPassword ? sPassword : req.query.pwd,
6162
version: 'v2',
62-
url: endpointUrl
63+
url: endpointUrl,
64+
headers: {
65+
'User-Agent': pkg.name + '-' + pkg.version
66+
}
6367
});
6468

6569
lt.getModels({}, function (err, models) {
@@ -99,6 +103,7 @@ module.exports = function (RED) {
99103
// what the request is for, and based on that if the required fields
100104
// have been provided.
101105
this.on('input', function (msg) {
106+
102107
var message = '',
103108
action = msg.action || config.action,
104109
globalContext = this.context().global,
@@ -108,7 +113,10 @@ module.exports = function (RED) {
108113
username: username,
109114
password: password,
110115
version: 'v2',
111-
url: endpointUrl
116+
url: endpointUrl,
117+
headers: {
118+
'User-Agent': pkg.name + '-' + pkg.version
119+
}
112120
});
113121

114122
if (!username || !password) {

‎services/language_translator_identify/v2.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
module.exports = function (RED) {
1818
const SERVICE_IDENTIFIER = 'language-translator';
19-
var LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
19+
var pkg = require('../../package.json'),
20+
LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
2021
//cfenv = require('cfenv'),
2122
serviceutils = require('../../utilities/service-utils'),
2223
//service = cfenv.getAppEnv().getServiceCreds(/language translator/i),
@@ -60,7 +61,10 @@ module.exports = function (RED) {
6061
username: username,
6162
password: password,
6263
version: 'v2',
63-
url: endpointUrl
64+
url: endpointUrl,
65+
headers: {
66+
'User-Agent': pkg.name + '-' + pkg.version
67+
}
6468
});
6569

6670
node.status({fill:'blue', shape:'dot', text:'requesting'});

‎services/language_translator_util/v2.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
**/
1616

1717
module.exports = function (RED) {
18-
var LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
19-
cfenv = require('cfenv'),
20-
username = null, password = null, sUsername = null, sPassword = null,
21-
service = cfenv.getAppEnv().getServiceCreds(/language translator/i),
22-
endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
18+
var pkg = require('../../package.json'),
19+
LanguageTranslatorV2 = require('watson-developer-cloud/language-translator/v2'),
20+
cfenv = require('cfenv'),
21+
username = null, password = null, sUsername = null, sPassword = null,
22+
service = cfenv.getAppEnv().getServiceCreds(/language translator/i),
23+
endpointUrl = 'https://gateway.watsonplatform.net/language-translator/api';
2324

2425
if (service) {
2526
sUsername = service.username;
@@ -73,7 +74,10 @@ module.exports = function (RED) {
7374
username: username,
7475
password: password,
7576
version: 'v2',
76-
url: endpointUrl
77+
url: endpointUrl,
78+
headers: {
79+
'User-Agent': pkg.name + '-' + pkg.version
80+
}
7781
});
7882

7983
// set global variable in order to make them accessible for the tranlsation node

0 commit comments

Comments
 (0)