vortexpy 4.0.18__tar.gz → 4.0.20__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexpy
-Version: 4.0.18
+Version: 4.0.20
 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.18 → vortexpy-4.0.20}/pyproject.toml

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

{vortexpy-4.0.18 → vortexpy-4.0.20}/vortex/DeferUtil.py

@@ -154,16 +154,23 @@ def deferToThreadWrapWithLogger(
             if inspect.isgenerator(result):
                 logger.error(
                     "Module Name %s, Class Name %s, Function Name %s"
-                    " has a yield in it. IT SHOULD NOT: ",
-                    funcToWrap.__name__,
+                    " has a yield in it. IT SHOULD NOT.",
                     funcToWrap.__module__,
                     funcToWrap.__class__.__name__,
+                    funcToWrap.__name__,
                 )
                 raise YieldInDeferToThreadException()
             return result
 
         def func(*args, **kwargs):
             if not twisted.python.threadable.isInIOThread() and checkMainThread:
+                logger.error(
+                    "Module Name %s, Class Name %s, Function Name %s"
+                    " is being deferred from a thread. IT SHOULD NOT.",
+                    funcToWrap.__module__,
+                    funcToWrap.__class__.__name__,
+                    funcToWrap.__name__,
+                )
                 raise Exception(
                     "Deferring to a thread can only be done from the main thread"
                 )

{vortexpy-4.0.18 → vortexpy-4.0.20}/vortex/Jsonable.py

@@ -6,6 +6,7 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import logging
 import traceback
 import typing
@@ -199,6 +200,13 @@ class Jsonable(object):
 
         # Tuple
         if valueType == T_RAPUI_TUPLE:
+            if not Jsonable.JSON_TUPLE_TYPE in value:
+                raise Exception(
+                    "Tuple is missing type field '_c',"
+                    " if this is a javascript tuple,"
+                    " ensure it's constructor calls super()"
+                )
+
             tupleType = value[Jsonable.JSON_TUPLE_TYPE]
 
             from .Tuple import TUPLE_TYPES_BY_NAME

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

@@ -61,6 +61,9 @@ V_TRUE = "1"
 V_FALSE = "0"
 
 ISO8601_ORA = "YYYY-MM-DD HH24:MI:SS.FF6"
+
+# This will print a date using TO_CHAR(), in the format fromStr() below expects
+ISO8601_ORA_WITH_TZ = "YYYY-MM-DD HH24:MI:SS.FF6TZHTZM"
 ISO8601 = "%Y-%m-%d %H:%M:%S.%f%z"
 ISO8601_JS_REGEXP = r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}[Z]{1}"
 ISO8601_JS_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"

{vortexpy-4.0.18 → vortexpy-4.0.20}/vortex/Tuple.py

@@ -6,6 +6,7 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import inspect
 import json
 import logging
@@ -33,7 +34,6 @@ from .SerialiseUtil import convertFromWkbElement
 
 logger = logging.getLogger(__name__)
 
-
 TUPLE_TYPES: list[Type["Tuple"]] = []
 TUPLE_TYPES_BY_NAME: Dict[str, Type["Tuple"]] = {}
 TUPLE_TYPES_BY_SHORT_NAME: Dict[str, Type["Tuple"]] = {}
@@ -611,6 +611,21 @@ class _TupleToPlainJsonMixin:
             extraTypeHint = getExtraTypeHint(fieldName)
             validator = getFieldValidatorFromExtraHint(extraTypeHint)
 
+            # If a value is not provided, but is required
+            #     Get the tupleField,
+            #     if it has and has a defaultValue
+            #         Then assign the default value
+            if value is None and not (type(None) in get_args(typeHint)):
+                tupleField = getattr(TupleClass, fieldName, None)
+                if (
+                    isinstance(tupleField, TupleField)
+                    and tupleField.defaultValue is not None
+                ):
+                    value = tupleField.defaultValue
+
+                # Cleanup, this is a long function
+                del tupleField
+
             if (
                 isinstance(value, str)
                 and datetime is typeHint
@@ -681,10 +696,10 @@ class _TupleToPlainJsonMixin:
                                 f" {valueTypeHint}, got {type(value)} instead"
                             )
 
-                        data[
-                            key
-                        ] = TupleClass.restfulJsonDictToTupleWithValidation(
-                            item, valueTypeHint
+                        data[key] = (
+                            TupleClass.restfulJsonDictToTupleWithValidation(
+                                item, valueTypeHint
+                            )
                         )
 
                 else:

{vortexpy-4.0.18 → vortexpy-4.0.20}/vortex/VortexUtil.py

@@ -241,6 +241,7 @@ def debounceCall(debounceSeconds: float):
 
             # Create a hash of the args
             hashedArgs = self.__wrapArgsAndKwargs(args, kwargs)
+            self.__cleanup()
 
             # If this method has never been called before, call it
             lastCallDate = self._calls.get(hashedArgs)
@@ -275,6 +276,8 @@ def debounceCall(debounceSeconds: float):
                     **kwargs,
                 )
 
+                return
+
             return
 
     def wrap(f):

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

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

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

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