Refactor message handling and model definitions: update message text handling in BaseHandler, enhance Context and Message models with optional fields, and streamline BotInput construction for asynchronous processing.

Author: Flagro

bot/models/base_handlers.py

@@ -79,7 +79,9 @@ async def _log_handler_request(
         user_handle = person.user_handle
         chat_id = context.chat_id
         message_details = (
-            f" with message of length {len(message.text)}" if message.text else ""
+            f" with message of length {len(message.message_text)}"
+            if message.message_text
+            else ""
         )
         args_prompt = " with args: " + " ".join(args) if args else ""
         self.logger.info(
@@ -150,6 +152,7 @@ class CommandPriority(enum.IntEnum):
 
 class BaseCommandHandler(BaseHandler, ABC):
     command: str = None
+    list_priority_order: CommandPriority = CommandPriority.DEFAULT
 
     def __str__(self) -> str:
         return f"Command Handler: {self.command}"

bot/models/config/__init__.py

@@ -1,4 +1,3 @@
-from .ai_config import AIConfig
 from .tg_config import TGConfig
 from .bot_config import BotConfig
 from .localizer_translations import LocalizerTranslations

bot/models/handlers_input.py

@@ -1,8 +1,8 @@
 import io
 from datetime import datetime
-from typing import Optional
+from typing import Optional, List
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 
 class Person(BaseModel):
@@ -13,7 +13,7 @@ class Person(BaseModel):
 
 class Context(BaseModel):
     chat_id: int
-    chat_name: str
+    chat_name: Optional[str] = None
     thread_id: Optional[int] = None
     is_group: bool = True
     is_bot_mentioned: bool = False
@@ -22,6 +22,8 @@ class Context(BaseModel):
 
 
 class Message(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     message_text: str
     timestamp: datetime
     in_file_image: Optional[io.BytesIO] = None
@@ -32,7 +34,7 @@ class BotInput(BaseModel):
     person: Person
     context: Context
     message: Message
-    args: Optional[str] = None
+    args: Optional[List[str]] = None
 
 
 class TranscribedMessage(BaseModel):

bot/models/handlers_response.py

@@ -1,7 +1,7 @@
 import io
 from typing import Optional, Dict
 from collections import OrderedDict
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 
 class KeyboardResponse(BaseModel):
@@ -11,6 +11,8 @@ class KeyboardResponse(BaseModel):
 
 
 class CommandResponse(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     text: Optional[str] = None
     image_url: Optional[str] = None
     audio_bytes: Optional[io.BytesIO] = None
@@ -19,5 +21,7 @@ class CommandResponse(BaseModel):
 
 
 class LocalizedCommandResponse(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     localized_text: Optional[str] = None
     keyboard: Optional[KeyboardResponse] = None

bot/rp_bot/ai_agent/agent_tools/agent.py

@@ -1,6 +1,6 @@
 import io
 from typing import AsyncIterator, Optional
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, ConfigDict
 from omnimodkit import ModelsToolkit
 from motor.motor_asyncio import AsyncIOMotorDatabase
 from .agent_toolkit import AIAgentToolkit
@@ -9,6 +9,8 @@
 
 
 class AIAgentStreamingResponse(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     text_chunk: str = Field(default="")
     total_text: str = Field(default="")
     image_url: Optional[str] = Field(default=None)

bot/rp_bot/ai_agent/agent_tools/autofact_generation.py

@@ -1,5 +1,5 @@
 from typing import List
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from .base_tool import BaseTool
 
 

bot/rp_bot/bot.py

@@ -11,7 +11,6 @@
 from .commands import handlers as command_handlers
 from .callbacks import handlers as callback_handlers
 from .messages import handlers as message_handlers
-from .ai_agent.ai import AI
 from .db import DB
 from .auth import Auth
 from .prompt_manager import PromptManager

bot/rp_bot/db_models/chat_modes.py

@@ -1,5 +1,5 @@
 from typing import List
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from bson import ObjectId
 from motor.motor_asyncio import AsyncIOMotorDatabase
 
@@ -10,6 +10,8 @@
 
 
 class ChatModeResponse(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     id: ObjectId
     mode_name: str
     mode_description: str

bot/telegram/bot.py

@@ -110,7 +110,7 @@ async def handle(
         """
         Handles the update and sends the response back to the user.
         """
-        bot_input = get_bot_input(update, context)
+        bot_input = await get_bot_input(update, context)
         await self.push_state(update, context, "sending_text")
 
         if bot_handler.streamable and self.telegram_bot_config.enable_message_streaming:
@@ -215,7 +215,7 @@ async def send_message(
             chat_id=chat_id,
             text=text,
             reply_to_message_id=reply_message_id,
-            photo=image_url,
+            # photo=image_url,
             parse_mode=parse_mode,
             reply_markup=markup,
         )

bot/telegram/utils.py

@@ -17,6 +17,11 @@ async def is_group_admin(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
     chat_id = update.effective_chat.id
     user_id = update.effective_user.id
 
+    # In private chats, the user is effectively the "admin" of their own chat
+    if update.effective_chat.type == constants.ChatType.PRIVATE:
+        return True
+
+    # For group chats, check actual administrators
     chat_administrators = await context.bot.get_chat_administrators(chat_id)
     return any(admin.user.id == user_id for admin in chat_administrators)
 
@@ -134,15 +139,15 @@ def get_thread_id(update: Update) -> Optional[int]:
     return None
 
 
-def get_bot_input(update: Update, context: ContextTypes.DEFAULT_TYPE) -> BotInput:
+async def get_bot_input(update: Update, context: ContextTypes.DEFAULT_TYPE) -> BotInput:
     """
     Get the bot input from the update and context
     """
     return BotInput(
-        person=get_person(update, context),
-        context=get_context(update, context),
-        message=get_message(update, context),
-        args=get_args(update, context),
+        person=await get_person(update, context),
+        context=await get_context(update, context),
+        message=await get_message(update, context),
+        args=await get_args(update, context),
     )