Merge pull request #501 from microsoft/jj/echo-aiohttp

JJ/echo aiohttp

Author: axelsrz

samples/02.echo-bot/app.py

@@ -1,24 +1,22 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-import asyncio
 import sys
 from datetime import datetime
 
-from flask import Flask, request, Response
+from aiohttp import web
+from aiohttp.web import Request, Response
 from botbuilder.core import BotFrameworkAdapterSettings, TurnContext, BotFrameworkAdapter
 from botbuilder.schema import Activity, ActivityTypes
 
 from bots import EchoBot
+from config import DefaultConfig
 
-# Create the loop and Flask app
-LOOP = asyncio.get_event_loop()
-app = Flask(__name__, instance_relative_config=True)
-app.config.from_object("config.DefaultConfig")
+CONFIG = DefaultConfig()
 
 # Create adapter.
 # See https://aka.ms/about-bot-adapter to learn more about how bots work.
-SETTINGS = BotFrameworkAdapterSettings(app.config["APP_ID"], app.config["APP_PASSWORD"])
+SETTINGS = BotFrameworkAdapterSettings(CONFIG.APP_ID, CONFIG.APP_PASSWORD)
 ADAPTER = BotFrameworkAdapter(SETTINGS)
 
 
@@ -52,31 +50,41 @@ async def on_error(context: TurnContext, error: Exception):
 BOT = EchoBot()
 
 # Listen for incoming requests on /api/messages
-@app.route("/api/messages", methods=["POST"])
-def messages():
+async def messages(req: Request) -> Response:
     # Main bot message handler.
-    if "application/json" in request.headers["Content-Type"]:
-        body = request.json
+    if "application/json" in req.headers["Content-Type"]:
+        body = await req.json()
     else:
         return Response(status=415)
 
     activity = Activity().deserialize(body)
     auth_header = (
-        request.headers["Authorization"] if "Authorization" in request.headers else ""
+        req.headers["Authorization"] if "Authorization" in req.headers else ""
     )
 
     try:
-        task = LOOP.create_task(
-            ADAPTER.process_activity(activity, auth_header, BOT.on_turn)
-        )
-        LOOP.run_until_complete(task)
+        await ADAPTER.process_activity(activity, auth_header, BOT.on_turn)
         return Response(status=201)
     except Exception as exception:
         raise exception
 
+def app():
+    APP = web.Application()
+    APP.router.add_post("/api/messages", messages)
+    return APP 
+
+#this is the code needed for the deployment template startup command
+def init_func(argv):
+    try:
+        APP = app()
+    except Exception as error:
+        raise error
+    
+    return APP
 
+#this part is needed if you start your bot with 'py app.py' instead of the deployed command.
 if __name__ == "__main__":
     try:
-        app.run(debug=False, port=app.config["PORT"])  # nosec debug
-    except Exception as exception:
-        raise exception
+        web.run_app(app(), host="localhost", port=CONFIG.PORT)
+    except Exception as error:
+        raise error

samples/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json

@@ -189,7 +189,7 @@
                 "use32BitWorkerProcess": true,
                 "webSocketsEnabled": false,
                 "alwaysOn": false,
-                "appCommandLine": "",
+                "appCommandLine": "python -m aiohttp.web -H 0.0.0.0 -P 8000 app:init_func",
                 "managedPipelineMode": "Integrated",
                 "virtualApplications": [
                     {

samples/02.echo-bot/requirements.txt

@@ -1,2 +1,3 @@
 botbuilder-core>=4.4.0b1
 flask>=1.0.3
+aiohttp>=3.6.2