8000 fixing linting issues · yosshy/botbuilder-python@96f262d · GitHub
[go: up one dir, main page]
Skip to content

Commit 96f262d

Browse files
Virtual-JoshVirtual-Josh
committed
fixing linting issues
1 parent 21876ca commit 96f262d

File tree

13 files changed

+252
-180
lines changed

13 files changed

+252
-180
lines changed

‎libraries/botbuilder-core/botbuilder/core/Teams/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
from .teams_activity_handler import TeamsActivityHandler
99

10-
__all__ = ["TeamsActivityHandler"]
10+
__all__ = ["TeamsActivityHandler"]

‎libraries/botbuilder-core/botbuilder/core/Teams/teams_activity_handler.py

Lines changed: 109 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License.
33

4-
from typing import List
5-
6-
from botbuilder.schema import ActivityTypes, ChannelAccount, MessageReaction
4+
from http import HTTPStatus
5+
from botbuilder.schema import ActivityTypes, ChannelAccount
76
from botbuilder.core.turn_context import TurnContext
8-
from botbuilder.core import ActivityHandler, MessageFactory
9-
from botbuilder.schema.teams import TeamInfo, ChannelInfo, TeamsChannelData, TenantInfo, TeamsChannelAccount
7+
from botbuilder.core import ActivityHandler, MessageFactory, InvokeResponse
8+
from botbuilder.schema.teams import (
9+
TeamInfo,
10+
ChannelInfo,
11+
TeamsChannelData,
12+
TeamsChannelAccount,
13+
)
1014
from botframework.connector import Channels
11-
from http import HTTPStatus
12-
from botbuilder.core import InvokeResponse
13-
14-
from pprint import pprint
15-
import jsonpickle
1615

1716
class TeamsActivityHandler(ActivityHandler):
1817
async def on_turn(self, turn_context: TurnContext):
1918
if turn_context is None:
2019
raise TypeError("ActivityHandler.on_turn(): turn_context cannot be None.")
2120

22-
2321
if hasattr(turn_context, "activity") and turn_context.activity is None:
2422
raise TypeError(
2523
"ActivityHandler.on_turn(): turn_context must have a non-None activity."
@@ -34,52 +32,74 @@ async def on_turn(self, turn_context: TurnContext):
3432
)
3533

3634
if turn_context.activity.type == ActivityTypes.invoke:
37-
A93C invokeResponse = await on_invoke_activity(turn_context)
35+
invoke_response = await self.on_invoke_activity(turn_context)
3836
else:
3937
await super().on_turn(turn_context)
40-
4138

42-
async def on_invoke_activity(turn_context: TurnContext):
39+
async def on_invoke_activity(self, turn_context: TurnContext):
4340
try:
44-
if turn_context.activity.name == None and turn_context.activity.channel_id == Channels.Msteams:
45-
return #await on_teams_card_action_invoke_activity(turn_context)
46-
else:
47-
turn_context.send_activity(MessageFactory.text("working"))
41+
if (
42+
turn_context.activity.name is None
43+
and turn_context.activity.channel_id == Channels.Msteams
44+
):
45+
return # await on_teams_card_action_invoke_activity(turn_context)
46+
47+
turn_context.send_activity(MessageFactory.text("working"))
4848
except:
4949
return
50-
50+
5151
async def on_conversation_update_activity(self, turn_context: TurnContext):
52-
print(turn_context.activity)
5352
if turn_context.activity.channel_id == Channels.ms_teams:
5453
channel_data = TeamsChannelData(**turn_context.activity.channel_data)
5554

56-
if turn_context.activity.members_added != None:
57-
return await self.on_teams_members_added_dispatch_activity(turn_context.activity.members_added, channel_data.team, turn_context)
55+
if turn_context.activity.members_added is not None:
56+
return await self.on_teams_members_added_dispatch_activity(
57+
turn_context.activity.members_added, channel_data.team, turn_context
58+
)
59+
60+
if turn_context.activity.members_removed is not None:
61+
return await self.on_teams_members_removed_dispatch_activity(
62+
turn_context.activity.members_removed,
63+
channel_data.team,
64+
turn_context,
65+
)
5866

