conkernelclient 0.0.8__tar.gz → 0.0.10__tar.gz

{conkernelclient-0.0.8/conkernelclient.egg-info → conkernelclient-0.0.10}/PKG-INFO

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

conkernelclient-0.0.10/conkernelclient/__init__.py

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

{conkernelclient-0.0.8 → conkernelclient-0.0.10}/conkernelclient/_modidx.py

@@ -8,6 +8,10 @@ d = { 'settings': { 'branch': 'main',
   'syms': { 'conkernelclient.core': { 'conkernelclient.core.ConKernelClient': ('core.html#conkernelclient', 'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelClient._async_recv_reply': ( 'core.html#conkernelclient._async_recv_reply',
                                                                                                   'conkernelclient/core.py'),
+                                      'conkernelclient.core.ConKernelClient._check_alive': ( 'core.html#conkernelclient._check_alive',
+                                                                                             'conkernelclient/core.py'),
+                                      'conkernelclient.core.ConKernelClient._fail_pending': ( 'core.html#conkernelclient._fail_pending',
+                                                                                              'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelClient.execute': ( 'core.html#conkernelclient.execute',
                                                                                         'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelClient.start_channels': ( 'core.html#conkernelclient.start_channels',
@@ -17,4 +21,5 @@ d = { 'settings': { 'branch': 'main',
                                       'conkernelclient.core.ConKernelClient.stop_channels': ( 'core.html#conkernelclient.stop_channels',
                                                                                               'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelManager': ('core.html#conkernelmanager', 'conkernelclient/core.py'),
+                                      'conkernelclient.core.DeadKernelError': ('core.html#deadkernelerror', 'conkernelclient/core.py'),
                                       'conkernelclient.core._send': ('core.html#_send', 'conkernelclient/core.py')}}}

{conkernelclient-0.0.8 → conkernelclient-0.0.10}/conkernelclient/core.py

@@ -3,7 +3,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto #0
-__all__ = ['ConKernelClient', 'ConKernelManager']
+__all__ = ['DeadKernelError', 'ConKernelClient', 'ConKernelManager']
 
 # %% ../nbs/00_core.ipynb #d3b521c0
 from queue import Empty
@@ -15,7 +15,13 @@ from zmq.error import ZMQError
 from jupyter_client.kernelspec import KernelSpec
 from jupyter_client import AsyncKernelManager
 from traitlets import Type
-import asyncio, zmq.asyncio, time
+import asyncio, zmq.asyncio, time, logging
+
+# %% ../nbs/00_core.ipynb #737a0fc1
+_log = logging.getLogger(__name__)
+
+# %% ../nbs/00_core.ipynb #a093006c
+class DeadKernelError(Exception): pass
 
 # %% ../nbs/00_core.ipynb #374b75d0
 if not hasattr(Session, '_orig_send'): Session._orig_send = Session.send
@@ -36,6 +42,17 @@ Session.send = _send
 
 # %% ../nbs/00_core.ipynb #d6a5fa6a
 class ConKernelClient(AsyncKernelClient):
+    def _fail_pending(self, exc:Exception, skip=None):
+        for k,(q,_) in list(getattr(self, '_pending', {}).items()):
+            if k != skip:
+                try: q.put_nowait(exc)
+                except asyncio.QueueFull: pass
+
+    def _check_alive(self):
+        if not self.channels_running: raise RuntimeError("Channels not running")
+        tk = getattr(self, '_shell_reader_task', None)
+        return tk is not None and not tk.done()
+
     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)
@@ -47,12 +64,21 @@ class ConKernelClient(AsyncKernelClient):
             while True:
                 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}")
+                    if isinstance(e, (AssertionError, OSError, ZMQError)): e = DeadKernelError(f"Kernel socket closed: {e}")
+                    self._fail_pending(e)
+                    _log.warning(f"_reader died, pending={list(self._pending)}: {e}")
                     break
-                q = self._pending.get(reply["parent_header"].get("msg_id"))
-                if q: await q.put(reply)
+                mid = reply["parent_header"].get("msg_id")
+                pend = self._pending.get(mid)
+                if pend:
+                    q, soe = pend
+                    try: q.put_nowait(reply)
+                    except asyncio.QueueFull: pass
+                else: _log.warning(f"Orphan reply for {reply['parent_header'].get('msg_id')}, pending={list(self._pending)}")
+                cts = reply.get("content", {})
+                if cts.get("status") in ("error", "aborted") and pend and soe:
+                    exc = RuntimeError(f"Kernel error aborted: {cts.get('ename')}: {cts.get('evalue')}")
+                    self._fail_pending(exc, skip=mid)
         self._shell_reader_task = asyncio.create_task(_reader())
         await _ready.wait()
         await asyncio.sleep(0.2)
@@ -60,6 +86,7 @@ class ConKernelClient(AsyncKernelClient):
 
     def stop_channels(self):
         "Stop channels and cancel the background shell-reply reader task"
+        self._fail_pending(RuntimeError("Shell channels stopped before reply"))
         super().stop_channels()
         if (tk := getattr(self, '_shell_reader_task', None)):
             tk.cancel()
@@ -68,33 +95,35 @@ class ConKernelClient(AsyncKernelClient):
 
     async def _async_recv_reply(self, msg_id, timeout=None, channel="shell"):
         if channel == "control": return await self._async_get_control_msg(timeout=timeout)
-        q = self._pending[msg_id]
+        q, _ = self._pending[msg_id]
         try:
             res = await asyncio.wait_for(q.get(), timeout)
             if isinstance(res, Exception): raise res
             return res
-        except asyncio.TimeoutError as e: raise TimeoutError("Timeout waiting for reply") from e
         finally: self._pending.pop(msg_id, None)
 
     def execute(self, code, user_expressions=None, allow_stdin=None, reply=False, subsh_id=None,
-                cts_typ='code', timeout=60, msg_id=None, **kw):
+                cts_typ='code', timeout=60, msg_id=None, stop_on_error=True, **kw):
         "Send an execute request, returning a coroutine for the reply if `reply`, else the msg_id"
+        if not self._check_alive(): return asyncio.sleep(0) if reply else None
         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)
+        content = dict(user_expressions=user_expressions, allow_stdin=allow_stdin, subsh_id=subsh_id, stop_on_error=stop_on_error, **kw)
         content[cts_typ] = code
         msg = self.session.msg("execute_request", content)
         if msg_id is not None: msg["header"]["msg_id"] = msg_id
         if subsh_id is not None: msg["header"]["subshell_id"] = subsh_id
         msg_id = msg["header"]["msg_id"]
-        if reply: self._pending[msg_id] = asyncio.Queue(maxsize=1)
-        self.shell_channel.send(msg)
+        if reply: self._pending[msg_id] = (asyncio.Queue(maxsize=1), stop_on_error)
+        try: self.shell_channel.send(msg)
+        except (AssertionError, OSError, ZMQError) as e: raise DeadKernelError(f"Kernel socket closed: {e}") from e
         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)
+        try: self.stdin_channel.send(msg)
+        except (AssertionError, OSError, ZMQError) as e: raise DeadKernelError(f"Kernel socket closed: {e}") from e
         await asyncio.sleep(0.01)
 
 # %% ../nbs/00_core.ipynb #b828c222

{conkernelclient-0.0.8 → conkernelclient-0.0.10/conkernelclient.egg-info}/PKG-INFO

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

{conkernelclient-0.0.8 → conkernelclient-0.0.10}/pyproject.toml

@@ -39,3 +39,5 @@ version = {attr = "conkernelclient.__version__"}
 include = ["conkernelclient"]
 
 [tool.nbdev]
+allowed_metadata_keys = ['solveit_dialog_mode', 'solveit_ver']
+allowed_cell_metadata_keys = ["solveit_ai"]

conkernelclient-0.0.8/conkernelclient/__init__.py

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