Merge pull request #387 from reagento/develop

Develop

Author: zhPavel

README.md

@@ -25,7 +25,7 @@ An extremely flexible and configurable data model conversion library.
 
 Install
 ```bash
-pip install adaptix==3.0.0b10
+pip install adaptix==3.0.0b11
 ```
 
 Use for model loading and dumping.

docs/changelog/changelog_body.rst

@@ -1,6 +1,79 @@
 ----------------------------------------------------
 
 
+.. _v3.0.0b11:
+
+`3.0.0b11 <https://github.com/reagento/adaptix/tree/v3.0.0b11>`__ -- 2025-05-09
+===============================================================================
+
+.. _v3.0.0b11-Features:
+
+Features
+--------
+
+
+- Completely redesigned error rendering system.
+  All errors related to loader, dumper, and converter generation now utilize a new compact and intuitive display format.
+  Error messages have also been substantially improved for clarity.
+
+  .. code-block:: text
+     :caption: Old error example
+
+        | adaptix.AggregateCannotProvide: Cannot create loader for model. Loaders for some fields cannot be created (1 sub-exception)
+        | Location: `Book`
+        +-+---------------- 1 ----------------
+          | adaptix.AggregateCannotProvide: Cannot create loader for model. Cannot fetch InputNameLayout (1 sub-exception)
+          | Location: `Book.author: Person`
+          +-+---------------- 1 ----------------
+            | adaptix.CannotProvide: Required fields ['last_name'] are skipped
+            | Location: `Book.author: Person`
+            +------------------------------------
+
+      The above exception was the direct cause of the following exception:
+
+      Traceback (most recent call last):
+        ...
+      adaptix.ProviderNotFoundError: Cannot produce loader for type <class '__main__.Book'>
+      Note: The attached exception above contains verbose description of the problem
+
+
+  .. code-block:: text
+     :caption: New error example
+
+      Traceback (most recent call last):
+        ...
+      adaptix.ProviderNotFoundError: Cannot produce loader for type <class '__main__.Book'>
+        × Cannot create loader for model. Loaders for some fields cannot be created
+        │ Location: ‹Book›
+        ╰──▷ Cannot create loader for model. Cannot fetch `InputNameLayout`
+           │ Location: ‹Book.author: Person›
+           ╰──▷ Required fields ['last_name'] are skipped
+
+.. _v3.0.0b11-Breaking Changes:
+
+Breaking Changes
+----------------
+
+- Custom iterable subclasses are no longer supported.
+  To use them, register via the internal (temporary) API with IterableProvider.
+- The ``Retort.replace`` method now requires ``Omitted`` instead of ``None`` to skip parameter values.
+- Removed the ``hide_traceback`` parameter from ``Retort`` and ``Retort.replace``.
+  Error rendering is now controlled via the ``error_renderer`` parameter.
+  Pass ``None`` to display raw Python ``ExceptionGroup`` traces.
+
+.. _v3.0.0b11-Bug Fixes:
+
+Bug Fixes
+---------
+
+- Fixed incorrect classification of parametrized generic Pydantic models as iterables
+  (due to Pydantic model instances being inherently iterable).
+- Corrected hint generation errors during model conversion.
+- Fixed handling of parametrized TypeAlias.
+
+----------------------------------------------------
+
+
 .. _v3.0.0b10:
 
 `3.0.0b10 <https://github.com/reagento/adaptix/tree/v3.0.0b10>`__ -- 2025-04-13

docs/common/installation.rst

@@ -2,7 +2,7 @@ Just use pip to install the library
 
 .. code-block:: text
 
-    pip install adaptix==3.0.0b10
+    pip install adaptix==3.0.0b11
 
 
 Integrations with 3-rd party libraries are turned on automatically,
@@ -20,5 +20,5 @@ So, this is valid installation variants:
 
 .. code-block:: text
 
