singlestoredb 1.15.5__tar.gz → 1.15.7__tar.gz

{singlestoredb-1.15.5/singlestoredb.egg-info → singlestoredb-1.15.7}/PKG-INFO

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

{singlestoredb-1.15.5 → singlestoredb-1.15.7}/setup.cfg

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

{singlestoredb-1.15.5 → singlestoredb-1.15.7}/singlestoredb/__init__.py

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

singlestoredb-1.15.7/singlestoredb/ai/__init__.py

@@ -0,0 +1,5 @@
+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-1.15.7/singlestoredb/ai/chat.py

@@ -0,0 +1,159 @@
+import os
+from typing import Any
+from typing import Callable
+from typing import Optional
+from typing import Union
+
+import httpx
+
+from singlestoredb import manage_workspaces
+
+try:
+    from langchain_openai import ChatOpenAI
+except ImportError:
+    raise ImportError(
+        'Could not import langchain_openai python package. '
+        'Please install it with `pip install langchain_openai`.',
+    )
+
+try:
+    from langchain_aws import ChatBedrockConverse
+except ImportError:
+    raise ImportError(
+        'Could not import langchain-aws python package. '
+        'Please install it with `pip install langchain-aws`.',
+    )
+
+import boto3
+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,
+    streaming: bool = True,
+    http_client: Optional[httpx.Client] = None,
+    obo_token_getter: Optional[Callable[[], Optional[str]]] = None,
+    **kwargs: Any,
+) -> Union[ChatOpenAI, ChatBedrockConverse]:
+    """Return a chat model instance (ChatOpenAI or ChatBedrockConverse).
+    """
+    inference_api_manager = (
+        manage_workspaces().organizations.current.inference_apis
+    )
+    info = inference_api_manager.get(model_name=model_name)
+    token_env = os.environ.get('SINGLESTOREDB_USER_TOKEN')
+    token = api_key if api_key is not None else token_env
+
+    if info.hosting_platform == 'Amazon':
+        # Instantiate Bedrock client
+        cfg_kwargs = {
+            '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
+
+        cfg = Config(**cfg_kwargs)
+        client = boto3.client(
+            'bedrock-runtime',
+            endpoint_url=info.connection_url,
+            region_name='us-east-1',
+            aws_access_key_id='placeholder',
+            aws_secret_access_key='placeholder',
+            config=cfg,
+        )
+
+        def _inject_headers(request: Any, **_ignored: Any) -> None:
+            """Inject dynamic auth/OBO headers prior to Bedrock sending."""
+            if obo_token_getter is not None:
+                obo_val = obo_token_getter()
+                if obo_val:
+                    request.headers['X-S2-OBO'] = obo_val
+            if token:
+                request.headers['Authorization'] = f'Bearer {token}'
+            request.headers.pop('X-Amz-Date', None)
+            request.headers.pop('X-Amz-Security-Token', None)
+
+        emitter = client._endpoint._event_emitter
+        emitter.register_first(
+            'before-send.bedrock-runtime.Converse',
+            _inject_headers,
+        )
+        emitter.register_first(
+            'before-send.bedrock-runtime.ConverseStream',
+            _inject_headers,
+        )
+        emitter.register_first(
+            'before-send.bedrock-runtime.InvokeModel',
+            _inject_headers,
+        )
+        emitter.register_first(
+            'before-send.bedrock-runtime.InvokeModelWithResponseStream',
+            _inject_headers,
+        )
+
+        return ChatBedrockConverse(
+            model_id=model_name,
+            endpoint_url=info.connection_url,
+            region_name='us-east-1',
+            aws_access_key_id='placeholder',
+            aws_secret_access_key='placeholder',
+            disable_streaming=not streaming,
+            client=client,
+            **kwargs,
+        )
+
+    # OpenAI / Azure OpenAI path
+    openai_kwargs = dict(
+        base_url=info.connection_url,
+        api_key=token,
+        model=model_name,
+        streaming=streaming,
+    )
+    if http_client is not None:
+        openai_kwargs['http_client'] = http_client
+    return ChatOpenAI(
+        **openai_kwargs,
+        **kwargs,
+    )

singlestoredb-1.15.7/singlestoredb/ai/embeddings.py

@@ -0,0 +1,125 @@
+import os
+from typing import Any
+from typing import Callable
+from typing import Optional
+from typing import Union
+
+import httpx
+
+from singlestoredb import manage_workspaces
+
+try:
+    from langchain_openai import OpenAIEmbeddings
+except ImportError:
+    raise ImportError(
+        'Could not import langchain_openai python package. '
+        'Please install it with `pip install langchain_openai`.',
+    )
+
+try:
+    from langchain_aws import BedrockEmbeddings
+except ImportError:
+    raise ImportError(
+        'Could not import langchain-aws python package. '
+        'Please install it with `pip install langchain-aws`.',
+    )
+
+import boto3
+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,
+    http_client: Optional[httpx.Client] = None,
+    obo_token_getter: Optional[Callable[[], Optional[str]]] = None,
+    **kwargs: Any,
+) -> Union[OpenAIEmbeddings, BedrockEmbeddings]:
+    """Return an embeddings model instance (OpenAIEmbeddings or BedrockEmbeddings).
+    """
+    inference_api_manager = (
+        manage_workspaces().organizations.current.inference_apis
+    )
+    info = inference_api_manager.get(model_name=model_name)
+    token_env = os.environ.get('SINGLESTOREDB_USER_TOKEN')
+    token = api_key if api_key is not None else token_env
+
+    if info.hosting_platform == 'Amazon':
+        # Instantiate Bedrock client
+        cfg_kwargs = {
+            '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
+
+        cfg = Config(**cfg_kwargs)
+        client = boto3.client(
+            'bedrock-runtime',
+            endpoint_url=info.connection_url,
+            region_name='us-east-1',
+            aws_access_key_id='placeholder',
+            aws_secret_access_key='placeholder',
+            config=cfg,
+        )
+
+        def _inject_headers(request: Any, **_ignored: Any) -> None:
+            """Inject dynamic auth/OBO headers prior to Bedrock sending."""
+            if obo_token_getter is not None:
+                obo_val = obo_token_getter()
+                if obo_val:
+                    request.headers['X-S2-OBO'] = obo_val
+            if token:
+                request.headers['Authorization'] = f'Bearer {token}'
+            request.headers.pop('X-Amz-Date', None)
+            request.headers.pop('X-Amz-Security-Token', None)
+
+        emitter = client._endpoint._event_emitter
+        emitter.register_first(
+            'before-send.bedrock-runtime.InvokeModel',
+            _inject_headers,
+        )
+        emitter.register_first(
+            'before-send.bedrock-runtime.InvokeModelWithResponseStream',
+            _inject_headers,
+        )
+
+        return BedrockEmbeddings(
+            model_id=model_name,
+            endpoint_url=info.connection_url,
+            region_name='us-east-1',
+            aws_access_key_id='placeholder',
+            aws_secret_access_key='placeholder',
+            client=client,
+            **kwargs,
+        )
+
+    # OpenAI / Azure OpenAI path
+    openai_kwargs = dict(
+        base_url=info.connection_url,
+        api_key=token,
+        model=model_name,
+    )
+    if http_client is not None:
+        openai_kwargs['http_client'] = http_client
+    return OpenAIEmbeddings(
+        **openai_kwargs,
+        **kwargs,
+    )

{singlestoredb-1.15.5 → singlestoredb-1.15.7}/singlestoredb/functions/ext/asgi.py

@@ -42,6 +42,7 @@ import tempfile
 import textwrap
 import threading
 import time
+import traceback
 import typing
 import urllib
 import uuid
@@ -709,21 +710,21 @@ class Application(object):
     error_response_dict: Dict[str, Any] = dict(
         type='http.response.start',
         status=500,
-        headers=[(b'content-type', b'application/json')],
+        headers=[(b'content-type', b'text/plain')],
     )
 
     # Timeout response start
     timeout_response_dict: Dict[str, Any] = dict(
         type='http.response.start',
         status=504,
-        headers=[(b'content-type', b'application/json')],
+        headers=[(b'content-type', b'text/plain')],
     )
 
     # Cancel response start
     cancel_response_dict: Dict[str, Any] = dict(
         type='http.response.start',
         status=503,
-        headers=[(b'content-type', b'application/json')],
+        headers=[(b'content-type', b'text/plain')],
     )
 
     # JSON response start
@@ -1247,12 +1248,10 @@ class Application(object):
                         'timeout': func_info['timeout'],
                     },
                 )
