supermemory 3.0.0a1__py3-none-any.whl → 3.0.0a2__py3-none-any.whl

supermemory/__init__.py

@@ -36,7 +36,7 @@ from ._exceptions import (
     UnprocessableEntityError,
     APIResponseValidationError,
 )
-from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
+from ._base_client import DefaultHttpxClient, DefaultAioHttpClient, DefaultAsyncHttpxClient
 from ._utils._logs import setup_logging as _setup_logging
 
 __all__ = [
@@ -78,6 +78,7 @@ __all__ = [
     "DEFAULT_CONNECTION_LIMITS",
     "DefaultHttpxClient",
     "DefaultAsyncHttpxClient",
+    "DefaultAioHttpClient",
 ]
 
 if not _t.TYPE_CHECKING:

supermemory/_base_client.py

@@ -960,6 +960,9 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
             if self.custom_auth is not None:
                 kwargs["auth"] = self.custom_auth
 
+            if options.follow_redirects is not None:
+                kwargs["follow_redirects"] = options.follow_redirects
+
             log.debug("Sending HTTP Request: %s %s", request.method, request.url)
 
             response = None
@@ -1068,7 +1071,14 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, APIResponse):
                 raise TypeError(f"API Response types must subclass {APIResponse}; Received {origin}")
 
@@ -1279,6 +1289,24 @@ class _DefaultAsyncHttpxClient(httpx.AsyncClient):
         super().__init__(**kwargs)
 
 
+try:
+    import httpx_aiohttp
+except ImportError:
+
+    class _DefaultAioHttpClient(httpx.AsyncClient):
+        def __init__(self, **_kwargs: Any) -> None:
+            raise RuntimeError("To use the aiohttp client you must have installed the package with the `aiohttp` extra")
+else:
+
+    class _DefaultAioHttpClient(httpx_aiohttp.HttpxAiohttpClient):  # type: ignore
+        def __init__(self, **kwargs: Any) -> None:
+            kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
+            kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
+            kwargs.setdefault("follow_redirects", True)
+
+            super().__init__(**kwargs)
+
+
 if TYPE_CHECKING:
     DefaultAsyncHttpxClient = httpx.AsyncClient
     """An alias to `httpx.AsyncClient` that provides the same defaults that this SDK
@@ -1287,8 +1315,12 @@ if TYPE_CHECKING:
     This is useful because overriding the `http_client` with your own instance of
     `httpx.AsyncClient` will result in httpx's defaults being used, not ours.
     """
+
+    DefaultAioHttpClient = httpx.AsyncClient
+    """An alias to `httpx.AsyncClient` that changes the default HTTP transport to `aiohttp`."""
 else:
     DefaultAsyncHttpxClient = _DefaultAsyncHttpxClient
+    DefaultAioHttpClient = _DefaultAioHttpClient
 
 
 class AsyncHttpxClientWrapper(DefaultAsyncHttpxClient):
@@ -1460,6 +1492,9 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
             if self.custom_auth is not None:
                 kwargs["auth"] = self.custom_auth
 
+            if options.follow_redirects is not None:
+                kwargs["follow_redirects"] = options.follow_redirects
+
             log.debug("Sending HTTP Request: %s %s", request.method, request.url)
 
             response = None
@@ -1568,7 +1603,14 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, AsyncAPIResponse):
                 raise TypeError(f"API Response types must subclass {AsyncAPIResponse}; Received {origin}")
 

supermemory/_client.py

@@ -21,7 +21,7 @@ from ._types import (
 )
 from ._utils import is_given, get_async_library
 from ._version import __version__
