singlestoredb 1.12.0__tar.gz → 1.12.1__tar.gz

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

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

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

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

{singlestoredb-1.12.0 → singlestoredb-1.12.1}/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.
@@ -199,7 +201,9 @@ def get_deployment(
 
     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:
         workspace_groups = [
             x for x in manager.workspace_groups
@@ -239,7 +243,9 @@ def get_deployment(
 
     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:
             return manager.get_workspace_group(deployment_id)
@@ -298,11 +304,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.1}/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
@@ -362,7 +360,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 +383,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 +626,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 +644,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 +655,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 +726,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.1}/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,

{singlestoredb-1.12.0 → singlestoredb-1.12.1}/singlestoredb/tests/test_management.py

@@ -414,8 +414,12 @@ class TestStage(unittest.TestCase):
         with self.assertRaises(OSError):
             st.upload_file(TEST_DIR / 'test.sql', 'upload_test.sql')
 
-        # Force overwrite with new content
-        f = st.upload_file(TEST_DIR / 'test2.sql', 'upload_test.sql', overwrite=True)
+        # Force overwrite with new content; use file object this time
+        f = st.upload_file(
+            open(TEST_DIR / 'test2.sql', 'r'),
+            'upload_test.sql',
+            overwrite=True,
+        )
         assert str(f.path) == 'upload_test.sql'
         assert f.type == 'file'
 
@@ -1093,6 +1097,50 @@ class TestFileSpaces(unittest.TestCase):
             # Cleanup
             space.remove('upload_test.ipynb')
 
+    def test_upload_file_io(self):
+        for space in [self.personal_space, self.shared_space]:
+            root = space.info('/')
+            assert str(root.path) == '/'
+            assert root.type == 'directory'
+
+            # Upload files
+            f = space.upload_file(
+                open(TEST_DIR / 'test.ipynb', 'r'),
+                'upload_test.ipynb',
+            )
+            assert str(f.path) == 'upload_test.ipynb'
+            assert f.type == 'notebook'
+
+            # Download and compare to original
+            txt = f.download(encoding='utf-8')
+            assert txt == open(TEST_DIR / 'test.ipynb').read()
+
+            # Make sure we can't overwrite
+            with self.assertRaises(OSError):
+                space.upload_file(
+                    open(TEST_DIR / 'test.ipynb', 'r'),
+                    'upload_test.ipynb',
+                )
+
+            # Force overwrite with new content
+            f = space.upload_file(
+                open(TEST_DIR / 'test2.ipynb', 'r'),
+                'upload_test.ipynb', overwrite=True,
+            )
+            assert str(f.path) == 'upload_test.ipynb'
+            assert f.type == 'notebook'
+
+            # Verify new content
+            txt = f.download(encoding='utf-8')
+            assert txt == open(TEST_DIR / 'test2.ipynb').read()
+
+            # Make sure we can't upload a folder
+            with self.assertRaises(s2.ManagementError):
+                space.upload_folder(TEST_DIR, 'test')
+
+            # Cleanup
+            space.remove('upload_test.ipynb')
+
     def test_open(self):
         for space in [self.personal_space, self.shared_space]:
             # See if error is raised for non-existent file

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

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