wherobots-python-dbapi 0.26.0__py3-none-any.whl → 0.27.0__py3-none-any.whl

wherobots/db/driver.py

@@ -11,8 +11,10 @@ from packaging.version import Version
 import platform
 import requests
 import tenacity
+import threading
 from typing import Final, Union, Dict
 import urllib.parse
+import websockets.exceptions
 import websockets.sync.client
 import certifi
 
@@ -50,6 +52,9 @@ paramstyle: Final[str] = PARAM_STYLE
 # This follows the industry-standard set used by urllib3.util.Retry's status_forcelist.
 TRANSIENT_HTTP_STATUS_CODES = {429, 502, 503, 504}
 
+# Default timeout for individual HTTP requests (connect + read), in seconds.
+DEFAULT_HTTP_TIMEOUT = 30
+
 
 def gen_user_agent_header():
     try:
@@ -78,6 +83,7 @@ def connect(
     results_format: Union[ResultsFormat, None] = None,
     data_compression: Union[DataCompression, None] = None,
     geometry_representation: Union[GeometryRepresentation, None] = None,
+    cancel_event: Union[threading.Event, None] = None,
 ) -> Connection:
     if not token and not api_key:
         raise ValueError("At least one of `token` or `api_key` is required")
@@ -108,6 +114,8 @@ def connect(
     if not host.startswith("http:"):
         host = f"https://{host}"
 
+    _check_cancelled(cancel_event)
+
     try:
         resp = requests.post(
             url=f"{host}/sql/session",
@@ -119,6 +127,7 @@ def connect(
                 "sessionType": session_type.value,
             },
             headers=headers,
+            timeout=DEFAULT_HTTP_TIMEOUT,
         )
         resp.raise_for_status()
     except requests.HTTPError as e:
@@ -148,10 +157,12 @@ def connect(
             )
             | tenacity.retry_if_exception_type(tenacity.TryAgain)
         ),
+        before_sleep=lambda _: _check_cancelled(cancel_event),
         reraise=True,
     )
     def get_session_uri() -> str:
-        r = requests.get(session_id_url, headers=headers)
+        _check_cancelled(cancel_event)
+        r = requests.get(session_id_url, headers=headers, timeout=DEFAULT_HTTP_TIMEOUT)
         r.raise_for_status()
         payload = r.json()
         status = AppStatus(payload.get("status"))