59-
if turn_context.activity.members_removed != None:
60-
return await self.on_teams_members_removed_dispatch_activity(turn_context.activity.members_removed, channel_data.team, turn_context)
61-
62-
if channel_data != None:
67+
if channel_data is not None:
6368
if channel_data.event_type == "channelCreated":
64-
return await self.on_teams_channel_created_activity(channel_data.channel, channel_data.team, turn_context)
65-
elif channel_data.event_type == "channelDeleted":
66-
return await self.on_teams_channel_deleted_activity(channel_data.channel, channel_data.team, turn_context)
67-
elif channel_data.event_type == "channelRenamed":
68-
return await self.on_teams_channel_renamed_activity(channel_data.channel, channel_data.team, turn_context)
69-
elif channel_data.event_type == "teamRenamed":
70-
return await self.on_teams_team_renamed_activity(channel_data.team, turn_context)
71-
else:
72-
return await super().on_conversation_update_activity(turn_context)
73-
69+
return await self.on_teams_channel_created_activity(
70+
channel_data.channel, channel_data.team, turn_context
71+
)
72+
if channel_data.event_type == "channelDeleted":
73+
return await self.on_teams_channel_deleted_activity(
74+
channel_data.channel, channel_data.team, turn_context
75+
)
76+
if channel_data.event_type == "channelRenamed":
77+
return await self.on_teams_channel_renamed_activity(
78+
channel_data.channel, channel_data.team, turn_context)
79+
if channel_data.event_type == "teamRenamed":
80+
return await self.on_teams_team_renamed_activity(
81+
channel_data.team, turn_context
82+
)
83+
return await super().on_conversation_update_activity(turn_context)
84+
7485
return await super().on_conversation_update_activity(turn_context)
75-
76-
async def on_teams_channel_created_activity(self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext):
86+
87+
async def on_teams_channel_created_activity( # pylint: disable=unused-argument
88+
self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
89+
):
7790
return
78-
79-
async def on_teams_team_renamed_activity(self, team_info: TeamInfo, turn_context: TurnContext):
91+
92+
async def on_teams_team_renamed_activity( # pylint: disable=unused-argument
93+
self, team_info: TeamInfo, turn_context: TurnContext
94+
):
8095
return
8196

82-
async def on_teams_members_added_dispatch_activity(self, members_added: [ChannelAccount], team_info: TeamInfo, turn_context: TurnContext):
97+
async def on_teams_members_added_dispatch_activity( # pylint: disable=unused-argument
98+
self,
99+
members_added: [ChannelAccount],
100+
team_info: TeamInfo,
101+
turn_context: TurnContext,
102+
):
83103
"""
84104
team_members = {}
85105
team_members_added = []
@@ -90,64 +110,79 @@ async def on_teams_members_added_dispatch_activity(self, members_added: [Channel
90110
if team_members == {}:
91111
result = await TeamsInfo.get_members_async(turn_context)
92112
team_members = { i.id : i for i in result }
93-
113+
94114
if member.id in team_members:
95115
team_members_added.append(member)
96116
else:
97117
newTeamsChannelAccount = TeamsChannelAccount(
98-
id=member.id,
99-
name = member.name,
118+
id=member.id,
119+
name = member.name,
100120
aad_object_id = member.aad_object_id,
101121
role = member.role
102122
)
103123
team_members_added.append(newTeamsChannelAccount)
104-
124+
105125
return await self.on_teams_members_added_activity(teams_members_added, team_info, turn_context)
106126
"""
107127
for member in members_added:
108-
newAccountJson = member.__dict__
109-
del newAccountJson["additional_properties"]
110-
member = TeamsChannelAccount(**newAccountJson)
128+
new_account_json = member.__dict__
129+
del new_account_json["additional_properties"]
130+
member = TeamsChannelAccount(**new_account_json)
111131
return await self.on_teams_members_added_activity(members_added, turn_context)
112132

113-
async def on_teams_members_added_activity(self, teams_members_added: [TeamsChannelAccount], turn_context: TurnContext):
133+
async def on_teams_members_added_activity(
134+
self, teams_members_added: [TeamsChannelAccount], turn_context: TurnContext
135+
):
114136
for member in teams_members_added:
115137
member = ChannelAccount(member)
116-
return super().on_members_added_activity(members_added, turn_context)
117-
118-
async def on_teams_members_removed_dispatch_activity(self, members_removed: List, team_info: TeamInfo, turn_context: TurnContext):
138+
return super().on_members_added_activity(teams_members_added, turn_context)
139+
140+
async def on_teams_members_removed_dispatch_activity( # pylint: disable=unused-argument
141+
self,
142+
members_removed: [ChannelAccount],
143+
team_info: TeamInfo,
144+
turn_context: TurnContext,
145+
):
119146
teams_members_removed = []
120147
for member in members_removed:
121-
newAccountJson = member.__dict__
122-
del newAccountJson["additional_properties"]
123-
teams_members_removed.append(TeamsChannelAccount(**newAccountJson))
124-
125-
return await self.on_teams_members_removed_activity(teams_members_removed, turn_context)
126-
127-
async def on_teams_members_removed_activity(self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext):
128-
members_removed = [ ChannelAccount(i) for i in teams_members_removed ]
148+
new_account_json = member.__dict__
149+
del new_account_json["additional_properties"]
150+
teams_members_removed.append(TeamsChannelAccount(**new_account_json))
151+
152+
return await self.on_teams_members_removed_activity(
153+
teams_members_removed, turn_context
154+
)
155+
156+
async def on_teams_members_removed_activity(
157+
self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext
158+
):
159+
members_removed = [ChannelAccount(i) for i in teams_members_removed]
129160
return super().on_members_removed_activity(members_removed, turn_context)
130161

