vortexpy 4.0.22__tar.gz → 4.0.24__tar.gz

vortexpy-4.0.24/PKG-INFO

@@ -0,0 +1,44 @@
+Metadata-Version: 2.4
+Name: vortexpy
+Version: 4.0.24
+Summary: Synertys observable, routable, data serialisation and transport code.
+Author-email: Synerty <contact@synerty.com>
+License: MIT License
+        
+        Copyright (c) 2016 
+        
+        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.
+        
+Project-URL: Homepage, https://github.com/Synerty/vortexpy
+Project-URL: Download, https://github.com/Synerty/vortexpy/tarball/3.4.6
+Keywords: vortex,observable,http,compressed,synerty
+Classifier: Programming Language :: Python :: 3.5
+License-File: LICENSE
+Requires-Dist: SQLAlchemy>=2.0
+Requires-Dist: GeoAlchemy2
+Requires-Dist: txwebsocket>=1.1.0
+Requires-Dist: autobahn[twisted]
+Requires-Dist: vcversioner
+Requires-Dist: six
+Requires-Dist: pytz
+Requires-Dist: reactivex>=4.0.4
+Requires-Dist: ddt>=1.6.0
+Requires-Dist: psutil
+Requires-Dist: txhttputil>=1.2.0
+Dynamic: license-file

{vortexpy-4.0.22 → vortexpy-4.0.24}/pyproject.toml

@@ -2,9 +2,13 @@
 requires = ["setuptools>=61.2"]
 build-backend = "setuptools.build_meta"
 
+[metadata]
+license-file = "LICENSE"
+
 [project]
 name = "vortexpy"
