singlestoredb 1.12.0__tar.gz → 1.12.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.12.0
+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.0 → singlestoredb-1.12.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = singlestoredb
-version = 1.12.0
+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.0 → singlestoredb-1.12.2}/singlestoredb/__init__.py

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

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

@@ -7,13 +7,11 @@ from typing import Optional
 from typing import Union
 
 from ...exceptions import ManagementError
+from ...management import files as mgmt_files
 from ...management import manage_workspaces
 from ...management.files import FilesManager
 from ...management.files import FileSpace
 from ...management.files import manage_files
-from ...management.files import MODELS_SPACE
-from ...management.files import PERSONAL_SPACE
-from ...management.files import SHARED_SPACE
 from ...management.workspace import StarterWorkspace
 from ...management.workspace import Workspace
 from ...management.workspace import WorkspaceGroup
@@ -190,6 +188,10 @@ def get_deployment(
         * params['group']['deployment_id']
         * params['in_deployment']['deployment_name']
         * params['in_deployment']['deployment_id']
+        * params['in']['in_group']['deployment_name']
+        * params['in']['in_group']['deployment_id']
+        * params['in']['in_deployment']['deployment_name']
+        * params['in']['in_deployment']['deployment_id']
 
     Or, from the SINGLESTOREDB_WORKSPACE_GROUP
     or SINGLESTOREDB_CLUSTER environment variables.
@@ -197,55 +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')
+        (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')
+        (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:
@@ -254,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(
@@ -267,6 +280,7 @@ def get_deployment(
                 )
             raise
 
+    # Use cluster from environment
     if os.environ.get('SINGLESTOREDB_CLUSTER'):
         try:
             return manager.get_starter_workspace(
@@ -298,11 +312,11 @@ def get_file_space(params: Dict[str, Any]) -> FileSpace:
     if file_location:
         file_location_lower_case = file_location.lower()
 
-        if file_location_lower_case == PERSONAL_SPACE:
+        if file_location_lower_case == mgmt_files.PERSONAL_SPACE:
             return manager.personal_space
-        elif file_location_lower_case == SHARED_SPACE:
+        elif file_location_lower_case == mgmt_files.SHARED_SPACE:
             return manager.shared_space
-        elif file_location_lower_case == MODELS_SPACE:
+        elif file_location_lower_case == mgmt_files.MODELS_SPACE:
             return manager.models_space
         else:
             raise ValueError(f'invalid file location: {file_location}')

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

@@ -10,11 +10,9 @@ import re
 from abc import ABC
 from abc import abstractmethod
 from typing import Any
-from typing import BinaryIO
 from typing import Dict
 from typing import List
 from typing import Optional
-from typing import TextIO
 from typing import Union
 
 from .. import config
@@ -350,6 +348,7 @@ class FilesObjectBytesReader(io.BytesIO):
 
 
 class FileLocation(ABC):
+
     @abstractmethod
     def open(
         self,
@@ -362,7 +361,7 @@ class FileLocation(ABC):
     @abstractmethod
     def upload_file(
         self,
-        local_path: Union[PathLike, TextIO, BinaryIO],
+        local_path: Union[PathLike, io.IOBase],
         path: PathLike,
         *,
         overwrite: bool = False,
@@ -385,7 +384,7 @@ class FileLocation(ABC):
     @abstractmethod
     def _upload(
         self,
-        content: Union[str, bytes, TextIO, BinaryIO],
+        content: Union[str, bytes, io.IOBase],
         path: PathLike,
         *,
         overwrite: bool = False,
@@ -628,7 +627,7 @@ class FileSpace(FileLocation):
 
     def upload_file(
         self,
-        local_path: Union[PathLike, TextIO, BinaryIO],
+        local_path: Union[PathLike, io.IOBase],
         path: PathLike,
         *,
         overwrite: bool = False,
@@ -646,7 +645,7 @@ class FileSpace(FileLocation):
             Should the ``path`` be overwritten if it exists already?
 
         """
-        if isinstance(local_path, (TextIO, BinaryIO)):
+        if isinstance(local_path, io.IOBase):
             pass
         elif not os.path.isfile(local_path):
             raise IsADirectoryError(f'local path is not a file: {local_path}')
@@ -657,8 +656,9 @@ class FileSpace(FileLocation):
 
             self.remove(path)
 
-        if isinstance(local_path, (TextIO, BinaryIO)):
+        if isinstance(local_path, io.IOBase):
             return self._upload(local_path, path, overwrite=overwrite)
+
         return self._upload(open(local_path, 'rb'), path, overwrite=overwrite)
 
     def upload_folder(
@@ -727,7 +727,7 @@ class FileSpace(FileLocation):
 
     def _upload(
         self,
-        content: Union[str, bytes, TextIO, BinaryIO],
+        content: Union[str, bytes, io.IOBase],
         path: PathLike,
         *,
         overwrite: bool = False,

{singlestoredb-1.12.0 → singlestoredb-1.12.2}/singlestoredb/management/workspace.py

@@ -10,11 +10,9 @@ import re
 import time
 from collections.abc import Mapping
 from typing import Any
-from typing import BinaryIO
 from typing import Dict
 from typing import List
 from typing import Optional
-from typing import TextIO
 from typing import Union
 
 from .. import config
@@ -165,7 +163,7 @@ class Stage(FileLocation):
 
     def upload_file(
         self,
-        local_path: Union[PathLike, TextIO, BinaryIO],
+        local_path: Union[PathLike, io.IOBase],
         stage_path: PathLike,
         *,
         overwrite: bool = False,
@@ -183,7 +181,7 @@ class Stage(FileLocation):
             Should the ``stage_path`` be overwritten if it exists already?
 
         """
-        if isinstance(local_path, (TextIO, BinaryIO)):
+        if isinstance(local_path, io.IOBase):
             pass
         elif not os.path.isfile(local_path):
             raise IsADirectoryError(f'local path is not a file: {local_path}')
@@ -194,8 +192,9 @@ class Stage(FileLocation):
 
             self.remove(stage_path)
 
-        if isinstance(local_path, (TextIO, BinaryIO)):
+        if isinstance(local_path, io.IOBase):
             return self._upload(local_path, stage_path, overwrite=overwrite)
+
         return self._upload(open(local_path, 'rb'), stage_path, overwrite=overwrite)
 
     def upload_folder(
@@ -258,7 +257,7 @@ class Stage(FileLocation):
 
     def _upload(
         self,
-        content: Union[str, bytes, TextIO, BinaryIO],
+        content: Union[str, bytes, io.IOBase],
         stage_path: PathLike,
         *,
         overwrite: bool = False,