txl-remote-kernels 0.2.15__py3-none-any.whl → 0.3.4__py3-none-any.whl

txl_remote_kernels/driver.py

@@ -1,4 +1,3 @@
-import asyncio
 import json
 import time
 import uuid
@@ -6,6 +5,8 @@ from typing import Any, Dict
 from urllib import parse
 
 import httpx
+from anyio import Lock, sleep
+from anyioutils import create_task
 from httpx_ws import aconnect_ws
 from txl_kernel.driver import KernelMixin
 from txl_kernel.message import date_to_str
@@ -25,11 +26,13 @@ def deadline_to_timeout(deadline: float) -> float:
 class KernelDriver(KernelMixin):
     def __init__(
         self,
+        task_group,
         url: str,
         kernel_name: str | None = "",
         comm_handlers=[],
     ) -> None:
-        super().__init__()
+        super().__init__(task_group)
+        self.task_group = task_group
         self.kernel_name = kernel_name
         parsed_url = parse.urlparse(url)
         self.base_url = parse.urljoin(url, parsed_url.path).rstrip("/")
@@ -37,12 +40,12 @@ class KernelDriver(KernelMixin):
         self.cookies = httpx.Cookies()
         i = self.base_url.find(":")
         self.ws_url = ("wss" if self.base_url[i - 1] == "s" else "ws") + self.base_url[i:]
-        self.start_task = asyncio.create_task(self.start())
+        self.start_task = create_task(self.start(), task_group)
         self.comm_handlers = comm_handlers
         self.shell_channel = "shell"
         self.control_channel = "control"
         self.iopub_channel = "iopub"
-        self.send_lock = asyncio.Lock()
+        self.send_lock = Lock()
         self.kernel_id = None
 
     async def start(self):
@@ -76,11 +79,11 @@ class KernelDriver(KernelMixin):
             cookies=self.cookies,
             subprotocols=["v1.kernel.websocket.jupyter.org"],
         ) as self.websocket:
-            recv_task = asyncio.create_task(self._recv())
+            recv_task = create_task(self._recv(), self.task_group)
             try:
                 await self.wait_for_ready()
                 self.started.set()
-                await asyncio.Future()
+                await sleep(float("inf"))
             except BaseException:
                 recv_task.cancel()
                 self.start_task.cancel()

txl_remote_kernels/{components.py → main.py}

@@ -4,7 +4,8 @@ from typing import Any
 from urllib import parse
 
 import httpx
-from asphalt.core import Component, Context
+from anyio import create_task_group, sleep
+from fps import Module
 from pycrdt import Map
 
 from txl.base import Kernels, Kernelspecs
@@ -20,7 +21,9 @@ class RemoteKernels(Kernels):
         url: str,
         kernel_name: str | None,
     ):
-        self.kernel = KernelDriver(url, kernel_name, comm_handlers=self.comm_handlers)
+        self.kernel = KernelDriver(
+            self.task_group, url, kernel_name, comm_handlers=self.comm_handlers
+        )
 
     async def execute(self, ycell: Map):
         await self.kernel.execute(ycell)
@@ -52,32 +55,34 @@ class RemoteKernelspecs(Kernelspecs):
             raise RuntimeError(f"Could not connect to a Jupyter server at {url}")
 
 
-class RemoteKernelsComponent(Component):
-    def __init__(self, url: str = "http://127.0.0.1:8000"):
-        super().__init__()
+class RemoteKernelsModule(Module):
+    def __init__(self, name: str, url: str = "http://127.0.0.1:8000"):
+        super().__init__(name)
         self.url = url
 
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
+    async def start(self) -> None:
         url = self.url
 
-        class _RemoteKernels(RemoteKernels):
-            def __init__(self, *args, **kwargs):
-                super().__init__(url, *args, **kwargs)
+        async with create_task_group() as self.tg:
+            class _RemoteKernels(RemoteKernels):
+                task_group = self.tg
+
+                def __init__(self, *args, **kwargs):
+                    super().__init__(url, *args, **kwargs)
 
-        ctx.add_resource(_RemoteKernels, types=Kernels)
+            self.put(_RemoteKernels, Kernels)
+            self.done()
+            await sleep(float("inf"))
 
+    async def stop(self) -> None:
+        self.tg.cancel_scope.cancel()
 
-class RemoteKernelspecsComponent(Component):
-    def __init__(self, url: str = "http://127.0.0.1:8000"):
-        super().__init__()
+
+class RemoteKernelspecsModule(Module):
+    def __init__(self, name: str, url: str = "http://127.0.0.1:8000"):
+        super().__init__(name)
         self.url = url
 
-    async def start(
-        self,
-        ctx: Context,
-    ) -> None:
+    async def start(self) -> None:
         kernelspecs = RemoteKernelspecs(self.url)
