Skip to content

Commit dc81941

Browse files
author
Chris Park
committed
Merge branch 'develop'
2 parents d8b5d2a + 2033e94 commit dc81941

24 files changed

+216
-70
lines changed

‎examples/entities.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ var args = parser.parseArgs();
1313

1414
var api = new Api(args.key, args.url);
1515
var endpoint = "entities";
16+
var entities_text_data = "Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS";
1617

17-
api.parameters.content = "Bill Murray will appear in new Ghostbusters film: Dr. Peter Venkman was spotted filming a cameo in Boston this… http://dlvr.it/BnsFfS";
18+
api.parameters.content = entities_text_data;
1819
api.parameters.genre = "social-media";
1920
api.rosette(endpoint, function(err, res){
2021
if(err){
2122
console.log(err);
2223
} else {
2324
console.log(JSON.stringify(res, null, 2));
2425
}
25-
});
26+
});

‎examples/entities_linked.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
1212
var args = parser.parseArgs();
1313
var api = new Api(args.key, args.url);
1414
var endpoint = "entities";
15+
var entities_linked_text_data = "Last month director Paul Feig announced the movie will have an all-star female cast including Kristen Wiig, Melissa McCarthy, Leslie Jones and Kate McKinnon.";
1516

16-
api.parameters.content = "Last month director Paul Feig announced the movie will have an all-star female cast including Kristen Wiig, Melissa McCarthy, Leslie Jones and Kate McKinnon.";
17+
api.parameters.content = entities_linked_text_data;
1718
// this parameter is deprecated
1819
api.parameters.linked = true;
1920
api.parameters.genre = "social-media";

‎examples/language.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ appHeader[0] = "X-RosetteAPI-App"
1717
appHeader[1] = "app";
1818
api.parameters.customHeaders = [appHeader];
1919

20-
var content = "Por favor Señorita, says the man.";
20+
var language_data = "Por favor Señorita, says the man.";
2121

22-
api.parameters.content = content;
22+
api.parameters.content = language_data;
2323
var appHeader = [];
2424
appHeader[0] = "X-RosetteAPI-App"
2525
appHeader[1] = "app";

‎examples/name_similarity.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ var args = parser.parseArgs();
1313
var api = new Api(args.key, args.url);
1414
var endpoint = "nameSimilarity";
1515

16-
var name_similarity_data1 = "Michael Jackson";
17-
var name_similarity_data2 = "迈克尔·杰克逊";
16+
var matched_name_data1 = "Michael Jackson";
17+
var matched_name_data2 = "迈克尔·杰克逊";
1818

19-
api.parameters.name1 = {"text": name_similarity_data1, "language": "eng", "entityType": "PERSON"};
20-
api.parameters.name2 = {"text": name_similarity_data2, "entityType": "PERSON"};
19+
api.parameters.name1 = {"text": matched_name_data1, "language": "eng", "entityType": "PERSON"};
20+
api.parameters.name2 = {"text": matched_name_data2, "entityType": "PERSON"};
2121

2222
api.rosette(endpoint, function(err, res){
2323
if(err){
2424
console.log(err);
2525
} else {
2626
console.log(JSON.stringify(res, null, 2));
2727
}
28-
});
28+
});

‎examples/name_translation.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ var args = parser.parseArgs();
1313
var api = new Api(args.key, args.url);
1414
var endpoint = "nameTranslation";
1515

16-
var name_translation_data = "معمر محمد أبو منيار القذاف";
17-
api.parameters.name = name_translation_data;
16+
var translated_name_data = "معمر محمد أبو منيار القذاف";
17+
api.parameters.name = translated_name_data;
1818
api.parameters.entityType = "PERSON";
1919
api.parameters.targetLanguage = "eng";
2020
api.parameters.targetScript = "Latn";

‎examples/text_embedding.js‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
"use strict";
2+
3+
var Api = require("../lib/Api");
4+
var ArgumentParser = require("argparse").ArgumentParser;
5+
6+
var parser = new ArgumentParser({
7+
addHelp: true,
8+
description: "Get the text embedding from a piece of text"
9+
});
10+
parser.addArgument(["--key"], {help: "Rosette API key", required: true});
11+
parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});
12+
var args = parser.parseArgs();
13+
14+
var api = new Api(args.key, args.url);
15+
var endpoint = "textEmbedding";
16+
var embeddings_data = 'Cambridge, Massachusetts'
17+
18+
api.parameters.content = embeddings_data;
19+
api.rosette(endpoint, function(err, res){
20+
if(err){
21+
console.log(err);
22+
} else {
23+
console.log(JSON.stringify(res, null, 2));
24+
}
25+
});

‎lib/Api.js‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,27 @@
1313
**/
1414
"use strict";
1515

16+
var http = require("http");
17+
var https = require("https");
18+
var URL = require("url");
19+
1620
var rosetteConstants = require("./rosetteConstants");
1721
var RosetteException = require("./rosetteExceptions");
1822
var paramObj = require("./parameters");
1923

