feat: taking control recognizer generation enhancements

Composer/packages/client/__tests__/recognizer.test.ts

@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { LuFile, SDKKinds, QnAFile } from '@bfc/shared';
+
+import {
+  getCrossTrainedRecognizerDialog,
+  getLuisRecognizerDialogs,
+  getMultiLanguagueRecognizerDialog,
+  getQnAMakerRecognizerDialogs,
+  preserveRecognizer,
+} from '../src/recoilModel/Recognizers';
+
+describe('Test the generated recognizer dialogs', () => {
+  it('should get MultiLanguagueRecognizer', () => {
+    const result = getMultiLanguagueRecognizerDialog(
+      'test',
+      [
+        { id: 'test.en-us', empty: false },
+        { id: 'test.fr-fr', empty: false },
+      ],
+      'qna'
+    );
+
+    expect(result.id).toBe('test.qna.dialog');
+    expect(result.content.recognizers['en-us']).toBe('test.en-us.qna');
+    expect(result.content.recognizers['']).toBe('test.en-us.qna');
+    expect(result.content.recognizers['fr-fr']).toBe('test.fr-fr.qna');
+  });
+
+  it('should get CrossTrainedRecognizerDialog', () => {
+    const result = getCrossTrainedRecognizerDialog(
+      'test',
+      [{ id: 'test.en-us', empty: false }] as LuFile[],
+      [{ id: 'test.en-us', empty: false }] as QnAFile[]
+    );
+    expect(result.id).toBe('test.lu.qna.dialog');
+    expect(result.content.recognizers[0]).toBe('test.lu');
+    expect(result.content.recognizers[1]).toBe('test.qna');
+  });
+
+  it('should get LuisRecognizerDialogs', () => {
+    const result = getLuisRecognizerDialogs('test', [
+      { id: 'test.en-us', empty: false },
+      { id: 'test.fr-fr', empty: false },
+    ] as LuFile[]);
+    expect(result.length).toBe(2);
+    expect(result[0].id).toBe('test.en-us.lu.dialog');
+    expect(result[1].content).toStrictEqual({
+      $kind: SDKKinds.LuisRecognizer,
+      id: `LUIS_test`,
+      applicationId: `=settings.luis.test_fr_fr_lu.appId`,
+      version: `=settings.luis.test_fr_fr_lu.version`,
+      endpoint: '=settings.luis.endpoint',
+      endpointKey: '=settings.luis.endpointKey',
+    });
+  });
+
+  it('should get QnaMakerRecognizer', () => {
+    const result = getQnAMakerRecognizerDialogs('test', [
+      { id: 'test.en-us', empty: false },
+      { id: 'test.fr-fr', empty: false },
+    ] as QnAFile[]);
+    expect(result.length).toBe(2);
+    expect(result[0].id).toBe('test.en-us.qna.dialog');
+    expect(result[1].content).toStrictEqual({
+      $kind: SDKKinds.QnAMakerRecognizer,
+      id: `QnA_test`,
+      knowledgeBaseId: `=settings.qna.test_fr_fr_qna`,
+      hostname: '=settings.qna.hostname',
+      endpointKey: '=settings.qna.endpointKey',
+    });
+  });
+
+  it('should preserve Recogniozer', () => {
+    const result = preserveRecognizer(
+      [{ id: 'test.en-us', content: '' }],
+      [
+        { id: 'test.en-us', content: 'test' },
+        { id: 'test.fr-fr', empty: false },
+      ]
+    );
+
+    expect(result.length).toBe(1);
+    expect(result[0].content).toBe('test');
+  });
+});

Composer/packages/client/__tests__/utils/buildUtil.test.ts

@@ -81,10 +81,10 @@ describe('createCrossTrainConfig', () => {
       { id: 'dia6.en-us' },
     ];
     const config = createCrossTrainConfig(dialogs as DialogInfo[], luFiles as LuFile[], ['en-us']);
-    expect(config['main.en-us.lu'].rootDialog).toBeTruthy();
-    expect(config['main.en-us.lu'].triggers.dia1_trigger[0]).toEqual('dia1.en-us.lu');
-    expect(config['main.en-us.lu'].triggers.no_dialog.length).toEqual(0);
-    expect(config['main.en-us.lu'].triggers.dia2_trigger[0]).toEqual('dia2.en-us.lu');
-    expect(config['main.en-us.lu'].triggers.dias_trigger.length).toBe(2);
+    expect(config['main.en-us'].rootDialog).toBeTruthy();
+    expect(config['main.en-us'].triggers.dia1_trigger[0]).toEqual('dia1.en-us');
+    expect(config['main.en-us'].triggers.no_dialog.length).toEqual(0);
+    expect(config['main.en-us'].triggers.dia2_trigger[0]).toEqual('dia2.en-us');
+    expect(config['main.en-us'].triggers.dias_trigger.length).toBe(2);
   });
 });

Composer/packages/client/src/components/TestController/TestController.tsx

