singlestoredb 1.12.2__cp38-abi3-win_amd64.whl → 1.12.4__cp38-abi3-win_amd64.whl

singlestoredb/__init__.py

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

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/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/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/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/mysql/connection.py

@@ -989,18 +989,11 @@ class Connection(BaseConnection):
 
     def set_character_set(self, charset, collation=None):
         """
-        Set session charaset (and collation) on the server.
+        Set charaset (and collation) on the server.
 
-        Send "SET [COLLATION|CHARACTER_SET]_SERVER = [collation|charset]" query.
+        Send "SET NAMES charset [COLLATE collation]" query.
         Update Connection.encoding based on charset.
 
-        If charset/collation are being set to utf8mb4, the corresponding global
-        variables (COLLATION_SERVER and CHARACTER_SET_SERVER) must be also set
-        to utf8mb4. This is true by default for SingleStore 8.7+. For previuous
-        versions or non-default setting user must manully run the query
-        `SET global collation_connection = utf8mb4_general_ci`
-        replacing utf8mb4_general_ci with {collation}.
-
         Parameters
         ----------
         charset : str
@@ -1013,9 +1006,9 @@ class Connection(BaseConnection):
         encoding = charset_by_name(charset).encoding
 
         if collation:
-            query = f'SET COLLATION_SERVER={collation}'
+            query = f'SET NAMES {charset} COLLATE {collation}'
         else:
-            query = f'SET CHARACTER_SET_SERVER={charset}'
+            query = f'SET NAMES {charset}'
         self._execute_command(COMMAND.COM_QUERY, query)
         self._read_packet()
         self.charset = charset
@@ -1119,6 +1112,19 @@ class Connection(BaseConnection):
             self._get_server_information()
             self._request_authentication()
 
+            # Send "SET NAMES" query on init for:
+            # - Ensure charaset (and collation) is set to the server.
+            #   - collation_id in handshake packet may be ignored.
+            # - If collation is not specified, we don't know what is server's
+            #   default collation for the charset. For example, default collation
+            #   of utf8mb4 is:
+            #   - MySQL 5.7, MariaDB 10.x: utf8mb4_general_ci
+            #   - MySQL 8.0: utf8mb4_0900_ai_ci
+            #
+            # Reference:
+            # - https://github.com/PyMySQL/PyMySQL/issues/1092
+            # - https://github.com/wagtail/wagtail/issues/9477
+            # - https://zenn.dev/methane/articles/2023-mysql-collation (Japanese)
             self.set_character_set(self.charset, self.collation)
 
             if self.sql_mode is not None:

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/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,70 @@ 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):
+        self.skipTest('Skip until charset commands are re-implemented')
+
+        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

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

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

{singlestoredb-1.12.2.dist-info → singlestoredb-1.12.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-_singlestoredb_accel.pyd,sha256=eIcqHNvo41uHe02n94fJEzSJyXdegzvb1VHa86AULsM,59392
-singlestoredb/__init__.py,sha256=dlGP3oKt-x7HySro64o0v_fGXAnosKaQsSoDYQc42mo,1712
+_singlestoredb_accel.pyd,sha256=BjwcTKJQb9p7VofVO-Lrg_BXA6nM4nvVUNyKF9WkU7c,59392
+singlestoredb/__init__.py,sha256=Y3oYr5E9O4QiB6TxEq0HF58H-agjoOb93fc2WyLXPBg,1712
 singlestoredb/auth.py,sha256=RmYiH0Wlc2RXc4pTlRMysxtBI445ggCIwojWKC_eDLE,7844
-singlestoredb/config.py,sha256=5OY9RDlGBrBWAHsGrg0X4v0y_QwNb7G6FSQooMgT8rY,13032
+singlestoredb/config.py,sha256=7-M2c7IAv3B1AmAKizgeNn880TDBbM4gbElLfStejIU,13035
 singlestoredb/connection.py,sha256=Ty_idVYH50Qx-j8WXy7NeB-DYLAcpdjGYTrTHkKzG9U,47309
 singlestoredb/converters.py,sha256=6gN3_RzSbw0Aimd5cGgBNPNq1yiHb1a_NK8qC9DmOQ0,21636
 singlestoredb/exceptions.py,sha256=WCCJrNSsU-hD-621Jpd6bwmvGftQ7byXkk-XKXlaxpg,3354
@@ -22,10 +22,10 @@ singlestoredb/apps/_uvicorn_util.py,sha256=Petkmq5keBPfXZsHBrnZfY3O2rUHvb3Cw6o-B
 singlestoredb/functions/__init__.py,sha256=Ehyp1pa40cvizzSYNGZ4UP4tiEcyfaxf_LI-oyt-Lro,84
 singlestoredb/functions/decorator.py,sha256=6c0uIknQNZrN5LAj-mWUw25Bcnl-_dRel6RMDzn2vK8,11816
 singlestoredb/functions/dtypes.py,sha256=5IwMSaSzxtSowxXrm5hZXW1lpNm6QILxiU4mAUEkBO0,32854
-singlestoredb/functions/signature.py,sha256=np4DHtfLM-S38srVu9KzsJZnI7tiwrl0UtMnA8F6rZ0,23162
+singlestoredb/functions/signature.py,sha256=0d1mqH1J0cV7W1NBAqM2C98DWIZomF5qYSS5-T6OW_g,23324
 singlestoredb/functions/ext/__init__.py,sha256=5ppI8IZN_zOwoJFdu_Oq9ipxtyHw9n6OMVAa_s9T_yY,24
 singlestoredb/functions/ext/arrow.py,sha256=mQhwaMpvCH_dP92WIhP_j-stu272n4UAHsFUOBTgnq0,9436
-singlestoredb/functions/ext/asgi.py,sha256=ENwGjjLxFYjv6HFB5WdX4YT5GSs5sn3mirOLgAM0wTY,44807
+singlestoredb/functions/ext/asgi.py,sha256=TNQlzosguNaM1-Rs1XXO78phav25XdKsbLTFpIvXgRA,45362
 singlestoredb/functions/ext/json.py,sha256=CROdj37cuJhAZ-CM93EI-SoLb4kxFcMGudsJ5QGyCoI,10831
 singlestoredb/functions/ext/mmap.py,sha256=zo6eweOFCZp0KIzAeL1vvuSjqvQhE8ybVhHbU0ZICt4,14124
 singlestoredb/functions/ext/rowdat_1.py,sha256=KYj_y5JWm3_B2-QC47HK-CNOrzujBqGUwLJfE49jwRg,23050
@@ -44,7 +44,7 @@ singlestoredb/fusion/handlers/stage.py,sha256=PP-SSP204lwpmnycSXXSmFPzoN535JVuwg
 singlestoredb/fusion/handlers/utils.py,sha256=nV2lSzKhv7CzM7I_uIh5kmDV0Ec6VeeKoHczx5pVNcw,11009
 singlestoredb/fusion/handlers/workspace.py,sha256=NxoEY5xd5lCQmXiim4nhAYCL0agHo1H_rGPpqa31hiw,28397
 singlestoredb/http/__init__.py,sha256=4cEDvLloGc3LSpU-PnIwacyu0n5oIIIE6xk2SPyWD_w,939
-singlestoredb/http/connection.py,sha256=dqXX5SSn6EOV7q0Ehh0E525eLT__B_jJLG-7jgVjbXg,40861
+singlestoredb/http/connection.py,sha256=kLA-LA4zinbNOSemRbGqbTHd3bNn-ucOwmQZa8HIKPI,41075
 singlestoredb/magics/__init__.py,sha256=fqCBQ0s8o1CYE4Xo_XiSbkLDzLgMNDgpSkOx66-uDZw,1244
 singlestoredb/magics/run_personal.py,sha256=M11xHi9lWquh_pLSpFI89LGE7PhOPQOGqlSPDl48itE,1900
 singlestoredb/magics/run_shared.py,sha256=rnKpW4d8CJvD6ehK8jG8FlxuqZvjZl4KocPTsk-23O8,1805
@@ -62,9 +62,9 @@ singlestoredb/management/workspace.py,sha256=D9DzpeWU7xFjpj8bBYiXyasjVYVANeYjTzg
 singlestoredb/mysql/__init__.py,sha256=CbpwzNUJPAmKPpIobC0-ugBta_RgHCMq7X7N75QLReY,4669
 singlestoredb/mysql/_auth.py,sha256=YaqqyvAHmeraBv3BM207rNveUVPM-mPnW20ts_ynVWg,8341
 singlestoredb/mysql/charset.py,sha256=mnCdMpvdub1S2mm2PSk2j5JddgsWRjsVLtGx-y9TskE,10724
-singlestoredb/mysql/connection.py,sha256=Dlam7wNSfn4jVBNrqdvxLzwxJqCQUzuu_rlcKU45MB0,75113
+singlestoredb/mysql/connection.py,sha256=sqcwlPopdxPt1wVUTq_1uJ5_CSRxbd_ILSgOCB1z7zQ,75387
 singlestoredb/mysql/converters.py,sha256=vebFFm6IrC0WgY-5Eh-esaPizY5cq3vDOUlEKGaYM-U,7771
-singlestoredb/mysql/cursors.py,sha256=pkrP-1t8IhBJRnYpdM7Rdm-332nOq1RYTDJ_yg_q5HI,27682
+singlestoredb/mysql/cursors.py,sha256=YoZU5_weniqXcoeA0GVSxmetkPYooiDkXMbVBYUNlrU,27942
 singlestoredb/mysql/err.py,sha256=aDbmfq08gWVmfgIea735wSeiFdvYbB5wusgd3qTVq1s,2480
 singlestoredb/mysql/optionfile.py,sha256=bz0cZp8tQZvab1iU7OT0yldHyaMVbvAcUJ3TSNwcmyI,675
 singlestoredb/mysql/protocol.py,sha256=UzHcrv0Pgb1FNofuBTnSxpC9VDkgNbPEbBrRETstxAg,14888
@@ -113,7 +113,7 @@ singlestoredb/tests/test.ipynb,sha256=IEgXbByXyWDplZvod1J2SqNHZiPOGdD4oNVMd0ArP7
 singlestoredb/tests/test.sql,sha256=winJzhZ2W52PcQ1j8X_NNIDRBmEa-xMAYrS_hoUtAP8,18337
 singlestoredb/tests/test2.ipynb,sha256=_kBQVvEoinQ1zInNcWFKpbdw-djkLsEO8l3g2MEU_Zs,236
 singlestoredb/tests/test2.sql,sha256=CEM8_lX189iQU65G3Pod7lig6osfrveQyoDz6HC35YQ,38
-singlestoredb/tests/test_basics.py,sha256=tLiR46qUy8-OHHRSHsQTBp5q9NAwNPR9HvfutI6YgnM,47629
+singlestoredb/tests/test_basics.py,sha256=tKzeSN8koMRFq5yjb98Wz5VWAOsnUKAETZEJyLhMD_o,49778
 singlestoredb/tests/test_config.py,sha256=Ad0PDmCnJMOyy9f7WTKiRasSR_3mYRByUlSb7k5ZySg,11502
 singlestoredb/tests/test_connection.py,sha256=UmoNo8erkcifEMbHZl83yAaRsyh6HANRdEtY3aViOK8,122792
 singlestoredb/tests/test_dbapi.py,sha256=cNJoTEZvYG7ckcwT7xqlkJX-2TDEYGTDDU1Igucp48k,679
@@ -141,9 +141,9 @@ singlestoredb/utils/results.py,sha256=wR70LhCqlobniZf52r67zYLBOKjWHQm68NAskdRQND
 singlestoredb/utils/xdict.py,sha256=-wi1lSPTnY99fhVMBhPKJ8cCsQhNG4GMUfkEBDKYgCw,13321
 sqlx/__init__.py,sha256=4Sdn8HN-Hf8v0_wCt60DCckCg8BvgM3-9r4YVfZycRE,89
 sqlx/magic.py,sha256=6VBlotgjautjev599tHaTYOfcfOA9m6gV_-P1_Qc4lI,3622
-singlestoredb-1.12.2.dist-info/LICENSE,sha256=Bojenzui8aPNjlF3w4ojguDP7sTf8vFV_9Gc2UAG1sg,11542
-singlestoredb-1.12.2.dist-info/METADATA,sha256=cWTppHIaZQ4oy5fvfS_FWlVtfVPcyA2Bk9F1kb9kfgM,5778
-singlestoredb-1.12.2.dist-info/WHEEL,sha256=UyMHzmWA0xVqVPKfTiLs2eN3OWWZUl-kQemNbpIqlKo,100
-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/RECORD,,
+singlestoredb-1.12.4.dist-info/LICENSE,sha256=Bojenzui8aPNjlF3w4ojguDP7sTf8vFV_9Gc2UAG1sg,11542
+singlestoredb-1.12.4.dist-info/METADATA,sha256=K1tOPCbyAof-bQelQHIkS3dyPZ5xx-2ckWoKxUamUSs,5778
+singlestoredb-1.12.4.dist-info/WHEEL,sha256=UyMHzmWA0xVqVPKfTiLs2eN3OWWZUl-kQemNbpIqlKo,100
+singlestoredb-1.12.4.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
+singlestoredb-1.12.4.dist-info/top_level.txt,sha256=lA65Vf4qAMfg_s1oG3LEO90h4t1Z-SPDbRqkevI3bSY,40
+singlestoredb-1.12.4.dist-info/RECORD,,