kenneth/Auto-Trader
1
0 Fork 0
Code Issues Pull Requests Actions 16 Packages Projects Releases Wiki Activity

fix(channels): stdlib logging placeholders in discord

Browse Source 
Convert 25 loguru-style "{}" format strings passed to self.logger (a
stdlib logging.Logger from BaseChannel) to %-style lazy formatting
with args present the old form raised TypeError inside handler
formatting - the message was lost and a logging-error traceback went
to stderr instead.

Verified: placeholder count == argument count at every converted site
(AST-checked), zero "{}" logger calls remain in the file, every diff
line is a pure placeholder conversion, and the full backend suite is
green (13809 passed).

Part of #1531.

Signed-off-by: shadowinlife <shadowinlife@gmail.com>
This commit is contained in:
shadowinlife committed 2026-09-21 16:46:47 +08:00
1 parent 61d5fe7625
commit 58df75d2a5
1 file changed
+25 -25
Download Patch File Download Diff File Expand all files Collapse all files
agent/src/channels/discord.py
+25 -25
View File
@@ -85,12 +85,12 @@ if DISCORD_AVAILABLE:
async def on_ready(self) -> None:
self._channel._bot_user_id = str(self.user.id) if self.user else None
self._channel.logger.info("bot connected as user {}", self._channel._bot_user_id)
self._channel.logger.info("bot connected as user %s", self._channel._bot_user_id)
try:
synced = await self.tree.sync()
self._channel.logger.info("app commands synced: {}", len(synced))
self._channel.logger.info("app commands synced: %s", len(synced))
except Exception as e:
self._channel.logger.warning("app command sync failed: {}", e)
self._channel.logger.warning("app command sync failed: %s", e)
async def on_message(self, message: discord.Message) -> None:
await self._channel._handle_discord_message(message)
@@ -110,7 +110,7 @@ if DISCORD_AVAILABLE:
await interaction.response.send_message(text, ephemeral=True)
return True
except Exception as e:
self._channel.logger.warning("interaction response failed: {}", e)
self._channel.logger.warning("interaction response failed: %s", e)
return False
async def _resolve_interaction_channel(
@@ -125,7 +125,7 @@ if DISCORD_AVAILABLE:
try:
channel = await self.fetch_channel(channel_id)
except Exception as e:
self._channel.logger.warning("interaction channel {} unavailable: {}", channel_id, e)
self._channel.logger.warning("interaction channel %s unavailable: %s", channel_id, e)
return None
self._channel._remember_channel(channel)
return channel
@@ -153,7 +153,7 @@ if DISCORD_AVAILABLE:
channel_id = interaction.channel_id
if channel_id is None:
self._channel.logger.warning("slash command missing channel_id: {}", command_text)
self._channel.logger.warning("slash command missing channel_id: %s", command_text)
return
if not self._channel.is_allowed(sender_id):
@@ -236,7 +236,7 @@ if DISCORD_AVAILABLE:
) -> None:
command_name = interaction.command.qualified_name if interaction.command else "?"
self._channel.logger.warning(
"app command failed user={} channel={} cmd={} error={}",
"app command failed user=%s channel=%s cmd=%s error=%s",
interaction.user.id,
interaction.channel_id,
command_name,
@@ -252,7 +252,7 @@ if DISCORD_AVAILABLE:
try:
channel = await self.fetch_channel(channel_id)
except Exception as e:
self._channel.logger.warning("channel {} unavailable: {}", msg.chat_id, e)
self._channel.logger.warning("channel %s unavailable: %s", msg.chat_id, e)
return
reference, mention_settings = self._build_reply_context(channel, msg.reply_to)
@@ -290,11 +290,11 @@ if DISCORD_AVAILABLE:
"""Send a file attachment via discord.py."""
path = Path(file_path)
if not path.is_file():
self._channel.logger.warning("file not found, skipping: {}", file_path)
self._channel.logger.warning("file not found, skipping: %s", file_path)
return False
if path.stat().st_size > MAX_ATTACHMENT_BYTES:
self._channel.logger.warning("file too large (>20MB), skipping: {}", path.name)
self._channel.logger.warning("file too large (>20MB), skipping: %s", path.name)
return False
try:
@@ -303,10 +303,10 @@ if DISCORD_AVAILABLE:
kwargs["reference"] = reference
kwargs["allowed_mentions"] = mention_settings
await channel.send(**kwargs)
self._channel.logger.info("file sent: {}", path.name)
self._channel.logger.info("file sent: %s", path.name)
return True
except Exception:
self._channel.logger.exception("Error sending file {}", path.name)
self._channel.logger.exception("Error sending file %s", path.name)
return False
@staticmethod
@@ -330,7 +330,7 @@ if DISCORD_AVAILABLE:
try:
message_id = int(reply_to)
except ValueError:
self._channel.logger.warning("Invalid reply target: {}", reply_to)
self._channel.logger.warning("Invalid reply target: %s", reply_to)
return None, mention_settings
return channel.get_partial_message(message_id), mention_settings
@@ -506,7 +506,7 @@ class DiscordChannel(BaseChannel):
target = await self._resolve_channel(chat_id)
if target is None:
self.logger.warning("stream target {} unavailable", chat_id)
self.logger.warning("stream target %s unavailable", chat_id)
return
now = time.monotonic()
@@ -515,7 +515,7 @@ class DiscordChannel(BaseChannel):
buf.message = await target.send(content=buf.text)
buf.last_edit = now
except Exception as e:
self.logger.warning("stream initial send failed: {}", e)
self.logger.warning("stream initial send failed: %s", e)
raise
return
@@ -526,7 +526,7 @@ class DiscordChannel(BaseChannel):
await buf.message.edit(content=DiscordBotClient._build_chunks(buf.text, [], False)[0])
buf.last_edit = now
except Exception as e:
self.logger.warning("stream edit failed: {}", e)
self.logger.warning("stream edit failed: %s", e)
raise
async def _handle_discord_message(self, message: discord.Message) -> None:
@@ -569,7 +569,7 @@ class DiscordChannel(BaseChannel):
await message.add_reaction(self.config.read_receipt_emoji)
self._pending_reactions[channel_id] = message
except Exception as e:
self.logger.debug("Failed to add read receipt reaction: {}", e)
self.logger.debug("Failed to add read receipt reaction: %s", e)
# Delayed working indicator (cosmetic — not tied to subagent lifecycle)
async def _delayed_working_emoji() -> None:
@@ -613,7 +613,7 @@ class DiscordChannel(BaseChannel):
try:
return await client.fetch_channel(channel_id)
except Exception as e:
self.logger.warning("channel {} unavailable: {}", chat_id, e)
self.logger.warning("channel %s unavailable: %s", chat_id, e)
return None
async def _finalize_stream(self, chat_id: str, buf: _StreamBuf) -> None:
@@ -626,12 +626,12 @@ class DiscordChannel(BaseChannel):
try:
await buf.message.edit(content=chunks[0])
except Exception as e:
self.logger.warning("final stream edit failed: {}", e)
self.logger.warning("final stream edit failed: %s", e)
raise
target = getattr(buf.message, "channel", None) or await self._resolve_channel(chat_id)
if target is None:
self.logger.warning("stream follow-up target {} unavailable", chat_id)
self.logger.warning("stream follow-up target %s unavailable", chat_id)
self._stream_bufs.pop(chat_id, None)
return
@@ -683,7 +683,7 @@ class DiscordChannel(BaseChannel):
media_paths.append(str(file_path))
markers.append(f"[attachment: {file_path.name}]")
except Exception as e:
self.logger.warning("Failed to download attachment: {}", e)
self.logger.warning("Failed to download attachment: %s", e)
markers.append(f"[attachment: {filename} - download failed]")
return media_paths, markers
@@ -726,7 +726,7 @@ class DiscordChannel(BaseChannel):
bot_user_id = str(self._client.user.id)
if bot_user_id is None:
self.logger.debug(
"message in {} ignored (bot identity unavailable)", message.channel.id
"message in %s ignored (bot identity unavailable)", message.channel.id
)
return False
@@ -739,7 +739,7 @@ class DiscordChannel(BaseChannel):
if self._references_bot_message(message, bot_user_id):
return True
self.logger.debug("message in {} ignored (bot not mentioned)", message.channel.id)
self.logger.debug("message in %s ignored (bot not mentioned)", message.channel.id)
return False
return True
@@ -769,7 +769,7 @@ class DiscordChannel(BaseChannel):
except asyncio.CancelledError:
return
except Exception as e:
self.logger.debug("typing indicator failed for {}: {}", channel_id, e)
self.logger.debug("typing indicator failed for %s: %s", channel_id, e)
return
self._typing_tasks[channel_id] = asyncio.create_task(typing_loop())
@@ -813,6 +813,6 @@ class DiscordChannel(BaseChannel):
try:
await self._client.close()
except Exception as e:
self.logger.warning("client close failed: {}", e)
self.logger.warning("client close failed: %s", e)
self._client = None
self._bot_user_id = None