DiscordBotLinuxMonitor 1.6.2__tar.gz → 1.6.4__tar.gz

{discordbotlinuxmonitor-1.6.2 → discordbotlinuxmonitor-1.6.4}/DiscordBotLinuxMonitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DiscordBotLinuxMonitor
-Version: 1.6.2
+Version: 1.6.4
 Summary: From discord channels: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz
@@ -98,6 +98,8 @@ Displayed infos are not the same if you do the command in private or public chan
 
  - `/list_commands`: 📋 List all available commands 📋
 
+ - `/version`: 🤖 Show current bot version 🤖
+
  - `/execute_command {command_name} [parameters]`: 🚀 Execute a command (optional parameters, only for commands with `accept_parameters` or a `{arg1}`/`{args}` placeholder) 🚀
 
  - `/execute_all_commands`: 🚀 Execute all commands 🚀

{discordbotlinuxmonitor-1.6.2 → discordbotlinuxmonitor-1.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DiscordBotLinuxMonitor
-Version: 1.6.2
+Version: 1.6.4
 Summary: From discord channels: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Discord-Bot-Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz
@@ -98,6 +98,8 @@ Displayed infos are not the same if you do the command in private or public chan
 
  - `/list_commands`: 📋 List all available commands 📋
 
+ - `/version`: 🤖 Show current bot version 🤖
+
  - `/execute_command {command_name} [parameters]`: 🚀 Execute a command (optional parameters, only for commands with `accept_parameters` or a `{arg1}`/`{args}` placeholder) 🚀
 
  - `/execute_all_commands`: 🚀 Execute all commands 🚀

{discordbotlinuxmonitor-1.6.2 → discordbotlinuxmonitor-1.6.4}/README.md

@@ -56,6 +56,8 @@ Displayed infos are not the same if you do the command in private or public chan
 
  - `/list_commands`: 📋 List all available commands 📋
 
+ - `/version`: 🤖 Show current bot version 🤖
+
  - `/execute_command {command_name} [parameters]`: 🚀 Execute a command (optional parameters, only for commands with `accept_parameters` or a `{arg1}`/`{args}` placeholder) 🚀
 
  - `/execute_all_commands`: 🚀 Execute all commands 🚀

{discordbotlinuxmonitor-1.6.2 → discordbotlinuxmonitor-1.6.4}/discordbotlinuxmonitor/__main__.py

@@ -54,6 +54,10 @@ def main() -> None:
     async def force_sync(interaction: discord.Interaction) -> None: # type: ignore
         await discord_bot_linux_monitor.force_sync(interaction)
 
+    @discord_bot.tree.command(name="version", description="🤖 Show bot version 🤖")
+    async def version(interaction: discord.Interaction) -> None: # type: ignore
+        await discord_bot_linux_monitor.version(interaction)
+
     @discord_bot.tree.command(name="usage", description="📊 View disk space, CPU, RAM, ... 📊")
     async def usage(interaction: discord.Interaction) -> None: # type: ignore
         await discord_bot_linux_monitor.usage(interaction)

{discordbotlinuxmonitor-1.6.2 → discordbotlinuxmonitor-1.6.4}/discordbotlinuxmonitor/discordbotlinuxmonitor.py

@@ -33,7 +33,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2026)"
 __python_version__ = "3.+"
-__version__ = "1.6.2 (2026/08/24)"
+__version__ = "1.6.4 (2026/08/24)"
 __status__ = "Usable for any Linux project"
 
 # pyright: reportMissingTypeStubs=false
@@ -286,6 +286,9 @@ class DiscordBotLinuxMonitor:
             logging.exception(msg=out_msg)
             return out_msg
 
+    def _welcome_message_with_version(self, welcome_message: str) -> str:
+        return f"{welcome_message}\n\n🤖 Bot version: {__version__}"
+
     def _get_rate_limit_wait_seconds(self, error: discord.HTTPException, fallback_seconds: float = 1.5) -> float:
         retry_after = getattr(error, "retry_after", None)
         if isinstance(retry_after, (int, float)) and retry_after > 0:
@@ -306,10 +309,33 @@ class DiscordBotLinuxMonitor:
 
         return fallback_seconds
 
+    def _format_duration(self, total_seconds: float) -> str:
+        seconds: int = max(0, int(total_seconds))
+
+        days, remainder = divmod(seconds, 86400)
+        hours, remainder = divmod(remainder, 3600)
+        minutes, secs = divmod(remainder, 60)
+
+        parts: List[str] = []
+        if days > 0:
+            parts.append(f"{days}d")
+        if hours > 0:
+            parts.append(f"{hours}h")
+        if minutes > 0:
+            parts.append(f"{minutes}m")
+        if secs > 0 or len(parts) == 0:
+            parts.append(f"{secs}s")
+
+        return " ".join(parts)
+
     async def _delete_message_with_rate_limit_retry(self, message: discord.Message, reason: str, max_retries: int = 10, on_rate_limit: Optional[Callable[[], None]] = None) -> None:
         for attempt in range(max_retries + 1):
             try:
-                await message.delete(reason=reason)
+                try:
+                    await message.delete(reason=reason)
+                except TypeError:
+                    # Some discord.py objects (e.g. PartialMessage) do not accept `reason`.
+                    await message.delete()
                 return
             except discord.NotFound:
                 return
@@ -330,7 +356,11 @@ class DiscordBotLinuxMonitor:
         for attempt in range(max_retries + 1):
             try:
                 if len(messages) == 1:
-                    await messages[0].delete(reason=reason)
+                    try:
+                        await messages[0].delete(reason=reason)
+                    except TypeError:
+                        # Some discord.py objects (e.g. PartialMessage) do not accept `reason`.
+                        await messages[0].delete()
                 else:
                     await channel.delete_messages(messages, reason=reason)
                 return
@@ -370,20 +400,20 @@ class DiscordBotLinuxMonitor:
                         logging.info(msg="Found the public channel, it will be possible to do public commands.")
                         public_channel_cmd_ready = True
                         if self.welcome_message_for_public_commands != "":
-                            await self._channel_send_no_limit(channel=channel, msg=self.welcome_message_for_public_commands)
+                            await self._channel_send_no_limit(channel=channel, msg=self._welcome_message_with_version(self.welcome_message_for_public_commands))
 
                     if self.channel_name_for_private_commands != "" and channel.name == self.channel_name_for_private_commands:
                         logging.info(msg="Found the private channel, it will be possible to do private commands.")
                         private_channel_cmd_ready = True
                         if self.welcome_message_for_private_commands != "":
-                            await self._channel_send_no_limit(channel=channel, msg=self.welcome_message_for_private_commands)
+                            await self._channel_send_no_limit(channel=channel, msg=self._welcome_message_with_version(self.welcome_message_for_private_commands))
 
                     if self.channel_name_for_public_error_tasks != "" and channel.name == self.channel_name_for_public_error_tasks:
                         logging.info(msg="Found the public channel for error task, it will be possible to show public status issues if found periodically.")
                         public_channel_error_task_ready = True
 
                         if self.welcome_message_for_public_error_tasks != "":
-                            await self._channel_send_no_limit(channel=channel, msg=self.welcome_message_for_public_error_tasks)
+                            await self._channel_send_no_limit(channel=channel, msg=self._welcome_message_with_version(self.welcome_message_for_public_error_tasks))
 
                         logging.info(msg=f"Activating automatic public follow and public service restart if down with '{self.bot.user}' and guild '{guild.name}' (id: '{guild.id}') on channel '{channel.name}' (id '{channel.id}').")
                         public_channel_for_error_task: discord.TextChannel = channel
@@ -397,7 +427,7 @@ class DiscordBotLinuxMonitor:
                         public_channel_info_task_ready = True
 
                         if self.welcome_message_for_public_infos_tasks != "":
-                            await self._channel_send_no_limit(channel=channel, msg=self.welcome_message_for_public_infos_tasks)
+                            await self._channel_send_no_limit(channel=channel, msg=self._welcome_message_with_version(self.welcome_message_for_public_infos_tasks))
 
                         logging.info(msg=f"Activating automatic public follow info with '{self.bot.user}' and guild '{guild.name}' (id: '{guild.id}') on channel '{channel.name}' (id '{channel.id}').")
                         public_channel_for_info_task: discord.TextChannel = channel
@@ -411,7 +441,7 @@ class DiscordBotLinuxMonitor:
                         private_channel_error_task_ready = True
 
                         if self.welcome_message_for_private_error_tasks != "":
-                            await self._channel_send_no_limit(channel=channel, msg=self.welcome_message_for_private_error_tasks)
+                            await self._channel_send_no_limit(channel=channel, msg=self._welcome_message_with_version(self.welcome_message_for_private_error_tasks))
 
                         logging.info(msg=f"Activating automatic private follow and public service restart if down with '{self.bot.user}' and guild '{guild.name}' (id: '{guild.id}') on channel '{channel.name}' (id '{channel.id}').")
                         private_channel_for_error_task: discord.TextChannel = channel
@@ -425,7 +455,7 @@ class DiscordBotLinuxMonitor:
                         private_channel_info_task_ready = True
 
                         if self.welcome_message_for_private_infos_tasks != "":
-                            await self._channel_send_no_limit(channel=channel, msg=self.welcome_message_for_private_infos_tasks)
+                            await self._channel_send_no_limit(channel=channel, msg=self._welcome_message_with_version(self.welcome_message_for_private_infos_tasks))
 
                         logging.info(msg=f"Activating automatic private follow info with '{self.bot.user}' and guild '{guild.name}' (id: '{guild.id}') on channel '{channel.name}' (id '{channel.id}').")
                         private_channel_for_info_task: discord.TextChannel = channel
@@ -486,6 +516,18 @@ class DiscordBotLinuxMonitor:
         # Respond to the user
         await self._interaction_followup_send_no_limit(interaction=interaction, msg=out_msg)
 