-from .resources import search, memories, settings, connections
+from .resources import memories, settings, connections
 from ._streaming import Stream as Stream, AsyncStream as AsyncStream
 from ._exceptions import APIStatusError, SupermemoryError
 from ._base_client import (
@@ -44,7 +44,6 @@ __all__ = [
 
 class Supermemory(SyncAPIClient):
     memories: memories.MemoriesResource
-    search: search.SearchResource
     settings: settings.SettingsResource
     connections: connections.ConnectionsResource
     with_raw_response: SupermemoryWithRawResponse
@@ -105,7 +104,6 @@ class Supermemory(SyncAPIClient):
         )
 
         self.memories = memories.MemoriesResource(self)
-        self.search = search.SearchResource(self)
         self.settings = settings.SettingsResource(self)
         self.connections = connections.ConnectionsResource(self)
         self.with_raw_response = SupermemoryWithRawResponse(self)
@@ -218,7 +216,6 @@ class Supermemory(SyncAPIClient):
 
 class AsyncSupermemory(AsyncAPIClient):
     memories: memories.AsyncMemoriesResource
-    search: search.AsyncSearchResource
     settings: settings.AsyncSettingsResource
     connections: connections.AsyncConnectionsResource
     with_raw_response: AsyncSupermemoryWithRawResponse
@@ -279,7 +276,6 @@ class AsyncSupermemory(AsyncAPIClient):
         )
 
         self.memories = memories.AsyncMemoriesResource(self)
-        self.search = search.AsyncSearchResource(self)
         self.settings = settings.AsyncSettingsResource(self)
         self.connections = connections.AsyncConnectionsResource(self)
         self.with_raw_response = AsyncSupermemoryWithRawResponse(self)
@@ -393,7 +389,6 @@ class AsyncSupermemory(AsyncAPIClient):
 class SupermemoryWithRawResponse:
     def __init__(self, client: Supermemory) -> None:
         self.memories = memories.MemoriesResourceWithRawResponse(client.memories)
-        self.search = search.SearchResourceWithRawResponse(client.search)
         self.settings = settings.SettingsResourceWithRawResponse(client.settings)
         self.connections = connections.ConnectionsResourceWithRawResponse(client.connections)
 
@@ -401,7 +396,6 @@ class SupermemoryWithRawResponse:
 class AsyncSupermemoryWithRawResponse:
     def __init__(self, client: AsyncSupermemory) -> None:
         self.memories = memories.AsyncMemoriesResourceWithRawResponse(client.memories)
-        self.search = search.AsyncSearchResourceWithRawResponse(client.search)
         self.settings = settings.AsyncSettingsResourceWithRawResponse(client.settings)
         self.connections = connections.AsyncConnectionsResourceWithRawResponse(client.connections)
 
@@ -409,7 +403,6 @@ class AsyncSupermemoryWithRawResponse:
 class SupermemoryWithStreamedResponse:
     def __init__(self, client: Supermemory) -> None:
         self.memories = memories.MemoriesResourceWithStreamingResponse(client.memories)
-        self.search = search.SearchResourceWithStreamingResponse(client.search)
         self.settings = settings.SettingsResourceWithStreamingResponse(client.settings)
         self.connections = connections.ConnectionsResourceWithStreamingResponse(client.connections)
 
@@ -417,7 +410,6 @@ class SupermemoryWithStreamedResponse:
 class AsyncSupermemoryWithStreamedResponse:
     def __init__(self, client: AsyncSupermemory) -> None:
         self.memories = memories.AsyncMemoriesResourceWithStreamingResponse(client.memories)
-        self.search = search.AsyncSearchResourceWithStreamingResponse(client.search)
         self.settings = settings.AsyncSettingsResourceWithStreamingResponse(client.settings)
         self.connections = connections.AsyncConnectionsResourceWithStreamingResponse(client.connections)
 

supermemory/_files.py

@@ -34,7 +34,7 @@ def assert_is_file_content(obj: object, *, key: str | None = None) -> None:
     if not is_file_content(obj):
         prefix = f"Expected entry at `{key}`" if key is not None else f"Expected file input `{obj!r}`"
         raise RuntimeError(
-            f"{prefix} to be bytes, an io.IOBase instance, PathLike or a tuple but received {type(obj)} instead. See https://github.com/supermemoryai/python-sdk/tree/main#file-uploads"
+            f"{prefix} to be bytes, an io.IOBase instance, PathLike or a tuple but received {type(obj)} instead."
         ) from None
 
 

supermemory/_models.py

