matrix-python 1.4.5a0__py3-none-any.whl → 1.4.7a0__py3-none-any.whl

matrix/_version.py

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

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:
@@ -245,8 +241,7 @@ class Bot(Registry):
         :func:`asyncio.run`, and ensures the client is closed gracefully
         on interruption.
         """
-        if config is not None:
-            self._load_config(config)
+        self._load_config(config)
 
         try:
             asyncio.run(self.run())
@@ -264,7 +259,7 @@ class Bot(Registry):
         calls the :meth:`on_ready` hook, and starts the long-running
         sync loop for receiving events.
         """
-        self.client.user = self.config.user_id
+        self.client.user = self.config.username
 
         self.start_at = time.time()
         self.log.info("starting – timestamp=%s", self.start_at)
@@ -327,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/config.py

@@ -1,61 +1,125 @@
-import yaml
+from typing import Any
+
+from envyaml import EnvYAML
+
 from .errors import ConfigError
-from typing import Optional
 
 
 class Config:
-    """
-    Configuration handler for Matrix client settings. Including the following:
-
-        homeserver: Defaults to 'https://matrix.org'
-        user_id: The Matrix user ID (username).
-        password: (Optional) One of the password or token must be provided.
-        token: (Optional) One of the password or token must be provided.
-        prefix: Defaults to '!' if not specified in the config file.
-
-    :param config_path: Path to the YAML configuration file.
-    :param homeserver: The Matrix homeserver URL.
-    :param username: The Matrix user ID (username).
-    :param password: The password for the Matrix user.
-    :param token: The access token for the Matrix user.
-    :param prefix: The command prefix.
-
-    :raises FileNotFoundError: If the configuration file does not exist.
-    :raises yaml.YAMLError: If the configuration file cannot be parsed.
-    :raises ConfigError: If neither password or token has been provided.
+    """Configuration handler for Matrix client settings.
+
+    Manages all settings required to connect and authenticate with a Matrix
+    homeserver. Configuration can be loaded from a YAML file or provided
+    directly via constructor parameters. At least one authentication method
+    must be provided.
+
+    # Example
+
+    ```python
+    # Load from file
+    config = Config(config_path="path/to/config..yaml")
+
+    # Manual configuration
+    config = Config(username="@bot:matrix.org", password="secret")
+    ```
     """
 
     def __init__(
         self,
-        config_path: Optional[str] = None,
+        config_path: str | None = None,
         *,
-        homeserver: Optional[str] = None,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
-        token: Optional[str] = None,
-        prefix: Optional[str] = None,
+        homeserver: str | None = None,
+        username: str | None = None,
+        password: str | None = None,
+        token: str | None = None,
+        prefix: str | None = None,
     ) -> None:
+        """Initialize the bot configuration.
+
+        Loads configuration from a YAML file if provided, otherwise uses
+        the provided parameters directly. At least one of password or token
+        must be supplied.
+
+        # Example
+
+        ```python
+        config = Config(
+            username="@bot:matrix.org",
+            password="secret",
+            prefix="!",
+        )
+        ```
+        """
+        self._data: dict[str, Any] = {}
+
         self.homeserver: str = homeserver or "https://matrix.org"
-        self.user_id: Optional[str] = username
-        self.password: Optional[str] = password
-        self.token: Optional[str] = token
+        self.username: str | None = username
+        self.password: str | None = password
+        self.token: str | None = token
         self.prefix: str = prefix or "!"
 
         if config_path:
             self.load_from_file(config_path)
-        elif not (self.password or self.token):
-            raise ConfigError("username and password or token")
+        else:
+            if not self.password and not self.token:
+                raise ConfigError("username and password or token")
+
+            self._data = {
+                "HOMESERVER": self.homeserver,
+                "USERNAME": self.username,
+                "PASSWORD": self.password,
+                "TOKEN": self.token,
+                "PREFIX": self.prefix,
+            }
 
     def load_from_file(self, config_path: str) -> None:
-        """Load Matrix client settings via YAML config file."""
-        with open(config_path, "r") as f:
-            config = yaml.safe_load(f)
-
-            if not (config.get("PASSWORD") or config.get("TOKEN")):
-                raise ConfigError("USERNAME and PASSWORD or TOKEN")
-
-            self.homeserver = config.get("HOMESERVER", "https://matrix.org")
-            self.user_id = config.get("USERNAME")
-            self.password = config.get("PASSWORD", None)
-            self.token = config.get("TOKEN", None)
-            self.prefix = config.get("PREFIX", "!")
+        """Load Matrix client settings from a YAML config file.
+
+        Supports environment variable substitution via EnvYAML. Values in
+        the YAML file can reference environment variables using ${VAR} syntax.
+
+        # Example
+
+        ```python
+        config = Config()
+        config.load_from_file("path/to/config.yaml")
+        ```
+        """
+        self._data = dict(EnvYAML(config_path))
+
+        password = self._data.get("PASSWORD", None)
+        token = self._data.get("TOKEN", None)
+
+        if not password and not token:
+            raise ConfigError("USERNAME and PASSWORD or TOKEN")
+
+        self.homeserver = self._data.get("HOMESERVER", "https://matrix.org")
+        self.username = self._data.get("USERNAME")
+        self.password = password
+        self.token = token
+        self.prefix = self._data.get("PREFIX", "!")
+
+    def get(self, key: str, *, section: str | None = None, default: Any = None) -> Any:
+        """Access a config value by key, optionally scoped to a section.
+
+        # Example
+
+        ```python
+        config.get(key="main_channel", section="bot")
+        config.get(key="log_level", default="INFO")
+        ```
+        """
+        if section in self._data:
+            return self._data.get(section, {}).get(key, default)
+        return self._data.get(key, default)
+
+    def __getitem__(self, key: str) -> Any:
+        """Access a config value by key, raising KeyError if not found.
+
+        # Example
+
+        ```python
+        config["bot"]["main_channel"]
+        ```
+        """
+        return self._data[key]

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.5a0.dist-info → matrix_python-1.4.7a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrix-python
-Version: 1.4.5a0
+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>
@@ -689,6 +689,7 @@ Requires-Dist: logger
 Requires-Dist: PyYAML==6.0.3
 Requires-Dist: markdown==3.10.2
 Requires-Dist: APScheduler==3.11.2
+Requires-Dist: envyaml==1.10.211231
 Provides-Extra: dev
 Requires-Dist: pytest==9.0.3; extra == "dev"
 Requires-Dist: pytest-asyncio==1.3.0; extra == "dev"

{matrix_python-1.4.5a0.dist-info → matrix_python-1.4.7a0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 matrix/__init__.py,sha256=g8yEFjELnnwlvOKns-Ug6LgOezkjAFZ-Opt7esbBHKg,728
-matrix/_version.py,sha256=X8Lfu8HB9IHEZFC88NkrWaj4moo7WlSXkDThKiafsrE,528
-matrix/bot.py,sha256=4gwL2vawLFEREwZD4cEydv6XSXm_SP6pztLD8uwB86M,11944
+matrix/_version.py,sha256=cIY61sFj4baHEv-2SFzhHnMonmSbAkIpGKrCbxZ8dPU,528
+matrix/bot.py,sha256=tbcn1Ra025I9plM-gf0NpzPKSTBlYe0_L8_RLO8w9GM,11984
 matrix/checks.py,sha256=F_7432_OcFO-im4fRAj62MUsyv1mXywT4OsGC_7xbBQ,486
 matrix/command.py,sha256=GrP3WsT07sKehGX7PHfnT7gRX22d99877VPd0X2ViEw,10514
-matrix/config.py,sha256=wPLfcHGpSapkBqbZIuI7zBdxh52OHTD8cQS0WqQkMeU,2388
+matrix/config.py,sha256=JW_BBs-msIhtv1AGebZumLsx4td-Gp-NZaNYPJxRsEo,3680
 matrix/content.py,sha256=z5_E2rTvHsODE52OiDkhDHNQAryx5NLhyHjBb65Xe-U,3853
 matrix/context.py,sha256=-CbxY-LtK9-jgHERhvJH73B3SpO-Uk5ty0j1TMKfzuI,4032
 matrix/errors.py,sha256=HKGb5NUeFuZvieXgpLlVSmUxK4jpA0ODuiPQqQlbQTE,1676
@@ -11,14 +11,14 @@ matrix/extension.py,sha256=RbCx58CdRXF8kGUgS-ec1aZdd-K5hQedhCCQ0-YR4Vg,2272
 matrix/group.py,sha256=TRIX7PE3lcB2ZWu3xY2W2OAmE_a8-i2zHNBYnX5uj28,3691
 matrix/message.py,sha256=w6pu86goylxdrX5fgXPUMB_tW0bOFIk6tKy6qkXTjl4,5136
 matrix/protocols.py,sha256=nFb4tLanwtrKWoIhZ96xMwXPjD3RF5ITca_yXtakXC4,166
-matrix/registry.py,sha256=jxXg_f_pVl6nuwLdVOIjWJ9Yl9hDJSLwoChnnr3ztNs,12753
+matrix/registry.py,sha256=PgdmbBADS-yqdFdj9x3QSsVfefx8Li848CU_UBbqCLQ,12646
 matrix/room.py,sha256=PBuMWQo8mKy2d2XIeMbBlVBTnnqZjOPPGpKLp4K1AVM,14038
 matrix/scheduler.py,sha256=EXsL9i8IDXhcpdW8lti0BR5XcIgkmud4iwOPaqcE9Gw,1727
 matrix/types.py,sha256=UFjC7p8RAf7piEPvp2X3NuWdqBwkM9Yc3He7KWb9icc,384
 matrix/help/__init__.py,sha256=1u7V7T_-VgYDeQCTXsc4y8Fo-8gJhOqYJq2U3cUjMWg,168
 matrix/help/help_command.py,sha256=xCLmKklw74LEMjbUfgQR9eaPMFvi3sPtDw2n2pnAnVQ,12800
 matrix/help/pagination.py,sha256=sJk0wC46sFHf7xl7WsGRAUc4FC7b9hPqmwQDmvcjwgM,2717
-matrix_python-1.4.5a0.dist-info/METADATA,sha256=JQOpjcfDsm5WIJIijrutXlKgF7H4vU1KGX11JpkOfn8,44636
-matrix_python-1.4.5a0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-matrix_python-1.4.5a0.dist-info/top_level.txt,sha256=BvHVM9c7-5SLzg-1OCRpHKgqAubWhRN1e38e6coHs-g,7
-matrix_python-1.4.5a0.dist-info/RECORD,,
+matrix_python-1.4.7a0.dist-info/METADATA,sha256=i0D7FpTrWeuERNEsaKTyljaqwmO6UF11pGf97xr2sgY,44672
+matrix_python-1.4.7a0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+matrix_python-1.4.7a0.dist-info/top_level.txt,sha256=BvHVM9c7-5SLzg-1OCRpHKgqAubWhRN1e38e6coHs-g,7
+matrix_python-1.4.7a0.dist-info/RECORD,,