-        ctx.add_resource(kernelspecs, types=Kernelspecs)
+        self.put(kernelspecs, Kernelspecs)

{txl_remote_kernels-0.2.15.dist-info → txl_remote_kernels-0.3.4.dist-info}/METADATA

@@ -1,10 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: txl_remote_kernels
-Version: 0.2.15
+Version: 0.3.4
 Summary: TXL plugin for remote kernels
 Project-URL: Source, https://github.com/davidbrochart/jpterm/plugins/remote_kernels
 Author-email: David Brochart <david.brochart@gmail.com>
-License: MIT
+License-Expression: MIT
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
@@ -16,9 +17,9 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Requires-Dist: httpx-ws>=0.4.2
 Requires-Dist: httpx>=0.23.1
-Requires-Dist: pycrdt<0.11.0,>=0.10.9
+Requires-Dist: pycrdt<0.13.0,>=0.10.9
 Requires-Dist: txl-kernel
-Requires-Dist: txl<0.3.0,>=0.2.18
+Requires-Dist: txl==0.3.1
 Description-Content-Type: text/markdown
 
 # TXL plugin for remote kernels

txl_remote_kernels-0.3.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+txl_remote_kernels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+txl_remote_kernels/driver.py,sha256=gJuGmbshysBo-040NThjm-MamqIME47ejUoeQuoGMmY,4332
+txl_remote_kernels/main.py,sha256=L7oQW6d0WKu35-luLrZwAWoml4X7CH0OjFf6ASrA9nE,2429
+txl_remote_kernels/message.py,sha256=lyO6uPpRlYgdRSOZxam6iA-QH_HjXga3XKNlA_cCs5Q,2400
+txl_remote_kernels-0.3.4.dist-info/METADATA,sha256=CZ6n0qURfYBDbRk7TNmLg0br9WQLKcJl4QCBDwRkFiM,969
+txl_remote_kernels-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+txl_remote_kernels-0.3.4.dist-info/entry_points.txt,sha256=WWe5nk2g-g6A4T9-ceUej1JR4k4rh4KF4FIbriEFQVM,289
+txl_remote_kernels-0.3.4.dist-info/licenses/LICENSE.txt,sha256=su0IgzSHZ9tMFeCQ_IaCji5Q4VrZSOqDsEFi7lPduc8,1106
+txl_remote_kernels-0.3.4.dist-info/RECORD,,

{txl_remote_kernels-0.2.15.dist-info → txl_remote_kernels-0.3.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

txl_remote_kernels-0.3.4.dist-info/entry_points.txt

@@ -0,0 +1,7 @@
+[fps.modules]
+remote_kernels = txl_remote_kernels.main:RemoteKernelsModule
+remote_kernelspecs = txl_remote_kernels.main:RemoteKernelspecsModule
+
+[txl.modules]
+remote_kernels = txl_remote_kernels.main:RemoteKernelsModule
+remote_kernelspecs = txl_remote_kernels.main:RemoteKernelspecsModule

txl_remote_kernels-0.2.15.dist-info/RECORD

@@ -1,9 +0,0 @@
-txl_remote_kernels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-txl_remote_kernels/components.py,sha256=ObVtxfhRlYFiIg5p3iIbo_q7U9H_mfNH7ppMtjltfEU,2212
-txl_remote_kernels/driver.py,sha256=VManMbXolZ3fVnUHixyRvpRkZG0zGxqWWRssScHxEYk,4207
-txl_remote_kernels/message.py,sha256=lyO6uPpRlYgdRSOZxam6iA-QH_HjXga3XKNlA_cCs5Q,2400
-txl_remote_kernels-0.2.15.dist-info/METADATA,sha256=j_xgKBDxiCSRu6tZlzuTT9CjvPjzi426pOt6Y9DtCHQ,941
-txl_remote_kernels-0.2.15.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-txl_remote_kernels-0.2.15.dist-info/entry_points.txt,sha256=WA4RR4FltYd8rtDu2FT6o5MTqByDja9LmHPlyksNQE0,335
-txl_remote_kernels-0.2.15.dist-info/licenses/LICENSE.txt,sha256=su0IgzSHZ9tMFeCQ_IaCji5Q4VrZSOqDsEFi7lPduc8,1106
-txl_remote_kernels-0.2.15.dist-info/RECORD,,

txl_remote_kernels-0.2.15.dist-info/entry_points.txt

@@ -1,7 +0,0 @@
-[asphalt.components]
-remote_kernels = txl_remote_kernels.components:RemoteKernelsComponent
-remote_kernelspecs = txl_remote_kernels.components:RemoteKernelspecsComponent
-
-[txl.components]
-remote_kernels = txl_remote_kernels.components:RemoteKernelsComponent
-remote_kernelspecs = txl_remote_kernels.components:RemoteKernelspecsComponent