-   pip install adaptix[attrs-strict]==3.0.0b10
-   pip install adaptix[attrs, sqlalchemy-strict]==3.0.0b10
+   pip install adaptix[attrs-strict]==3.0.0b11
+   pip install adaptix[attrs, sqlalchemy-strict]==3.0.0b11

docs/conf.py

@@ -78,6 +78,12 @@
     "sidebar_hide_name": True,
     "light_logo": "adaptix-with-title-light.png",
     "dark_logo": "adaptix-with-title-dark.png",
+    "light_css_variables": {
+        "font-stack--monospace": 'Hack, SFMono-Regular, Menlo, Consolas, Monaco, "Liberation Mono", "Lucida Console", monospace',
+    },
+    "dark_css_variables": {
+        "font-stack--monospace": 'Hack, SFMono-Regular, Menlo, Consolas, Monaco, "Liberation Mono", "Lucida Console", monospace',
+    },
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,

docs/examples/loading-and-dumping/extended_usage/fields_filtering_only.pytb

@@ -1,13 +1,6 @@
-  | adaptix.AggregateCannotProvide: Cannot create loader for model. Cannot fetch InputNameLayout (1 sub-exception)
-  | Location: `User`
-  +-+---------------- 1 ----------------
-    | adaptix.CannotProvide: Required fields ['password_hash'] are skipped
-    | Location: `User`
-    +------------------------------------
-
-The above exception was the direct cause of the following exception:
-
 Traceback (most recent call last):
   ...
-adaptix.NoSuitableProvider: Cannot produce loader for type <class 'docs.examples.extended_usage.fields_filtering_only.User'>
-Note: The attached exception above contains verbose description of the problem
+adaptix.ProviderNotFoundError: Cannot produce loader for type <class '__main__.User'>
+  × Cannot create loader for model. Cannot fetch `InputNameLayout`
+  │ Location: ‹User›
+  ╰──▷ Required fields ['password_hash'] are skipped

docs/examples/loading-and-dumping/extended_usage/fields_filtering_skip.pytb

@@ -1,13 +1,6 @@
-  | adaptix.AggregateCannotProvide: Cannot create loader for model. Cannot fetch InputNameLayout (1 sub-exception)
-  | Location: `User`
-  +-+---------------- 1 ----------------
-    | adaptix.CannotProvide: Required fields ['password_hash'] are skipped
-    | Location: `User`
-    +------------------------------------
-
-The above exception was the direct cause of the following exception:
-
 Traceback (most recent call last):
   ...
-adaptix.NoSuitableProvider: Cannot produce loader for type <class 'docs.examples.extended_usage.fields_filtering_skip.User'>
-Note: The attached exception above contains verbose description of the problem
+adaptix.ProviderNotFoundError: Cannot produce loader for type <class '__main__.User'>
+  × Cannot create loader for model. Cannot fetch `InputNameLayout`
+  │ Location: ‹User›
+  ╰──▷ Required fields ['password_hash'] are skipped

docs/loading-and-dumping/specific-types-behavior.rst

@@ -227,19 +227,24 @@ If there are several parents, it will be the selected class that appears first i
 Also, builtin dumper can work only with class type hints and ``Literal``.
 For example, type hints like ``LiteralString | int`` can not be dumped.
 
-Iterable subclasses
+Iterables
 '''''''''''''''''''''
 
+Exact list: ``list``, ``tuple``,
+``set``, ``frozenset``, ``collections.deque``,
+``Iterable``, ``Reversible``, ``Collection``, ``Sequence``,
+``MutableSequence``, ``Set``, ``MutableSet``.
+
 If ``strict_coercion`` is enabled, the loader takes any iterable excluding ``str`` and ``Mapping``.
 If ``strict_coercion`` is disabled, any iterable are accepted.
 
-Dumper produces the ``tuple`` (or ``list`` for list children) with dumped elements.
+Dumper produces the ``tuple`` (or ``list`` for mutable types) with dumped elements.
 
 If you require a loader for abstract type, a minimal suitable type will be used.
 For type ``Iterable[int]`` retort will use ``tuple``.
 
-Tuple of dynamic length like ``*tuple[int, ...]`` isn't supported yet.
-This doesn't applies for tuples like ``*tuple[int, str]`` (constant length tuples).
+Tuples with unpacking variable-length tuple like ``tuple[str, *tuple[int, ...]]`` are not supported yet.
+This doesn't applies for tuples like ``tuple[str, int]`` (constant length tuples).
 
 Dict and Mapping
 '''''''''''''''''''''

