singlestoredb 0.10.0__cp38-abi3-win_amd64.whl → 0.10.2__cp38-abi3-win_amd64.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '0.10.0'
+__version__ = '0.10.2'
 
 from .alchemy import create_engine
 from .config import options, get_option, set_option, describe_option

singlestoredb/fusion/handlers/utils.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import datetime
+import os
 from typing import Any
 from typing import Dict
 from typing import Optional
@@ -26,15 +27,17 @@ def get_workspace_group(params: Dict[str, Any]) -> WorkspaceGroup:
     """Find a workspace group matching group_id or group_name."""
     manager = get_workspace_manager()
 
-    if params['group_name']:
+    group_name = params.get('group_name') or \
+        (params.get('in_group') or {}).get('group_name')
+    if group_name:
         workspace_groups = [
             x for x in manager.workspace_groups
-            if x.name == params['group_name']
+            if x.name == group_name
         ]
 
         if not workspace_groups:
             raise KeyError(
-                'no workspace group found with name "{}"'.format(params['group_name']),
+                'no workspace group found with name "{}"'.format(group_name),
             )
 
         if len(workspace_groups) > 1:
@@ -45,4 +48,17 @@ def get_workspace_group(params: Dict[str, Any]) -> WorkspaceGroup:
 
         return workspace_groups[0]
 
-    return manager.get_workspace_group(params['group_id'])
+    group_id = params.get('group_id') or \
+        (params.get('in_group') or {}).get('group_id')
+    if group_id:
+        return manager.get_workspace_group(group_id)
+
+    if os.environ.get('SINGLESTOREDB_WORKSPACE_GROUP'):
+        return manager.get_workspace_group(
+            os.environ['SINGLESTOREDB_WORKSPACE_GROUP'],
+        )
+
+    if os.environ.get('SINGLESTOREDB_CLUSTER'):
+        raise ValueError('clusters and shared workspaces are not currently supported')
+
+    raise KeyError('no workspace group was specified')

singlestoredb/fusion/handlers/workspace.py

@@ -80,8 +80,10 @@ ShowWorkspaceGroupsHandler.register()
 
 class ShowWorkspacesHandler(SQLHandler):
     """
-    SHOW WORKSPACES IN GROUP { group_id | group_name }
-        [ <like> ] [ <extended> ] [ <order-by> ] [ <limit> ];
+    SHOW WORKSPACES [ in_group ] [ <like> ] [ <extended> ] [ <order-by> ] [ <limit> ];
+
+    # Workspace group
+    in_group = IN GROUP { group_id | group_name }
 
     # ID of group
     group_id = ID '<group-id>'
@@ -198,10 +200,12 @@ CreateWorkspaceGroupHandler.register()
 
 class CreateWorkspaceHandler(SQLHandler):
     """
-    CREATE WORKSPACE [ if_not_exists ] workspace_name
-        IN GROUP { group_id | group_name }
+    CREATE WORKSPACE [ if_not_exists ] workspace_name [ in_group ]
         WITH SIZE size [ wait_on_active ];
 
+    # Create workspace in workspace group
+    in_group = IN GROUP { group_id | group_name }
+
     # Only run command if workspace doesn't already exist
     if_not_exists = IF NOT EXISTS
 
@@ -264,15 +268,15 @@ class DropWorkspaceGroupHandler(SQLHandler):
     """
 
     def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:
-        manager = get_workspace_manager()
-
         try:
-            name_or_id = params['group_name'] or params['group_id']
-            wg = manager.workspace_groups[name_or_id]
-            wg.terminate(wait_on_terminated=params['wait_on_terminated'])
+            workspace_group = get_workspace_group(params)
+            if workspace_group.terminated_at is not None:
+                raise KeyError
+            workspace_group.terminate(wait_on_terminated=params['wait_on_terminated'])
 
         except KeyError:
             if not params['if_exists']:
+                name_or_id = params['group_id'] or params['group_name']
                 raise KeyError(f"could not find workspace group '{name_or_id}'")
 
         return None
@@ -284,7 +288,10 @@ DropWorkspaceGroupHandler.register()
 class DropWorkspaceHandler(SQLHandler):
     """
     DROP WORKSPACE [ if_exists ] { workspace_id | workspace_name }
