TeLLMgramBot 3.2.0__tar.gz → 3.2.1__tar.gz

{tellmgrambot-3.2.0 → tellmgrambot-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 3.2.0
+Version: 3.2.1
 Summary: LLM-powered Telegram bot (OpenAI + Anthropic)
 Home-page: https://github.com/Digital-Heresy/TeLLMgramBot
 Author: Digital Heresy

{tellmgrambot-3.2.0 → tellmgrambot-3.2.1}/TeLLMgramBot/TeLLMgramBot.py

@@ -135,8 +135,8 @@ class TelegramBot:
         users keep sensitive private exchanges out of shared group contexts.
 
         Usage:
-            /private       — toggles private mode on (if off) or off (if on)
-            /private off   — explicitly disables private mode
+            /private       — enables private mode (idempotent if already on)
+            /private off   — disables private mode and purges in-session private messages
 
         Only available in private chats; sending the command in a group returns an error.
         """
@@ -150,10 +150,10 @@ class TelegramBot:
             return
 
         user_id = user.id
+        chat_id = chat.id
         args = (msg.text or "").strip().split()
         force_off = len(args) > 1 and args[1].lower() == 'off'
-        current = await get_private_mode(user_id)
-        new_state = False if (force_off or current) else True
+        new_state = False if force_off else True
         await set_private_mode(user_id, new_state)
 
         if new_state:
@@ -162,6 +162,9 @@ class TelegramBot:
                 "from group conversation contexts. Use /private off to disable."
             )
         else:
+            # Purge in-session private messages so the bot cannot reference them after the toggle.
+            if chat_id in self.conversations:
+                self.conversations[chat_id].purge_private_messages()
             await msg.reply_text(
                 "Private mode is OFF. Future messages in this private chat will be included in group conversation contexts."
             )

{tellmgrambot-3.2.0 → tellmgrambot-3.2.1}/TeLLMgramBot/conversation.py

@@ -63,6 +63,11 @@ class Conversation:
         # before live messages) rather than at index 1 (before all existing history).
         self._history_end: dict[int, int] = {}
 
+        # Set of id()s for message dicts added while private mode was ON.
+        # Used by purge_private_messages() to remove them from self.messages without
+        # touching the database. Cleared on purge or clear_interaction().
+        self._private_message_ids: set[int] = set()
+
     def set_system_content(self, new_content: str):
         """
         Replace the system content (bot's personality prompt) in the conversation.
@@ -85,7 +90,10 @@ class Conversation:
             username: Telegram username (display only, may be None).
             is_private: If True, excludes this message from group context loading (used for /forget or private commands).
         """
-        self.messages.append({"role": "user", "content": content})
+        msg_dict = {"role": "user", "content": content}
+        self.messages.append(msg_dict)
+        if is_private:
+            self._private_message_ids.add(id(msg_dict))
         await insert_message(self.chat_id, user_id, username, "user", content, is_private)
 
     async def add_assistant_message(self, content: str, bot_user_id: int, bot_username: str | None, is_private: bool = False):
@@ -100,7 +108,10 @@ class Conversation:
                         the is_private flag of the user message it responds to, so that both
                         sides of a private-mode exchange are excluded from shared contexts.
         """
-        self.messages.append({"role": "assistant", "content": content})
+        msg_dict = {"role": "assistant", "content": content}
+        self.messages.append(msg_dict)
+        if is_private:
+            self._private_message_ids.add(id(msg_dict))
         await insert_message(self.chat_id, bot_user_id, bot_username, "assistant", content, is_private)
 
     async def get_message_token_count(self) -> int:
@@ -138,6 +149,23 @@ class Conversation:
         except Exception as e:
             log_error(e, f"{type(e).__name__} pruning under {token_limit} tokens for {self.chat_print}", self.error_log)
 
+    def purge_private_messages(self):
+        """
+        Remove all in-session private-mode messages from the in-memory conversation.
+
+        Strips any messages added while private mode was ON from self.messages without
+        modifying the database. Called when a user disables private mode (/private off)
+        so the bot can no longer reference messages sent during the private session.
+
+        Side Effects:
+            - Modifies self.messages in-place, removing tracked private message dicts.
+            - Clears self._private_message_ids.
+        """
+        if not self._private_message_ids:
+            return
+        self.messages = [m for m in self.messages if id(m) not in self._private_message_ids]
+        self._private_message_ids.clear()
+
     async def get_past_interaction(self, token_limit: int, user_id: int, bot_id: int | None = None) -> bool:
         """
         Load past conversation messages from the database up to a token limit.
@@ -231,7 +259,7 @@ class Conversation:
             label = "Full" if not token_limit_reached and not group_limit_reached else "Partial"
             group_note = f", plus {group_rows_inserted} group message(s)" if group_rows_inserted > 0 else ""
             print(
-                f"{label} context loaded for User {user_id} in {self.chat_print} — "
+                f"{label} context loaded for User {user_id} in {self.chat_print} - "
                 f"storing {token_count} token(s){group_note}"
             )
         else:
@@ -314,11 +342,13 @@ class Conversation:
             - Clears self.messages to contain only the system message (index 0).
             - Resets self._context_cursor to empty dict.
             - Resets self._history_end to empty dict.
+            - Resets self._private_message_ids to empty set.
             - Deletes all messages for this chat (private) or this user (group) from database.
         """
         self.messages = [self.messages[0]]
         self._context_cursor = {}
         self._history_end = {}
+        self._private_message_ids = set()
         if self.chat_type == 'private':
             await delete_messages_for_chat(self.chat_id)
         else:

{tellmgrambot-3.2.0 → tellmgrambot-3.2.1}/TeLLMgramBot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TeLLMgramBot
-Version: 3.2.0
+Version: 3.2.1
 Summary: LLM-powered Telegram bot (OpenAI + Anthropic)
 Home-page: https://github.com/Digital-Heresy/TeLLMgramBot
 Author: Digital Heresy

{tellmgrambot-3.2.0 → tellmgrambot-3.2.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='TeLLMgramBot',
-    version='3.2.0',
+    version='3.2.1',
     packages=find_packages(),
     license='MIT',
     author='Digital Heresy',