singlestoredb 1.14.1__py3-none-any.whl → 1.14.2__py3-none-any.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.14.1'
+__version__ = '1.14.2'
 
 from typing import Any
 
@@ -31,14 +31,18 @@ from .types import (
     Date, Time, Timestamp, DateFromTicks, TimeFromTicks, TimestampFromTicks,
     Binary, STRING, BINARY, NUMBER, DATETIME, ROWID,
 )
-from .vectorstore import (
-    vector_db, IndexInterface, IndexList, IndexModel, MatchTypedDict,
-    Metric, IndexStatsTypedDict, NamespaceStatsTypedDict, Vector,
-    VectorDictMetadataValue, VectorMetadataTypedDict, VectorTuple,
-    VectorTupleWithMetadata, DeletionProtection, AndFilter, EqFilter,
-    ExactMatchFilter, FilterTypedDict, GteFilter, GtFilter, InFilter,
-    LteFilter, LtFilter, NeFilter, NinFilter, OrFilter, SimpleFilter,
-)
+# These are only loaded if the singlestore-vectorstore package is available
+try:
+    from .vectorstore import (
+        vector_db, IndexInterface, IndexList, IndexModel, MatchTypedDict,
+        Metric, IndexStatsTypedDict, NamespaceStatsTypedDict, Vector,
+        VectorDictMetadataValue, VectorMetadataTypedDict, VectorTuple,
+        VectorTupleWithMetadata, DeletionProtection, AndFilter, EqFilter,
+        ExactMatchFilter, FilterTypedDict, GteFilter, GtFilter, InFilter,
+        LteFilter, LtFilter, NeFilter, NinFilter, OrFilter, SimpleFilter,
+    )
+except (ImportError, ModuleNotFoundError):
+    pass
 
 
 #

singlestoredb/fusion/handler.py

