conkernelclient 0.0.17__tar.gz → 0.0.19__tar.gz

{conkernelclient-0.0.17/conkernelclient.egg-info → conkernelclient-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conkernelclient
-Version: 0.0.17
+Version: 0.0.19
 Summary: Concurrent-safe Jupyter KernelClient
 Author-email: Jeremy Howard <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: jupyter_client
 Requires-Dist: fastcore>=2.1.17
-Requires-Dist: jupywire>=0.0.1
+Requires-Dist: jupywire>=0.1.4
 Provides-Extra: dev
 Requires-Dist: ipykernel; extra == "dev"
 Requires-Dist: ipymini>=0.1.17; extra == "dev"

{conkernelclient-0.0.17 → conkernelclient-0.0.19}/conkernelclient/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.0.17"
+__version__ = "0.0.19"
 from .core import *
 from .ops import *

{conkernelclient-0.0.17 → conkernelclient-0.0.19}/conkernelclient/_modidx.py

@@ -27,6 +27,8 @@ d = { 'settings': { 'branch': 'main',
                                       'conkernelclient.core.ConKernelClient.wait_for_ready': ( 'core.html#conkernelclient.wait_for_ready',
                                                                                                'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelManager': ('core.html#conkernelmanager', 'conkernelclient/core.py'),
+                                      'conkernelclient.core.ConKernelManager.__init__': ( 'core.html#conkernelmanager.__init__',
+                                                                                          'conkernelclient/core.py'),
                                       'conkernelclient.core.ConKernelManager._transport_encryption_default': ( 'core.html#conkernelmanager._transport_encryption_default',
                                                                                                                'conkernelclient/core.py'),
                                       'conkernelclient.core.DeadKernelError': ('core.html#deadkernelerror', 'conkernelclient/core.py'),
@@ -71,10 +73,8 @@ d = { 'settings': { 'branch': 'main',
                                      'conkernelclient.ops._ReqProxy.__getattr__': ( 'ops.html#_reqproxy.__getattr__',
                                                                                     'conkernelclient/ops.py'),
                                      'conkernelclient.ops._ReqProxy.__init__': ('ops.html#_reqproxy.__init__', 'conkernelclient/ops.py'),
-                                     'conkernelclient.ops.iopub_msgs': ('ops.html#iopub_msgs', 'conkernelclient/ops.py'),
                                      'conkernelclient.ops.iopub_streams': ('ops.html#iopub_streams', 'conkernelclient/ops.py'),
                                      'conkernelclient.ops.iter_timeout': ('ops.html#iter_timeout', 'conkernelclient/ops.py'),
-                                     'conkernelclient.ops.parent_id': ('ops.html#parent_id', 'conkernelclient/ops.py'),
                                      'conkernelclient.ops.parse_expr': ('ops.html#parse_expr', 'conkernelclient/ops.py'),
                                      'conkernelclient.ops.reconnect': ('ops.html#reconnect', 'conkernelclient/ops.py'),
                                      'conkernelclient.ops.run_kernel': ('ops.html#run_kernel', 'conkernelclient/ops.py')}}}

{conkernelclient-0.0.17 → conkernelclient-0.0.19}/conkernelclient/core.py

@@ -186,5 +186,8 @@ async def astop_channels(self:ConKernelClient):
 # %% ../nbs/00_core.ipynb #b828c222
 class ConKernelManager(AsyncKernelManager):
     client_class,client_factory = ConKernelClient,Type(ConKernelClient)
+    def __init__(self, *args, kernel_spec=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if kernel_spec is not None: self._kernel_spec = kernel_spec
     @default('transport_encryption')
     def _transport_encryption_default(self): return 'auto'

{conkernelclient-0.0.17 → conkernelclient-0.0.19}/conkernelclient/ops.py

@@ -5,14 +5,17 @@ Docs: https://AnswerDotAI.github.io/conkernelclient/ops.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_ops.ipynb.
 
 # %% auto #0
-__all__ = ['default_timeout', 'output_types', 'parent_id', 'iter_timeout', 'iopub_msgs', 'iopub_streams', 'EvalError',
-           'parse_expr', 'run_kernel', 'reconnect']
+__all__ = ['default_timeout', 'iter_timeout', 'iopub_streams', 'EvalError', 'parse_expr', 'run_kernel', 'reconnect', 'parent_id',
+           'iopub_msgs', 'output_types']
 
 # %% ../nbs/01_ops.ipynb #23936f1c
 from fastcore.utils import *
 from fastcore.ansi import strip_ansi
 from fastcore.nbio import msgs2outs, preferred_out
 from .core import ConKernelClient, ConKernelManager, DeadKernelError
+from jupywire.ops import parent_id, iopub_msgs, output_types
+from jupyter_client.kernelspec import KernelSpec
+_all_ = ['parent_id', 'iopub_msgs', 'output_types']
 from contextlib import asynccontextmanager
 from ast import literal_eval
 from queue import Empty
@@ -21,10 +24,6 @@ import asyncio, time
 # %% ../nbs/01_ops.ipynb #d62f6b51
 default_timeout = 10
 
-def parent_id(msg):
-    "The `msg_id` of the request this `msg` responds to, or None"
-    return nested_idx(msg, "parent_header", "msg_id") or None
-
 def iter_timeout(timeout=None, default=default_timeout):
     "Yield remaining seconds until `timeout` expires, using monotonic time"
     end = time.monotonic() + (timeout or default)
@@ -51,17 +50,7 @@ async def iopub_flush(self:ConKernelClient, timeout=0.1):
         while True: await self.get_iopub_msg(timeout=timeout)
     except Empty: pass
 
-# %% ../nbs/01_ops.ipynb #add288fe
-output_types = {'stream', 'execute_result', 'display_data', 'error'}
-
-
 # %% ../nbs/01_ops.ipynb #ebdbd6eb
-def iopub_msgs(msgs, msg_type=None):
-    "Filter iopub `msgs` by `msg_type` - a single type, or a collection of types (all messages if None)"
-    if msg_type is None: return msgs
-    types = {msg_type} if isinstance(msg_type, str) else msg_type
-    return [m for m in msgs if m['msg_type'] in types]
-
 def iopub_streams(msgs, name=None):
     "The stream messages in `msgs`, optionally only stream `name` ('stdout'/'stderr')"
     streams = iopub_msgs(msgs, 'stream')
@@ -116,11 +105,10 @@ def reply(self:ConKernelClient,
     code, # A string of code in the kernel's language.
     user_expressions:NoneType=None, # A dict mapping names to expressions to be evaluated in the user's dict
     allow_stdin:NoneType=None, # Flag for whether the kernel can send stdin requests to frontends.
-    cts_typ:str='code', timeout:int=None, msg_id:NoneType=None, priority:bool=False, **kw
+    cts_typ:str='code', timeout:int=None, msg_id:NoneType=None, **kw
 ):
-    if priority: assert self.priority, 'no priority subshell configured'
     return self.execute(code, user_expressions=user_expressions, allow_stdin=allow_stdin, reply=True,
-        cts_typ=cts_typ, timeout=timeout or getattr(self, 'default_timeout', default_timeout), msg_id=msg_id, subsh_id=self.priority if priority else None, **kw)
+        cts_typ=cts_typ, timeout=timeout or getattr(self, 'default_timeout', default_timeout), msg_id=msg_id, **kw)
 
 # %% ../nbs/01_ops.ipynb #5de02acb
 from jupywire.ops import EvalOps, EvalException, try_eval
@@ -215,12 +203,15 @@ async def interrupt(self:ConKernelClient, timeout=5):
 # %% ../nbs/01_ops.ipynb #edaf42c9
 @asynccontextmanager
 async def run_kernel(
-    kernel_name='python3', # Kernelspec name to launch
+    kernel_name='python3', # Kernelspec name to launch, or display name when `argv` is given
+    argv=None, # Kernel argv; bypasses kernelspec discovery when provided
     manager_cls=ConKernelManager, # Manager class, e.g. a subclass customizing launch
     **kwargs # Passed to `start_kernel` (e.g. `env`, `cwd`)
 ):
-    "Start a kernel, yield `(km, kc)` with channels running, and always shut both down"
-    km = manager_cls(kernel_name=kernel_name)
+    "Start a named or direct-argv kernel, yielding `(km, kc)`, and always shut it down"
+    manager_kwargs = dict(kernel_name=kernel_name)
+    if argv is not None: manager_kwargs['kernel_spec'] = KernelSpec(argv=argv, display_name=kernel_name)
+    km = manager_cls(**manager_kwargs)
     await km.start_kernel(**kwargs)
     kc = await km.client().start_channels()
     try: yield km, kc

{conkernelclient-0.0.17 → conkernelclient-0.0.19/conkernelclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: conkernelclient
-Version: 0.0.17
+Version: 0.0.19
 Summary: Concurrent-safe Jupyter KernelClient
 Author-email: Jeremy Howard <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: jupyter_client
 Requires-Dist: fastcore>=2.1.17
-Requires-Dist: jupywire>=0.0.1
+Requires-Dist: jupywire>=0.1.4
 Provides-Extra: dev
 Requires-Dist: ipykernel; extra == "dev"
 Requires-Dist: ipymini>=0.1.17; extra == "dev"

{conkernelclient-0.0.17 → conkernelclient-0.0.19}/conkernelclient.egg-info/requires.txt

@@ -1,6 +1,6 @@
 jupyter_client
 fastcore>=2.1.17
-jupywire>=0.0.1
+jupywire>=0.1.4
 
 [dev]
 ipykernel

{conkernelclient-0.0.17 → conkernelclient-0.0.19}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 dependencies = [
   'jupyter_client',
   'fastcore>=2.1.17',
-  'jupywire>=0.0.1',
+  'jupywire>=0.1.4',
 ]
 
 [project.optional-dependencies]

{conkernelclient-0.0.17 → conkernelclient-0.0.19}/tests/test_races.py

@@ -37,11 +37,10 @@ class LockedClient(ConKernelClient):
 class LockedKernelManager(ConKernelManager):
     client_class,client_factory = LockedClient,Type(LockedClient)
 
-
 def test_burst_replies_under_send_jitter():
     "20 pending replies at once, every send jittered: the reader must route each reply to its waiter."
     async def _run():
-        async with run_kernel(kernel_name="ipymini", manager_cls=LockedKernelManager) as (km, kc):
+        async with run_kernel("ipymini", ["ipymini", "-f", "{connection_file}"], manager_cls=LockedKernelManager) as (km, kc):
             reps = [kc.execute(f"x{i} = {i}; x{i}", reply=True, timeout=30) for i in range(20)]
             for i, r in enumerate(await asyncio.gather(*reps)): assert r["content"]["status"] == "ok", (i, r["content"])
     asyncio.run(_run())