131-
132-
162+
async def on_teams_channel_deleted_activity( # pylint: disable=unused-argument
163+
self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
164+
):
165+
return # Task.CompleteTask
133166

134-
async def on_teams_channel_deleted_activity(self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext):
135-
return #Task.CompleteTask
167+
async def on_teams_channel_renamed_activity( # pylint: disable=unused-argument
168+
self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
169+
):
170+
return # Task.CompleteTask
136171

137-
async def on_teams_channel_renamed_activity(self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext):
138-
return #Task.CompleteTask
139-
140-
async def on_teams_team_reanamed_async(self, teamInfo: TeamInfo, turn_context: TurnContext):
141-
return #Task.CompleteTask
172+
async def on_teams_team_reanamed_async( # pylint: disable=unused-argument
173+
self, team_info: TeamInfo, turn_context: TurnContext
174+
):
175+
return # Task.CompleteTask
142176

143177
@staticmethod
144178
def _create_invoke_response(body: object = None) -> InvokeResponse:
145-
return InvokeResponse(status = int(HTTPStatus.OK), body = body)
146-
179+
return InvokeResponse(status=int(HTTPStatus.OK), body=body)
180+
147181
class _InvokeResponseException(Exception):
148182
def __init__(self, status_code: HTTPStatus, body: object = None):
149-
self._statusCode = status_code
183+
super().__init__()
184+
self._status_code = status_code
150185
self._body = body
151186

152-
def create_invoke_response() -> InvokeResponse:
153-
return InvokeResponse(status= int(self._statusCode), body = self._body)
187+
def create_invoke_response(self) -> InvokeResponse:
188+
return InvokeResponse(status=int(self._status_code), body=self._body)

‎libraries/botbuilder-core/botbuilder/core/Teams/teams_info.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎libraries/botbuilder-core/tests/teams/conversation-update/app.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
from types import MethodType
88

99
from flask import Flask, request, Response
10-
from botbuilder.core import BotFrameworkAdapterSettings, TurnContext, BotFrameworkAdapter
10+
from botbuilder.core import (
11+
BotFrameworkAdapterSettings,
12+
TurnContext,
13+
BotFrameworkAdapter,
14+
)
1115
from botbuilder.schema import Activity, ActivityTypes
1216

1317
from bots import ConversationUpdateBot
@@ -24,29 +28,34 @@
2428

2529

2630
# Catch-all for errors.
27-
async def on_error(self, context: TurnContext, error: Exception):
31+
async def on_error( # pylint: disable=unused-argument
32+
self, context: TurnContext, error: Exception
33+
):
2834
# This check writes out errors to console log .vs. app insights.
2935
# NOTE: In production environment, you should consider logging this to Azure
3036
# application insights.
3137
print(f"\n [on_turn_error] unhandled error: {error}", file=sys.stderr)
3238

3339
# Send a message to the user
3440
await context.send_activity("The bot encountered an error or bug.")
35-
await context.send_activity("To continue to run this bot, please fix the bot source code.")
41+
await context.send_activity(
42+
"To continue to run this bot, please fix the bot source code."
43+
)
3644
# Send a trace activity if we're talking to the Bot Framework Emulator
37-
if context.activity.channel_id == 'emulator':
45+
if context.activity.channel_id == "emulator":
3846
# Create a trace activity that contains the error object
3947
trace_activity = Activity(
4048
label="TurnError",
4149
name="on_turn_error Trace",
4250
timestamp=datetime.utcnow(),
4351
type=ActivityTypes.trace,
4452
value=f"{error}",
45-
value_type="https://www.botframework.com/schemas/error"
53+
value_type="https://www.botframework.com/schemas/error",
4654
)
4755
# Send a trace activity, which will be displayed in Bot Framework Emulator
4856
await context.send_activity(trace_activity)
4957

58+
5059
ADAPTER.on_turn_error = MethodType(on_error, ADAPTER)
5160

5261
# Create the Bot

0 commit comments

Comments
 (0)
0