Skip to content

Commit 3ff1416

Browse files
github-actionsgithub-actions
authored andcommitted
Format Python code with psf/black push
1 parent e760cbf commit 3ff1416

File tree

10 files changed

+163
-118
lines changed

10 files changed

+163
-118
lines changed

cogs/code_interpreter_service_cog.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,16 @@ async def on_message(self, message):
285285
)
286286
await message.reply(
287287
embed=response_embed,
288-
view=CodeInterpreterDownloadArtifactsView(
289-
message, self, self.sessions[message.channel.id], artifact_names
290-
)
291-
if artifacts_available
292-
else None,
288+
view=(
289+
CodeInterpreterDownloadArtifactsView(
290+
message,
291+
self,
292+
self.sessions[message.channel.id],
293+
artifact_names,
294+
)
295+
if artifacts_available
296+
else None
297+
),
293298
)
294299

295300
safe_remove_list(self.thread_awaiting_responses, message.channel.id)

cogs/moderations_service_cog.py

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,11 @@ async def start_moderations_service(self, guild_id, alert_channel_id=None):
191191
self.set_guild_moderated(guild_id)
192192
moderations_channel = await self.check_and_launch_moderations(
193193
guild_id,
194-
Moderation.moderation_alerts_channel
195-
if not alert_channel_id
196-
else alert_channel_id,
194+
(
195+
Moderation.moderation_alerts_channel
196+
if not alert_channel_id
197+
else alert_channel_id
198+
),
197199
)
198200
self.set_moderated_alert_channel(guild_id, moderations_channel.id)
199201

@@ -269,9 +271,11 @@ async def config_command(
269271
ephemeral=True,
270272
embed=await self.build_moderation_settings_embed(
271273
config_type,
272-
self.get_or_set_warn_set(ctx.guild_id)
273-
if config_type == "warn"
274-
else self.get_or_set_delete_set(ctx.guild_id),
274+
(
275+
self.get_or_set_warn_set(ctx.guild_id)
276+
if config_type == "warn"
277+
else self.get_or_set_delete_set(ctx.guild_id)
278+
),
275279
),
276280
)
277281
return
@@ -297,16 +301,20 @@ async def config_command(
297301

298302
new_delete_set = ThresholdSet(
299303
hate if hate else delete_set["hate"],
300-
hate_threatening
301-
if hate_threatening
302-
else delete_set["hate/threatening"],
304+
(
305+
hate_threatening
306+
if hate_threatening
307+
else delete_set["hate/threatening"]
308+
),
303309
self_harm if self_harm else delete_set["self-harm"],
304310
sexual if sexual else delete_set["sexual"],
305311
sexual_minors if sexual_minors else delete_set["sexual/minors"],
306312
violence if violence else delete_set["violence"],
307-
violence_graphic
308-
if violence_graphic
309-
else delete_set["violence/graphic"],
313+
(
314+
violence_graphic
315+
if violence_graphic
316+
else delete_set["violence/graphic"]
317+
),
310318
)
311319
self.set_delete_set(ctx.guild_id, new_delete_set)
312320
await self.restart_moderations_service(ctx)

cogs/search_service_cog.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@ async def paginate_embed(
276276
for count, chunk in enumerate(response_text, start=1):
277277
if not first:
278278
page = discord.Embed(
279-
title="Search Results"
280-
if not original_link
281-
else "Follow-up results",
279+
title=(
280+
"Search Results" if not original_link else "Follow-up results"
281+
),
282282
description=chunk,
283283
url=original_link,
284284
)

cogs/text_service_cog.py

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ def __init__(
198198
assert self.CONVERSATION_DRAWING_ABILITY_EXTRACTION_SNIPPET is not None
199199

200200
except Exception:
201-
self.CONVERSATION_STARTER_TEXT = (
202-
self.CONVERSATION_STARTER_TEXT_MINIMAL
203-
) = self.CONVERSATION_STARTER_TEXT_VISION = (
201+
self.CONVERSATION_STARTER_TEXT = self.CONVERSATION_STARTER_TEXT_MINIMAL = (
202+
self.CONVERSATION_STARTER_TEXT_VISION
203+
) = (
204204
"You are an artificial intelligence that is able to do anything, and answer any question,"
205205
"I want you to be my personal assistant and help me with some tasks. "
206206
"and I want you to make well-informed decisions using the data that you have been trained on, "
@@ -239,9 +239,9 @@ async def on_member_join(self, member):
239239
welcome_message_response = await self.model.send_request(
240240
query,
241241
tokens=self.usage_service.count_tokens(query),
242-
is_chatgpt_request=True
243-
if "turbo" in str(self.model.model)
244-
else False,
242+
is_chatgpt_request=(
243+
True if "turbo" in str(self.model.model) else False
244+
),
245245
)
246246
welcome_message = str(welcome_message_response["choices"][0]["text"])
247247
except Exception:
@@ -1401,10 +1401,16 @@ async def converse_command(
14011401
await TextService.encapsulated_send(
14021402
self,
14031403
target.id,
1404-
opener
1405-
if target.id not in self.conversation_threads or self.pinecone_service
1406-
else "".join(
1407-
[item.text for item in self.conversation_threads[target.id].history]
1404+
(
1405+
opener
1406+
if target.id not in self.conversation_threads
1407+
or self.pinecone_service
1408+
else "".join(
1409+
[
1410+
item.text
1411+
for item in self.conversation_threads[target.id].history
1412+
]
1413+
)
14081414
),
14091415
target_message,
14101416
overrides=overrides,
@@ -1594,9 +1600,11 @@ async def callback(self, interaction: discord.Interaction):
15941600
try:
15951601
id = await self.converser_cog.sharegpt_service.format_and_share(
15961602
self.converser_cog.full_conversation_history[self.conversation_id],
1597-
self.converser_cog.bot.user.default_avatar.url
1598-
if not self.converser_cog.bot.user.avatar
1599-
else self.converser_cog.bot.user.avatar.url,
1603+
(
1604+
self.converser_cog.bot.user.default_avatar.url
1605+
if not self.converser_cog.bot.user.avatar
1606+
else self.converser_cog.bot.user.avatar.url
1607+
),
16001608
)
16011609
url = f"https://shareg.pt/{id}"
16021610
await interaction.response.send_message(

cogs/translation_service_cog.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ def build_translation_embed(
2828
)
2929
embed.set_footer(
3030
text=f"Requested by {requestor.name}#{requestor.discriminator}",
31-
icon_url=requestor.avatar.url
32-
if requestor.avatar
33-
else requestor.default_avatar.url,
31+
icon_url=(
32+
requestor.avatar.url if requestor.avatar else requestor.default_avatar.url
33+
),
3434
)
3535

3636
return embed

models/index_model.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,10 +1688,12 @@ async def interaction_check(self, interaction: discord.Interaction) -> bool:
16881688
self.user_id,
16891689
indexes,
16901690
self.name,
1691-
False
1692-
if not self.deep_select.values
1693-
or self.deep_select.values[0] == "no"
1694-
else True,
1691+
(
1692+
False
1693+
if not self.deep_select.values
1694+
or self.deep_select.values[0] == "no"
1695+
else True
1696+
),
16951697
)
16961698
except ValueError as e:
16971699
await interaction.followup.send(

0 commit comments

Comments
 (0)