@@ -33,7 +33,7 @@ CORE_GRAMMAR = r'''
     close_paren = ws* ")" ws*
     open_repeats = ws* ~r"[\(\[\{]" ws*
     close_repeats = ws* ~r"[\)\]\}]" ws*
-    select = ~r"SELECT"i ws+ ~r".+" ws*
+    statement = ~r"[\s\S]*" ws*
     table = ~r"(?:([A-Za-z0-9_\-]+)|`([^\`]+)`)(?:\.(?:([A-Za-z0-9_\-]+)|`([^\`]+)`))?" ws*
     column = ~r"(?:([A-Za-z0-9_\-]+)|`([^\`]+)`)(?:\.(?:([A-Za-z0-9_\-]+)|`([^\`]+)`))?" ws*
     link_name = ~r"(?:([A-Za-z0-9_\-]+)|`([^\`]+)`)(?:\.(?:([A-Za-z0-9_\-]+)|`([^\`]+)`))?" ws*
@@ -77,6 +77,7 @@ BUILTINS = {
     '<file-type>': r'''
     file_type = { FILE | FOLDER }
     ''',
+    '<statement>': '',
 }
 
 BUILTIN_DEFAULTS = {  # type: ignore
@@ -627,6 +628,18 @@ class SQLHandler(NodeVisitor):
         cls.compile()
         registry.register_handler(cls, overwrite=overwrite)
 
+    def create_result(self) -> result.FusionSQLResult:
+        """
+        Create a new result object.
+
+        Returns
+        -------
+        FusionSQLResult
+            A new result object for this handler
+
+        """
+        return result.FusionSQLResult()
+
     def execute(self, sql: str) -> result.FusionSQLResult:
         """
         Parse the SQL and invoke the handler method.
@@ -746,9 +759,9 @@ class SQLHandler(NodeVisitor):
         _, out, *_ = visited_children
         return out
 
-    def visit_select(self, node: Node, visited_children: Iterable[Any]) -> Any:
-        out = ' '.join(flatten(visited_children))
-        return {'select': out}
+    def visit_statement(self, node: Node, visited_children: Iterable[Any]) -> Any:
+        out = ' '.join(flatten(visited_children)).strip()
+        return {'statement': out}
 
     def visit_order_by(self, node: Node, visited_children: Iterable[Any]) -> Any:
         """Handle ORDER BY."""

singlestoredb/management/export.py

@@ -215,7 +215,7 @@ class ExportService(object):
                 msg='Export ID is not set. You must start the export first.',
             )
 
-        self._manager._post(
+        self._manager._delete(
             f'workspaceGroups/{self.workspace_group.id}/egress/dropTableEgress',
             json=dict(egressID=self.export_id),
         )

singlestoredb/tests/test_fusion.py

@@ -499,7 +499,10 @@ class TestJobsFusion(unittest.TestCase):
     @classmethod
     def tearDownClass(cls):
         for job_id in cls.job_ids:
-            cls.manager.organizations.current.jobs.delete(job_id)
+            try:
+                cls.manager.organizations.current.jobs.delete(job_id)
+            except Exception:
+                pass
         if cls.workspace_group is not None:
             cls.workspace_group.terminate(force=True)
         cls.manager = None

singlestoredb/tests/test_management.py

@@ -397,13 +397,16 @@ class TestStage(unittest.TestCase):
     def test_upload_file(self):
         st = self.wg.stage
 
+        upload_test_sql = f'upload_test_{id(self)}.sql'
+        upload_test2_sql = f'upload_test2_{id(self)}.sql'
+
         root = st.info('/')
         assert str(root.path) == '/'
         assert root.type == 'directory'
 
         # Upload file
-        f = st.upload_file(TEST_DIR / 'test.sql', 'upload_test.sql')
-        assert str(f.path) == 'upload_test.sql'
+        f = st.upload_file(TEST_DIR / 'test.sql', upload_test_sql)
+        assert str(f.path) == upload_test_sql
         assert f.type == 'file'
 
         # Download and compare to original
@@ -412,15 +415,15 @@ class TestStage(unittest.TestCase):
 
         # Make sure we can't overwrite
         with self.assertRaises(OSError):
-            st.upload_file(TEST_DIR / 'test.sql', 'upload_test.sql')
+            st.upload_file(TEST_DIR / 'test.sql', upload_test_sql)
 
         # Force overwrite with new content; use file object this time
         f = st.upload_file(
             open(TEST_DIR / 'test2.sql', 'r'),
-            'upload_test.sql',
+            upload_test_sql,
             overwrite=True,
         )
-        assert str(f.path) == 'upload_test.sql'
+        assert str(f.path) == upload_test_sql
         assert f.type == 'file'
 
         # Verify new content
@@ -442,9 +445,9 @@ class TestStage(unittest.TestCase):
         # Write file into folder
         f = st.upload_file(
             TEST_DIR / 'test2.sql',
-            os.path.join(lib.path, 'upload_test2.sql'),
+            os.path.join(lib.path, upload_test2_sql),
         )
-        assert str(f.path) == 'lib/upload_test2.sql'
+        assert str(f.path) == 'lib/' + upload_test2_sql
         assert f.type == 'file'
 
     def test_open(self):
@@ -928,7 +931,10 @@ class TestJob(unittest.TestCase):
     @classmethod
     def tearDownClass(cls):
         for job_id in cls.job_ids:
-            cls.manager.organizations.current.jobs.delete(job_id)
+            try:
+                cls.manager.organizations.current.jobs.delete(job_id)
+            except Exception:
+                pass
         if cls.workspace_group is not None:
             cls.workspace_group.terminate(force=True)
         cls.workspace_group = None
@@ -1061,6 +1067,8 @@ class TestFileSpaces(unittest.TestCase):
         cls.shared_space = None
 
     def test_upload_file(self):
+        upload_test_ipynb = f'upload_test_{id(self)}.ipynb'
+
         for space in [self.personal_space, self.shared_space]:
             root = space.info('/')
             assert str(root.path) == '/'
@@ -1069,9 +1077,9 @@ class TestFileSpaces(unittest.TestCase):
             # Upload files
             f = space.upload_file(
                 TEST_DIR / 'test.ipynb',
-                'upload_test.ipynb',
+                upload_test_ipynb,
             )
-            assert str(f.path) == 'upload_test.ipynb'
+            assert str(f.path) == upload_test_ipynb
             assert f.type == 'notebook'
 
             # Download and compare to original
@@ -1082,15 +1090,15 @@ class TestFileSpaces(unittest.TestCase):
             with self.assertRaises(OSError):
                 space.upload_file(
                     TEST_DIR / 'test.ipynb',
-                    'upload_test.ipynb',
+                    upload_test_ipynb,
                 )
 
             # Force overwrite with new content
             f = space.upload_file(
                 TEST_DIR / 'test2.ipynb',
-                'upload_test.ipynb', overwrite=True,
+                upload_test_ipynb, overwrite=True,
             )
-            assert str(f.path) == 'upload_test.ipynb'
+            assert str(f.path) == upload_test_ipynb
             assert f.type == 'notebook'
 
             # Verify new content
@@ -1102,9 +1110,11 @@ class TestFileSpaces(unittest.TestCase):
                 space.upload_folder(TEST_DIR, 'test')
 
             # Cleanup
-            space.remove('upload_test.ipynb')
+            space.remove(upload_test_ipynb)
 
     def test_upload_file_io(self):
+        upload_test_ipynb = f'upload_test_{id(self)}.ipynb'
+
         for space in [self.personal_space, self.shared_space]:
             root = space.info('/')
             assert str(root.path) == '/'
@@ -1113,9 +1123,9 @@ class TestFileSpaces(unittest.TestCase):
             # Upload files
             f = space.upload_file(
                 open(TEST_DIR / 'test.ipynb', 'r'),
-                'upload_test.ipynb',
+                upload_test_ipynb,
             )
-            assert str(f.path) == 'upload_test.ipynb'
+            assert str(f.path) == upload_test_ipynb
             assert f.type == 'notebook'
 
             # Download and compare to original
@@ -1126,15 +1136,15 @@ class TestFileSpaces(unittest.TestCase):
             with self.assertRaises(OSError):
                 space.upload_file(
                     open(TEST_DIR / 'test.ipynb', 'r'),
-                    'upload_test.ipynb',
+                    upload_test_ipynb,
                 )
 
             # Force overwrite with new content
             f = space.upload_file(
                 open(TEST_DIR / 'test2.ipynb', 'r'),
-                'upload_test.ipynb', overwrite=True,
+                upload_test_ipynb, overwrite=True,
             )
-            assert str(f.path) == 'upload_test.ipynb'
+            assert str(f.path) == upload_test_ipynb
             assert f.type == 'notebook'
 
             # Verify new content
@@ -1146,7 +1156,7 @@ class TestFileSpaces(unittest.TestCase):
                 space.upload_folder(TEST_DIR, 'test')
 
             # Cleanup
-            space.remove('upload_test.ipynb')
+            space.remove(upload_test_ipynb)
 
     def test_open(self):
         for space in [self.personal_space, self.shared_space]:

{singlestoredb-1.14.1.dist-info → singlestoredb-1.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.14.1
+Version: 1.14.2
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore
@@ -19,7 +19,6 @@ Requires-Dist: build
 Requires-Dist: parsimonious
 Requires-Dist: requests
 Requires-Dist: setuptools
-Requires-Dist: singlestore-vectorstore>=0.1.2
 Requires-Dist: sqlparams
 Requires-Dist: wheel
 Requires-Dist: tomli>=1.1.0; python_version < "3.11"
@@ -44,6 +43,8 @@ Provides-Extra: rsa
 Requires-Dist: cryptography; extra == "rsa"
 Provides-Extra: sqlalchemy
 Requires-Dist: sqlalchemy-singlestoredb>=1.0.0; extra == "sqlalchemy"
+Provides-Extra: vectorstore
+Requires-Dist: singlestore-vectorstore>=0.1.2; extra == "vectorstore"
 
 # <img src="https://github.com/singlestore-labs/singlestoredb-python/blob/main/resources/singlestore-logo.png" height="60" valign="middle"/> SingleStoreDB Python SDK
 

{singlestoredb-1.14.1.dist-info → singlestoredb-1.14.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-singlestoredb/__init__.py,sha256=EzlSL8GTLh0YsZT6nfBumDkUyKFIwMdORoJ_z5Xx8TI,2091
+singlestoredb/__init__.py,sha256=LXawJyI2-AilQxUSQ8IJnDUiwZk5nrB-FGGpHWcToGI,2256
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=dayUWwSy2YdgmhF8tzH-7FwFpwon5bgX_VeX-Yu5ia4,12969
 singlestoredb/connection.py,sha256=ELk3-UpM6RaB993aIt08MydKiiDnejHQ1s8EFiacrAI,46055
@@ -36,7 +36,7 @@ singlestoredb/functions/ext/rowdat_1.py,sha256=SlXbJ2042jEoaXw81y5llw1625w0aU2nZ
 singlestoredb/functions/ext/utils.py,sha256=2-B8YU_Iekv8JcpI-ochs9TIeuyatLaLAH-AyYyUUIg,5311
 singlestoredb/fusion/__init__.py,sha256=Qo7SuqGw-l-vE8-EI2jhm6hXJkYfOLUKIws9c7LFNX0,356
 singlestoredb/fusion/graphql.py,sha256=ZA3HcDq5rER-dCEavwTqnF7KM0D2LCYIY7nLQk7lSso,5207
-singlestoredb/fusion/handler.py,sha256=HEW83De1zj94hvG7rbqlOszIIgBKiag0UGO5I0WoJ6A,27400
+singlestoredb/fusion/handler.py,sha256=M5iyNP4zOaGqUqnZg_b5xhRE-8tHgfZSHDH0zKTiJmE,27692
 singlestoredb/fusion/registry.py,sha256=jjdRTYZ3ylhy6gAoW5xBj0tkxGFBT-2yLQ0tztTgDIY,6112
 singlestoredb/fusion/result.py,sha256=p5I65C-Dhhl1yeZwetXXZabwritr8Ph2mFvJJ3ovcBM,11790
 singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -55,7 +55,7 @@ singlestoredb/magics/run_shared.py,sha256=SI8dCBRMaGn-xZU7dto4jsAqKBi-Ll14htUsMU
 singlestoredb/management/__init__.py,sha256=ofNTPCdkZ1dS_aX2aUujd8aMHQi8Lle5Ced0aaO3RH4,269
 singlestoredb/management/billing_usage.py,sha256=9ighjIpcopgIyJOktBYQ6pahBZmWGHOPyyCW4gu9FGs,3735
 singlestoredb/management/cluster.py,sha256=h75grXSxq4Anr4RxwKxcZW4TkWJ4bFg_ql5iRWCNLdQ,14405
-singlestoredb/management/export.py,sha256=VrpGyHVUadtJfprcsi9N2SNS6dunDfA1EV2SfWaPlmA,9081
+singlestoredb/management/export.py,sha256=yR-yZUE9USFrP5OR_5iLFqEc8GLiKDQypSEp08CmT5k,9083
 singlestoredb/management/files.py,sha256=89IhpGw9WdwxVeksavHEDMVn9wb_jxb-utZuIDqkLHw,30477
 singlestoredb/management/inference_api.py,sha256=L6eFqaUaPugF_cmrZ4xlArj8CIv25vWqQs1vwgKPEF4,2583
 singlestoredb/management/job.py,sha256=4-xLWzbE8odQogVVaFer80UEoTAZY1T28VZ9Ug4rbmM,24611
@@ -125,9 +125,9 @@ singlestoredb/tests/test_dbapi.py,sha256=IKq5Hcwx8WikASP8_AB5fo3TXv7ryWPCVGonoly
 singlestoredb/tests/test_exceptions.py,sha256=tfr_8X2w1UmG4nkSBzWGB0C7ehrf1GAVgj6_ODaG-TM,1131
 singlestoredb/tests/test_ext_func.py,sha256=s1k1cBxQ7vIS1zSrKGkKTgLZE1DT_Rqj-3VNSCSv68I,43261
 singlestoredb/tests/test_ext_func_data.py,sha256=yTADD93nPxX6_rZXXLZaOWEI_yPvYyir9psn5PK9ctU,47695
-singlestoredb/tests/test_fusion.py,sha256=EH1mRwdX2Fajsq6x2l0gBhH1YhcxtvDGIKC9HJ4sDbQ,50521
+singlestoredb/tests/test_fusion.py,sha256=7YQ_nOQoV_7yD4OEpJz2Ov-zok-cBFK9IOJ3FgZ0xo0,50593
 singlestoredb/tests/test_http.py,sha256=RXasTqBWRn__omj0eLFTJYIbZjd0PPdIV2d4Cqz0MC8,8580
-singlestoredb/tests/test_management.py,sha256=IGwBijg5NnSSGVNjbtW2m7wVv2b0SFdvfW4sBXTPLP0,45571
+singlestoredb/tests/test_management.py,sha256=rzM5xZllXys6OzyFBxOieYSn4kDGCwWuyIkJWsPXvAY,45847
 singlestoredb/tests/test_plugin.py,sha256=qpO9wmWc62VaijN1sJ97YSYIX7I7Y5C6sY-WzwrutDQ,812
 singlestoredb/tests/test_results.py,sha256=wg93sujwt-R9_eJCgSCElgAZhLDkIiAo3qPkPydOv78,6582
 singlestoredb/tests/test_types.py,sha256=jqoAaSjhbgwB3vt0KsTcl7XBWoMMIa0mPFKhEi5bBjo,4500
@@ -148,9 +148,9 @@ singlestoredb/utils/results.py,sha256=bJtaUaDiFq26IsPAKZ2FHGB7csMn94EAxLKrP4HaEE
 singlestoredb/utils/xdict.py,sha256=S9HKgrPrnu_6b7iOwa2KrW8CmU1Uqx0BWdEyogFzWbE,12896
 sqlx/__init__.py,sha256=aBYiU8DZXCogvWu3yWafOz7bZS5WWwLZXj7oL0dXGyU,85
 sqlx/magic.py,sha256=JsS9_9aBFaOt91Torm1JPN0c8qB2QmYJmNSKtbSQIY0,3509
-singlestoredb-1.14.1.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-1.14.1.dist-info/METADATA,sha256=PEUJtCAYwCFmN7FKYnqwkV3o8Ai9_eVYbS3D4dyY1_8,5734
-singlestoredb-1.14.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-singlestoredb-1.14.1.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
-singlestoredb-1.14.1.dist-info/top_level.txt,sha256=DfFGz7bM4XrshloiCeTABgylT3BUnS8T5pJam3ewT6Q,19
-singlestoredb-1.14.1.dist-info/RECORD,,
+singlestoredb-1.14.2.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-1.14.2.dist-info/METADATA,sha256=WgSCJwj4A5uNxFytXq-Xg7zoyt0zXy_s5q7FdcPrJQE,5786
+singlestoredb-1.14.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+singlestoredb-1.14.2.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
+singlestoredb-1.14.2.dist-info/top_level.txt,sha256=DfFGz7bM4XrshloiCeTABgylT3BUnS8T5pJam3ewT6Q,19
+singlestoredb-1.14.2.dist-info/RECORD,,