singlestoredb 1.0.1__tar.gz → 1.0.2__tar.gz

{singlestoredb-1.0.1/singlestoredb.egg-info → singlestoredb-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.0.1
+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
@@ -13,32 +13,16 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Database
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: PyJWT
-Requires-Dist: build
-Requires-Dist: parsimonious
-Requires-Dist: requests
-Requires-Dist: setuptools
-Requires-Dist: sqlparams
-Requires-Dist: wheel
 Provides-Extra: dataframe
-Requires-Dist: ibis-singlestoredb; extra == "dataframe"
 Provides-Extra: dbt
-Requires-Dist: dbt-singlestore; extra == "dbt"
 Provides-Extra: ed22519
-Requires-Dist: PyNaCl>=1.4.0; extra == "ed22519"
 Provides-Extra: gssapi
-Requires-Dist: gssapi; extra == "gssapi"
 Provides-Extra: ibis
-Requires-Dist: ibis-singlestoredb; extra == "ibis"
 Provides-Extra: kerberos
-Requires-Dist: gssapi; extra == "kerberos"
 Provides-Extra: pytest
-Requires-Dist: pytest; extra == "pytest"
 Provides-Extra: rsa
-Requires-Dist: cryptography; extra == "rsa"
 Provides-Extra: sqlalchemy
-Requires-Dist: sqlalchemy-singlestoredb>=1.0.0; extra == "sqlalchemy"
+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.0.1 → singlestoredb-1.0.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = singlestoredb
-version = 1.0.1
+version = 1.0.2
 description = Interface to the SingleStoreDB database and workspace management APIs
 long_description = file: README.md
 long_description_content_type = text/markdown

{singlestoredb-1.0.1 → singlestoredb-1.0.2}/singlestoredb/__init__.py

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

{singlestoredb-1.0.1 → singlestoredb-1.0.2}/singlestoredb/functions/ext/asgi.py

@@ -18,7 +18,7 @@ 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
 
 '''

{singlestoredb-1.0.1 → singlestoredb-1.0.2}/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-1.0.1 → singlestoredb-1.0.2}/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-1.0.1 → singlestoredb-1.0.2}/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.1 → singlestoredb-1.0.2/singlestoredb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.0.1
+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
@@ -13,32 +13,16 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Database
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: PyJWT
-Requires-Dist: build
-Requires-Dist: parsimonious
-Requires-Dist: requests
-Requires-Dist: setuptools
-Requires-Dist: sqlparams
-Requires-Dist: wheel
 Provides-Extra: dataframe
-Requires-Dist: ibis-singlestoredb; extra == "dataframe"
 Provides-Extra: dbt
-Requires-Dist: dbt-singlestore; extra == "dbt"
 Provides-Extra: ed22519
-Requires-Dist: PyNaCl>=1.4.0; extra == "ed22519"
 Provides-Extra: gssapi
-Requires-Dist: gssapi; extra == "gssapi"
 Provides-Extra: ibis
-Requires-Dist: ibis-singlestoredb; extra == "ibis"
 Provides-Extra: kerberos
-Requires-Dist: gssapi; extra == "kerberos"
 Provides-Extra: pytest
-Requires-Dist: pytest; extra == "pytest"
 Provides-Extra: rsa
-Requires-Dist: cryptography; extra == "rsa"
 Provides-Extra: sqlalchemy
-Requires-Dist: sqlalchemy-singlestoredb>=1.0.0; extra == "sqlalchemy"
+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