The agent engineering platform.
Python agentsaiai-agentsanthropicchatgptdeepagentsenterpriseframeworkgeminigenerative-ailangchainlanggraphllmmultiagentopen-sourceopenaipydanticpythonragtypescript
couchbase: [patch] Return chat message history in order (#24498)
Nithish Raghunandanan1639ccfd1529
diff --git a/libs/partners/couchbase/langchain_couchbase/chat_message_histories.py b/libs/partners/couchbase/langchain_couchbase/chat_message_histories.pyindex ba61e3376f..110763f645 100644--- a/libs/partners/couchbase/langchain_couchbase/chat_message_histories.py+++ b/libs/partners/couchbase/langchain_couchbase/chat_message_histories.py@@ -1,4 +1,7 @@+"""Couchbase Chat Message History"""+import logging+import timeimport uuidfrom typing import Any, Dict, List, Sequence@@ -14,6 +17,7 @@ logger = logging.getLogger(__name__)DEFAULT_SESSION_ID_KEY = "session_id"DEFAULT_MESSAGE_KEY = "message"+DEFAULT_TS_KEY = "ts"DEFAULT_INDEX_NAME = "LANGCHAIN_CHAT_HISTORY"DEFAULT_BATCH_SIZE = 100@@ -128,10 +132,13 @@ class CouchbaseChatMessageHistory(BaseChatMessageHistory):self._message_key = message_keyself._create_index = create_indexself._session_id = session_id+ self._ts_key = DEFAULT_TS_KEY# Create an index if it does not exist if requestedif create_index:- index_fields = f"({self._session_id_key}, {self._message_key})"+ index_fields = (+ f"({self._session_id_key}, {self._ts_key}, {self._message_key})"+ )index_creation_query = (f"CREATE INDEX {DEFAULT_INDEX_NAME} IF NOT EXISTS ON "+ f"{self._collection_name}{index_fields} "@@ -146,6 +153,8 @@ class CouchbaseChatMessageHistory(BaseChatMessageHistory):"""Add a message to the cache"""# Generate a UUID for the document keydocument_key = uuid.uuid4().hex+ # get utc timestamp for ordering the messages+ timestamp = time.time()message_content = message_to_dict(message)try:self._collection.insert(@@ -153,6 +162,7 @@ class CouchbaseChatMessageHistory(BaseChatMessageHistory):value={self._message_key: message_content,self._session_id_key: self._session_id,+ self._ts_key: timestamp,},)except Exception as e:@@ -164,12 +174,14 @@ class CouchbaseChatMessageHistory(BaseChatMessageHistory):messages_to_insert = []for message in messages:document_key = uuid.uuid4().hex+ timestamp = time.time()message_content = message_to_dict(message)messages_to_insert.append({document_key: {self._message_key: message_content,self._session_id_key: self._session_id,+ self._ts_key: timestamp,},})@@ -189,7 +201,7 @@ class CouchbaseChatMessageHistory(BaseChatMessageHistory):# Delete all documents in the collection with the session_idclear_query = (f"DELETE FROM `{self._collection_name}`"- + f"where {self._session_id_key}=$session_id"+ + f"WHERE {self._session_id_key}=$session_id")try:self._scope.query(clear_query, session_id=self._session_id).execute()@@ -202,6 +214,7 @@ class CouchbaseChatMessageHistory(BaseChatMessageHistory):fetch_query = (f"SELECT {self._message_key} FROM `{self._collection_name}` "+ f"where {self._session_id_key}=$session_id"+ + f" ORDER BY {self._ts_key} ASC")message_items = []diff --git a/libs/partners/couchbase/pyproject.toml b/libs/partners/couchbase/pyproject.tomlindex 5be4d77158..36359fbefd 100644--- a/libs/partners/couchbase/pyproject.toml+++ b/libs/partners/couchbase/pyproject.toml@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"[tool.poetry]name = "langchain-couchbase"-version = "0.1.0"+version = "0.1.1"description = "An integration package connecting Couchbase and LangChain"authors = []readme = "README.md"diff --git a/libs/partners/couchbase/tests/integration_tests/test_chat_message_history.py b/libs/partners/couchbase/tests/integration_tests/test_chat_message_history.pyindex eacfb4d9ce..aaee1ec219 100644--- a/libs/partners/couchbase/tests/integration_tests/test_chat_message_history.py+++ b/libs/partners/couchbase/tests/integration_tests/test_chat_message_history.py@@ -95,8 +95,9 @@ class TestCouchbaseCache:# check that the messages are in the memorymessages = memory.chat_memory.messagesassert len(messages) == 2- for message in messages:- assert message in [ai_message, user_message]++ # check that the messages are in the order of creation+ assert messages == [ai_message, user_message]# clear the memorymemory.chat_memory.clear()@@ -147,9 +148,17 @@ class TestCouchbaseCache:messages_b = memory_b.chat_memory.messagesassert len(messages_a) == 1assert len(messages_b) == 1- assert messages_a[0] == ai_message- assert messages_b[0] == user_message+ assert messages_a == [ai_message]+ assert messages_b == [user_message]# clear the memorymemory_a.chat_memory.clear()+ time.sleep(SLEEP_DURATION)+ # ensure that only the session that is cleared is empty+ assert memory_a.chat_memory.messages == []+ assert memory_b.chat_memory.messages == [user_message]++ # clear the other session's memorymemory_b.chat_memory.clear()+ time.sleep(SLEEP_DURATION)+ assert memory_b.chat_memory.messages == []