vortexpy 4.3.6__tar.gz → 6.0.0__tar.gz

vortexpy-6.0.0/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2016-2026 Flying Ion Pty Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

{vortexpy-4.3.6 → vortexpy-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.3.6
+Version: 6.0.0
 Summary: Flying Ion's observable, routable, data serialisation and transport code.
 Author-email: Flying Ion Pty Ltd <contact@flyingion.com>
 License: MIT
@@ -32,17 +32,20 @@ Requires-Dist: txhttputil>=1.2.0
 Flying Ion's observable, routable, data serialisation and transport code.
 
 See [README_PERMISSIONS.md](README_PERMISSIONS.md) for the two-level permission
-system (endpoint guards + access control context) introduced in v5.0.
-
-**Tuple and Payload tutorials:** [docs/README.md](docs/README.md) (simple → full features, encode/decode, threaded decode).
+system (endpoint guards + access control context) introduced in v6.0.
 
 Why PY at the end? To be consistent with VortexJS, which is the Browser side package.
 See https://gitlab.com/flyingion/vortexjs
 
 Requirements:
-* Python 3.5
-* Twisted 16+
-* SQLAlchemy 1, 1.1
+* Python 3.12 (development target)
+* Twisted (autobahn / txwebsocket)
+* SQLAlchemy >= 2.0
+
+See `pyproject.toml` for the authoritative dependency list.
+
+See [README_MIGRATION.md](README_MIGRATION.md) for breaking changes and
+migration guides (4.4.0, 6.0.0).
 
 The "vortex" is designed to transport "Payloads" from a web browser (VortexJS) to a
 twisted web server (VortexPY). There is also a python client for python client to python server

{vortexpy-4.3.6 → vortexpy-6.0.0}/README.md

@@ -3,17 +3,20 @@
 Flying Ion's observable, routable, data serialisation and transport code.
 
 See [README_PERMISSIONS.md](README_PERMISSIONS.md) for the two-level permission
-system (endpoint guards + access control context) introduced in v5.0.
-
-**Tuple and Payload tutorials:** [docs/README.md](docs/README.md) (simple → full features, encode/decode, threaded decode).
+system (endpoint guards + access control context) introduced in v6.0.
 
 Why PY at the end? To be consistent with VortexJS, which is the Browser side package.
 See https://gitlab.com/flyingion/vortexjs
 
 Requirements:
-* Python 3.5
-* Twisted 16+
-* SQLAlchemy 1, 1.1
+* Python 3.12 (development target)
+* Twisted (autobahn / txwebsocket)
+* SQLAlchemy >= 2.0
+
+See `pyproject.toml` for the authoritative dependency list.
+
+See [README_MIGRATION.md](README_MIGRATION.md) for breaking changes and
+migration guides (4.4.0, 6.0.0).
 
 The "vortex" is designed to transport "Payloads" from a web browser (VortexJS) to a
 twisted web server (VortexPY). There is also a python client for python client to python server

{vortexpy-4.3.6 → vortexpy-6.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "4.3.6"
+version = "6.0.0"
 license = {text = "MIT"}
 authors = [{name = "Flying Ion Pty Ltd", email = "contact@flyingion.com"}]
 description = "Flying Ion's observable, routable, data serialisation and transport code."
@@ -53,17 +53,3 @@ namespaces = false
 
 [project.entry-points."mypy.plugins"]
 vortex_defer = "vortex.mypy_plugin:plugin"
-
-[tool.pytest.ini_options]
-testpaths = ["vortex"]
-python_files = ["*_test.py"]
-python_functions = ["test*"]
-norecursedirs = ["_trial_temp", "example", "old_fork"]
-markers = [
-    "trial: legacy Twisted Trial *Test.py modules (not collected; run with trial CLI)",
-    "slow: large payload or timing benchmarks",
-    "integration: docker or multi-process integration suites under test-integration/",
-]
-
-[tool.taskipy.tasks]
-test-integrations = "bash -c 'pytest test-integration/ -xvs -m integration'"

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/DeferUtil.py

@@ -32,7 +32,6 @@ def callMethodLater(func):
     def wrapper(*args, **kwargs):
         return reactor.callLater(0, func, *args, **kwargs)
 
-    wrapper.__wrapped__ = func
     return wrapper
 
 
@@ -47,7 +46,7 @@ def nonConcurrentMethod(method):
             call.running = False
 
     call.running = False
-    call.__wrapped__ = method
+
     return call
 
 
@@ -61,7 +60,6 @@ def maybeDeferredWrap(funcToWrap):
     def func(*args, **kwargs):
         return maybeDeferred(funcToWrap, *args, **kwargs)
 
-    func.__wrapped__ = funcToWrap
     return func
 
 
@@ -80,7 +78,6 @@ def ensureDeferredWrap(funcToWrap):
     def func(*args, **kwargs):
         return ensureDeferred(funcToWrap(*args, **kwargs))
 
-    func.__wrapped__ = funcToWrap
     return func
 
 
@@ -143,7 +140,6 @@ def vortexInlineCallbacksLogAndConsumeFailure(loggerArg):
             d.addErrback(vortexLogAndConsumeFailure, loggerArg)
             return d
 
-        called.__wrapped__ = funcToWrap
         return called
 
     return wrapper
@@ -157,7 +153,6 @@ def deferToThreadWrapWithLogger(
     loggerArg: logging.Logger,
     consumeError: bool = False,
     checkMainThread: bool = True,
-    logException: bool = True,
 ) -> Callable[[Callable[_P, _R]], Callable[_P, Deferred[_R]]]:
     """Defer To Thread Wrap With Logger
 
@@ -168,9 +163,6 @@ def deferToThreadWrapWithLogger(
     :param checkMainThread: Don't use this parameter, it's only needed during reactor
                 startup when the reactors thread isn't properly set and the check
                 fails.
-    :param logException: When True, thread exceptions are logged at ERROR with a full
-                traceback. When False, the same events are logged at DEBUG with a
-                neutral message so log analysers are not triggered.
 
     :return: A decorator that makes the wrapped callable return a Deferred.
 
@@ -238,26 +230,11 @@ def deferToThreadWrapWithLogger(
                         methodFrame,
                     )
 
-            def handleFailure(failure):
-                if logException:
-                    return vortexLogFailure(
-                        failure, loggerArg, consumeError=consumeError
-                    )
-
-                loggerArg.debug(
-                    "Threaded call failed in %s.%s: %s",
-                    funcToWrap.__module__,
-                    funcToWrap.__qualname__,
-                    failure.getErrorMessage(),
-                )
-                return True if consumeError else failure
-
             d: Deferred[_R] = deferToThread(timedFuncToRun, *args, **kwargs)
             d.addCallback(checkForInlineCallbackYield)
-            d.addErrback(handleFailure)
+            d.addErrback(vortexLogFailure, loggerArg, consumeError=consumeError)
             return d
 
-        func.__wrapped__ = funcToWrap
         return func
 
     return wrapper

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/DeferUtil_test.py

@@ -84,61 +84,3 @@ async def testDeferToThreadWrapWithLoggerCapturesSlowCallFrame() -> None:
     assert "twisted_runtime_metrics.py" not in snapshot.longestThreadedMethodFrame, (
         "captured frame must skip metrics collector internals"
     )
-
-
-@deferToThreadWrapWithLogger(logger, logException=False)
-def _deferUtilTestFailingWorkQuiet() -> str:
-    raise ValueError("expected quiet failure")
-
-
-@deferToThreadWrapWithLogger(logger)
-def _deferUtilTestFailingWorkLoud() -> str:
-    raise ValueError("expected loud failure")
-
-
-@pytest.mark.twisted
-@ensureDeferred
-async def testDeferToThreadWrapWithLoggerLogExceptionFalseLogsDebug(
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    with caplog.at_level(logging.DEBUG, logger=logger.name):
-        try:
-            await _deferUtilTestFailingWorkQuiet()
-            raise AssertionError("wrapped call must propagate the failure")
-        except ValueError:
-            pass
-
-    errorRecords = [r for r in caplog.records if r.levelno >= logging.ERROR]
-    assert errorRecords == [], (
-        "logException=False must not log thread failures at ERROR"
-    )
-    debugRecords = [
-        r
-        for r in caplog.records
-        if r.levelno == logging.DEBUG and "expected quiet failure" in r.message
-    ]
-    assert len(debugRecords) == 1, (
-        "logException=False must log one neutral DEBUG record"
-    )
-
-
-@pytest.mark.twisted
-@ensureDeferred
-async def testDeferToThreadWrapWithLoggerDefaultLogsError(
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    with caplog.at_level(logging.DEBUG, logger=logger.name):
-        try:
-            await _deferUtilTestFailingWorkLoud()
-            raise AssertionError("wrapped call must propagate the failure")
-        except ValueError:
-            pass
-
-    errorRecords = [
-        r
-        for r in caplog.records
-        if r.levelno >= logging.ERROR and "expected loud failure" in r.getMessage()
-    ]
-    assert errorRecords, (
-        "default logException=True must log thread failures at ERROR"
-    )

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/Jsonable.py

@@ -107,11 +107,9 @@ class Jsonable(object):
         try:
             valueType = V_NULL if value is None else toRapuiType(value)
         except KeyError as e:
-            unsupportedType = e.args[0] if e.args else value.__class__
             raise KeyError(
-                "%r field name is %r, type is %r"
-                % (unsupportedType, name, value.__class__)
-            ) from e
+                "%s field name is %s, type is %s", e, name, value.__class__
+            )
 
         # Payloads and Tuples
         if self.__isRawJsonableField(name):
@@ -292,8 +290,6 @@ class Jsonable(object):
         Returns and instance of this object populated with data from the json dict
         """
 
-        hints = utilTypeHintsForClass(type(self))
-
         # Use the fromJsonField code to convert all the values
         for name, value in list(jsonDict.items()):
             if name.startswith("_"):
@@ -301,21 +297,7 @@ class Jsonable(object):
 
             if self.__isRawJsonableField(name):
                 setattr(self, name, value)
-                continue
-
-            value = self.fromJsonField(value)
-
-            # Reconstruct enum members for fields annotated with an enum type.
-            # Serialisation emits the primitive value; the receiving class's
-            # annotation carries the enum class back into the member.
-            enumClass = utilEnumClassFromTypeHint(hints.get(name))
-            if (
-                enumClass is not None
-                and value is not None
-                and not isinstance(value, enumClass)
-            ):
-                value = enumClass(value)
-
-            setattr(self, name, value)
+            else:
+                setattr(self, name, self.fromJsonField(value))
 
         return self

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/PayloadEndpoint.py

@@ -22,32 +22,18 @@ from vortex.VortexAccessControlContextABC import (
     NO_AUTH_ACCESS_CONTROL_CONTEXT,
     VortexAccessControlContextABC,
 )
-from vortex.VortexEndpointPermission import (
-    EndpointPermissionsType as PermissionsType,
-)
+from vortex.VortexEndpointPermission import EndpointPermissionsType as PermissionsType
 from vortex.VortexSession import (
     _callableLabel,
     checkAccessControlContextSignature,
+    checkEndpointPermissionsSignature,
     checkNoHttpSessionInSignature,
+    checkNoVortexSessionInSignature,
 )
 
 logger = logging.getLogger(__name__)
 
 
-# TODO: typings needs to support keyword args before tbis will work.
-# PayloadEndpointProcessCallable = Callable[
-#     [
-#         ...
-#         # PayloadEnvelope,  # payloadEnvelope
-#         # str,  # vortexUuid
-#         # str,  # vortexName
-#         # Any,  # vortexSession
-#         # SendVortexMsgResponseCallable  # sendResponse
-#     ],
-#     Optional[Deferred]  # Return
-# ]
-
-
 class PayloadEndpoint:
     """
     The payload endpoint is responsible for matching payloads filters against
@@ -71,7 +57,6 @@ class PayloadEndpoint:
         acceptOnlyFromVortex: Optional[Union[str, tuple]] = None,
         ignoreFromVortex: Optional[Union[str, tuple]] = None,
         requiredPermissions: Optional[PermissionsType] = None,
-        logProcessException: bool = True,
     ) -> None:
         """
         :param filt: The filter to match against payloads
@@ -83,13 +68,8 @@ class PayloadEndpoint:
             the caller's session must hold.  Pass an empty frozenset to
             explicitly declare "no permissions required".  Omitting the
             parameter (``None``) emits a deprecation warning.
-        :param logProcessException: When True, handler exceptions log at ERROR.
-            When False, the same events log at DEBUG with neutral wording.
         """
-        self._requiredPermissions: Optional[PermissionsType] = (
-            requiredPermissions
-        )
-        self._logProcessException = logProcessException
+        self._requiredPermissions: Optional[PermissionsType] = requiredPermissions
 
         if requiredPermissions is None:
             logger.warning(self._NO_PERMISSIONS_WARNING, filt)
@@ -97,13 +77,18 @@ class PayloadEndpoint:
         callableDesc = (
             f"PayloadEndpoint filt={filt} callback={_callableLabel(callable_)}"
         )
-        self._callableAcceptsAccessControlContext = (
-            checkAccessControlContextSignature(
+        self._callableAcceptsAccessControlContext = checkAccessControlContextSignature(
+            callable_,
+            callableDescription=callableDesc,
+        )
+        self._callableAcceptsEndpointPermissions = (
+            checkEndpointPermissionsSignature(
                 callable_,
                 callableDescription=callableDesc,
             )
         )
         checkNoHttpSessionInSignature(callable_, callableDesc)
+        checkNoVortexSessionInSignature(callable_, callableDesc)
 
         self._acceptOnlyFromVortex = acceptOnlyFromVortex
         if isinstance(self._acceptOnlyFromVortex, str):
@@ -178,10 +163,7 @@ class PayloadEndpoint:
             return False
 
         # Filter for the backend vortexes.
-        if (
-            self._acceptOnlyFromVortex
-            and vortexName not in self._acceptOnlyFromVortex
-        ):
+        if self._acceptOnlyFromVortex and vortexName not in self._acceptOnlyFromVortex:
             return False
 
         def removeUnhashable(filt):
@@ -225,14 +207,13 @@ class PayloadEndpoint:
         if not self.check(payloadEnvelope, vortexName):
             return
 
-        if self.PERMITTER and not self.PERMITTER.check(
-            payloadEnvelope, vortexSession
-        ):
+        if self.PERMITTER and not self.PERMITTER.check(payloadEnvelope, vortexSession):
             logger.debug("Permission failed for %s", payloadEnvelope.filt)
             return
 
         # Level 1: Endpoint permission check
         auth = VortexFactory.getAuthenticator()
+        endpointPermissions = None
         if self._requiredPermissions:
             if not auth:
                 logger.error(
@@ -259,16 +240,26 @@ class PayloadEndpoint:
                 )
                 return
 
+        # Level 1 injection: when the callable declares endpointPermissions,
+        # compute the caller's permissions once here at the boundary so
+        # handlers never see the session or the authenticator.
+        if (
+            self._callableAcceptsEndpointPermissions
+            and endpointPermissions is None
+            and auth
+            and vortexSession
+        ):
+            endpointPermissions = yield maybeDeferred(
+                auth.getEndpointPermissions, vortexSession
+            )
+
         # Level 2: Get access control context, but only if the callback uses it.
         # Default to the sentinel so handlers always receive a non-None value
         # with a clear error on attribute access when auth is unavailable.
         accessControlContext = NO_AUTH_ACCESS_CONTROL_CONTEXT
         if self._callableAcceptsAccessControlContext and auth and vortexSession:
             raw_ctx = yield maybeDeferred(
-                auth.getAccessControlContext,
-                vortexSession,
-                vortexName,
-                vortexUuid,
+                auth.getAccessControlContext, vortexSession, vortexName, vortexUuid
             )
             if not isinstance(raw_ctx, VortexAccessControlContextABC):
                 logger.error(
@@ -283,15 +274,16 @@ class PayloadEndpoint:
 
         callable_ = self._wref()
         if callable_:
-            kwargs = dict(
+            kwargs: Dict[str, object] = dict(
                 payloadEnvelope=payloadEnvelope,
                 vortexUuid=vortexUuid,
                 vortexName=vortexName,
                 sendResponse=sendResponse,
-                vortexSession=vortexSession,
             )
             if self._callableAcceptsAccessControlContext:
                 kwargs["accessControlContext"] = accessControlContext
+            if self._callableAcceptsEndpointPermissions:
+                kwargs["endpointPermissions"] = endpointPermissions
             return (yield maybeDeferred(callable_, **kwargs))
         else:
             PayloadIO().remove(self)

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/PayloadEndpointTest.py

@@ -54,7 +54,6 @@ class PayloadEndpointPyTest(unittest.TestCase):
             payloadEnvelope=PayloadEnvelope(filt=payload.filt),
             vortexUuid="test",
             vortexName="test",
-            vortexSession=None,
             sendResponse=lambda x: x,
         )
 
@@ -143,7 +142,9 @@ class PayloadEndpointPyTest(unittest.TestCase):
 
         def subScope():
             inst = PayloadEndpointPyTestAssignPayload(self)
-            PayloadEndpoint(filt, inst.process, requiredPermissions=frozenset())
+            PayloadEndpoint(
+                filt, inst.process, requiredPermissions=frozenset()
+            )
 
         self._processEnvelope(payload)
         yield self._flushReactor()

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/PayloadEnvelope.py

@@ -57,9 +57,9 @@ class PayloadEnvelope(Jsonable):
     ) -> None:
         Jsonable.__init__(self)
         """Constructor"""
-        assert not (data and encodedPayload), (
-            "You can not pass encodedData and encodedPayload"
-        )
+        assert not (
+            data and encodedPayload
+        ), "You can not pass encodedData and encodedPayload"
 
         self.filt: Dict = {} if filt is None else filt
         self.data: Union[Any, str, None] = data if data else encodedPayload
@@ -75,18 +75,18 @@ class PayloadEnvelope(Jsonable):
     @property
     def encodedPayload(self) -> Optional[str]:
         # self.data could be from VortexJS/Typescript where we allow `str` data
-        assert self.data is None or isinstance(self.data, str), (
-            "Encoded payload is not None or a string"
-        )
+        assert self.data is None or isinstance(
+            self.data, str
+        ), "Encoded payload is not None or a string"
         return self.data
 
     @encodedPayload.setter
     def encodedPayload(self, val: Optional[str]):
         # This value should only be set from users of VortexPy and
         # Payload.toEncodedPayload so we only allow str or None
-        assert val is None or isinstance(val, str), (
-            "Encoded payload is not None or a string"
-        )
+        assert val is None or isinstance(
+            val, str
+        ), "Encoded payload is not None or a string"
         self.data = val
 
     def isEmpty(self):

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/PayloadIO.py

@@ -8,6 +8,7 @@
 
 import logging
 from datetime import datetime
+from typing import Optional
 
 import pytz
 from twisted.internet import reactor
@@ -59,8 +60,8 @@ class PayloadIO(object):
         payloadEnvelope: PayloadEnvelope,
         vortexUuid: str,
         vortexName: str,
-        vortexSession,
-        sendResponse: SendVortexMsgResponseCallable,
+        vortexSession=None,
+        sendResponse: Optional[SendVortexMsgResponseCallable] = None,
     ):
         from vortex.VortexFactory import VortexFactory
 
@@ -95,8 +96,8 @@ class PayloadIO(object):
         payloadEnvelope: PayloadEnvelope,
         vortexUuid: str,
         vortexName: str,
-        vortexSession,
-        sendResponse: SendVortexMsgResponseCallable,
+        vortexSession=None,
+        sendResponse: Optional[SendVortexMsgResponseCallable] = None,
     ):
         startDate = datetime.now(pytz.utc)
 
@@ -106,6 +107,10 @@ class PayloadIO(object):
             common function
             """
             try:
+                assert sendResponse is not None, (
+                    "PayloadIO._processLater: sendResponse must be set"
+                    " to respond to an exception"
+                )
                 sendResponse(
                     PayloadEnvelope(
                         filt=payloadEnvelope.filt,
@@ -115,15 +120,8 @@ class PayloadIO(object):
             except Exception as e:
                 logger.exception(e)
 
-            if endpoint._logProcessException:
-                vortexLogFailure(failure, logger)
-                logger.error(payloadEnvelope.filt)
-            else:
-                logger.debug(
-                    "Payload handler response for filt=%s: %s",
-                    payloadEnvelope.filt,
-                    failure.getErrorMessage(),
-                )
+            vortexLogFailure(failure, logger)
+            logger.error(payloadEnvelope.filt)
 
         def callback(value, blocking=False):
             # A blocking call taking more than 100ms is BAD

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/PayloadPriority.py

@@ -7,4 +7,5 @@
 # Support : contact@flyingion.com
 
 RPC_PRIORITY = 10
+HEARTBEAT_PRIORITY = 20
 DEFAULT_PRIORITY = 100

{vortexpy-4.3.6 → vortexpy-6.0.0}/vortex/PayloadResponse.py

@@ -67,7 +67,7 @@ class PayloadResponse(Deferred):
         destVortexUuid: Optional[str] = None,
         timeout: Optional[float] = None,
         resultCheck=True,
-        logTimeoutException=True,
+        logTimeoutError=True,
     ) -> None:
         """Constructor
 
@@ -81,8 +81,6 @@ class PayloadResponse(Deferred):
         :param timeout The timeout to wait for a response
         :param resultCheck Should the response payload.result be checked, if it fails
                     it errback will be called.
-        :param logTimeoutException: When True, payload timeouts log at ERROR.
-                    When False, timeouts log at DEBUG with neutral wording.
         """
         Deferred.__init__(self)
 
@@ -90,7 +88,7 @@ class PayloadResponse(Deferred):
             timeout = self.TIMEOUT
 
         self._resultCheck = resultCheck
-        self._logTimeoutException = logTimeoutException
+        self._logTimeoutError = logTimeoutError
 
         # uuid4 can have collisions
         self._messageId = str(uuid4()) + str(PayloadResponse.__SEQ)
@@ -144,10 +142,8 @@ class PayloadResponse(Deferred):
             self._endpoint.shutdown()
             self._endpoint = None
 
-        if self._logTimeoutException:
+        if self._logTimeoutError:
             logger.error("Timed out for payload %s", self._filt)
-        else:
-            logger.debug("Payload response timed out for %s", self._filt)
         self._status = self.TIMED_OUT
         return failure
 
@@ -157,7 +153,6 @@ class PayloadResponse(Deferred):
         vortexUuid: str,
         vortexName: str,
         sendResponse=None,
-        vortexSession=None,
     ):
         if self._endpoint:
             self._endpoint.shutdown()