@@ -168,6 +179,8 @@ def connect(
         logging.info("Getting SQL session status from %s ...", session_id_url)
         session_uri = get_session_uri()
         logging.debug("SQL session URI from app status: %s", session_uri)
+    except InterfaceError:
+        raise
     except Exception as e:
         raise InterfaceError("Could not acquire SQL session!", e)
 
@@ -178,9 +191,16 @@ def connect(
         results_format=results_format,
         data_compression=data_compression,
         geometry_representation=geometry_representation,
+        cancel_event=cancel_event,
     )
 
 
+def _check_cancelled(cancel_event: Union[threading.Event, None]) -> None:
+    """Raise InterfaceError if the cancel event is set."""
+    if cancel_event is not None and cancel_event.is_set():
+        raise InterfaceError("Connection cancelled by caller")
+
+
 def http_to_ws(uri: str) -> str:
     """Converts an HTTP URI to a WebSocket URI."""
     parsed = urllib.parse.urlparse(uri)
@@ -198,19 +218,41 @@ def connect_direct(
     results_format: Union[ResultsFormat, None] = None,
     data_compression: Union[DataCompression, None] = None,
     geometry_representation: Union[GeometryRepresentation, None] = None,
+    cancel_event: Union[threading.Event, None] = None,
 ) -> Connection:
     uri_with_protocol = f"{uri}/{protocol}"
+    ssl_context = ssl.create_default_context()
+    ssl_context.load_verify_locations(certifi.where())
 
-    try:
+    @tenacity.retry(
+        stop=tenacity.stop_after_attempt(5),
+        wait=tenacity.wait_exponential(multiplier=1, min=1, max=5),
+        retry=tenacity.retry_if_exception_type(
+            (
+                ConnectionRefusedError,
+                ConnectionResetError,
+                TimeoutError,
+                websockets.exceptions.InvalidHandshake,
+            )
+        ),
+        before_sleep=lambda _: _check_cancelled(cancel_event),
+        reraise=True,
+    )
+    def ws_connect() -> websockets.sync.client.ClientConnection:
+        _check_cancelled(cancel_event)
         logging.info("Connecting to SQL session at %s ...", uri_with_protocol)
-        ssl_context = ssl.create_default_context()
-        ssl_context.load_verify_locations(certifi.where())
-        ws = websockets.sync.client.connect(
+        return websockets.sync.client.connect(
             uri=uri_with_protocol,
             additional_headers=headers,
             max_size=MAX_MESSAGE_SIZE,
+            open_timeout=DEFAULT_HTTP_TIMEOUT,
             ssl=ssl_context,
         )
+
+    try:
+        ws = ws_connect()
+    except InterfaceError:
+        raise
     except Exception as e:
         raise InterfaceError("Failed to connect to SQL session!") from e
 

{wherobots_python_dbapi-0.26.0.dist-info → wherobots_python_dbapi-0.27.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wherobots-python-dbapi
-Version: 0.26.0
+Version: 0.27.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
@@ -285,3 +285,9 @@ users may find useful:
     your expected time between queries and effectively get a continuously
     running SQL session runtime without any complex connection management
     in your application.
+* `cancel_event`: a `threading.Event` that, when set, causes the
+    connection attempt to abort promptly with an `InterfaceError`. This
+    is useful when `connect()` is running in a background thread and the
+    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.

{wherobots_python_dbapi-0.26.0.dist-info → wherobots_python_dbapi-0.27.0.dist-info}/RECORD

@@ -3,14 +3,14 @@ wherobots/db/__init__.py,sha256=HN_uGOUMor80GB3rZIqnPcYWDAia7QAC-y9HfGKnegs,744
 wherobots/db/connection.py,sha256=BWQwVzFgujEwPKvhDePM9q45M2opCk6Jq998L0ekMyY,12795
 wherobots/db/constants.py,sha256=qV-6CmOya7-f-DoRMzcDzlhcmV5PkLCcqG5TFIsxQ7o,744
 wherobots/db/cursor.py,sha256=Z0rNdhJ985IP9XnZpjrCzvM0OqDFVgCNfJn8lrbijAo,6809
-wherobots/db/driver.py,sha256=J-ESQYLTOL0NYbOVVwsARXwECjVgVohg-aUA7Lv_ZrQ,7474
+wherobots/db/driver.py,sha256=Hvldyos2yCMoshq80PFI-4rYhVGPV2SL5OioTuY7PmE,8966
 wherobots/db/errors.py,sha256=G8a-DB6pgB0pUld59Wyq8PuywL-JWxGJfvrr-g8BPuU,310
 wherobots/db/models.py,sha256=uk0EqZMH_RFkQusSw2AvyFivGvGJBu_WYP8FHa6JJGM,4178
 wherobots/db/region.py,sha256=GoFzazvgOjE1kVVT1QKAsRK88c_1XSAebR3ME4foSlQ,400
 wherobots/db/runtime.py,sha256=eAR1oJEtssgkp-IRPTLOrlPI-_5SM_ASw6T6hQ_qF4I,985
 wherobots/db/session_type.py,sha256=jZNwCl0nxvY-0reIn8RR_-fIYSSvIcaGx_4pRc71Lww,137
 wherobots/db/types.py,sha256=WXKT_gbdQCH2_yXD_FECk0BpB7yfNWOLewCfax0U_Lk,2516
-wherobots_python_dbapi-0.26.0.dist-info/METADATA,sha256=iBhvIP-JgBLJgV4Fd1HCcAJjd2jbKIeXRA0439Tg-38,10328
-wherobots_python_dbapi-0.26.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-wherobots_python_dbapi-0.26.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-wherobots_python_dbapi-0.26.0.dist-info/RECORD,,
+wherobots_python_dbapi-0.27.0.dist-info/METADATA,sha256=FMCBp3yiCPb_d0AqxVkMmRqtDG5akWaktCfcJ5Uh4W0,10726
+wherobots_python_dbapi-0.27.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+wherobots_python_dbapi-0.27.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+wherobots_python_dbapi-0.27.0.dist-info/RECORD,,