singlestoredb 1.2.0__cp38-abi3-macosx_10_9_universal2.whl → 1.3.0__cp38-abi3-macosx_10_9_universal2.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.2.0'
+__version__ = '1.3.0'
 
 from typing import Any
 

singlestoredb/connection.py

@@ -2,7 +2,10 @@
 """SingleStoreDB connections and cursors."""
 import abc
 import inspect
+import io
+import queue
 import re
+import sys
 import warnings
 import weakref
 from collections.abc import Mapping
@@ -33,6 +36,11 @@ from .config import get_option
 from .utils.results import Description
 from .utils.results import Result
 
+if sys.version_info < (3, 10):
+    InfileQueue = queue.Queue
+else:
+    InfileQueue = queue.Queue[Union[bytes, str]]
+
 
 # DB-API settings
 apilevel = '2.0'
@@ -496,6 +504,14 @@ class Cursor(metaclass=abc.ABCMeta):
     def execute(
         self, query: str,
         args: Optional[Union[Sequence[Any], Dict[str, Any], Any]] = None,
+        infile_stream: Optional[  # type: ignore
+            Union[
+                io.RawIOBase,
+                io.TextIOBase,
+                Iterator[Union[bytes, str]],
+                InfileQueue,
+            ]
+        ] = None,
     ) -> int:
         """
         Execute a SQL statement.
@@ -510,6 +526,8 @@ class Cursor(metaclass=abc.ABCMeta):
             The SQL statement to execute
         args : Sequence or dict, optional
             Parameters to substitute into the SQL code
+        infile_stream : io.RawIOBase or io.TextIOBase or Iterator[bytes|str], optional
+            Data stream for ``LOCAL INFILE`` statement
 
         Examples
         --------
@@ -1339,7 +1357,8 @@ def connect(
     autocommit : bool, optional
         Enable autocommits
     results_type : str, optional
-        The form of the query results: tuples, namedtuples, dicts
+        The form of the query results: tuples, namedtuples, dicts,
+        numpy, polars, pandas, arrow
     results_format : str, optional
         Deprecated. This option has been renamed to results_type.
     program_name : str, optional

singlestoredb/http/connection.py

@@ -3,6 +3,7 @@
 import datetime
 import decimal
 import functools
+import io
 import json
 import math
 import os
@@ -420,6 +421,14 @@ class Cursor(connection.Cursor):
     def execute(
         self, query: str,
         args: Optional[Union[Sequence[Any], Dict[str, Any]]] = None,
+        infile_stream: Optional[  # type: ignore
+            Union[
+                io.RawIOBase,
+                io.TextIOBase,
+                Iterable[Union[bytes, str]],
+                connection.InfileQueue,
+            ]
+        ] = None,
     ) -> int:
         """
         Execute a SQL statement.
@@ -432,7 +441,7 @@ class Cursor(connection.Cursor):
             Parameters to substitute into the SQL code
 
         """
-        return self._execute(query, args)
+        return self._execute(query, args, infile_stream=infile_stream)
 
     def _validate_param_subs(
         self, query: str,
@@ -496,6 +505,14 @@ class Cursor(connection.Cursor):
         self, oper: str,
         params: Optional[Union[Sequence[Any], Dict[str, Any]]] = None,
         is_callproc: bool = False,
+        infile_stream: Optional[  # type: ignore
+            Union[
+                io.RawIOBase,
+                io.TextIOBase,
+                Iterable[Union[bytes, str]],
+                connection.InfileQueue,
+            ]
+        ] = None,
     ) -> int:
         self._descriptions = []
         self._schemas = []

singlestoredb/mysql/connection.py

@@ -5,12 +5,15 @@
 # https://dev.mysql.com/doc/refman/5.5/en/error-handling.html
 import errno
 import functools
+import io
 import os
+import queue
 import socket
 import struct
 import sys
 import traceback
 import warnings
+from typing import Iterable
 
 try:
     import _singlestoredb_accel
@@ -353,6 +356,7 @@ class Connection(BaseConnection):
             )
 
         self._local_infile = bool(local_infile)
+        self._local_infile_stream = None
         if self._local_infile:
             client_flag |= CLIENT.LOCAL_FILES
         if multi_statements:
@@ -843,7 +847,7 @@ class Connection(BaseConnection):
         return self.cursorclass(self)
 
     # The following methods are INTERNAL USE ONLY (called from Cursor)
-    def query(self, sql, unbuffered=False):
+    def query(self, sql, unbuffered=False, infile_stream=None):
         """
         Run a query on the server.
 
