Merge pull request #13 from ionet-official/dev

deploy in main

Author: ilkhom19

app/message_processor.py

@@ -116,10 +116,17 @@ async def _generate_and_send_response(self, channel_id: int, user_message: Messa
             context_messages = context.get_context_messages()
             logger.debug(f"Retrieved {len(context_messages)} context messages for channel {channel_id}")
 
-            # Add system prompt
+            # Add system prompt with formatting instructions
+            formatting_instructions = ("\n\nIMPORTANT: Use only basic markdown formatting that works across platforms: "
+                                     "- Use *bold* for emphasis (single asterisks work on both platforms) "
+                                     "- Use `code` for inline code or technical terms "
+                                     "- Use bullet points with - or • for lists "
+                                     "- Use [text](url) for links "
+                                     "- Avoid complex formatting, special characters, or platform-specific syntax")
+            
             system_prompt = {
                 "role": "system",
-                "content": SYSTEM_PROMPT
+                "content": SYSTEM_PROMPT + formatting_instructions
             }
 
             messages = [system_prompt] + context_messages

app/telegram.py

@@ -1,7 +1,6 @@
 import asyncio
 import logging
 import time
-import re
 from telegram import Update
 from telegram.ext import Application, CommandHandler, MessageHandler, filters, ContextTypes
 
@@ -12,34 +11,6 @@
 logger = logging.getLogger(__name__)
 
 
-def convert_markdown_to_html(text):
-    """Convert Discord-style markdown to Telegram HTML"""
-    # Convert **bold** to <b>bold</b>
-    text = re.sub(r'\*\*(.*?)\*\*', r'<b>\1</b>', text)
-    
-    # Convert *italic* to <i>italic</i>
-    text = re.sub(r'\*(.*?)\*', r'<i>\1</i>', text)
-    
-    # Convert `code` to <code>code</code>
-    text = re.sub(r'`(.*?)`', r'<code>\1</code>', text)
-    
-    # Convert ```code block``` to <pre>code block</pre>
-    text = re.sub(r'```(.*?)```', r'<pre>\1</pre>', text, flags=re.DOTALL)
-    
-    # Escape HTML characters that aren't part of our tags
-    # We need to be careful not to escape our intentional HTML tags
-    text = text.replace('&', '&amp;')
-    text = text.replace('<', '&lt;').replace('>', '&gt;')
-    
-    # Restore our intentional HTML tags
-    text = text.replace('&lt;b&gt;', '<b>').replace('&lt;/b&gt;', '</b>')
-    text = text.replace('&lt;i&gt;', '<i>').replace('&lt;/i&gt;', '</i>')
-    text = text.replace('&lt;code&gt;', '<code>').replace('&lt;/code&gt;', '</code>')
-    text = text.replace('&lt;pre&gt;', '<pre>').replace('&lt;/pre&gt;', '</pre>')
-    
-    return text
-
-
 class TelegramBot:
     """Telegram bot implementation"""
 
@@ -171,9 +142,8 @@ async def _handle_message(self, update: Update, context: ContextTypes.DEFAULT_TY
                         user_mention = f"@{user.username}" if user.username else user.first_name or "User"
                         response_text = f"{user_mention} {msg.content}"
 
-                    # Convert markdown to HTML for better Telegram formatting
-                    html_response = convert_markdown_to_html(response_text)
-                    await update.message.reply_text(html_response, parse_mode='HTML')
+                    # Send response with simple Markdown formatting like Discord
+                    await update.message.reply_text(response_text, parse_mode='Markdown')
                     break
         else:
             logger.error("Message processor not initialized")

tests/test_telegram.py

@@ -5,7 +5,7 @@
 from telegram import Update, User, Chat, Message as TelegramMessage
 from telegram.ext import ContextTypes
 
-from app.telegram import TelegramBot, convert_markdown_to_html
+from app.telegram import TelegramBot
 from app.models import Message
 from app.message_processor import MessageProcessor
 
@@ -164,8 +164,8 @@ async def test_handle_message_success(self, telegram_bot):
         assert call_args[0][0] == 123  # chat_id
         assert isinstance(call_args[0][1], Message)
 
-        # Verify response was sent with user mention (since it's a group chat)
-        update.message.reply_text.assert_called_once_with("@testuser Hi there!", parse_mode='HTML')
+        # Verify response was sent with user mention (since it's a group chat)  
+        update.message.reply_text.assert_called_once_with("@testuser Hi there!", parse_mode='Markdown')
 
         # Verify typing action was sent
         context.bot.send_chat_action.assert_called_once_with(chat_id=123, action="typing")
@@ -204,7 +204,7 @@ async def test_handle_message_private_chat(self, telegram_bot):
         await telegram_bot._handle_message(update, context)
 
         # Verify response was sent without user mention (since it's a private chat)
-        update.message.reply_text.assert_called_once_with("Hi there!", parse_mode='HTML')
+        update.message.reply_text.assert_called_once_with("Hi there!", parse_mode='Markdown')
 
     @pytest.mark.asyncio
     async def test_handle_message_no_text(self, telegram_bot):
@@ -496,24 +496,5 @@ async def test_handle_message_logging(self, telegram_bot):
             # Should log receiving message and adding to processor
             assert mock_logger.debug.call_count >= 2
 
-    def test_convert_markdown_to_html(self):
-        """Test markdown to HTML conversion function"""
-        # Test bold text
-        assert convert_markdown_to_html("**bold**") == "<b>bold</b>"
-        
-        # Test italic text
-        assert convert_markdown_to_html("*italic*") == "<i>italic</i>"
-        
-        # Test code
-        assert convert_markdown_to_html("`code`") == "<code>code</code>"
-        
-        # Test combined formatting
-        result = convert_markdown_to_html("**IO Net Assistant** provides *specific* info about `io.net`")
-        expected = "<b>IO Net Assistant</b> provides <i>specific</i> info about <code>io.net</code>"
-        assert result == expected
-        
-        # Test HTML escaping
-        result = convert_markdown_to_html("Test & escape < > characters")
-        assert "&amp;" in result
-        assert "&lt;" in result
-        assert "&gt;" in result
+
+