From ea1a8822438ed362c01b46dd03f1c4d303aa3ef5 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Mon, 21 Jun 2021 09:45:22 -0500 Subject: [PATCH 1/4] Updated aiohttp dependency in botbuilder-integration-aiohttp --- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index 12237f3bb..1d6b34204 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.14.0", "botbuilder-core==4.14.0", "yarl<=1.4.2", - "aiohttp~=3.6.2", + "aiohttp>=3.6.2,<3.8.0", ] root = os.path.abspath(os.path.dirname(__file__)) From 348f8283d1adf5fd25b3c47f1ce552290a02b144 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Mon, 21 Jun 2021 11:04:06 -0500 Subject: [PATCH 2/4] Updated other aio dependencies --- libraries/botbuilder-ai/tests/requirements.txt | 2 +- libraries/botbuilder-testing/requirements.txt | 2 +- libraries/botframework-connector/tests/requirements.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/botbuilder-ai/tests/requirements.txt b/libraries/botbuilder-ai/tests/requirements.txt index 9dcdcd03f..676c72001 100644 --- a/libraries/botbuilder-ai/tests/requirements.txt +++ b/libraries/botbuilder-ai/tests/requirements.txt @@ -1 +1 @@ -aioresponses~=0.6.3 \ No newline at end of file +aioresponses~=0.7.2 \ No newline at end of file diff --git a/libraries/botbuilder-testing/requirements.txt b/libraries/botbuilder-testing/requirements.txt index e6c7cf111..89ca8a2b9 100644 --- a/libraries/botbuilder-testing/requirements.txt +++ b/libraries/botbuilder-testing/requirements.txt @@ -1,4 +1,4 @@ botbuilder-schema==4.14.0 botbuilder-core==4.14.0 botbuilder-dialogs==4.14.0 -aiounittest==1.3.0 +aiounittest==1.4.0 diff --git a/libraries/botframework-connector/tests/requirements.txt b/libraries/botframework-connector/tests/requirements.txt index 0c8169787..a5669fcb8 100644 --- a/libraries/botframework-connector/tests/requirements.txt +++ b/libraries/botframework-connector/tests/requirements.txt @@ -1,5 +1,5 @@ pytest-cov>=2.6.0 -pytest==5.2.2 +pytest~=6.2.3 azure-devtools>=0.4.1 -pytest-asyncio==0.10.0 +pytest-asyncio==0.15.1 ddt==1.2.1 \ No newline at end of file From bb71a46fc772e01da0afc7232490b9dfe6f924e4 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Mon, 21 Jun 2021 14:50:09 -0500 Subject: [PATCH 3/4] Corrected bug with serialize attempt on a dict --- .../botbuilder-core/botbuilder/core/bot_framework_adapter.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py index 08ffc659e..eac74917d 100644 --- a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py +++ b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py @@ -511,10 +511,7 @@ async def process_activity_with_identity( if invoke_response is None: return InvokeResponse(status=int(HTTPStatus.NOT_IMPLEMENTED)) return InvokeResponse( - status=invoke_response.value.status, - body=invoke_response.value.body.serialize() - if invoke_response.value.body - else None, + status=invoke_response.value.status, body=invoke_response.value.body, ) return None From b14b4c27337bd7be406689c22dcaf32cc004ace0 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Mon, 21 Jun 2021 15:56:22 -0500 Subject: [PATCH 4/4] Corrected BotFrameworkAdapter InvokeResponse tests. --- .../botbuilder-core/tests/test_bot_framework_adapter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/botbuilder-core/tests/test_bot_framework_adapter.py b/libraries/botbuilder-core/tests/test_bot_framework_adapter.py index 1fed80986..51692a13d 100644 --- a/libraries/botbuilder-core/tests/test_bot_framework_adapter.py +++ b/libraries/botbuilder-core/tests/test_bot_framework_adapter.py @@ -815,9 +815,9 @@ async def callback(context: TurnContext): assert invoke_response assert invoke_response.status == 200 - assert invoke_response.body["id"] == inbound_activity.value.id + assert invoke_response.body.id == inbound_activity.value.id assert ( - invoke_response.body["connectionName"] + invoke_response.body.connection_name == inbound_activity.value.connection_name ) @@ -880,8 +880,8 @@ async def callback(context): assert invoke_response assert invoke_response.status == 200 - assert invoke_response.body["id"] == inbound_activity.value.id + assert invoke_response.body.id == inbound_activity.value.id assert ( - invoke_response.body["connectionName"] + invoke_response.body.connection_name == inbound_activity.value.connection_name )