thds.atacama 1.0.20250331210237__py3-none-any.whl → 1.1.20250402145016__py3-none-any.whl

thds/atacama/_attrs.py

@@ -3,6 +3,8 @@ import typing as ty
 import attrs
 import marshmallow
 
+from . import _typevars
+
 T = ty.TypeVar("T")
 
 
@@ -38,8 +40,8 @@ class Attribute(ty.NamedTuple):
 
 
 def yield_attributes(attrs_class: type) -> ty.Iterator[Attribute]:
-    hints = ty.get_type_hints(attrs_class)
-    for attribute in attrs.fields(attrs_class):
+    base_class, hints = _typevars.base_class_and_hints(attrs_class)
+    for attribute in attrs.fields(base_class):
         yield Attribute(
             attribute.name,
             hints.get(attribute.name, attribute.type),

thds/atacama/_typevars.py

@@ -0,0 +1,65 @@
+# currently only in use by the _attrs type introspection tool,
+# but probably could be useful for other things, and doesn't directly deal with attrs.
+import typing as ty
+
+
+def _resolve_typevars(
+    type_hint: type, type_params: ty.Tuple[ty.TypeVar, ...], type_args: ty.Tuple[type, ...]
+) -> type:
+    """Recursively resolve TypeVars in a type hint with their actual types."""
+
+    # Direct TypeVar replacement - this is the 'base case'
+    if isinstance(type_hint, ty.TypeVar) and type_hint in type_params:
+        idx = type_params.index(type_hint)
+        if idx < len(type_args):
+            return type_args[idx]
+        return type_hint
+
+    # Handle generic types that might contain TypeVars
+    if hasattr(type_hint, "__origin__"):
+        origin = type_hint.__origin__
+        args = getattr(type_hint, "__args__", ())
+
+        # Recursively resolve each argument
+        resolved_args = tuple(_resolve_typevars(arg, type_params, type_args) for arg in args)
+
+        # If nothing changed, return the original
+        if resolved_args == args:
+            return type_hint
+
+        # Create a new generic with resolved arguments
+        try:
+            return origin[resolved_args]
+        except (TypeError, IndexError):
+            # Fall back to original if we can't create a new generic
+            return type_hint
+
+    # Return unmodified for simple types
+    return type_hint
+
+
+def base_class_and_hints(class_: type) -> ty.Tuple[type, ty.Dict[str, type]]:
+    # Get the original class and type arguments if it's a generic
+    if not hasattr(class_, "__origin__"):
+        return class_, ty.get_type_hints(class_)
+
+    # Get type hints from the base class
+    base_class = class_.__origin__
+    base_hints = ty.get_type_hints(base_class)
+    if not hasattr(base_class, "__parameters__"):
+        return base_class, base_hints
+
+    # Create a modified hints dictionary with resolved types
+    type_params = base_class.__parameters__
+    assert hasattr(
+        class_, "__args__"
+    ), f"Generic class {class_} must have type arguments, or we cannot determine types for it."
+    type_args = class_.__args__
+    hints = {}
+
+    for name, hint_type in base_hints.items():
+        # Check if this hint is a TypeVar or contains TypeVars
+        resolved_type = _resolve_typevars(hint_type, type_params, type_args)
+        hints[name] = resolved_type
+
+    return base_class, hints

thds/atacama/fields.py

@@ -1,5 +1,6 @@
 # portions copyright Desert contributors - see LICENSE_desert.md
 import enum
+import logging
 import typing as ty
 from functools import partial
 
@@ -19,8 +20,7 @@ class VariadicTuple(marshmallow.fields.List):
 
 
 T = ty.TypeVar("T")
-NoneType = type(None)
-
+logger = logging.getLogger(__name__)
 
 # most kwargs for a field belong to the surrounding context,
 # e.g. the name and the aggregation that this field lives in.
@@ -36,6 +36,7 @@ def generate_field(
     schema_generator: ty.Callable[[type], ty.Type[marshmallow.Schema]],
     typ: type,
     field_kwargs: ty.Mapping[str, ty.Any] = dict(),  # noqa: [B006]
+    debug_name: str = "",
 ) -> marshmallow.fields.Field:
     """Return a Marshmallow Field or Schema.
 
@@ -104,6 +105,9 @@ def generate_field(
             nested_schema = schema_generator(typ)
         except RecursionError:
             nested_schema = lambda: schema_generator(typ)  # type: ignore # noqa: E731
+        except Exception:
+            logger.exception(f"Failed to generate schema for {debug_name}={typ}")
+            raise
         return marshmallow.fields.Nested(nested_schema, **field_kwargs)
 
     return generic_types_dispatch(

thds/atacama/leaf.py

@@ -59,6 +59,8 @@ def allow_already_parsed(typ: ty.Type, mm_field: FieldT) -> FieldT:
     )
 
 
+NoneType = type(None)
+
 NATIVE_TO_MARSHMALLOW: LeafTypeMapping = {
     float: marshmallow.fields.Float,
     int: marshmallow.fields.Integer,
@@ -72,6 +74,7 @@ NATIVE_TO_MARSHMALLOW: LeafTypeMapping = {
     uuid.UUID: marshmallow.fields.UUID,
     ty.Union[int, float]: marshmallow.fields.Number,
     ty.Any: _field_with_default_kwargs(marshmallow.fields.Raw, allow_none=True),
+    NoneType: _field_with_default_kwargs(marshmallow.fields.Constant, constant=None, allow_none=True),
 }
 
 

thds/atacama/schemas.py

@@ -3,7 +3,7 @@ import typing as ty
 import marshmallow  # type: ignore
 from typing_extensions import Protocol
 
-from ._attrs import generate_attrs_post_load, is_attrs_class, yield_attributes
+from ._attrs import Attribute, generate_attrs_post_load, is_attrs_class, yield_attributes
 from ._cache import GenSchemaCachingDeco
 from ._config import PerGenerationConfigContext, _GenConfig
 from ._meta import SchemaMeta
@@ -142,7 +142,9 @@ class SchemaGenerator:
                 ),
             )
 
-    def _named_field_discriminator(self, attribute, named_field: NamedField) -> marshmallow.fields.Field:
+    def _named_field_discriminator(
+        self, attribute: Attribute, named_field: NamedField
+    ) -> marshmallow.fields.Field:
         """When we are given a field name with a provided value, there are 4 possibilities."""
         # 1. A Field. This should be plugged directly into the Schema
         # without being touched.  Recursion ends here.
@@ -161,6 +163,7 @@ class SchemaGenerator:
                 lambda _s: ty.cast(ty.Type[marshmallow.Schema], named_field),
                 attribute.type,
                 _set_default(attribute.default),
+                debug_name=attribute.name,
             )
         # 3. A nested Schema Generator, with inner keyword
         # arguments. This would be used in the case where you want the
@@ -173,7 +176,11 @@ class SchemaGenerator:
         # .nested on the current SchemaGenerator.
         if isinstance(named_field, _NestedSchemaGenerator):
             return generate_field(
-                self._leaf_types, named_field, attribute.type, named_field.field_kwargs
+                self._leaf_types,
+                named_field,
+                attribute.type,
+                named_field.field_kwargs,
+                debug_name=attribute.name,
             )
         # 4. A partial Field with some 'inner' keyword arguments for
         # the Field only. Recursion continues - simply adds keyword
@@ -188,6 +195,7 @@ class SchemaGenerator:
             self,
             attribute.type,
             dict(_set_default(attribute.default), **named_field.field_kwargs),
+            debug_name=attribute.name,
         )
 
     def _gen_fields(

{thds_atacama-1.0.20250331210237.dist-info → thds_atacama-1.1.20250402145016.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: thds.atacama
-Version: 1.0.20250331210237
+Version: 1.1.20250402145016
 Summary: A Marshmallow schema generator for `attrs` classes. Inspired by `desert`.
 Author-email: Trilliant Health <info@trillianthealth.com>
 License: MIT

{thds_atacama-1.0.20250331210237.dist-info → thds_atacama-1.1.20250402145016.dist-info}/RECORD

@@ -1,18 +1,19 @@
 thds/atacama/__init__.py,sha256=GYDLPjg7E91sPlOKZ8UyhSDCRvhUSbg9hbL-fK2hzZY,265
-thds/atacama/_attrs.py,sha256=3g3mXdUJRsaKgGnzDWZ8AoqM8pgLL9GMeY1cF7-sN6o,1556
+thds/atacama/_attrs.py,sha256=CwDIplm48Z4vrj9fDY4YdoB7imUOVpGmguKZW4PpAxo,1605
 thds/atacama/_cache.py,sha256=fYZ6iYKvQClCRtuGIQAMdJHyVHJ9Ffyr0dW1eyaMnwA,1477
 thds/atacama/_config.py,sha256=Z2gqxnBJvk9plS-3vgNchfq3Z7wBsuyu0SqAmnKFg2o,1442
 thds/atacama/_generic_dispatch.py,sha256=N5gZGTLMDVCwbf3OAx1EIA-wG3_T6CICiy65D-A_RKI,2256
 thds/atacama/_meta.py,sha256=sOjP0Y0KiNZUAXrxg2JWwolSWlxgU_OUqniUR_2Iv8g,498
+thds/atacama/_typevars.py,sha256=Qp6TDyA-Wfpjv2icAVH4HTOUWsdpGUfPgmuQRtqmEsI,2391
 thds/atacama/custom_fields.py,sha256=leIsn40R5TexbAgTj1X-HUtkopfEMp5Hwb-0PYQGQ2U,945
 thds/atacama/field_transforms.py,sha256=9Y1HO0U7oZZhmpYegTM1ruZX0hZMgdWS6b4gARb_Yo8,528
-thds/atacama/fields.py,sha256=zIfFCyUO1YcbKiLsl3OX-xhx3JxnyRBkP6kf-nOezsA,5281
+thds/atacama/fields.py,sha256=ZxdL1f-Gr0eWxUfIucjphEOP8_7k-BOE92izdk1iuQI,5462
 thds/atacama/generators.py,sha256=O6LvFaFpsfvAD4l_cCa82usF1RQ4aBHhv8bLikJ5rL0,486
-thds/atacama/leaf.py,sha256=C7HDGBS_Evds35qWeBLQAw1ZahERJONh-WrguZzIMvs,4575
+thds/atacama/leaf.py,sha256=Gp2kt8l5dgUq7K_QgMc6ddSbIvCW3kmNO5-7vCxhwEo,4701
 thds/atacama/nonempty.py,sha256=bL1cqNpUzATosiqGdEPEn6zlYcliySKH0tj__2UnijU,1384
 thds/atacama/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thds/atacama/schemas.py,sha256=CqSaj1KJGPuXzHkjdSVrZUhhd3dagmEUtYuBEiJGJ_g,9418
-thds_atacama-1.0.20250331210237.dist-info/METADATA,sha256=hBZ7SV1R1aqymMFLXUowqTidnxhCXAY_X6tcbPPaskw,17789
-thds_atacama-1.0.20250331210237.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-thds_atacama-1.0.20250331210237.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_atacama-1.0.20250331210237.dist-info/RECORD,,
+thds/atacama/schemas.py,sha256=azhePCqWc2IBAqU6xmBR4fDPXrmXX2GhRJU9FliYL6c,9628
+thds_atacama-1.1.20250402145016.dist-info/METADATA,sha256=Dik4f2QJQx382c8n4oFEy5ARDMakNgBnVzsfkBAxjkQ,17789
+thds_atacama-1.1.20250402145016.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+thds_atacama-1.1.20250402145016.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_atacama-1.1.20250402145016.dist-info/RECORD,,