vortexpy 6.1.1__tar.gz → 6.1.2__tar.gz

{vortexpy-6.1.1 → vortexpy-6.1.2}/PKG-INFO

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

{vortexpy-6.1.1 → vortexpy-6.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "6.1.1"
+version = "6.1.2"
 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-6.1.1 → vortexpy-6.1.2}/vortex/Tuple.py

@@ -29,6 +29,9 @@ from .SerialiseUtil import ISO8601
 from .SerialiseUtil import T_RAPUI_TUPLE
 from .SerialiseUtil import WKBElement
 from .SerialiseUtil import convertFromWkbElement
+from .SerialiseUtil import datetimeToBson
+from .SerialiseUtil import datetimeToBsonMicroseconds
+from .SerialiseUtil import requireAwareDatetime
 
 logger = logging.getLogger(__name__)
 
@@ -319,6 +322,28 @@ class TupleField:
         self.jsonExclude = jsonExclude
         self.bsonDatetimeFormat = bsonDatetimeFormat
 
+    def toBson(self, value: Any) -> Any:
+        """Convert a datetime to this field's BSON storage format.
+
+        Non-datetime values pass through unchanged, so every Mongo
+        filter value can be wrapped uniformly. Naive datetimes raise
+        ``TypeError``.
+        """
+        if not isinstance(value, datetime):
+            return value
+        aware = requireAwareDatetime(value)
+        if self.bsonDatetimeFormat is None:
+            return datetimeToBson(aware)
+        if self.bsonDatetimeFormat is BsonDatetimeFormatE.standardMsIntEpoch:
+            return datetimeToBson(aware)
+        if self.bsonDatetimeFormat is BsonDatetimeFormatE.standardUsIntEpoch:
+            return datetimeToBsonMicroseconds(aware)
+        if self.bsonDatetimeFormat is BsonDatetimeFormatE.standardMsBsonDate:
+            return aware
+        raise NotImplementedError(
+            f"Unsupported BsonDatetimeFormatE {self.bsonDatetimeFormat!r}"
+        )
+
 
 class PolymorphicTupleTypeFieldArg:
     def __init__(self, fieldName: str):

{vortexpy-6.1.1 → vortexpy-6.1.2}/vortex/TupleBson.py

@@ -43,7 +43,6 @@ from .SerialiseUtil import WKBElement
 from .SerialiseUtil import convertFromWkbElement
 from .SerialiseUtil import datetimeFromBson
 from .SerialiseUtil import datetimeToBson
-from .SerialiseUtil import datetimeToBsonMicroseconds
 from .SerialiseUtil import requireAwareDatetime
 from .Tuple import BsonDatetimeFormatE
 from .Tuple import TupleField
@@ -65,24 +64,6 @@ class TupleBsonConverter(TupleDocumentConverterBase):
             return tupleField.bsonDatetimeFormat
         return None
 
-    @classmethod
-    def _utilDatetimeToBsonStorageValue(
-        cls,
-        value: datetime,
-        bsonDatetimeFormat: BsonDatetimeFormatE | None,
-    ) -> datetime | int:
-        if bsonDatetimeFormat is None:
-            return datetimeToBson(value)
-        if bsonDatetimeFormat is BsonDatetimeFormatE.standardMsIntEpoch:
-            return datetimeToBson(value)
-        if bsonDatetimeFormat is BsonDatetimeFormatE.standardUsIntEpoch:
-            return datetimeToBsonMicroseconds(value)
-        if bsonDatetimeFormat is BsonDatetimeFormatE.standardMsBsonDate:
-            return requireAwareDatetime(value)
-        raise NotImplementedError(
-            f"Unsupported BsonDatetimeFormatE {bsonDatetimeFormat!r}"
-        )
-
     @classmethod
     def _utilCoerceIntOrFloatEpochToDatetime(
         cls,
@@ -145,7 +126,7 @@ class TupleBsonConverter(TupleDocumentConverterBase):
 
         def convert(
             value: Any,
-            bsonDatetimeFormat: BsonDatetimeFormatE | None = None,
+            tupleField: TupleField | None = None,
         ) -> Any:
             if isinstance(value, list):
                 return [convert(item) for item in value]
@@ -165,17 +146,18 @@ class TupleBsonConverter(TupleDocumentConverterBase):
                 return None
 
             if isinstance(value, datetime):
-                return cls._utilDatetimeToBsonStorageValue(value, bsonDatetimeFormat)
+                if tupleField is None:
+                    return datetimeToBson(value)
+                return tupleField.toBson(value)
 
             return value
 
         for shortName, normalName in tuple_.__shortFieldNamesMap__.items():
             tupleField = getattr(type(tuple_), normalName, None)
-            fieldFormat: BsonDatetimeFormatE | None = None
-            if isinstance(tupleField, TupleField):
-                fieldFormat = tupleField.bsonDatetimeFormat
+            if not isinstance(tupleField, TupleField):
+                tupleField = None
 
-            value = convert(getattr(tuple_, normalName), fieldFormat)
+            value = convert(getattr(tuple_, normalName), tupleField)
             if value is None and not includeNones:
                 continue
             if value is False and not includeFalse:

{vortexpy-6.1.1 → vortexpy-6.1.2}/vortex/TupleBson_test.py

@@ -250,6 +250,33 @@ class TupleBsonTest(unittest.TestCase):
         )
         self.assertEqual(deserialisedTuple.at, aware)
 
+    def testTupleFieldToBsonConvertsDatetimePerFormat(self) -> None:
+        aware = datetime(2020, 1, 2, 3, 4, 5, 678000, tzinfo=UTC)
+        self.assertEqual(
+            BsonDatetimeFormatTestTuple.defaultMsDate.toBson(aware),
+            datetimeToBson(aware),
+        )
+        self.assertEqual(
+            BsonDatetimeFormatTestTuple.microsecondDate.toBson(aware),
+            datetimeToBsonMicroseconds(aware),
+        )
+        self.assertEqual(
+            BsonDatetimeFormatTestTuple.bsonDateField.toBson(aware),
+            aware,
+        )
+
+    def testTupleFieldToBsonPassesThroughNonDatetimeValues(self) -> None:
+        field = BsonDatetimeFormatTestTuple.defaultMsDate
+        self.assertEqual(field.toBson("2026-10-23"), "2026-10-23")
+        self.assertEqual(field.toBson(1577934245678), 1577934245678)
+        self.assertIs(field.toBson(True), True)
+        self.assertIsNone(field.toBson(None))
+
+    def testTupleFieldToBsonRejectsNaiveDatetime(self) -> None:
+        naive = datetime(2020, 1, 2, 3, 4, 5, 678000)
+        with self.assertRaises(TypeError):
+            BsonDatetimeFormatTestTuple.defaultMsDate.toBson(naive)
+
 
 class TupleBsonCollectingTest(unittest.TestCase):
     def testSingleBadScalarCollectsErrorAndPopulatesOtherFields(self) -> None:

{vortexpy-6.1.1 → vortexpy-6.1.2}/vortex/__init__.py

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

{vortexpy-6.1.1 → vortexpy-6.1.2}/vortexpy.egg-info/PKG-INFO

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