wherobots-python-dbapi 0.7.2__tar.gz → 0.7.4__tar.gz

{wherobots_python_dbapi-0.7.2 → wherobots_python_dbapi-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wherobots-python-dbapi
-Version: 0.7.2
+Version: 0.7.4
 Summary: Python DB-API driver for Wherobots DB
 License: Apache 2.0
 Author: Maxime Petazzoni
@@ -14,8 +14,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: StrEnum (>=0.4.15,<0.5.0)
 Requires-Dist: cbor2 (>=5.6.3,<6.0.0)
-Requires-Dist: pandas (>=2.2.2,<3.0.0)
-Requires-Dist: pyarrow (>=15.0.2,<16.0.0)
+Requires-Dist: numpy (<2)
+Requires-Dist: pandas (>=2.1.0,<3.0.0)
+Requires-Dist: pyarrow (>=14.0.2,<15.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: tenacity (>=8.2.3,<9.0.0)
 Requires-Dist: websockets (>=12.0,<13.0)

{wherobots_python_dbapi-0.7.2 → wherobots_python_dbapi-0.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wherobots-python-dbapi"
-version = "0.7.2"
+version = "0.7.4"
 description = "Python DB-API driver for Wherobots DB"
 authors = ["Maxime Petazzoni <max@wherobots.com>"]
 license = "Apache 2.0"
@@ -16,10 +16,12 @@ python = "^3.9"
 requests = "^2.31.0"
 websockets = "^12.0"
 tenacity = "^8.2.3"
-pyarrow = "^15.0.2"
+pyarrow = "^14.0.2"
 cbor2 = "^5.6.3"
-pandas = "^2.2.2"
+pandas = "^2.1.0"
 StrEnum = "^0.4.15"
+# pyarrow 14.0.2 doesn't limit numpy < 2, but it should, we do it here
+numpy = "<2"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.8.0"

{wherobots_python_dbapi-0.7.2 → wherobots_python_dbapi-0.7.4}/wherobots/db/cursor.py

@@ -1,8 +1,18 @@
 import queue
-from typing import Any, Optional
+from typing import Any, Optional, List, Tuple
 
 from .errors import ProgrammingError, DatabaseError
 
+_TYPE_MAP = {
+    "object": "STRING",
+    "int64": "NUMBER",
+    "float64": "NUMBER",
+    "datetime64[ns]": "DATETIME",
+    "timedelta[ns]": "DATETIME",
+    "bool": "NUMBER",  # Assuming boolean is stored as number
+    "bytes": "BINARY",
+}
+
 
 class Cursor:
 
@@ -17,14 +27,14 @@ class Cursor:
 
         # Description and row count are set by the last executed operation.
         # Their default values are defined by PEP-0249.
-        self.__description: Optional[str] = None
+        self.__description: Optional[List[Tuple]] = None
         self.__rowcount: int = -1
 
         # Array-size is also defined by PEP-0249 and is expected to be read/writable.
         self.arraysize: int = 1
 
     @property
-    def description(self) -> Optional[str]:
+    def description(self) -> Optional[List[Tuple]]:
         return self.__description
 
     @property
@@ -34,7 +44,7 @@ class Cursor:
     def __on_execution_result(self, result) -> None:
         self.__queue.put(result)
 
-    def __get_results(self) -> Optional[list[Any]]:
+    def __get_results(self) -> Optional[List[Tuple[Any, ...]]]:
         if not self.__current_execution_id:
             raise ProgrammingError("No query has been executed yet")
         if self.__results is not None:
@@ -43,8 +53,23 @@ class Cursor:
         result = self.__queue.get()
         if isinstance(result, DatabaseError):
             raise result
+
         self.__rowcount = len(result)
         self.__results = result
+        if not result.empty:
+            self.__description = [
+                (
+                    col_name,  # name
+                    _TYPE_MAP.get(str(result[col_name].dtype), "STRING"),  # type_code
+                    None,  # display_size
+                    result[col_name].memory_usage(),  # internal_size
+                    None,  # precision
+                    None,  # scale
+                    True,  # null_ok; Assuming all columns can accept NULL values
+                )
+                for col_name in result.columns
+            ]
+
         return self.__results
 
     def execute(self, operation: str, parameters: dict[str, Any] = None):
@@ -54,6 +79,7 @@ class Cursor:
         self.__results = None
         self.__current_row = 0
         self.__rowcount = -1
+        self.__description = None
 
         sql = operation.format(**(parameters or {}))
         self.__current_execution_id = self.__exec_fn(sql, self.__on_execution_result)

{wherobots_python_dbapi-0.7.2 → wherobots_python_dbapi-0.7.4}/wherobots/db/driver.py

@@ -4,9 +4,12 @@ A PEP-0249 compatible driver for interfacing with Wherobots DB.
 """
 
 import logging
-import os
+import platform
 import urllib.parse
 import queue
+from importlib import metadata
+from importlib.metadata import PackageNotFoundError
+
 import requests
 import tenacity
 import threading
@@ -39,6 +42,18 @@ threadsafety = 1
 paramstyle = "pyformat"
 
 
+def gen_user_agent_header():
+    try:
+        package_version = metadata.version("wherobots-python-dbapi")
+    except PackageNotFoundError:
+        package_version = "unknown"
+    python_version = platform.python_version()
+    system = platform.system().lower()
+    return {
+        "User-Agent": f"wherobots-python-dbapi/{package_version} os/{system} python/{python_version}"
+    }
+
+
 def connect(
     host: str = DEFAULT_ENDPOINT,
     token: str = None,
@@ -57,12 +72,14 @@ def connect(
     if token and api_key:
         raise ValueError("`token` and `api_key` can't be both provided")
 
-    headers = {}
+    headers = gen_user_agent_header()
     if token:
         headers["Authorization"] = f"Bearer {token}"
     elif api_key:
         headers["X-API-Key"] = api_key
 
+    logging.info(headers)
+
     host = host or DEFAULT_ENDPOINT
     runtime = runtime or DEFAULT_RUNTIME
     region = region or DEFAULT_REGION

{wherobots_python_dbapi-0.7.2 → wherobots_python_dbapi-0.7.4}/wherobots/db/runtime.py

@@ -2,12 +2,12 @@ from enum import Enum
 
 
 class Runtime(Enum):
-    SEDONA = "TINY"
-    SAN_FRANCISCO = "SMALL"
-    NEW_YORK = "MEDIUM"
-    CAIRO = "LARGE"
-    DELHI = "XLARGE"
-    TOKYO = "XXLARGE"
+    SEDONA = "tiny"
+    SAN_FRANCISCO = "small"
+    NEW_YORK = "medium"
+    CAIRO = "large"
+    DELHI = "x-large"
+    TOKYO = "2x-large"
     ATLANTIS = "4x-large"
 
     NEW_YORK_HIMEM = "medium-himem"