singlestoredb 1.0.0__cp38-abi3-macosx_10_9_universal2.whl → 1.0.2__cp38-abi3-macosx_10_9_universal2.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.0.0'
+__version__ = '1.0.2'
 
 from typing import Any
 

singlestoredb/functions/ext/asgi.py

@@ -18,11 +18,12 @@ An example of starting a server is shown below.
 
 Example
 -------
-$ SINGLESTOREDB_EXT_FUNCTIONS='myfuncs.[percentage_90,percentage_95]' \
+$ SINGLESTOREDB_EXT_FUNCTIONS='myfuncs.[percentile_90,percentile_95]' \
     uvicorn --factory singlestoredb.functions.ext:create_app
 
 '''
 import importlib.util
+import io
 import itertools
 import os
 import urllib
@@ -184,7 +185,7 @@ def make_func(name: str, func: Callable[..., Any]) -> Callable[..., Any]:
     return do_func
 
 
-def create_app(
+def create_app(  # noqa: C901
     functions: Optional[
         Union[
             str,
@@ -539,4 +540,44 @@ def create_app(
 
     app.drop_functions = drop_functions  # type: ignore
 
+    async def call(
+        name: str,
+        data_in: io.BytesIO,
+        data_out: io.BytesIO,
+        data_format: str = 'rowdat_1',
+        data_version: str = '1.0',
+    ) -> None:
+
+        async def receive() -> Dict[str, Any]:
+            return dict(body=data_in.read())
+
+        async def send(content: Dict[str, Any]) -> None:
+            status = content.get('status', 200)
+            if status != 200:
+                raise KeyError(f'error occurred when calling `{name}`: {status}')
+            data_out.write(content.get('body', b''))
+
+        accepts = dict(
+            json=b'application/json',
+            rowdat_1=b'application/octet-stream',
+            arrow=b'application/vnd.apache.arrow.file',
+        )
+
+        # Mock an ASGI scope
+        scope = dict(
+            type='http',
+            path='invoke',
+            method='POST',
+            headers={
+                b'content-type': accepts[data_format.lower()],
+                b'accepts': accepts[data_format.lower()],
+                b's2-ef-name': name.encode('utf-8'),
+                b's2-ef-version': data_version.encode('utf-8'),
+            },
+        )
+
+        await app(scope, receive, send)
+
+    app.call = call  # type: ignore
+
     return app

singlestoredb/functions/ext/json.py

@@ -315,8 +315,8 @@ def _dump_vectors(
 
 def dump_pandas(
     returns: List[int],
-    row_ids: List[int],
-    cols: List[Tuple[Any, Any]],
+    row_ids: 'pd.Series[int]',
+    cols: List[Tuple['pd.Series[int]', 'pd.Series[bool]']],
 ) -> bytes:
     '''
     Convert a list of pd.Series of data into JSON format.