@@ -737,6 +737,7 @@ class FinalRequestOptionsInput(TypedDict, total=False):
     idempotency_key: str
     json_data: Body
     extra_json: AnyMapping
+    follow_redirects: bool
 
 
 @final
@@ -750,6 +751,7 @@ class FinalRequestOptions(pydantic.BaseModel):
     files: Union[HttpxRequestFiles, None] = None
     idempotency_key: Union[str, None] = None
     post_parser: Union[Callable[[Any], Any], NotGiven] = NotGiven()
+    follow_redirects: Union[bool, None] = None
 
     # It should be noted that we cannot use `json` here as that would override
     # a BaseModel method in an incompatible fashion.

supermemory/_types.py

@@ -100,6 +100,7 @@ class RequestOptions(TypedDict, total=False):
     params: Query
     extra_json: AnyMapping
     idempotency_key: str
+    follow_redirects: bool
 
 
 # Sentinel class used until PEP 0661 is accepted
@@ -215,3 +216,4 @@ class _GenericAlias(Protocol):
 
 class HttpxSendArgs(TypedDict, total=False):
     auth: httpx.Auth
+    follow_redirects: bool

supermemory/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "supermemory"
-__version__ = "3.0.0-alpha.1"  # x-release-please-version
+__version__ = "3.0.0-alpha.2"  # x-release-please-version

supermemory/resources/__init__.py

