singlestoredb 1.15.0__cp38-abi3-win32.whl → 1.15.1__cp38-abi3-win32.whl

singlestoredb/fusion/handlers/files.py

@@ -89,7 +89,7 @@ class ShowPersonalFilesHandler(ShowFilesHandler):
       specified number.
     * Use the ``ORDER BY`` clause to sort the results by the specified
       key. By default, the results are sorted in the ascending order.
-    * The ``AT PATH`` clause specifies the path in the personal/shared
+    * The ``AT`` clause specifies the path in the personal/shared
       space to list the files from.
     * Use the ``RECURSIVE`` clause to list the files recursively.
     * To return more information about the files, use the ``EXTENDED``
@@ -99,7 +99,7 @@ class ShowPersonalFilesHandler(ShowFilesHandler):
     --------
     The following command lists the files at a specific path::
 
-        SHOW PERSONAL FILES AT PATH "/data/";
+        SHOW PERSONAL FILES AT "/data/";
 
     The following command lists the files recursively with
     additional information::
@@ -154,7 +154,7 @@ class ShowSharedFilesHandler(ShowFilesHandler):
       specified number.
     * Use the ``ORDER BY`` clause to sort the results by the specified
       key. By default, the results are sorted in the ascending order.
-    * The ``AT PATH`` clause specifies the path in the personal/shared
+    * The ``AT`` clause specifies the path in the personal/shared
       space to list the files from.
     * Use the ``RECURSIVE`` clause to list the files recursively.
     * To return more information about the files, use the ``EXTENDED``
@@ -164,7 +164,7 @@ class ShowSharedFilesHandler(ShowFilesHandler):
     --------
     The following command lists the files at a specific path::
 
-        SHOW SHARED FILES AT PATH "/data/";
+        SHOW SHARED FILES AT "/data/";
 
     The following command lists the files recursively with
     additional information::

singlestoredb/fusion/handlers/models.py

@@ -44,7 +44,7 @@ class ShowModelsHandler(ShowFilesHandler):
       specified number.
     * Use the ``ORDER BY`` clause to sort the results by the specified
       key. By default, the results are sorted in the ascending order.
-    * The ``AT PATH`` clause specifies the path in the models
+    * The ``AT`` clause specifies the path in the models
       space to list the files from.
     * To return more information about the files, use the ``EXTENDED``
       clause.

singlestoredb/fusion/handlers/stage.py

@@ -62,7 +62,7 @@ class ShowStageFilesHandler(SQLHandler):
       specified number.
     * Use the ``ORDER BY`` clause to sort the results by the specified
       key. By default, the results are sorted in the ascending order.
-    * The ``AT PATH`` clause specifies the path in the Stage to list
+    * The ``AT`` clause specifies the path in the Stage to list
       the files from.
     * The ``IN`` clause specifies the ID or the name of the
       deployment in which the Stage is attached.
@@ -74,7 +74,7 @@ class ShowStageFilesHandler(SQLHandler):
     --------
     The following command lists the files at a specific path::
 
-        SHOW STAGE FILES IN 'wsg1' AT PATH "/data/";
+        SHOW STAGE FILES IN 'wsg1' AT "/data/";
 
     The following command lists the files recursively with
     additional information::
@@ -393,7 +393,7 @@ class DropStageFolderHandler(SQLHandler):
     # Name of deployment
     deployment_name = '<deployment-name>'
 
-    # Should folers be deleted recursively?
+    # Should folders be deleted recursively?
     recursive = RECURSIVE
 
     Description
@@ -474,7 +474,7 @@ class CreateStageFolderHandler(SQLHandler):
       is created. The path must end with a trailing slash (/).
     * ``<deployment-id>``: The ID of the deployment in which
       the Stage is attached.
-    * ``<deployment-name>``: The name of the deployment in which
+    * ``<deployment-name>``: The name of the deployment in
       which the Stage is attached.
 
     Remarks

singlestoredb/management/cluster.py

@@ -390,7 +390,7 @@ class ClusterManager(Manager):
         :class:`Cluster`
 
         """
-        if isinstance(region, Region):
+        if isinstance(region, Region) and region.id:
             region = region.id
         res = self._post(
             'clusters', json=dict(

singlestoredb/management/manager.py

@@ -148,7 +148,9 @@ class Manager(object):
 
         """
         if self._params:
