diff --git a/memorylayer-sdk-python/src/memorylayer/client.py b/memorylayer-sdk-python/src/memorylayer/client.py index 14dd11b..0ead91c 100644 --- a/memorylayer-sdk-python/src/memorylayer/client.py +++ b/memorylayer-sdk-python/src/memorylayer/client.py @@ -783,7 +783,7 @@ async def associate( payload["metadata"] = metadata data = await self._request("POST", f"/memories/{source_id}/associate", json=payload) - return Association(**data) + return Association(**data.get("association", data)) async def get_associations( self, @@ -1379,7 +1379,7 @@ async def get_session(self, session_id: str) -> Session: Session object """ data = await self._request("GET", f"/sessions/{session_id}") - return Session(**data) + return Session(**data.get("session", data)) async def create_checkpoint( self, @@ -1539,7 +1539,7 @@ async def get_briefing( "include_contradictions": str(include_contradictions).lower(), } data = await self._request("GET", "/sessions/briefing", params=params) - return SessionBriefing(**data) + return SessionBriefing(**data.get("briefing", data)) # Workspace methods @@ -1561,7 +1561,7 @@ async def create_workspace(self, name: str, tags: list[str] | None = None) -> Wo if tags is not None: payload["tags"] = tags data = await self._request("POST", "/workspaces", json=payload) - return Workspace(**data) + return Workspace(**data.get("workspace", data)) async def list_workspaces( self, @@ -1607,7 +1607,7 @@ async def get_workspace(self, workspace_id: str | None = None) -> Workspace: raise ValueError("workspace_id must be provided or set on client") data = await self._request("GET", f"/workspaces/{ws_id}") - return Workspace(**data) + return Workspace(**data.get("workspace", data)) async def update_workspace( self, @@ -2451,7 +2451,7 @@ async def create_thread( payload["ownership"] = ownership data = await self._request("POST", "/threads", json=payload) - return ChatThread(**data) + return ChatThread(**data.get("thread", data)) async def list_threads( self, @@ -2561,7 +2561,7 @@ async def get_thread( params["workspace_id"] = ws_id data = await self._request("GET", f"/threads/{thread_id}", params=params or None) - return ChatThread(**data) + return ChatThread(**data.get("thread", data)) async def get_thread_full( self, @@ -2628,7 +2628,7 @@ async def update_thread( payload["metadata"] = metadata data = await self._request("PUT", f"/threads/{thread_id}", params=params or None, json=payload) - return ChatThread(**data) + return ChatThread(**data.get("thread", data)) async def delete_thread( self, @@ -2916,7 +2916,7 @@ async def list_documents( enterprise_feature="Document management", ) docs = [DocumentInfo(**d) for d in data.get("documents", [])] - return docs, data.get("total_count", len(docs)) + return docs, data.get("total_count", data.get("total", len(docs))) async def get_document(self, document_id: str) -> DocumentInfo: """Get document metadata and processing status.""" @@ -3076,7 +3076,7 @@ async def reprocess_document( json=payload if payload else None, enterprise_feature="Document reprocessing", ) - return JobInfo(**data) + return JobInfo(**data.get("job", data)) # ------------------------------------------------------------------ # # Dataset operations (Enterprise) diff --git a/memorylayer-sdk-python/src/memorylayer/sync_client.py b/memorylayer-sdk-python/src/memorylayer/sync_client.py index c1e2ede..2cdb114 100644 --- a/memorylayer-sdk-python/src/memorylayer/sync_client.py +++ b/memorylayer-sdk-python/src/memorylayer/sync_client.py @@ -661,7 +661,7 @@ def associate( payload["metadata"] = metadata data = self._request("POST", f"/memories/{source_id}/associate", json=payload) - return Association(**data) + return Association(**data.get("association", data)) def get_associations( self, @@ -1188,7 +1188,7 @@ def create_session(self, ttl_seconds: int = 3600) -> Session: """ payload = {"ttl_seconds": ttl_seconds} data = self._request("POST", "/sessions", json=payload) - return Session(**data) + return Session(**data.get("session", data)) def list_sessions( self, @@ -1232,7 +1232,7 @@ def get_session(self, session_id: str) -> Session: Session object """ data = self._request("GET", f"/sessions/{session_id}") - return Session(**data) + return Session(**data.get("session", data)) def create_checkpoint( self, @@ -1392,7 +1392,7 @@ def get_briefing( "include_contradictions": str(include_contradictions).lower(), } data = self._request("GET", "/sessions/briefing", params=params) - return SessionBriefing(**data) + return SessionBriefing(**data.get("briefing", data)) def touch_session(self, session_id: str) -> dict[str, Any]: """ @@ -1484,7 +1484,7 @@ def create_workspace(self, name: str, tags: list[str] | None = None) -> Workspac if tags is not None: payload["tags"] = tags data = self._request("POST", "/workspaces", json=payload) - return Workspace(**data) + return Workspace(**data.get("workspace", data)) def list_workspaces( self, @@ -1530,7 +1530,7 @@ def get_workspace(self, workspace_id: str | None = None) -> Workspace: raise ValueError("workspace_id must be provided or set on client") data = self._request("GET", f"/workspaces/{ws_id}") - return Workspace(**data) + return Workspace(**data.get("workspace", data)) def update_workspace( self, @@ -1850,7 +1850,7 @@ def create_thread( payload["ownership"] = ownership data = self._request("POST", "/threads", json=payload) - return ChatThread(**data) + return ChatThread(**data.get("thread", data)) def list_threads( self, @@ -1957,7 +1957,7 @@ def get_thread( params["workspace_id"] = ws_id data = self._request("GET", f"/threads/{thread_id}", params=params or None) - return ChatThread(**data) + return ChatThread(**data.get("thread", data)) def get_thread_full( self, @@ -2193,7 +2193,7 @@ def list_documents( enterprise_feature="Document management", ) docs = [DocumentInfo(**d) for d in data.get("documents", [])] - return docs, data.get("total_count", len(docs)) + return docs, data.get("total_count", data.get("total", len(docs))) def get_document(self, document_id: str) -> DocumentInfo: """Get document metadata and processing status.""" @@ -2336,7 +2336,7 @@ def reprocess_document( json=payload if payload else None, enterprise_feature="Document reprocessing", ) - return JobInfo(**data) + return JobInfo(**data.get("job", data)) # ------------------------------------------------------------------ # # Dataset operations (Enterprise) diff --git a/memorylayer-sdk-python/tests/test_response_envelopes.py b/memorylayer-sdk-python/tests/test_response_envelopes.py new file mode 100644 index 0000000..7dd2e42 --- /dev/null +++ b/memorylayer-sdk-python/tests/test_response_envelopes.py @@ -0,0 +1,233 @@ +"""Regression tests for parsing the server's wrapped single-resource responses. + +The server returns ``{"session": {...}}`` (SessionResponse / SessionStartResponse) +and ``{"thread": {...}}`` (ThreadResponse) envelopes. The clients must unwrap +them, while still accepting a bare object for backward compatibility. +""" + +import pytest +import respx +from httpx import Response + +from memorylayer import MemoryLayerClient, SyncMemoryLayerClient + +BASE_URL = "http://test.memorylayer.ai" + +SESSION = { + "id": "sess_123", + "workspace_id": "ws_test", + "metadata": {}, + "expires_at": "2026-01-26T11:00:00Z", + "created_at": "2026-01-26T10:00:00Z", +} + +THREAD = { + "id": "thr_1", + "workspace_id": "ws_test", + "tenant_id": "_default", + "context_id": "_default", + "metadata": {}, + "message_count": 0, + "last_decomposed_index": 0, + "created_at": "2026-01-26T10:00:00Z", + "updated_at": "2026-01-26T10:00:00Z", + "ownership": "workspace", +} + + +@pytest.fixture +def async_client() -> MemoryLayerClient: + return MemoryLayerClient(base_url=BASE_URL, api_key="test_key", workspace_id="ws_test") + + +@pytest.fixture +def sync_client() -> SyncMemoryLayerClient: + return SyncMemoryLayerClient(base_url=BASE_URL, api_key="test_key", workspace_id="ws_test") + + +@pytest.mark.parametrize("body", [{"session": SESSION}, SESSION], ids=["wrapped", "bare"]) +@pytest.mark.asyncio +@respx.mock +async def test_async_get_session_parses_response(async_client: MemoryLayerClient, body: dict) -> None: + respx.get(f"{BASE_URL}/v1/sessions/sess_123").mock(return_value=Response(200, json=body)) + + async with async_client: + session = await async_client.get_session("sess_123") + + assert session.id == "sess_123" + assert session.workspace_id == "ws_test" + + +@pytest.mark.parametrize("body", [{"session": SESSION}, SESSION], ids=["wrapped", "bare"]) +@respx.mock +def test_sync_get_session_parses_response(sync_client: SyncMemoryLayerClient, body: dict) -> None: + respx.get(f"{BASE_URL}/v1/sessions/sess_123").mock(return_value=Response(200, json=body)) + + with sync_client: + session = sync_client.get_session("sess_123") + + assert session.id == "sess_123" + + +@respx.mock +def test_sync_create_session_parses_wrapped_response(sync_client: SyncMemoryLayerClient) -> None: + respx.post(f"{BASE_URL}/v1/sessions").mock( + return_value=Response(200, json={"session": SESSION, "briefing": None}), + ) + + with sync_client: + session = sync_client.create_session(ttl_seconds=3600) + + assert session.id == "sess_123" + + +@pytest.mark.parametrize("body", [{"thread": THREAD}, THREAD], ids=["wrapped", "bare"]) +@pytest.mark.asyncio +@respx.mock +async def test_async_thread_methods_parse_response(async_client: MemoryLayerClient, body: dict) -> None: + respx.post(f"{BASE_URL}/v1/threads").mock(return_value=Response(201, json=body)) + respx.get(f"{BASE_URL}/v1/threads/thr_1").mock(return_value=Response(200, json=body)) + respx.put(f"{BASE_URL}/v1/threads/thr_1").mock(return_value=Response(200, json=body)) + + async with async_client: + created = await async_client.create_thread(ownership="workspace") + fetched = await async_client.get_thread("thr_1") + updated = await async_client.update_thread("thr_1", title="Renamed") + + assert created.id == fetched.id == updated.id == "thr_1" + + +@pytest.mark.parametrize("body", [{"thread": THREAD}, THREAD], ids=["wrapped", "bare"]) +@respx.mock +def test_sync_thread_methods_parse_response(sync_client: SyncMemoryLayerClient, body: dict) -> None: + respx.post(f"{BASE_URL}/v1/threads").mock(return_value=Response(201, json=body)) + respx.get(f"{BASE_URL}/v1/threads/thr_1").mock(return_value=Response(200, json=body)) + + with sync_client: + created = sync_client.create_thread(ownership="workspace") + fetched = sync_client.get_thread("thr_1") + + assert created.id == fetched.id == "thr_1" + + +WORKSPACE = { + "id": "ws_test", + "tenant_id": "_default", + "name": "Test", + "created_at": "2026-01-26T10:00:00Z", + "updated_at": "2026-01-26T10:00:00Z", +} + +BRIEFING = {"workspace_summary": {"total_memories": 3}} + +ASSOCIATION = { + "id": "assoc_1", + "workspace_id": "ws_test", + "source_id": "mem_1", + "target_id": "mem_2", + "relationship": "related_to", + "strength": 0.5, + "metadata": {}, + "created_at": "2026-01-26T10:00:00Z", +} + +DOCUMENT = { + "id": "doc_1", + "workspace_id": "ws_test", + "filename": "a.pdf", + "document_type": "pdf", + "content_hash": "abc", + "size_bytes": 10, + "status": "pending", + "created_at": "2026-01-26T10:00:00Z", +} + +JOB = {"id": "job_1", "workspace_id": "ws_test", "status": "pending", "created_at": "2026-01-26T10:00:00Z"} + + +def _mock_misc_routes(workspace_body: dict, briefing_body: dict, association_body: dict, reprocess_body: dict) -> None: + respx.post(f"{BASE_URL}/v1/workspaces").mock(return_value=Response(200, json=workspace_body)) + respx.get(f"{BASE_URL}/v1/workspaces/ws_test").mock(return_value=Response(200, json=workspace_body)) + respx.get(url__startswith=f"{BASE_URL}/v1/sessions/briefing").mock(return_value=Response(200, json=briefing_body)) + respx.post(f"{BASE_URL}/v1/memories/mem_1/associate").mock(return_value=Response(200, json=association_body)) + respx.post(f"{BASE_URL}/v1/documents/doc_1/reprocess").mock(return_value=Response(200, json=reprocess_body)) + + +MISC_CASES = [ + pytest.param( + {"workspace": WORKSPACE}, + {"briefing": BRIEFING}, + {"association": ASSOCIATION}, + {"document": DOCUMENT, "job": JOB}, + id="wrapped", + ), + pytest.param(WORKSPACE, BRIEFING, ASSOCIATION, JOB, id="bare"), +] + + +@pytest.mark.parametrize(("ws", "briefing", "assoc", "reprocess"), MISC_CASES) +@pytest.mark.asyncio +@respx.mock +async def test_async_misc_methods_parse_response( + async_client: MemoryLayerClient, ws: dict, briefing: dict, assoc: dict, reprocess: dict +) -> None: + _mock_misc_routes(ws, briefing, assoc, reprocess) + + async with async_client: + created = await async_client.create_workspace("Test") + fetched = await async_client.get_workspace("ws_test") + got_briefing = await async_client.get_briefing() + association = await async_client.associate("mem_1", "mem_2", "related_to") + job = await async_client.reprocess_document("doc_1") + + assert created.id == fetched.id == "ws_test" + assert got_briefing.workspace_summary == {"total_memories": 3} + assert association.id == "assoc_1" + assert job.id == "job_1" + + +@pytest.mark.parametrize(("ws", "briefing", "assoc", "reprocess"), MISC_CASES) +@respx.mock +def test_sync_misc_methods_parse_response( + sync_client: SyncMemoryLayerClient, ws: dict, briefing: dict, assoc: dict, reprocess: dict +) -> None: + _mock_misc_routes(ws, briefing, assoc, reprocess) + + with sync_client: + created = sync_client.create_workspace("Test") + fetched = sync_client.get_workspace("ws_test") + got_briefing = sync_client.get_briefing() + association = sync_client.associate("mem_1", "mem_2", "related_to") + job = sync_client.reprocess_document("doc_1") + + assert created.id == fetched.id == "ws_test" + assert got_briefing.workspace_summary == {"total_memories": 3} + assert association.id == "assoc_1" + assert job.id == "job_1" + + +@pytest.mark.asyncio +@respx.mock +async def test_async_list_documents_uses_server_total(async_client: MemoryLayerClient) -> None: + respx.get(url__startswith=f"{BASE_URL}/v1/documents").mock( + return_value=Response(200, json={"documents": [DOCUMENT], "total": 7, "limit": 1, "offset": 0}), + ) + + async with async_client: + docs, total = await async_client.list_documents(limit=1) + + assert [d.id for d in docs] == ["doc_1"] + assert total == 7 + + +@respx.mock +def test_sync_list_documents_uses_server_total(sync_client: SyncMemoryLayerClient) -> None: + respx.get(url__startswith=f"{BASE_URL}/v1/documents").mock( + return_value=Response(200, json={"documents": [DOCUMENT], "total": 7, "limit": 1, "offset": 0}), + ) + + with sync_client: + docs, total = sync_client.list_documents(limit=1) + + assert [d.id for d in docs] == ["doc_1"] + assert total == 7