-
Notifications
You must be signed in to change notification settings - Fork 802
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1462 from OfficeDev/v-jegadeesh/python-migration
Python TTK migration
- Loading branch information
Showing
22 changed files
with
690 additions
and
12 deletions.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
samples/bot-initiate-thread-in-channel/python/.vscode/extensions.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "recommendations": [ | ||
| "TeamsDevApp.ms-teams-vscode-extension", | ||
| "ms-python.python", | ||
| ] | ||
| } |
69 changes: 69 additions & 0 deletions
69
samples/bot-initiate-thread-in-channel/python/.vscode/launch.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Launch App (Edge)", | ||
| "type": "msedge", | ||
| "request": "launch", | ||
| "url": "https://teams.microsoft.com/l/app/${{local:TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}", | ||
| "cascadeTerminateToConfigurations": [ | ||
| "Python: Run App Locally" | ||
| ], | ||
| "presentation": { | ||
| "group": "all", | ||
| "hidden": true | ||
| }, | ||
| "internalConsoleOptions": "neverOpen" | ||
| }, | ||
| { | ||
| "name": "Launch App (Chrome)", | ||
| "type": "chrome", | ||
| "request": "launch", | ||
| "url": "https://teams.microsoft.com/l/app/${{local:TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}", | ||
| "cascadeTerminateToConfigurations": [ | ||
| "Python: Run App Locally" | ||
| ], | ||
| "presentation": { | ||
| "group": "all", | ||
| "hidden": true | ||
| }, | ||
| "internalConsoleOptions": "neverOpen" | ||
| }, | ||
| { | ||
| "name": "Python: Run App Locally", | ||
| "type": "debugpy", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/app.py", | ||
| "cwd": "${workspaceFolder}", | ||
| "console": "integratedTerminal" | ||
| } | ||
| ], | ||
| "compounds": [ | ||
| { | ||
| "name": "Debug (Edge)", | ||
| "configurations": [ | ||
| "Launch App (Edge)", | ||
| "Python: Run App Locally" | ||
| ], | ||
| "preLaunchTask": "Prepare Teams App Resources", | ||
| "presentation": { | ||
| "group": "all", | ||
| "order": 1 | ||
| }, | ||
| "stopAll": true | ||
| }, | ||
| { | ||
| "name": "Debug (Chrome)", | ||
| "configurations": [ | ||
| "Launch App (Chrome)", | ||
| "Python: Run App Locally" | ||
| ], | ||
| "preLaunchTask": "Prepare Teams App Resources", | ||
| "presentation": { | ||
| "group": "all", | ||
| "order": 2 | ||
| }, | ||
| "stopAll": true | ||
| } | ||
| ] | ||
| } |
3 changes: 3 additions & 0 deletions
3
samples/bot-initiate-thread-in-channel/python/.vscode/settings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "debug.onTaskErrors": "abort" | ||
| } |
78 changes: 78 additions & 0 deletions
78
samples/bot-initiate-thread-in-channel/python/.vscode/tasks.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // This file is automatically generated by Teams Toolkit. | ||
| // The teamsfx tasks defined in this file require Teams Toolkit version >= 5.0.0. | ||
| // See https://aka.ms/teamsfx-tasks for details on how to customize each task. | ||
| { | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "Prepare Teams App Resources", | ||
| "dependsOn": [ | ||
| "Validate prerequisites", | ||
| "Start local tunnel", | ||
| "Provision", | ||
| "Deploy" | ||
| ], | ||
| "dependsOrder": "sequence" | ||
| }, | ||
| { | ||
| // 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", | ||
| "type": "teamsfx", | ||
| "command": "debug-check-prerequisites", | ||
| "args": { | ||
| "prerequisites": [ | ||
| "m365Account", // Sign-in prompt for Microsoft 365 account, then validate if the account enables the sideloading permission. | ||
| "portOccupancy" // Validate available ports to ensure those debug ones are not occupied. | ||
| ], | ||
| "portOccupancy": [ | ||
| 3978, // app service port | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| // Start the local tunnel service to forward public URL to local port and inspect traffic. | ||
| // See https://aka.ms/teamsfx-tasks/local-tunnel for the detailed args definitions. | ||
| "label": "Start local tunnel", | ||
| "type": "teamsfx", | ||
| "command": "debug-start-local-tunnel", | ||
| "args": { | ||
| "type": "dev-tunnel", | ||
| "ports": [ | ||
| { | ||
| "portNumber": 3978, | ||
| "protocol": "http", | ||
| "access": "public", | ||
| "writeToEnvironmentFile": { | ||
| "endpoint": "BOT_ENDPOINT", // output tunnel endpoint as BOT_ENDPOINT | ||
| "domain": "BOT_DOMAIN" // output tunnel domain as BOT_DOMAIN | ||
| } | ||
| } | ||
| ], | ||
| "env": "local" | ||
| }, | ||
| "isBackground": true, | ||
| "problemMatcher": "$teamsfx-local-tunnel-watch" | ||
| }, | ||
| { | ||
| // Create the debug resources. | ||
| // See https://aka.ms/teamsfx-tasks/provision to know the details and how to customize the args. | ||
| "label": "Provision", | ||
| "type": "teamsfx", | ||
| "command": "provision", | ||
| "args": { | ||
| "env": "local" | ||
| } | ||
| }, | ||
| { | ||
| // Build project. | ||
| // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. | ||
| "label": "Deploy", | ||
| "type": "teamsfx", | ||
| "command": "deploy", | ||
| "args": { | ||
| "env": "local" | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
samples/bot-initiate-thread-in-channel/python/env/.env.local
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # 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=local | ||
|
|
||
| # Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly | ||
| BOT_ENDPOINT= | ||
| BOT_DOMAIN= | ||
| AAD_APP_CLIENT_ID= | ||
| AAD_APP_OBJECT_ID= | ||
| AAD_APP_TENANT_ID= | ||
| AAD_APP_OAUTH_AUTHORITY= | ||
| AAD_APP_OAUTH_AUTHORITY_HOST= | ||
| TEAMS_APP_ID= | ||
| TEAMS_APP_TENANT_ID= | ||
| MICROSOFT_APP_TYPE= | ||
| MICROSOFT_APP_TENANT_ID= | ||
| RESOURCE_SUFFIX= | ||
| AZURE_SUBSCRIPTION_ID= | ||
| AZURE_RESOURCE_GROUP_NAME= | ||
| APP_NAME_SUFFIX=local |
42 changes: 42 additions & 0 deletions
42
samples/bot-initiate-thread-in-channel/python/infra/azure.bicep
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| @maxLength(20) | ||
| @minLength(4) | ||
| @description('Used to generate names for all resources in this file') | ||
| param resourceBaseName string | ||
|
|
||
| @description('Required when create Azure Bot service') | ||
| param botAadAppClientId string | ||
|
|
||
| param botAppDomain string | ||
|
|
||
| @maxLength(42) | ||
| param botDisplayName string | ||
|
|
||
| param botServiceName string = resourceBaseName | ||
| param botServiceSku string = 'F0' | ||
|
|
||
| // Register your web service as a bot with the Bot Framework | ||
| resource botService 'Microsoft.BotService/botServices@2021-03-01' = { | ||
| kind: 'azurebot' | ||
| location: 'global' | ||
| name: botServiceName | ||
| properties: { | ||
| displayName: botDisplayName | ||
| endpoint: 'https://${botAppDomain}/api/messages' | ||
| msaAppId: botAadAppClientId | ||
| msaAppType: 'MultiTenant' | ||
| msaAppTenantId: '' | ||
| } | ||
| sku: { | ||
| name: botServiceSku | ||
| } | ||
| } | ||
|
|
||
| // Connect the bot service to Microsoft Teams | ||
| resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = { | ||
| parent: botService | ||
| location: 'global' | ||
| name: 'MsTeamsChannel' | ||
| properties: { | ||
| channelName: 'MsTeamsChannel' | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
samples/bot-initiate-thread-in-channel/python/infra/azure.parameters.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "parameters": { | ||
| "resourceBaseName": { | ||
| "value": "bot${{RESOURCE_SUFFIX}}" | ||
| }, | ||
| "botAadAppClientId": { | ||
| "value": "${{AAD_APP_CLIENT_ID}}" | ||
| }, | ||
| "botAppDomain": { | ||
| "value": "${{BOT_DOMAIN}}" | ||
| }, | ||
| "botDisplayName": { | ||
| "value": "botinitiatethread" | ||
| } | ||
| } | ||
| } |
78 changes: 78 additions & 0 deletions
78
samples/bot-initiate-thread-in-channel/python/teamsapp.local.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| # yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.2/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.2 | ||
|
|
||
| additionalMetadata: | ||
| sampleTag: Microsoft-Teams-Samples:bot-initiate-thread-in-channel-python | ||
|
|
||
| provision: | ||
| # Creates a new Azure Active Directory (AAD) app to authenticate users if the environment variable that stores clientId is empty | ||
| - uses: aadApp/create | ||
| with: | ||
| name: botinitiatethread-aad # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here. | ||
| generateClientSecret: true # If the value is false, the action will not generate client secret for you | ||
| signInAudience: "AzureADMultipleOrgs" # Multitenant | ||
| writeToEnvironmentFile: # Write the information of created resources into environment file for the specified environment variable(s). | ||
| clientId: AAD_APP_CLIENT_ID | ||
| clientSecret: SECRET_AAD_APP_CLIENT_SECRET # Environment variable that starts with `SECRET_` will be stored to the .env.{envName}.user environment file | ||
| objectId: AAD_APP_OBJECT_ID | ||
| tenantId: AAD_APP_TENANT_ID | ||
| authority: AAD_APP_OAUTH_AUTHORITY | ||
| authorityHost: AAD_APP_OAUTH_AUTHORITY_HOST | ||
|
|
||
| # Creates a Teams app | ||
| - uses: teamsApp/create | ||
| with: | ||
| # Teams app name | ||
| name: botinitiatethread${{APP_NAME_SUFFIX}} | ||
| # Write the information of created resources into environment file for | ||
| # the specified environment variable(s). | ||
| writeToEnvironmentFile: | ||
| teamsAppId: TEAMS_APP_ID | ||
|
|
||
| - uses: arm/deploy # Deploy given ARM templates parallelly. | ||
| with: | ||
| subscriptionId: ${{AZURE_SUBSCRIPTION_ID}} # The AZURE_SUBSCRIPTION_ID is a built-in environment variable. TeamsFx will ask you select one subscription if its value is empty. You're free to reference other environment varialbe here, but TeamsFx will not ask you to select subscription if it's empty in this case. | ||
| resourceGroupName: ${{AZURE_RESOURCE_GROUP_NAME}} # The AZURE_RESOURCE_GROUP_NAME is a built-in environment variable. TeamsFx will ask you to select or create one resource group if its value is empty. You're free to reference other environment varialbe here, but TeamsFx will not ask you to select or create resource grouop if it's empty in this case. | ||
| templates: | ||
| - path: ./infra/azure.bicep | ||
| parameters: ./infra/azure.parameters.json | ||
| deploymentName: Create-resources-for-bot | ||
| bicepCliVersion: v0.9.1 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config. | ||
|
|
||
| # Validate using manifest schema | ||
| - uses: teamsApp/validateManifest | ||
| with: | ||
| # Path to manifest template | ||
| manifestPath: ./appManifest/manifest.json | ||
|
|
||
| # Build Teams app package with latest env value | ||
| - uses: teamsApp/zipAppPackage | ||
| with: | ||
| # Path to manifest template | ||
| manifestPath: ./appManifest/manifest.json | ||
| outputZipPath: ./appManifest/build/appManifest.${{TEAMSFX_ENV}}.zip | ||
| outputJsonPath: ./appManifest/build/manifest.${{TEAMSFX_ENV}}.json | ||
| # Validate app package using validation rules | ||
| - uses: teamsApp/validateAppPackage | ||
| with: | ||
| # Relative path to this file. This is the path for built zip file. | ||
| appPackagePath: ./appManifest/build/appManifest.${{TEAMSFX_ENV}}.zip | ||
|
|
||
| # Apply the Teams app manifest to an existing Teams app in | ||
| # Teams Developer Portal. | ||
| # Will use the app id in manifest file to determine which Teams app to update. | ||
| - uses: teamsApp/update | ||
| with: | ||
| # Relative path to this file. This is the path for built zip file. | ||
| appPackagePath: ./appManifest/build/appManifest.${{TEAMSFX_ENV}}.zip | ||
|
|
||
| deploy: | ||
| # Generate runtime environment variables | ||
| - uses: file/createOrUpdateEnvironmentFile | ||
| with: | ||
| target: ./.env | ||
| envs: | ||
| MicrosoftAppId: ${{AAD_APP_CLIENT_ID}} | ||
| MicrosoftAppPassword: ${{SECRET_AAD_APP_CLIENT_SECRET}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.2/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.2 | ||
|
|
||
| additionalMetadata: | ||
| sampleTag: Microsoft-Teams-Samples:bot-initiate-thread-in-channel-python | ||
|
|
||
| environmentFolderPath: ./env |
Oops, something went wrong.