20-
var relationships = require("./relationships");
21-
var matchedName = require("./nameSimilarity");
22-
var translatedName = require("./nameTranslation");
23-
var sentiment = require("./sentiment");
2424
var categories = require("./categories");
2525
var entities = require("./entities");
26-
var morphology = require("./morphology");
27-
var tokens = require("./tokens");
28-
var sentences = require("./sentences");
26+
var info = require("./info");
2927
var language = require("./language");
28+
var matchedName = require("./nameSimilarity");
29+
var morphology = require("./morphology");
3030
var ping = require("./ping");
31-
var info = require("./info");
31+
var relationships = require("./relationships");
32+
var sentences = require("./sentences");
33+
var sentiment = require("./sentiment");
34+
var textEmbedding = require("./textEmbedding");
35+
var translatedName = require("./nameTranslation");
36+
var tokens = require("./tokens");
3237

3338
/**
3439
* @class
@@ -54,6 +59,12 @@ function Api(userKey, serviceURL) {
5459
*/
5560
this.parameters = new paramObj();
5661

62+
/**
63+
* @type {object}
64+
* @desc The HTTP(S) object
65+
*/
66+
this.protocol = https;
67+
5768
/**
5869
* @type {string}
5970
* @desc URL of the API
@@ -69,6 +80,10 @@ function Api(userKey, serviceURL) {
6980
} else {
7081
this.serviceURL = "https://api.rosette.com/rest/v1/";
7182
}
83+
var urlParts = URL.parse(serviceURL);
84+
if (urlParts.protocol === "http:") {
85+
this.protocol = http;
86+
}
7287

7388
};
7489

@@ -84,7 +99,7 @@ Api.prototype.rosette = function(endpoint, callback) {
8499
var e = new endpoint();
85100

86101
// send parameters to the specified endpoint
87-
e.getResults(api.parameters, api.userKey, api.serviceURL, function(err, res) {
102+
e.getResults(api.parameters, api.userKey, api.protocol, api.serviceURL, function(err, res) {
88103
if (err) {
89104
return callback(err);
90105
} else {

‎lib/categories.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ function categories() {
3636
* @param {string} serviceURL - The base service URL to be used to access the Rosette API
3737
* @param {function} callback - Callback function to be exectuted after the function to which it is passed is complete
3838
*/
39-
categories.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
39+
categories.prototype.getResults = function(parameters, userKey, protocol, serviceURL, callback) {
4040

4141
if (parameters.documentFile != null) {
42-
parameters.loadFile(parameters.documentFile, parameters, userKey, serviceURL, "categories", callback);
42+
parameters.loadFile(parameters.documentFile, parameters, userKey, protocol, serviceURL, "categories", callback);
4343
} else {
4444

4545
// validate parameters
@@ -51,7 +51,7 @@ categories.prototype.getResults = function(parameters, userKey, serviceURL, call
5151
// configure URL
5252
var urlParts = URL.parse(serviceURL + "categories");
5353
var req = new rosetteRequest();
54-
req.makeRequest('POST', userKey, urlParts, parameters, callback);
54+
req.makeRequest('POST', userKey, protocol, urlParts, parameters, callback);
5555
}
5656
}
5757

‎lib/entities.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ function entities() {
3636
* @param {string} serviceURL - The base service URL to be used to access the Rosette API
3737
* @param {function} callback - Callback function to be exectuted after the function to which it is passed is complete
3838
*/
39-
entities.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
39+
entities.prototype.getResults = function(parameters, userKey, protocol, serviceURL, callback) {
4040

4141
if (parameters.documentFile != null) {
4242
if (parameters.loadParams().linked == true) {
4343
console.warn("entities/linked endpoint has been combined with /entities. Do not specify the linked parameter.");
44-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities/linked", callback);
44+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, protocol, serviceURL, "entities/linked", callback);
4545
} else {
46-
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, serviceURL, "entities", callback);
46+
parameters.loadFile(parameters.loadParams().documentFile, parameters, userKey, protocol, serviceURL, "entities", callback);
4747
}
4848

4949

@@ -66,7 +66,7 @@ entities.prototype.getResults = function(parameters, userKey, serviceURL, callba
6666

6767

6868
var req = new rosetteRequest();
69-
req.makeRequest('POST', userKey, urlParts, parameters, callback);
69+
req.makeRequest('POST', userKey, protocol, urlParts, parameters, callback);
7070

7171
}
7272
}

‎lib/info.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ function info() {
3636
* @param {string} serviceURL - The base service URL to be used to access the Rosette API
3737
* @param {function} callback - Callback function to be exectuted after the function to which it is passed is complete
3838
*/
39-
info.prototype.getResults = function(parameters, userKey, serviceURL, callback) {
39+
info.prototype.getResults = function(parameters, userKey, protocol, serviceURL, callback) {
4040

4141
// configure URL
4242
var urlParts = URL.parse(serviceURL + "info");
4343
var req = new rosetteRequest();
44-
req.makeRequest('GET', userKey, urlParts, parameters, callback);
44+
req.makeRequest('GET', userKey, protocol, urlParts, parameters, callback);
4545
};
4646

4747
module.exports = info;

0 commit comments

Comments
 (0)