txl_kernel 0.2.12__tar.gz → 0.3.1__tar.gz

{txl_kernel-0.2.12 → txl_kernel-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: txl_kernel
-Version: 0.2.12
+Version: 0.3.1
 Summary: TXL plugin for a kernel driver
 Project-URL: Source, https://github.com/davidbrochart/jpterm/plugins/kernel
 Author-email: David Brochart <david.brochart@gmail.com>
@@ -11,13 +11,13 @@ 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 :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
-Requires-Dist: asphalt
-Requires-Dist: pycrdt<0.9.0,>=0.8.11
+Requires-Dist: pycrdt<0.13.0,>=0.10.9
 Requires-Dist: python-dateutil>=2.8.2
-Requires-Dist: txl
+Requires-Dist: txl<0.3.0,>=0.2.18
 Description-Content-Type: text/markdown
 
 # TXL plugin for a kernel driver

txl_kernel-0.3.1/pyproject.toml

@@ -0,0 +1,20 @@
+[build-system]
+requires = [ "hatchling",]
+build-backend = "hatchling.build"
+
+[project]
+name = "txl_kernel"
+version = "0.3.1"
+description = "TXL plugin for a kernel driver"
+readme = "README.md"
+requires-python = ">=3.10"
+license = "MIT"
+keywords = []
+classifiers = [ "Development Status :: 4 - Beta", "Programming Language :: Python", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy",]
+dependencies = [ "txl >=0.2.18,<0.3.0", "python-dateutil >=2.8.2", "pycrdt >=0.10.9,<0.13.0",]
+[[project.authors]]
+name = "David Brochart"
+email = "david.brochart@gmail.com"
+
+[project.urls]
+Source = "https://github.com/davidbrochart/jpterm/plugins/kernel"

{txl_kernel-0.2.12 → txl_kernel-0.3.1}/txl_kernel/driver.py

@@ -1,8 +1,9 @@
-import asyncio
 import time
 from typing import Dict
 
-from asphalt.core import Event, Signal
+from anyio import move_on_after
+from anyioutils import Event, Queue, create_task
+from fps import Signal
 from pycrdt import Array, Map
 
 from .message import create_message
@@ -13,11 +14,12 @@ def deadline_to_timeout(deadline: float) -> float:
 
 
 class Comm:
-    def __init__(self, comm_id: str, shell_channel, session_id: str, send_message):
+    def __init__(self, comm_id: str, shell_channel, session_id: str, send_message, task_group):
         self.comm_id = comm_id
         self.shell_channel = shell_channel
         self.session_id = session_id
         self.send_message = send_message
+        self.task_group = task_group
         self.msg_cnt = 0
 
     def send(self, buffers):
@@ -29,24 +31,18 @@ class Comm:
             buffers=buffers,
         )
         self.msg_cnt += 1
-        asyncio.create_task(self.send_message(msg, self.shell_channel, change_date_to_str=True))
-
-
-class BusyEvent(Event):
-    def __init__(self, source, topic, busy: bool):
-        super().__init__(source, topic)
-        self.busy = busy
+        create_task(self.send_message(msg, self.shell_channel, change_date_to_str=True), self.task_group)
 
 
 class KernelMixin:
-    busy = Signal(BusyEvent)
-
-    def __init__(self):
+    def __init__(self, task_group):
+        self.task_group = task_group
+        self.busy = Signal[bool]()
         self.msg_cnt = 0
-        self.execute_requests: Dict[str, Dict[str, asyncio.Queue]] = {}
-        self.recv_queue = asyncio.Queue()
-        self.started = asyncio.Event()
-        asyncio.create_task(self.recv())
+        self.execute_requests: Dict[str, Dict[str, Queue]] = {}
+        self.recv_queue = Queue()
+        self.started = Event()
+        create_task(self.recv(), task_group)
 
     def create_message(self, *args, **kwargs):
         return create_message(*args, **kwargs)
@@ -64,23 +60,19 @@ class KernelMixin:
             await self.send_message(msg, self.shell_channel, change_date_to_str=True)
             msg_id = msg["header"]["msg_id"]
             self.execute_requests[msg_id] = {
-                "iopub": asyncio.Queue(),
-                "shell": asyncio.Queue(),
+                "iopub": Queue(),
+                "shell": Queue(),
             }
-            try:
-                msg = await asyncio.wait_for(
-                    self.execute_requests[msg_id]["shell"].get(), new_timeout
-                )
-            except asyncio.TimeoutError:
+            with move_on_after(new_timeout) as scope:
+                msg = await self.execute_requests[msg_id]["shell"].get()
+            if scope.cancelled_caught:
                 del self.execute_requests[msg_id]
                 error_message = f"Kernel didn't respond in {timeout} seconds"
                 raise RuntimeError(error_message)
             if msg["header"]["msg_type"] == "kernel_info_reply":
-                try:
-                    msg = await asyncio.wait_for(self.execute_requests[msg_id]["iopub"].get(), 0.2)
-                except asyncio.TimeoutError:
-                    pass
-                else:
+                with move_on_after(0.2) as scope:
+                    msg = await self.execute_requests[msg_id]["iopub"].get()
+                if not scope.cancelled_caught:
                     break
             del self.execute_requests[msg_id]
             new_timeout = deadline_to_timeout(deadline)
@@ -93,7 +85,7 @@ class KernelMixin:
             if msg_type == "comm_open":
                 for comm_handler in self.comm_handlers:
                     comm_id = msg["content"]["comm_id"]
-                    comm = Comm(comm_id, self.shell_channel, self.session_id, self.send_message)
+                    comm = Comm(comm_id, self.shell_channel, self.session_id, self.send_message, self.task_group)
                     comm_handler.comm_open(msg, comm)
             elif msg_type == "comm_msg":
                 for comm_handler in self.comm_handlers:
@@ -101,9 +93,9 @@ class KernelMixin:
             elif msg_type == "status":
                 execution_state = msg["content"]["execution_state"]
                 if execution_state == "idle":
-                    self.busy.dispatch(False)
+                    await self.busy.emit(False)
                 elif execution_state == "busy":
-                    self.busy.dispatch(True)
+                    await self.busy.emit(True)
             msg_id = msg["parent_header"].get("msg_id")
             if msg_id in self.execute_requests:
                 # msg["header"] = str_to_date(msg["header"])
@@ -121,6 +113,7 @@ class KernelMixin:
         if ycell["cell_type"] != "code":
             return
         ycell["outputs"].clear()
+        ycell["execution_count"] = None
         code = str(ycell["source"])
         content = {"code": code, "silent": False}
         msg = create_message(
@@ -135,19 +128,16 @@ class KernelMixin:
             msg_id = msg["header"]["msg_id"]
         self.msg_cnt += 1
         self.execute_requests[msg_id] = {
-            "iopub": asyncio.Queue(),
-            "shell": asyncio.Queue(),
+            "iopub": Queue(),
+            "shell": Queue(),
         }
         await self.send_message(msg, self.shell_channel, change_date_to_str=True)
         if wait_for_executed:
             deadline = time.monotonic() + timeout
             while True:
-                try:
-                    msg = await asyncio.wait_for(
-                        self.execute_requests[msg_id]["iopub"].get(),
-                        deadline_to_timeout(deadline),
-                    )
-                except asyncio.TimeoutError:
+                with move_on_after(deadline_to_timeout(deadline)) as scope:
+                    msg = await self.execute_requests[msg_id]["iopub"].get()
+                if scope.cancelled_caught:
                     del self.execute_requests[msg_id]
                     error_message = f"Kernel didn't respond in {timeout} seconds"
                     raise RuntimeError(error_message)
@@ -157,12 +147,9 @@ class KernelMixin:
                     and msg["content"]["execution_state"] == "idle")
                 ):
                     break