+    async def version(self, interaction: discord.Interaction) -> None:
+        if not self._check_if_valid_guild(guild=interaction.guild):
+            return
+        if not (await self._is_bot_channel_interaction(interaction=interaction, send_message_if_not_bot=True)):
+            return
+
+        out_msg: str = (
+            f"🤖 Bot version: {__version__}\n"
+            f"🐍 Python compatibility: {__python_version__}"
+        )
+        await interaction.response.send_message(content=out_msg, ephemeral=True)
+
     async def usage(self, interaction: discord.Interaction) -> None:
         if not self._check_if_valid_guild(guild=interaction.guild):
             return
@@ -880,6 +922,10 @@ class DiscordBotLinuxMonitor:
         started_monotonic: float = asyncio.get_running_loop().time()
         last_progress_monotonic: float = started_monotonic
         last_reported_deleted_count: int = 0
+        heartbeat_frames: List[str] = ["|", "/", "-", "\\"]
+        heartbeat_index: int = 0
+        heartbeat_stop_event = asyncio.Event()
+        heartbeat_task: Optional[asyncio.Task] = None
 
         def _on_rate_limit_hit() -> None:
             nonlocal rate_limit_retries
@@ -888,6 +934,7 @@ class DiscordBotLinuxMonitor:
         async def _update_progress(force: bool = False) -> None:
             nonlocal last_progress_monotonic
             nonlocal last_reported_deleted_count
+            nonlocal heartbeat_index
 
             now = asyncio.get_running_loop().time()
             should_update = force
@@ -899,12 +946,17 @@ class DiscordBotLinuxMonitor:
             if not should_update:
                 return
 
-            elapsed_seconds = int(now - started_monotonic)
+            elapsed_duration = self._format_duration(now - started_monotonic)
+            last_update = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            heartbeat_frame = heartbeat_frames[heartbeat_index % len(heartbeat_frames)]
+            heartbeat_index += 1
             progress_msg = (
                 f"🧹 Cleaning channel '{channel.name}'...\n"
-                f"Deleted messages: {deleted_count}\n"
-                f"Rate-limit waits: {rate_limit_retries}\n"
-                f"Elapsed: {elapsed_seconds}s"
+                f" - Status: {heartbeat_frame} Working...\n"
+                f" - Deleted messages: {deleted_count}\n"
+                f" - Rate-limit waits: {rate_limit_retries}\n"
+                f" - Elapsed: {elapsed_duration}\n"
+                f" - Last update: {last_update}"
             )
 
             try:
@@ -919,8 +971,16 @@ class DiscordBotLinuxMonitor:
                 else:
                     logging.warning(msg=f"Failed to update cleanup progress message: {e}")
 
+        async def _heartbeat_loop() -> None:
+            while not heartbeat_stop_event.is_set():
+                await asyncio.sleep(5)
+                if heartbeat_stop_event.is_set():
+                    return
+                await _update_progress(force=True)
+
         try:
             await _update_progress(force=True)
+            heartbeat_task = asyncio.create_task(_heartbeat_loop())
             recent_batch: List[discord.Message] = []
 
             async for message in channel.history(limit=None, oldest_first=False):
@@ -943,12 +1003,15 @@ class DiscordBotLinuxMonitor:
                 deleted_count += len(recent_batch)
                 await _update_progress()
 
-            elapsed_seconds = int(asyncio.get_running_loop().time() - started_monotonic)
+            elapsed_duration = self._format_duration(asyncio.get_running_loop().time() - started_monotonic)
+            last_update = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             out_msg = (
                 f"✅ Cleared channel '{channel.name}'.\n"
-                f"Deleted messages: {deleted_count}\n"
-                f"Rate-limit waits: {rate_limit_retries}\n"
-                f"Elapsed: {elapsed_seconds}s"
+                f" - Status: Completed\n"
+                f" - Deleted messages: {deleted_count}\n"
+                f" - Rate-limit waits: {rate_limit_retries}\n"
+                f" - Elapsed: {elapsed_duration}\n"
+                f" - Last update: {last_update}"
             )
             await interaction.edit_original_response(content=out_msg)
         except discord.HTTPException as e:
@@ -961,6 +1024,14 @@ class DiscordBotLinuxMonitor:
             out_msg = f"**Internal error while clearing messages in channel '{channel.name}'**:\n```sh\n{e}\n```"
             logging.exception(msg=out_msg)
             await interaction.edit_original_response(content=out_msg)
+        finally:
+            heartbeat_stop_event.set()
+            if heartbeat_task is not None and not heartbeat_task.done():
+                heartbeat_task.cancel()
+                try:
+                    await heartbeat_task
+                except asyncio.CancelledError:
+                    pass
 
     async def list_commands(self, interaction: discord.Interaction) -> None:
         if not self._check_if_valid_guild(guild=interaction.guild):

{discordbotlinuxmonitor-1.6.2 → discordbotlinuxmonitor-1.6.4}/setup.py

@@ -6,7 +6,7 @@ with io.open(file='README.md', mode='r', encoding='utf-8') as readme_file:
 
 setup(
     name="DiscordBotLinuxMonitor",
-    version="1.6.2",
+    version="1.6.4",
     description="From discord channels: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)",
     long_description=readme,
     long_description_content_type="text/markdown",