Merge branch 'main' into kavin/c#-assistants-v2

microsoft · Aug 2, 2024 · ca97e35 · ca97e35
2 parents 17af079 + 52236d8
commit ca97e35
Show file tree

Hide file tree

Showing 32 changed files with 182 additions and 170 deletions.
diff --git a/.github/workflows/dotnet-codeql.yml b/.github/workflows/dotnet-codeql.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           languages: csharp
       - name: Setup .NET
@@ -50,6 +50,6 @@ jobs:
         working-directory: dotnet/packages/Microsoft.TeamsAI/
         run: dotnet build Microsoft.Teams.AI.sln --configuration Release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           category: "/language:csharp"
diff --git a/.github/workflows/js-codeql.yml b/.github/workflows/js-codeql.yml
@@ -38,10 +38,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           languages: javascript
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           category: "/language:javascript"
diff --git a/.github/workflows/python-codeql.yml b/.github/workflows/python-codeql.yml
@@ -38,10 +38,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           languages: python
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           category: "/language:python"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -36,7 +36,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif
diff --git a/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Models/OpenAIModel.cs b/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Models/OpenAIModel.cs
@@ -178,7 +178,7 @@ public async Task<PromptResponse> CompletePromptAsync(ITurnContext turnContext,
                 IEnumerable<OAIChat.ChatMessage> chatMessages = prompt.Output.Select(chatMessage => chatMessage.ToOpenAIChatMessage());
 
                 ChatCompletionOptions? chatCompletionOptions = ModelReaderWriter.Read<ChatCompletionOptions>(BinaryData.FromString($@"{{
-                    ""max_tokens"": {maxInputTokens},
+                    ""max_tokens"": {promptTemplate.Configuration.Completion.MaxTokens},
                     ""temperature"": {(float)promptTemplate.Configuration.Completion.Temperature},
                     ""top_p"": {(float)promptTemplate.Configuration.Completion.TopP},
                     ""presence_penalty"": {(float)promptTemplate.Configuration.Completion.PresencePenalty},

diff --git a/js/package.json b/js/package.json
@@ -26,23 +26,23 @@
     "devDependencies": {
         "@azure/logger": "^1.1.3",
         "@azure/ms-rest-js": "2.7.0",
-        "@microsoft/api-extractor": "^7.47.2",
+        "@microsoft/api-extractor": "^7.47.4",
         "@standardlabs/is-private": "^1.0.1",
         "@types/jsonwebtoken": "9.0.4",
         "@types/lodash": "^4.17.7",
         "@types/mocha": "^10.0.7",
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/sinon": "^10.0.19",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "applicationinsights": "^2.9.5",
         "browserify": "^17.0.0",
-        "chai": "^4.4.1",
+        "chai": "^4.5.0",
         "depcheck": "^1.4.7",
         "eslint-config-prettier": "^8.10.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-jsdoc": "^46.10.1",
-        "eslint-plugin-mocha": "^10.4.3",
+        "eslint-plugin-mocha": "^10.5.0",
         "eslint-plugin-only-warn": "^1.1.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint": "^8.57.0",
@@ -57,14 +57,14 @@
         "proxyquire": "^2.1.3",
         "read-text-file": "^1.1.0",
         "replace-in-file": "^4.1.0",
-        "rimraf": "^5.0.9",
+        "rimraf": "^5.0.10",
         "shx": "^0.3.4",
         "sinon": "^16.1.3",
         "source-map-support": "^0.5.19",
         "sponge": "^0.1.0",
         "tinyify": "^4.0.0",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.3",
+        "typescript": "^5.5.4",
         "wsrun": "^5.2.4"
     }
 }
diff --git a/js/packages/teams-ai/package.json b/js/packages/teams-ai/package.json
@@ -30,7 +30,7 @@
     },
     "dependencies": {
         "@azure/openai-assistants": "1.0.0-beta.5",
-        "@azure/msal-node": "^2.11.1",
+        "@azure/msal-node": "^2.12.0",
         "axios": "^1.7.2",
         "botbuilder-dialogs": "^4.22.3",
         "botframework-connector": "^4.22.1",
@@ -40,7 +40,7 @@
         "json-colorizer": "^2.2.2",
         "jsonschema": "1.4.1",
         "uuid": "^9.0.1",
-        "yaml": "^2.4.5"
+        "yaml": "^2.5.0"
     },
     "resolutions": {
         "follow-redirects": "^1.15.0"
@@ -50,18 +50,18 @@
         "@types/express": "^4.17.21",
         "@types/jsonwebtoken": "^9.0.4",
         "@types/mocha": "^10.0.7",
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/uuid": "^9.0.8",
         "botbuilder-core": "^4.22.1",
         "eslint": "^8.57.0",
         "express": "^4.19.2",
         "jsonwebtoken": "^9.0.2",
         "mocha": "10.7.0",
         "nyc": "^15.1.0",
-        "rimraf": "5.0.9",
+        "rimraf": "5.0.10",
         "shx": "^0.3.4",
         "ts-mocha": "10.0.0",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     },
     "scripts": {
         "build": "tsc -b",

diff --git a/js/samples/01.getting-started/a.echoBot/package.json b/js/samples/01.getting-started/a.echoBot/package.json
@@ -27,15 +27,15 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~3.0.1",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
-        "typescript": "^5.5.3",
+        "rimraf": "^5.0.10",
+        "typescript": "^5.5.4",
         "ts-node": "^10.9.2"
     }
 }