-                body = json.dumps(
-                    dict(
-                        error='[TimeoutError] Function call timed out after ' +
-                        str(func_info['timeout']) +
-                        ' seconds',
-                    ),
+                body = (
+                    'TimeoutError: Function call timed out after ' +
+                    str(func_info['timeout']) +
+                    ' seconds'
                 ).encode('utf-8')
                 await send(self.timeout_response_dict)
 
@@ -1265,11 +1264,7 @@ class Application(object):
                         'function_name': func_name.decode('utf-8'),
                     },
                 )
-                body = json.dumps(
-                    dict(
-                        error='[CancelledError] Function call was cancelled',
-                    ),
-                ).encode('utf-8')
+                body = b'CancelledError: Function call was cancelled'
                 await send(self.cancel_response_dict)
 
             except Exception as e:
@@ -1282,11 +1277,12 @@ class Application(object):
                         'exception_type': type(e).__name__,
                     },
                 )
-                body = json.dumps(
-                    dict(
-                        error=f'[{type(e).__name__}] {str(e).strip()}',
-                    ),
-                ).encode('utf-8')
+                msg = traceback.format_exc().strip().split(' File ')[-1]
+                if msg.startswith('"/tmp/ipykernel_'):
+                    msg = 'Line ' + msg.split(', line ')[-1]
+                else:
+                    msg = 'File ' + msg
+                body = msg.encode('utf-8')
                 await send(self.error_response_dict)
 
             finally:

