vortexpy 4.0.15__tar.gz → 4.0.18__tar.gz

{vortexpy-4.0.15 → vortexpy-4.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexpy
-Version: 4.0.15
+Version: 4.0.18
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 Project-URL: Homepage, https://github.com/Synerty/vortexpy

{vortexpy-4.0.15 → vortexpy-4.0.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "4.0.15"
+version = "4.0.18"
 authors = [{name = "Synerty", email = "contact@synerty.com"}]
 description = "Synertys observable, routable, data serialisation and transport code."
 keywords = [

{vortexpy-4.0.15 → vortexpy-4.0.18}/vortex/SerialiseUtil.py

@@ -6,12 +6,14 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import decimal
 import logging
 from base64 import b64encode, b64decode
 from collections import defaultdict
 from datetime import datetime, date
 
+import pytz
 from sqlalchemy.orm.collections import InstrumentedList
 
 logger = logging.getLogger(__name__)
@@ -210,11 +212,16 @@ def fromStr(val: str, typeName: str):
     if typeName == T_DATETIME:
         # TODO: Check with ISO8601_JS_REGEXP
         if len(val) == len("2017-06-06T09:40:37.097Z"):
-            return datetime.strptime(val, ISO8601_JS_FORMAT)
+            return datetime.strptime(val, ISO8601_JS_FORMAT).replace(
+                tzinfo=pytz.UTC
+            )
 
         if len(val) <= len("2017-06-06 09:40:37.097068"):
-            logger.warning("Parsing date time with no timezone: %s", val)
-            return datetime.strptime(val, ISO8601_NOTZ)
+            logger.warning(
+                "Parsing date time with no timezone: %s Setting TZ to UTC",
+                val,
+            )
+            return datetime.strptime(val, ISO8601_NOTZ).replace(tzinfo=pytz.UTC)
 
         return datetime.strptime(val, ISO8601)
 

{vortexpy-4.0.15 → vortexpy-4.0.18}/vortex/__init__.py

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

{vortexpy-4.0.15 → vortexpy-4.0.18}/vortex/data_loader/TupleDataLiveLockManager.py

@@ -131,6 +131,7 @@ class _LockState:
             + self.tupleDataSelector.toJsonStr()
         )
         self._locked = False
+        self.lockTouched = datetime.now(pytz.UTC)
         self.unlockedByDelegateUuid = delegateUuid
 
         self.liveUpdateDataTuple = None
@@ -174,20 +175,23 @@ class TupleDataLiveLockManager:
 
     def _checkLockExpired(self):
         for (
-            dataTupleType,
+            tupleDataType,
             lockStateByDataSelector,
         ) in list(self._lockStateByDataSelectorByDataTupleType.items()):
             for (
                 tupleSelectorStr,
                 lockState,
             ) in list(lockStateByDataSelector.items()):
-                if lockState.expired:
-                    logger.info(
-                        "Unlocking. Lock expired for %s", tupleSelectorStr
-                    )
+                if not lockState.expired:
+                    continue
+
+                logger.info("Unlocking. Lock expired for %s", tupleSelectorStr)
+                if lockState.locked:
                     self.unlock(
                         lockState.tupleDataSelector, "_checkLockExpired"
                     )
+                else:
+                    lockStateByDataSelector.pop(tupleSelectorStr, None)
 
     def _lock(
         self,

{vortexpy-4.0.15 → vortexpy-4.0.18}/vortexpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexpy
-Version: 4.0.15
+Version: 4.0.18
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 Project-URL: Homepage, https://github.com/Synerty/vortexpy