-            kwargs['params'] = self._params
+            params = dict(self._params)
+            params.update(kwargs.get('params', {}))
+            kwargs['params'] = params
         set_organization(kwargs)
         return self._check(self._doit('get', path, *args, **kwargs), path, kwargs)
 
@@ -171,7 +173,9 @@ class Manager(object):
 
         """
         if self._params:
-            kwargs['params'] = self._params
+            params = dict(self._params)
+            params.update(kwargs.get('params', {}))
+            kwargs['params'] = params
         set_organization(kwargs)
         return self._check(self._doit('post', path, *args, **kwargs), path, kwargs)
 
@@ -194,7 +198,9 @@ class Manager(object):
 
         """
         if self._params:
-            kwargs['params'] = self._params
+            params = dict(self._params)
+            params.update(kwargs.get('params', {}))
+            kwargs['params'] = params
         set_organization(kwargs)
         return self._check(self._doit('put', path, *args, **kwargs), path, kwargs)
 
@@ -217,7 +223,9 @@ class Manager(object):
 
         """
         if self._params:
-            kwargs['params'] = self._params
+            params = dict(self._params)
+            params.update(kwargs.get('params', {}))
+            kwargs['params'] = params
         set_organization(kwargs)
         return self._check(self._doit('delete', path, *args, **kwargs), path, kwargs)
 
@@ -240,7 +248,9 @@ class Manager(object):
 
         """
         if self._params:
-            kwargs['params'] = self._params
+            params = dict(self._params)
+            params.update(kwargs.get('params', {}))
+            kwargs['params'] = params
         set_organization(kwargs)
         return self._check(self._doit('patch', path, *args, **kwargs), path, kwargs)
 

singlestoredb/management/region.py

@@ -21,7 +21,10 @@ class Region(object):
 
     """
 
-    def __init__(self, id: str, name: str, provider: str):
+    def __init__(
+        self, name: str, provider: str, id: Optional[str] = None,
+        region_name: Optional[str] = None,
+    ) -> None:
         """Use :attr:`WorkspaceManager.regions` instead."""
         #: Unique ID of the region
         self.id = id
@@ -32,6 +35,9 @@ class Region(object):
         #: Name of the cloud provider
         self.provider = provider
 
+        #: Name of the provider region
+        self.region_name = region_name
+
         self._manager: Optional[Manager] = None
 
     def __str__(self) -> str:
@@ -59,10 +65,14 @@ class Region(object):
         :class:`Region`
 
         """
+        id = obj.get('regionID', None)
+        region_name = obj.get('regionName', None)
+
         out = cls(
-            id=obj['regionID'],
+            id=id,
             name=obj['region'],
             provider=obj['provider'],
+            region_name=region_name,
         )
         out._manager = manager
         return out

singlestoredb/management/workspace.py

@@ -1074,7 +1074,7 @@ class WorkspaceGroup(object):
         try:
             region = [x for x in manager.regions if x.id == obj['regionID']][0]
         except IndexError:
-            region = Region(obj.get('regionID', '<unknown>'), '<unknown>', '<unknown>')
+            region = Region('<unknown>', '<unknown>', obj.get('regionID', '<unknown>'))
         out = cls(
             name=obj['name'],
             id=obj['workspaceGroupID'],
@@ -1391,13 +1391,10 @@ class StarterWorkspace(object):
                 msg='An endpoint has not been set in this '
                     'starter workspace configuration',
             )
-        # Parse endpoint as host:port
-        if ':' in self.endpoint:
-            host, port = self.endpoint.split(':', 1)
-            kwargs['host'] = host
-            kwargs['port'] = int(port)
-        else:
-            kwargs['host'] = self.endpoint
+
+        kwargs['host'] = self.endpoint
+        kwargs['database'] = self.database_name
+
         return connection.connect(**kwargs)
 
     def terminate(self) -> None:
