Merge pull request #165 from uhd-urz/dev

Apply hotfix for bill-teams

Author: mhxion

CHANGELOG.md

@@ -5,14 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.3] - 2025-09-22
+
+This is a hotfix release. See the **version 2.4.2 changelog below** for the new changes.
+
+### Fixed
+
+- Fix how type for `ConfigurationValidation` argument is validated that affects `bill-teams` plugin
+
 ## [2.4.2] - 2025-09-22
 
 This release brings some minor bug fixes and improvements.
 
 ### Added
 
-- elAPI `whoami` that shows information about the eLab user (see [documentation](https://github.com/uhd-urz/elAPI/tree/main?tab=readme-ov-file#elapi-whoami))
-- New configuration field `async_capacity` that lets you the maximum number of in-flight requests (see [documentation](https://github.com/uhd-urz/elAPI/tree/dev?tab=readme-ov-file#configuration))
+- elAPI `whoami` that shows information about the eLab user (
+  see [documentation](https://github.com/uhd-urz/elAPI/tree/main?tab=readme-ov-file#elapi-whoami))
+- New configuration field `async_capacity` that lets you the maximum number of in-flight requests (
+  see [documentation](https://github.com/uhd-urz/elAPI/tree/dev?tab=readme-ov-file#configuration))
 - Improved `bill-teams` retry strategy that uses `async_capacity`
 
 ### Fixed
@@ -21,19 +31,20 @@ This release brings some minor bug fixes and improvements.
 
 ### Changes
 
-- Replace HTTPX's back-end with `aiohttp`. This fixes #162. 
+- Replace HTTPX's back-end with `aiohttp`. This fixes #162.
 
 ## [2.4.1] - 2025-08-26
 
 > [!NOTE]
 > This release deprecates support for Python versions 3.9 and 3.10.
 
-This is a hotfix release. See the [version 2.4.0 changelog](https://github.com/uhd-urz/elAPI/releases/tag/v2.4.0) for the new changes.
+This is a hotfix release. See the [version 2.4.0 changelog](https://github.com/uhd-urz/elAPI/releases/tag/v2.4.0) for
+the new changes.
 
 ### Fixed
 
-- Rollback [httpx-limiter](https://midnighter.github.io/httpx-limiter/) to version 0.3.0. The version 0.4.0 would break elAPI support on Pyodide (see GH #160)
-
+- Rollback [httpx-limiter](https://midnighter.github.io/httpx-limiter/) to version 0.3.0. The version 0.4.0 would break
+  elAPI support on Pyodide (see GH #160)
 
 ## [2.4.0] - 2025-08-25
 
@@ -44,10 +55,13 @@ This release brings general bug fixes and a few major improvements.
 
 ### Added
 
-- The `mail` built-in plugin that is able to scan logs and send emails based on pre-configured trigger conditions (see [documentation](https://github.com/uhd-urz/elAPI/tree/main?tab=readme-ov-file#mail-built-in-plugin))
-- New configuration field `async_rate_limit` that lets you control requests per second (see [documentation](https://github.com/uhd-urz/elAPI/tree/dev?tab=readme-ov-file#configuration))
+- The `mail` built-in plugin that is able to scan logs and send emails based on pre-configured trigger conditions (
+  see [documentation](https://github.com/uhd-urz/elAPI/tree/main?tab=readme-ov-file#mail-built-in-plugin))
+- New configuration field `async_rate_limit` that lets you control requests per second (
+  see [documentation](https://github.com/uhd-urz/elAPI/tree/dev?tab=readme-ov-file#configuration))
 - Global callback mechanisms (GH https://github.com/uhd-urz/elAPI/pull/156/; see "Callback classes")
-- `add_logging_level` to add new logging levels (see [documentation](https://haggis.readthedocs.io/en/stable/api.html#haggis.logs.add_logging_level))
+- `add_logging_level` to add new logging levels (
+  see [documentation](https://haggis.readthedocs.io/en/stable/api.html#haggis.logs.add_logging_level))
 
 ### Fixed
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "elapi"
-version = "2.4.2"
+version = "2.4.3"
 description = "elAPI is a powerful, extensible API client for eLabFTW."
 authors = [{ name = "Alexander Haller, Mahadi Xion", email = "elabftw@uni-heidelberg.de" }]
 requires-python = ">=3.11.0,<4"

src/elapi/VERSION

@@ -1 +1 @@
-2.4.2
+2.4.3

src/elapi/configuration/validators.py

@@ -5,6 +5,7 @@
 
 from dynaconf.utils.boxing import DynaBox
 
+from .._names import APP_NAME
 from ..configuration.config import CANON_YAML_EXTENSION, CONFIG_FILE_NAME
 from ..core_validators import (
     CriticalValidationError,
@@ -15,15 +16,18 @@
     Validator,
 )
 from ..loggers import DefaultLogLevels, Logger
+from ..path import ProperPath
 from ..styles import Missing, stdout_console
 from ..styles.highlight import NoteText
 from ..utils import add_message
 from ._config_history import FieldValueWithKey, MinimalActiveConfiguration
 from .config import (
+    _XDG_DOWNLOAD_DIR,
     ASYNC_CAPACITY_DEFAULT_VAL,
     ASYNC_RATE_LIMIT_DEFAULT_VAL,
     DEVELOPMENT_MODE_DEFAULT_VAL,
     ENABLE_HTTP2_DEFAULT_VAL,
+    FALLBACK_EXPORT_DIR,
     KEY_ASYNC_CAPACITY,
     KEY_ASYNC_RATE_LIMIT,
     KEY_DEVELOPMENT_MODE,
@@ -48,14 +52,14 @@ def __init__(self, minimal_active_config_obj: MinimalActiveConfiguration, /):
         self.active_configuration = minimal_active_config_obj
 
     @property
-    def active_configuration(self) -> MinimalActiveConfiguration:
+    def active_configuration(self) -> MinimalActiveConfiguration | dict:
         return self._active_configuration
 
     @active_configuration.setter
-    def active_configuration(self, value: MinimalActiveConfiguration):
-        if not isinstance(value, MinimalActiveConfiguration):
+    def active_configuration(self, value: MinimalActiveConfiguration | dict):
+        if not isinstance(value, (MinimalActiveConfiguration, dict)):
             raise TypeError(
-                f"Value must be an instance of {MinimalActiveConfiguration.__name__}."
+                f"Value must be an instance of dict or {MinimalActiveConfiguration.__name__}."
             )
         self._active_configuration = value
 
@@ -68,6 +72,7 @@ def __init__(self, *args):
         super().__init__(*args)
 
     def validate(self) -> str:
+        self.active_configuration: MinimalActiveConfiguration
         _HOST_EXAMPLE: str = f"{KEY_HOST.lower()}: 'https://demo.elabftw.net/api/v2'"
 
         if isinstance(self.active_configuration.get_value(KEY_HOST), Missing):
@@ -126,10 +131,9 @@ def __init__(self, *args):
         super().__init__(*args)
 
     def validate(self) -> str:
-        from ..loggers import Logger
         from .config import KEY_API_TOKEN
 
-        logger = Logger()
+        self.active_configuration: MinimalActiveConfiguration
         if isinstance(self.active_configuration.get_value(KEY_API_TOKEN), Missing):
             logger.critical(
                 f"'{KEY_API_TOKEN.lower()}' is missing from configuration file."
@@ -197,10 +201,10 @@ def __init__(self, *args):
         super().__init__(*args)
 
     def validate(self) -> Path:
+        self.active_configuration: MinimalActiveConfiguration
+
         def get_validated_fallback():
-            from .._names import APP_NAME
-            from ..path import ProperPath
-            from .config import _XDG_DOWNLOAD_DIR, FALLBACK_EXPORT_DIR
+            global FALLBACK_EXPORT_DIR, _XDG_DOWNLOAD_DIR, ProperPath
 
             ACTUAL_FALLBACK_EXPORT_DIR = FALLBACK_EXPORT_DIR
             if _XDG_DOWNLOAD_DIR is not None:
@@ -274,9 +278,6 @@ def __init__(self, *args, key_name: str, fallback_value: bool):
         self.fallback_value = fallback_value
 
     def validate(self) -> bool:
-        from ..loggers import Logger
-
-        logger = Logger()
         if isinstance(
             value := self.active_configuration.get_value(self.key_name), Missing
         ):
@@ -312,7 +313,9 @@ def __init__(
         self.fallback_value = fallback_value
         self.allow_none = allow_none
 
-    def validate(self) -> float:
+    def validate(self) -> Optional[float]:
+        self.active_configuration: MinimalActiveConfiguration
+
         if isinstance(
             value := self.active_configuration.get_value(self.key_name), Missing
         ):
@@ -349,6 +352,8 @@ def __init__(
         self.allow_none = allow_none
 
     def validate(self) -> Optional[int]:
+        self.active_configuration: MinimalActiveConfiguration
+
         if isinstance(
             value := self.active_configuration.get_value(self.key_name), Missing
         ):
@@ -380,7 +385,9 @@ def __init__(self, *args, key_name: str, fallback_value: dict):
         self.fallback_value = fallback_value
 
     def validate(self) -> dict:
+        self.active_configuration: MinimalActiveConfiguration
         value: DynaBox = self.active_configuration.get_value(self.key_name)
+
         if isinstance(value, Missing):
             return self.fallback_value
         if value is None: