singlestoredb 1.15.7__cp38-abi3-win_amd64.whl → 1.16.0__cp38-abi3-win_amd64.whl

singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.15.7'
+__version__ = '1.16.0'
 
 from typing import Any
 

singlestoredb/ai/__init__.py

@@ -1,5 +1,2 @@
-from .chat import SingleStoreChat  # noqa: F401
 from .chat import SingleStoreChatFactory  # noqa: F401
-from .chat import SingleStoreChatOpenAI  # noqa: F401
-from .embeddings import SingleStoreEmbeddings  # noqa: F401
 from .embeddings import SingleStoreEmbeddingsFactory  # noqa: F401

singlestoredb/ai/chat.py

@@ -29,44 +29,6 @@ from botocore import UNSIGNED
 from botocore.config import Config
 
 
-class SingleStoreChatOpenAI(ChatOpenAI):
-    def __init__(self, model_name: str, api_key: Optional[str] = None, **kwargs: Any):
-        inference_api_manger = (
-            manage_workspaces().organizations.current.inference_apis
-        )
-        info = inference_api_manger.get(model_name=model_name)
-        token = (
-            api_key
-            if api_key is not None
-            else os.environ.get('SINGLESTOREDB_USER_TOKEN')
-        )
-        super().__init__(
-            base_url=info.connection_url,
-            api_key=token,
-            model=model_name,
-            **kwargs,
-        )
-
-
-class SingleStoreChat(ChatOpenAI):
-    def __init__(self, model_name: str, api_key: Optional[str] = None, **kwargs: Any):
-        inference_api_manger = (
-            manage_workspaces().organizations.current.inference_apis
-        )
-        info = inference_api_manger.get(model_name=model_name)
-        token = (
-            api_key
-            if api_key is not None
-            else os.environ.get('SINGLESTOREDB_USER_TOKEN')
-        )
-        super().__init__(
-            base_url=info.connection_url,
-            api_key=token,
-            model=model_name,
-            **kwargs,
-        )
-
-
 def SingleStoreChatFactory(
     model_name: str,
     api_key: Optional[str] = None,
@@ -90,9 +52,27 @@ def SingleStoreChatFactory(
             'signature_version': UNSIGNED,
             'retries': {'max_attempts': 1, 'mode': 'standard'},
         }
-        if http_client is not None and http_client.timeout is not None:
-            cfg_kwargs['read_timeout'] = http_client.timeout
-            cfg_kwargs['connect_timeout'] = http_client.timeout
+        # Extract timeouts from http_client if provided
+        t = http_client.timeout if http_client is not None else None
+        connect_timeout = None
+        read_timeout = None
+        if t is not None:
+            if isinstance(t, httpx.Timeout):
+                if t.connect is not None:
+                    connect_timeout = float(t.connect)
+                if t.read is not None:
+                    read_timeout = float(t.read)
+                if connect_timeout is None and read_timeout is not None:
+                    connect_timeout = read_timeout
+                if read_timeout is None and connect_timeout is not None:
+                    read_timeout = connect_timeout
+            elif isinstance(t, (int, float)):
+                connect_timeout = float(t)
+                read_timeout = float(t)
+        if read_timeout is not None:
+            cfg_kwargs['read_timeout'] = read_timeout
+        if connect_timeout is not None:
+            cfg_kwargs['connect_timeout'] = connect_timeout
 
         cfg = Config(**cfg_kwargs)
         client = boto3.client(

singlestoredb/ai/embeddings.py

@@ -29,21 +29,6 @@ from botocore import UNSIGNED
 from botocore.config import Config
 
 
-class SingleStoreEmbeddings(OpenAIEmbeddings):
-
-    def __init__(self, model_name: str, **kwargs: Any):
-        inference_api_manger = (
-            manage_workspaces().organizations.current.inference_apis
-        )
-        info = inference_api_manger.get(model_name=model_name)
-        super().__init__(
-            base_url=info.connection_url,
-            api_key=os.environ.get('SINGLESTOREDB_USER_TOKEN'),
-            model=model_name,
-            **kwargs,
-        )
-
-
 def SingleStoreEmbeddingsFactory(
     model_name: str,
     api_key: Optional[str] = None,
@@ -66,9 +51,27 @@ def SingleStoreEmbeddingsFactory(
             'signature_version': UNSIGNED,
             'retries': {'max_attempts': 1, 'mode': 'standard'},
         }
-        if http_client is not None and http_client.timeout is not None:
-            cfg_kwargs['read_timeout'] = http_client.timeout
-            cfg_kwargs['connect_timeout'] = http_client.timeout
+        # Extract timeouts from http_client if provided
+        t = http_client.timeout if http_client is not None else None
+        connect_timeout = None
+        read_timeout = None
+        if t is not None:
+            if isinstance(t, httpx.Timeout):
+                if t.connect is not None:
+                    connect_timeout = float(t.connect)
+                if t.read is not None:
+                    read_timeout = float(t.read)
+                if connect_timeout is None and read_timeout is not None:
+                    connect_timeout = read_timeout
+                if read_timeout is None and connect_timeout is not None:
+                    read_timeout = connect_timeout
+            elif isinstance(t, (int, float)):
+                connect_timeout = float(t)
+                read_timeout = float(t)
+        if read_timeout is not None:
+            cfg_kwargs['read_timeout'] = read_timeout
+        if connect_timeout is not None:
+            cfg_kwargs['connect_timeout'] = connect_timeout
 
         cfg = Config(**cfg_kwargs)
         client = boto3.client(

singlestoredb/connection.py

@@ -9,15 +9,15 @@ import re
 import sys
 import warnings
 import weakref
+from collections.abc import Iterator
 from collections.abc import Mapping
 from collections.abc import MutableMapping
+from collections.abc import Sequence
 from typing import Any
 from typing import Callable
 from typing import Dict
-from typing import Iterator
 from typing import List
 from typing import Optional
-from typing import Sequence
 from typing import Tuple
 from typing import Union
 from urllib.parse import parse_qs

singlestoredb/functions/ext/asgi.py

@@ -48,15 +48,15 @@ import urllib
 import uuid
 import zipfile
 import zipimport
+from collections.abc import Awaitable
+from collections.abc import Iterable
+from collections.abc import Sequence
 from types import ModuleType
 from typing import Any
-from typing import Awaitable
 from typing import Callable
 from typing import Dict
-from typing import Iterable
 from typing import List
 from typing import Optional
-from typing import Sequence
 from typing import Set
 from typing import Tuple
 from typing import Union

singlestoredb/functions/ext/rowdat_1.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 import struct
 import warnings
+from collections.abc import Sequence
 from io import BytesIO
 from typing import Any
 from typing import List
 from typing import Optional
-from typing import Sequence
 from typing import Tuple
 from typing import TYPE_CHECKING
 

singlestoredb/functions/signature.py

@@ -9,12 +9,12 @@ import string
 import sys
 import types
 import typing
+from collections.abc import Sequence
 from typing import Any
 from typing import Callable
 from typing import Dict
 from typing import List
 from typing import Optional
-from typing import Sequence
 from typing import Tuple
 from typing import TypeVar
 from typing import Union

singlestoredb/functions/typing/__init__.py

@@ -1,5 +1,5 @@
+from collections.abc import Iterable
 from typing import Any
-from typing import Iterable
 from typing import Tuple
 from typing import TypeVar
 

singlestoredb/functions/utils.py

@@ -4,10 +4,10 @@ import struct
 import sys
 import types
 import typing
+from collections.abc import Iterable
 from enum import Enum
 from typing import Any
 from typing import Dict
-from typing import Iterable
 from typing import Tuple
 from typing import Union
 

singlestoredb/fusion/handler.py

@@ -5,10 +5,10 @@ import os
 import re
 import sys
 import textwrap
+from collections.abc import Iterable
 from typing import Any
 from typing import Callable
 from typing import Dict
-from typing import Iterable
 from typing import List
 from typing import Optional
 from typing import Set

singlestoredb/fusion/result.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 
 import re
+from collections.abc import Iterable
 from typing import Any
-from typing import Iterable
 from typing import List
 from typing import Optional
 from typing import Tuple

singlestoredb/http/connection.py

@@ -10,13 +10,13 @@ import os
 import re
 import time
 from base64 import b64decode
+from collections.abc import Iterable
+from collections.abc import Sequence
 from typing import Any
 from typing import Callable
 from typing import Dict
-from typing import Iterable
 from typing import List
 from typing import Optional
-from typing import Sequence
 from typing import Tuple
 from typing import Union
 from urllib.parse import urljoin

singlestoredb/management/manager.py

@@ -15,6 +15,7 @@ import requests
 
 from .. import config
 from ..exceptions import ManagementError
+from ..exceptions import OperationalError
 from .utils import get_token
 
 
@@ -310,3 +311,63 @@ class Manager(object):
             out = getattr(self, f'get_{self.obj_type}')(out.id)
 
         return out
+
+    def _wait_on_endpoint(
+        self,
+        out: Any,
+        interval: int = 10,
+        timeout: int = 300,
+    ) -> Any:
+        """
+        Wait for the endpoint to be ready by attempting to connect.
+
+        Parameters
+        ----------
+        out : Any
+            Workspace object with a connect method
+        interval : int, optional
+            Interval between each connection attempt (default: 10 seconds)
+        timeout : int, optional
+            Maximum time to wait before raising an exception (default: 300 seconds)
+
+        Raises
+        ------
+        ManagementError
+            If timeout is reached or endpoint is not available
+
+        Returns
+        -------
+        Same object type as `out`
+
+        """
+        # Only wait if workload type is set which means we are in the
+        # notebook environment. Outside of the environment, the endpoint
+        # may not be reachable directly.
+        if not os.environ.get('SINGLESTOREDB_WORKLOAD_TYPE', ''):
+            return out
+
+        if not hasattr(out, 'connect') or not out.connect:
+            raise ManagementError(
+                msg=f'{type(out).__name__} object does not have a valid endpoint',
+            )
+
+        while True:
+            try:
+                # Try to establish a connection to the endpoint using context manager
+                with out.connect(connect_timeout=5):
+                    pass
+            except Exception as exc:
+                # If we get an 'access denied' error, that means that the server is
+                # up and we just aren't authenticating.
+                if isinstance(exc, OperationalError) and exc.errno == 1045:
+                    break
+                # If connection fails, check timeout and retry
+                if timeout <= 0:
+                    raise ManagementError(
+                        msg=f'Exceeded waiting time for {self.obj_type} endpoint '
+                            'to become ready',
+                    )
+                time.sleep(interval)
+                timeout -= interval
+
+        return out

singlestoredb/management/utils.py

@@ -6,11 +6,11 @@ import itertools
 import os
 import re
 import sys
+from collections.abc import Mapping
 from typing import Any
 from typing import Callable
 from typing import Dict
 from typing import List
-from typing import Mapping
 from typing import Optional
 from typing import SupportsIndex
 from typing import Tuple

singlestoredb/management/workspace.py

@@ -1794,6 +1794,12 @@ class WorkspaceManager(Manager):
                 interval=wait_interval,
                 timeout=wait_timeout,
             )
+            # After workspace is active, wait for endpoint to be ready
+            out = self._wait_on_endpoint(
+                out,
+                interval=wait_interval,
+                timeout=wait_timeout,
+            )
         return out
 
     def get_workspace_group(self, id: str) -> WorkspaceGroup:

singlestoredb/mysql/connection.py

@@ -13,9 +13,9 @@ import struct
 import sys
 import traceback
 import warnings
+from collections.abc import Iterable
 from typing import Any
 from typing import Dict
-from typing import Iterable
 
 try:
     import _singlestoredb_accel

singlestoredb/pytest.py

@@ -2,10 +2,12 @@
 """Pytest plugin"""
 import logging
 import os
+import socket
 import subprocess
 import time
+import uuid
+from collections.abc import Iterator
 from enum import Enum
-from typing import Iterator
 from typing import Optional
 
 import pytest
@@ -28,6 +30,14 @@ TEARDOWN_WAIT_ATTEMPTS = 20
 TEARDOWN_WAIT_SECONDS = 2
 
 
+def _find_free_port() -> int:
+    """Find a free port by binding to port 0 and getting the assigned port."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.bind(('', 0))
+        s.listen(1)
+        return s.getsockname()[1]
+
+
 class ExecutionMode(Enum):
     SEQUENTIAL = 1
     LEADER = 2
@@ -79,7 +89,11 @@ class _TestContainerManager():
     """Manages the setup and teardown of a SingleStoreDB Dev Container"""
 
     def __init__(self) -> None:
-        self.container_name = 'singlestoredb-test-container'
+        # Generate unique container name using UUID and worker ID
+        worker = os.environ.get('PYTEST_XDIST_WORKER', 'master')
+        unique_id = uuid.uuid4().hex[:8]
+        self.container_name = f'singlestoredb-test-{worker}-{unique_id}'
+
         self.dev_image_name = 'ghcr.io/singlestore-labs/singlestoredb-dev'
 
         assert 'SINGLESTORE_LICENSE' in os.environ, 'SINGLESTORE_LICENSE not set'
@@ -91,14 +105,69 @@ class _TestContainerManager():
             'SINGLESTORE_SET_GLOBAL_DEFAULT_PARTITIONS_PER_LEAF': '1',
         }
 
-        self.ports = ['3306', '8080', '9000']
+        # Use dynamic port allocation to avoid conflicts
+        self.mysql_port = _find_free_port()
+        self.http_port = _find_free_port()
+        self.studio_port = _find_free_port()
+        self.ports = [
+            (self.mysql_port, '3306'),    # External port -> Internal port
+            (self.http_port, '8080'),
+            (self.studio_port, '9000'),
+        ]
+
+        self.url = f'root:{self.root_password}@127.0.0.1:{self.mysql_port}'
+
+    def _container_exists(self) -> bool:
+        """Check if a container with this name already exists."""
+        try:
+            result = subprocess.run(
+                [
+                    'docker', 'ps', '-a', '--filter',
+                    f'name={self.container_name}',
+                    '--format', '{{.Names}}',
+                ],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+            return self.container_name in result.stdout
+        except subprocess.CalledProcessError:
+            return False
+
+    def _cleanup_existing_container(self) -> None:
+        """Stop and remove any existing container with the same name."""
+        if not self._container_exists():
+            return
 
-        self.url = f'root:{self.root_password}@127.0.0.1:3306'
+        logger.info(f'Found existing container {self.container_name}, cleaning up')
+        try:
+            # Try to stop the container (ignore if it's already stopped)
+            subprocess.run(
+                ['docker', 'stop', self.container_name],
+                capture_output=True,
+                check=False,
+            )
+            # Remove the container
+            subprocess.run(
+                ['docker', 'rm', self.container_name],
+                capture_output=True,
+                check=True,
+            )
+            logger.debug(f'Cleaned up existing container {self.container_name}')
+        except subprocess.CalledProcessError as e:
+            logger.warning(f'Failed to cleanup existing container: {e}')
+            # Continue anyway - the unique name should prevent most conflicts
 
     def start(self) -> None:
+        # Clean up any existing container with the same name
+        self._cleanup_existing_container()
+
         command = ' '.join(self._start_command())
 
-        logger.info(f'Starting container {self.container_name}')
+        logger.info(
+            f'Starting container {self.container_name} on ports {self.mysql_port}, '
+            f'{self.http_port}, {self.studio_port}',
+        )
         try:
             license = os.environ['SINGLESTORE_LICENSE']
             env = {
@@ -108,8 +177,8 @@ class _TestContainerManager():
         except Exception as e:
             logger.exception(e)
             raise RuntimeError(
-                'Failed to start container. '
-                'Is one already running?',
+                f'Failed to start container {self.container_name}. '
+                f'Command: {command}',
             ) from e
         logger.debug('Container started')
 
@@ -123,9 +192,9 @@ class _TestContainerManager():
             else:
                 yield f'{key}={value}'
 
-        for port in self.ports:
+        for external_port, internal_port in self.ports:
             yield '-p'
-            yield f'{port}:{port}'
+            yield f'{external_port}:{internal_port}'
 
         yield self.dev_image_name