docs/overview.rst

@@ -16,7 +16,7 @@ Installation
 
 .. code-block:: text
 
-    pip install adaptix==3.0.0b10
+    pip install adaptix==3.0.0b11
 
 
 Example

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'adaptix'
-version = '3.0.0b10'
+version = '3.0.0b11'
 description = 'An extremely flexible and configurable data model conversion library'
 readme = 'README.md'
 requires-python = '>=3.9'
@@ -122,6 +122,9 @@ line-length = 120
 output-format = "concise"
 
 [tool.ruff.lint]
+
+allowed-confusables = ['×', '‹', '›']
+
 select = ['ALL']
 fixable = [
   'Q000',
@@ -177,7 +180,7 @@ ignore = [
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ['F401']
 
-"test_*" = ['S101', 'PLR2004', 'PLC0105', 'N806', 'FA102', 'UP035', 'UP006']
+"test_*" = ['S101', 'PLR2004', 'PLC0105', 'N806', 'FA102', 'UP035', 'UP006', 'E501']
 "tests/*/local_helpers.py" = ['S101', 'PLR2004', 'PLC0105', 'N806', 'FA102']
 "tests/*/data_*.py" = ['F821']
 "tests/tests_helpers/*" = ['INP001', 'S101']

src/adaptix/_internal/conversion/facade/retort.py

@@ -4,14 +4,14 @@
 from inspect import Parameter, Signature
 from typing import Any, Callable, Optional, TypeVar, overload
 
-from adaptix import TypeHint
-
-from ...common import Converter
+from ...common import Converter, TypeHint
 from ...provider.essential import Provider
 from ...provider.loc_stack_filtering import P
 from ...provider.shape_provider import BUILTIN_SHAPE_PROVIDER
+from ...retort.error_renderer import ErrorRenderer
 from ...retort.operating_retort import OperatingRetort
 from ...type_tools import is_generic_class
+from ...utils import Omittable, Omitted
 from ..coercer_provider import (
     DictCoercerProvider,
     DstAnyCoercerProvider,
@@ -64,10 +64,14 @@ def _calculate_derived(self) -> None:
         super()._calculate_derived()
         self._simple_converter_cache: dict[tuple[TypeHint, TypeHint, Optional[str]], Converter] = {}
 
-    def replace(self: AR, *, hide_traceback: Optional[bool] = None) -> AR:
+    def replace(
+        self: AR,
+        *,
+        error_renderer: Omittable[Optional[ErrorRenderer]] = Omitted(),
+    ) -> AR:
         with self._clone() as clone:
-            if hide_traceback is not None:
-                clone._hide_traceback = hide_traceback
+            if not isinstance(error_renderer, Omitted):
+                clone._error_renderer = error_renderer
         return clone
 
     def extend(self: AR, *, recipe: Iterable[Provider]) -> AR:
@@ -187,7 +191,7 @@ def convert(self, src_obj: Any, dst: type[DstT], *, recipe: Iterable[Provider] =
         src = type(src_obj)
         if is_generic_class(src):
             raise ValueError(
-                f"Can not infer the actual type of generic class instance ({src!r}),"
+                f"Cannot infer the actual type of generic class instance ({src!r}),"
                 " you have to use `get_converter` explicitly passing the type of object",
             )