-version = "4.0.22"
+version = "4.0.24"
+license = {file = "LICENSE"}
 authors = [{name = "Synerty", email = "contact@synerty.com"}]
 description = "Synertys observable, routable, data serialisation and transport code."
 keywords = [

vortexpy-4.0.24/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortex/DeferUtil.py

@@ -68,17 +68,38 @@ def ensureDeferredWrap(funcToWrap):
 
 
 def vortexLogFailure(failure, loggerArg, consumeError=False, successValue=True):
+    """
+    Log a Twisted Failure instance using the provided logger.
+
+    Args:
+        failure: Twisted Failure instance to log
+        loggerArg: Logger instance to use for logging
+        consumeError: If True, returns successValue instead of the failure
+        successValue: Value to return if consumeError is True
+
+    Returns:
+        The original failure or successValue depending on consumeError
+    """
     try:
         if not hasattr(failure, "_vortexFailureLogged"):
-            if isinstance(failure.value, Exception):
-                loggerArg.exception(failure.value)
-            elif failure.getTraceback():
-                loggerArg.error(failure.getTraceback())
+            exc_info = (
+                failure.type,
+                failure.value,
+                failure.getTracebackObject(),
+            )
 
+            # Log with full exception info for better tracebacks
+            loggerArg.exception(str(failure.value), exc_info=exc_info)
+
+            # Mark as logged to prevent duplicate logging
             failure._vortexFailureLogged = True
+
         return successValue if consumeError else failure
+
     except Exception as e:
-        logger.exception(e)
+        # If something goes wrong in our logging logic, log that error
+        loggerArg.exception("Error while logging failure: %s", str(e))
+        return failure
 
 
 def vortexLogAndConsumeFailure(failure, loggerArg, successValue=True):

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortex/Tuple.py

@@ -14,7 +14,7 @@ import re
 from abc import abstractmethod, ABC
 from copy import deepcopy
 from datetime import datetime
-from typing import Dict, Optional, Annotated
+from typing import Dict, Optional, Annotated, Any
 from typing import List
 from typing import Type
 from typing import get_args
@@ -850,10 +850,20 @@ class Tuple(Jsonable, _TupleToPlainJsonMixin, _TupleToSqlaJsonMixin):
             return False
         return cls.__tupleType__ == other.__tupleType__
 
-    def tupleClone(self):
+    def tupleClone(self, deep=False):
         clone = self.__class__()
+
+        def cloneVal(anyVal: Any):
+            if isinstance(anyVal, list):
+                return [cloneVal(v) for v in anyVal]
+            if isinstance(anyVal, Tuple):
+                return anyVal.tupleClone()
+            return anyVal
+
         for name in self.__fieldNames__:
             val = getattr(self, name)
+            if deep:
+                val = cloneVal(val)
             if val is not None:
                 setattr(clone, name, val)
 

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortex/__init__.py

@@ -7,4 +7,4 @@
  * Support : support@synerty.com
 """
 
-__version__ = '4.0.22'
+__version__ = '4.0.24'

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortex/handler/TupleDataObservableCache.py

@@ -109,6 +109,13 @@ class TupleDataObservableCache(metaclass=ABCMeta):
     def __init__(self) -> None:
         self.__cache: Dict[str, _CachedSubscribedData] = {}
 
+    def start(self):
+
+        self.__pollLoopingCall = task.LoopingCall(self.__cacheCheck)
+
+        d = self.__pollLoopingCall.start(self.__CHECK_PERIOD, now=False)
+        d.addErrback(vortexLogFailure, logger, consumeError=True)
+
     def shutdown(self):
         if not self.__pollLoopingCall:
             raise Exception("This has already been shutdown")
@@ -122,13 +129,6 @@ class TupleDataObservableCache(metaclass=ABCMeta):
 
         self.__cache = {}
 
-    def start(self):
-
-        self.__pollLoopingCall = task.LoopingCall(self.__cacheCheck)
-
-        d = self.__pollLoopingCall.start(self.__CHECK_PERIOD, now=False)
-        d.addErrback(vortexLogFailure, logger, consumeError=True)
-
     def _tupleSelectors(self) -> typing.List[TupleSelector]:
         tupleSelectors = []
         for key in self.__cache:
@@ -138,21 +138,24 @@ class TupleDataObservableCache(metaclass=ABCMeta):
     ## ----- Implement local observable
 
     def __cacheCheck(self):
-        currentVortexUuids = set(VortexFactory.getRemoteVortexUuids())
+        try:
+            currentVortexUuids = set(VortexFactory.getRemoteVortexUuids())
 
-        for ts, cache in list(self.__cache.items()):
-            cache.vortexUuids = cache.vortexUuids & currentVortexUuids
+            for ts, cache in list(self.__cache.items()):
+                cache.vortexUuids = cache.vortexUuids & currentVortexUuids
 
-            if cache.vortexUuids or cache.subject.observers:
-                cache.resetTearDown()
+                if cache.vortexUuids or cache.subject.observers:
+                    cache.resetTearDown()
 
-            elif cache.isReadyForTearDown():
-                logger.debug("Cleaning cache for %s", cache.tupleSelector)
-                self._sendUnsubscribeToServer(cache.tupleSelector)
-                del self.__cache[ts]
+                elif cache.isReadyForTearDown():
+                    logger.debug("Cleaning cache for %s", cache.tupleSelector)
+                    self._sendUnsubscribeToServer(cache.tupleSelector)
+                    del self.__cache[ts]
 
-            else:
-                cache.markForTearDown()
+                else:
+                    cache.markForTearDown()
+        except Exception as e:
+            logger.error("Looping call __cacheCheck threw exception: %s", e)
 
     def _getCache(
         self, tupleSelector: TupleSelector

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortex/handler/TupleDataObservableHandler.py

@@ -195,6 +195,7 @@ class TupleDataObservableHandler:
         sendResponse: SendVortexMsgResponseCallable,
         **kwargs,
     ):
+
         if not VortexFactory.isVortexUuidOnline(vortexUuid):
             logger.debug(
                 "Vortex %s is no longer online, skipping reply", vortexUuid
@@ -215,16 +216,24 @@ class TupleDataObservableHandler:
         # Handle unsubscribe
         if payloadEnvelope.filt.get("unsubscribe"):
             if tsStr in self._observerDataByTupleSelector:
-                try:
-                    self._observerDataByTupleSelector[tsStr].observers.remove(
-                        observerDetails
+                observers = self._observerDataByTupleSelector[tsStr].observers
+                if observerDetails in observers:
+                    observers.remove(observerDetails)
+                    logger.debug(f"Processed unsubscribe for: {tsStr}")
+                else:
+                    logger.debug(
+                        "Unsubscribe called for missing subscription: %s",
+                        tsStr,
                     )
 
-                except KeyError:
-                    pass
-
                 if not self._observerDataByTupleSelector[tsStr].observers:
+                    logger.debug(f"Last subscription unsubscribed for {tsStr}")
                     del self._observerDataByTupleSelector[tsStr]
+            else:
+                logger.debug(
+                    "Unsubscribe called for non-existent tuple selector: %s",
+                    tsStr,
+                )
 
             return
 

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortex/handler/TupleDataObservableProxyHandler.py

@@ -173,10 +173,14 @@ class TupleDataObservableProxyHandler(TupleDataObservableCache):
             return
 
         cache = self._getCache(tupleSelector)
-        try:
+        if vortexUuid in cache.vortexUuids:
             cache.vortexUuids.remove(vortexUuid)
-        except KeyError:
-            pass
+        else:
+            logger.debug(
+                "VortexUuid %s not found in cache for %s",
+                vortexUuid,
+                tupleSelector.toJsonStr(),
+            )
 
     def _handleSubscribe(
         self,
@@ -219,14 +223,16 @@ class TupleDataObservableProxyHandler(TupleDataObservableCache):
 
     def _sendRequestToServer(self, payloadEnvelope: PayloadEnvelope):
         payloadEnvelope.filt["observerName"] = self._observerName
+        vortexMsg = payloadEnvelope.toVortexMsg()
         d = VortexFactory.sendVortexMsg(
-            vortexMsgs=payloadEnvelope.toVortexMsg(),
+            vortexMsgs=vortexMsg,
             destVortexName=self._proxyToVortexName,
         )
         d.addErrback(vortexLogFailure, logger, consumeError=True)
 
     def _sendUnsubscribeToServer(self, tupleSelector: TupleSelector):
-        payloadEnvelope = PayloadEnvelope()
+        logger.debug("Sending unsubscribe for: %s", tupleSelector.name)
+        payloadEnvelope = PayloadEnvelope(filt=self._filt.copy())
         payloadEnvelope.filt["tupleSelector"] = tupleSelector
         payloadEnvelope.filt["unsubscribe"] = True
         self._sendRequestToServer(payloadEnvelope)

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortex/handler/TupleDataObserverClient.py

@@ -63,9 +63,9 @@ class TupleDataObserverClient(TupleDataObservableCache):
         # .subscribe(online= > self.vortexOnlineChanged())
         #
         # self.onDestroyEvent.subscribe(() = > isOnlineSub.unsubscribe())
-        VortexFactory.subscribeToVortexStatusChange(destVortexName).pipe(ops.filter(
-            lambda online: online is True
-        )).subscribe(self._vortexOnlineChanged)
+        VortexFactory.subscribeToVortexStatusChange(destVortexName).pipe(
+            ops.filter(lambda online: online is True)
+        ).subscribe(self._vortexOnlineChanged)
 
         TupleDataObservableCache.start(self)
 
@@ -152,7 +152,8 @@ class TupleDataObserverClient(TupleDataObservableCache):
         d.addErrback(vortexLogFailure, logger, consumeError=True)
 
     def _sendUnsubscribeToServer(self, tupleSelector: TupleSelector):
-        payload = PayloadEnvelope()
+        logger.debug("Sending unsubscribe for: %s", tupleSelector.name)
+        payload = PayloadEnvelope(self._sendFilt.copy())
         payload.filt["tupleSelector"] = tupleSelector
         payload.filt["unsubscribe"] = True
         self._sendRequestToServer(payload)

vortexpy-4.0.24/vortexpy.egg-info/PKG-INFO

@@ -0,0 +1,44 @@
+Metadata-Version: 2.4
+Name: vortexpy
+Version: 4.0.24
+Summary: Synertys observable, routable, data serialisation and transport code.
+Author-email: Synerty <contact@synerty.com>
+License: MIT License
+        
+        Copyright (c) 2016 
+        
+        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.
+        
+Project-URL: Homepage, https://github.com/Synerty/vortexpy
+Project-URL: Download, https://github.com/Synerty/vortexpy/tarball/3.4.6
+Keywords: vortex,observable,http,compressed,synerty
+Classifier: Programming Language :: Python :: 3.5
+License-File: LICENSE
+Requires-Dist: SQLAlchemy>=2.0
+Requires-Dist: GeoAlchemy2
+Requires-Dist: txwebsocket>=1.1.0
+Requires-Dist: autobahn[twisted]
+Requires-Dist: vcversioner
+Requires-Dist: six
+Requires-Dist: pytz
+Requires-Dist: reactivex>=4.0.4
+Requires-Dist: ddt>=1.6.0
+Requires-Dist: psutil
+Requires-Dist: txhttputil>=1.2.0
+Dynamic: license-file

{vortexpy-4.0.22 → vortexpy-4.0.24}/vortexpy.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-setup.cfg
 vortex/DataWrapTuple.py
 vortex/DeferUtil.py
 vortex/Jsonable.py

vortexpy-4.0.22/PKG-INFO

@@ -1,21 +0,0 @@
-Metadata-Version: 2.1
-Name: vortexpy
-Version: 4.0.22
-Summary: Synertys observable, routable, data serialisation and transport code.
-Author-email: Synerty <contact@synerty.com>
-Project-URL: Homepage, https://github.com/Synerty/vortexpy
-Project-URL: Download, https://github.com/Synerty/vortexpy/tarball/3.4.6
-Keywords: vortex,observable,http,compressed,synerty
-Classifier: Programming Language :: Python :: 3.5
-License-File: LICENSE
-Requires-Dist: SQLAlchemy>=2.0
-Requires-Dist: GeoAlchemy2
-Requires-Dist: txwebsocket>=1.1.0
-Requires-Dist: autobahn[twisted]
-Requires-Dist: vcversioner
-Requires-Dist: six
-Requires-Dist: pytz
-Requires-Dist: reactivex>=4.0.4
-Requires-Dist: ddt>=1.6.0
-Requires-Dist: psutil
-Requires-Dist: txhttputil>=1.2.0

vortexpy-4.0.22/setup.cfg

@@ -1,7 +0,0 @@
-[metadata]
-description-file = README.md
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

vortexpy-4.0.22/vortexpy.egg-info/PKG-INFO

@@ -1,21 +0,0 @@
-Metadata-Version: 2.1
-Name: vortexpy
-Version: 4.0.22
-Summary: Synertys observable, routable, data serialisation and transport code.
-Author-email: Synerty <contact@synerty.com>
-Project-URL: Homepage, https://github.com/Synerty/vortexpy
-Project-URL: Download, https://github.com/Synerty/vortexpy/tarball/3.4.6
-Keywords: vortex,observable,http,compressed,synerty
-Classifier: Programming Language :: Python :: 3.5
-License-File: LICENSE
-Requires-Dist: SQLAlchemy>=2.0
-Requires-Dist: GeoAlchemy2
-Requires-Dist: txwebsocket>=1.1.0
-Requires-Dist: autobahn[twisted]
-Requires-Dist: vcversioner
-Requires-Dist: six
-Requires-Dist: pytz
-Requires-Dist: reactivex>=4.0.4
-Requires-Dist: ddt>=1.6.0
-Requires-Dist: psutil
-Requires-Dist: txhttputil>=1.2.0