perf: speedup date parsing using ciso8601

.github/workflows/main.yml

@@ -37,6 +37,9 @@ jobs:
         pip install --upgrade --upgrade-strategy eager --pre -e .[test] pytest-cov codecov 'coverage<5'
         pip freeze
     - name: Run the tests
-      run: py.test --cov jupyter_client jupyter_client
+      run:  |
+        py.test --cov jupyter_client jupyter_client
+        pip install ciso8601
+        py.test --cov jupyter_client jupyter_client
     - name: Code coverage
       run: codecov

jupyter_client/jsonutil.py

@@ -6,6 +6,10 @@
 from datetime import datetime
 import re
 import warnings
+try:
+    import ciso8601
+except ImportError:
+    ciso8601 = None
 
 from dateutil.parser import parse as _dateutil_parse
 from dateutil.tz import tzlocal
@@ -52,7 +56,10 @@ def parse_date(s):
         return s
     m = ISO8601_PAT.match(s)
     if m:
-        dt = _dateutil_parse(s)
+        if ciso8601 is not None:
+            dt = ciso8601.parse_datetime(s)
+        else:
+            dt = _dateutil_parse(s)
         return _ensure_tzinfo(dt)
     return s
 

jupyter_client/session.py

@@ -38,7 +38,7 @@
 
 from traitlets.config.configurable import Configurable, LoggingConfigurable
 from ipython_genutils.importstring import import_item
-from jupyter_client.jsonutil import extract_dates, squash_dates, date_default
+from jupyter_client.jsonutil import extract_dates, squash_dates, date_default, parse_date
 from ipython_genutils.py3compat import str_to_bytes, str_to_unicode
 from traitlets import (
     CBytes, Unicode, Bool, Any, Instance, Set, DottedObjectName, CUnicode,
@@ -928,10 +928,14 @@ def deserialize(self, msg_list, content=True, copy=True):
         if not len(msg_list) >= minlen:
             raise TypeError("malformed message, must have at least %i elements"%minlen)
         header = self.unpack(msg_list[1])
-        message['header'] = extract_dates(header)
+
+        message['header'] = header
+        message['header']['date'] = parse_date(message['header']['date'])
         message['msg_id'] = header['msg_id']
         message['msg_type'] = header['msg_type']
-        message['parent_header'] = extract_dates(self.unpack(msg_list[2]))
+        message['parent_header'] = self.unpack(msg_list[2])
+        if 'date' in message['parent_header']:
+            message['parent_header']['date'] = parse_date(message['parent_header']['date'])
         message['metadata'] = self.unpack(msg_list[3])
         if content:
             message['content'] = self.unpack(msg_list[4])

jupyter_client/tests/test_performance.py

@@ -0,0 +1,23 @@
+import pytest
+
+from jupyter_client import session as ss
+
+from .test_session import SessionTestCase
+
+@pytest.mark.usefixtures('benchmark')
+class TestPerformance(SessionTestCase):
+    @pytest.fixture(autouse=True)
+    def _request_benchmark(self, benchmark):
+        self.benchmark = benchmark
+
+    def test_deserialize_performance(self):
+        def run(data):
+            self.session.digest_history = []
+            self.session.deserialize(self.session.feed_identities(data)[1])
+        content = dict(t=ss.utcnow())
+        metadata = dict(t=ss.utcnow())
+        self.session.auth = None
+        p = self.session.msg('msg')
+        msg = self.session.msg('msg', content=content, metadata=metadata, parent=p['header'])
+        data = self.session.serialize(msg)
+        self.benchmark(run, data)

jupyter_client/tests/test_session.py

@@ -344,3 +344,4 @@ def test_clone(self):
         s._add_digest(digest)
         assert digest in s.digest_history
         assert digest not in s2.digest_history
+

setup.py

@@ -77,7 +77,7 @@ def run(self):
     ],
     python_requires  = '>=3.5',
     extras_require   = {
-        'test': ['ipykernel', 'ipython', 'mock', 'pytest', 'pytest-asyncio', 'async_generator', 'pytest-timeout'],
+        'test': ['ipykernel', 'ipython', 'mock', 'pytest', 'pytest-asyncio', 'async_generator', 'pytest-timeout', 'pytest-benchmark'],
         'doc': open('docs/requirements.txt').read().splitlines(),
     },
     cmdclass         = {