singlestoredb 1.12.1__cp38-abi3-macosx_10_9_universal2.whl → 1.12.2__cp38-abi3-macosx_10_9_universal2.whl

singlestoredb/__init__.py

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

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/management/files.py

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

singlestoredb/tests/test_fusion.py

@@ -4,6 +4,7 @@
 import os
 import random
 import secrets
+import tempfile
 import time
 import unittest
 from typing import Any
@@ -714,3 +715,810 @@ class TestJobsFusion(unittest.TestCase):
         res = out[0]
         assert res[0] == job_id
         assert res[1] == 1
+
+
+@pytest.mark.management
+class TestStageFusion(unittest.TestCase):
+
+    id: str = secrets.token_hex(8)
+    dbname: str = 'information_schema'
+    manager: None
+    workspace_group: None
+    workspace_group_2: None
+
+    @classmethod
+    def setUpClass(cls):
+        cls.manager = s2.manage_workspaces()
+        us_regions = [x for x in cls.manager.regions if x.name.startswith('US')]
+        cls.workspace_group = cls.manager.create_workspace_group(
+            f'Stage Fusion Testing 1 {cls.id}',
+            region=random.choice(us_regions),
+            firewall_ranges=[],
+        )
+        cls.workspace_group_2 = cls.manager.create_workspace_group(
+            f'Stage Fusion Testing 2 {cls.id}',
+            region=random.choice(us_regions),
+            firewall_ranges=[],
+        )
+        # Wait for both workspace groups to start
+        time.sleep(5)
+
+        os.environ['SINGLESTOREDB_DEFAULT_DATABASE'] = 'information_schema'
+        os.environ['SINGLESTOREDB_WORKSPACE_GROUP'] = cls.workspace_group.id
+
+    @classmethod
+    def tearDownClass(cls):
+        if cls.workspace_group is not None:
+            cls.workspace_group.terminate(force=True)
+        if cls.workspace_group_2 is not None:
+            cls.workspace_group_2.terminate(force=True)
+        cls.manager = None
+        cls.workspace_group = None
+        cls.workspace_group_2 = None
+        cls.workspace = None
+        cls.workspace_2 = None
+        if os.environ.get('SINGLESTOREDB_WORKSPACE', None) is not None:
+            del os.environ['SINGLESTOREDB_WORKSPACE']
+        if os.environ.get('SINGLESTOREDB_WORKSPACE_GROUP', None) is not None:
+            del os.environ['SINGLESTOREDB_WORKSPACE_GROUP']
+        if os.environ.get('SINGLESTOREDB_DEFAULT_DATABASE', None) is not None:
+            del os.environ['SINGLESTOREDB_DEFAULT_DATABASE']
+
+    def setUp(self):
+        self.enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLED')
+        os.environ['SINGLESTOREDB_FUSION_ENABLED'] = '1'
+        self.conn = s2.connect(database=type(self).dbname, local_infile=True)
+        self.cur = self.conn.cursor()
+
+    def tearDown(self):
+        self._clear_stage()
+
+        if self.enabled:
+            os.environ['SINGLESTOREDB_FUSION_ENABLED'] = self.enabled
+        else:
+            del os.environ['SINGLESTOREDB_FUSION_ENABLED']
+
+        try:
+            if self.cur is not None:
+                self.cur.close()
+        except Exception:
+            # traceback.print_exc()
+            pass
+
+        try:
+            if self.conn is not None:
+                self.conn.close()
+        except Exception:
+            # traceback.print_exc()
+            pass
+
+    def _clear_stage(self):
+        if self.workspace_group is not None:
+            self.cur.execute(f'''
+                show stage files
+                    in group id '{self.workspace_group.id}' recursive
+            ''')
+            files = list(self.cur)
+            folders = []
+            for file in files:
+                if file[0].endswith('/'):
+                    folders.append(file)
+                    continue
+                self.cur.execute(f'''
+                    drop stage file '{file[0]}'
+                        in group id '{self.workspace_group.id}'
+                ''')
+            for folder in folders:
+                self.cur.execute(f'''
+                    drop stage folder '{folder[0]}'
+                        in group id '{self.workspace_group.id}'
+                ''')
+
+        if self.workspace_group_2 is not None:
+            self.cur.execute(f'''
+                show stage files
+                    in group id '{self.workspace_group_2.id}' recursive
+            ''')
+            files = list(self.cur)
+            folders = []
+            for file in files:
+                if file[0].endswith('/'):
+                    folders.append(file)
+                    continue
+                self.cur.execute(f'''
+                    drop stage file '{file[0]}'
+                        in group id '{self.workspace_group_2.id}'
+                ''')
+            for folder in folders:
+                self.cur.execute(f'''
+                    drop stage folder '{folder[0]}'
+                        in group id '{self.workspace_group_2.id}'
+                ''')
+
+    def test_show_stage(self):
+        test2_sql = os.path.join(os.path.dirname(__file__), 'test2.sql')
+
+        # Should be empty
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Copy files to stage
+        self.cur.execute(
+            f'upload file to stage "new_test_1.sql" from "{test2_sql}"',
+        )
+        self.cur.execute('create stage folder "subdir1"')
+        self.cur.execute(
+            f'upload file to stage "subdir1/new_test_2.sql" from "{test2_sql}"',
+        )
+        self.cur.execute(
+            f'upload file to stage "subdir1/new_test_3.sql" from "{test2_sql}"',
+        )
+        self.cur.execute('create stage folder "subdir2"')
+        self.cur.execute(
+            f'upload file to stage "subdir2/new_test_4.sql" from "{test2_sql}"',
+        )
+        self.cur.execute(
+            f'upload file to stage "subdir2/new_test_5.sql" from "{test2_sql}"',
+        )
+
+        # Make sure files are there
+        self.cur.execute('''
+            show stage files recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 7
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_1.sql',
+            'subdir1/',
+            'subdir1/new_test_2.sql',
+            'subdir1/new_test_3.sql',
+            'subdir2/',
+            'subdir2/new_test_4.sql',
+            'subdir2/new_test_5.sql',
+        ]
+
+        # Do non-recursive listing
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_1.sql',
+            'subdir1/',
+            'subdir2/',
+        ]
+
+        # List files in specific workspace group
+        self.cur.execute(f'''
+            show stage files in group id '{self.workspace_group.id}'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_1.sql',
+            'subdir1/',
+            'subdir2/',
+        ]
+
+        self.cur.execute(f'''
+            show stage files in id '{self.workspace_group.id}'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_1.sql',
+            'subdir1/',
+            'subdir2/',
+        ]
+
+        self.cur.execute(f'''
+            show stage files in group '{self.workspace_group.name}'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_1.sql',
+            'subdir1/',
+            'subdir2/',
+        ]
+
+        self.cur.execute(f'''
+            show stage files in '{self.workspace_group.name}'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_1.sql',
+            'subdir1/',
+            'subdir2/',
+        ]
+
+        # Check other workspace group
+        self.cur.execute(f'''
+            show stage files in group '{self.workspace_group_2.name}'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Limit results
+        self.cur.execute('''
+            show stage files recursive limit 5
+        ''')
+        files = list(self.cur)
+        assert len(files) == 5
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_1.sql',
+            'subdir1/',
+            'subdir1/new_test_2.sql',
+            'subdir1/new_test_3.sql',
+            'subdir2/',
+        ]
+
+        # Order by type and name
+        self.cur.execute('''
+            show stage files order by type, name recursive extended
+        ''')
+        files = list(self.cur)
+        assert len(files) == 7
+        assert list(x[0] for x in files) == [
+            'subdir1/',
+            'subdir2/',
+            'new_test_1.sql',
+            'subdir1/new_test_2.sql',
+            'subdir1/new_test_3.sql',
+            'subdir2/new_test_4.sql',
+            'subdir2/new_test_5.sql',
+        ]
+
+        # Order by type and name descending
+        self.cur.execute('''
+            show stage files order by type desc, name desc recursive extended
+        ''')
+        files = list(self.cur)
+        assert len(files) == 7
+        assert list(x[0] for x in files) == [
+            'subdir2/new_test_5.sql',
+            'subdir2/new_test_4.sql',
+            'subdir1/new_test_3.sql',
+            'subdir1/new_test_2.sql',
+            'new_test_1.sql',
+            'subdir2/',
+            'subdir1/',
+        ]
+
+        # List at specific path
+        self.cur.execute('''
+            show stage files at 'subdir2/' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 2
+        assert list(sorted(x[0] for x in files)) == [
+            'new_test_4.sql',
+            'new_test_5.sql',
+        ]
+
+        # LIKE clause
+        self.cur.execute('''
+            show stage files like '%_4.%' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(sorted(x[0] for x in files)) == [
+            'subdir2/new_test_4.sql',
+        ]
+
+    def test_download_stage(self):
+        test2_sql = os.path.join(os.path.dirname(__file__), 'test2.sql')
+
+        # Should be empty
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Copy file to stage 1
+        self.cur.execute(f'''
+            upload file to stage 'dl_test.sql' from '{test2_sql}'
+        ''')
+
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(sorted(x[0] for x in files)) == ['dl_test.sql']
+
+        # Copy file to stage 2
+        self.cur.execute(f'''
+            upload file to stage 'dl_test2.sql'
+                in group '{self.workspace_group_2.name}'
+                from '{test2_sql}'
+        ''')
+
+        # Make sure only one file in stage 2
+        self.cur.execute(f'''
+            show stage files in group '{self.workspace_group_2.name}'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(sorted(x[0] for x in files)) == ['dl_test2.sql']
+
+        # Download file from stage 1
+        with tempfile.TemporaryDirectory() as tmpdir:
+            self.cur.execute(f'''
+                download stage file 'dl_test.sql' to '{tmpdir}/dl_test.sql'
+            ''')
+            with open(os.path.join(tmpdir, 'dl_test.sql'), 'r') as dl_file:
+                assert dl_file.read() == open(test2_sql, 'r').read()
+
+        # Download file from stage 2
+        with tempfile.TemporaryDirectory() as tmpdir:
+            self.cur.execute(f'''
+                download stage file 'dl_test2.sql'
+                    in group '{self.workspace_group_2.name}'
+                    to '{tmpdir}/dl_test2.sql'
+            ''')
+            with open(os.path.join(tmpdir, 'dl_test2.sql'), 'r') as dl_file:
+                assert dl_file.read() == open(test2_sql, 'r').read()
+
+    def test_stage_multi_wg_operations(self):
+        test_sql = os.path.join(os.path.dirname(__file__), 'test.sql')
+        test2_sql = os.path.join(os.path.dirname(__file__), 'test2.sql')
+
+        # Should be empty
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Copy file to stage 1
+        self.cur.execute(f'''
+            upload file to stage 'new_test.sql' from '{test_sql}'
+        ''')
+
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+
+        # Copy file to stage 2
+        self.cur.execute(f'''
+            upload file to stage 'new_test2.sql'
+                in group '{self.workspace_group_2.name}'
+                from '{test2_sql}'
+        ''')
+
+        # Make sure only one file in stage 1
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert files[0][0] == 'new_test.sql'
+
+        # Make sure only one file in stage 2
+        self.cur.execute(f'''
+            show stage files in group '{self.workspace_group_2.name}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(sorted(x[0] for x in files)) == ['new_test2.sql']
+
+        # Make sure only one file in stage 2 (using IN)
+        self.cur.execute(f'''
+            show stage files in '{self.workspace_group_2.name}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(sorted(x[0] for x in files)) == ['new_test2.sql']
+
+        # Make subdir
+        self.cur.execute(f'''
+            create stage folder 'data' in group '{self.workspace_group_2.name}'
+        ''')
+
+        # Upload file using workspace ID
+        self.cur.execute(f'''
+            upload file to stage 'data/new_test2_sub.sql'
+                in group id '{self.workspace_group_2.id}'
+                from '{test2_sql}'
+        ''')
+
+        # Make sure only one file in stage 1
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert files[0][0] == 'new_test.sql'
+
+        # Make sure two files in stage 2
+        self.cur.execute(f'''
+            show stage files in group id '{self.workspace_group_2.id}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == \
+            ['data/', 'data/new_test2_sub.sql', 'new_test2.sql']
+
+        # Test overwrite
+        with self.assertRaises(OSError):
+            self.cur.execute(f'''
+                upload file to stage 'data/new_test2_sub.sql'
+                    in group id '{self.workspace_group_2.id}'
+                    from '{test2_sql}'
+            ''')
+
+        self.cur.execute(f'''
+            upload file to stage 'data/new_test2_sub.sql'
+                in group id '{self.workspace_group_2.id}'
+                from '{test2_sql}' overwrite
+        ''')
+
+        # Make sure two files in stage 2
+        self.cur.execute(f'''
+            show stage files in group id '{self.workspace_group_2.id}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == \
+            ['data/', 'data/new_test2_sub.sql', 'new_test2.sql']
+
+        # Test LIKE clause
+        self.cur.execute(f'''
+            show stage files
+                in group id '{self.workspace_group_2.id}'
+                like '%_sub%' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(sorted(x[0] for x in files)) == ['data/new_test2_sub.sql']
+
+        # Drop file from default stage
+        self.cur.execute('''
+            drop stage file 'new_test.sql'
+        ''')
+
+        # Make sure no files in stage 1
+        self.cur.execute('''
+            show stage files
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Make sure two files in stage 2
+        self.cur.execute(f'''
+            show stage files in group id '{self.workspace_group_2.id}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(sorted(x[0] for x in files)) == \
+            ['data/', 'data/new_test2_sub.sql', 'new_test2.sql']
+
+        # Attempt to drop directory from stage 2
+        with self.assertRaises(OSError):
+            self.cur.execute(f'''
+                drop stage folder 'data'
+                    in group id '{self.workspace_group_2.id}'
+            ''')
+
+        self.cur.execute(f'''
+            drop stage file 'data/new_test2_sub.sql'
+                in group id '{self.workspace_group_2.id}'
+        ''')
+
+        # Make sure one file and one directory in stage 2
+        self.cur.execute(f'''
+            show stage files in group id '{self.workspace_group_2.id}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 2
+        assert list(sorted(x[0] for x in files)) == ['data/', 'new_test2.sql']
+
+        # Drop stage folder from stage 2
+        self.cur.execute(f'''
+            drop stage folder 'data'
+                in group id '{self.workspace_group_2.id}'
+        ''')
+
+        # Make sure one file in stage 2
+        self.cur.execute(f'''
+            show stage files in group id '{self.workspace_group_2.id}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(sorted(x[0] for x in files)) == ['new_test2.sql']
+
+        # Drop last file
+        self.cur.execute(f'''
+            drop stage file 'new_test2.sql'
+                in group id '{self.workspace_group_2.id}'
+        ''')
+
+        # Make sure no files in stage 2
+        self.cur.execute(f'''
+            show stage files in group id '{self.workspace_group_2.id}' recursive
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+
+@pytest.mark.management
+class TestFilesFusion(unittest.TestCase):
+
+    id: str = secrets.token_hex(8)
+    dbname: str = 'information_schema'
+    manager: None
+    workspace_group: None
+
+    @classmethod
+    def setUpClass(cls):
+        cls.manager = s2.manage_workspaces()
+        us_regions = [x for x in cls.manager.regions if x.name.startswith('US')]
+        cls.workspace_group = cls.manager.create_workspace_group(
+            f'Files Fusion Testing {cls.id}',
+            region=random.choice(us_regions),
+            firewall_ranges=[],
+        )
+        # Wait for both workspace groups to start
+        time.sleep(5)
+
+        os.environ['SINGLESTOREDB_DEFAULT_DATABASE'] = 'information_schema'
+        os.environ['SINGLESTOREDB_WORKSPACE_GROUP'] = cls.workspace_group.id
+
+    @classmethod
+    def tearDownClass(cls):
+        if cls.workspace_group is not None:
+            cls.workspace_group.terminate(force=True)
+        cls.manager = None
+        cls.workspace_group = None
+        cls.workspace = None
+        if os.environ.get('SINGLESTOREDB_WORKSPACE', None) is not None:
+            del os.environ['SINGLESTOREDB_WORKSPACE']
+        if os.environ.get('SINGLESTOREDB_WORKSPACE_GROUP', None) is not None:
+            del os.environ['SINGLESTOREDB_WORKSPACE_GROUP']
+        if os.environ.get('SINGLESTOREDB_DEFAULT_DATABASE', None) is not None:
+            del os.environ['SINGLESTOREDB_DEFAULT_DATABASE']
+
+    def setUp(self):
+        self.enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLED')
+        os.environ['SINGLESTOREDB_FUSION_ENABLED'] = '1'
+        self.conn = s2.connect(database=type(self).dbname, local_infile=True)
+        self.cur = self.conn.cursor()
+
+    def tearDown(self):
+        self._clear_files()
+
+        if self.enabled:
+            os.environ['SINGLESTOREDB_FUSION_ENABLED'] = self.enabled
+        else:
+            del os.environ['SINGLESTOREDB_FUSION_ENABLED']
+
+        try:
+            if self.cur is not None:
+                self.cur.close()
+        except Exception:
+            # traceback.print_exc()
+            pass
+
+        try:
+            if self.conn is not None:
+                self.conn.close()
+        except Exception:
+            # traceback.print_exc()
+            pass
+
+    def _clear_files(self):
+        cls = type(self)
+        for prefix in ['show', 'dl', 'drop']:
+            for i in range(1, 6):
+                try:
+                    self.cur.execute(
+                        f'''drop personal file "{prefix}_test_{i}_{cls.id}.ipynb"''',
+                    )
+                except (OSError, s2.ManagementError):
+                    pass
+            for i in range(1, 6):
+                try:
+                    self.cur.execute(
+                        f'''drop shared file "{prefix}_test_{i}_{cls.id}.ipynb"''',
+                    )
+                except (OSError, s2.ManagementError):
+                    pass
+
+    def test_show_personal_files(self):
+        return self._test_show_files('personal')
+
+    def test_show_shared_files(self):
+        return self._test_show_files('shared')
+
+    def _test_show_files(self, ftype):
+        cls = type(self)
+        nb = os.path.join(os.path.dirname(__file__), 'test.ipynb')
+
+        # Should be empty
+        self.cur.execute(f'''
+            show {ftype} files like 'show_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Upload files
+        self.cur.execute(
+            f'upload {ftype} file to "show_test_1_{cls.id}.ipynb" from "{nb}"',
+        )
+        self.cur.execute(
+            f'upload {ftype} file to "show_test_2_{cls.id}.ipynb" from "{nb}"',
+        )
+        self.cur.execute(
+            f'upload {ftype} file to "show_test_3_{cls.id}.ipynb" from "{nb}"',
+        )
+        self.cur.execute(
+            f'upload {ftype} file to "show_test_4_{cls.id}.ipynb" from "{nb}"',
+        )
+        self.cur.execute(
+            f'upload {ftype} file to "show_test_5_{cls.id}.ipynb" from "{nb}"',
+        )
+
+        # Make sure files are there
+        self.cur.execute(f'''
+            show {ftype} files like 'show_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 5
+        assert list(sorted(x[0] for x in files)) == [
+            f'show_test_1_{cls.id}.ipynb',
+            f'show_test_2_{cls.id}.ipynb',
+            f'show_test_3_{cls.id}.ipynb',
+            f'show_test_4_{cls.id}.ipynb',
+            f'show_test_5_{cls.id}.ipynb',
+        ]
+
+        # Test ORDER BY
+        self.cur.execute(f'''
+            show {ftype} files like 'show_%{cls.id}%' order by name desc
+        ''')
+        files = list(self.cur)
+        assert len(files) == 5
+        assert list(x[0] for x in files) == [
+            f'show_test_5_{cls.id}.ipynb',
+            f'show_test_4_{cls.id}.ipynb',
+            f'show_test_3_{cls.id}.ipynb',
+            f'show_test_2_{cls.id}.ipynb',
+            f'show_test_1_{cls.id}.ipynb',
+        ]
+
+        # Test LIMIT
+        self.cur.execute(f'''
+            show {ftype} files like 'show_%{cls.id}%' order by name desc limit 3
+        ''')
+        files = list(self.cur)
+        assert len(files) == 3
+        assert list(x[0] for x in files) == [
+            f'show_test_5_{cls.id}.ipynb',
+            f'show_test_4_{cls.id}.ipynb',
+            f'show_test_3_{cls.id}.ipynb',
+        ]
+
+        # Test EXTENDED
+        self.cur.execute(f'''
+            show {ftype} files like 'show_%{cls.id}%' extended
+        ''')
+        assert [x[0] for x in self.cur.description] == \
+            ['Name', 'Type', 'Size', 'Writable', 'CreatedAt', 'LastModifiedAt']
+
+    def test_download_personal_files(self):
+        return self._test_download_files('personal')
+
+    def test_download_shared_files(self):
+        return self._test_download_files('shared')
+
+    def _test_download_files(self, ftype):
+        cls = type(self)
+        nb = os.path.join(os.path.dirname(__file__), 'test.ipynb')
+
+        # Should be empty
+        self.cur.execute(f'''
+            show {ftype} files like 'dl_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Upload files
+        self.cur.execute(f'upload {ftype} file to "dl_test_1_{cls.id}.ipynb" from "{nb}"')
+        self.cur.execute(f'upload {ftype} file to "dl_test_2_{cls.id}.ipynb" from "{nb}"')
+
+        # Make sure files are there
+        self.cur.execute(f'''
+            show {ftype} files like 'dl_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 2
+        assert list(sorted(x[0] for x in files)) == [
+            f'dl_test_1_{cls.id}.ipynb',
+            f'dl_test_2_{cls.id}.ipynb',
+        ]
+
+        # Download files
+        with tempfile.TemporaryDirectory() as tmpdir:
+            self.cur.execute(f'''
+                download {ftype} file 'dl_test_1_{cls.id}.ipynb'
+                    to '{tmpdir}/dl_test_1.ipynb'
+            ''')
+            with open(os.path.join(tmpdir, 'dl_test_1.ipynb'), 'r') as dl_file:
+                assert dl_file.read() == open(nb, 'r').read()
+
+            self.cur.execute(f'''
+                download {ftype} file 'dl_test_2_{cls.id}.ipynb'
+                    to '{tmpdir}/dl_test_2.ipynb'
+            ''')
+            with open(os.path.join(tmpdir, 'dl_test_2.ipynb'), 'r') as dl_file:
+                assert dl_file.read() == open(nb, 'r').read()
+
+    def test_drop_personal_files(self):
+        return self._test_drop_files('personal')
+
+    def test_drop_shared_files(self):
+        return self._test_drop_files('shared')
+
+    def _test_drop_files(self, ftype):
+        cls = type(self)
+        nb = os.path.join(os.path.dirname(__file__), 'test.ipynb')
+
+        # Should be empty
+        self.cur.execute(f'''
+            show {ftype} files like 'drop_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0
+
+        # Upload files
+        self.cur.execute(
+            f'upload {ftype} file to "drop_test_1_{cls.id}.ipynb" from "{nb}"',
+        )
+        self.cur.execute(
+            f'upload {ftype} file to "drop_test_2_{cls.id}.ipynb" from "{nb}"',
+        )
+
+        # Make sure files are there
+        self.cur.execute(f'''
+            show {ftype} files like 'drop_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 2
+        assert list(sorted(x[0] for x in files)) == [
+            f'drop_test_1_{cls.id}.ipynb',
+            f'drop_test_2_{cls.id}.ipynb',
+        ]
+
+        # Drop 1 file
+        self.cur.execute(f'''
+            drop {ftype} file 'drop_test_1_{cls.id}.ipynb'
+        ''')
+
+        # Make sure 1 file is there
+        self.cur.execute(f'''
+            show {ftype} files like 'drop_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 1
+        assert list(x[0] for x in files) == [f'drop_test_2_{cls.id}.ipynb']
+
+        # Drop 2nd file
+        self.cur.execute(f'''
+            drop {ftype} file 'drop_test_2_{cls.id}.ipynb'
+        ''')
+
+        # Make sure no files are there
+        self.cur.execute(f'''
+            show {ftype} files like 'drop_%{cls.id}%'
+        ''')
+        files = list(self.cur)
+        assert len(files) == 0

{singlestoredb-1.12.1.dist-info → singlestoredb-1.12.2.dist-info}/METADATA

@@ -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.dist-info → singlestoredb-1.12.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
-_singlestoredb_accel.abi3.so,sha256=hEcp6tY0Iwmx0nPwBkfSG2Yb9iWV4KUd65FPBatqYGc,206864
+_singlestoredb_accel.abi3.so,sha256=w_pN-iqjjIvBbB-M4V1NU29Ju2Om_zynPEjKFVPhb-E,206864
+singlestoredb-1.12.2.dist-info/RECORD,,
+singlestoredb-1.12.2.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-1.12.2.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
+singlestoredb-1.12.2.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
+singlestoredb-1.12.2.dist-info/top_level.txt,sha256=lA65Vf4qAMfg_s1oG3LEO90h4t1Z-SPDbRqkevI3bSY,40
+singlestoredb-1.12.2.dist-info/METADATA,sha256=bw-btFC0eX7QrakG-glHHak-eMA8OoksWrrYrSMgJkg,5636
 sqlx/magic.py,sha256=JsS9_9aBFaOt91Torm1JPN0c8qB2QmYJmNSKtbSQIY0,3509
 sqlx/__init__.py,sha256=aBYiU8DZXCogvWu3yWafOz7bZS5WWwLZXj7oL0dXGyU,85
-singlestoredb-1.12.1.dist-info/RECORD,,
-singlestoredb-1.12.1.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-1.12.1.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
-singlestoredb-1.12.1.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
-singlestoredb-1.12.1.dist-info/top_level.txt,sha256=lA65Vf4qAMfg_s1oG3LEO90h4t1Z-SPDbRqkevI3bSY,40
-singlestoredb-1.12.1.dist-info/METADATA,sha256=wYTpEPYx7WpKtU6Jr7wQjunmlrA7UnsmNMRkbL73R40,5636
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=rlF69SiclYyKghNRckX77Ls1ZT23RhSssO1cyYBiHmA,12589
-singlestoredb/__init__.py,sha256=4htLkEL7t7jjaZ4Qym7QvHrv4P7cYZdDGtYcMpmSGow,1649
+singlestoredb/__init__.py,sha256=Ms1Jw6Pv01LlItPE5vSqQ59kqTYvN3HrSbQSN1i1qv0,1649
 singlestoredb/types.py,sha256=FIqO1A7e0Gkk7ITmIysBy-P5S--ItbMSlYvblzqGS30,9969
 singlestoredb/connection.py,sha256=0HEpjBZXLqQwOTEfveMkgej1H3Kyof47prIHvJJZtoo,45831
 singlestoredb/pytest.py,sha256=OyF3BO9mgxenifYhOihnzGk8WzCJ_zN5_mxe8XyFPOc,9074
@@ -26,13 +26,13 @@ singlestoredb/fusion/handlers/models.py,sha256=xJPIG0_GgF-VrmPoIsU2U4AsS7ytDz8JM
 singlestoredb/fusion/handlers/job.py,sha256=r0KdOD55VUDw-SymC__5Mn-fzJTZE_xcBgH-O8DYVHc,21095
 singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 singlestoredb/fusion/handlers/export.py,sha256=3moTJeqsHkDDpitUUAE6x95JYH2rmb28MALbO4x0dcc,8981
-singlestoredb/fusion/handlers/utils.py,sha256=dg5v25kCejgqg8smnxE4vqu_G3OJzJ4jX8pm2N1z6mc,10574
+singlestoredb/fusion/handlers/utils.py,sha256=ozHOWUraoN8XGTK9JZdhv5HV8AQR8zfUd1yh1kLvUXY,10685
 singlestoredb/fusion/handlers/stage.py,sha256=kYVjbPys83kf3jX6jWwN8Ju0oEocKVZ3TIOt2HiC5Ew,14287
 singlestoredb/fusion/handlers/workspace.py,sha256=4xN2TFO4yF7KZB2Fcht7IuvoDdAT6fDfDLjixiHZN8w,27506
 singlestoredb/tests/test.sql,sha256=dfMehVCQ9wObSVTQKyQi-fRFDZeqRxV4Cj8doBCPEFM,17679
 singlestoredb/tests/test_xdict.py,sha256=fqHspoi39nbX3fIDVkkRXcd5H50xdOsSvK0bxAMQnaE,10408
 singlestoredb/tests/test_results.py,sha256=wg93sujwt-R9_eJCgSCElgAZhLDkIiAo3qPkPydOv78,6582
-singlestoredb/tests/test_fusion.py,sha256=W3aRfBeu8HBGm1CIQWFIeWUPBUlfHBCbJy8vejPHdRs,23828
+singlestoredb/tests/test_fusion.py,sha256=EH1mRwdX2Fajsq6x2l0gBhH1YhcxtvDGIKC9HJ4sDbQ,50521
 singlestoredb/tests/test_plugin.py,sha256=qpO9wmWc62VaijN1sJ97YSYIX7I7Y5C6sY-WzwrutDQ,812
 singlestoredb/tests/test_basics.py,sha256=1__lEF7FmQF4_pFi5R53TtJidtQznmQ592Ci6aDVgrc,46368
 singlestoredb/tests/test_ext_func.py,sha256=OWd-CJ1Owhx72nikSWWEF2EQFCJk7vEXZM2Oy9EbYQo,37357
@@ -56,7 +56,7 @@ singlestoredb/tests/ext_funcs/__init__.py,sha256=qZLnDI_Ck0tguVi-K-BKXDHAcC0jui3
 singlestoredb/magics/__init__.py,sha256=lZjkT3Webo9c1EQAzlRCRh6B2pckQH8uvNrrB__abcI,1210
 singlestoredb/magics/run_shared.py,sha256=SI8dCBRMaGn-xZU7dto4jsAqKBi-Ll14htUsMUSBpJM,1752
 singlestoredb/magics/run_personal.py,sha256=2f7u1T7iblxGzZurHNgNXLrPBvsvPADZKo_RD_IjYuE,1844
-singlestoredb/management/files.py,sha256=_FDIs9rtG7cW6aIkXnYReLQaFxdix2iu7Do368hOoE8,30476
+singlestoredb/management/files.py,sha256=89IhpGw9WdwxVeksavHEDMVn9wb_jxb-utZuIDqkLHw,30477
 singlestoredb/management/organization.py,sha256=hqMaM7H-naMjNbxDl_f7G_2o5TkiGKyzPhxuzDveJAw,5402
 singlestoredb/management/job.py,sha256=4-xLWzbE8odQogVVaFer80UEoTAZY1T28VZ9Ug4rbmM,24611
 singlestoredb/management/region.py,sha256=HnLcWUh7r_aLECliplCDHak4a_F3B7LOSXEYMW66qD0,1611