@@ -9,7 +9,6 @@ import { PrimaryButton } from 'office-ui-fabric-react/lib/Button';
 import formatMessage from 'format-message';
 import { useRecoilValue } from 'recoil';
 import { IConfig, IPublishConfig, defaultPublishConfig } from '@bfc/shared';
-import { useRecognizerConfig } from '@bfc/extension-client';
 
 import {
   botEndpointsState,
@@ -68,7 +67,6 @@ export const TestController: React.FC<{ projectId: string }> = (props) => {
   const settings = useRecoilValue(settingsState(projectId));
   const qnaFiles = useRecoilValue(qnaFilesState(projectId));
   const botLoadErrorMsg = useRecoilValue(botLoadErrorState(projectId));
-  const { recognizers } = useRecognizerConfig();
 
   const botEndpoints = useRecoilValue(botEndpointsState);
   const {
@@ -158,18 +156,13 @@ export const TestController: React.FC<{ projectId: string }> = (props) => {
     setBotStatus(BotStatus.publishing, projectId);
     dismissDialog();
     const { luis, qna } = config;
-    const recognizerTypes = dialogs.reduce((result, file) => {
-      const recognizer = recognizers.filter((r) => r.isSelected && r.isSelected(file.content.recognizer));
-      result[file.id] = recognizer[0]?.id || '';
-      return result;
-    }, {});
 
     await setSettings(projectId, {
       ...settings,
       luis: luis,
       qna: Object.assign({}, settings.qna, qna),
     });
-    await build(luis, qna, recognizerTypes, projectId);
+    await build(luis, qna, projectId);
   }
 
   async function handleLoadBot() {

Composer/packages/client/src/pages/notifications/useNotifications.tsx

@@ -10,6 +10,7 @@ import { useRecoilValue } from 'recoil';
 import {
   botDiagnosticsState,
   botProjectFileState,
+  crossTrainConfigState,
   dialogSchemasState,
   formDialogSchemasSelectorFamily,
   jsonSchemaFilesState,
@@ -20,6 +21,7 @@ import {
   skillManifestsState,
   validateDialogsSelectorFamily,
 } from '../../recoilModel';
+import { recognizersSelectorFamily } from '../../recoilModel/selectors/recognizers';
 
 import { getReferredLuFiles } from './../../utils/luUtil';
 import {
@@ -45,7 +47,8 @@ export default function useNotifications(projectId: string, filter?: string) {
   const formDialogSchemas = useRecoilValue(formDialogSchemasSelectorFamily(projectId));
   const botProjectFile = useRecoilValue(botProjectFileState(projectId));
   const jsonSchemaFiles = useRecoilValue(jsonSchemaFilesState(projectId));
-
+  const recognizers = useRecoilValue(recognizersSelectorFamily(projectId));
+  const crossTrainConfig = useRecoilValue(crossTrainConfigState(projectId));
   const botAssets: BotAssets = {
     projectId,
     dialogs,
@@ -58,6 +61,8 @@ export default function useNotifications(projectId: string, filter?: string) {
     formDialogSchemas,
     botProjectFile,
     jsonSchemaFiles,
+    recognizers,
+    crossTrainConfig,
   };
 
   const memoized = useMemo(() => {

Composer/packages/client/src/recoilModel/DispatcherWrapper.tsx

@@ -24,8 +24,11 @@ import {
   filePersistenceState,
   botProjectFileState,
   jsonSchemaFilesState,
+  crossTrainConfigState,
 } from './atoms';
 import { botsForFilePersistenceSelector, formDialogSchemasSelectorFamily } from './selectors';
+import { Recognizer } from './Recognizers';
+import { recognizersSelectorFamily } from './selectors/recognizers';
 
 const getBotAssets = async (projectId, snapshot: Snapshot): Promise<BotAssets> => {
   const result = await Promise.all([
@@ -39,6 +42,8 @@ const getBotAssets = async (projectId, snapshot: Snapshot): Promise<BotAssets> =
     snapshot.getPromise(botProjectFileState(projectId)),
     snapshot.getPromise(formDialogSchemasSelectorFamily(projectId)),
     snapshot.getPromise(jsonSchemaFilesState(projectId)),
+    snapshot.getPromise(recognizersSelectorFamily(projectId)),
+    snapshot.getPromise(crossTrainConfigState(projectId)),
   ]);
   return {
     projectId,
@@ -52,6 +57,8 @@ const getBotAssets = async (projectId, snapshot: Snapshot): Promise<BotAssets> =
     botProjectFile: result[7],
     formDialogSchemas: result[8],
     jsonSchemaFiles: result[9],
+    recognizers: result[10],
+    crossTrainConfig: result[11],
   };
 };
 
@@ -110,7 +117,10 @@ export const DispatcherWrapper = ({ children }) => {
   return (
     <Fragment>
       {botProjects.map((projectId) => (
-        <UndoRoot key={projectId} projectId={projectId} />
+        <Fragment key={projectId}>
+          <UndoRoot projectId={projectId} />
+          <Recognizer projectId={projectId} />
+        </Fragment>
       ))}
       <InitDispatcher onLoad={setLoaded} />
       {loaded ? children : null}