diff options
Diffstat (limited to 'src/client/cognitive_services')
| -rw-r--r-- | src/client/cognitive_services/CognitiveServices.ts | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/client/cognitive_services/CognitiveServices.ts b/src/client/cognitive_services/CognitiveServices.ts index 408903324..4ad03aab4 100644 --- a/src/client/cognitive_services/CognitiveServices.ts +++ b/src/client/cognitive_services/CognitiveServices.ts @@ -1,18 +1,16 @@ -import * as request from 'request-promise'; -import { Doc, Field } from '../../fields/Doc'; -import { Cast } from '../../fields/Types'; -import { Utils } from '../../Utils'; +import * as rp from 'request-promise'; +import { Doc, FieldType } from '../../fields/Doc'; import { InkData } from '../../fields/InkField'; -import { UndoManager } from '../util/UndoManager'; -import requestPromise = require('request-promise'); import { List } from '../../fields/List'; +import { Cast } from '../../fields/Types'; +import { UndoManager } from '../util/UndoManager'; type APIManager<D> = { converter: BodyConverter<D>; requester: RequestExecutor }; type RequestExecutor = (apiKey: string, body: string, service: Service) => Promise<string>; type AnalysisApplier<D> = (target: Doc, relevantKeys: string[], data: D, ...args: any) => any; type BodyConverter<D> = (data: D) => string; -type Converter = (results: any) => Field; -type TextConverter = (results: any, data: string) => Promise<{ keyterms: Field; external_recommendations: any; kp_string: string[] }>; +type Converter = (results: any) => FieldType; +type TextConverter = (results: any, data: string) => Promise<{ keyterms: FieldType; external_recommendations: any; kp_string: string[] }>; type BingConverter = (results: any) => Promise<{ title_vals: string[]; url_vals: string[] }>; export type Tag = { name: string; confidence: number }; @@ -95,7 +93,7 @@ export namespace CognitiveServices { }, }; - return request.post(options); + return rp.post(options); }, }; @@ -344,10 +342,10 @@ export namespace CognitiveServices { export namespace Appliers { export async function vectorize(keyterms: any, dataDoc: Doc, mainDoc: boolean = false) { console.log('vectorizing...'); - //keyterms = ["father", "king"]; + // keyterms = ["father", "king"]; - const args = { method: 'POST', uri: Utils.prepend('/recommender'), body: { keyphrases: keyterms }, json: true }; - await requestPromise.post(args).then(async wordvecs => { + const args = { method: 'POST', uri: ClientUtils.prepend('/recommender'), body: { keyphrases: keyterms }, json: true }; + await rp.post(args).then(async wordvecs => { if (wordvecs) { const indices = Object.keys(wordvecs); console.log('successful vectorization!'); @@ -355,7 +353,7 @@ export namespace CognitiveServices { indices.forEach((ind: any) => { vectorValues.push(wordvecs[ind]); }); - //ClientRecommender.Instance.processVector(vectorValues, dataDoc, mainDoc); + // ClientRecommender.Instance.processVector(vectorValues, dataDoc, mainDoc); } // adds document to internal doc set else { console.log('unsuccessful :( word(s) not in vocabulary'); |