@@ -1,13 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .search import (
-    SearchResource,
-    AsyncSearchResource,
-    SearchResourceWithRawResponse,
-    AsyncSearchResourceWithRawResponse,
-    SearchResourceWithStreamingResponse,
-    AsyncSearchResourceWithStreamingResponse,
-)
 from .memories import (
     MemoriesResource,
     AsyncMemoriesResource,
@@ -40,12 +32,6 @@ __all__ = [
     "AsyncMemoriesResourceWithRawResponse",
     "MemoriesResourceWithStreamingResponse",
     "AsyncMemoriesResourceWithStreamingResponse",
-    "SearchResource",
-    "AsyncSearchResource",
-    "SearchResourceWithRawResponse",
-    "AsyncSearchResourceWithRawResponse",
-    "SearchResourceWithStreamingResponse",
-    "AsyncSearchResourceWithStreamingResponse",
     "SettingsResource",
     "AsyncSettingsResource",
     "SettingsResourceWithRawResponse",

supermemory/resources/connections.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Dict, Union, Optional
+from typing import Dict, List, Union, Optional
 from typing_extensions import Literal
 
 import httpx
 
-from ..types import connection_list_params, connection_create_params
+from ..types import connection_create_params
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
@@ -20,7 +20,6 @@ from .._response import (
 )
 from .._base_client import make_request_options
 from ..types.connection_get_response import ConnectionGetResponse
-from ..types.connection_list_response import ConnectionListResponse
 from ..types.connection_create_response import ConnectionCreateResponse
 
 __all__ = ["ConnectionsResource", "AsyncConnectionsResource"]
@@ -50,9 +49,10 @@ class ConnectionsResource(SyncAPIResource):
         self,
         provider: Literal["notion", "google-drive", "onedrive"],
         *,
-        end_user_id: str | NotGiven = NOT_GIVEN,
-        redirect_url: str | NotGiven = NOT_GIVEN,
+        container_tags: List[str] | NotGiven = NOT_GIVEN,
+        document_limit: int | NotGiven = NOT_GIVEN,
         metadata: Optional[Dict[str, Union[str, float, bool]]] | NotGiven = NOT_GIVEN,
+        redirect_url: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -76,56 +76,19 @@ class ConnectionsResource(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `provider` but received {provider!r}")
         return self._post(
             f"/v3/connections/{provider}",
-            body=maybe_transform({"metadata": metadata}, connection_create_params.ConnectionCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "end_user_id": end_user_id,
-                        "redirect_url": redirect_url,
-                    },
-                    connection_create_params.ConnectionCreateParams,
-                ),
+            body=maybe_transform(
+                {
+                    "container_tags": container_tags,
+                    "document_limit": document_limit,
+                    "metadata": metadata,
+                    "redirect_url": redirect_url,
+                },
+                connection_create_params.ConnectionCreateParams,
             ),
-            cast_to=ConnectionCreateResponse,
-        )
-
-    def list(
-        self,
-        *,
-        end_user_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectionListResponse:
-        """
-        List all connections
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        return self._get(
-            "/v3/connections",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform({"end_user_id": end_user_id}, connection_list_params.ConnectionListParams),
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=ConnectionListResponse,
+            cast_to=ConnectionCreateResponse,
         )
 
     def get(
@@ -140,7 +103,7 @@ class ConnectionsResource(SyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> ConnectionGetResponse:
         """
-        Get connection details
+        Get connection details with id
 
         Args:
           extra_headers: Send extra headers
@@ -186,9 +149,10 @@ class AsyncConnectionsResource(AsyncAPIResource):
         self,
         provider: Literal["notion", "google-drive", "onedrive"],
         *,
-        end_user_id: str | NotGiven = NOT_GIVEN,
-        redirect_url: str | NotGiven = NOT_GIVEN,
+        container_tags: List[str] | NotGiven = NOT_GIVEN,
+        document_limit: int | NotGiven = NOT_GIVEN,
         metadata: Optional[Dict[str, Union[str, float, bool]]] | NotGiven = NOT_GIVEN,
+        redirect_url: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -212,58 +176,19 @@ class AsyncConnectionsResource(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `provider` but received {provider!r}")
         return await self._post(
             f"/v3/connections/{provider}",
-            body=await async_maybe_transform({"metadata": metadata}, connection_create_params.ConnectionCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "end_user_id": end_user_id,
-                        "redirect_url": redirect_url,
-                    },
-                    connection_create_params.ConnectionCreateParams,
-                ),
+            body=await async_maybe_transform(
+                {
+                    "container_tags": container_tags,
+                    "document_limit": document_limit,
+                    "metadata": metadata,
+                    "redirect_url": redirect_url,
+                },
+                connection_create_params.ConnectionCreateParams,
             ),
-            cast_to=ConnectionCreateResponse,
-        )
-
-    async def list(
-        self,
-        *,
-        end_user_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectionListResponse:
-        """
-        List all connections
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        return await self._get(
-            "/v3/connections",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {"end_user_id": end_user_id}, connection_list_params.ConnectionListParams
-                ),
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=ConnectionListResponse,
+            cast_to=ConnectionCreateResponse,
         )
 
     async def get(
@@ -278,7 +203,7 @@ class AsyncConnectionsResource(AsyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> ConnectionGetResponse:
         """
-        Get connection details
+        Get connection details with id
 
         Args:
           extra_headers: Send extra headers
@@ -307,9 +232,6 @@ class ConnectionsResourceWithRawResponse:
         self.create = to_raw_response_wrapper(
             connections.create,
         )
-        self.list = to_raw_response_wrapper(
-            connections.list,
-        )
         self.get = to_raw_response_wrapper(
             connections.get,
         )
@@ -322,9 +244,6 @@ class AsyncConnectionsResourceWithRawResponse:
         self.create = async_to_raw_response_wrapper(
             connections.create,
         )
-        self.list = async_to_raw_response_wrapper(
-            connections.list,
-        )
         self.get = async_to_raw_response_wrapper(
             connections.get,
         )
@@ -337,9 +256,6 @@ class ConnectionsResourceWithStreamingResponse:
         self.create = to_streamed_response_wrapper(
             connections.create,
         )
-        self.list = to_streamed_response_wrapper(
-            connections.list,
-        )
         self.get = to_streamed_response_wrapper(
             connections.get,
         )
@@ -352,9 +268,6 @@ class AsyncConnectionsResourceWithStreamingResponse:
         self.create = async_to_streamed_response_wrapper(
             connections.create,
         )
-        self.list = async_to_streamed_response_wrapper(
-            connections.list,
-        )
         self.get = async_to_streamed_response_wrapper(
             connections.get,
         )