{singlestoredb-1.15.5 → singlestoredb-1.15.7}/singlestoredb/management/inference_api.py

@@ -23,6 +23,7 @@ class InferenceAPIInfo(object):
     name: str
     connection_url: str
     project_id: str
+    hosting_platform: str
 
     def __init__(
         self,
@@ -31,12 +32,14 @@ class InferenceAPIInfo(object):
         name: str,
         connection_url: str,
         project_id: str,
+        hosting_platform: str,
     ):
         self.service_id = service_id
         self.connection_url = connection_url
         self.model_name = model_name
         self.name = name
         self.project_id = project_id
+        self.hosting_platform = hosting_platform
 
     @classmethod
     def from_dict(
@@ -62,6 +65,7 @@ class InferenceAPIInfo(object):
             model_name=obj['modelName'],
             name=obj['name'],
             connection_url=obj['connectionURL'],
+            hosting_platform=obj['hostingPlatform'],
         )
         return out
 

{singlestoredb-1.15.5 → singlestoredb-1.15.7}/singlestoredb/tests/test_management.py

@@ -873,12 +873,20 @@ class TestStage(unittest.TestCase):
     def test_file_object(self):
         st = self.wg.stage
 
-        st.mkdir('obj_test')
-        st.mkdir('obj_test/nest_1')
+        obj_test_dir = f'obj_test_{id(self)}'
 
-        f1 = st.upload_file(TEST_DIR / 'test.sql', 'obj_test.sql')
-        f2 = st.upload_file(TEST_DIR / 'test.sql', 'obj_test/nest_1/obj_test.sql')
-        d2 = st.info('obj_test/nest_1/')
+        st.mkdir(obj_test_dir)
+        st.mkdir(f'{obj_test_dir}/nest_1')
+
+        obj_test_sql = f'obj_test_{id(self)}.sql'
+        obj_test_2_sql = f'obj_test_2_{id(self)}.sql'
+
+        f1 = st.upload_file(TEST_DIR / 'test.sql', obj_test_sql)
+        f2 = st.upload_file(
+            TEST_DIR / 'test.sql',
+            f'{obj_test_dir}/nest_1/{obj_test_sql}',
+        )
+        d2 = st.info(f'{obj_test_dir}/nest_1/')
 
         # is_file / is_dir
         assert not f1.is_dir()
@@ -889,17 +897,17 @@ class TestStage(unittest.TestCase):
         assert not d2.is_file()
 
         # abspath / basename / dirname / exists
-        assert f1.abspath() == 'obj_test.sql'
-        assert f1.basename() == 'obj_test.sql'
+        assert f1.abspath() == obj_test_sql
+        assert f1.basename() == obj_test_sql
         assert f1.dirname() == '/'
         assert f1.exists()
-        assert f2.abspath() == 'obj_test/nest_1/obj_test.sql'
-        assert f2.basename() == 'obj_test.sql'
-        assert f2.dirname() == 'obj_test/nest_1/'
+        assert f2.abspath() == f'{obj_test_dir}/nest_1/{obj_test_sql}'
+        assert f2.basename() == obj_test_sql
+        assert f2.dirname() == f'{obj_test_dir}/nest_1/'
         assert f2.exists()