@@ -1455,7 +1452,7 @@ class StarterWorkspace(object):
 
     def create_user(
         self,
-        user_name: str,
+        username: str,
         password: Optional[str] = None,
     ) -> Dict[str, str]:
         """
@@ -1463,7 +1460,7 @@ class StarterWorkspace(object):
 
         Parameters
         ----------
-        user_name : str
+        username : str
             The starter workspace user name to connect the new user to the database
         password : str, optional
             Password for the new user. If not provided, a password will be
@@ -1485,7 +1482,7 @@ class StarterWorkspace(object):
             )
 
         payload = {
-            'userName': user_name,
+            'userName': username,
         }
         if password is not None:
             payload['password'] = password
@@ -1715,7 +1712,7 @@ class WorkspaceManager(Manager):
         :class:`WorkspaceGroup`
 
         """
-        if isinstance(region, Region):
+        if isinstance(region, Region) and region.id:
             region = region.id
         res = self._post(
             'workspaceGroups', json=dict(
@@ -1854,7 +1851,8 @@ class WorkspaceManager(Manager):
         self,
         name: str,
         database_name: str,
-        workspace_group: dict[str, str],
+        provider: str,
+        region_name: str,
     ) -> 'StarterWorkspace':
         """
         Create a new starter (shared tier) workspace.
@@ -1865,27 +1863,21 @@ class WorkspaceManager(Manager):
             Name of the starter workspace
         database_name : str
             Name of the database for the starter workspace
-        workspace_group : dict[str, str]
-            Workspace group input (dict with keys: 'cell_id')
+        provider : str
+            Cloud provider for the starter workspace (e.g., 'aws', 'gcp', 'azure')
+        region_name : str
+            Cloud provider region for the starter workspace (e.g., 'us-east-1')
 
         Returns
         -------
         :class:`StarterWorkspace`
         """
-        if not workspace_group or not isinstance(workspace_group, dict):
-            raise ValueError(
-                'workspace_group must be a dict with keys: '
-                "'cell_id'",
-            )
-        if set(workspace_group.keys()) != {'cell_id'}:
-            raise ValueError("workspace_group must contain only 'cell_id'")
 
         payload = {
             'name': name,
             'databaseName': database_name,
-            'workspaceGroup': {
-                'cellID': workspace_group['cell_id'],
-            },
+            'provider': provider,
+            'regionName': region_name,
         }
 
         res = self._post('sharedtier/virtualWorkspaces', json=payload)

singlestoredb/tests/ext_funcs/__init__.py

@@ -28,6 +28,45 @@ from singlestoredb.functions.typing import polars as plt
 from singlestoredb.functions.typing import pyarrow as pat
 
 
+@udf
+def doc_test(x: int, y: float) -> int:
+    """
+    A simple function to test the decorator and documentation.
+
+    Parameters
+    ----------
+    x : int
+        An integer to be multiplied by 2.
+    y : float
+        A float that is not used in the computation.
+
+    Examples
+    --------
+    Basic usage of the function:
+    >>> doc_test(
+    ...     3, 4.5,
+    ... )
+    6
+
+    Another example with different values:
+    >>> doc_test(5, 2.0)
+    10
+
+    SQL Example
+    sql> SELECT doc_test(3, 4.5);
+    6
+
+    Final text
+
+    Returns
+    -------
+    int
+        The input integer multiplied by 2.
+
+    """
+    return x * 2
+
+
 @udf
 def int_mult(x: int, y: int) -> int:
     return x * y

singlestoredb/tests/test_connection.py

@@ -1443,6 +1443,11 @@ class TestConnection(unittest.TestCase):
         out = cur.fetchone()
         row = dict(zip(names, out.row(0)))
 
+        # Recent versions of polars have a problem with decimals
+        class FixCompare(str):
+            def __eq__(self, other):
+                return super().__eq__(other.replace('precision=None', 'precision=22'))
+
         dtypes = [
             ('id', 'Int32'),
             ('tinyint', 'Int8'),
@@ -1464,10 +1469,10 @@ class TestConnection(unittest.TestCase):
             ('float', 'Float32'),
             ('double', 'Float64'),
             ('real', 'Float64'),
-            ('decimal', 'Decimal(precision=22, scale=6)'),
-            ('dec', 'Decimal(precision=22, scale=6)'),
-            ('fixed', 'Decimal(precision=22, scale=6)'),
-            ('numeric', 'Decimal(precision=22, scale=6)'),
+            ('decimal', FixCompare('Decimal(precision=22, scale=6)')),
+            ('dec', FixCompare('Decimal(precision=22, scale=6)')),
+            ('fixed', FixCompare('Decimal(precision=22, scale=6)')),
+            ('numeric', FixCompare('Decimal(precision=22, scale=6)')),
             ('date', 'Date'),
             ('time', "Duration(time_unit='us')"),
             ('time_6', "Duration(time_unit='us')"),
@@ -1585,6 +1590,11 @@ class TestConnection(unittest.TestCase):
         out = cur.fetchone()
         row = dict(zip(names, out.row(0)))
 
+        # Recent versions of polars have a problem with decimals
+        class FixCompare(str):
+            def __eq__(self, other):
+                return super().__eq__(other.replace('precision=None', 'precision=22'))
+
         dtypes = [
             ('id', 'Int32'),
             ('tinyint', 'Int8'),
@@ -1606,10 +1616,10 @@ class TestConnection(unittest.TestCase):
             ('float', 'Float32'),
             ('double', 'Float64'),
             ('real', 'Float64'),
-            ('decimal', 'Decimal(precision=22, scale=6)'),
-            ('dec', 'Decimal(precision=22, scale=6)'),
-            ('fixed', 'Decimal(precision=22, scale=6)'),
-            ('numeric', 'Decimal(precision=22, scale=6)'),
+            ('decimal', FixCompare('Decimal(precision=22, scale=6)')),
+            ('dec', FixCompare('Decimal(precision=22, scale=6)')),
+            ('fixed', FixCompare('Decimal(precision=22, scale=6)')),
+            ('numeric', FixCompare('Decimal(precision=22, scale=6)')),
             ('date', 'Date'),
             ('time', "Duration(time_unit='us')"),
             ('time_6', "Duration(time_unit='us')"),

singlestoredb/tests/test_management.py

@@ -14,7 +14,6 @@ import singlestoredb as s2
 from singlestoredb.management.job import Status
 from singlestoredb.management.job import TargetType
 from singlestoredb.management.region import Region
-from singlestoredb.management.region import RegionManager
 from singlestoredb.management.utils import NamedList
 
 
@@ -26,6 +25,11 @@ def clean_name(s):
     return re.sub(r'[^\w]', r'-', s).replace('_', '-').lower()
 
 
+def shared_database_name(s):
+    """Return a shared database name. Cannot contain special characters except -"""
+    return re.sub(r'[^\w]', '', s).replace('-', '_').lower()
+
+
 @pytest.mark.management
 class TestCluster(unittest.TestCase):
 
@@ -366,42 +370,36 @@ class TestWorkspace(unittest.TestCase):
         assert 'endpoint' in cm.exception.msg, cm.exception.msg
 
 
-@pytest.mark.skip('Not implemented in server yet')
 @pytest.mark.management
 class TestStarterWorkspace(unittest.TestCase):
 
     manager = None
     starter_workspace = None
-    starter_workspace_user = {
-        'username': 'starter_user',
-        'password': None,
-    }
-
-    @property
-    def starter_username(self):
-        """Return the username for the starter workspace user."""
-        return self.starter_workspace_user['username']
-
-    @property
-    def password(self):
-        """Return the password for the starter workspace user."""
-        return self.starter_workspace_user['password']
 
     @classmethod
     def setUpClass(cls):
         cls.manager = s2.manage_workspaces()
 
-        us_regions = [x for x in cls.manager.regions if 'US' in x.name]
-        cls.password = secrets.token_urlsafe(20) + '-x&$'
+        shared_tier_regions: NamedList[Region] = [
+            x for x in cls.manager.shared_tier_regions if 'US' in x.name
+        ]
+        cls.starter_username = 'starter_user'
+        cls.password = secrets.token_urlsafe(20)
 
-        name = clean_name(secrets.token_urlsafe(20)[:20])
+        name = shared_database_name(secrets.token_urlsafe(20)[:20])
+
+        cls.database_name = f'starter_db_{name}'
+
+        shared_tier_region: Region = random.choice(shared_tier_regions)
+
+        if not shared_tier_region:
+            raise ValueError('No shared tier regions found')
 
         cls.starter_workspace = cls.manager.create_starter_workspace(
             f'starter-ws-test-{name}',
-            database_name=f'starter_db_{name}',
-            workspace_group={
-                'cell_id': random.choice(us_regions).id,
-            },
+            database_name=cls.database_name,
+            provider=shared_tier_region.provider,
+            region_name=shared_tier_region.region_name,
         )
 
         cls.starter_workspace.create_user(
@@ -469,14 +467,14 @@ class TestStarterWorkspace(unittest.TestCase):
         ) as conn:
             with conn.cursor() as cur:
                 cur.execute('show databases')
-                assert 'starter_db' in [x[0] for x in list(cur)]
+                assert self.database_name in [x[0] for x in list(cur)]
 
         # Test missing endpoint
         workspace = self.manager.get_starter_workspace(self.starter_workspace.id)
         workspace.endpoint = None
 
         with self.assertRaises(s2.ManagementError) as cm:
-            workspace.connect(user='admin', password=self.password)
+            workspace.connect(user=self.starter_username, password=self.password)
 
         assert 'endpoint' in cm.exception.msg, cm.exception.msg
 
@@ -1492,7 +1490,6 @@ class TestFileSpaces(unittest.TestCase):
             space.remove('obj_test_2.ipynb')
 
 
-@pytest.mark.skip('Not implemented in server yet')
 @pytest.mark.management
 class TestRegions(unittest.TestCase):
     """Test cases for region management."""
@@ -1530,14 +1527,6 @@ class TestRegions(unittest.TestCase):
         providers = {x.provider for x in regions}
         assert 'Azure' in providers or 'GCP' in providers or 'AWS' in providers
 
-        # Verify region can be accessed by name or ID
-        region_by_name = regions[region.name]
-        region_by_id = regions[region.id]
-        assert region_by_name == region_by_id
-        assert region_by_name.id == region.id
-        assert region_by_name.name == region.name
-        assert region_by_name.provider == region.provider
-
     def test_list_shared_tier_regions(self):
         """Test listing shared tier regions."""
         regions = self.manager.list_shared_tier_regions()
@@ -1549,22 +1538,14 @@ class TestRegions(unittest.TestCase):
         if regions:
             region = regions[0]
             assert isinstance(region, Region)
-            assert hasattr(region, 'id')
             assert hasattr(region, 'name')
             assert hasattr(region, 'provider')
+            assert hasattr(region, 'region_name')
 
             # Verify provider values
             providers = {x.provider for x in regions}
             assert any(p in providers for p in ['Azure', 'GCP', 'AWS'])
 
-            # Verify region can be accessed by name or ID
-            region_by_name = regions[region.name]
-            region_by_id = regions[region.id]
-            assert region_by_name == region_by_id
-            assert region_by_name.id == region.id
-            assert region_by_name.name == region.name
-            assert region_by_name.provider == region.provider
-
     def test_str_repr(self):
         """Test string representation of regions."""
         regions = self.manager.list_regions()
@@ -1581,17 +1562,3 @@ class TestRegions(unittest.TestCase):
 
         # Test __repr__
         assert repr(region) == str(region)
-
-    def test_no_manager(self):
-        """Test behavior when manager is not available."""
-        regions = self.manager.list_regions()
-        if not regions:
-            self.skipTest('No regions available for testing')
-
-        region = regions[0]
-        region._manager = None
-
-        # Verify from_dict class method
-        with self.assertRaises(s2.ManagementError) as cm:
-            RegionManager.list_shared_tier_regions(None)
-        assert 'No workspace manager' in str(cm.exception)

singlestoredb/tests/test_udf.py

@@ -36,6 +36,32 @@ def to_sql(x):
 
 class TestUDF(unittest.TestCase):
 
+    def test_invalid_signature(self):
+
+        def foo(x: np.ndarray, y: np.ndarray) -> str: ...
+        with self.assertRaises(TypeError):
+            to_sql(foo)
+
+        def foo(x: str, y: str) -> np.ndarray: ...
+        with self.assertRaises(TypeError):
+            to_sql(foo)
+
+        def foo(x: str, y: np.ndarray) -> np.ndarray: ...
+        with self.assertRaises(TypeError):
+            to_sql(foo)
+
+        def foo(x: np.ndarray, y: str) -> np.ndarray: ...
+        with self.assertRaises(TypeError):
+            to_sql(foo)
+
+        def foo(x: str, y: np.ndarray) -> str: ...
+        with self.assertRaises(TypeError):
+            to_sql(foo)
+
+        def foo(x: np.ndarray, y: str) -> str: ...
+        with self.assertRaises(TypeError):
+            to_sql(foo)
+
     def test_return_annotations(self):
 
         # No annotations
@@ -76,24 +102,25 @@ class TestUDF(unittest.TestCase):
         assert to_sql(foo) == '`foo`() RETURNS DOUBLE NULL'
 
         # Optional return value with collection type
-        def foo() -> Optional[List[str]]: ...
-        assert to_sql(foo) == '`foo`() RETURNS ARRAY(TEXT NOT NULL) NULL'
+        # def foo() -> Optional[List[str]]: ...
+        # assert to_sql(foo) == '`foo`() RETURNS ARRAY(TEXT NOT NULL) NULL'
 
         # Optional return value with nested collection type
-        def foo() -> Optional[List[List[str]]]: ...
-        assert to_sql(foo) == '`foo`() RETURNS ARRAY(ARRAY(TEXT NOT NULL) NOT NULL) NULL'
+        # def foo() -> Optional[List[List[str]]]: ...
+        # assert to_sql(foo) == '`foo`()
+        #     RETURNS ARRAY(ARRAY(TEXT NOT NULL) NOT NULL) NULL'
 
         # Optional return value with collection type with nulls
-        def foo() -> Optional[List[Optional[str]]]: ...
-        assert to_sql(foo) == '`foo`() RETURNS ARRAY(TEXT NULL) NULL'
+        # def foo() -> Optional[List[Optional[str]]]: ...
+        # assert to_sql(foo) == '`foo`() RETURNS ARRAY(TEXT NULL) NULL'
 
         # Custom type with bound
         def foo() -> D: ...
         assert to_sql(foo) == '`foo`() RETURNS TEXT NOT NULL'
 
         # Return value with custom collection type with nulls
-        def foo() -> E: ...
-        assert to_sql(foo) == '`foo`() RETURNS ARRAY(DOUBLE NULL) NULL'
+        # def foo() -> E: ...
+        # assert to_sql(foo) == '`foo`() RETURNS ARRAY(DOUBLE NULL) NULL'
 
         # Incompatible types
         def foo() -> Union[int, str]: ...
@@ -158,17 +185,18 @@ class TestUDF(unittest.TestCase):
         assert to_sql(foo) == '`foo`(`x` DOUBLE NULL) RETURNS TINYINT NULL'
 
         # Optional parameter with collection type
-        def foo(x: Optional[List[str]]) -> None: ...
-        assert to_sql(foo) == '`foo`(`x` ARRAY(TEXT NOT NULL) NULL) RETURNS TINYINT NULL'
+        # def foo(x: Optional[List[str]]) -> None: ...
+        # assert to_sql(foo) == '`foo`(`x`
+        #     ARRAY(TEXT NOT NULL) NULL) RETURNS TINYINT NULL'
 
         # Optional parameter with nested collection type
-        def foo(x: Optional[List[List[str]]]) -> None: ...
-        assert to_sql(foo) == '`foo`(`x` ARRAY(ARRAY(TEXT NOT NULL) NOT NULL) NULL) ' \
-            'RETURNS TINYINT NULL'
+        # def foo(x: Optional[List[List[str]]]) -> None: ...
+        # assert to_sql(foo) == '`foo`(`x` ARRAY(ARRAY(TEXT NOT NULL) NOT NULL) NULL) ' \
+        #     'RETURNS TINYINT NULL'
 
         # Optional parameter with collection type with nulls
-        def foo(x: Optional[List[Optional[str]]]) -> None: ...
-        assert to_sql(foo) == '`foo`(`x` ARRAY(TEXT NULL) NULL) RETURNS TINYINT NULL'
+        # def foo(x: Optional[List[Optional[str]]]) -> None: ...
+        # assert to_sql(foo) == '`foo`(`x` ARRAY(TEXT NULL) NULL) RETURNS TINYINT NULL'
 
         # Custom type with bound
         def foo(x: D) -> None: ...

{singlestoredb-1.15.0.dist-info → singlestoredb-1.15.1.dist-info}/METADATA

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