singlestoredb 1.12.1__tar.gz → 1.12.2__tar.gz

{singlestoredb-1.12.1/singlestoredb.egg-info → singlestoredb-1.12.2}/PKG-INFO

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

{singlestoredb-1.12.1 → singlestoredb-1.12.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = singlestoredb
-version = 1.12.1
+version = 1.12.2
 description = Interface to the SingleStoreDB database and workspace management APIs
 long_description = file: README.md
 long_description_content_type = text/markdown

{singlestoredb-1.12.1 → singlestoredb-1.12.2}/singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.12.1'
+__version__ = '1.12.2'
 
 from typing import Any
 

{singlestoredb-1.12.1 → singlestoredb-1.12.2}/singlestoredb/fusion/handlers/utils.py

@@ -199,59 +199,65 @@ def get_deployment(
     """
     manager = get_workspace_manager()
 
+    #
+    # Search for deployment by name
+    #
     deployment_name = params.get('deployment_name') or \
         (params.get('in_deployment') or {}).get('deployment_name') or \
         (params.get('group') or {}).get('deployment_name') or \
         ((params.get('in') or {}).get('in_group') or {}).get('deployment_name') or \
         ((params.get('in') or {}).get('in_deployment') or {}).get('deployment_name')
+
     if deployment_name:
+        # Standard workspace group
         workspace_groups = [
             x for x in manager.workspace_groups
             if x.name == deployment_name
         ]
 
-        starter_workspaces = []
-        if not workspace_groups:
-            filtered_starter_workspaces = [
-                x for x in manager.starter_workspaces
-                if x.name == deployment_name
-            ]
-
-            if not filtered_starter_workspaces:
-                raise KeyError(
-                    f'no deployment found with name: {deployment_name}',
-                )
-
-            starter_workspaces = filtered_starter_workspaces
+        if len(workspace_groups) == 1:
+            return workspace_groups[0]
 
-        if len(workspace_groups) > 1:
+        elif len(workspace_groups) > 1:
             ids = ', '.join(x.id for x in workspace_groups)
             raise ValueError(
                 f'more than one workspace group with given name was found: {ids}',
             )
 
-        if len(starter_workspaces) > 1:
+        # Starter workspace
+        starter_workspaces = [
+            x for x in manager.starter_workspaces
+            if x.name == deployment_name
+        ]
+
+        if len(starter_workspaces) == 1:
+            return starter_workspaces[0]
+
+        elif len(starter_workspaces) > 1:
             ids = ', '.join(x.id for x in starter_workspaces)
             raise ValueError(
                 f'more than one starter workspace with given name was found: {ids}',
             )
 
-        if workspace_groups:
-            return workspace_groups[0]
-        else:
-            return starter_workspaces[0]
+        raise KeyError(f'no deployment found with name: {deployment_name}')
 
+    #
+    # Search for deployment by ID
+    #
     deployment_id = params.get('deployment_id') or \
         (params.get('in_deployment') or {}).get('deployment_id') or \
         (params.get('group') or {}).get('deployment_id') or \
         ((params.get('in') or {}).get('in_group') or {}).get('deployment_id') or \
         ((params.get('in') or {}).get('in_deployment') or {}).get('deployment_id')
+
     if deployment_id:
         try:
+            # Standard workspace group
             return manager.get_workspace_group(deployment_id)
         except ManagementError as exc:
             if exc.errno == 404:
                 try:
+                    # Starter workspace
                     return manager.get_starter_workspace(deployment_id)
                 except ManagementError as exc:
                     if exc.errno == 404:
@@ -260,6 +266,7 @@ def get_deployment(
             else:
                 raise
 
+    # Use workspace group from environment
     if os.environ.get('SINGLESTOREDB_WORKSPACE_GROUP'):
         try:
             return manager.get_workspace_group(
@@ -273,6 +280,7 @@ def get_deployment(
                 )
             raise
 
+    # Use cluster from environment
     if os.environ.get('SINGLESTOREDB_CLUSTER'):
         try:
             return manager.get_starter_workspace(

{singlestoredb-1.12.1 → singlestoredb-1.12.2}/singlestoredb/management/files.py

@@ -348,6 +348,7 @@ class FilesObjectBytesReader(io.BytesIO):
 
 
 class FileLocation(ABC):
+
     @abstractmethod
     def open(
         self,