-        assert d2.abspath() == 'obj_test/nest_1/'
+        assert d2.abspath() == f'{obj_test_dir}/nest_1/'
         assert d2.basename() == 'nest_1'
-        assert d2.dirname() == 'obj_test/'
+        assert d2.dirname() == f'{obj_test_dir}/'
         assert d2.exists()
 
         # download
@@ -910,9 +918,9 @@ class TestStage(unittest.TestCase):
         with self.assertRaises(IsADirectoryError):
             d2.remove()
 
-        assert st.is_file('obj_test.sql')
+        assert st.is_file(obj_test_sql)
         f1.remove()
-        assert not st.is_file('obj_test.sql')
+        assert not st.is_file(obj_test_sql)
 
         # removedirs
         with self.assertRaises(NotADirectoryError):
@@ -923,8 +931,8 @@ class TestStage(unittest.TestCase):
         assert not st.exists(d2.path)
 
         # rmdir
-        f1 = st.upload_file(TEST_DIR / 'test.sql', 'obj_test.sql')
-        d2 = st.mkdir('obj_test/nest_1')
+        f1 = st.upload_file(TEST_DIR / 'test.sql', obj_test_sql)
+        d2 = st.mkdir(f'{obj_test_dir}/nest_1')
 
         assert st.exists(f1.path)
         assert st.exists(d2.path)
@@ -937,20 +945,20 @@ class TestStage(unittest.TestCase):
 
         d2.rmdir()
 
-        assert not st.exists('obj_test/nest_1/')
-        assert not st.exists('obj_test')
+        assert not st.exists(f'{obj_test_dir}/nest_1/')
+        assert not st.exists(obj_test_dir)
 
         # mtime / ctime
         assert f1.getmtime() > 0
         assert f1.getctime() > 0
 
         # rename
-        assert st.exists('obj_test.sql')
-        assert not st.exists('obj_test_2.sql')
-        f1.rename('obj_test_2.sql')
-        assert not st.exists('obj_test.sql')
-        assert st.exists('obj_test_2.sql')
-        assert f1.abspath() == 'obj_test_2.sql'
+        assert st.exists(obj_test_sql)
+        assert not st.exists(obj_test_2_sql)
+        f1.rename(obj_test_2_sql)
+        assert not st.exists(obj_test_sql)
+        assert st.exists(obj_test_2_sql)
+        assert f1.abspath() == obj_test_2_sql
 
 
 @pytest.mark.management

{singlestoredb-1.15.5 → singlestoredb-1.15.7/singlestoredb.egg-info}/PKG-INFO

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

singlestoredb-1.15.5/singlestoredb/ai/__init__.py

@@ -1,2 +0,0 @@
-from .chat import SingleStoreChatOpenAI  # noqa: F401
-from .embeddings import SingleStoreEmbeddings  # noqa: F401

singlestoredb-1.15.5/singlestoredb/ai/chat.py

@@ -1,40 +0,0 @@
-import os
-from typing import Any
-
-from singlestoredb.fusion.handlers.utils import get_workspace_manager
-
-try:
-    from langchain_openai import ChatOpenAI
-except ImportError:
-    raise ImportError(
-        'Could not import langchain_openai python package. '
-        'Please install it with `pip install langchain_openai`.',
-    )
-
-
-class SingleStoreChatOpenAI(ChatOpenAI):
-    def __init__(self, model_name: str, **kwargs: Any):
-        inference_api_manger = (
-            get_workspace_manager().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,
-        )
-
-
-class SingleStoreChat(ChatOpenAI):
-    def __init__(self, model_name: str, **kwargs: Any):
-        inference_api_manger = (
-            get_workspace_manager().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,
-        )

singlestoredb-1.15.5/singlestoredb/ai/embeddings.py

@@ -1,27 +0,0 @@
-import os
-from typing import Any
-
-from singlestoredb.fusion.handlers.utils import get_workspace_manager
-
-try:
-    from langchain_openai import OpenAIEmbeddings
-except ImportError:
-    raise ImportError(
-        'Could not import langchain_openai python package. '
-        'Please install it with `pip install langchain_openai`.',
-    )
-
-
-class SingleStoreEmbeddings(OpenAIEmbeddings):
-
-    def __init__(self, model_name: str, **kwargs: Any):
-        inference_api_manger = (
-            get_workspace_manager().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,
-        )