Don't show notification until download actually starts (microsoft#6369)

Co-authored-by: Dong Lei <[email protected]>
Co-authored-by: Chris Whitten <[email protected]>

Composer/packages/client/src/recoilModel/dispatchers/orchestrator.ts

@@ -14,13 +14,21 @@ import { Locales } from '../../locales';
 
 import { createNotification } from './notification';
 
-export const downloadModel = (addr: string, model: 'en' | 'multilang') => {
+export const downloadModel = (addr: string, model: 'en' | 'multilang', notificationStartCallback: () => void) => {
   return new Promise<boolean>((resolve, reject) => {
     httpClient.post(addr, { language: model }).then((resp) => {
+      if (resp.status === 201) {
+        resolve(true);
+        return;
+      }
+
       if (resp.status !== 200) {
         reject(false);
+        return;
       }
 
+      notificationStartCallback();
+
       const statusUri = resp.data;
 
       const timer = setInterval(async () => {
@@ -74,11 +82,12 @@ export const orchestratorDispatcher = () => {
       // Download Model Notification
       const { addNotification, deleteNotification } = await snapshot.getPromise(dispatcherState);
       const notification = createNotification(orchestratorDownloadNotificationProps());
-      addNotification(notification);
 
       try {
         for (const languageModel of availableLanguageModels(recognizers)) {
-          await downloadModel('/orchestrator/download', languageModel);
+          await downloadModel('/orchestrator/download', languageModel, () => {
+            addNotification(notification);
+          });
         }
       } finally {
         deleteNotification(notification.id);

Composer/packages/server/src/controllers/orchestrator.ts

@@ -60,6 +60,11 @@ async function downloadDefaultModel(req: Request, res: Response) {
   const modelName = lang.language === 'en' ? modelList.defaults?.en_intent : modelList.defaults?.multilingual_intent;
   const modelPath = await getModelPath(modelName);
 
+  if (await pathExists(modelPath)) {
+    state = DownloadState.ALREADYDOWNLOADED;
+    return res.send(201);
+  }
+
   const onProgress = (msg: string) => {
     setTimeout(() => {
       state = DownloadState.DOWNLOADING;
@@ -73,11 +78,7 @@ async function downloadDefaultModel(req: Request, res: Response) {
   state = DownloadState.DOWNLOADING;
 
   setTimeout(async () => {
-    if (!(await pathExists(modelPath))) {
-      await Orchestrator.baseModelGetAsync(modelPath, modelName, onProgress, onFinish);
-    } else {
-      state = DownloadState.ALREADYDOWNLOADED;
-    }
+    await Orchestrator.baseModelGetAsync(modelPath, modelName, onProgress, onFinish);
   }, 0);
 
   return res.send(200, '/orchestrator/status');