Fix OpenSearch sync store: add dependency and update codegen

- Add opensearch-py dependency to sync library's pyproject.toml
- Update codegen script to transform AsyncOpenSearch → OpenSearch
- Regenerate sync code with correct synchronous OpenSearch client
- Improve ImportError message for missing opensearch dependency

This fixes the type checking errors in the sync library where the
generated code was incorrectly using AsyncOpenSearch instead of
the synchronous OpenSearch client.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: William Easton <[email protected]>

Author: github-actions[bot]

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

@@ -44,7 +44,7 @@
         get_source_from_body,
     )
 except ImportError as e:
-    msg = "OpenSearchStore requires py-key-value-aio[opensearch]"
+    msg = "OpenSearchStore requires opensearch-py[async]>=2.0.0. Install with: pip install 'py-key-value-aio[opensearch]'"
     raise ImportError(msg) from e
 
 

key-value/key-value-sync/pyproject.toml

@@ -40,6 +40,7 @@ valkey = ["valkey-glide-sync>=2.1.0"]
 vault = ["hvac>=2.3.0", "types-hvac>=2.3.0"]
 memcached = ["aiomcache>=0.8.0"]
 elasticsearch = ["elasticsearch>=8.0.0", "aiohttp>=3.12"]
+opensearch = ["opensearch-py[async]>=2.0.0"]
 pydantic = ["pydantic>=2.11.9"]
 keyring = ["keyring>=25.6.0"]
 keyring-linux = ["keyring>=25.6.0", "dbus-python>=1.4.0"]
