8000 Corrected TeamsChannelData deserialization in TelemetryLoggerMiddlewa… · cybsafe/botbuilder-python@43dd98e · GitHub
[go: up one dir, main page]
Skip to content

Commit 43dd98e

Browse files
tracyboehrerTracy Boehrer
tracyboehrer
and
Tracy Boehrer
authored
Corrected TeamsChannelData deserialization in TelemetryLoggerMiddleware (microsoft#1957)
* Corrected TeamsChannelData deserialization in TelemetryLoggerMiddleware * Pinned emoji package for proper recognizers-text operation * Corrected TelemetryLoggerMiddleware test for Teams * Formatted TelemetryLoggerMiddleware Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
1 parent 31d0ffe commit 43dd98e

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

‎libraries/botbuilder-core/botbuilder/core/telemetry_logger_middleware.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,12 @@ def __populate_additional_channel_properties(
303303
properties: dict,
304304
):
305305
if activity.channel_id == Channels.ms_teams:
306-
teams_channel_data: TeamsChannelData = activity.channel_data
306+
teams_channel_data: TeamsChannelData = TeamsChannelData().deserialize(
307+
activity.channel_data
308+
)
307309

308310
properties["TeamsTenantId"] = (
309-
teams_channel_data.tenant
311+
teams_channel_data.tenant.id
310312
if teams_channel_data and teams_channel_data.tenant
311313
else ""
312314
)

‎libraries/botbuilder-core/tests/test_telemetry_middleware.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ async def test_log_teams(self):
251251
channel_data = TeamsChannelData(
252252
team=team_info,
253253
tenant=TenantInfo(id="tenantId"),
254-
)
254+
).serialize()
255255

256256
activity = MessageFactory.text("te 8000 st")
257257
activity.channel_data = channel_data
@@ -272,7 +272,7 @@ async def test_log_teams(self):
272272
"fromId": "userId",
273273
"recipientId": "bot",
274274
"recipientName": "Bot",
275-
"TeamsTenantId": TenantInfo(id="tenantId"),
275+
"TeamsTenantId": "tenantId",
276276
"TeamsUserAadObjectId": "aaId",
277277
"TeamsTeamInfo": TeamInfo.serialize(team_info),
278278
},

‎libraries/botbuilder-dialogs/setup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
REQUIRES = [
88
"regex<=2019.08.19",
9+
"emoji==1.7.0",
910
"recognizers-text-date-time>=1.0.2a1",
1011
"recognizers-text-number-with-unit>=1.0.2a1",
1112
"recognizers-text-number>=1.0.2a1",

0 commit comments

Comments
 (0)
0