singlestoredb 1.12.1__tar.gz → 1.12.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.12.1
+Version: 1.12.3
 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.3}/accel.c

@@ -2179,9 +2179,6 @@ static PyObject *load_rowdat_1_numpy(PyObject *self, PyObject *args, PyObject *k
 
     // Get number of columns
     n_cols = PyObject_Length(py_colspec);
-    if (n_cols == 0) {
-        goto error;
-    }
 
     // Determine column types
     ctypes = calloc(sizeof(int), n_cols);
@@ -3979,10 +3976,6 @@ static PyObject *load_rowdat_1(PyObject *self, PyObject *args, PyObject *kwargs)
     end = data + (unsigned long long)length;
 
     colspec_l = PyObject_Length(py_colspec);
-    if (colspec_l == 0) {
-        goto error;
-    }
-
     ctypes = malloc(sizeof(int) * colspec_l);
 
     for (i = 0; i < colspec_l; i++) {

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

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

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

{singlestoredb-1.12.1 → singlestoredb-1.12.3}/singlestoredb/config.py

@@ -80,7 +80,7 @@ register_option(
 )
 
 register_option(
-    'charset', 'string', check_str, 'utf8',
+    'charset', 'string', check_str, 'utf8mb4',
     'Specifies the character set for the session.',
     environ='SINGLESTOREDB_CHARSET',
 )

{singlestoredb-1.12.1 → singlestoredb-1.12.3}/singlestoredb/functions/ext/asgi.py

@@ -69,6 +69,12 @@ try:
 except ImportError:
     has_cloudpickle = False
 
+try:
+    from pydantic import BaseModel
+    has_pydantic = True
+except ImportError:
+    has_pydantic = False
+
 
 logger = utils.get_logger('singlestoredb.functions.ext.asgi')
 
@@ -138,13 +144,24 @@ def get_func_names(funcs: str) -> List[Tuple[str, str]]:
 
 
 def as_tuple(x: Any) -> Any:
-    if hasattr(x, 'model_fields'):
-        return tuple(x.model_fields.values())
+    """Convert object to tuple."""
+    if has_pydantic and isinstance(x, BaseModel):
+        return tuple(x.model_dump().values())
     if dataclasses.is_dataclass(x):
         return dataclasses.astuple(x)
     return x
 
 
+def as_list_of_tuples(x: Any) -> Any:
+    """Convert object to a list of tuples."""
+    if isinstance(x, (list, tuple)) and len(x) > 0:
+        if has_pydantic and isinstance(x[0], BaseModel):
+            return [tuple(y.model_dump().values()) for y in x]
+        if dataclasses.is_dataclass(x[0]):
+            return [dataclasses.astuple(y) for y in x]
+    return x
+
+
 def make_func(
     name: str,
     func: Callable[..., Any],
@@ -183,7 +200,7 @@ def make_func(
                 out_ids: List[int] = []
                 out = []
                 for i, res in zip(row_ids, func_map(func, rows)):
-                    out.extend(as_tuple(res))
+                    out.extend(as_list_of_tuples(res))
                     out_ids.extend([row_ids[i]] * (len(out)-len(out_ids)))
                 return out_ids, out
 

{singlestoredb-1.12.1 → singlestoredb-1.12.3}/singlestoredb/functions/signature.py

@@ -6,6 +6,8 @@ import numbers
 import os
 import re
 import string
+import sys
+import types
 import typing
 from typing import Any
 from typing import Callable
@@ -32,6 +34,11 @@ except ImportError:
 from . import dtypes as dt
 from ..mysql.converters import escape_item  # type: ignore
 
+if sys.version_info >= (3, 10):
+    _UNION_TYPES = {typing.Union, types.UnionType}
+else:
+    _UNION_TYPES = {typing.Union}
+
 
 array_types: Tuple[Any, ...]
 
@@ -211,7 +218,7 @@ def simplify_dtype(dtype: Any) -> List[Any]:
     args = []
 
     # Flatten Unions
-    if origin is Union:
+    if origin in _UNION_TYPES:
         for x in typing.get_args(dtype):
             args.extend(simplify_dtype(x))
 

{singlestoredb-1.12.1 → singlestoredb-1.12.3}/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.3}/singlestoredb/http/connection.py

@@ -43,6 +43,12 @@ try:
 except ImportError:
     has_shapely = False
 
+try:
+    import pydantic
+    has_pydantic = True
+except ImportError:
+    has_pydantic = False
+
 from .. import connection
 from .. import fusion
 from .. import types
@@ -533,6 +539,9 @@ class Cursor(connection.Cursor):
             self._expect_results = True
             sql_type = 'query'
 
+        if has_pydantic and isinstance(params, pydantic.BaseModel):
+            params = params.model_dump()
+
         self._validate_param_subs(oper, params)
 
         handler = fusion.get_handler(oper)

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

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

{singlestoredb-1.12.1 → singlestoredb-1.12.3}/singlestoredb/mysql/cursors.py

@@ -8,6 +8,12 @@ from ..utils import results
 from ..utils.debug import log_query
 from ..utils.results import get_schema
 
+try:
+    from pydantic import BaseModel
+    has_pydantic = True
+except ImportError:
+    has_pydantic = False
+
 
 #: Regular expression for :meth:`Cursor.executemany`.
 #: executemany only supports simple bulk insert.
@@ -149,6 +155,8 @@ class Cursor(BaseCursor):
             return tuple(literal(arg) for arg in args)
         elif dtype is dict or isinstance(args, dict):
             return {key: literal(val) for (key, val) in args.items()}
+        elif has_pydantic and isinstance(args, BaseModel):
+            return {key: literal(val) for (key, val) in args.model_dump().items()}
         # If it's not a dictionary let's try escaping it anyways.
         # Worst case it will throw a Value error
         return conn.escape(args)

{singlestoredb-1.12.1 → singlestoredb-1.12.3}/singlestoredb/tests/test_basics.py

@@ -6,6 +6,7 @@ import decimal
 import math
 import os
 import unittest
+from typing import Optional
 
 from requests.exceptions import InvalidJSONError
 
@@ -28,6 +29,12 @@ try:
 except ImportError:
     has_pygeos = False
 
+try:
+    import pydantic
+    has_pydantic = True
+except ImportError:
+    has_pydantic = False
+
 import singlestoredb as s2
 from . import utils
 # import traceback
@@ -1255,6 +1262,68 @@ class TestBasics(unittest.TestCase):
         except Exception:
             pass
 
+    def test_pydantic(self):
+        if not has_pydantic:
+            self.skipTest('Test requires pydantic')
+
+        tblname = 'foo_' + str(id(self))
+
+        class FooData(pydantic.BaseModel):
+            x: Optional[int]
+            y: Optional[float]
+            z: Optional[str] = None
+
+        self.cur.execute(f'''
+            CREATE TABLE {tblname}(
+                x INT,
+                y DOUBLE,
+                z TEXT
+            )
+        ''')
+
+        self.cur.execute(
+            f'INSERT INTO {tblname}(x, y) VALUES (%(x)s, %(y)s)',
+            FooData(x=2, y=3.23),
+        )
+
+        self.cur.execute('SELECT * FROM ' + tblname)
+
+        assert list(sorted(self.cur.fetchall())) == \
+            list(sorted([(2, 3.23, None)]))
+
+        self.cur.executemany(
+            f'INSERT INTO {tblname}(x) VALUES (%(x)s)',
+            [FooData(x=3, y=3.12), FooData(x=10, y=100.11)],
+        )
+
+        self.cur.execute('SELECT * FROM ' + tblname)
+
+        assert list(sorted(self.cur.fetchall())) == \
+            list(
+                sorted([
+                    (2, 3.23, None),
+                    (3, None, None),
+                    (10, None, None),
+                ]),
+            )
+
+    def test_charset(self):
+        with s2.connect(database=type(self).dbname) as conn:
+            with conn.cursor() as cur:
+                cur.execute('''
+                    select json_extract_string('{"foo":"😀"}', "bar");
+                ''')
+
+        if 'http' in self.conn.driver:
+            self.skipTest('Charset is not use in HTTP interface')
+
+        with self.assertRaises(s2.OperationalError):
+            with s2.connect(database=type(self).dbname, charset='utf8') as conn:
+                with conn.cursor() as cur:
+                    cur.execute('''
+                        select json_extract_string('{"foo":"😀"}', "bar");
+                    ''')
+
 
 if __name__ == '__main__':
     import nose2