-
Notifications
You must be signed in to change notification settings - Fork 813
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updating Python samples PR -2 #1521
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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,14 @@ | ||
# TeamsFx files | ||
env/.env.*.user | ||
env/.env.local | ||
appManifest/build/ | ||
|
||
# python virtual environment | ||
.venv/ | ||
|
||
# misc | ||
.env | ||
.deployment/ | ||
|
||
# tmp files | ||
__pycache__/ |
6 changes: 6 additions & 0 deletions
6
samples/bot-configuration-app-auth/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-configuration-app-auth/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-configuration-app-auth/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-configuration-app-auth/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" | ||
} | ||
} | ||
] | ||
} |
Binary file added
BIN
+227 KB
samples/bot-configuration-app-auth/python/Images/Bot-description-card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+125 KB
...les/bot-configuration-app-auth/python/Images/configurable-card-Interaction1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+130 KB
...les/bot-configuration-app-auth/python/Images/configurable-card-Interaction2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+109 KB
...les/bot-configuration-app-auth/python/Images/configurable-card-Interaction3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+128 KB
...les/bot-configuration-app-auth/python/Images/configurable-card-Interaction4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+99.3 KB
samples/bot-configuration-app-auth/python/Images/groupChat-AddBot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+60.9 KB
samples/bot-configuration-app-auth/python/Images/groupChat-AddedBot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,121 @@ | ||
--- | ||
page_type: sample | ||
description: This Teams bot enables configuration and reconfiguration with dynamic search capabilities on Adaptive Cards. | ||
products: | ||
- office-teams | ||
- office | ||
- office-365 | ||
languages: | ||
- python | ||
extensions: | ||
contentType: samples | ||
createdDate: "31-12-2024 13:38:25" | ||
urlFragment: officedev-microsoft-teams-samples-bot-configuration-app-auth-nodejs | ||
--- | ||
|
||
# Create a commands menu | ||
This sample illustrates bot configuration and reconfiguration in Teams and group chats, showcasing a type-ahead search feature on Adaptive Cards. It supports both static and dynamic search options, enabling a customizable and interactive bot experience for users. | ||
|
||
## Included Features | ||
* Bots | ||
|
||
## Interaction with app | ||
|
||
![Configuration Bot](Images/ConfigurationBot.gif) | ||
|
||
## Prerequisites | ||
|
||
- Microsoft Teams is installed and you have an account | ||
- [Python SDK](https://www.python.org/downloads/) min version 3.6 | ||
- [dev tunnel](https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started?tabs=windows) or [ngrok](https://ngrok.com/) latest version or equivalent tunnelling solution | ||
|
||
|
||
## Run the app (Using Teams Toolkit for Visual Studio Code) | ||
|
||
The simplest way to run this sample in Teams is to use Teams Toolkit for Visual Studio Code. | ||
|
||
1. Ensure you have downloaded and installed [Visual Studio Code](https://code.visualstudio.com/docs/setup/setup-overview) | ||
1. Install the [Teams Toolkit extension](https://marketplace.visualstudio.com/items?itemName=TeamsDevApp.ms-teams-vscode-extension) and [Python Extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) | ||
1. Select **File > Open Folder** in VS Code and choose this samples directory from the repo | ||
1. Press **CTRL+Shift+P** to open the command box and enter **Python: Create Environment** to create and activate your desired virtual environment. Remember to select `requirements.txt` as dependencies to install when creating the virtual environment. | ||
1. Using the extension, sign in with your Microsoft 365 account where you have permissions to upload custom apps | ||
1. Select **Debug > Start Debugging** or **F5** to run the app in a Teams web client. | ||
1. In the browser that launches, select the **Add** button to install the app to Teams. | ||
|
||
> If you do not have permission to upload custom apps (sideloading), Teams Toolkit will recommend creating and using a Microsoft 365 Developer Program account - a free program to get your own dev environment sandbox that includes Teams. | ||
|
||
## Run the app (Manually Uploading to Teams) | ||
|
||
> Note these instructions are for running the sample on your local machine, the tunnelling solution is required because | ||
the Teams service needs to call into the bot. | ||
|
||
1) Clone the repository | ||
|
||
```bash | ||
git clone https://github.com/OfficeDev/Microsoft-Teams-Samples.git | ||
``` | ||
|
||
2) Run ngrok - point to port 3978 | ||
|
||
```bash | ||
ngrok http 3978 --host-header="localhost:3978" | ||
``` | ||
|
||
Alternatively, you can also use the `dev tunnels`. Please follow [Create and host a dev tunnel](https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started?tabs=windows) and host the tunnel with anonymous user access command as shown below: | ||
|
||
```bash | ||
devtunnel host -p 3978 --allow-anonymous | ||
``` | ||
|
||
3) Create [Azure Bot resource resource](https://docs.microsoft.com/azure/bot-service/bot-service-quickstart-registration) in Azure | ||
- Use the current `https` URL you were given by running the tunneling application. Append with the path `/api/messages` used by this sample | ||
- Ensure that you've [enabled the Teams Channel](https://docs.microsoft.com/azure/bot-service/channel-connect-teams?view=azure-bot-service-4.0) | ||
- __*If you don't have an Azure account*__ you can use this [Azure free account here](https://azure.microsoft.com/free/) | ||
|
||
4) In a terminal, go to `samples\bot-configuration-app-auth` | ||
|
||
5) Activate your desired virtual environment | ||
|
||
6) Install dependencies by running ```pip install -r requirements.txt``` in the project folder. | ||
|
||
7) Update the `config.py` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.) | ||
|
||
8) __*This step is specific to Teams.*__ | ||
- **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `${{AAD_APP_CLIENT_ID}}` and `${{TEAMS_APP_ID}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) | ||
- **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` | ||
- **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") | ||
|
||
9) Run your bot with `python app.py` | ||
|
||
# Running the sample | ||
You can interact with this bot in Teams by sending it a message, or selecting a command from the command list. The bot will respond to the following strings. | ||
|
||
**Configurable Card** | ||
A configurable card is used to modify data even after the bot has been installed. When the bot is added to a Teams or group chat scope, it utilizes 'config/fetch' and 'config/submit' invoke requests. | ||
|
||
- **Result:** The bot will send the configurable adaptive card | ||
- **Valid Scopes:** group chat, team chat | ||
|
||
- **Bot Interactions:** | ||
|
||
**Adding bot UI:** | ||
![groupChat-AddBot ](Images/groupChat-AddBot.png) | ||
|
||
**Added bot UI:** | ||
![groupChat-AddedBot ](Images/groupChat-AddedBot.png) | ||
|
||
**Option 1 : Auth card Interactions:** | ||
- Note: The `Sign-in` page displayed is currently using a dummy URL. Please update it with your authentication URL. | ||
|
||
![Bot-description-card](Images/Bot-description-card.png) | ||
|
||
## Further reading | ||
|
||
- [Bot configuration](https://learn.microsoft.com/microsoftteams/platform/bots/how-to/bot-configuration-experience) | ||
- [Bot Framework Documentation](https://docs.botframework.com) | ||
- [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0) | ||
- [Send Notification to User in Chat](https://docs.microsoft.com/graph/api/chat-sendactivitynotification?view=graph-rest-beta) | ||
- [Send Notification to User in Team](https://docs.microsoft.com/graph/api/team-sendactivitynotification?view=graph-rest-beta&tabs=http) | ||
- [Send Notification to User](https://docs.microsoft.com/graph/api/userteamwork-sendactivitynotification?view=graph-rest-beta&tabs=http) | ||
|
||
<img src="https://pnptelemetry.azurewebsites.net/microsoft-teams-samples/samples/bot-configuration-app-auth-python" /> |
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,94 @@ | ||
# Copyright (c) Microsoft Corporation. All rights reserved. | ||
# Licensed under the MIT License. | ||
|
||
import sys | ||
import traceback | ||
import uuid | ||
from datetime import datetime | ||
from http import HTTPStatus | ||
|
||
from aiohttp import web | ||
from aiohttp.web import Request, Response, json_response | ||
from botbuilder.core import ( | ||
BotFrameworkAdapterSettings, | ||
TurnContext, | ||
BotFrameworkAdapter, | ||
) | ||
from botbuilder.core.integration import aiohttp_error_middleware | ||
from botbuilder.schema import Activity, ActivityTypes | ||
|
||
from bots import TeamsBot | ||
from config import DefaultConfig | ||
|
||
CONFIG = DefaultConfig() | ||
|
||
# Create adapter. | ||
# See https://aka.ms/about-bot-adapter to learn more about how bots work. | ||
SETTINGS = BotFrameworkAdapterSettings(CONFIG.APP_ID, CONFIG.APP_PASSWORD) | ||
ADAPTER = BotFrameworkAdapter(SETTINGS) | ||
|
||
|
||
# Catch-all for errors. | ||
async def on_error(context: TurnContext, error: Exception): | ||
# This check writes out errors to console log .vs. app insights. | ||
# NOTE: In production environment, you should consider logging this to Azure | ||
# application insights. | ||
print(f"\n [on_turn_error] unhandled error: {error}", file=sys.stderr) | ||
traceback.print_exc() | ||
|
||
# Send a message to the user | ||
await context.send_activity("The bot encountered an error or bug.") | ||
await context.send_activity( | ||
"To continue to run this bot, please fix the bot source code." | ||
) | ||
# Send a trace activity if we're talking to the Bot Framework Emulator | ||
if context.activity.channel_id == "emulator": | ||
# Create a trace activity that contains the error object | ||
trace_activity = Activity( | ||
label="TurnError", | ||
name="on_turn_error Trace", | ||
timestamp=datetime.utcnow(), | ||
type=ActivityTypes.trace, | ||
value=f"{error}", | ||
value_type="https://www.botframework.com/schemas/error", | ||
) | ||
# Send a trace activity, which will be displayed in Bot Framework Emulator | ||
await context.send_activity(trace_activity) | ||
|
||
|
||
ADAPTER.on_turn_error = on_error | ||
|
||
# If the channel is the Emulator, and authentication is not in use, the AppId will be null. | ||
# We generate a random AppId for this case only. This is not required for production, since | ||
# the AppId will have a value. | ||
APP_ID = SETTINGS.app_id if SETTINGS.app_id else uuid.uuid4() | ||
BASE_URL = CONFIG.BOT_ENDPOINT | ||
# Create the Bot | ||
BOT = TeamsBot() | ||
|
||
|
||
# Listen for incoming requests on /api/messages. | ||
async def messages(req: Request) -> Response: | ||
# Main bot message handler. | ||
if "application/json" in req.headers["Content-Type"]: | ||
body = await req.json() | ||
else: | ||
return Response(status=HTTPStatus.UNSUPPORTED_MEDIA_TYPE) | ||
|
||
activity = Activity().deserialize(body) | ||
auth_header = req.headers["Authorization"] if "Authorization" in req.headers else "" | ||
|
||
response = await ADAPTER.process_activity(activity, auth_header, BOT.on_turn) | ||
if response: | ||
return json_response(data=response.body, status=response.status) | ||
return Response(status=HTTPStatus.OK) | ||
|
||
|
||
APP = web.Application(middlewares=[aiohttp_error_middleware]) | ||
APP.router.add_post("/api/messages", messages) | ||
|
||
if __name__ == "__main__": | ||
try: | ||
web.run_app(APP, host="localhost", port=CONFIG.PORT) | ||
except Exception as error: | ||
raise error |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code does not handle the case where the 'Content-Type' header is missing, which could lead to a KeyError.
Copilot is powered by AI, so mistakes are possible. Review output carefully before use.