diff --git a/templates/python/custom-copilot-assistant-assistants-api/.vscode/launch.json b/templates/python/custom-copilot-assistant-assistants-api/.vscode/launch.json index c54ee4d329..2d4ff97c1d 100644 --- a/templates/python/custom-copilot-assistant-assistants-api/.vscode/launch.json +++ b/templates/python/custom-copilot-assistant-assistants-api/.vscode/launch.json @@ -52,18 +52,6 @@ "program": "${workspaceFolder}/src/app.py", "cwd": "${workspaceFolder}/src", "console": "integratedTerminal" - }, - { - "name": "Start Test Tool", - "type": "node", - "request": "launch", - "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", - "args": [ - "start" - ], - "cwd": "${workspaceFolder}", - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen" } ], "compounds": [ @@ -98,22 +86,6 @@ "order": 2 }, "stopAll": true - }, - { - "name": "Debug in Test Tool", - "configurations": [ - "Start Python", - "Start Test Tool" - ], - "cascadeTerminateToConfigurations": [ - "Start Test Tool" - ], - "preLaunchTask": "Deploy (Test Tool)", - "presentation": { - "group": "2-local", - "order": 1 - }, - "stopAll": true } ] } \ No newline at end of file diff --git a/templates/python/custom-copilot-assistant-assistants-api/.vscode/tasks.json b/templates/python/custom-copilot-assistant-assistants-api/.vscode/tasks.json index cd77312c80..ea45da5013 100644 --- a/templates/python/custom-copilot-assistant-assistants-api/.vscode/tasks.json +++ b/templates/python/custom-copilot-assistant-assistants-api/.vscode/tasks.json @@ -4,36 +4,6 @@ { "version": "2.0.0", "tasks": [ - { - // Check all required prerequisites. - // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", - "type": "teamsfx", - "command": "debug-check-prerequisites", - "args": { - "prerequisites": [ - "nodejs", // Check if Node.js is installed and the version is >= 12. - "portOccupancy" // Validate available ports to ensure those debug ones are not occupied. - ], - "portOccupancy": [ - 3978, // app service port - 56150, // test tool port - ] - } - }, - { - // Build project. - // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", - "dependsOn": [ - "Validate prerequisites (Test Tool)" - ], - "type": "teamsfx", - "command": "deploy", - "args": { - "env": "testtool", - } - }, { "label": "Start Teams App Locally", "dependsOn": [ diff --git a/templates/python/custom-copilot-assistant-assistants-api/env/.env.testtool b/templates/python/custom-copilot-assistant-assistants-api/env/.env.testtool deleted file mode 100644 index 53abad07db..0000000000 --- a/templates/python/custom-copilot-assistant-assistants-api/env/.env.testtool +++ /dev/null @@ -1,8 +0,0 @@ -# This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. - -# Built-in environment variables -TEAMSFX_ENV=testtool - -# Environment variables used by test tool -TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json \ No newline at end of file diff --git a/templates/python/custom-copilot-assistant-assistants-api/env/.env.testtool.user.tpl b/templates/python/custom-copilot-assistant-assistants-api/env/.env.testtool.user.tpl deleted file mode 100644 index 3808b59f51..0000000000 --- a/templates/python/custom-copilot-assistant-assistants-api/env/.env.testtool.user.tpl +++ /dev/null @@ -1,11 +0,0 @@ -# This file includes environment variables that will not be committed to git by default. You can set these environment variables in your CI/CD system for your project. - -# If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. -{{#openAIKey}} -SECRET_OPENAI_API_KEY='{{{openAIKey}}}' -{{/openAIKey}} -{{^openAIKey}} -SECRET_OPENAI_API_KEY= -{{/openAIKey}} -OPENAI_ASSISTANT_ID= # See README.md for how to fill in this value. \ No newline at end of file diff --git a/templates/python/custom-copilot-assistant-assistants-api/teamsapp.testtool.yml b/templates/python/custom-copilot-assistant-assistants-api/teamsapp.testtool.yml deleted file mode 100644 index 029f77eede..0000000000 --- a/templates/python/custom-copilot-assistant-assistants-api/teamsapp.testtool.yml +++ /dev/null @@ -1,23 +0,0 @@ -# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json -# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file -# Visit https://aka.ms/teamsfx-actions for details on actions -version: v1.5 - -deploy: - # Install development tool(s) - - uses: devTool/install - with: - testTool: - version: ~0.2.1 - symlinkDir: ./devTools/teamsapptester - - # Generate runtime environment variables - - uses: file/createOrUpdateEnvironmentFile - with: - target: ./.env - envs: - TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} - BOT_ID: "" - BOT_PASSWORD: "" - OPENAI_API_KEY: ${{SECRET_OPENAI_API_KEY}} - OPENAI_ASSISTANT_ID: ${{OPENAI_ASSISTANT_ID}} diff --git a/templates/python/custom-copilot-assistant-new/.vscode/launch.json b/templates/python/custom-copilot-assistant-new/.vscode/launch.json index c54ee4d329..2d4ff97c1d 100644 --- a/templates/python/custom-copilot-assistant-new/.vscode/launch.json +++ b/templates/python/custom-copilot-assistant-new/.vscode/launch.json @@ -52,18 +52,6 @@ "program": "${workspaceFolder}/src/app.py", "cwd": "${workspaceFolder}/src", "console": "integratedTerminal" - }, - { - "name": "Start Test Tool", - "type": "node", - "request": "launch", - "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", - "args": [ - "start" - ], - "cwd": "${workspaceFolder}", - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen" } ], "compounds": [ @@ -98,22 +86,6 @@ "order": 2 }, "stopAll": true - }, - { - "name": "Debug in Test Tool", - "configurations": [ - "Start Python", - "Start Test Tool" - ], - "cascadeTerminateToConfigurations": [ - "Start Test Tool" - ], - "preLaunchTask": "Deploy (Test Tool)", - "presentation": { - "group": "2-local", - "order": 1 - }, - "stopAll": true } ] } \ No newline at end of file diff --git a/templates/python/custom-copilot-assistant-new/.vscode/tasks.json b/templates/python/custom-copilot-assistant-new/.vscode/tasks.json index cd77312c80..ea45da5013 100644 --- a/templates/python/custom-copilot-assistant-new/.vscode/tasks.json +++ b/templates/python/custom-copilot-assistant-new/.vscode/tasks.json @@ -4,36 +4,6 @@ { "version": "2.0.0", "tasks": [ - { - // Check all required prerequisites. - // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", - "type": "teamsfx", - "command": "debug-check-prerequisites", - "args": { - "prerequisites": [ - "nodejs", // Check if Node.js is installed and the version is >= 12. - "portOccupancy" // Validate available ports to ensure those debug ones are not occupied. - ], - "portOccupancy": [ - 3978, // app service port - 56150, // test tool port - ] - } - }, - { - // Build project. - // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", - "dependsOn": [ - "Validate prerequisites (Test Tool)" - ], - "type": "teamsfx", - "command": "deploy", - "args": { - "env": "testtool", - } - }, { "label": "Start Teams App Locally", "dependsOn": [ diff --git a/templates/python/custom-copilot-assistant-new/README.md.tpl b/templates/python/custom-copilot-assistant-new/README.md.tpl index 9673cebe82..bad085bf7a 100644 --- a/templates/python/custom-copilot-assistant-new/README.md.tpl +++ b/templates/python/custom-copilot-assistant-new/README.md.tpl @@ -18,25 +18,10 @@ It showcases how to build an AI agent in Teams capable of chatting with users an {{#useOpenAI}} > - An account with [OpenAI](https://platform.openai.com/). {{/useOpenAI}} -{{^enableTestToolByDefault}} > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). -{{/enableTestToolByDefault}} -{{#enableTestToolByDefault}} -> - [Node.js](https://nodejs.org/) (supported versions: 16, 18) for local debug in Test Tool. -{{/enableTestToolByDefault}} ### Configurations 1. Open the command box and enter `Python: Create Environment` to create and activate your desired virtual environment. Remember to select `src/requirements.txt` as dependencies to install when creating the virtual environment. -{{#enableTestToolByDefault}} -{{#useAzureOpenAI}} -1. In file *env/.env.testtool.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. -{{/useAzureOpenAI}} -{{#useOpenAI}} -1. In file *env/.env.testtool.user*, fill in your OpenAI key `SECRET_OPENAI_API_KEY`. -1. In this template, default model name is `gpt-3.5-turbo`. If you want to use a different model from OpenAI, fill in your model name in [src/config.py](./src/config.py). -{{/useOpenAI}} -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} {{#useAzureOpenAI}} 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. {{/useAzureOpenAI}} @@ -44,30 +29,19 @@ It showcases how to build an AI agent in Teams capable of chatting with users an 1. In file *env/.env.local.user*, fill in your OpenAI key `SECRET_OPENAI_API_KEY`. 1. In this template, default model name is `gpt-3.5-turbo`. If you want to use a different model from OpenAI, fill in your model name in [src/config.py](./src/config.py). {{/useOpenAI}} -{{/enableTestToolByDefault}} ### Conversation with bot 1. Select the Teams Toolkit icon on the left in the VS Code toolbar. -{{#enableTestToolByDefault}} -1. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. -{{/enableTestToolByDefault}} 1. You will receive a welcome message from the bot, or send any message to get a response. **Congratulations**! You are running an application that can now interact with users in Teams: > For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -{{#enableTestToolByDefault}} -![ai agent](https://github.com/OfficeDev/Microsoft-Teams-Samples/assets/109947924/6a362379-5c22-40d4-8087-9fc37bc96800) -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} ![ai agent](https://github.com/OfficeDev/TeamsFx/assets/109947924/775a0fde-f2ba-4198-a94d-a43c598d6e9b) -{{/enableTestToolByDefault}} ## What's included in the template diff --git a/templates/python/custom-copilot-assistant-new/env/.env.testtool b/templates/python/custom-copilot-assistant-new/env/.env.testtool deleted file mode 100644 index 43ce12aad3..0000000000 --- a/templates/python/custom-copilot-assistant-new/env/.env.testtool +++ /dev/null @@ -1,8 +0,0 @@ -# This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. - -# Built-in environment variables -TEAMSFX_ENV=testtool - -# Environment variables used by test tool -TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json diff --git a/templates/python/custom-copilot-assistant-new/env/.env.testtool.user.tpl b/templates/python/custom-copilot-assistant-new/env/.env.testtool.user.tpl deleted file mode 100644 index 76d74f19c2..0000000000 --- a/templates/python/custom-copilot-assistant-new/env/.env.testtool.user.tpl +++ /dev/null @@ -1,32 +0,0 @@ -# This file includes environment variables that will not be committed to git by default. You can set these environment variables in your CI/CD system for your project. - -# If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. -{{#useOpenAI}} -{{#openAIKey}} -SECRET_OPENAI_API_KEY='{{{openAIKey}}}' -{{/openAIKey}} -{{^openAIKey}} -SECRET_OPENAI_API_KEY= -{{/openAIKey}} -{{/useOpenAI}} -{{#useAzureOpenAI}} -{{#azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY='{{{azureOpenAIKey}}}' -{{/azureOpenAIKey}} -{{^azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY= -{{/azureOpenAIKey}} -{{#azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME='{{{azureOpenAIDeploymentName}}}' -{{/azureOpenAIDeploymentName}} -{{^azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME= -{{/azureOpenAIDeploymentName}} -{{#azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT='{{{azureOpenAIEndpoint}}}' -{{/azureOpenAIEndpoint}} -{{^azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT= -{{/azureOpenAIEndpoint}} -{{/useAzureOpenAI}} \ No newline at end of file diff --git a/templates/python/custom-copilot-assistant-new/teamsapp.testtool.yml.tpl b/templates/python/custom-copilot-assistant-new/teamsapp.testtool.yml.tpl deleted file mode 100644 index c925d4f9e6..0000000000 --- a/templates/python/custom-copilot-assistant-new/teamsapp.testtool.yml.tpl +++ /dev/null @@ -1,29 +0,0 @@ -# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json -# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file -# Visit https://aka.ms/teamsfx-actions for details on actions -version: v1.5 - -deploy: - # Install development tool(s) - - uses: devTool/install - with: - testTool: - version: ~0.2.1 - symlinkDir: ./devTools/teamsapptester - - # Generate runtime environment variables - - uses: file/createOrUpdateEnvironmentFile - with: - target: ./.env - envs: - TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} - BOT_ID: "" - BOT_PASSWORD: "" - {{#useOpenAI}} - OPENAI_API_KEY: ${{SECRET_OPENAI_API_KEY}} - {{/useOpenAI}} - {{#useAzureOpenAI}} - AZURE_OPENAI_API_KEY: ${{SECRET_AZURE_OPENAI_API_KEY}} - AZURE_OPENAI_MODEL_DEPLOYMENT_NAME: ${{AZURE_OPENAI_MODEL_DEPLOYMENT_NAME}} - AZURE_OPENAI_ENDPOINT: ${{AZURE_OPENAI_ENDPOINT}} - {{/useAzureOpenAI}} \ No newline at end of file diff --git a/templates/python/custom-copilot-basic/.vscode/launch.json b/templates/python/custom-copilot-basic/.vscode/launch.json index c54ee4d329..2d4ff97c1d 100644 --- a/templates/python/custom-copilot-basic/.vscode/launch.json +++ b/templates/python/custom-copilot-basic/.vscode/launch.json @@ -52,18 +52,6 @@ "program": "${workspaceFolder}/src/app.py", "cwd": "${workspaceFolder}/src", "console": "integratedTerminal" - }, - { - "name": "Start Test Tool", - "type": "node", - "request": "launch", - "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", - "args": [ - "start" - ], - "cwd": "${workspaceFolder}", - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen" } ], "compounds": [ @@ -98,22 +86,6 @@ "order": 2 }, "stopAll": true - }, - { - "name": "Debug in Test Tool", - "configurations": [ - "Start Python", - "Start Test Tool" - ], - "cascadeTerminateToConfigurations": [ - "Start Test Tool" - ], - "preLaunchTask": "Deploy (Test Tool)", - "presentation": { - "group": "2-local", - "order": 1 - }, - "stopAll": true } ] } \ No newline at end of file diff --git a/templates/python/custom-copilot-basic/.vscode/tasks.json b/templates/python/custom-copilot-basic/.vscode/tasks.json index cd77312c80..ea45da5013 100644 --- a/templates/python/custom-copilot-basic/.vscode/tasks.json +++ b/templates/python/custom-copilot-basic/.vscode/tasks.json @@ -4,36 +4,6 @@ { "version": "2.0.0", "tasks": [ - { - // Check all required prerequisites. - // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", - "type": "teamsfx", - "command": "debug-check-prerequisites", - "args": { - "prerequisites": [ - "nodejs", // Check if Node.js is installed and the version is >= 12. - "portOccupancy" // Validate available ports to ensure those debug ones are not occupied. - ], - "portOccupancy": [ - 3978, // app service port - 56150, // test tool port - ] - } - }, - { - // Build project. - // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", - "dependsOn": [ - "Validate prerequisites (Test Tool)" - ], - "type": "teamsfx", - "command": "deploy", - "args": { - "env": "testtool", - } - }, { "label": "Start Teams App Locally", "dependsOn": [ diff --git a/templates/python/custom-copilot-basic/README.md.tpl b/templates/python/custom-copilot-basic/README.md.tpl index c2e9dcff66..61f11e8ab8 100644 --- a/templates/python/custom-copilot-basic/README.md.tpl +++ b/templates/python/custom-copilot-basic/README.md.tpl @@ -19,25 +19,10 @@ This template showcases a bot app that responds to user questions like an AI ass {{#useOpenAI}} > - An account with [OpenAI](https://platform.openai.com/). {{/useOpenAI}} -{{^enableTestToolByDefault}} > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). -{{/enableTestToolByDefault}} -{{#enableTestToolByDefault}} -> - [Node.js](https://nodejs.org/) (supported versions: 16, 18) for local debug in Test Tool. -{{/enableTestToolByDefault}} ### Configurations 1. Open the command box and enter `Python: Create Environment` to create and activate your desired virtual environment. Remember to select `src/requirements.txt` as dependencies to install when creating the virtual environment. -{{#enableTestToolByDefault}} -{{#useAzureOpenAI}} -1. In file *env/.env.testtool.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. -{{/useAzureOpenAI}} -{{#useOpenAI}} -1. In file *env/.env.testtool.user*, fill in your OpenAI key `SECRET_OPENAI_API_KEY`. -1. In this template, default model name is `gpt-3.5-turbo`. If you want to use a different model from OpenAI, fill in your model name in [src/config.py](./src/config.py). -{{/useOpenAI}} -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} {{#useAzureOpenAI}} 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. {{/useAzureOpenAI}} @@ -45,30 +30,19 @@ This template showcases a bot app that responds to user questions like an AI ass 1. In file *env/.env.local.user*, fill in your OpenAI key `SECRET_OPENAI_API_KEY`. 1. In this template, default model name is `gpt-3.5-turbo`. If you want to use a different model from OpenAI, fill in your model name in [src/config.py](./src/config.py). {{/useOpenAI}} -{{/enableTestToolByDefault}} ### Conversation with bot 1. Select the Teams Toolkit icon on the left in the VS Code toolbar. -{{#enableTestToolByDefault}} -1. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. -{{/enableTestToolByDefault}} 1. You will receive a welcome message from the bot, or send any message to get a response. **Congratulations**! You are running an application that can now interact with users in Teams: > For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -{{#enableTestToolByDefault}} -![ai chat bot](https://github.com/OfficeDev/TeamsFx/assets/9698542/9bd22201-8fda-4252-a0b3-79531c963e5e) -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} ![ai chat bot](https://user-images.githubusercontent.com/7642967/258726187-8306610b-579e-4301-872b-1b5e85141eff.png) -{{/enableTestToolByDefault}} ## What's included in the template diff --git a/templates/python/custom-copilot-basic/env/.env.testtool b/templates/python/custom-copilot-basic/env/.env.testtool deleted file mode 100644 index 43ce12aad3..0000000000 --- a/templates/python/custom-copilot-basic/env/.env.testtool +++ /dev/null @@ -1,8 +0,0 @@ -# This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. - -# Built-in environment variables -TEAMSFX_ENV=testtool - -# Environment variables used by test tool -TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json diff --git a/templates/python/custom-copilot-basic/env/.env.testtool.user.tpl b/templates/python/custom-copilot-basic/env/.env.testtool.user.tpl deleted file mode 100644 index 76d74f19c2..0000000000 --- a/templates/python/custom-copilot-basic/env/.env.testtool.user.tpl +++ /dev/null @@ -1,32 +0,0 @@ -# This file includes environment variables that will not be committed to git by default. You can set these environment variables in your CI/CD system for your project. - -# If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. -{{#useOpenAI}} -{{#openAIKey}} -SECRET_OPENAI_API_KEY='{{{openAIKey}}}' -{{/openAIKey}} -{{^openAIKey}} -SECRET_OPENAI_API_KEY= -{{/openAIKey}} -{{/useOpenAI}} -{{#useAzureOpenAI}} -{{#azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY='{{{azureOpenAIKey}}}' -{{/azureOpenAIKey}} -{{^azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY= -{{/azureOpenAIKey}} -{{#azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME='{{{azureOpenAIDeploymentName}}}' -{{/azureOpenAIDeploymentName}} -{{^azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME= -{{/azureOpenAIDeploymentName}} -{{#azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT='{{{azureOpenAIEndpoint}}}' -{{/azureOpenAIEndpoint}} -{{^azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT= -{{/azureOpenAIEndpoint}} -{{/useAzureOpenAI}} \ No newline at end of file diff --git a/templates/python/custom-copilot-basic/teamsapp.testtool.yml.tpl b/templates/python/custom-copilot-basic/teamsapp.testtool.yml.tpl deleted file mode 100644 index c925d4f9e6..0000000000 --- a/templates/python/custom-copilot-basic/teamsapp.testtool.yml.tpl +++ /dev/null @@ -1,29 +0,0 @@ -# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json -# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file -# Visit https://aka.ms/teamsfx-actions for details on actions -version: v1.5 - -deploy: - # Install development tool(s) - - uses: devTool/install - with: - testTool: - version: ~0.2.1 - symlinkDir: ./devTools/teamsapptester - - # Generate runtime environment variables - - uses: file/createOrUpdateEnvironmentFile - with: - target: ./.env - envs: - TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} - BOT_ID: "" - BOT_PASSWORD: "" - {{#useOpenAI}} - OPENAI_API_KEY: ${{SECRET_OPENAI_API_KEY}} - {{/useOpenAI}} - {{#useAzureOpenAI}} - AZURE_OPENAI_API_KEY: ${{SECRET_AZURE_OPENAI_API_KEY}} - AZURE_OPENAI_MODEL_DEPLOYMENT_NAME: ${{AZURE_OPENAI_MODEL_DEPLOYMENT_NAME}} - AZURE_OPENAI_ENDPOINT: ${{AZURE_OPENAI_ENDPOINT}} - {{/useAzureOpenAI}} \ No newline at end of file diff --git a/templates/python/custom-copilot-rag-azure-ai-search/.vscode/launch.json b/templates/python/custom-copilot-rag-azure-ai-search/.vscode/launch.json index afb0badab1..2d4ff97c1d 100644 --- a/templates/python/custom-copilot-rag-azure-ai-search/.vscode/launch.json +++ b/templates/python/custom-copilot-rag-azure-ai-search/.vscode/launch.json @@ -48,22 +48,10 @@ { "name": "Start Python", "type": "debugpy", - "program": "${workspaceFolder}/src/app.py", "request": "launch", - "cwd": "${workspaceFolder}/src/", + "program": "${workspaceFolder}/src/app.py", + "cwd": "${workspaceFolder}/src", "console": "integratedTerminal" - }, - { - "name": "Start Test Tool", - "type": "node", - "request": "launch", - "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", - "args": [ - "start" - ], - "cwd": "${workspaceFolder}", - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen" } ], "compounds": [ @@ -98,22 +86,6 @@ "order": 2 }, "stopAll": true - }, - { - "name": "Debug in Test Tool", - "configurations": [ - "Start Python", - "Start Test Tool" - ], - "cascadeTerminateToConfigurations": [ - "Start Test Tool" - ], - "preLaunchTask": "Deploy (Test Tool)", - "presentation": { - "group": "2-local", - "order": 1 - }, - "stopAll": true } ] } \ No newline at end of file diff --git a/templates/python/custom-copilot-rag-azure-ai-search/.vscode/tasks.json b/templates/python/custom-copilot-rag-azure-ai-search/.vscode/tasks.json index cd77312c80..ea45da5013 100644 --- a/templates/python/custom-copilot-rag-azure-ai-search/.vscode/tasks.json +++ b/templates/python/custom-copilot-rag-azure-ai-search/.vscode/tasks.json @@ -4,36 +4,6 @@ { "version": "2.0.0", "tasks": [ - { - // Check all required prerequisites. - // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", - "type": "teamsfx", - "command": "debug-check-prerequisites", - "args": { - "prerequisites": [ - "nodejs", // Check if Node.js is installed and the version is >= 12. - "portOccupancy" // Validate available ports to ensure those debug ones are not occupied. - ], - "portOccupancy": [ - 3978, // app service port - 56150, // test tool port - ] - } - }, - { - // Build project. - // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", - "dependsOn": [ - "Validate prerequisites (Test Tool)" - ], - "type": "teamsfx", - "command": "deploy", - "args": { - "env": "testtool", - } - }, { "label": "Start Teams App Locally", "dependsOn": [ diff --git a/templates/python/custom-copilot-rag-azure-ai-search/README.md.tpl b/templates/python/custom-copilot-rag-azure-ai-search/README.md.tpl index c1b88904a5..c5032e4908 100644 --- a/templates/python/custom-copilot-rag-azure-ai-search/README.md.tpl +++ b/templates/python/custom-copilot-rag-azure-ai-search/README.md.tpl @@ -22,26 +22,10 @@ This app template also demonstrates usage of techniques like: > - An account with [OpenAI](https://platform.openai.com/). {{/useOpenAI}} > - An [Azure Search service](https://learn.microsoft.com/en-us/azure/search/search-what-is-azure-search). -{{^enableTestToolByDefault}} > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). -{{/enableTestToolByDefault}} -{{#enableTestToolByDefault}} -> - [Node.js](https://nodejs.org/) (supported versions: 16, 18) for local debug in Test Tool. -{{/enableTestToolByDefault}} ### Configurations 1. Open the command box and enter `Python: Create Environment` to create and activate your desired virtual environment. Remember to select `src/requirements.txt` as dependencies to install when creating the virtual environment. -{{#enableTestToolByDefault}} -{{#useAzureOpenAI}} -1. In file *env/.env.testtool.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME`, endpoint `AZURE_OPENAI_ENDPOINT` and embedding deployment name `AZURE_OPENAI_EMBEDDING_DEPLOYMENT`. -{{/useAzureOpenAI}} -{{#useOpenAI}} -1. In file *env/.env.testtool.user*, fill in your OpenAI key `SECRET_OPENAI_API_KEY`. -1. In this template, default model name is `gpt-3.5-turbo` and default embedding model name is `text-embedding-ada-002`. If you want to use different models from OpenAI, fill in your model names in [src/config.py](./src/config.py). -{{/useOpenAI}} -1. In file *env/.env.local.user*, fill in your Azure Search key `SECRET_AZURE_SEARCH_KEY` and endpoint `AZURE_SEARCH_ENDPOINT`. -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} {{#useAzureOpenAI}} 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME`, endpoint `AZURE_OPENAI_ENDPOINT` and embedding deployment name `AZURE_OPENAI_EMBEDDING_DEPLOYMENT`. {{/useAzureOpenAI}} @@ -50,15 +34,9 @@ This app template also demonstrates usage of techniques like: 1. In this template, default model name is `gpt-3.5-turbo` and default embedding model name is `text-embedding-ada-002`. If you want to use different models from OpenAI, fill in your model names in [src/config.py](./src/config.py). {{/useOpenAI}} 1. In file *env/.env.local.user*, fill in your Azure Search key `SECRET_AZURE_SEARCH_KEY` and endpoint `AZURE_SEARCH_ENDPOINT`. -{{/enableTestToolByDefault}} ### Setting up index and documents -{{^enableTestToolByDefault}} 1. Azure Search key `SECRET_AZURE_SEARCH_KEY` and endpoint `AZURE_SEARCH_ENDPOINT` are loaded from *env/.env.local.user*. Please make sure you have already configured them. -{{/enableTestToolByDefault}} -{{#enableTestToolByDefault}} -1. Azure Search key `SECRET_AZURE_SEARCH_KEY` and endpoint `AZURE_SEARCH_ENDPOINT` are loaded from *env/.env.testtool.user*. Please make sure you have already configured them. -{{/enableTestToolByDefault}} 1. Use command `python src/indexers/setup.py` to create index and upload documents in `src/indexers/data`. 1. You will see the following information indicated the success of setup: ``` @@ -70,26 +48,16 @@ This app template also demonstrates usage of techniques like: ### Conversation with bot 1. Select the Teams Toolkit icon on the left in the VS Code toolbar. -{{^enableTestToolByDefault}} 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. -{{/enableTestToolByDefault}} -{{#enableTestToolByDefault}} -1. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -{{/enableTestToolByDefault}} 1. You will receive a welcome message from the bot, or send any message to get a response. **Congratulations**! You are running an application that can now interact with users in Teams: > For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -{{#enableTestToolByDefault}} -![alt text](https://github.com/OfficeDev/TeamsFx/assets/109947924/3e0de761-b4c8-4ae2-9ede-8e9922e54765) -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} ![alt text](https://github.com/OfficeDev/TeamsFx/assets/109947924/2c17e3e8-09c1-42b6-b47a-ac4234343883) -{{/enableTestToolByDefault}} ## What's included in the template diff --git a/templates/python/custom-copilot-rag-azure-ai-search/env/.env.testtool b/templates/python/custom-copilot-rag-azure-ai-search/env/.env.testtool deleted file mode 100644 index 53abad07db..0000000000 --- a/templates/python/custom-copilot-rag-azure-ai-search/env/.env.testtool +++ /dev/null @@ -1,8 +0,0 @@ -# This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. - -# Built-in environment variables -TEAMSFX_ENV=testtool - -# Environment variables used by test tool -TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json \ No newline at end of file diff --git a/templates/python/custom-copilot-rag-azure-ai-search/env/.env.testtool.user.tpl b/templates/python/custom-copilot-rag-azure-ai-search/env/.env.testtool.user.tpl deleted file mode 100644 index 14169d1be3..0000000000 --- a/templates/python/custom-copilot-rag-azure-ai-search/env/.env.testtool.user.tpl +++ /dev/null @@ -1,42 +0,0 @@ -# This file includes environment variables that will not be committed to git by default. You can set these environment variables in your CI/CD system for your project. - -# If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. -SECRET_BOT_PASSWORD= -{{#useOpenAI}} -{{#openAIKey}} -SECRET_OPENAI_API_KEY='{{{openAIKey}}}' -{{/openAIKey}} -{{^openAIKey}} -SECRET_OPENAI_API_KEY= -{{/openAIKey}} -{{/useOpenAI}} -{{#useAzureOpenAI}} -{{#azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY='{{{azureOpenAIKey}}}' -{{/azureOpenAIKey}} -{{^azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY= -{{/azureOpenAIKey}} -{{#azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME='{{{azureOpenAIDeploymentName}}}' -{{/azureOpenAIDeploymentName}} -{{^azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME= -{{/azureOpenAIDeploymentName}} -{{#azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT='{{{azureOpenAIEndpoint}}}' -{{/azureOpenAIEndpoint}} -{{^azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT= -{{/azureOpenAIEndpoint}} -{{#azureOpenAIEmbeddingDeploymentName}} -AZURE_OPENAI_EMBEDDING_DEPLOYMENT='{{{azureOpenAIEmbeddingDeploymentName}}}' -{{/azureOpenAIEmbeddingDeploymentName}} -{{^azureOpenAIEmbeddingDeploymentName}} -AZURE_OPENAI_EMBEDDING_DEPLOYMENT= -{{/azureOpenAIEmbeddingDeploymentName}} -{{/useAzureOpenAI}} - -SECRET_AZURE_SEARCH_KEY= -AZURE_SEARCH_ENDPOINT= \ No newline at end of file diff --git a/templates/python/custom-copilot-rag-azure-ai-search/teamsapp.testtool.yml.tpl b/templates/python/custom-copilot-rag-azure-ai-search/teamsapp.testtool.yml.tpl deleted file mode 100644 index 985b67c909..0000000000 --- a/templates/python/custom-copilot-rag-azure-ai-search/teamsapp.testtool.yml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json -# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file -# Visit https://aka.ms/teamsfx-actions for details on actions -version: v1.5 - -deploy: - # Install development tool(s) - - uses: devTool/install - with: - testTool: - version: ~0.2.1 - symlinkDir: ./devTools/teamsapptester - - # Generate runtime environment variables - - uses: file/createOrUpdateEnvironmentFile - with: - target: ./.env - envs: - TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} - BOT_ID: "" - BOT_PASSWORD: "" - {{#useAzureOpenAI}} - AZURE_OPENAI_API_KEY: ${{SECRET_AZURE_OPENAI_API_KEY}} - AZURE_OPENAI_MODEL_DEPLOYMENT_NAME: ${{AZURE_OPENAI_MODEL_DEPLOYMENT_NAME}} - AZURE_OPENAI_ENDPOINT: ${{AZURE_OPENAI_ENDPOINT}} - AZURE_OPENAI_EMBEDDING_DEPLOYMENT: ${{AZURE_OPENAI_EMBEDDING_DEPLOYMENT}} - {{/useAzureOpenAI}} - {{#useOpenAI}} - OPENAI_API_KEY: ${{SECRET_OPENAI_API_KEY}} - {{/useOpenAI}} - AZURE_SEARCH_KEY: ${{SECRET_AZURE_SEARCH_KEY}} - AZURE_SEARCH_ENDPOINT: ${{AZURE_SEARCH_ENDPOINT}} diff --git a/templates/python/custom-copilot-rag-customize/.vscode/launch.json b/templates/python/custom-copilot-rag-customize/.vscode/launch.json index afb0badab1..5e8a82bb11 100644 --- a/templates/python/custom-copilot-rag-customize/.vscode/launch.json +++ b/templates/python/custom-copilot-rag-customize/.vscode/launch.json @@ -50,20 +50,8 @@ "type": "debugpy", "program": "${workspaceFolder}/src/app.py", "request": "launch", - "cwd": "${workspaceFolder}/src/", + "cwd": "${workspaceFolder}/src", "console": "integratedTerminal" - }, - { - "name": "Start Test Tool", - "type": "node", - "request": "launch", - "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", - "args": [ - "start" - ], - "cwd": "${workspaceFolder}", - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen" } ], "compounds": [ @@ -98,22 +86,6 @@ "order": 2 }, "stopAll": true - }, - { - "name": "Debug in Test Tool", - "configurations": [ - "Start Python", - "Start Test Tool" - ], - "cascadeTerminateToConfigurations": [ - "Start Test Tool" - ], - "preLaunchTask": "Deploy (Test Tool)", - "presentation": { - "group": "2-local", - "order": 1 - }, - "stopAll": true } ] } \ No newline at end of file diff --git a/templates/python/custom-copilot-rag-customize/.vscode/tasks.json b/templates/python/custom-copilot-rag-customize/.vscode/tasks.json index cd77312c80..ea45da5013 100644 --- a/templates/python/custom-copilot-rag-customize/.vscode/tasks.json +++ b/templates/python/custom-copilot-rag-customize/.vscode/tasks.json @@ -4,36 +4,6 @@ { "version": "2.0.0", "tasks": [ - { - // Check all required prerequisites. - // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", - "type": "teamsfx", - "command": "debug-check-prerequisites", - "args": { - "prerequisites": [ - "nodejs", // Check if Node.js is installed and the version is >= 12. - "portOccupancy" // Validate available ports to ensure those debug ones are not occupied. - ], - "portOccupancy": [ - 3978, // app service port - 56150, // test tool port - ] - } - }, - { - // Build project. - // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", - "dependsOn": [ - "Validate prerequisites (Test Tool)" - ], - "type": "teamsfx", - "command": "deploy", - "args": { - "env": "testtool", - } - }, { "label": "Start Teams App Locally", "dependsOn": [ diff --git a/templates/python/custom-copilot-rag-customize/README.md.tpl b/templates/python/custom-copilot-rag-customize/README.md.tpl index 14371b8324..2799209f22 100644 --- a/templates/python/custom-copilot-rag-customize/README.md.tpl +++ b/templates/python/custom-copilot-rag-customize/README.md.tpl @@ -20,25 +20,10 @@ This app template also demonstrates usage of techniques like: {{#useOpenAI}} > - An account with [OpenAI](https://platform.openai.com/). {{/useOpenAI}} -{{^enableTestToolByDefault}} > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). -{{/enableTestToolByDefault}} -{{#enableTestToolByDefault}} -> - [Node.js](https://nodejs.org/) (supported versions: 16, 18) for local debug in Test Tool. -{{/enableTestToolByDefault}} ### Configurations 1. Open the command box and enter `Python: Create Environment` to create and activate your desired virtual environment. Remember to select `src/requirements.txt` as dependencies to install when creating the virtual environment. -{{#enableTestToolByDefault}} -{{#useAzureOpenAI}} -1. In file *env/.env.testtool.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. -{{/useAzureOpenAI}} -{{#useOpenAI}} -1. In file *env/.env.testtool.user*, fill in your OpenAI key `SECRET_OPENAI_API_KEY`. -1. In this template, default model name is `gpt-3.5-turbo`. If you want to use different models from OpenAI, fill in your model names in [src/config.py](./src/config.py). -{{/useOpenAI}} -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} {{#useAzureOpenAI}} 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. {{/useAzureOpenAI}} @@ -46,30 +31,19 @@ This app template also demonstrates usage of techniques like: 1. In file *env/.env.local.user*, fill in your OpenAI key `SECRET_OPENAI_API_KEY`. 1. In this template, default model name is `gpt-3.5-turbo`. If you want to use different models from OpenAI, fill in your model names in [src/config.py](./src/config.py). {{/useOpenAI}} -{{/enableTestToolByDefault}} ### Conversation with bot 1. Select the Teams Toolkit icon on the left in the VS Code toolbar. -{{^enableTestToolByDefault}} 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. -{{/enableTestToolByDefault}} -{{#enableTestToolByDefault}} -1. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -{{/enableTestToolByDefault}} 1. You will receive a welcome message from the bot, or send any message to get a response. **Congratulations**! You are running an application that can now interact with users in Teams: > For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -{{#enableTestToolByDefault}} -![alt text](https://github.com/OfficeDev/TeamsFx/assets/109947924/6658f342-6c27-447a-b791-2f2c400d48f9) -{{/enableTestToolByDefault}} -{{^enableTestToolByDefault}} ![alt text](https://github.com/OfficeDev/TeamsFx/assets/109947924/d4f9b455-dbb0-4e14-8557-59f9be5c1200) -{{/enableTestToolByDefault}} ## What's included in the template diff --git a/templates/python/custom-copilot-rag-customize/env/.env.testtool b/templates/python/custom-copilot-rag-customize/env/.env.testtool deleted file mode 100644 index 53abad07db..0000000000 --- a/templates/python/custom-copilot-rag-customize/env/.env.testtool +++ /dev/null @@ -1,8 +0,0 @@ -# This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. - -# Built-in environment variables -TEAMSFX_ENV=testtool - -# Environment variables used by test tool -TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json \ No newline at end of file diff --git a/templates/python/custom-copilot-rag-customize/env/.env.testtool.user.tpl b/templates/python/custom-copilot-rag-customize/env/.env.testtool.user.tpl deleted file mode 100644 index 76d74f19c2..0000000000 --- a/templates/python/custom-copilot-rag-customize/env/.env.testtool.user.tpl +++ /dev/null @@ -1,32 +0,0 @@ -# This file includes environment variables that will not be committed to git by default. You can set these environment variables in your CI/CD system for your project. - -# If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. -{{#useOpenAI}} -{{#openAIKey}} -SECRET_OPENAI_API_KEY='{{{openAIKey}}}' -{{/openAIKey}} -{{^openAIKey}} -SECRET_OPENAI_API_KEY= -{{/openAIKey}} -{{/useOpenAI}} -{{#useAzureOpenAI}} -{{#azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY='{{{azureOpenAIKey}}}' -{{/azureOpenAIKey}} -{{^azureOpenAIKey}} -SECRET_AZURE_OPENAI_API_KEY= -{{/azureOpenAIKey}} -{{#azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME='{{{azureOpenAIDeploymentName}}}' -{{/azureOpenAIDeploymentName}} -{{^azureOpenAIDeploymentName}} -AZURE_OPENAI_MODEL_DEPLOYMENT_NAME= -{{/azureOpenAIDeploymentName}} -{{#azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT='{{{azureOpenAIEndpoint}}}' -{{/azureOpenAIEndpoint}} -{{^azureOpenAIEndpoint}} -AZURE_OPENAI_ENDPOINT= -{{/azureOpenAIEndpoint}} -{{/useAzureOpenAI}} \ No newline at end of file diff --git a/templates/python/custom-copilot-rag-customize/teamsapp.testtool.yml.tpl b/templates/python/custom-copilot-rag-customize/teamsapp.testtool.yml.tpl deleted file mode 100644 index ec0c16a5fc..0000000000 --- a/templates/python/custom-copilot-rag-customize/teamsapp.testtool.yml.tpl +++ /dev/null @@ -1,29 +0,0 @@ -# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json -# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file -# Visit https://aka.ms/teamsfx-actions for details on actions -version: v1.5 - -deploy: - # Install development tool(s) - - uses: devTool/install - with: - testTool: - version: ~0.2.1 - symlinkDir: ./devTools/teamsapptester - - # Generate runtime environment variables - - uses: file/createOrUpdateEnvironmentFile - with: - target: ./.env - envs: - TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} - BOT_ID: "" - BOT_PASSWORD: "" - {{#useOpenAI}} - OPENAI_API_KEY: ${{SECRET_OPENAI_API_KEY}} - {{/useOpenAI}} - {{#useAzureOpenAI}} - AZURE_OPENAI_API_KEY: ${{SECRET_AZURE_OPENAI_API_KEY}} - AZURE_OPENAI_MODEL_DEPLOYMENT_NAME: ${{AZURE_OPENAI_MODEL_DEPLOYMENT_NAME}} - AZURE_OPENAI_ENDPOINT: ${{AZURE_OPENAI_ENDPOINT}} - {{/useAzureOpenAI}}