fix: address CodeRabbit PR feedback for OpenSearch store

- Fix type annotation: AsyncElasticsearch → AsyncOpenSearch in async test
- Add key/collection/version fields to serialized documents (following PR #204)
- Update test snapshots to expect version, key, and collection fields
- Fix ImportError message in sync store to reference correct package
- Run codegen to regenerate sync library with fixes

Co-authored-by: William Easton <strawgate@users.noreply.github.com>

Author: github-actions[bot]

key-value/key-value-aio/src/key_value/aio/stores/opensearch/store.py

@@ -359,7 +359,7 @@ async def _put_managed_entry(
         index_name: str = self._get_index_name(collection=collection)
         document_id: str = self._get_document_id(key=key)
 
-        document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry)
+        document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry, key=key, collection=collection)
 
         try:
             _ = await self._client.index(  # type: ignore[reportUnknownVariableType]
@@ -395,7 +395,7 @@ async def _put_managed_entries(
 
             index_action: dict[str, Any] = new_bulk_action(action="index", index=index_name, document_id=document_id)
 
-            document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry)
+            document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry, key=key, collection=collection)
 
             operations.extend([index_action, document])
 

key-value/key-value-aio/tests/stores/opensearch/test_opensearch.py

@@ -5,7 +5,6 @@
 
 import pytest
 from dirty_equals import IsFloat, IsStr
-from elasticsearch import AsyncElasticsearch
 from inline_snapshot import snapshot
 from key_value.shared.stores.wait import async_wait_for_true
 from key_value.shared.utils.managed_entry import ManagedEntry
