Skip to content

Commit bc5d627

Browse files
Corrected bug with serialize attempt on a dict (#1726)
* Updated aiohttp dependency in botbuilder-integration-aiohttp * Updated other aio dependencies * Corrected bug with serialize attempt on a dict * Corrected BotFrameworkAdapter InvokeResponse tests. Co-authored-by: Axel Suárez <axsuarez@microsoft.com>
1 parent 80f25c9 commit bc5d627

File tree

6 files changed

+10
-13
lines changed

6 files changed

+10
-13
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
aioresponses~=0.6.3
1+
aioresponses~=0.7.2

libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,10 +511,7 @@ async def process_activity_with_identity(
511511
if invoke_response is None:
512512
return InvokeResponse(status=int(HTTPStatus.NOT_IMPLEMENTED))
513513
return InvokeResponse(
514-
status=invoke_response.value.status,
515-
body=invoke_response.value.body.serialize()
516-
if invoke_response.value.body
517-
else None,
514+
status=invoke_response.value.status, body=invoke_response.value.body,
518515
)
519516

520517
return None

libraries/botbuilder-core/tests/test_bot_framework_adapter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -815,9 +815,9 @@ async def callback(context: TurnContext):
815815

816816
assert invoke_response
817817
assert invoke_response.status == 200
818-
assert invoke_response.body["id"] == inbound_activity.value.id
818+
assert invoke_response.body.id == inbound_activity.value.id
819819
assert (
820-
invoke_response.body["connectionName"]
820+
invoke_response.body.connection_name
821821
== inbound_activity.value.connection_name
822822
)
823823

@@ -880,8 +880,8 @@ async def callback(context):
880880

881881
assert invoke_response
882882
assert invoke_response.status == 200
883-
assert invoke_response.body["id"] == inbound_activity.value.id
883+
assert invoke_response.body.id == inbound_activity.value.id
884884
assert (
885-
invoke_response.body["connectionName"]
885+
invoke_response.body.connection_name
886886
== inbound_activity.value.connection_name
887887
)

libraries/botbuilder-integration-aiohttp/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"botframework-connector==4.14.0",
1111
"botbuilder-core==4.14.0",
1212
"yarl<=1.4.2",
13-
"aiohttp~=3.6.2",
13+
"aiohttp>=3.6.2,<3.8.0",
1414
]
1515

1616
root = os.path.abspath(os.path.dirname(__file__))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
botbuilder-schema==4.14.0
22
botbuilder-core==4.14.0
33
botbuilder-dialogs==4.14.0
4-
aiounittest==1.3.0
4+
aiounittest==1.4.0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pytest-cov>=2.6.0
2-
pytest==5.2.2
2+
pytest~=6.2.3
33
azure-devtools>=0.4.1
4-
pytest-asyncio==0.10.0
4+
pytest-asyncio==0.15.1
55
ddt==1.2.1

0 commit comments

Comments
 (0)