@@ -859,8 +863,10 @@ class Connection(BaseConnection):
         else:
             if isinstance(sql, str):
                 sql = sql.encode(self.encoding, 'surrogateescape')
+            self._local_infile_stream = infile_stream
             self._execute_command(COMMAND.COM_QUERY, sql)
             self._affected_rows = self._read_query_result(unbuffered=unbuffered)
+            self._local_infile_stream = None
         return self._affected_rows
 
     def next_result(self, unbuffered=False):
@@ -1871,24 +1877,82 @@ class LoadLocalFile:
     def send_data(self):
         """Send data packets from the local file to the server"""
         if not self.connection._sock:
-            raise err.InterfaceError(0, '')
+            raise err.InterfaceError(0, 'Connection is closed')
+
         conn = self.connection
+        infile = conn._local_infile_stream
+
+        # 16KB is efficient enough
+        packet_size = min(conn.max_allowed_packet, 16 * 1024)
 
         try:
-            with open(self.filename, 'rb') as open_file:
-                packet_size = min(
-                    conn.max_allowed_packet, 16 * 1024,
-                )  # 16KB is efficient enough
-                while True:
-                    chunk = open_file.read(packet_size)
-                    if not chunk:
-                        break
-                    conn.write_packet(chunk)
-        except OSError:
-            raise err.OperationalError(
-                ER.FILE_NOT_FOUND,
-                f"Can't find file '{self.filename}'",
-            )
+
+            if self.filename in [':stream:', b':stream:']:
+
+                if infile is None:
+                    raise err.OperationalError(
+                        ER.FILE_NOT_FOUND,
+                        ':stream: specified for LOCAL INFILE, but no stream was supplied',
+                    )
+
+                # Binary IO
+                elif isinstance(infile, io.RawIOBase):
+                    while True:
+                        chunk = infile.read(packet_size)
+                        if not chunk:
+                            break
+                        conn.write_packet(chunk)
+
+                # Text IO
+                elif isinstance(infile, io.TextIOBase):
+                    while True:
+                        chunk = infile.read(packet_size)
+                        if not chunk:
+                            break
+                        conn.write_packet(chunk.encode('utf8'))
+
+                # Iterable of bytes or str
+                elif isinstance(infile, Iterable):
+                    for chunk in infile:
+                        if not chunk:
+                            continue
+                        if isinstance(chunk, str):
+                            conn.write_packet(chunk.encode('utf8'))
+                        else:
+                            conn.write_packet(chunk)
+
+                # Queue (empty value ends the iteration)
+                elif isinstance(infile, queue.Queue):
+                    while True:
+                        chunk = infile.get()
+                        if not chunk:
+                            break
+                        if isinstance(chunk, str):
+                            conn.write_packet(chunk.encode('utf8'))
+                        else:
+                            conn.write_packet(chunk)
+
+                else:
+                    raise err.OperationalError(
+                        ER.FILE_NOT_FOUND,
+                        ':stream: specified for LOCAL INFILE, ' +
+                        f'but stream type is unrecognized: {infile}',
+                    )
+
+            else:
+                try:
+                    with open(self.filename, 'rb') as open_file:
+                        while True:
+                            chunk = open_file.read(packet_size)
+                            if not chunk:
+                                break
+                            conn.write_packet(chunk)
+                except OSError:
+                    raise err.OperationalError(
+                        ER.FILE_NOT_FOUND,
+                        f"Can't find file '{self.filename!s}'",
+                    )
+
         finally:
             if not conn._closed:
                 # send the empty packet to signify we are done sending data

singlestoredb/mysql/cursors.py

@@ -178,7 +178,7 @@ class Cursor(BaseCursor):
 
         return query
 
