chore: set USER_AGENT to environment variables before luis and qna build

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

@@ -179,8 +179,8 @@ export const publisherDispatcher = () => {
         const response = await httpClient.post(`/publish/${projectId}/publish/${target.name}`, {
           metadata: {
             ...metadata,
-            luResources: referredLuFiles.map((file) => file.id),
-            qnaResources: qnaFiles.map((file) => file.id),
+            luResources: referredLuFiles.map((file) => ({ id: file.id, isEmpty: file.empty })),
+            qnaResources: qnaFiles.map((file) => ({ id: file.id, isEmpty: file.empty })),
           },
           sensitiveSettings,
         });

Composer/packages/lib/indexers/package.json

@@ -26,7 +26,7 @@
     "rimraf": "^2.6.3"
   },
   "dependencies": {
-    "@microsoft/bf-lu": "^4.11.0-rc.20201030.a9f9b96",
+    "@microsoft/bf-lu": "^4.12.0-dev.20201209.a2ab9dd",
     "adaptive-expressions": "^4.11.0-dev.20201013.d5458bf",
     "botbuilder-lg": "4.12.0-dev-20201119.9afa93623c3e",
     "lodash": "^4.17.19"

Composer/packages/server/package.json

@@ -66,7 +66,7 @@
     "@microsoft/bf-dialog": "4.11.0-dev.20201025.69cf2b9",
     "@microsoft/bf-dispatcher": "^4.11.0-beta.20201016.393c6b2",
     "@microsoft/bf-generate-library": "^4.10.0-daily.20201205.191993",
-    "@microsoft/bf-lu": "^4.11.0-rc.20201030.a9f9b96",
+    "@microsoft/bf-lu": "^4.12.0-dev.20201209.a2ab9dd",
     "@microsoft/bf-orchestrator": "4.11.0-beta.20201203.cd29e25",
     "applicationinsights": "^1.8.7",
     "archiver": "^5.0.2",

Composer/packages/server/src/constants.ts

@@ -18,3 +18,5 @@ export enum ClaimNames {
 export const APPINSIGHTS_INSTRUMENTATIONKEY = process.env.APPINSIGHTS_INSTRUMENTATIONKEY;
 
 export const piiProperties = ['sessionId', 'userId', 'projectId'];
+
+export const COMPOSER_VERSION = '1.2.0';

Composer/packages/server/src/models/bot/builder.ts

@@ -13,6 +13,9 @@ import keys from 'lodash/keys';
 import { Path } from '../../utility/path';
 import { IFileStorage } from '../storage/interface';
 import log from '../../logger';
+import { setEnvDefault } from '../../utility/setEnvDefault';
+import { useElectronContext } from '../../utility/electronContext';
+import { COMPOSER_VERSION } from '../../constants';
 
 import { IOrchestratorBuildOutput, IOrchestratorNLRList, IOrchestratorProgress } from './interface';
 
@@ -45,6 +48,11 @@ export type DownSamplingConfig = {
   maxUtteranceAllowed: number;
 };
 
+const getUserAgent = () => {
+  const platform = useElectronContext() ? 'desktop' : 'web';
+  return `microsoft.bot.composer/${COMPOSER_VERSION} ${platform}`;
+};
+
 export class Builder {
   public botDir: string;
   public generatedFolderPath: string;
@@ -82,6 +90,10 @@ export class Builder {
     allFiles: FileInfo[],
     emptyFiles: { [key: string]: boolean }
   ) => {
+    const userAgent = getUserAgent();
+    setEnvDefault('LUIS_USER_AGENT', userAgent);
+    setEnvDefault('QNA_USER_AGENT', userAgent);
+
     try {
       await this.createGeneratedDir();
       //do cross train before publish

Composer/packages/tools/language-servers/language-understanding/package.json

@@ -21,7 +21,7 @@
     "@bfc/indexers": "*",
     "@bfc/shared": "*",
     "@microsoft/bf-cli-command": "^4.10.0-preview.141651",
-    "@microsoft/bf-lu": "^4.11.0-rc.20201030.a9f9b96",
+    "@microsoft/bf-lu": "^4.12.0-dev.20201209.a2ab9dd",
     "express": "^4.15.2",
     "monaco-languageclient": "^0.10.0",
     "normalize-url": "^2.0.1",

Composer/yarn.lock

@@ -3129,15 +3129,15 @@
     seedrandom "~3.0.5"
     swagger-parser "^8.0.4"
 
-"@microsoft/bf-lu@^4.11.0-rc.20201030.a9f9b96":
-  version "4.11.0-rc.20201030.a9f9b96"
-  resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.11.0-rc.20201030.a9f9b96.tgz#9fcb2a18d66bcef74eabc98f06df4574215c402f"
-  integrity sha512-+VFZUGQdH+1lwuSxE9G2lOqO6KPevvhijKyX8N93/I+VxwfHuCF/BZ439MseT3+vJ9OzATfkeccqgOuI/kNBlQ==
+"@microsoft/bf-lu@^4.12.0-dev.20201209.a2ab9dd":
+  version "4.12.0-dev.20201209.a2ab9dd"
+  resolved "https://registry.yarnpkg.com/@microsoft/bf-lu/-/bf-lu-4.12.0-dev.20201209.a2ab9dd.tgz#edf04d5f7eab1bad05c759e9e8fde8acb7e3dd5e"
+  integrity sha512-w7gr7w4yOfXpooFNGEcKC+WC6WYxRK5SLQBbZzL2lWPwp+3P+d7Yih/HgnZPpFIg//IK6v/b/JfySYZUe0+fBA==
   dependencies:
     "@azure/cognitiveservices-luis-authoring" "4.0.0-preview.1"
     "@azure/ms-rest-azure-js" "2.0.1"
     "@types/node-fetch" "~2.5.5"
-    antlr4 "^4.7.2"
+    antlr4 "~4.8.0"
     chalk "2.4.1"
     console-stream "^0.1.1"
     deep-equal "^1.0.1"

extensions/azurePublish/src/luisAndQnA.ts

@@ -19,9 +19,11 @@ type QnaConfigType = {
   qnaRegion: string | 'westus';
 };
 
+type Resource = { id: string; isEmpty: boolean };
+
 type Resources = {
-  luResources: string[];
-  qnaResources: string[];
+  luResources: Resource[];
+  qnaResources: Resource[];
 }
 
 type BuildSettingType = {
@@ -201,24 +203,27 @@ export async function build(project: IBotProject, path: string, settings: BuildS
   const {builder, files} = project;
 
   const luFiles: FileInfo[] = [];
-  luResources.forEach((id) => {
+  const emptyFiles = {};
+  luResources.forEach(({ id, isEmpty }) => {
     const fileName = `${id}.lu`;
     const f = files.get(fileName);
+    if (isEmpty) emptyFiles[fileName] = true;
     if (f) {
       luFiles.push(f);
     }
   });
   const qnaFiles: FileInfo[] = [];
-  qnaResources.forEach((id) => {
+  qnaResources.forEach(({ id, isEmpty }) => {
     const fileName = `${id}.qna`;
     const f = files.get(fileName);
+    if (isEmpty) emptyFiles[fileName] = true;
     if (f) {
       qnaFiles.push(f);
     }
   });
 
   builder.rootDir = botPath(path);
   builder.setBuildConfig( {...luisConfig, ...qnaConfig},  project.settings.downsampling );
-  await builder.build(luFiles, qnaFiles, Array.from(files.values()) as FileInfo[]);
+  await builder.build(luFiles, qnaFiles, Array.from(files.values()) as FileInfo[], emptyFiles);
   await builder.copyModelPathToBot();
 }