Skip to content

Commit 7c12d30

Browse files
ehz0ahktz03
andauthored
fix(langchain): preserve recall inputs and context metadata (#6338)
* fix(langchain): keep session IDs out of stateless retrieval (cherry picked from commit faede6a) Signed-off-by: Hao Zhe <[email protected]> * fix(langchain): recall supported current message inputs (cherry picked from commit d8d0237) Signed-off-by: Hao Zhe <[email protected]> * fix(langchain): preserve system messages during context injection (cherry picked from commit 2b3ed8f) Signed-off-by: Hao Zhe <[email protected]> * fix(langchain): preserve configured metadata in recall references (cherry picked from commit 37a8462) Signed-off-by: Hao Zhe <[email protected]> * test(langchain): cover recall and context preservation across lifecycle paths Keep SDK option coverage in the existing adapter suite. Extend public sync and async contracts for configured metadata through recording, tuple and dictionary policy inputs, and completed streams without mutating caller messages. Signed-off-by: Hao Zhe <[email protected]> * fix(langchain): use the configured string input for recall Prefer the configured current-message string over unrelated prompt fields, independent of dictionary order. Extend the public sync, async and streaming host-history contract to expose the original failure. Signed-off-by: Hao Zhe <[email protected]> --------- Signed-off-by: Hao Zhe <[email protected]> Co-authored-by: ktz03 <[email protected]>
1 parent 3a5733f commit 7c12d30

6 files changed

Lines changed: 305 additions & 31 deletions

File tree

‎integrations/frameworks/langchain/src/langchain_openviking/context.py‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,9 @@ def _assembled_context(
314314
block = self._format_context_block(session_context, recall_documents)
315315
return OpenVikingAssembledContext(
316316
block=block,
317-
context_parts=context_parts_from_documents(recall_documents),
317+
context_parts=context_parts_from_documents(
318+
recall_documents, metadata_prefix=self.retriever.metadata_prefix
319+
),
318320
session_context=session_context,
319321
recall_documents=recall_documents,
320322
)
@@ -911,20 +913,23 @@ def _latest_user_text_from_input(input_value: Any, input_messages_key: str | Non
911913
if isinstance(input_value, str):
912914
return input_value
913915
if isinstance(input_value, dict):
916+
value = input_value.get(input_messages_key or "messages")
917+
if isinstance(value, str):
918+
return value.strip()
914919
for value in input_value.values():
915920
if isinstance(value, str) and value.strip():
916921
return value.strip()
917922
return ""
918923

919924

920925
def _input_messages(input_value: Any, input_messages_key: str | None) -> list[Any]:
921-
if isinstance(input_value, list):
922-
return list(input_value)
923926
if isinstance(input_value, dict):
924927
key = input_messages_key or "messages"
925-
value = input_value.get(key)
926-
if isinstance(value, list):
927-
return list(value)
928+
input_value = input_value.get(key)
929+
if isinstance(input_value, (list, tuple)):
930+
return list(input_value)
931+
if isinstance(input_value, BaseMessage):
932+
return [input_value]
928933
return []
929934

930935

@@ -933,13 +938,17 @@ def _inject_system_context(
933938
context_block: str,
934939
input_messages_key: str | None,
935940
) -> Any:
936-
if isinstance(input_value, list):
937-
return _merge_system_message(input_value, context_block)
941+
if isinstance(input_value, (list, tuple, BaseMessage)):
942+
return _merge_system_message(
943+
_input_messages(input_value, input_messages_key), context_block
944+
)
938945
if isinstance(input_value, dict):
939946
key = input_messages_key or "messages"
940-
if isinstance(input_value.get(key), list):
947+
if isinstance(input_value.get(key), (list, tuple, BaseMessage)):
941948
updated = dict(input_value)
942-
updated[key] = _merge_system_message(input_value[key], context_block)
949+
updated[key] = _merge_system_message(
950+
_input_messages(input_value, input_messages_key), context_block
951+
)
943952
return updated
944953
updated = dict(input_value)
945954
updated["openviking_context"] = context_block
@@ -951,8 +960,12 @@ def _merge_system_message(messages: Sequence[Any], context_block: str) -> list[A
951960
updated = list(messages)
952961
for index, message in enumerate(updated):
953962
if isinstance(message, SystemMessage):
954-
content = extract_message_text(message.content)
955-
updated[index] = SystemMessage(content=f"{content}\n\n{context_block}".strip())
963+
content = (
964+
[*deepcopy(message.content), {"type": "text", "text": context_block}]
965+
if isinstance(message.content, list)
966+
else f"{extract_message_text(message.content)}\n\n{context_block}".strip()
967+
)
968+
updated[index] = message.model_copy(update={"content": content})
956969
return updated
957970
return [SystemMessage(content=context_block), *updated]
958971

‎integrations/frameworks/langchain/src/langchain_openviking/history.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,21 +269,23 @@ def _acknowledge_context_parts(self) -> None:
269269
)
270270

271271

272-
def context_parts_from_documents(documents: Sequence[Any]) -> list[dict[str, Any]]:
272+
def context_parts_from_documents(
273+
documents: Sequence[Any], *, metadata_prefix: str = "openviking"
274+
) -> list[dict[str, Any]]:
273275
"""Build OpenViking ContextPart dictionaries from LangChain Documents."""
274276

275277
parts: list[dict[str, Any]] = []
276278
for doc in documents:
277279
metadata = getattr(doc, "metadata", {}) or {}
278-
uri = metadata.get("openviking_uri") or metadata.get("source") or ""
280+
uri = metadata.get(f"{metadata_prefix}_uri") or metadata.get("source") or ""
279281
if not uri:
280282
continue
281283
parts.append(
282284
{
283285
"type": "context",
284286
"uri": uri,
285-
"context_type": metadata.get("openviking_context_type") or "resource",
286-
"abstract": metadata.get("openviking_abstract")
287+
"context_type": metadata.get(f"{metadata_prefix}_context_type") or "resource",
288+
"abstract": metadata.get(f"{metadata_prefix}_abstract")
287289
or getattr(doc, "page_content", "")[:500],
288290
}
289291
)

‎integrations/frameworks/langchain/src/langchain_openviking/retrievers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def _get_relevant_documents(self, query: str, *, run_manager: Any) -> list[Docum
198198
method,
199199
query=query,
200200
target_uri=self.target_uri,
201-
session_id=self.session_id,
201+
session_id=self.session_id if method == "search" else None,
202202
limit=self.limit,
203203
score_threshold=self.score_threshold,
204204
filter=self.filter,
@@ -218,7 +218,7 @@ async def _aget_relevant_documents(self, query: str, *, run_manager: Any) -> lis
218218
method,
219219
query=query,
220220
target_uri=self.target_uri,
221-
session_id=self.session_id,
221+
session_id=self.session_id if method == "search" else None,
222222
limit=self.limit,
223223
score_threshold=self.score_threshold,
224224
filter=self.filter,

‎integrations/frameworks/langchain/tests/unit/test_langchain_async_integration.py‎

Lines changed: 93 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import threading
77
from typing import Any
88

9+
import httpx
910
import pytest
1011

1112
pytest.importorskip("langchain_core")
@@ -967,6 +968,61 @@ async def test_async_retriever_uses_native_client_for_search_and_read():
967968
assert set(client.call_thread_ids) == {main_thread_id}
968969

969970

971+
@pytest.mark.asyncio
972+
@pytest.mark.parametrize("asynchronous", [False, True])
973+
@pytest.mark.parametrize("search_mode", ["find", "search"])
974+
@pytest.mark.parametrize("session_id", [None, "review-session"])
975+
async def test_retriever_passes_session_only_to_search(
976+
monkeypatch, asynchronous, search_mode, session_id
977+
):
978+
from openviking_sdk import AsyncHTTPClient, SyncHTTPClient
979+
980+
requests = []
981+
982+
async def request(self, method, path, **kwargs):
983+
requests.append((method, path, kwargs["json"]))
984+
return httpx.Response(
985+
200,
986+
json={
987+
"status": "ok",
988+
"result": {
989+
"resources": [
990+
{"uri": "viking://resources/release.md", "abstract": "Release checklist"}
991+
]
992+
},
993+
},
994+
)
995+
996+
monkeypatch.setattr(AsyncHTTPClient, "_request", request)
997+
client_type = AsyncHTTPClient if asynchronous else SyncHTTPClient
998+
client = client_type(url="http://openviking.test", api_key="test")
999+
retriever = OpenVikingRetriever(
1000+
**({"async_client": client} if asynchronous else {"client": client}),
1001+
search_mode=search_mode,
1002+
session_id=session_id,
1003+
content_mode="abstract",
1004+
score_threshold=0.5,
1005+
tags=["env=test"],
1006+
)
1007+
try:
1008+
documents = (
1009+
await retriever.ainvoke("release") if asynchronous else retriever.invoke("release")
1010+
)
1011+
finally:
1012+
await retriever.aclose()
1013+
if asynchronous:
1014+
await client.close()
1015+
else:
1016+
client.close()
1017+
1018+
assert [document.page_content for document in documents] == ["Release checklist"]
1019+
expected = {"query": "release", "target_uri": "", "limit": 10, "score_threshold": 0.5}
1020+
expected["tags"] = ["env=test"]
1021+
if search_mode == "search" and session_id is not None:
1022+
expected["session_id"] = session_id
1023+
assert requests == [("POST", f"/api/v1/search/{search_mode}", expected)]
1024+
1025+
9701026
@pytest.mark.asyncio
9711027
async def test_async_recorder_preserves_batch_and_commit_semantics():
9721028
class BatchTrackingClient(InMemoryOpenVikingClient):
@@ -1318,16 +1374,31 @@ async def test_async_chat_history_reads_writes_and_clears_natively():
13181374

13191375

13201376
@pytest.mark.asyncio
1321-
async def test_async_context_assembler_combines_session_and_recall():
1322-
backing = InMemoryOpenVikingClient(
1323-
{"viking://resources/runbooks/async.md": "Async context is azure."}
1324-
)
1377+
@pytest.mark.parametrize("metadata_prefix", ["openviking", "recall", "", "my_recall"])
1378+
@pytest.mark.parametrize(
1379+
"uri,context_type",
1380+
[
1381+
("viking://resources/runbooks/async.md", "resource"),
1382+
("viking://user/default/memories/preferences/async.md", "memory"),
1383+
("viking://skills/async.md", "skill"),
1384+
],
1385+
)
1386+
async def test_async_context_assembler_combines_session_and_recall(
1387+
metadata_prefix, uri, context_type
1388+
):
1389+
content = "Async context is azure. " * 30
1390+
backing = InMemoryOpenVikingClient({uri: content})
13251391
backing.add_message("async-assembler", "user", content="Active async turn.")
13261392
client = AsyncInMemoryOpenVikingClient(backing)
13271393
assembler = OpenVikingSessionContextAssembler(
13281394
include_session_context=True,
13291395
async_client=client,
1330-
target_uri="viking://resources",
1396+
retriever=OpenVikingRetriever(
1397+
async_client=client,
1398+
target_uri=uri,
1399+
metadata_prefix=metadata_prefix,
1400+
search_mode="search",
1401+
),
13311402
)
13321403

13331404
assembled = await assembler.aassemble(
@@ -1337,7 +1408,23 @@ async def test_async_context_assembler_combines_session_and_recall():
13371408

13381409
assert "Active async turn." in assembled.block
13391410
assert "Async context is azure." in assembled.block
1340-
assert assembled.context_parts[0]["uri"] == "viking://resources/runbooks/async.md"
1411+
assert assembled.context_parts == [
1412+
{"type": "context", "uri": uri, "context_type": context_type, "abstract": content[:240]}
1413+
]
1414+
recorder = OpenVikingSessionRecorder(async_client=client)
1415+
await recorder.arecord(
1416+
"async-assembler",
1417+
[HumanMessage(content="Deployment question"), AIMessage(content="Deployment answer")],
1418+
context_parts=assembled.context_parts,
1419+
)
1420+
assert [
1421+
part
1422+
for message in backing.sessions["async-assembler"][-2:]
1423+
for part in message["parts"]
1424+
if part["type"] == "context"
1425+
] == assembled.context_parts
1426+
await recorder.aclose()
1427+
await assembler.aclose()
13411428

13421429

13431430
@pytest.mark.asyncio

0 commit comments

Comments
 (0)