txl-remote-kernels 0.1.24__tar.gz → 0.2.1__tar.gz

txl_remote_kernels-0.2.1/.gitignore

@@ -0,0 +1,3 @@
+__pycache__
+# pixi environments
+.pixi

{txl_remote_kernels-0.1.24 → txl_remote_kernels-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: txl_remote_kernels
-Version: 0.1.24
+Version: 0.2.1
 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>
@@ -10,14 +10,15 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 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.8.0,>=0.7.2
 Requires-Dist: txl
 Requires-Dist: txl-kernel
-Requires-Dist: y-py<1,>=0.6.0
 Description-Content-Type: text/markdown
 
 # TXL plugin for remote kernels

{txl_remote_kernels-0.1.24 → txl_remote_kernels-0.2.1}/pyproject.toml

@@ -17,6 +17,7 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
@@ -25,16 +26,16 @@ dependencies = [
   "txl_kernel",
   "httpx >=0.23.1",
   "httpx-ws >=0.4.2",
-  "y-py >=0.6.0,<1",
+  "pycrdt >=0.7.2,<0.8.0",
 ]
 dynamic = ["version"]
 
 [project.urls]
 Source = "https://github.com/davidbrochart/jpterm/plugins/remote_kernels"
 
-[project.entry-points."asphalt.components"]
-remote_kernels = "txl_remote_kernels.components:RemoteKernelsComponent"
-remote_kernelspecs = "txl_remote_kernels.components:RemoteKernelspecsComponent"
+[project.entry-points]
+"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"}
 
 [tool.hatch.version]
 path = "txl_remote_kernels/__init__.py"

txl_remote_kernels-0.2.1/txl_remote_kernels/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.1"

{txl_remote_kernels-0.1.24 → txl_remote_kernels-0.2.1}/txl_remote_kernels/components.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 from typing import Any
 from urllib import parse
 
 import httpx
-import y_py as Y
 from asphalt.core import Component, Context
+from pycrdt import Map
 
 from txl.base import Kernels, Kernelspecs
 
@@ -20,8 +22,8 @@ class RemoteKernels(Kernels):
     ):
         self.kernel = KernelDriver(url, kernel_name, comm_handlers=self.comm_handlers)
 
-    async def execute(self, ydoc: Y.YDoc, ycell: Y.YMap):
-        await self.kernel.execute(ydoc, ycell)
+    async def execute(self, ycell: Map):
+        await self.kernel.execute(ycell)
 
 
 class RemoteKernelspecs(Kernelspecs):
@@ -35,15 +37,19 @@ class RemoteKernelspecs(Kernelspecs):
         self.cookies = httpx.Cookies()
 
     async def get(self) -> dict[str, Any]:
-        async with httpx.AsyncClient() as client:
-            r = await client.get(
-                f"{self.base_url}/api/kernelspecs",
-                params={**self.query_params},
-                cookies=self.cookies,
-            )
-            d = r.json()
-            self.cookies.update(r.cookies)
-            return d
+        url = f"{self.base_url}/api/kernelspecs"
+        try:
+            async with httpx.AsyncClient() as client:
+                r = await client.get(
+                    url,
+                    params={**self.query_params},
+                    cookies=self.cookies,
+                )
+                d = r.json()
+                self.cookies.update(r.cookies)
+                return d
+        except httpx.ConnectError:
+            raise RuntimeError(f"Could not connect to a Jupyter server at {url}")
 
 
 class RemoteKernelsComponent(Component):

{txl_remote_kernels-0.1.24 → txl_remote_kernels-0.2.1}/txl_remote_kernels/driver.py

@@ -43,6 +43,7 @@ class KernelDriver(KernelMixin):
         self.control_channel = "control"
         self.iopub_channel = "iopub"
         self.send_lock = asyncio.Lock()
+        self.kernel_id = None
 
     async def start(self):
         i = str(uuid.uuid4())
@@ -62,15 +63,15 @@ class KernelDriver(KernelMixin):
             d = r.json()
             self.cookies.update(r.cookies)
             self.session_id = d["id"]
-            kernel_id = d["kernel"]["id"]
+            self.kernel_id = d["kernel"]["id"]
             r = await client.get(
-                f"{self.base_url}/api/kernels/{kernel_id}",
+                f"{self.base_url}/api/kernels/{self.kernel_id}",
                 cookies=self.cookies,
             )
-        if r.status_code != 200 or kernel_id != r.json()["id"]:
+        if r.status_code != 200 or self.kernel_id != r.json()["id"]:
             return
         async with aconnect_ws(
-            f"{self.ws_url}/api/kernels/{kernel_id}/channels",
+            f"{self.ws_url}/api/kernels/{self.kernel_id}/channels",
             params={"session_id": self.session_id},
             cookies=self.cookies,
             subprotocols=["v1.kernel.websocket.jupyter.org"],

txl_remote_kernels-0.1.24/.gitignore

@@ -1 +0,0 @@
-__pycache__

txl_remote_kernels-0.1.24/txl_remote_kernels/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.24"