Merge branch 'main' into gemini-image

Author: alex-funmula

dive_mcp_host/httpd/database/msg_store/abstract.py

@@ -122,7 +122,6 @@ async def delete_messages_after(
             user_id: User ID or fingerprint, depending on the prefix.
         """
 
-    # NOTE: Might change, currently not used
     @abstractmethod
     async def update_message_content(
         self,
@@ -136,6 +135,7 @@ async def update_message_content(
             message_id: Unique identifier for the message.
             data: New content for the message.
             user_id: User ID or fingerprint, depending on the prefix.
+                Should not be used in this current implementation.
 
         Returns:
             Updated Message object.

dive_mcp_host/httpd/database/msg_store/base.py

@@ -372,16 +372,19 @@ async def lock_msg(
             chat_id: Unique identifier for the chat.
             message_id: Unique identifier for the message.
             user_id: User ID or fingerprint, depending on the prefix.
+                Should not be used in this current implementation.
 
         Returns:
             If the message exist and is locked, returns True, False otherwise.
         """
+        if user_id is not None:
+            raise ValueError("user_id should not be used.")
+
         query = (
             select(ORMMessage.message_id)
             .where(
                 ORMMessage.message_id == message_id,
                 ORMMessage.chat_id == chat_id,
-                ORMChat.user_id == user_id,
             )
             .with_for_update()
         )
@@ -400,10 +403,14 @@ async def update_message_content(
             message_id: Unique identifier for the message.
             data: New content for the message.
             user_id: User ID or fingerprint, depending on the prefix.
+                Should not be used in this current implementation.
 
         Returns:
             Updated Message object.
         """
+        if user_id is not None:
+            raise ValueError("user_id should not be used.")
+
         # Prepare files list
         files = []
         if data.images:
@@ -416,7 +423,6 @@ async def update_message_content(
             update(ORMMessage)
             .where(
                 ORMMessage.message_id == message_id,
-                ORMChat.user_id == user_id,
             )
             .values(
                 content=data.text or "",

tests/test_base_message_store_sqlite.py

@@ -632,7 +632,6 @@ async def test_update_message_content(
     updated_message = await message_store.update_message_content(
         message_id=user_message.message_id,
         data=update_data,
-        user_id=sample_chat.user_id,
     )
 
     # Verify the returned message
@@ -673,36 +672,6 @@ async def test_update_message_content_not_found(
         await message_store.update_message_content(
             message_id="non_existent_message",
             data=update_data,
-            user_id=sample_chat.user_id,
-        )
-
-
-@pytest.mark.asyncio
-async def test_update_message_content_wrong_user(
-    message_store: BaseMessageStore,
-    sample_chat: ORMChat,
-    sample_messages: dict[str, ORMMessage],
-):
-    """Test updating a message with wrong user ID."""
-    # Get the user message to update
-    user_message = sample_messages["user_message"]
-
-    # Create update data
-    update_data = QueryInput(
-        text="Updated message content",
-        images=["image1.jpg"],
-        documents=["doc1.pdf"],
-    )
-
-    # Try to update the message with wrong user ID
-    with pytest.raises(
-        ValueError,
-        match=f"Message {user_message.message_id} not found",
-    ):
-        await message_store.update_message_content(
-            message_id=user_message.message_id,
-            data=update_data,
-            user_id="wrong_user_id",
         )
 
 
@@ -724,7 +693,6 @@ async def test_update_message_content_empty_data(
     updated_message = await message_store.update_message_content(
         message_id=user_message.message_id,
         data=update_data,
-        user_id=sample_chat.user_id,
     )
 
     # Verify the returned message