wherobots-python-dbapi 0.28.1__tar.gz → 0.29.0__tar.gz

{wherobots_python_dbapi-0.28.1 → wherobots_python_dbapi-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: wherobots-python-dbapi
-Version: 0.28.1
+Version: 0.29.0
 Summary: Python DB-API driver for Wherobots DB
 Project-URL: Homepage, https://github.com/wherobots/wherobots-python-dbapi-driver
 Project-URL: Tracker, https://github.com/wherobots/wherobots-python-dbapi-driver/issues
@@ -302,3 +302,8 @@ users may find useful:
     caller needs to interrupt it (e.g. on client disconnect or timeout).
     The event is checked before each HTTP request, between retry
     attempts, and before the WebSocket handshake.
+* `stale_query_probe_seconds`: how long a running query may go without
+    any message from the SQL session before the driver asks the session
+    for its state again, in case the query's completion event was lost.
+    Repeat probes back off to at most 8 times this interval. Defaults to
+    30 seconds; pass `None` to disable probing.

{wherobots_python_dbapi-0.28.1 → wherobots_python_dbapi-0.29.0}/README.md

@@ -277,3 +277,8 @@ users may find useful:
     caller needs to interrupt it (e.g. on client disconnect or timeout).
     The event is checked before each HTTP request, between retry
     attempts, and before the WebSocket handshake.
+* `stale_query_probe_seconds`: how long a running query may go without
+    any message from the SQL session before the driver asks the session
+    for its state again, in case the query's completion event was lost.
+    Repeat probes back off to at most 8 times this interval. Defaults to
+    30 seconds; pass `None` to disable probing.

{wherobots_python_dbapi-0.28.1 → wherobots_python_dbapi-0.29.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wherobots-python-dbapi"
-version = "0.28.1"
+version = "0.29.0"
 description = "Python DB-API driver for Wherobots DB"
 authors = [{ name = "Maxime Petazzoni", email = "max@wherobots.com" }]
 requires-python = ">=3.10, <4"

wherobots_python_dbapi-0.29.0/wherobots/db/_transport.py

@@ -0,0 +1,57 @@
+"""Transport termination independent of the WebSocket protocol's send lock."""
+
+import errno
+import select
+import selectors
+import socket
+
+from websockets.sync.client import ClientConnection
+
+
+def abort_connection(ws: ClientConnection) -> None:
+    """Disable further writes and wake blocked I/O before publishing failures.
+
+    ClientConnection.close() takes the library's protocol mutex, which a
+    stalled sendall() may hold. Shutdown the owned socket instead; the library's
+    receive thread will observe EOF/error and finish protocol cleanup itself.
+    Already transmitted bytes may still execute remotely.
+    """
+    try:
+        ws.socket.shutdown(socket.SHUT_RDWR)
+    except OSError as exc:
+        if exc.errno not in (errno.ENOTCONN, errno.EBADF, errno.ECONNRESET):
+            raise
+    finally:
+        # Even if shutdown fails, prevent any later send on this socket object.
+        ws.socket.close()
+
+
+def socket_writable(ws: ClientConnection) -> bool:
+    """Whether a small write to the transport's socket won't block right now.
+
+    For a send that must not stall the reader thread: a full send buffer
+    (a peer that keeps sending but stops reading) would park sendall(), which
+    also holds the library's protocol mutex, so even keepalive pings stall.
+
+    Never raises. Returns ``True`` (proceed, as without this check) on any
+    failure or for a transport without a real socket, such as a test fake:
+    ``False`` would silently disable the caller's sends. Uses ``poll`` (or a
+    selector), not ``select.select``, which fails for fds above FD_SETSIZE.
+    """
+    try:
+        sock = getattr(ws, "socket", None)
+        if not isinstance(sock, socket.socket):
+            return True
+        fd = sock.fileno()
+        if fd < 0:
+            return True  # Closed: let the send itself report it.
+        if hasattr(select, "poll"):
+            poller = select.poll()
+            poller.register(fd, select.POLLOUT)
+            # POLLERR/POLLHUP count as writable: the send then fails fast.
+            return bool(poller.poll(0))
+        with selectors.DefaultSelector() as selector:
+            selector.register(fd, selectors.EVENT_WRITE)
+            return bool(selector.select(0))
+    except Exception:
+        return True