vortexpy 4.1.1__tar.gz → 4.1.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.1.1
+Version: 4.1.3
 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.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "4.1.1"
+version = "4.1.3"
 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.3}/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.3}/vortex/VortexFactory.py

@@ -75,7 +75,7 @@ class _VortexConnectionRateLimit:
     def __init__(self):
         self._connections: list[_ConnectionDateSuccess] = []
         self._peerConnectionLimitPerIp = None
-        self._newConnectionsPerWindow = 5
+        self._newConnectionsPerWindow = 20
         self._rollingNewConnectionWindowSeconds = 10.0
 
     def _hasHitPeerConnectionLimit(

{vortexpy-4.1.1 → vortexpy-4.1.3}/vortex/VortexServer.py

@@ -43,7 +43,7 @@ VortexServer
 """
 
 HEART_BEAT_PERIOD = 10.0
-HEART_BEAT_TIMEOUT = 180.0
+HEART_BEAT_TIMEOUT = 60.0
 
 
 class VortexServer(VortexABC):
@@ -153,13 +153,15 @@ class VortexServer(VortexABC):
                     lambda: self._sessionExpired(httpSession.uid)
                 )
 
-            # Update the connection dict in the sessions object
             httpSessionConns = VortexSessionI(httpSession).connections
+            for oldConn in list(httpSessionConns.values()):
+                if oldConn is not vortexConnection:
+                    oldConn.close()
             httpSessionConns[vortexUuid] = vortexConnection
 
-        # Get the old connection if it exists
         if vortexUuid in self._connectionByVortexUuid:
-            self._connectionByVortexUuid[vortexUuid].close()
+            if self._connectionByVortexUuid[vortexUuid] is not vortexConnection:
+                self._connectionByVortexUuid[vortexUuid].close()
 
         # Update the _connectionsByvortexUuid
         self._connectionByVortexUuid[vortexUuid] = vortexConnection

{vortexpy-4.1.1 → vortexpy-4.1.3}/vortex/VortexServerWebsocket.py

@@ -267,13 +267,6 @@ class VortexWebSocketUpgradeResource(resource.Resource):
         return b"upgrade" in connection and upgrade == b"websocket"
 
     def _renderGet(self, request):
-        from vortex.VortexFactory import VortexFactory
-
-        if not VortexFactory.canConnect(str(request.client.host)):
-            request.setResponseCode(503)
-            request.setHeader("Retry-After", str(max(10, int(random() * 100))))
-            return b"Rejected due to new connections throttling."
-
         request.setResponseCode(200)
         request.setHeader(b"Content-Type", b"application/json")
         request.setHeader(b"Cache-Control", b"no-store")

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

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

{vortexpy-4.1.1 → vortexpy-4.1.3}/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.3}/vortexpy.egg-info/PKG-INFO

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