singlestoredb 1.4.2__tar.gz → 1.5.0__tar.gz

{singlestoredb-1.4.2/singlestoredb.egg-info → singlestoredb-1.5.0}/PKG-INFO

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

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/setup.cfg

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

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.4.2'
+__version__ = '1.5.0'
 
 from typing import Any
 

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/config.py

@@ -221,6 +221,17 @@ register_option(
     environ='SINGLESTOREDB_ENABLE_EXTENDED_DATA_TYPES',
 )
 
+register_option(
+    'vector_data_format', 'string',
+    functools.partial(
+        check_str,
+        valid_values=['json', 'binary'],
+    ),
+    'binary',
+    'Format for vector data values',
+    environ='SINGLESTOREDB_VECTOR_DATA_FORMAT',
+)
+
 register_option(
     'fusion.enabled', 'bool', check_bool, False,
     'Should Fusion SQL queries be enabled?',

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/connection.py

@@ -1304,6 +1304,7 @@ def connect(
     encoding_errors: Optional[str] = None,
     track_env: Optional[bool] = None,
     enable_extended_data_types: Optional[bool] = None,
+    vector_data_format: Optional[str] = None,
 ) -> Connection:
     """
     Return a SingleStoreDB connection.
@@ -1387,6 +1388,8 @@ def connect(
         Should the connection track the SINGLESTOREDB_URL environment variable?
     enable_extended_data_types : bool, optional
         Should extended data types (BSON, vector) be enabled?
+    vector_data_format : str, optional
+        Format for vector types: json or binary
 
     Examples
     --------

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/fusion/handlers/workspace.py

@@ -13,6 +13,59 @@ from .utils import get_workspace_group
 from .utils import get_workspace_manager
 
 
+class UseWorkspaceHandler(SQLHandler):
+    """
+    USE WORKSPACE workspace [ with_database ];
+
+    # Workspace
+    workspace = { workspace_id | workspace_name }
+
+    # ID of workspace
+    workspace_id = ID '<workspace-id>'
+
+    # Name of workspace
+    workspace_name = '<workspace-name>'
+
+    # Name of database
+    with_database = WITH DATABASE 'database-name'
+
+    Description
+    -----------
+    Change the workspace and database in the notebook.
+
+    Arguments
+    ---------
+    * ``<workspace-id>``: The ID of the workspace to delete.
+    * ``<workspace-name>``: The name of the workspace to delete.
+
+    Remarks
+    -------
+    * Specify the ``WITH DATABASE`` clause to select a default
+      database for the session.
+    * This command only works in a notebook session in the
+      Managed Service.
+
+    Example
+    -------
+    The following command sets the workspace to ``examplews`` and
+    select 'dbname' as the default database::
+
+        USE WORKSPACE 'examplews' WITH DATABASE 'dbname';
+
+    """
+    def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:
+        from singlestoredb.notebook import portal
+        if params.get('with_database'):
+            portal.connection = params['workspace']['workspace_name'], \
+                                params['with_database']
+        else:
+            portal.workspace = params['workspace']['workspace_name']
+        return None
+
+
+UseWorkspaceHandler.register(overwrite=True)
+
+
 class ShowRegionsHandler(SQLHandler):
     """
     SHOW REGIONS [ <like> ]

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/http/connection.py

@@ -1243,5 +1243,7 @@ def connect(
     inf_as_null: Optional[bool] = None,
     encoding_errors: Optional[str] = None,
     track_env: Optional[bool] = None,
+    enable_extended_data_types: Optional[bool] = None,
+    vector_data_format: Optional[str] = None,
 ) -> Connection:
     return Connection(**dict(locals()))

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/management/utils.py

@@ -123,14 +123,14 @@ class NamedList(List[T]):
 def _setup_authentication_info_handler() -> Callable[..., Dict[str, Any]]:
     """Setup authentication info event handler."""
 
-    authentication_info: List[Tuple[str, Any]] = []
+    authentication_info: Dict[str, Any] = {}
 
     def handle_authentication_info(msg: Dict[str, Any]) -> None:
         """Handle authentication info events."""
         nonlocal authentication_info
         if msg.get('name', '') != 'singlestore.portal.authentication_updated':
             return
-        authentication_info = list(msg.get('data', {}).items())
+        authentication_info = dict(msg.get('data', {}))
 
     events.subscribe(handle_authentication_info)
 
@@ -145,11 +145,27 @@ def _setup_authentication_info_handler() -> Callable[..., Dict[str, Any]]:
             out['user'] = data['user']
         if 'password' in data:
             out['password'] = data['password']
-        authentication_info = list(out.items())
+        authentication_info = out
 
     events.subscribe(handle_authentication_info)
 
+    def retrieve_current_authentication_info() -> List[Tuple[str, Any]]:
+        """Retrieve JWT if not expired."""
+        nonlocal authentication_info
+        password = authentication_info.get('password')
+        if password:
+            expires = datetime.datetime.fromtimestamp(
+                jwt.decode(
+                    password,
+                    options={'verify_signature': False},
+                )['exp'],
+            )
+            if datetime.datetime.now() > expires:
+                authentication_info = {}
+        return list(authentication_info.items())
+
     def get_env() -> List[Tuple[str, Any]]:
+        """Retrieve JWT from environment."""
         conn = {}
         url = os.environ.get('SINGLESTOREDB_URL') or get_option('host')
         if url:
@@ -170,7 +186,7 @@ def _setup_authentication_info_handler() -> Callable[..., Dict[str, Any]]:
         return dict(
             itertools.chain(
                 (get_env() if include_env else []),
-                authentication_info,
+                retrieve_current_authentication_info(),
             ),
         )
 

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/mysql/connection.py

@@ -280,6 +280,8 @@ class Connection(BaseConnection):
         Should the connection track the SINGLESTOREDB_URL environment variable?
     enable_extended_data_types : bool, optional
         Should extended data types (BSON, vector) be enabled?
+    vector_data_format : str, optional
+        Specify the data type of vector values: json or binary
 
     See `Connection <https://www.python.org/dev/peps/pep-0249/#connection-objects>`_
     in the specification.
@@ -350,6 +352,7 @@ class Connection(BaseConnection):
         encoding_errors='strict',
         track_env=False,
         enable_extended_data_types=True,
+        vector_data_format='binary',
     ):
         BaseConnection.__init__(**dict(locals()))
 
