chore(ner/intent): support for botonic full-stack (#1644)

* chore(ner/intent): support for botonic full-stack * refactor(plugin-ner, plugin-ic): baseUrl typed Co-authored-by: Eric Lozano <ericlozano98@gmail.com>
hubtype · Jul 15, 2021 · 3df40fc · 3df40fc
1 parent 82d0263
commit 3df40fc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/packages/botonic-plugin-intent-classification/src/index.ts b/packages/botonic-plugin-intent-classification/src/index.ts
@@ -9,10 +9,7 @@ export default class BotonicPluginIntentClassification implements Plugin {
   private readonly modelsSelector: Promise<IntentModelSelector>
 
   constructor(readonly options: PluginOptions) {
-    this.modelsSelector = IntentModelSelector.build(
-      this.options.locales,
-      this.options.modelsBaseUrl
-    )
+    this.modelsSelector = IntentModelSelector.build(this.options.locales)
   }
 
   async pre(request: PluginPreRequest): Promise<void> {

diff --git a/packages/botonic-plugin-intent-classification/src/model/model-selector.ts b/packages/botonic-plugin-intent-classification/src/model/model-selector.ts
@@ -9,11 +9,13 @@ export class IntentModelSelector extends ModelSelector<
   IntentClassifier,
   IntentClassifierConfig
 > {
-  static async build(
-    locales: Locale[],
-    modelsBaseUrl: string
-  ): Promise<IntentModelSelector> {
-    const selector = new IntentModelSelector(locales, modelsBaseUrl)
+  static async build(locales: Locale[]): Promise<IntentModelSelector> {
+    const baseUrl: string =
+      // @ts-ignore
+      (typeof MODELS_BASE_URL !== 'undefined' && MODELS_BASE_URL) ||
+      process.env.MODELS_BASE_URL
+    const intentModelsUrl = `${baseUrl}/intent-classification/models`
+    const selector = new IntentModelSelector(locales, intentModelsUrl)
     return await selector.load()
   }
 

diff --git a/packages/botonic-plugin-intent-classification/src/options.ts b/packages/botonic-plugin-intent-classification/src/options.ts
@@ -1,3 +1,3 @@
 import { Locale } from '@botonic/nlp/lib/types'
 
-export type PluginOptions = { locales: Locale[]; modelsBaseUrl: string }
+export type PluginOptions = { locales: Locale[] }
diff --git a/packages/botonic-plugin-ner/src/index.ts b/packages/botonic-plugin-ner/src/index.ts
@@ -9,10 +9,7 @@ export default class BotonicPluginNER implements Plugin {
   private modelsSelector: Promise<NerModelSelector>
 
   constructor(readonly options: PluginOptions) {
-    this.modelsSelector = NerModelSelector.build(
-      this.options.locales,
-      this.options.modelsBaseUrl
-    )
+    this.modelsSelector = NerModelSelector.build(this.options.locales)
   }
 
   async pre(request: PluginPreRequest): Promise<void> {

diff --git a/packages/botonic-plugin-ner/src/model/model-selector.ts b/packages/botonic-plugin-ner/src/model/model-selector.ts
@@ -9,11 +9,13 @@ export class NerModelSelector extends ModelSelector<
   NamedEntityRecognizer,
   NerConfig
 > {
-  static async build(
-    locales: Locale[],
-    modelsBaseUrl: string
-  ): Promise<NerModelSelector> {
-    const selector = new NerModelSelector(locales, modelsBaseUrl)
+  static async build(locales: Locale[]): Promise<NerModelSelector> {
+    const baseUrl: string =
+      // @ts-ignore
+      (typeof MODELS_BASE_URL !== 'undefined' && MODELS_BASE_URL) ||
+      process.env.MODELS_BASE_URL
+    const nerModelsUrl = `${baseUrl}/ner/models`
+    const selector = new NerModelSelector(locales, nerModelsUrl)
     return await selector.load()
   }
 

diff --git a/packages/botonic-plugin-ner/src/options.ts b/packages/botonic-plugin-ner/src/options.ts
@@ -1,3 +1,3 @@
 import { Locale } from '@botonic/nlp/lib/types'
 
-export type PluginOptions = { locales: Locale[]; modelsBaseUrl: string }
+export type PluginOptions = { locales: Locale[] }