@@ -75,6 +74,7 @@ def test_managed_entry_document_conversion():
 
     assert document == snapshot(
         {
+            "version": 1,
             "value": {"flat": {"test": "test"}},
             "created_at": "2025-01-01T00:00:00+00:00",
             "expires_at": "2025-01-01T00:00:10+00:00",
@@ -189,7 +189,7 @@ async def test_put_put_two_indices(self, store: OpenSearchStore, opensearch_clie
         index_names: list[str] = list(indices.keys())
         assert index_names == snapshot(["opensearch-kv-store-e2e-test-test_collection", "opensearch-kv-store-e2e-test-test_collection_2"])
 
-    async def test_value_stored_as_f_object(self, store: OpenSearchStore, opensearch_client: AsyncElasticsearch):
+    async def test_value_stored_as_f_object(self, store: OpenSearchStore, opensearch_client: AsyncOpenSearch):
         """Verify values are stored as f objects, not JSON strings"""
         await store.put(collection="test", key="test_key", value={"name": "Alice", "age": 30})
 
@@ -199,6 +199,9 @@ async def test_value_stored_as_f_object(self, store: OpenSearchStore, opensearch
         response = await opensearch_client.get(index=index_name, id=doc_id)
         assert response["_source"] == snapshot(
             {
+                "version": 1,
+                "key": "test_key",
+                "collection": "test",
                 "value": {"flat": {"name": "Alice", "age": 30}},
                 "created_at": IsStr(min_length=20, max_length=40),
             }
@@ -209,6 +212,9 @@ async def test_value_stored_as_f_object(self, store: OpenSearchStore, opensearch
         response = await opensearch_client.get(index=index_name, id=doc_id)
         assert response["_source"] == snapshot(
             {
+                "version": 1,
+                "key": "test_key",
+                "collection": "test",
                 "value": {"flat": {"name": "Bob", "age": 25}},
                 "created_at": IsStr(min_length=20, max_length=40),
                 "expires_at": IsStr(min_length=20, max_length=40),

key-value/key-value-sync/src/key_value/sync/code_gen/stores/opensearch/store.py

@@ -37,7 +37,7 @@
         get_source_from_body,
     )
 except ImportError as e:
-    msg = "OpenSearchStore requires opensearch-py[async]>=2.0.0. Install with: pip install 'py-key-value-aio[opensearch]'"
+    msg = "OpenSearchStore requires opensearch-py>=2.0.0. Install with: pip install 'py-key-value-sync[opensearch]'"
     raise ImportError(msg) from e
 
 logger = logging.getLogger(__name__)
@@ -318,7 +318,7 @@ def _put_managed_entry(self, *, key: str, collection: str, managed_entry: Manage
         index_name: str = self._get_index_name(collection=collection)
         document_id: str = self._get_document_id(key=key)
 
-        document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry)
+        document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry, key=key, collection=collection)
 
         try:  # type: ignore[reportUnknownVariableType]
             _ = self._client.index(index=index_name, id=document_id, body=document, params={"refresh": "true"})
@@ -349,7 +349,7 @@ def _put_managed_entries(
 
             index_action: dict[str, Any] = new_bulk_action(action="index", index=index_name, document_id=document_id)
 
-            document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry)
+            document: dict[str, Any] = self._serializer.dump_dict(entry=managed_entry, key=key, collection=collection)
 
             operations.extend([index_action, document])
 

key-value/key-value-sync/tests/code_gen/stores/opensearch/test_opensearch.py

@@ -8,7 +8,6 @@
 
 import pytest
 from dirty_equals import IsFloat, IsStr
-from elasticsearch import Elasticsearch
 from inline_snapshot import snapshot
 from key_value.shared.stores.wait import wait_for_true
 from key_value.shared.utils.managed_entry import ManagedEntry
@@ -74,7 +73,12 @@ def test_managed_entry_document_conversion():
     document = adapter.dump_dict(entry=managed_entry)
 
     assert document == snapshot(
-        {"value": {"flat": {"test": "test"}}, "created_at": "2025-01-01T00:00:00+00:00", "expires_at": "2025-01-01T00:00:10+00:00"}
+        {
+            "version": 1,
+            "value": {"flat": {"test": "test"}},
+            "created_at": "2025-01-01T00:00:00+00:00",
+            "expires_at": "2025-01-01T00:00:10+00:00",
+        }
     )
 
     round_trip_managed_entry = adapter.load_dict(data=document)
@@ -179,7 +183,7 @@ def test_put_put_two_indices(self, store: OpenSearchStore, opensearch_client: Op
         index_names: list[str] = list(indices.keys())
         assert index_names == snapshot(["opensearch-kv-store-e2e-test-test_collection", "opensearch-kv-store-e2e-test-test_collection_2"])
 
-    def test_value_stored_as_f_object(self, store: OpenSearchStore, opensearch_client: Elasticsearch):
+    def test_value_stored_as_f_object(self, store: OpenSearchStore, opensearch_client: OpenSearch):
         """Verify values are stored as f objects, not JSON strings"""
         store.put(collection="test", key="test_key", value={"name": "Alice", "age": 30})
 
@@ -188,14 +192,23 @@ def test_value_stored_as_f_object(self, store: OpenSearchStore, opensearch_clien
 
         response = opensearch_client.get(index=index_name, id=doc_id)
         assert response["_source"] == snapshot(
-            {"value": {"flat": {"name": "Alice", "age": 30}}, "created_at": IsStr(min_length=20, max_length=40)}
+            {
+                "version": 1,
+                "key": "test_key",
+                "collection": "test",
+                "value": {"flat": {"name": "Alice", "age": 30}},
+                "created_at": IsStr(min_length=20, max_length=40),
+            }
         )
 
         # Test with TTL
         store.put(collection="test", key="test_key", value={"name": "Bob", "age": 25}, ttl=10)
         response = opensearch_client.get(index=index_name, id=doc_id)
         assert response["_source"] == snapshot(
             {
+                "version": 1,
+                "key": "test_key",
+                "collection": "test",
                 "value": {"flat": {"name": "Bob", "age": 25}},
                 "created_at": IsStr(min_length=20, max_length=40),
                 "expires_at": IsStr(min_length=20, max_length=40),