resolves #1418 Import model of shared namespace

theopenconversationkit · Jan 5, 2023 · fc0e357 · fc0e357
1 parent 2a5b4d8
commit fc0e357
Show file tree

Hide file tree

Showing 24 changed files with 164 additions and 51 deletions.
diff --git a/bot/admin/web/src/app/configuration/bot/new-bot.component.ts b/bot/admin/web/src/app/configuration/bot/new-bot.component.ts
@@ -71,7 +71,8 @@ export class NewBotComponent implements OnInit {
       true,
       false,
       0.0,
-      false
+      false,
+      []
     );
     this.applicationService.saveApplication(newApp).subscribe((app) => {
       this.applicationService.refreshCurrentApplication(app);

diff --git a/nlp/admin/server/src/main/kotlin/AdminService.kt b/nlp/admin/server/src/main/kotlin/AdminService.kt
@@ -167,7 +167,7 @@ object AdminService {
 
     fun getApplicationWithIntents(application: ApplicationDefinition): ApplicationWithIntents {
         val intents = front.getIntentsByApplicationId(application._id).sortedBy { it.name }
-        return ApplicationWithIntents(application, intents)
+        return ApplicationWithIntents(application, intents, front.getModelSharedIntents(application.namespace))
     }
 
     fun createOrGetIntent(namespace: String, intent: IntentDefinition): IntentDefinition? {

diff --git a/nlp/admin/server/src/main/kotlin/AdminVerticle.kt b/nlp/admin/server/src/main/kotlin/AdminVerticle.kt
@@ -303,7 +303,11 @@ open class AdminVerticle : WebVerticle() {
                     || appWithSameName.normalizeText != newApp.normalizeText) {
                     front.triggerBuild(ModelBuildTrigger(newApp._id, true))
                 }
-                ApplicationWithIntents(newApp, front.getIntentsByApplicationId(newApp._id))
+                ApplicationWithIntents(
+                    newApp,
+                    front.getIntentsByApplicationId(newApp._id),
+                    front.getModelSharedIntents(application.namespace),
+                    )
             } else {
                 unauthorized()
             }

diff --git a/nlp/admin/server/src/main/kotlin/model/ApplicationWithIntents.kt b/nlp/admin/server/src/main/kotlin/model/ApplicationWithIntents.kt
@@ -71,13 +71,17 @@ data class ApplicationWithIntents(
      * Normalized text model - sentences are persisted with normalizedText.
      */
     val normalizeText: Boolean = false,
+    /**
+     * The shared intent definitions for other namespaces.
+     */
+    val namespaceIntents: List<IntentDefinition> = emptyList(),
     /**
      * The id of the app.
      */
     val _id: Id<ApplicationDefinition>?
 ) {
 
-    constructor(application: ApplicationDefinition, intents: List<IntentDefinition>) :
+    constructor(application: ApplicationDefinition, intents: List<IntentDefinition>, namespacesIntents: List<IntentDefinition>) :
         this(
             application.name,
             application.label,
@@ -90,6 +94,7 @@ data class ApplicationWithIntents(
             application.supportSubEntities,
             application.unknownIntentThreshold,
             application.normalizeText,
+            namespacesIntents.sortedWith(compareBy({ it.label }, { it.name })),
             application._id
         )
 

diff --git a/nlp/admin/web/src/app/applications/application/application.component.ts b/nlp/admin/web/src/app/applications/application/application.component.ts
@@ -71,7 +71,8 @@ export class ApplicationComponent implements OnInit {
           true,
           false,
           0.0,
-          false
+          false,
+          [],
         );
       }
       this.nlpEngineType = this.application.nlpEngineType.name;

diff --git a/nlp/admin/web/src/app/core-nlp/state.service.ts b/nlp/admin/web/src/app/core-nlp/state.service.ts
@@ -58,6 +58,7 @@ export class StateService implements AuthListener {
   readonly entities: BehaviorSubject<EntityDefinition[]> = new BehaviorSubject([]);
   readonly currentIntents: BehaviorSubject<Intent[]> = new BehaviorSubject([]);
   readonly currentIntentsCategories: BehaviorSubject<IntentsCategory[]> = new BehaviorSubject([]);
+  readonly currentNamespaceIntentsCategories: BehaviorSubject<IntentsCategory[]> = new BehaviorSubject([]);
   readonly configurationChange: Subject<boolean> = new Subject();
 
   currentApplication: Application;
@@ -138,6 +139,16 @@ export class StateService implements AuthListener {
     this.currentIntentsCategories.next(
       categories.sort((a, b) => a.category.localeCompare(b.category))
     );
+
+    const namespaceCategories = [];
+    groupBy(this.currentApplication.intents.concat(this.currentApplication.namespaceIntents), (i) => (i.category ? i.category : 'default')).forEach(
+      (intents, category) => {
+        namespaceCategories.push(new IntentsCategory(category, intents));
+      }
+    );
+    this.currentNamespaceIntentsCategories.next(
+      namespaceCategories.sort((a, b) => a.category.localeCompare(b.category))
+    );
   }
 
   addIntent(intent: Intent) {
@@ -160,6 +171,14 @@ export class StateService implements AuthListener {
     return this.currentApplication.intents.find((i) => i._id === id);
   }
 
+  findSharedNamespaceIntentById(id: string): Intent {
+    return this.findIntentById(id) ?? this.currentApplication.namespaceIntents.find((i) => i._id === id);
+  }
+
+  isOtherNamespaceIntent(intent: Intent) : boolean {
+    return intent && this.currentApplication.isOtherNamespaceIntent(intent);
+  }
+
   findIntentByName(name: string): Intent {
     return this.currentApplication.intents.find((i) => i.name === name);
   }

diff --git a/nlp/admin/web/src/app/intents/intents.component.css b/nlp/admin/web/src/app/intents/intents.component.css
@@ -107,7 +107,7 @@ button:focus {
 }
 
 .entities {
-  width: 30%;
+  width: 25%;
   text-align: center;
 }
 
@@ -116,5 +116,5 @@ button:focus {
 }
 
 .intent {
-  width: 15%;
+  width: 200px
 }
diff --git a/nlp/admin/web/src/app/intents/intents.component.html b/nlp/admin/web/src/app/intents/intents.component.html
@@ -64,8 +64,8 @@ <h4 class="title">No Intent found</h4>
           <span
             *ngIf="!row.data.expandable"
             class="intent_name"
-            nbTooltip="{{ row.data.name }}"
-            >{{ row.data.intentLabel() }}</span
+            nbTooltip="{{ row.data.qualifiedName() }}"
+            >{{ state.isOtherNamespaceIntent(row.data) ? row.data.qualifiedName() : row.data.intentLabel() }}</span
           >
           <div
             *ngIf="state.intentExistsInOtherApplication(row.data.name)"
@@ -116,7 +116,7 @@ <h4 class="title">No Intent found</h4>
                 >{{ e.qualifiedName(state.user) }}</span
               >
               <button
-                *ngIf="!state.intentExistsInOtherApplication(row.data.name)"
+                *ngIf="!state.intentExistsInOtherApplication(row.data.name) && !state.isOtherNamespaceIntent(row.data)"
                 nbButton
                 size="tiny"
                 ghost
@@ -147,6 +147,7 @@ <h4 class="title">No Intent found</h4>
         >
           <div *ngIf="!row.data.expandable">
             <button
+              *ngIf = "!state.isOtherNamespaceIntent(row.data)"
               [disabled]="selectedIntent == row.data"
               nbButton
               size="small"
@@ -162,7 +163,7 @@ <h4 class="title">No Intent found</h4>
               class="shared_list"
             >
               <mat-chip-list
-                *ngIf="!state.intentExistsInOtherApplication(row.data.name)"
+                *ngIf="!state.intentExistsInOtherApplication(row.data.name) && !state.isOtherNamespaceIntent(row.data)"
                 nbTooltip="Shared intent - click to remove"
               >
                 <mat-chip
@@ -175,7 +176,7 @@ <h4 class="title">No Intent found</h4>
                 </mat-chip>
               </mat-chip-list>
               <mat-chip-list
-                *ngIf="state.intentExistsInOtherApplication(row.data.name)"
+                *ngIf="state.intentExistsInOtherApplication(row.data.name) && !state.isOtherNamespaceIntent(row.data)"
                 nbTooltip="Shared intent"
               >
                 <mat-chip
@@ -205,7 +206,7 @@ <h4 class="title">No Intent found</h4>
         >
           <div *ngIf="!row.data.expandable">
             <button
-              *ngIf="!state.intentExistsInOtherApplication(row.data.name)"
+              *ngIf="!state.intentExistsInOtherApplication(row.data.name) && !state.isOtherNamespaceIntent(row.data)"
               nbButton
               size="small"
               ghost
@@ -220,7 +221,7 @@ <h4 class="title">No Intent found</h4>
               class="shared_list"
             >
               <mat-chip-list
-                *ngIf="!state.intentExistsInOtherApplication(row.data.name)"
+                *ngIf="!state.intentExistsInOtherApplication(row.data.name) && !state.isOtherNamespaceIntent(row.data)"
                 nbTooltip="Mandatory states - click to delete"
               >
                 <br />
@@ -234,7 +235,7 @@ <h4 class="title">No Intent found</h4>
                 </mat-chip>
               </mat-chip-list>
               <mat-chip-list
-                *ngIf="state.intentExistsInOtherApplication(row.data.name)"
+                *ngIf="state.intentExistsInOtherApplication(row.data.name) && !state.isOtherNamespaceIntent(row.data)"
                 matTooltip="Mandatory states"
               >
                 <br />
@@ -263,7 +264,7 @@ <h4 class="title">No Intent found</h4>
           *nbTreeGridCellDef="let row"
           class="actions"
         >
-          <div *ngIf="!row.data.expandable">
+          <div *ngIf="!row.data.expandable && !state.isOtherNamespaceIntent(row.data)">
             <button
               nbButton
               outline

diff --git a/nlp/admin/web/src/app/intents/intents.component.ts b/nlp/admin/web/src/app/intents/intents.component.ts
@@ -69,7 +69,7 @@ export class IntentsComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.state.currentIntentsCategories.subscribe((it) => {
+    this.state.currentNamespaceIntentsCategories.subscribe((it) => {
       this.nodes = Array.from(it, (element) => {
         return {
           expanded: element.category === 'default',

diff --git a/nlp/admin/web/src/app/logs/log-stats.component.html b/nlp/admin/web/src/app/logs/log-stats.component.html
@@ -24,7 +24,7 @@
     >
       <nb-option value="_all_">All</nb-option>
       <nb-option-group
-        *ngFor="let category of state.currentIntentsCategories | async"
+        *ngFor="let category of state.currentNamespaceIntentsCategories | async"
         [title]="category.category"
       >
         <nb-option

diff --git a/nlp/admin/web/src/app/model/application.ts b/nlp/admin/web/src/app/model/application.ts
@@ -30,6 +30,7 @@ export class Application {
     public supportSubEntities: boolean,
     public unknownIntentThreshold: number,
     public normalizeText: boolean,
+    public namespaceIntents: Intent[],
     public _id?: string
   ) {}
 
@@ -46,10 +47,15 @@ export class Application {
       this.supportSubEntities,
       this.unknownIntentThreshold,
       this.normalizeText,
+      this.namespaceIntents,
       this._id
     );
   }
 
+  isOtherNamespaceIntent(intent: Intent) : boolean {
+    return this.namespaceIntents.findIndex(i => i.namespace === intent.namespace && i.name === intent.name) !== -1;
+  }
+
   removeIntentById(id: string) {
     this.intents.forEach((e, i) => {
       if (e._id === id) {
@@ -69,7 +75,7 @@ export class Application {
   }
 
   intentById(id: string): Intent {
-    return this.intents.find((i) => i._id === id);
+    return this.intents.find((i) => i._id === id)
   }
 
   supportLocale(locale: string): boolean {
@@ -110,7 +116,8 @@ export class Application {
     const result = Object.assign(value, json, {
       intents: Intent.fromJSONArray(json.intents),
       nlpEngineType: NlpEngineType.fromJSON(json.nlpEngineType),
-      label: json.label || json.name
+      label: json.label || json.name,
+      namespaceIntents: Intent.fromJSONArray(json.namespaceIntents),
     });
 
     return result;

diff --git a/nlp/admin/web/src/app/sentence-analysis/sentence-analysis.component.html b/nlp/admin/web/src/app/sentence-analysis/sentence-analysis.component.html
@@ -74,7 +74,7 @@
       <tock-search-filter
         [groups]="intentGroups()"
         (filterChange)="changeIntentFilter($event)"
-        [selectedValue]="selectedValueLabel"
+        [selectedValue]="selectedIntentLabel"
         [activeFirst]="true"
         [cleanupIfSelected]="true"
         name="Intent"
@@ -244,6 +244,7 @@
       Unknown
     </button>
     <button
+      [disabled]="state.isOtherNamespaceIntent(selectedIntent)"
       nbButton
       status="primary"
       size="small"
@@ -254,6 +255,7 @@
       Validate
     </button>
     <button
+      [disabled]="state.isOtherNamespaceIntent(selectedIntent)"
       nbButton
       outline
       status="primary"

diff --git a/nlp/admin/web/src/app/sentence-analysis/sentence-analysis.component.ts b/nlp/admin/web/src/app/sentence-analysis/sentence-analysis.component.ts
@@ -51,7 +51,8 @@ export class SentenceAnalysisComponent implements OnInit {
   intentBeforeClassification: string;
   UNKNOWN_INTENT_FILTER = new FilterOption('tock:unknown', 'Unknown');
   intentId: string;
-  selectedValueLabel: string;
+  selectedIntent:Intent;
+  selectedIntentLabel: string;
 
   constructor(
     public state: StateService,
@@ -66,9 +67,11 @@ export class SentenceAnalysisComponent implements OnInit {
   ngOnInit() {
     this.intentBeforeClassification = this.sentence.classification.intentId;
     if (this.intentBeforeClassification === this.UNKNOWN_INTENT_FILTER.value) {
-      this.selectedValueLabel = this.UNKNOWN_INTENT_FILTER.label;
+      this.selectedIntent = null;
+      this.selectedIntentLabel = this.UNKNOWN_INTENT_FILTER.label;
     } else {
-      this.selectedValueLabel = this.state.findIntentById(this.intentBeforeClassification).name;
+      this.selectedIntent = this.state.findSharedNamespaceIntentById(this.intentBeforeClassification);
+      this.selectedIntentLabel = this.selectedIntent.name;
     }
     if (this.minimalView) {
       setTimeout((_) => {
@@ -80,7 +83,8 @@ export class SentenceAnalysisComponent implements OnInit {
   changeIntentFilter = (intentId: string) => {
     if (intentId && this.sentence.classification.intentId !== intentId) {
       this.sentence.classification.intentId = intentId;
-      this.selectedValueLabel = this.state.findIntentById(intentId).name;
+      this.selectedIntent = this.state.findIntentById(intentId);
+      this.selectedIntentLabel = this.selectedIntent.name;
       this.onIntentChange();
     }
   };
@@ -268,7 +272,8 @@ export class SentenceAnalysisComponent implements OnInit {
       )
       .subscribe(
         (intent) => {
-          this.selectedValueLabel = intent.intentLabel();
+          this.selectedIntent = intent;
+          this.selectedIntentLabel = intent.intentLabel();
           this.state.addIntent(intent);
           this.sentence.classification.intentId = intent._id;
           this.onIntentChange();

diff --git a/nlp/build-model-worker/src/main/kotlin/BuildModelWorker.kt b/nlp/build-model-worker/src/main/kotlin/BuildModelWorker.kt
@@ -82,7 +82,7 @@ class BuildModelWorker {
                 logger.trace { "New sentences : ${sentences.map { it.text }}" }
 
                 front.updateIntentsModelForApplication(sentences, app, key.language, app.nlpEngineType, onlyIfNotExists)
-                sentences.groupBy { it.classification.intentId }.forEach { intentId, intentSentences ->
+                sentences.groupBy { it.classification.intentId }.forEach { (intentId, intentSentences) ->
                     logger.info { "start model update for ${app.name}, intent $intentId and ${key.language}" }
                     front.updateEntityModelForIntent(
                         intentSentences,
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,8 @@ export class NewBotComponent implements OnInit { @@
           true,
           false,
 .0,
-          false
+          false,
+          []
         );
         this.applicationService.saveApplication(newApp).subscribe((app) => {
           this.applicationService.refreshCurrentApplication(app);
@@ Expand Down @@