matrix-python 1.4.6a0__tar.gz → 1.4.7a0__tar.gz

{matrix_python-1.4.6a0 → matrix_python-1.4.7a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrix-python
-Version: 1.4.6a0
+Version: 1.4.7a0
 Summary: An easy-to-use Matrix bot framework designed for quick development and minimal setup
 Author: Simon Roy,  Chris Dedman Rollet 
 Maintainer-email: Code Society Lab <admin@codesociety.xyz>

{matrix_python-1.4.6a0 → matrix_python-1.4.7a0}/matrix/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.4.6a0'
-__version_tuple__ = version_tuple = (1, 4, 6, 'a0')
+__version__ = version = '1.4.7a0'
+__version_tuple__ = version_tuple = (1, 4, 7, 'a0')
 
-__commit_id__ = commit_id = 'g9d2b531d5'
+__commit_id__ = commit_id = 'gdeb79d4c2'

{matrix_python-1.4.6a0 → matrix_python-1.4.7a0}/matrix/bot.py

@@ -184,10 +184,6 @@ class Bot(Registry):
             await handler(error)
             return
 
-        if self._fallback_error_handler:
-            await self._fallback_error_handler(error)
-            return
-
         await self._dispatch("on_error", error)
 
     async def on_command(self, _ctx: Context) -> None:
@@ -326,15 +322,19 @@ class Bot(Registry):
 
     async def _process_commands(self, room: Room, event: Event) -> None:
         """Parse and execute commands"""
-        ctx = await self._build_context(room, event)
+        try:
+            ctx = await self._build_context(room, event)
 
-        if ctx.command:
-            for check in self._checks:
-                if not await check(ctx):
-                    raise CheckError(ctx.command, check)
+            if ctx.command:
+                for check in self._checks:
+                    if not await check(ctx):
+                        raise CheckError(ctx.command, check)
 
-            await self._on_command(ctx)
-            await ctx.command(ctx)
+                await self._on_command(ctx)
+                await ctx.command(ctx)
+        except Exception as error:
+            ctx = Context(bot=self, room=room, event=event)
+            await self._on_command_error(ctx, error)
 
     async def _build_context(self, matrix_room: Room, event: Event) -> Context:
         room = self.get_room(matrix_room.room_id)

{matrix_python-1.4.6a0 → matrix_python-1.4.7a0}/matrix/registry.py

@@ -65,7 +65,6 @@ class Registry:
 
         self._event_handlers: Dict[Type[Event], List[Callback]] = defaultdict(list)
         self._hook_handlers: Dict[str, List[Callback]] = defaultdict(list)
-        self._fallback_error_handler: Optional[ErrorCallback] = None
         self._error_handlers: Dict[type[Exception], ErrorCallback] = {}
         self._command_error_handlers: Dict[type[Exception], CommandErrorCallback] = {}
 
@@ -378,14 +377,15 @@ class Registry:
         ```
         """
 
+        if not exception:
+            exception = Exception
+
         def wrapper(func: ErrorCallback) -> ErrorCallback:
             if not inspect.iscoroutinefunction(func):
                 raise TypeError("Error handlers must be coroutines")
 
-            if exception:
-                self._error_handlers[exception] = func
-            else:
-                self._fallback_error_handler = func
+            self._error_handlers[exception] = func
+
             logger.debug(
                 "registered error handler '%s' on %s",
                 func.__name__,

{matrix_python-1.4.6a0 → matrix_python-1.4.7a0}/matrix_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrix-python
-Version: 1.4.6a0
+Version: 1.4.7a0
 Summary: An easy-to-use Matrix bot framework designed for quick development and minimal setup
 Author: Simon Roy,  Chris Dedman Rollet 
 Maintainer-email: Code Society Lab <admin@codesociety.xyz>

{matrix_python-1.4.6a0 → matrix_python-1.4.7a0}/tests/test_bot.py

@@ -3,9 +3,7 @@ import pytest
 from unittest.mock import AsyncMock, MagicMock, patch
 from nio import MatrixRoom, RoomMessageText
 
-from matrix.bot import Bot
-from matrix.config import Config
-from matrix.extension import Extension
+from matrix.bot import Bot, Config, Extension, Room
 from matrix.errors import (
     CheckError,
     CommandNotFoundError,
@@ -118,7 +116,8 @@ async def test_dispatch_calls_all_handlers(bot):
             "type": "m.room.message",
         }
     )
-    room = MatrixRoom("!roomid:matrix.org", "room_alias")
+    matrix_room = MatrixRoom("!roomid:matrix.org", "room_alias")
+    room = Room(matrix_room, bot.client)
 
     await bot._dispatch_matrix_event(room, event)
     assert "h1" in called
@@ -206,9 +205,7 @@ async def test_on_error_calls_fallback_handler(bot):
         nonlocal called
         called = True
 
-    await bot._fallback_error_handler(Exception("test error"))
-    await bot.on_error(Exception("test error"))
-
+    await bot._on_error(Exception("test error"))
     assert called, "Fallback error handler was not called"
 
 
@@ -245,7 +242,9 @@ async def test_process_commands_executes_command(bot, event):
 
 
 @pytest.mark.asyncio
-async def test_command_not_found_raises(bot):
+async def test_command_not_found_calls_command_error_handler(bot):
+    bot._on_command_error = AsyncMock()
+
     event = RoomMessageText.from_dict(
         {
             "content": {"body": "!nonexistent", "msgtype": "m.text"},
@@ -258,17 +257,14 @@ async def test_command_not_found_raises(bot):
 
     room = MatrixRoom("!roomid", "alias")
 
-    with patch("matrix.context.Context", autospec=True) as MockContext:
-        mock_ctx = MagicMock()
-        mock_ctx.body = "!nonexistent"
-        MockContext.return_value = mock_ctx
+    await bot._process_commands(room, event)
 
-        with pytest.raises(CommandNotFoundError):
-            await bot._process_commands(room, event)
+    bot._on_command_error.assert_awaited_once()
+    assert isinstance(bot._on_command_error.call_args[0][1], CommandNotFoundError)
 
 
 @pytest.mark.asyncio
-async def test_bot_does_not_execute_when_global_check_fails(bot, event):
+async def test_bot_does_not_execute_command_when_global_check_fails(bot):
     called = False
 
     @bot.command()
@@ -280,6 +276,8 @@ async def test_bot_does_not_execute_when_global_check_fails(bot, event):
     async def global_check(ctx):
         return False
 
+    bot._on_command_error = AsyncMock()
+
     event = RoomMessageText.from_dict(
         {
             "content": {"body": "!greet", "msgtype": "m.text"},
@@ -290,18 +288,14 @@ async def test_bot_does_not_execute_when_global_check_fails(bot, event):
         }
     )
 
-    room = MatrixRoom("!roomid", "alias")
+    matrix_room = MatrixRoom("!roomid", "alias")
+    room = Room(matrix_room, bot.client)
 
-    with patch("matrix.context.Context", autospec=True) as MockContext:
-        mock_ctx = MagicMock()
-        mock_ctx.body = "!greet"
-        mock_ctx.command = bot.commands["greet"]
-        MockContext.return_value = mock_ctx
-
-        with pytest.raises(CheckError):
-            await bot._process_commands(room, event)
+    await bot._process_commands(room, event)
 
-    assert not called, "Expected command handler not to be called"
+    assert not called
+    bot._on_command_error.assert_awaited_once()
+    assert isinstance(bot._on_command_error.call_args[0][1], CheckError)
 
 
 @pytest.mark.asyncio

{matrix_python-1.4.6a0 → matrix_python-1.4.7a0}/tests/test_registry.py

@@ -297,16 +297,6 @@ def test_register_error_handler_with_exception_type__expect_handler_in_dict(
     assert registry._error_handlers[ValueError] is on_value_error
 
 
-def test_register_generic_error_handler__expect_fallback_error_handler_set(
-    registry: Registry,
-):
-    @registry.error()
-    async def on_any_error(error):
-        pass
-
-    assert registry._fallback_error_handler is on_any_error
-
-
 def test_register_error_handler_with_non_coroutine__expect_type_error(
     registry: Registry,
 ):