Skip to content

fix: allow copied clients to clear default headers and query #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Kayvan-Zahiri wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: allow copied clients to clear default headers and query #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions custom/supermemory/_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,22 @@ def copy(
options = dict(self._options)
if self._owned_http_client:
options["http_client"] = self._http_client
options["default_headers"] = set_default_headers or {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
options["default_query"] = set_default_query or {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
options["default_headers"] = (
set_default_headers
if set_default_headers is not None
else {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
)
options["default_query"] = (
set_default_query
if set_default_query is not None
else {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
)
options.update(overrides)
return type(self)(**options)

Expand Down Expand Up @@ -515,14 +523,22 @@ def copy(
options = dict(self._options)
if self._owned_http_client:
options["http_client"] = self._http_client
options["default_headers"] = set_default_headers or {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
options["default_query"] = set_default_query or {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
options["default_headers"] = (
set_default_headers
if set_default_headers is not None
else {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
)
options["default_query"] = (
set_default_query
if set_default_query is not None
else {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
)
options.update(overrides)
return type(self)(**options)

Expand Down
48 changes: 32 additions & 16 deletions src/supermemory/_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,22 @@ def copy(
options = dict(self._options)
if self._owned_http_client:
options["http_client"] = self._http_client
options["default_headers"] = set_default_headers or {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
options["default_query"] = set_default_query or {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
options["default_headers"] = (
set_default_headers
if set_default_headers is not None
else {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
)
options["default_query"] = (
set_default_query
if set_default_query is not None
else {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
)
options.update(overrides)
return type(self)(**options)

Expand Down Expand Up @@ -515,14 +523,22 @@ def copy(
options = dict(self._options)
if self._owned_http_client:
options["http_client"] = self._http_client
options["default_headers"] = set_default_headers or {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
options["default_query"] = set_default_query or {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
options["default_headers"] = (
set_default_headers
if set_default_headers is not None
else {
**options["default_headers"],
**(overrides.pop("default_headers", None) or {}),
}
)
options["default_query"] = (
set_default_query
if set_default_query is not None
else {
**options["default_query"],
**(overrides.pop("default_query", None) or {}),
}
)
options.update(overrides)
return type(self)(**options)

Expand Down
94 changes: 94 additions & 0 deletions tests/test_copy_defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
from typing import Any

import httpx
import pytest

from supermemory import AsyncSupermemory, Supermemory

CASES = [
({"set_default_headers": {}}, {}, {"trace": "original"}),
({"set_default_query": {}}, {"x-context": "original"}, {}),
({"set_default_headers": {}, "set_default_query": {}}, {}, {}),
({"set_default_headers": None, "set_default_query": None}, {"x-context": "original"}, {"trace": "original"}),
(
{"set_default_headers": {"X-New": "replacement"}, "set_default_query": {"new": "replacement"}},
{"x-new": "replacement"},
{"new": "replacement"},
),
(
{"default_headers": {"X-New": "additional"}, "default_query": {"new": "additional"}},
{"x-context": "original", "x-new": "additional"},
{"trace": "original", "new": "additional"},
),
]


@pytest.fixture(autouse=True)
def clear_custom_headers(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.delenv("SUPERMEMORY_CUSTOM_HEADERS", raising=False)


def verify(request: httpx.Request, headers: dict[str, str], query: dict[str, str]) -> None:
assert {k: v for k, v in request.headers.items() if k in ("x-context", "x-new")} == headers
assert dict(request.url.params) == query
assert request.headers["authorization"] == "Bearer sm_test"


@pytest.mark.parametrize("method", ["copy", "with_options"])
@pytest.mark.parametrize("options,headers,query", CASES)
def test_sync_copy_replaces_or_merges_defaults(
method: str, options: dict[str, Any], headers: dict[str, str], query: dict[str, str]
) -> None:
seen = []

def handle(request: httpx.Request) -> httpx.Response:
seen.append(request)
return httpx.Response(
200,
json={"namespaces": [], "pagination": {"currentPage": 1, "limit": 10, "totalItems": 0, "totalPages": 0}},
)

with httpx.Client(transport=httpx.MockTransport(handle)) as transport:
client = Supermemory(
api_key="sm_test",
http_client=transport,
default_headers={"X-Context": "original"},
default_query={"trace": "original"},
)
derived = getattr(client, method)(**options)
derived.namespaces.list()
client.namespaces.list()

assert len(seen) == 2
verify(seen[0], headers, query)
verify(seen[1], {"x-context": "original"}, {"trace": "original"})


@pytest.mark.parametrize("method", ["copy", "with_options"])
@pytest.mark.parametrize("options,headers,query", CASES)
async def test_async_copy_replaces_or_merges_defaults(
method: str, options: dict[str, Any], headers: dict[str, str], query: dict[str, str]
) -> None:
seen = []

def handle(request: httpx.Request) -> httpx.Response:
seen.append(request)
return httpx.Response(
200,
json={"namespaces": [], "pagination": {"currentPage": 1, "limit": 10, "totalItems": 0, "totalPages": 0}},
)

async with httpx.AsyncClient(transport=httpx.MockTransport(handle)) as transport:
client = AsyncSupermemory(
api_key="sm_test",
http_client=transport,
default_headers={"X-Context": "original"},
default_query={"trace": "original"},
)
derived = getattr(client, method)(**options)
await derived.namespaces.list()
await client.namespaces.list()

assert len(seen) == 2
verify(seen[0], headers, query)
verify(seen[1], {"x-context": "original"}, {"trace": "original"})