txl-kernel 0.3.8__tar.gz → 0.3.10__tar.gz

{txl_kernel-0.3.8 → txl_kernel-0.3.10}/PKG-INFO

@@ -1,23 +1,24 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: txl_kernel
-Version: 0.3.8
+Version: 0.3.10
 Summary: TXL plugin for a kernel driver
-Project-URL: Source, https://github.com/davidbrochart/jpterm/plugins/kernel
+Project-URL: Source, https://github.com/davidbrochart/jpterm/tree/main/plugins/kernel
 Author-email: David Brochart <david.brochart@gmail.com>
 License-Expression: MIT
 License-File: LICENSE.txt
 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 :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.10
-Requires-Dist: pycrdt<0.13.0,>=0.10.9
+Requires-Python: >=3.11
+Requires-Dist: pycrdt<0.15.0,>=0.14.1
 Requires-Dist: python-dateutil>=2.8.2
-Requires-Dist: txl==0.3.2
+Requires-Dist: txl==0.3.4
 Description-Content-Type: text/markdown
 
 # TXL plugin for a kernel driver

txl_kernel-0.3.10/pyproject.toml

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

{txl_kernel-0.3.8 → txl_kernel-0.3.10}/txl_kernel/driver.py

@@ -1,11 +1,13 @@
+import math
 import time
-from typing import Dict
+from typing import Any, Dict
 
-from anyio import move_on_after
-from anyioutils import Event, Queue, create_task
+from anyio import Event, create_memory_object_stream, move_on_after
 from fps import Signal
 from pycrdt import Array, Map
 
+from txl.stapled import StapledObjectStream
+
 from .message import create_message
 
 
@@ -31,8 +33,8 @@ class Comm:
             buffers=buffers,
         )
         self.msg_cnt += 1
-        create_task(
-            self.send_message(msg, self.shell_channel, change_date_to_str=True), self.task_group
+        self.task_group.create_task(
+            self.send_message(msg, self.shell_channel, change_date_to_str=True)
         )
 
 
@@ -41,10 +43,12 @@ class KernelMixin:
         self.task_group = task_group
         self.busy = Signal[bool]()
         self.msg_cnt = 0
-        self.execute_requests: Dict[str, Dict[str, Queue]] = {}
-        self.recv_queue = Queue()
+        self.execute_requests: Dict[str, Dict[str, StapledObjectStream]] = {}
+        self.recv_queue = StapledObjectStream(
+            *create_memory_object_stream[Any](max_buffer_size=math.inf)
+        )
         self.started = Event()
-        create_task(self.recv(), task_group)
+        task_group.create_task(self.recv())
 
     def create_message(self, *args, **kwargs):
         return create_message(*args, **kwargs)
@@ -62,18 +66,22 @@ 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": Queue(),
-                "shell": Queue(),
+                "iopub": StapledObjectStream(
+                    *create_memory_object_stream[Any](max_buffer_size=math.inf)
+                ),
+                "shell": StapledObjectStream(
+                    *create_memory_object_stream[Any](max_buffer_size=math.inf)
+                ),
             }
             with move_on_after(new_timeout) as scope:
-                msg = await self.execute_requests[msg_id]["shell"].get()
+                msg = await self.execute_requests[msg_id]["shell"].receive()
             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":
                 with move_on_after(0.2) as scope:
-                    msg = await self.execute_requests[msg_id]["iopub"].get()
+                    msg = await self.execute_requests[msg_id]["iopub"].receive()
                 if not scope.cancelled_caught:
                     break
             del self.execute_requests[msg_id]
@@ -81,7 +89,7 @@ class KernelMixin:
 
     async def recv(self):
         while True:
-            msg = await self.recv_queue.get()
+            msg = await self.recv_queue.receive()
             channel = msg.pop("channel")
             msg_type = msg["header"]["msg_type"]
             if msg_type == "comm_open":
@@ -108,7 +116,7 @@ class KernelMixin:
             if msg_id in self.execute_requests:
                 # msg["header"] = str_to_date(msg["header"])
                 # msg["parent_header"] = str_to_date(msg["parent_header"])
-                self.execute_requests[msg_id][channel].put_nowait(msg)
+                self.execute_requests[msg_id][channel].send_nowait(msg)
 
     async def execute(
         self,
@@ -136,15 +144,19 @@ class KernelMixin:
             msg_id = msg["header"]["msg_id"]
         self.msg_cnt += 1
         self.execute_requests[msg_id] = {
-            "iopub": Queue(),
-            "shell": Queue(),
+            "iopub": StapledObjectStream(
+                *create_memory_object_stream[Any](max_buffer_size=math.inf)
+            ),
+            "shell": StapledObjectStream(
+                *create_memory_object_stream[Any](max_buffer_size=math.inf)
+            ),
         }
         await self.send_message(msg, self.shell_channel, change_date_to_str=True)
         if wait_for_executed:
             deadline = time.monotonic() + timeout
             while True:
                 with move_on_after(deadline_to_timeout(deadline)) as scope:
-                    msg = await self.execute_requests[msg_id]["iopub"].get()
+                    msg = await self.execute_requests[msg_id]["iopub"].receive()
                 if scope.cancelled_caught:
                     del self.execute_requests[msg_id]
                     error_message = f"Kernel didn't respond in {timeout} seconds"
@@ -156,7 +168,7 @@ class KernelMixin:
                 ):
                     break
             with move_on_after(deadline_to_timeout(deadline)) as scope:
-                msg = await self.execute_requests[msg_id]["shell"].get()
+                msg = await self.execute_requests[msg_id]["shell"].receive()
             if scope.cancelled_caught:
                 del self.execute_requests[msg_id]
                 error_message = f"Kernel didn't respond in {timeout} seconds"

txl_kernel-0.3.8/pyproject.toml

@@ -1,20 +0,0 @@
-[build-system]
-requires = [ "hatchling",]
-build-backend = "hatchling.build"
-
-[project]
-name = "txl_kernel"
-version = "0.3.8"
-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.3.2", "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"