vortexpy 4.1.1__tar.gz → 4.1.2__tar.gz

{vortexpy-4.1.1 → vortexpy-4.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.1.1
+Version: 4.1.2
 Summary: Flying Ion's observable, routable, data serialisation and transport code.
 Author-email: Flying Ion Pty Ltd <contact@flyingion.com>
 License: MIT

{vortexpy-4.1.1 → vortexpy-4.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "4.1.1"
+version = "4.1.2"
 license = {text = "MIT"}
 authors = [{name = "Flying Ion Pty Ltd", email = "contact@flyingion.com"}]
 description = "Flying Ion's observable, routable, data serialisation and transport code."

{vortexpy-4.1.1 → vortexpy-4.1.2}/vortex/TupleRestful.py

@@ -19,7 +19,7 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from typing import TYPE_CHECKING, Annotated, Any, NamedTuple, Optional, Type
 
-from typing import get_args
+from typing import Union, get_args
 from typing import get_origin
 from typing import get_type_hints
 
@@ -256,6 +256,24 @@ class TupleRestfulConverter:
 
         return True
 
+    @classmethod
+    def _nestedTupleTypeFromHint(cls, typeHint: Any) -> Any | None:
+        """Return nested tuple class for a field hint, including ``X | None`` unions."""
+        if hasattr(typeHint, "__tupleType__"):
+            return typeHint
+
+        unionArgs = get_args(typeHint)
+        if not unionArgs:
+            return None
+
+        for unionArg in unionArgs:
+            if unionArg is type(None):
+                continue
+            if hasattr(unionArg, "__tupleType__"):
+                return unionArg
+
+        return None
+
     @classmethod
     def _checkType(
         cls,
@@ -284,6 +302,9 @@ class TupleRestfulConverter:
             if hasattr(typeHint, "__tupleType__"):
                 return None
 
+            if cls._nestedTupleTypeFromHint(typeHint) is not None:
+                return None
+
         if type(value) in get_args(typeHint):
             if validator:
                 try:
@@ -425,6 +446,16 @@ class TupleRestfulConverter:
                 cls._prefixValidationErrors(child.errors, field_path),
             )
 
+        nestedTupleType = cls._nestedTupleTypeFromHint(typeHint)
+        if nestedTupleType is not None and nestedTupleType is not typeHint:
+            child = cls.restfulJsonDictToTupleWithValidationResult(
+                value, nestedTupleType
+            )
+            return _ConvertResult(
+                child.tuple_,
+                cls._prefixValidationErrors(child.errors, field_path),
+            )
+
         if not get_args(typeHint):
             return _ConvertResult(
                 _UNSET,

{vortexpy-4.1.1 → vortexpy-4.1.2}/vortex/__init__.py

@@ -6,4 +6,4 @@
 # Website : https://flyingion.com
 # Support : contact@flyingion.com
 
-__version__ = '4.1.1'
+__version__ = '4.1.2'

{vortexpy-4.1.1 → vortexpy-4.1.2}/vortex/tuple_json_schema/json_schema_node_tuple.py

@@ -38,7 +38,7 @@ class JsonSchemaNodeTuple(Tuple):
     ``tupleToRestfulJsonDict()`` when serialising as a normal Vortex tuple.
     """
 
-    __tupleType__ = "flyingion.vortex.JsonSchemaNodeTuple"
+    __tupleType__ = "vortex.JsonSchemaNodeTuple"
 
     schemaUri: str | None = TupleField(None, typingType=str | None)
     schemaType: str | None = TupleField(None, typingType=str | None)

{vortexpy-4.1.1 → vortexpy-4.1.2}/vortexpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.1.1
+Version: 4.1.2
 Summary: Flying Ion's observable, routable, data serialisation and transport code.
 Author-email: Flying Ion Pty Ltd <contact@flyingion.com>
 License: MIT