txl_remote_kernels 0.3.7__tar.gz → 0.3.8__tar.gz

{txl_remote_kernels-0.3.7 → txl_remote_kernels-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: txl_remote_kernels
-Version: 0.3.7
+Version: 0.3.8
 Summary: TXL plugin for remote kernels
 Project-URL: Source, https://github.com/davidbrochart/jpterm/tree/main/plugins/remote_kernels
 Author-email: David Brochart <david.brochart@gmail.com>
@@ -8,18 +8,18 @@ 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: httpx-ws>=0.4.2
-Requires-Dist: httpx>=0.23.1
-Requires-Dist: pycrdt<0.13.0,>=0.12.44
-Requires-Dist: txl-kernel
-Requires-Dist: txl==0.3.3
+Requires-Python: >=3.11
+Requires-Dist: httpx2[ws]>=2.6.0
+Requires-Dist: pycrdt<0.15.0,>=0.14.1
+Requires-Dist: txl-kernel<0.4.0,>=0.3.10
+Requires-Dist: txl==0.3.4
 Description-Content-Type: text/markdown
 
 # TXL plugin for remote kernels

{txl_remote_kernels-0.3.7 → txl_remote_kernels-0.3.8}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "txl_remote_kernels"
-version = "0.3.7"
+version = "0.3.8"
 description = "TXL plugin for remote kernels"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 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.3", "txl_kernel", "httpx >=0.23.1", "httpx-ws >=0.4.2", "pycrdt >=0.12.44,<0.13.0",]
+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", "txl_kernel >=0.3.10,<0.4.0", "httpx2[ws]>=2.6.0", "pycrdt >=0.14.1,<0.15.0",]
 [[project.authors]]
 name = "David Brochart"
 email = "david.brochart@gmail.com"

{txl_remote_kernels-0.3.7 → txl_remote_kernels-0.3.8}/txl_remote_kernels/driver.py

@@ -4,10 +4,8 @@ import uuid
 from typing import Any, Dict
 from urllib import parse
 
-import httpx
+import httpx2
 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
 
@@ -37,10 +35,10 @@ class KernelDriver(KernelMixin):
         parsed_url = parse.urlparse(url)
         self.base_url = parse.urljoin(url, parsed_url.path).rstrip("/")
         self.query_params = parse.parse_qs(parsed_url.query)
-        self.cookies = httpx.Cookies()
+        self.cookies = httpx2.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 = create_task(self.start(), task_group)
+        self.start_task = task_group.create_task(self.start())
         self.comm_handlers = comm_handlers
         self.shell_channel = "shell"
         self.control_channel = "control"
@@ -50,7 +48,7 @@ class KernelDriver(KernelMixin):
 
     async def start(self):
         i = str(uuid.uuid4())
-        async with httpx.AsyncClient() as client:
+        async with httpx2.AsyncClient() as client:
             body = {
                 "kernel": {"name": self.kernel_name},
                 "name": i,
@@ -73,13 +71,12 @@ class KernelDriver(KernelMixin):
             )
         if r.status_code != 200 or self.kernel_id != r.json()["id"]:
             return
-        async with aconnect_ws(
+        async with httpx2.AsyncClient(cookies=self.cookies) as client, client.websocket(
             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"],
         ) as self.websocket:
-            recv_task = create_task(self._recv(), self.task_group)
+            recv_task = self.task_group.create_task(self._recv())
             try:
                 await self.wait_for_ready()
                 self.started.set()
@@ -98,7 +95,7 @@ class KernelDriver(KernelMixin):
                     msg = json.loads(message.data)
                 else:
                     msg = from_binary(message.data)
-            self.recv_queue.put_nowait(msg)
+            self.recv_queue.send_nowait(msg)
 
     async def send_message(
         self,

{txl_remote_kernels-0.3.7 → txl_remote_kernels-0.3.8}/txl_remote_kernels/main.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Any
 from urllib import parse
 
-import httpx
+import httpx2
 from anyio import create_task_group, sleep
 from fps import Module
 from pycrdt import Map
@@ -37,12 +37,12 @@ class RemoteKernelspecs(Kernelspecs):
         parsed_url = parse.urlparse(url)
         self.base_url = parse.urljoin(url, parsed_url.path).rstrip("/")
         self.query_params = parse.parse_qs(parsed_url.query)
-        self.cookies = httpx.Cookies()
+        self.cookies = httpx2.Cookies()
 
     async def get(self) -> dict[str, Any]:
         url = f"{self.base_url}/api/kernelspecs"
         try:
-            async with httpx.AsyncClient() as client:
+            async with httpx2.AsyncClient() as client:
                 r = await client.get(
                     url,
                     params={**self.query_params},
@@ -51,7 +51,7 @@ class RemoteKernelspecs(Kernelspecs):
                 d = r.json()
                 self.cookies.update(r.cookies)
                 return d
-        except httpx.ConnectError:
+        except httpx2.ConnectError:
             raise RuntimeError(f"Could not connect to a Jupyter server at {url}")