singlestoredb 1.14.1__tar.gz → 1.14.2__tar.gz

{singlestoredb-1.14.1/singlestoredb.egg-info → singlestoredb-1.14.2}/PKG-INFO

@@ -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
@@ -23,6 +23,7 @@ Provides-Extra: kerberos
 Provides-Extra: pytest
 Provides-Extra: rsa
 Provides-Extra: sqlalchemy
+Provides-Extra: vectorstore
 License-File: LICENSE
 
 # <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 → singlestoredb-1.14.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = singlestoredb
-version = 1.14.1
+version = 1.14.2
 description = Interface to the SingleStoreDB database and workspace management APIs
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -24,7 +24,6 @@ install_requires =
 	parsimonious
 	requests
 	setuptools
-	singlestore-vectorstore>=0.1.2
 	sqlparams
 	wheel
 	tomli>=1.1.0;python_version < '3.11'
@@ -68,6 +67,8 @@ rsa =
 	cryptography
 sqlalchemy = 
 	sqlalchemy-singlestoredb>=1.0.0
+vectorstore = 
+	singlestore-vectorstore>=0.1.2
 
 [options.package_data]
 * = 

{singlestoredb-1.14.1 → singlestoredb-1.14.2}/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-1.14.1 → singlestoredb-1.14.2}/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-1.14.1 → singlestoredb-1.14.2}/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-1.14.1 → singlestoredb-1.14.2}/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-1.14.1 → singlestoredb-1.14.2}/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 → singlestoredb-1.14.2/singlestoredb.egg-info}/PKG-INFO

@@ -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
@@ -23,6 +23,7 @@ Provides-Extra: kerberos
 Provides-Extra: pytest
 Provides-Extra: rsa
 Provides-Extra: sqlalchemy
+Provides-Extra: vectorstore
 License-File: LICENSE
 
 # <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 → singlestoredb-1.14.2}/singlestoredb.egg-info/requires.txt

@@ -3,7 +3,6 @@ build
 parsimonious
 requests
 setuptools
-singlestore-vectorstore>=0.1.2
 sqlparams
 wheel
 
@@ -40,3 +39,6 @@ cryptography
 
 [sqlalchemy]
 sqlalchemy-singlestoredb>=1.0.0
+
+[vectorstore]
+singlestore-vectorstore>=0.1.2