diff --git a/js/samples/02.teams-features/a.messageExtensions.searchCommand/package.json b/js/samples/02.teams-features/a.messageExtensions.searchCommand/package.json
@@ -28,15 +28,15 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~3.0.1",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
-        "typescript": "^5.5.3",
+        "rimraf": "^5.0.10",
+        "typescript": "^5.5.4",
         "ts-node": "^10.9.2"
     }
 }
diff --git a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/package.json b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/package.json
@@ -28,15 +28,15 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~3.0.1",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
-        "typescript": "^5.5.3",
+        "rimraf": "^5.0.10",
+        "typescript": "^5.5.4",
         "ts-node": "^10.9.2"
     }
 }
diff --git a/js/samples/03.ai-concepts/a.twentyQuestions/package.json b/js/samples/03.ai-concepts/a.twentyQuestions/package.json
@@ -27,15 +27,15 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~3.0.1",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
-        "typescript": "^5.5.3",
+        "rimraf": "^5.0.10",
+        "typescript": "^5.5.4",
         "shx": "^0.3.4",
         "ts-node": "^10.9.2"
     }

diff --git a/js/samples/03.ai-concepts/b.AI-messageExtensions/package.json b/js/samples/03.ai-concepts/b.AI-messageExtensions/package.json
@@ -27,15 +27,15 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~3.0.1",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
-        "typescript": "^5.5.3",
+        "rimraf": "^5.0.10",
+        "typescript": "^5.5.4",
         "shx": "^0.3.4",
         "ts-node": "^10.9.2"
     }

diff --git a/js/samples/03.ai-concepts/c.actionMapping-lightBot/package.json b/js/samples/03.ai-concepts/c.actionMapping-lightBot/package.json
@@ -27,15 +27,15 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~1.19.4",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
-        "typescript": "^5.5.3",
+        "rimraf": "^5.0.10",
+        "typescript": "^5.5.4",
         "shx": "^0.3.4",
         "ts-node": "^10.9.2"
     }

diff --git a/js/samples/03.ai-concepts/d.chainedActions-listBot/package.json b/js/samples/03.ai-concepts/d.chainedActions-listBot/package.json
@@ -27,17 +27,17 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/jsonwebtoken": "^9.0.4",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~1.19.4",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
+        "rimraf": "^5.0.10",
         "shx": "^0.3.4",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     }
 }
diff --git a/js/samples/03.ai-concepts/e.customModel-LLAMA/package.json b/js/samples/03.ai-concepts/e.customModel-LLAMA/package.json
@@ -30,15 +30,15 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~1.19.4",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
-        "typescript": "^5.5.3",
+        "rimraf": "^5.0.10",
+        "typescript": "^5.5.4",
         "shx": "^0.3.4",
         "ts-node": "^10.9.2"
     }

diff --git a/js/samples/03.ai-concepts/f.chatModeration/package.json b/js/samples/03.ai-concepts/f.chatModeration/package.json
@@ -29,7 +29,7 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
@@ -38,6 +38,6 @@
         "prettier": "^3.3.3",
         "shx": "^0.3.4",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     }
 }
diff --git a/js/samples/04.ai-apps/a.teamsChefBot/package.json b/js/samples/04.ai-apps/a.teamsChefBot/package.json
@@ -32,15 +32,15 @@
     },
     "devDependencies": {
         "@types/jsonwebtoken": "^9.0.6",
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~3.0.1",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
+        "rimraf": "^5.0.10",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     }
 }
diff --git a/js/samples/04.ai-apps/b.devOpsBot/package.json b/js/samples/04.ai-apps/b.devOpsBot/package.json
@@ -28,16 +28,16 @@
     },
     "devDependencies": {
         "@types/jsonwebtoken": "^9.0.6",
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "^8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "eslint": "^8.57.0",
         "nodemon": "~3.0.1",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
+        "rimraf": "^5.0.10",
         "shx": "^0.3.4",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     }
 }
diff --git a/js/samples/04.ai-apps/c.vision-cardGazer/package.json b/js/samples/04.ai-apps/c.vision-cardGazer/package.json
@@ -29,16 +29,16 @@
         "restify": "~11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.11",
+        "@types/node": "^20.14.13",
         "@types/restify": "8.5.12",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "env-cmd": "^10.1.0",
         "eslint": "^8.57.0",
         "prettier": "^3.3.3",
-        "rimraf": "^5.0.9",
+        "rimraf": "^5.0.10",
         "nodemon": "~3.0.1",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     }
 }