crate 2.0.0.dev5__py3-none-any.whl → 2.0.0.dev6__py3-none-any.whl

crate/client/__init__.py

@@ -29,7 +29,7 @@ __all__ = [
 
 # version string read from setup.py using a regex. Take care not to break the
 # regex!
-__version__ = "2.0.0.dev5"
+__version__ = "2.0.0.dev6"
 
 # codeql[py/unused-global-variable]
 apilevel = "2.0"

crate/client/http.py

@@ -20,6 +20,8 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 
+import calendar
+import datetime as dt
 import heapq
 import io
 import logging
@@ -84,19 +86,35 @@ def super_len(o):
     return None
 
 
-def cratedb_json_encoder(obj: t.Any) -> str:
+epoch_aware = dt.datetime(1970, 1, 1, tzinfo=dt.timezone.utc)
+epoch_naive = dt.datetime(1970, 1, 1)
+
+
+def json_encoder(obj: t.Any) -> t.Union[int, str]:
     """
     Encoder function for orjson, with additional type support.
 
-    - Python's `Decimal` type.
-    - freezegun's `FakeDatetime` type.
+    - Python's `Decimal` type will be serialized to `str`.
+    - Python's `dt.datetime` and `dt.date` types will be
+      serialized to `int` after converting to milliseconds
+      since epoch.
 
     https://github.com/ijl/orjson#default
+    https://cratedb.com/docs/crate/reference/en/latest/general/ddl/data-types.html#type-timestamp
     """
     if isinstance(obj, Decimal):
         return str(obj)
-    elif hasattr(obj, "isoformat"):
-        return obj.isoformat()
+    if isinstance(obj, dt.datetime):
+        if obj.tzinfo is not None:
+            delta = obj - epoch_aware
+        else:
+            delta = obj - epoch_naive
+        return int(
+            delta.microseconds / 1000.0
+            + (delta.seconds + delta.days * 24 * 3600) * 1000.0
+        )
+    if isinstance(obj, dt.date):
+        return calendar.timegm(obj.timetuple()) * 1000
     raise TypeError
 
 
@@ -108,8 +126,12 @@ def json_dumps(obj: t.Any) -> bytes:
     """
     return orjson.dumps(
         obj,
-        default=cratedb_json_encoder,
-        option=(orjson.OPT_NON_STR_KEYS | orjson.OPT_SERIALIZE_NUMPY),
+        default=json_encoder,
+        option=(
+            orjson.OPT_PASSTHROUGH_DATETIME
+            | orjson.OPT_NON_STR_KEYS
+            | orjson.OPT_SERIALIZE_NUMPY
+        ),
     )
 
 

{crate-2.0.0.dev5.dist-info → crate-2.0.0.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: crate
-Version: 2.0.0.dev5
+Version: 2.0.0.dev6
 Summary: CrateDB Python Client
 Home-page: https://github.com/crate/crate-python
 Author: Crate.io

{crate-2.0.0.dev5.dist-info → crate-2.0.0.dev6.dist-info}/RECORD

@@ -1,17 +1,17 @@
-crate/client/__init__.py,sha256=ApP2LvuWsycIceLILaXsUgyFR96CcOx7C7hI5OXEdtc,1349
+crate/client/__init__.py,sha256=Mu7v8I3SFaCqVv2FueZnU6v0IZYjdUaihbaHTkATTLM,1349
 crate/client/_pep440.py,sha256=iwY5wopxbgbwsT0ImANrwN3V_ZYQHhSr7lEdVT5dQRM,42
 crate/client/blob.py,sha256=aMo6ZNHGT3Zq_yR3gcpd3CKrJvfqUAhExhKtHUwC5Io,3460
 crate/client/connection.py,sha256=80v9_--YilDAaIQpejf3G_TWGz9iwUkixwHAL66sDm0,8098
 crate/client/converter.py,sha256=Qci0MNcpz1jAnjquG8Ld9LI84_iHVInrv4HMb8r5zzg,4313
 crate/client/cursor.py,sha256=Mlk-TVLzM4zSSr7GxcHK4Mjbt1KQeMfNFNrPBtGjk-c,10741
 crate/client/exceptions.py,sha256=wMyJmOB3RP5kuPeW9f0fEb-1AKZcGSTyIGvN0HqpqUw,2557
-crate/client/http.py,sha256=b_EVzChq6FGQg4tNc-3fheUas9mybQJI4aMHKYVpGEU,22513
+crate/client/http.py,sha256=wNTlFOwYv9R4dMWvaZ7b-U-uzUwLNJB7pknwiE_QGkE,23270
 crate/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crate/testing/layer.py,sha256=jvHRWTRE4Zal211UO0HWPFcbprAcaGB3WyAUDR7BKFQ,13376
 crate/testing/util.py,sha256=BPEZ8DavXwyOTCmOQnP5QjQlapEw3harzKK4w2HOTA4,3264
-crate-2.0.0.dev5.dist-info/LICENSE,sha256=s_w3FXmAYQuatqsgvyYLnGyC_13KOqp3W1DUEXO9RpY,10175
-crate-2.0.0.dev5.dist-info/METADATA,sha256=GpJuX0mupTBanwtxvK3MJhMYRAyhdnhl48NtkeCPNsw,5655
-crate-2.0.0.dev5.dist-info/NOTICE,sha256=jfWOHkoZKjNATGXMfgpMJdL38ki_ZZTgR6M9CUUJxrM,1159
-crate-2.0.0.dev5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-crate-2.0.0.dev5.dist-info/top_level.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
-crate-2.0.0.dev5.dist-info/RECORD,,
+crate-2.0.0.dev6.dist-info/LICENSE,sha256=s_w3FXmAYQuatqsgvyYLnGyC_13KOqp3W1DUEXO9RpY,10175
+crate-2.0.0.dev6.dist-info/METADATA,sha256=AEedSYqZFFHb7rO2c7pOXUE3S3d-zbU8CuRK-DoKADE,5655
+crate-2.0.0.dev6.dist-info/NOTICE,sha256=jfWOHkoZKjNATGXMfgpMJdL38ki_ZZTgR6M9CUUJxrM,1159
+crate-2.0.0.dev6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+crate-2.0.0.dev6.dist-info/top_level.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
+crate-2.0.0.dev6.dist-info/RECORD,,