singlestoredb 0.10.1__cp38-abi3-macosx_10_9_universal2.whl → 0.10.2__cp38-abi3-macosx_10_9_universal2.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '0.10.1'
+__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-0.10.1.dist-info → singlestoredb-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 0.10.1
+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.1.dist-info → singlestoredb-0.10.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-_singlestoredb_accel.abi3.so,sha256=aj9EeTCn4gv2x2D8gdYk46hfbRcMYShmgcwCoGwGYGw,190381
-singlestoredb-0.10.1.dist-info/RECORD,,
-singlestoredb-0.10.1.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-0.10.1.dist-info/WHEEL,sha256=KJyRfI6ymNrbNX24abM8L1lvGQoLJMtVQA9ah4jJdY4,113
-singlestoredb-0.10.1.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
-singlestoredb-0.10.1.dist-info/METADATA,sha256=v0DZBvC8O7pBGOASioXg95mJtEgaJRw9kgkKmXFSzTQ,7639
+_singlestoredb_accel.abi3.so,sha256=-6OnNeHuiNB34MvOOTPJkJSNUYBBk9nZ8V8bvlpPviE,190381
+singlestoredb-0.10.2.dist-info/RECORD,,
+singlestoredb-0.10.2.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-0.10.2.dist-info/WHEEL,sha256=KJyRfI6ymNrbNX24abM8L1lvGQoLJMtVQA9ah4jJdY4,113
+singlestoredb-0.10.2.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
+singlestoredb-0.10.2.dist-info/METADATA,sha256=AIiNHizIrmtM6tIi3t2FTOO_HlNBK4vgrYfXjXBHx3s,7639
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=ZfLiOeqADAUMekvA9OZoDWDLdvXTGebPOcmMnN33Drw,7476
-singlestoredb/__init__.py,sha256=oUzYHmU50txggC0PrUNxueSr7gF0uOoZk01y3xP9rzk,878
+singlestoredb/__init__.py,sha256=k9Blt_QRyqz6gOVAJZEMHpMi_Yh_jjUhWYGOxfoo2e8,878
 singlestoredb/types.py,sha256=FIqO1A7e0Gkk7ITmIysBy-P5S--ItbMSlYvblzqGS30,9969
 singlestoredb/connection.py,sha256=gDBIs3XgLOROVHtzMx9zmSYILc0aRVY7k8we3b4TxCw,44227
 singlestoredb/exceptions.py,sha256=HuoA6sMRL5qiCiee-_5ddTGmFbYC9Euk8TYUsh5GvTw,3234
@@ -17,9 +17,9 @@ singlestoredb/fusion/registry.py,sha256=rbt-3WITO0aLC3ylDlY7FBlzA9-kmTBbW6-LQyVI
 singlestoredb/fusion/__init__.py,sha256=Qo7SuqGw-l-vE8-EI2jhm6hXJkYfOLUKIws9c7LFNX0,356
 singlestoredb/fusion/result.py,sha256=Bd3KbRpqWqQcWp_Chd4bzBy8Kfc8nXLS_Pn_GGbPO6o,11772
 singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-singlestoredb/fusion/handlers/utils.py,sha256=ZbJKXn7twJg7xsOHVDOCNgFly5TZGlfjG7BW3zZgDP4,1428
+singlestoredb/fusion/handlers/utils.py,sha256=QMgflQFTGz1ltTTJR50XfY2GZdHbjUTKUB5SWM7S6UE,1981
 singlestoredb/fusion/handlers/stage.py,sha256=LL_C-yz8X6mjvseFmY_EmDLzxOMJqm6pvvYIUh7HXjc,5234
-singlestoredb/fusion/handlers/workspace.py,sha256=doBeR5Sudi7q1-K1zPcliWQOZmhFA6hK_7JR1Nu-Ffk,9441
+singlestoredb/fusion/handlers/workspace.py,sha256=pyEqD5nbu0BRE0-DfiW3O6WhbJHaVaAQJzkHnVUozfs,9710
 singlestoredb/tests/test.sql,sha256=wtHioW6SNa2nht71Bo9XQkE36-X1L6C_AZ5QyMJuvqM,9415
 singlestoredb/tests/test_xdict.py,sha256=fqHspoi39nbX3fIDVkkRXcd5H50xdOsSvK0bxAMQnaE,10408
 singlestoredb/tests/test_results.py,sha256=wg93sujwt-R9_eJCgSCElgAZhLDkIiAo3qPkPydOv78,6582