-        IN GROUP { group_id | group_name } [ wait_on_terminated ];
+        [ in_group ] [ wait_on_terminated ];
+
+    # Workspace group
+    in_group = IN GROUP { group_id | group_name }
 
     # Only drop workspace if it exists
     if_exists = IF EXISTS
@@ -307,16 +314,15 @@ class DropWorkspaceHandler(SQLHandler):
     """
 
     def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:
-        manager = get_workspace_manager()
-
         try:
+            workspace_group = get_workspace_group(params)
             workspace_name_or_id = params['workspace_name'] or params['workspace_id']
-            group_name_or_id = params['group_name'] or params['group_id']
-            wg = manager.workspace_groups[group_name_or_id]
-            ws = wg.workspaces[workspace_name_or_id]
+            ws = workspace_group.workspaces[workspace_name_or_id]
             ws.terminate(wait_on_terminated=params['wait_on_terminated'])
 
         except KeyError:
+            group_name_or_id = params['in_group'].get('group_id', None) or \
+                               params['in_group'].get('group_name', None)
             if not params['if_exists']:
                 raise KeyError(
                     f"could not find workspace '{workspace_name_or_id}' "

singlestoredb/management/utils.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python
 """SingleStoreDB Cluster Management."""
 import datetime
+import functools
 import os
 import re
 import sys
 from typing import Any
+from typing import Callable
 from typing import Dict
 from typing import List
 from typing import Optional
@@ -31,37 +33,44 @@ else:
     PathLikeABC = os.PathLike[str]
 
 
-def get_token() -> Optional[str]:
-    """Return the token for the Management API."""
-    # See if an API key is configured
-    tok = get_option('management.token')
-    if tok:
-        return tok
+class TTLProperty(object):
+    """Property with time limit."""
 
-    # See if the connection URL contains a JWT
-    url = get_option('host')
-    if not url:
-        return None
+    def __init__(self, fget: Callable[[Any], Any], ttl: datetime.timedelta):
+        self.fget = fget
+        self.ttl = ttl
+        self._last_executed = datetime.datetime(2000, 1, 1)
+        self._last_result = None
+        self.__doc__ = fget.__doc__
+        self._name = ''
 
-    urlp = urlparse(url, scheme='singlestoredb', allow_fragments=True)
-    if urlp.password:
-        try:
-            jwt.decode(urlp.password, options={'verify_signature': False})
-            return urlp.password
-        except jwt.DecodeError:
-            pass
+    def reset(self) -> None:
+        self._last_executed = datetime.datetime(2000, 1, 1)
+        self._last_result = None
 
-    # Didn't find a key anywhere
-    return None
+    def __set_name__(self, owner: Any, name: str) -> None:
+        self._name = name
 
+    def __get__(self, obj: Any, objtype: Any = None) -> Any:
+        if obj is None:
+            return self
 
-def get_organization() -> Optional[str]:
-    """Return the organization for the current token or environment."""
-    org = os.environ.get('SINGLESTOREDB_ORGANIZATION')
-    if org:
-        return org
+        if self._last_result is not None \
+                and (datetime.datetime.now() - self._last_executed) < self.ttl:
+            return self._last_result
 
-    return None
+        self._last_result = self.fget(obj)
+        self._last_executed = datetime.datetime.now()
+
+        return self._last_result
+
+
+def ttl_property(ttl: datetime.timedelta) -> Callable[[Any], Any]:
+    """Property with a time-to-live."""
+    def wrapper(func: Callable[[Any], Any]) -> Any:
+        out = TTLProperty(func, ttl=ttl)
+        return functools.wraps(func)(out)
+    return wrapper
 
 
 class NamedList(List[T]):
@@ -107,6 +116,39 @@ class NamedList(List[T]):
             raise
 
 
+def get_token() -> Optional[str]:
+    """Return the token for the Management API."""
+    # See if an API key is configured
+    tok = get_option('management.token')
+    if tok:
+        return tok
+
+    # See if the connection URL contains a JWT
+    url = get_option('host')
+    if not url:
+        return None
+
+    urlp = urlparse(url, scheme='singlestoredb', allow_fragments=True)
+    if urlp.password:
+        try:
+            jwt.decode(urlp.password, options={'verify_signature': False})
+            return urlp.password
+        except jwt.DecodeError:
+            pass
+
+    # Didn't find a key anywhere
+    return None
+
+
+def get_organization() -> Optional[str]:
+    """Return the organization for the current token or environment."""
+    org = os.environ.get('SINGLESTOREDB_ORGANIZATION')
+    if org:
+        return org
+
+    return None
+
+
 def enable_http_tracing() -> None:
     """Enable tracing of HTTP requests."""
     import logging

singlestoredb/management/workspace.py

@@ -28,6 +28,7 @@ from .utils import NamedList
 from .utils import PathLike
 from .utils import snake_to_camel
 from .utils import to_datetime
+from .utils import ttl_property
 from .utils import vars_to_str
 
 
@@ -1119,7 +1120,7 @@ class WorkspaceGroup(object):
         try:
             region = [x for x in manager.regions if x.id == obj['regionID']][0]
         except IndexError:
-            region = None
+            region = Region(obj.get('regionID', '<unknown>'), '<unknown>', '<unknown>')
         out = cls(
             name=obj['name'],
             id=obj['workspaceGroupID'],
@@ -1377,23 +1378,23 @@ class WorkspaceManager(Manager):
     #: Object type
     obj_type = 'workspace'
 
-    @ property
+    @property
     def workspace_groups(self) -> NamedList[WorkspaceGroup]:
         """Return a list of available workspace groups."""
         res = self._get('workspaceGroups')
         return NamedList([WorkspaceGroup.from_dict(item, self) for item in res.json()])
 
-    @ property
+    @property
     def organizations(self) -> Organizations:
         """Return the organizations."""
         return Organizations(self)
 
-    @ property
+    @property
     def billing(self) -> Billing:
         """Return the current billing information."""
         return Billing(self)
 
-    @ property
+    @ttl_property(datetime.timedelta(hours=1))
     def regions(self) -> NamedList[Region]:
         """Return a list of available regions."""
         res = self._get('regions')

{singlestoredb-0.10.0.dist-info → singlestoredb-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 0.10.0
+Version: 0.10.2
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore

{singlestoredb-0.10.0.dist-info → singlestoredb-0.10.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-_singlestoredb_accel.pyd,sha256=Jjd6MaIvCYkXOOEpmyp59vl9GbG1nNhNX0Aw-sIU45Q,45568
-singlestoredb/__init__.py,sha256=0NRPHoBellCGLI_aEk1_axilX9YBo7VNdm40gMq7pzY,910
+_singlestoredb_accel.pyd,sha256=8PqjY5PQXqifYCe96103HTZ-dhDT7H-1FTJ5gx84_B8,45568
+singlestoredb/__init__.py,sha256=HVmH2GEx2_Vmnv0hvAFuRaB2yiP3MMmGY6cfiqJ2AFo,910
 singlestoredb/auth.py,sha256=RmYiH0Wlc2RXc4pTlRMysxtBI445ggCIwojWKC_eDLE,7844
 singlestoredb/config.py,sha256=Uq7LWKlIwMAJC3_G3j5dUIQVJf2JzbDVtRK6votjuDw,7746
 singlestoredb/connection.py,sha256=gSKmMN1d_ZSXVTmzfuHK3BXcLyNGiaSi2Vy6z7nymjg,45657
@@ -22,8 +22,8 @@ singlestoredb/fusion/registry.py,sha256=7wELKu09I6N4Oif4lpqAHCy8p_C4COn85hhtoCN5
 singlestoredb/fusion/result.py,sha256=EcFY5Qv43ySlQsfl_JB-I3ko7PzVdjuhhoKN96uHSAM,12171
 singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 singlestoredb/fusion/handlers/stage.py,sha256=VEoHU3q5BX3lCl6pG9jVf-eviqkTZhyzTbO3sRKrMPs,5426
-singlestoredb/fusion/handlers/utils.py,sha256=GPDlvm-hU2zwTYczyITHcWwmBc4BwhiVN5JF3SeX2Nw,1476
-singlestoredb/fusion/handlers/workspace.py,sha256=Q6rEa0I74V3ujn_JHzUAROz8GxgLMjLWSaeiVpC5ZSs,9770
+singlestoredb/fusion/handlers/utils.py,sha256=H79iVSp0EZKyL3vI8OX8m8cBuFfU-7X9u5CjqnFBmRs,2045
+singlestoredb/fusion/handlers/workspace.py,sha256=b21Vi6zZPi8TyWaI7BcAF4L7KGU6xFNV3EAN7wF1fN4,10045
 singlestoredb/http/__init__.py,sha256=4cEDvLloGc3LSpU-PnIwacyu0n5oIIIE6xk2SPyWD_w,939
 singlestoredb/http/connection.py,sha256=vYP10ZsqrhK8RrLS17OVuMkpTsO0VZQu3bxx1FQzUwU,37839
 singlestoredb/management/__init__.py,sha256=kdKM-wErALWaEHYBLx_raHkJ8xUvUPflhOk8OBJyn58,173
@@ -32,8 +32,8 @@ singlestoredb/management/cluster.py,sha256=0GhpuSt_rcFz5f1hzcRHK911KWFewljlV4GFt
 singlestoredb/management/manager.py,sha256=-fcuqyM3amze72kNF8JXjQOkWzZrdp9LVDd1ySNWHzI,8813
 singlestoredb/management/organization.py,sha256=iz5Mde0lat3EYLpwNDbnS0ytI33O6tG6-wYDL4-TGdM,2200
 singlestoredb/management/region.py,sha256=oGoLLS88dE1GmY7GCc0BV7X3f7bWwKQyeXOVBFmK9Pk,1678
-singlestoredb/management/utils.py,sha256=7Lz2JvudiA4uHJ2uM50zeaPtzHUo8hfcCSbEipkhLpo,7227
-singlestoredb/management/workspace.py,sha256=HfxnlGPu6Lt0eG_ZPevqjf68IwI0KlS2_8e5qrO-NJo,49129
+singlestoredb/management/utils.py,sha256=-XXP7FnCRWlDcPMo6oOG-_UYI00QQqUpXM4TlILu5Kw,8533
+singlestoredb/management/workspace.py,sha256=Bzkzp2_UymVfyOJDg4SjtPa2MsWAC0UinofR-xMxYN0,49253
 singlestoredb/mysql/__init__.py,sha256=CbpwzNUJPAmKPpIobC0-ugBta_RgHCMq7X7N75QLReY,4669
 singlestoredb/mysql/_auth.py,sha256=YaqqyvAHmeraBv3BM207rNveUVPM-mPnW20ts_ynVWg,8341
 singlestoredb/mysql/charset.py,sha256=mnCdMpvdub1S2mm2PSk2j5JddgsWRjsVLtGx-y9TskE,10724
@@ -98,8 +98,8 @@ singlestoredb/utils/debug.py,sha256=y7dnJeJGt3U_BWXz9pLt1qNQREpPtumYX_sk1DiqG6Y,
 singlestoredb/utils/mogrify.py,sha256=gCcn99-vgsGVjTUV7RHJ6hH4vCNrsGB_Xo4z8kiSPDQ,4201
 singlestoredb/utils/results.py,sha256=ely2XVAHHejObjLibS3UcrPOuCO2g5aRtA3PxAMtE-g,5432
 singlestoredb/utils/xdict.py,sha256=-wi1lSPTnY99fhVMBhPKJ8cCsQhNG4GMUfkEBDKYgCw,13321
-singlestoredb-0.10.0.dist-info/LICENSE,sha256=Bojenzui8aPNjlF3w4ojguDP7sTf8vFV_9Gc2UAG1sg,11542
-singlestoredb-0.10.0.dist-info/METADATA,sha256=qGhIMkL82Uz22yjAtqT-l5T2eiKqf-bcZt7YnxuWiKo,7794
-singlestoredb-0.10.0.dist-info/WHEEL,sha256=NWRSyYmhZPn8_0pCTTzBY74ihO0hpYMm3KvprjPFRJU,100
-singlestoredb-0.10.0.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
-singlestoredb-0.10.0.dist-info/RECORD,,
+singlestoredb-0.10.2.dist-info/LICENSE,sha256=Bojenzui8aPNjlF3w4ojguDP7sTf8vFV_9Gc2UAG1sg,11542
+singlestoredb-0.10.2.dist-info/METADATA,sha256=WJLPuZGqhIr4yEui0bNp7_4jhJkryaQ4-ZdHRkhkXus,7794
+singlestoredb-0.10.2.dist-info/WHEEL,sha256=NWRSyYmhZPn8_0pCTTzBY74ihO0hpYMm3KvprjPFRJU,100
+singlestoredb-0.10.2.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
+singlestoredb-0.10.2.dist-info/RECORD,,