-    def execute(self, query, args=None):
+    def execute(self, query, args=None, infile_stream=None):
         """
         Execute a query.
 
@@ -192,6 +192,8 @@ class Cursor(BaseCursor):
             Query to execute.
         args : Sequence[Any] or Dict[str, Any] or Any, optional
             Parameters used with query. (optional)
+        infile_stream : io.BytesIO or Iterator[bytes], optional
+            Data stream for ``LOCAL INFILE`` statements
 
         Returns
         -------
@@ -205,7 +207,7 @@ class Cursor(BaseCursor):
 
         query = self.mogrify(query, args)
 
-        result = self._query(query)
+        result = self._query(query, infile_stream=infile_stream)
         self._executed = query
         return result
 
@@ -387,10 +389,10 @@ class Cursor(BaseCursor):
             raise IndexError('out of range')
         self._rownumber = r
 
-    def _query(self, q):
+    def _query(self, q, infile_stream=None):
         conn = self._get_db()
         self._clear_result()
-        conn.query(q)
+        conn.query(q, infile_stream=infile_stream)
         self._do_get_result()
         return self.rowcount
 
@@ -680,10 +682,10 @@ class SSCursor(Cursor):
 
     __del__ = close
 
-    def _query(self, q):
+    def _query(self, q, infile_stream=None):
         conn = self._get_db()
         self._clear_result()
-        conn.query(q, unbuffered=True)
+        conn.query(q, unbuffered=True, infile_stream=infile_stream)
         self._do_get_result()
         return self.rowcount
 

singlestoredb/utils/results.py

@@ -515,6 +515,8 @@ _schema_converters: Dict[
     'namedtuples': _no_schema,
     'dict': _no_schema,
     'dicts': _no_schema,
+    'structsequence': _no_schema,
+    'structsequences': _no_schema,
     'numpy': _description_to_numpy_schema,
     'pandas': _description_to_numpy_schema,
     'polars': _description_to_polars_schema,
@@ -578,4 +580,6 @@ def get_schema(
         for the given format type
 
     """
-    return _schema_converters[format](desc) or {}
+    if format in _schema_converters:
+        return _schema_converters[format](desc) or {}
+    return {}

{singlestoredb-1.2.0.dist-info → singlestoredb-1.3.0.dist-info}/METADATA

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

