Merge pull request #20 from wherobots/use-new-runtime-ids

chore: move to use new runtime IDs, add user agent header

Author: zongsizhang

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wherobots-python-dbapi"
-version = "0.7.3"
+version = "0.7.4"
 description = "Python DB-API driver for Wherobots DB"
 authors = ["Maxime Petazzoni <[email protected]>"]
 license = "Apache 2.0"

wherobots/db/driver.py

@@ -4,9 +4,12 @@
 """
 
 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 @@
 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/db/runtime.py

@@ -2,12 +2,12 @@
 
 
 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"