@@ -66,7 +67,7 @@ env_files = [".env"]
 
 [dependency-groups]
 dev = [
-    "py-key-value-sync[memory,disk,redis,elasticsearch,memcached,mongodb,vault,rocksdb]",
+    "py-key-value-sync[memory,disk,redis,elasticsearch,opensearch,memcached,mongodb,vault,rocksdb]",
     "py-key-value-sync[valkey]; platform_system != 'Windows'",
     "py-key-value-sync[pydantic]",
     "py-key-value-sync[keyring]",

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

@@ -26,7 +26,7 @@
 from key_value.sync.code_gen.stores.opensearch.utils import LessCapableJsonSerializer, new_bulk_action
 
 try:
-    from opensearchpy import AsyncOpenSearch
+    from opensearchpy import OpenSearch
     from opensearchpy.exceptions import RequestError
 
     from key_value.sync.code_gen.stores.opensearch.utils import (
@@ -37,7 +37,7 @@
         get_source_from_body,
     )
 except ImportError as e:
-    msg = "OpenSearchStore requires py-key-value-aio[opensearch]"
+    msg = "OpenSearchStore requires opensearch-py[async]>=2.0.0. Install with: pip install 'py-key-value-aio[opensearch]'"
     raise ImportError(msg) from e
 
 logger = logging.getLogger(__name__)
@@ -118,7 +118,7 @@ class OpenSearchStore(
     `OpenSearchV1CollectionSanitizationStrategy` strategies.
     """
 
-    _client: AsyncOpenSearch
+    _client: OpenSearch
 
     _index_prefix: str
 
@@ -133,7 +133,7 @@ class OpenSearchStore(
     def __init__(
         self,
         *,
-        opensearch_client: AsyncOpenSearch,
+        opensearch_client: OpenSearch,
         index_prefix: str,
         default_collection: str | None = None,
         key_sanitization_strategy: SanitizationStrategy | None = None,
@@ -172,7 +172,7 @@ def __init__(
     def __init__(
         self,
         *,
-        opensearch_client: AsyncOpenSearch | None = None,
+        opensearch_client: OpenSearch | None = None,
         url: str | None = None,
         api_key: str | None = None,
         index_prefix: str,
@@ -203,7 +203,7 @@ def __init__(
             if api_key:
                 client_kwargs["api_key"] = api_key
 
-            self._client = AsyncOpenSearch(**client_kwargs)
+            self._client = OpenSearch(**client_kwargs)
         else:
             msg = "Either opensearch_client or url must be provided"
             raise ValueError(msg)

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

@@ -3,7 +3,7 @@
 # DO NOT CHANGE! Change the original file instead.
 from typing import Any, TypeVar, cast
 
-from opensearchpy import AsyncOpenSearch
+from opensearchpy import OpenSearch
 from opensearchpy.serializer import JSONSerializer
 
 
@@ -128,6 +128,6 @@ def default(self, data: Any) -> Any:  # type: ignore[reportIncompatibleMethodOve
         raise TypeError(msg)
 
     @classmethod
-    def install_serializer(cls, client: AsyncOpenSearch) -> None:
+    def install_serializer(cls, client: OpenSearch) -> None:
         # OpenSearch uses a different serializer architecture
         client.transport.serializer = cls()  # type: ignore[reportUnknownMemberType]

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

@@ -10,7 +10,7 @@
 from inline_snapshot import snapshot
 from key_value.shared.stores.wait import wait_for_true
 from key_value.shared.utils.managed_entry import ManagedEntry
-from opensearchpy import AsyncOpenSearch
+from opensearchpy import OpenSearch
 from typing_extensions import override
 
 from key_value.sync.code_gen.stores.base import BaseStore
@@ -35,12 +35,12 @@
 OPENSEARCH_VERSIONS_TO_TEST = ["2.11.0", "2.18.0"]
 
 
-def get_opensearch_client() -> AsyncOpenSearch:
-    return AsyncOpenSearch(hosts=[OS_URL], use_ssl=False, verify_certs=False)
+def get_opensearch_client() -> OpenSearch:
+    return OpenSearch(hosts=[OS_URL], use_ssl=False, verify_certs=False)
 
 
 def ping_opensearch() -> bool:
-    os_client: AsyncOpenSearch = get_opensearch_client()
+    os_client: OpenSearch = get_opensearch_client()
 
     with os_client:
         try:
@@ -49,7 +49,7 @@ def ping_opensearch() -> bool:
             return False
 
 
-def cleanup_opensearch_indices(opensearch_client: AsyncOpenSearch):
+def cleanup_opensearch_indices(opensearch_client: OpenSearch):
     with contextlib.suppress(Exception):
         indices = opensearch_client.indices.get(index="opensearch-kv-store-e2e-test-*")
         for index in indices:
@@ -101,7 +101,7 @@ def setup_opensearch(self, request: pytest.FixtureRequest) -> Generator[None, No
             yield
 
     @pytest.fixture
-    def opensearch_client(self, setup_opensearch: None) -> Generator[AsyncOpenSearch, None, None]:
+    def opensearch_client(self, setup_opensearch: None) -> Generator[OpenSearch, None, None]:
         os_client = get_opensearch_client()
 
         with os_client:
@@ -111,7 +111,7 @@ def opensearch_client(self, setup_opensearch: None) -> Generator[AsyncOpenSearch
 
     @override
     @pytest.fixture
-    def default_store(self, opensearch_client: AsyncOpenSearch) -> Generator[BaseStore, None, None]:
+    def default_store(self, opensearch_client: OpenSearch) -> Generator[BaseStore, None, None]:
         store = OpenSearchStore(
             opensearch_client=opensearch_client, index_prefix="opensearch-kv-store-e2e-test", default_collection="test-collection"
         )
@@ -121,7 +121,7 @@ def default_store(self, opensearch_client: AsyncOpenSearch) -> Generator[BaseSto
 
     @override
     @pytest.fixture
-    def collection_sanitized_store(self, opensearch_client: AsyncOpenSearch) -> Generator[BaseStore, None, None]:
+    def collection_sanitized_store(self, opensearch_client: OpenSearch) -> Generator[BaseStore, None, None]:
         store = OpenSearchStore(
             opensearch_client=opensearch_client,
             index_prefix="opensearch-kv-store-e2e-test",
@@ -134,7 +134,7 @@ def collection_sanitized_store(self, opensearch_client: AsyncOpenSearch) -> Gene
 
     @override
     @pytest.fixture
-    def key_sanitized_store(self, opensearch_client: AsyncOpenSearch) -> Generator[BaseStore, None, None]:
+    def key_sanitized_store(self, opensearch_client: OpenSearch) -> Generator[BaseStore, None, None]:
         store = OpenSearchStore(
             opensearch_client=opensearch_client,
             index_prefix="opensearch-kv-store-e2e-test",
@@ -147,7 +147,7 @@ def key_sanitized_store(self, opensearch_client: AsyncOpenSearch) -> Generator[B
 
     @override
     @pytest.fixture
-    def fully_sanitized_store(self, opensearch_client: AsyncOpenSearch) -> Generator[BaseStore, None, None]:
+    def fully_sanitized_store(self, opensearch_client: OpenSearch) -> Generator[BaseStore, None, None]:
         store = OpenSearchStore(
             opensearch_client=opensearch_client,
             index_prefix="opensearch-kv-store-e2e-test",

scripts/build_sync_library.py

@@ -219,6 +219,7 @@ class RenameAsyncToSync(ast.NodeTransformer):  # type: ignore
         "__aiter__": "__iter__",
         "asyncio.locks": "threading",
         "AsyncElasticsearch": "Elasticsearch",
+        "AsyncOpenSearch": "OpenSearch",
         "AsyncDatabase": "Database",
         "AsyncCollection": "Collection",
         "AsyncMongoClient": "MongoClient",