@@ -634,6 +637,13 @@ class Connection(BaseConnection):
         self._in_sync = False
         self._track_env = bool(track_env) or self.host == 'singlestore.com'
         self._enable_extended_data_types = enable_extended_data_types
+        if vector_data_format.lower() in ['json', 'binary']:
+            self._vector_data_format = vector_data_format
+        else:
+            raise ValueError(
+                'unknown value for vector_data_format, '
+                f'expecting "json" or "binary": {vector_data_format}',
+            )
         self._connection_info = {}
         events.subscribe(self._handle_event)
 
@@ -1117,6 +1127,15 @@ class Connection(BaseConnection):
                     pass
                 c.close()
 
+            if self._vector_data_format:
+                c = self.cursor()
+                try:
+                    val = self._vector_data_format
+                    c.execute(f'SET @@SESSION.vector_type_project_format={val}')
+                except self.OperationalError:
+                    pass
+                c.close()
+
             if self.init_command is not None:
                 c = self.cursor()
                 c.execute(self.init_command)

{singlestoredb-1.4.2 → singlestoredb-1.5.0}/singlestoredb/notebook/_portal.py

@@ -9,6 +9,7 @@ from typing import Callable
 from typing import Dict
 from typing import List
 from typing import Optional
+from typing import Tuple
 
 from . import _objects as obj
 from ..management import workspace as mgr
@@ -187,6 +188,37 @@ class Portal(object):
             timeout_message='timeout waiting for workspace update',
         )
 
+    deployment = workspace
+
+    @property
+    def connection(self) -> Tuple[obj.Workspace, Optional[str]]:
+        """Workspace and default database name."""
+        return self.workspace, self.default_database
+
+    @connection.setter
+    def connection(self, workspace_and_default_database: Tuple[str, str]) -> None:
+        """Set workspace and default database name."""
+        name_or_id, default_database = workspace_and_default_database
+        if re.match(
+            r'[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}',
+            name_or_id, flags=re.I,
+        ):
+            w = mgr.get_workspace(name_or_id)
+        else:
+            w = mgr.get_workspace_group(self.workspace_group_id).workspaces[name_or_id]
+
+        if w.state and w.state.lower() not in ['active', 'resumed']:
+            raise RuntimeError('workspace is not active')
+
+        id = w.id
+
+        self._call_javascript(
+            'changeConnection', [id, default_database],
+            wait_on_condition=lambda: self.workspace_id == id and
+            self.default_database == default_database,  # type: ignore
+            timeout_message='timeout waiting for workspace update',
+        )
+
     @property
     def cluster_id(self) -> Optional[str]:
         """Cluster ID."""

{singlestoredb-1.4.2 → singlestoredb-1.5.0/singlestoredb.egg-info}/PKG-INFO

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