conkernelclient 0.0.4__tar.gz → 0.0.6__tar.gz

{conkernelclient-0.0.4/conkernelclient.egg-info → conkernelclient-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conkernelclient
-Version: 0.0.4
+Version: 0.0.6
 Summary: Concurrent-safe Jupyter KernelClient
 Author-email: Jeremy Howard <github@jhoward.fastmail.fm>
 License: Apache-2.0

conkernelclient-0.0.6/conkernelclient/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "0.0.6"
+from .core import *

{conkernelclient-0.0.4 → conkernelclient-0.0.6}/conkernelclient/_modidx.py

@@ -12,6 +12,8 @@ d = { 'settings': { 'branch': 'main',
                                                                                         'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelClient.start_channels': ( 'core.html#conkernelclient.start_channels',
                                                                                                'conkernelclient/core.py'),
+                                      'conkernelclient.core.ConKernelClient.stdin_send': ( 'core.html#conkernelclient.stdin_send',
+                                                                                           'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelClient.stop_channels': ( 'core.html#conkernelclient.stop_channels',
                                                                                               'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelManager': ('core.html#conkernelmanager', 'conkernelclient/core.py'),

{conkernelclient-0.0.4 → conkernelclient-0.0.6}/conkernelclient/core.py

@@ -15,7 +15,7 @@ from zmq.error import ZMQError
 from jupyter_client.kernelspec import KernelSpec
 from jupyter_client import AsyncKernelManager
 from traitlets import Type
-import asyncio, zmq.asyncio
+import asyncio, zmq.asyncio, time
 
 # %% ../nbs/00_core.ipynb #374b75d0
 if not hasattr(Session, '_orig_send'): Session._orig_send = Session.send
@@ -27,7 +27,9 @@ def _send(self, stream, msg_or_type, content=None, parent=None, ident=None,
     # Force a sync, ensuring the send is fully registered internally
     # Avoids a race where the lock releases, another thread immediately calls send(),
     # and now 2 threads are interacting with the internal state before I/O thread has caught up
-    if stream and hasattr(stream, 'io_thread'): stream.io_thread.socket.get(zmq.EVENTS)
+    if stream:
+        if hasattr(stream, 'io_thread'): stream.io_thread.socket.get(zmq.EVENTS)
+        elif hasattr(stream, 'getsockopt'): stream.getsockopt(zmq.EVENTS)
     return msg
 
 Session.send = _send
@@ -35,6 +37,7 @@ Session.send = _send
 # %% ../nbs/00_core.ipynb #d6a5fa6a
 class ConKernelClient(AsyncKernelClient):
     async def start_channels(self, shell:bool=True, iopub:bool=True, stdin:bool=True, hb:bool=True, control:bool=True):
+        "Start channels, wait for ready, and launch background shell-reply reader"
         super().start_channels(shell=shell, iopub=iopub, stdin=stdin, hb=hb, control=control)
         await self.wait_for_ready()
         self._pending = {}
@@ -45,18 +48,23 @@ class ConKernelClient(AsyncKernelClient):
                 try: reply = await self.get_shell_msg(timeout=None)
                 except Exception as e:
                     for q in self._pending.values(): await q.put(e)
+                    if self._pending: logging.warning(f"_reader died with pending - {self._pending}: {e}")
+                    else: logging.warning(f"_reader died with no pending: {e}")
                     break
                 q = self._pending.get(reply["parent_header"].get("msg_id"))
                 if q: await q.put(reply)
         self._shell_reader_task = asyncio.create_task(_reader())
         await _ready.wait()
+        await asyncio.sleep(0.2)
         return self
 
     def stop_channels(self):
+        "Stop channels and cancel the background shell-reply reader task"
         super().stop_channels()
         if (tk := getattr(self, '_shell_reader_task', None)):
             tk.cancel()
             self._shell_reader_task = None
+        time.sleep(0.2)
 
     async def _async_recv_reply(self, msg_id, timeout=None, channel="shell"):
         if channel == "control": return await self._async_get_control_msg(timeout=timeout)
@@ -70,6 +78,7 @@ class ConKernelClient(AsyncKernelClient):
 
     def execute(self, code, user_expressions=None, allow_stdin=None, reply=False, subsh_id=None,
                 cts_typ='code', timeout=60, msg_id=None, **kw):
+        "Send an execute request, returning a coroutine for the reply if `reply`, else the msg_id"
         if user_expressions is None: user_expressions = {}
         if allow_stdin is None: allow_stdin = self.allow_stdin
         content = dict(user_expressions=user_expressions, allow_stdin=allow_stdin, subsh_id=subsh_id, **kw)
@@ -83,5 +92,10 @@ class ConKernelClient(AsyncKernelClient):
         if not reply: return msg_id
         return self._async_recv_reply(msg_id, timeout=timeout)
 
+    async def stdin_send(self, msg:dict):
+        "Send on `stdin_channel` then ping event loop"
+        self.stdin_channel.send(msg)
+        await asyncio.sleep(0)
+
 # %% ../nbs/00_core.ipynb #b828c222
 class ConKernelManager(AsyncKernelManager): client_class,client_factory = ConKernelClient,Type(ConKernelClient)

{conkernelclient-0.0.4 → conkernelclient-0.0.6/conkernelclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conkernelclient
-Version: 0.0.4
+Version: 0.0.6
 Summary: Concurrent-safe Jupyter KernelClient
 Author-email: Jeremy Howard <github@jhoward.fastmail.fm>
 License: Apache-2.0

conkernelclient-0.0.4/conkernelclient/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.0.4"
-from .core import *