{singlestoredb-1.2.0.dist-info → singlestoredb-1.3.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-_singlestoredb_accel.abi3.so,sha256=U96QrfE_1sJXFcli1gYDpma-o3AgMQVNQd3Al8w5q8M,206605
-singlestoredb-1.2.0.dist-info/RECORD,,
-singlestoredb-1.2.0.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-1.2.0.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
-singlestoredb-1.2.0.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
-singlestoredb-1.2.0.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
-singlestoredb-1.2.0.dist-info/METADATA,sha256=UBRxeu9w0pspytg7fNSvYhCbTglBsDtvje-nEKczlao,5570
+_singlestoredb_accel.abi3.so,sha256=UxjCadI_UT1uCyJFel3lMm2PEB7c8-x409GIYdtoVjY,206605
+singlestoredb-1.3.0.dist-info/RECORD,,
+singlestoredb-1.3.0.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-1.3.0.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
+singlestoredb-1.3.0.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
+singlestoredb-1.3.0.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
+singlestoredb-1.3.0.dist-info/METADATA,sha256=PLBzts-ZoiYv7LrQvRGSKycJ9DJ7W2KsnLMDkFJ_1LA,5570
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=H4pQxqBEGGCmVHg40VEnAdqGXHun8ougZzj-Ed6ZLH4,11822
-singlestoredb/__init__.py,sha256=rZ6NwQ45H3V4coeT30CgKFhUs7ujcmiZoca1Hw3j8_8,1634
+singlestoredb/__init__.py,sha256=juu9u0zHHRDvLViF83NCU4pBRNBPEDElq5-VpoIoErg,1634
 singlestoredb/types.py,sha256=FIqO1A7e0Gkk7ITmIysBy-P5S--ItbMSlYvblzqGS30,9969
-singlestoredb/connection.py,sha256=1ghx5w0VvOyf5JABD9iTC3wEJrzAsDXlzJEaIqWlsnY,44392
+singlestoredb/connection.py,sha256=aLc9_9q5pJ2DCHbmBkWP-4KlDPGoCyB92yaQfNtcnSA,44958
 singlestoredb/pytest.py,sha256=OyF3BO9mgxenifYhOihnzGk8WzCJ_zN5_mxe8XyFPOc,9074
 singlestoredb/exceptions.py,sha256=HuoA6sMRL5qiCiee-_5ddTGmFbYC9Euk8TYUsh5GvTw,3234
 singlestoredb/converters.py,sha256=t1hRMZfccWJs_WyOw-W-Kh87fxsOkpOnKXAeh_Nr-zU,20681
@@ -53,7 +53,7 @@ singlestoredb/management/workspace.py,sha256=jHNTZ_zqi80U20BS6ezJX5DLZxWX_68fV1G
 singlestoredb/management/manager.py,sha256=m8I5zTmEqjMCEE4fmmVdzza8TvofhnIHvO0np0WH-Y8,8810
 singlestoredb/management/billing_usage.py,sha256=9ighjIpcopgIyJOktBYQ6pahBZmWGHOPyyCW4gu9FGs,3735
 singlestoredb/utils/config.py,sha256=m3Xn6hsbdKyLufSnbokhFJ9Vfaz9Qpkj1IEnIiH9oJQ,24503
-singlestoredb/utils/results.py,sha256=Hs34Q35UQzPQuTZ-mwidNJVU26WlQmSNqfpKwQ2XUfc,15153
+singlestoredb/utils/results.py,sha256=bJtaUaDiFq26IsPAKZ2FHGB7csMn94EAxLKrP4HaEEA,15277
 singlestoredb/utils/convert_rows.py,sha256=A6up7a8Bq-eV2BXdGCotQviqp1Q7XdJ2MA9339hLYVQ,1816
 singlestoredb/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 singlestoredb/utils/dtypes.py,sha256=1qUiB4BJFJ7rOVh2mItQssYbJupV7uq1x8uwX-Eu2Ks,5898
@@ -61,12 +61,12 @@ singlestoredb/utils/xdict.py,sha256=S9HKgrPrnu_6b7iOwa2KrW8CmU1Uqx0BWdEyogFzWbE,
 singlestoredb/utils/debug.py,sha256=0JiLA37u_9CKiDGiN9BK_PtFMUku3vIcNjERWaTNRSU,349
 singlestoredb/utils/mogrify.py,sha256=-a56IF70U6CkfadeaZgfjRSVsAD3PuqRrzPpjZlgbwY,4050
 singlestoredb/http/__init__.py,sha256=A_2ZUCCpvRYIA6YDpPy57wL5R1eZ5SfP6I1To5nfJ2s,912
-singlestoredb/http/connection.py,sha256=RUPTgbnrvlp_fRCgoFl0og_-35TSVAAjkxUFctO8DWw,38818
+singlestoredb/http/connection.py,sha256=HUYzgiGYRUblHhgDi-ghfXykGkdB9iQ3i_XVvhtqH88,39349
 singlestoredb/mysql/protocol.py,sha256=2GG8qTXy5npqo7z2D2K5T0S8PtoUOS-hFDEXy8VConw,14451
-singlestoredb/mysql/cursors.py,sha256=Drdy3WN5SRTdAa7KQTefDobTDKCUTtto1GiwIbWfFHc,26527
+singlestoredb/mysql/cursors.py,sha256=Eqe7jITRvOo4P_TxIarTumg_2PG1DcCfZ4Uo9IFdDa8,26794
 singlestoredb/mysql/__init__.py,sha256=olUTAvkiERhDW41JXQMawkg-i0tvBEkoTkII1tt6lxU,4492
 singlestoredb/mysql/times.py,sha256=2j7purNVnJmjhOUgwUze-r3kNlCWqxjXj-jtqOzBfZI,463
-singlestoredb/mysql/connection.py,sha256=5gXm2UxtUmAbQnp0LzRuGO4MTEX1xFDCLpKtjwj43j8,67884
+singlestoredb/mysql/connection.py,sha256=WZZl3cWLsyuKlQfB3CzXRmXnAXcTLDBUG8eAViYEwDw,70301
 singlestoredb/mysql/charset.py,sha256=-FlONDS_oAUF5B3mIgeHBPb_SCt4zHD33arUeBNctU0,10510
 singlestoredb/mysql/converters.py,sha256=CVe8SDmjbIAhy1xpQ2N5OKWw6t5eWpw-EU3QTlA0Hh0,7500
 singlestoredb/mysql/optionfile.py,sha256=DqL-rOQcqQncD5eVbPRkwZqo7Pj3Vh40VLx3E_e87TU,655