-            try:
-                msg = await asyncio.wait_for(
-                    self.execute_requests[msg_id]["shell"].get(),
-                    deadline_to_timeout(deadline),
-                )
-            except asyncio.TimeoutError:
+            with move_on_after(deadline_to_timeout(deadline)) as scope:
+                msg = await self.execute_requests[msg_id]["shell"].get()
+            if scope.cancelled_caught:
                 del self.execute_requests[msg_id]
                 error_message = f"Kernel didn't respond in {timeout} seconds"
                 raise RuntimeError(error_message)
@@ -174,27 +161,18 @@ class KernelMixin:
         content = msg["content"]
         if msg_type == "stream":
             with outputs.doc.transaction():
-                # TODO: uncomment when changes are made in jupyter-ydoc
                 if (not outputs) or (outputs[-1]["name"] != content["name"]):  # type: ignore
                     outputs.append(
-                        #Map(
-                        #    {
-                        #        "name": content["name"],
-                        #        "output_type": msg_type,
-                        #        "text": Array([content["text"]]),
-                        #    }
-                        #)
-                        {
-                            "name": content["name"],
-                            "output_type": msg_type,
-                            "text": [content["text"]],
-                        }
+                        Map(
+                            {
+                                "name": content["name"],
+                                "output_type": msg_type,
+                                "text": Array([content["text"]]),
+                            }
+                        )
                     )
                 else:
-                    #outputs[-1]["text"].append(content["text"])  # type: ignore
-                    last_output = outputs[-1]
-                    last_output["text"].append(content["text"])  # type: ignore
-                    outputs[-1] = last_output
+                    outputs[-1]["text"].append(content["text"])  # type: ignore
         elif msg_type in ("display_data", "execute_result"):
             outputs.append(
                 {

txl_kernel-0.2.12/pyproject.toml

@@ -1,36 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "txl_kernel"
-description = "TXL plugin for a kernel driver"
-readme = "README.md"
-requires-python = ">=3.10"
-license = "MIT"
-keywords = []
-authors = [
-  { name = "David Brochart", email = "david.brochart@gmail.com" },
-]
-classifiers = [
-  "Development Status :: 4 - Beta",
-  "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",
-]
-dependencies = [
-  "txl",
-  "asphalt",
-  "python-dateutil >=2.8.2",
-  "pycrdt >=0.8.11,<0.9.0",
-]
-dynamic = ["version"]
-
-[project.urls]
-Source = "https://github.com/davidbrochart/jpterm/plugins/kernel"
-
-[tool.hatch.version]
-path = "txl_kernel/__init__.py"

txl_kernel-0.2.12/txl_kernel/__init__.py

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