@@ -336,6 +336,7 @@ def dump_pandas(
 
     '''
     import pandas as pd
+    row_ids.index = row_ids
     df = pd.concat([row_ids] + [x[0] for x in cols], axis=1)
     return ('{"data": %s}' % df.to_json(orient='values')).encode('utf-8')
 

singlestoredb/fusion/handlers/stage.py

@@ -218,9 +218,9 @@ class DropStageFolderHandler(SQLHandler):
     def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:
         wg = get_workspace_group(params)
         if params['recursive']:
-            wg.stage.rmdir(params['stage_path'])
-        else:
             wg.stage.removedirs(params['stage_path'])
+        else:
+            wg.stage.rmdir(params['stage_path'])
         return None
 
 

singlestoredb/fusion/registry.py

@@ -128,8 +128,6 @@ class ShowFusionCommandsHandler(SQLHandler):
 
         data: List[Tuple[Any, ...]] = []
         for _, v in sorted(_handlers.items()):
-            if v is type(self):
-                continue
             data.append((v.help.lstrip(),))
 
         res.set_rows(data)

singlestoredb/management/__init__.py

@@ -2,4 +2,5 @@
 from .cluster import manage_cluster
 from .manager import get_organization
 from .manager import get_token
+from .workspace import get_secret
 from .workspace import manage_workspaces

singlestoredb/management/manager.py

@@ -57,14 +57,15 @@ class Manager(object):
         base_url: Optional[str] = None, *, organization_id: Optional[str] = None,
     ):
         from .. import __version__ as client_version
-        access_token = (
+        new_access_token = (
             access_token or get_token()
         )
-        if not access_token:
+        if not new_access_token:
             raise ManagementError(msg='No management token was configured.')
+        self._is_jwt = not access_token and new_access_token and is_jwt(new_access_token)
         self._sess = requests.Session()
         self._sess.headers.update({
-            'Authorization': f'Bearer {access_token}',
+            'Authorization': f'Bearer {new_access_token}',
             'Content-Type': 'application/json',
             'Accept': 'application/json',
             'User-Agent': f'SingleStoreDB-Python/{client_version}',
@@ -116,6 +117,9 @@ class Manager(object):
         **kwargs: Any,
     ) -> requests.Response:
         """Perform HTTP request."""
+        # Refresh the JWT as needed
+        if self._is_jwt:
+            self._sess.headers.update({'Authorization': f'Bearer {get_token()}'})
         return getattr(self._sess, method.lower())(
             urljoin(self._base_url, path), *args, **kwargs,
         )

singlestoredb/management/workspace.py

@@ -7,6 +7,7 @@ import glob
 import io
 import os
 import re
+import socket
 import time
 from typing import Any
 from typing import BinaryIO
@@ -31,6 +32,11 @@ from .utils import ttl_property
 from .utils import vars_to_str
 
 
+def get_secret(name: str) -> str:
+    """Get a secret from the organization."""
+    return manage_workspaces().organization.get_secret(name).value
+
+
 class StageObject(object):
     """
     Stage file / folder object.
@@ -1334,7 +1340,7 @@ class WorkspaceGroup(object):
     def create_workspace(
         self, name: str, size: Optional[str] = None,
         wait_on_active: bool = False, wait_interval: int = 10,
-        wait_timeout: int = 600,
+        wait_timeout: int = 600, add_endpoint_to_firewall_ranges: bool = True,
     ) -> Workspace:
         """
         Create a new workspace.
@@ -1352,6 +1358,9 @@ class WorkspaceGroup(object):
             if wait=True
         wait_interval : int, optional
             Number of seconds between each polling interval
+        add_endpoint_to_firewall_ranges : bool, optional
+            Should the workspace endpoint be added to the workspace group
+            firewall ranges?
 
         Returns
         -------
@@ -1362,11 +1371,18 @@ class WorkspaceGroup(object):
             raise ManagementError(
                 msg='No workspace manager is associated with this object.',
             )
-        return self._manager.create_workspace(
+
+        out = self._manager.create_workspace(
             name=name, workspace_group=self, size=size, wait_on_active=wait_on_active,
             wait_interval=wait_interval, wait_timeout=wait_timeout,
         )
 
+        if add_endpoint_to_firewall_ranges and out.endpoint is not None:
+            ip_address = '{}/32'.format(socket.gethostbyname(out.endpoint))
+            self.update(firewall_ranges=self.firewall_ranges+[ip_address])
+
+        return out
+
     @property
     def workspaces(self) -> NamedList[Workspace]:
         """Return a list of available workspaces."""

{singlestoredb-1.0.0.dist-info → singlestoredb-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.0.0
+Version: 1.0.2
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore
@@ -38,18 +38,13 @@ Requires-Dist: pytest ; extra == 'pytest'
 Provides-Extra: rsa
 Requires-Dist: cryptography ; extra == 'rsa'
 Provides-Extra: sqlalchemy
-Requires-Dist: sqlalchemy-singlestoredb ; extra == 'sqlalchemy'
+Requires-Dist: sqlalchemy-singlestoredb >=1.0.0 ; extra == 'sqlalchemy'
 
-# <img src="https://github.com/singlestore-labs/singlestoredb-python/blob/main/resources/singlestore-logo.png" height="60" valign="middle"/> SingleStoreDB Python Interface
+# <img src="https://github.com/singlestore-labs/singlestoredb-python/blob/main/resources/singlestore-logo.png" height="60" valign="middle"/> SingleStoreDB Python SDK
 
 This project contains a [DB-API 2.0](https://www.python.org/dev/peps/pep-0249/)
 compatible Python interface to the SingleStore database and workspace management API.
 
-> **Warning**
-> As of version v0.5.0, the parameter substitution syntax has changed from `:1`, `:2`, etc.
-> for list parameters and `:foo`, `:bar`, etc. for dictionary parameters to `%s` and `%(foo)s`,
-> `%(bar)s` etc., respectively.
-
 ## Install
 
 This package can be install from PyPI using `pip`:
@@ -142,17 +137,3 @@ This library is licensed under the [Apache 2.0 License](https://raw.githubuserco
 
 * [SingleStore](https://singlestore.com)
 * [Python](https://python.org)
-
-## User agreement
-
-SINGLESTORE, INC. ("SINGLESTORE") AGREES TO GRANT YOU AND YOUR COMPANY ACCESS TO THIS OPEN SOURCE SOFTWARE CONNECTOR ONLY IF (A) YOU AND YOUR COMPANY REPRESENT AND WARRANT THAT YOU, ON BEHALF OF YOUR COMPANY, HAVE THE AUTHORITY TO LEGALLY BIND YOUR COMPANY AND (B) YOU, ON BEHALF OF YOUR COMPANY ACCEPT AND AGREE TO BE BOUND BY ALL OF THE OPEN SOURCE TERMS AND CONDITIONS APPLICABLE TO THIS OPEN SOURCE CONNECTOR AS SET FORTH BELOW (THIS “AGREEMENT”), WHICH SHALL BE DEFINITIVELY EVIDENCED BY ANY ONE OF THE FOLLOWING MEANS: YOU, ON BEHALF OF YOUR COMPANY, CLICKING THE “DOWNLOAD, “ACCEPTANCE” OR “CONTINUE” BUTTON, AS APPLICABLE OR COMPANY’S INSTALLATION, ACCESS OR USE OF THE OPEN SOURCE CONNECTOR AND SHALL BE EFFECTIVE ON THE EARLIER OF THE DATE ON WHICH THE DOWNLOAD, ACCESS, COPY OR INSTALL OF THE CONNECTOR OR USE ANY SERVICES (INCLUDING ANY UPDATES OR UPGRADES) PROVIDED BY SINGLESTORE.
-BETA SOFTWARE CONNECTOR
-
-Customer Understands and agrees that it is  being granted access to pre-release or “beta” versions of SingleStore’s open source software connector (“Beta Software Connector”) for the limited purposes of non-production testing and evaluation of such Beta Software Connector. Customer acknowledges that SingleStore shall have no obligation to release a generally available version of such Beta Software Connector or to provide support or warranty for such versions of the Beta Software Connector  for any production or non-evaluation use.
-
-NOTWITHSTANDING ANYTHING TO THE CONTRARY IN ANY DOCUMENTATION,  AGREEMENT OR IN ANY ORDER DOCUMENT, SINGLESTORE WILL HAVE NO WARRANTY, INDEMNITY, SUPPORT, OR SERVICE LEVEL, OBLIGATIONS WITH
-RESPECT TO THIS BETA SOFTWARE CONNECTOR (INCLUDING TOOLS AND UTILITIES).
-
-APPLICABLE OPEN SOURCE LICENSE: Apache 2.0
-
-IF YOU OR YOUR COMPANY DO NOT AGREE TO THESE TERMS AND CONDITIONS, DO NOT CHECK THE ACCEPTANCE BOX, AND DO NOT DOWNLOAD, ACCESS, COPY, INSTALL OR USE THE SOFTWARE OR THE SERVICES.

{singlestoredb-1.0.0.dist-info → singlestoredb-1.0.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
-_singlestoredb_accel.abi3.so,sha256=lJYQZ5iHR4HNGM3DIdYkFXJcn_C-TZis_CuLXnFFRuM,206109
-singlestoredb-1.0.0.dist-info/RECORD,,
-singlestoredb-1.0.0.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-1.0.0.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
-singlestoredb-1.0.0.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
-singlestoredb-1.0.0.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
-singlestoredb-1.0.0.dist-info/METADATA,sha256=QCkpCijTfoIgblswX6KWaTkJDswI_fZNzTzKqD75KLE,7740
+_singlestoredb_accel.abi3.so,sha256=h_78j0iV0aEoVaA4uPmTME8DTqBKRDt_BAjUCgj1cfc,206109
+singlestoredb-1.0.2.dist-info/RECORD,,
+singlestoredb-1.0.2.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-1.0.2.dist-info/WHEEL,sha256=_VEguvlLpUd-c8RbFMA4yMIVNMBv2LhpxYLCEQ-Bogk,113
+singlestoredb-1.0.2.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
+singlestoredb-1.0.2.dist-info/top_level.txt,sha256=SDtemIXf-Kp-_F2f_S6x0db33cHGOILdAEsIQZe2LZc,35
+singlestoredb-1.0.2.dist-info/METADATA,sha256=ZDy0IGkaKydgjvPH_QGR5D-hFy4cfIh4NiwKbkTCH20,5515
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=ZfLiOeqADAUMekvA9OZoDWDLdvXTGebPOcmMnN33Drw,7476
-singlestoredb/__init__.py,sha256=noDMtTHtutIvN1rZDyY8bkZiXM01mZ9L0Yy-75RHZAM,1634
+singlestoredb/__init__.py,sha256=A8RLgMfoXrQq6Px3VKkXKI08uBzCtZz5BA2WufmiL4M,1634
 singlestoredb/types.py,sha256=FIqO1A7e0Gkk7ITmIysBy-P5S--ItbMSlYvblzqGS30,9969
 singlestoredb/connection.py,sha256=gDBIs3XgLOROVHtzMx9zmSYILc0aRVY7k8we3b4TxCw,44227
 singlestoredb/pytest.py,sha256=OyF3BO9mgxenifYhOihnzGk8WzCJ_zN5_mxe8XyFPOc,9074
@@ -15,12 +15,12 @@ singlestoredb/exceptions.py,sha256=HuoA6sMRL5qiCiee-_5ddTGmFbYC9Euk8TYUsh5GvTw,3
 singlestoredb/converters.py,sha256=aH_QhLr94i9_AjvcplTar0HfX2yi53KGxHHzJc7lSU0,12515
 singlestoredb/fusion/graphql.py,sha256=ZA3HcDq5rER-dCEavwTqnF7KM0D2LCYIY7nLQk7lSso,5207
 singlestoredb/fusion/handler.py,sha256=7Oau7A5mclO5t3egH2FINxo8By6zpwzAQLCMFIo9CCo,18338
-singlestoredb/fusion/registry.py,sha256=zgv1wS1egG1qfNA1TQ_PtRGtMsiAKrOWHnlGGB_GpB4,4141
+singlestoredb/fusion/registry.py,sha256=xpaWO9Bne5QYSE0ump1NcyHimFQSYW49gu3NSPBhLCI,4084
 singlestoredb/fusion/__init__.py,sha256=Qo7SuqGw-l-vE8-EI2jhm6hXJkYfOLUKIws9c7LFNX0,356
 singlestoredb/fusion/result.py,sha256=Bd3KbRpqWqQcWp_Chd4bzBy8Kfc8nXLS_Pn_GGbPO6o,11772
 singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 singlestoredb/fusion/handlers/utils.py,sha256=oYbf13Y3orEkJfHMNnO7B_W1anEdK-0S9vVVkF2pPFk,5109
-singlestoredb/fusion/handlers/stage.py,sha256=D8TarqgifaSR_JFEjKU43KJy64qPnuiYJKQE21nrdUk,6386
+singlestoredb/fusion/handlers/stage.py,sha256=Abj59HZyy7kUWwujG-7FZ9-8d14W3XWRc3XfOMgBeng,6386
 singlestoredb/fusion/handlers/workspace.py,sha256=hHE6ZTrt3wWnQsTMkEiiWWFiQend4VNTebX382Ot5FI,11342
 singlestoredb/tests/test.sql,sha256=zuckJJgKI8cjIkM03WC67hCTk75TSJYVNA3x9VLQWH4,9954
 singlestoredb/tests/test_xdict.py,sha256=fqHspoi39nbX3fIDVkkRXcd5H50xdOsSvK0bxAMQnaE,10408
@@ -46,11 +46,11 @@ singlestoredb/tests/test2.sql,sha256=D4U2GSlOVeo39U8-RMM4YziJzYFfi4Ztm2YXJVJVAS8
 singlestoredb/tests/ext_funcs/__init__.py,sha256=qZLnDI_Ck0tguVi-K-BKXDHAcC0jui3dsm93Djj4x08,9290
 singlestoredb/management/organization.py,sha256=Oj4-VQoEc90hLQ9vxXu4fSrGWK_Qq5lftmkM1Q5l6lk,4916
 singlestoredb/management/region.py,sha256=HnLcWUh7r_aLECliplCDHak4a_F3B7LOSXEYMW66qD0,1611
-singlestoredb/management/__init__.py,sha256=RneG1ooIR31wzidco8cNXbxmglRKvlZsmP8I7MfC69c,168
+singlestoredb/management/__init__.py,sha256=jXtKvpvl5diiotXPiEi2EpJwhPLEMb4_MTpndjCz3Kg,202
 singlestoredb/management/utils.py,sha256=ZFt1jaUwNij16UplNxK_kvvd-w54OunsBaGHojqqUn8,8329
 singlestoredb/management/cluster.py,sha256=_TT4tV43VPDrtcdS_VN-TTYij7yFQzjAMeuYRF9zKj8,14362
-singlestoredb/management/workspace.py,sha256=3ZZFsP30us7nv5lhaiJYX_LYbH7MM5Mg7l_56lz8d2c,51293
-singlestoredb/management/manager.py,sha256=QVtMUi1VJcW2pF56yQ0iI0v_fXH9qaWyujvlK5kODi8,8519
+singlestoredb/management/workspace.py,sha256=xIdSA_X8aiLnCZjNJg8-xYZeVyVeL1i4sVJUx-zMG_g,51907
+singlestoredb/management/manager.py,sha256=mxwW1OQFvUIaPzTo_-9Oolv4Xwvf3mL5VS3qnvR1Ydg,8764
 singlestoredb/management/billing_usage.py,sha256=9ighjIpcopgIyJOktBYQ6pahBZmWGHOPyyCW4gu9FGs,3735
 singlestoredb/utils/config.py,sha256=m3Xn6hsbdKyLufSnbokhFJ9Vfaz9Qpkj1IEnIiH9oJQ,24503
 singlestoredb/utils/results.py,sha256=cqFK4-0CBSDcT-R1ixKIWN5_sCn9s9SoEO6Gllj8mCI,5204
@@ -104,9 +104,9 @@ singlestoredb/functions/decorator.py,sha256=feFPevL6-3wE9KJCb3vrgqtSoY8Gc_lD0mgW
 singlestoredb/functions/__init__.py,sha256=WL1LqgMTdnGOse3tQqmD-HH8TdfCPS89GNO7hO0v_aw,41
 singlestoredb/functions/dtypes.py,sha256=iP3_AvE2jBxlkziOHzoUvTtYCdBZlaxJHNgvGwp07Ao,36712
 singlestoredb/functions/signature.py,sha256=iqSsx8N8lU0ycNBO05HLAixy2OGIjrq33ntLME4YPmA,19343
-singlestoredb/functions/ext/asgi.py,sha256=Bs64CtwFUw1s8UXL6AqoMTNOFkXc-uJ0KQalR2JOQFQ,17662
+singlestoredb/functions/ext/asgi.py,sha256=DOf775i708hpUL52FQ1P_R5ORXHQjH9dbErUJ_L98jE,18911
 singlestoredb/functions/ext/arrow.py,sha256=WB7n1ACslyd8nlbFzUvlbxn1BVuEjA9-BGBEqCWlSOo,9061
 singlestoredb/functions/ext/__init__.py,sha256=kGCV3QC5pL95TytpI8pwvSVCqqoTrV8duQQEUp65sy4,66
-singlestoredb/functions/ext/json.py,sha256=jAImdlPa-KWfCihJtA-zrht9Ylkq-jQNvVi_7Xee84E,10310
+singlestoredb/functions/ext/json.py,sha256=UuUxTzlr5ztAbXqOGaVGUhO7xFN_oBY75nFh9B8cRog,10372
 singlestoredb/functions/ext/rowdat_1.py,sha256=yZElsItSbVTFlXU3N-ee6QIybxuksqwv1UE3Y6h45c0,22274
 singlestoredb/alchemy/__init__.py,sha256=dXRThusYrs_9GjrhPOw0-vw94in_T8yY9jE7SGCqiQk,2523