valkey-glide 2.1.0rc9__cp39-cp39-macosx_11_0_arm64.whl → 2.1.1rc3__cp39-cp39-macosx_11_0_arm64.whl

glide/__init__.py

@@ -1,5 +1,9 @@
 # Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
 
+import sys
+import types
+import warnings
+
 from glide.glide import (
     ClusterScanCursor,
     OpenTelemetryConfig,
@@ -159,6 +163,56 @@ from .glide_client import GlideClient, GlideClusterClient, TGlideClient
 from .logger import Level as LogLevel
 from .logger import Logger
 
+_glide_module = sys.modules[__name__]
+
+_legacy_modules = [
+    "glide.exceptions",
+    "glide.config",
+    "glide.constants",
+    "glide.routes",
+    "glide.async_commands",
+    "glide.async_commands.batch",
+    "glide.async_commands.batch_options",
+    "glide.async_commands.bitmap",
+    "glide.async_commands.command_args",
+    "glide.async_commands.server_modules",
+    "glide.async_commands.server_modules.ft_options",
+    "glide.async_commands.server_modules.ft_options.ft_aggregate_options",
+    "glide.async_commands.server_modules.ft_options.ft_create_options",
+    "glide.async_commands.server_modules.ft_options.ft_profile_options",
+    "glide.async_commands.server_modules.ft_options.ft_search_options",
+    "glide.async_commands.server_modules.glide_json",
+    "glide.async_commands.sorted_set",
+    "glide.async_commands.stream",
+]
+
+
+class _LegacyModule(types.ModuleType):
+    """Proxy for a deprecated module that warns when first accessed."""
+
+    def __init__(self, name):
+        super().__init__(name)
+        self._warned = False
+
+    def __getattr__(self, name):
+        if not self._warned:
+            warnings.warn(
+                f"Importing from '{self.__name__}' is deprecated. "
+                f"Please import directly from 'glide' instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            self._warned = True
+
+        # Access the attribute from the real top-level glide module
+        return getattr(_glide_module, name)
+
+
+# Replace old modules with lazy proxy modules
+for old_name in _legacy_modules:
+    if old_name not in sys.modules:
+        sys.modules[old_name] = _LegacyModule(old_name)
+
 __all__ = [
     # Client
     "TGlideClient",

glide/async_commands/cluster_commands.py

@@ -1062,39 +1062,70 @@ class ClusterCommands(CoreCommands):
             await self._execute_command(RequestType.FlushDB, args, route),
         )
 
-    async def copy(
-        self,
-        source: TEncodable,
-        destination: TEncodable,
-        replace: Optional[bool] = None,
-    ) -> bool:
         """
-        Copies the value stored at the `source` to the `destination` key. When `replace` is True,
-        removes the `destination` key first if it already exists, otherwise performs no action.
+        Copies the value stored at the `source` to the `destination` key. If `destinationDB`
+        is specified, the value will be copied to the database specified by `destinationDB`,
+        otherwise the current database will be used. When `replace` is True, removes the
+        `destination` key first if it already exists, otherwise performs no action.
 
         See [valkey.io](https://valkey.io/commands/copy) for more details.
 
-        Note:
-            Both `source` and `destination` must map to the same hash slot.
-
         Args:
             source (TEncodable): The key to the source value.
             destination (TEncodable): The key where the value should be copied to.
+            destinationDB (Optional[Union[int, str]]): The alternative logical database index for the destination key.
             replace (Optional[bool]): If the destination key should be removed before copying the value to it.
 
         Returns:
-            bool: True if the source was copied. Otherwise, returns False.
+            bool: True if the source was copied. Otherwise, return False.
 
         Examples:
             >>> await client.set("source", "sheep")
-            >>> await client.copy(b"source", b"destination")
-                True # Source was copied
+            >>> await client.copy(b"source", b"destination", destinationDB=1)
+                True # Source was copied to DB 1
+            >>> await client.select(1)
             >>> await client.get("destination")
                 b"sheep"
 
-        Since: Valkey version 6.2.0.
+        Since: Valkey version 9.0.0.
+        """
+        ...
+
+    async def copy(
+        self,
+        source: TEncodable,
+        destination: TEncodable,
+        # TODO next major release the arguments replace and destinationDB must have their order
+        # swapped to align with the standalone order.
+        # At the moment of the patch release 2.1.1. we can't have a breaking change
+        replace: Optional[bool] = None,
+        destinationDB: Optional[int] = None,
+    ) -> bool:
+        """
+        Copies the value stored at the `source` to the `destination` key.
+
+        This method supports two signatures:
+        1. copy(source, destination, replace=None) - original API
+        2. copy(source, destination, replace=None, destinationDB=None) - new API with DB support
+
+        When `replace` is True, removes the `destination` key first if it already exists,
+        otherwise performs no action.
+
+        See [valkey.io](https://valkey.io/commands/copy) for more details.
+
+        Note:
+            When `destinationDB` is not provided, both `source` and `destination` must map to the same hash slot.
         """
+        # Handle backward compatibility for positional arguments
+        # If destinationDB is a boolean, it's likely the old API: copy(source, destination, replace)
+        if isinstance(destinationDB, bool):
+            replace = destinationDB
+            destinationDB = None
+
+        # Build command arguments
         args: List[TEncodable] = [source, destination]
+        if destinationDB is not None:
+            args.extend(["DB", str(destinationDB)])
         if replace is True:
             args.append("REPLACE")
         return cast(

glide/async_commands/core.py

@@ -430,6 +430,34 @@ class CoreCommands(Protocol):
         """
         return cast(int, await self._execute_command(RequestType.Del, keys))
 
+    async def move(self, key: TEncodable, db_index: int) -> bool:
+        """
+        Move key from the currently selected database to the specified destination database.
+
+        Note:
+            For cluster mode move command is supported since Valkey 9.0.0
+
+        See [valkey.io](https://valkey.io/commands/move/) for more details.
+
+        Args:
+            key (TEncodable): The key to move.
+            db_index (int): The destination database number.
+
+        Returns:
+            bool: True if the key was moved successfully, False if the key does not exist
+            or was already present in the destination database.
+
+        Examples:
+            >>> await client.move("some_key", 1)
+                True  # The key was successfully moved to database 1
+            >>> await client.move("nonexistent_key", 1)
+                False  # The key does not exist
+        """
+        return cast(
+            bool,
+            await self._execute_command(RequestType.Move, [key, str(db_index)]),
+        )
+
     async def incr(self, key: TEncodable) -> int:
         """
         Increments the number stored at `key` by one. If the key does not exist, it is set to 0 before performing the
@@ -2242,6 +2270,20 @@ class CoreCommands(Protocol):
         """
         return cast(int, await self._execute_command(RequestType.SAdd, [key] + members))
 
+    async def select(self, index: int) -> TOK:
+        """
+        Change the currently selected database.
+
+        See [valkey.io](https://valkey.io/commands/select/) for details.
+
+        Args:
+            index (int): The index of the database to select.
+
+        Returns:
+            A simple OK response.
+        """
+        return cast(TOK, await self._execute_command(RequestType.Select, [str(index)]))
+
     async def srem(self, key: TEncodable, members: List[TEncodable]) -> int:
         """
         Remove specified members from the set stored at `key`.

glide/async_commands/standalone_commands.py

@@ -162,42 +162,6 @@ class StandaloneCommands(CoreCommands):
             timeout=timeout,
         )
 
-    async def select(self, index: int) -> TOK:
-        """
-        Change the currently selected database.
-
-        **WARNING**: This command is NOT RECOMMENDED for production use.
-        Upon reconnection, the client will revert to the database_id specified
-        in the client configuration (default: 0), NOT the database selected
-        via this command.
-
-        **RECOMMENDED APPROACH**: Use the database_id parameter in client
-        configuration instead:
-
-        ```python
-        client = await GlideClient.create_client(
-            GlideClientConfiguration(
-                addresses=[NodeAddress("localhost", 6379)],
-                database_id=5  # Recommended: persists across reconnections
-            )
-        )
-        ```
-
-        **RECONNECTION BEHAVIOR**: After any reconnection (due to network issues,
-        timeouts, etc.), the client will automatically revert to the database_id
-        specified during client creation, losing any database selection made via
-        this SELECT command.
-
-        See [valkey.io](https://valkey.io/commands/select/) for details.
-
-        Args:
-            index (int): The index of the database to select.
-
-        Returns:
-            A simple OK response.
-        """
-        return cast(TOK, await self._execute_command(RequestType.Select, [str(index)]))
-
     async def config_resetstat(self) -> TOK:
         """
         Resets the statistics reported by the server using the INFO and LATENCY HISTOGRAM commands.
@@ -651,31 +615,6 @@ class StandaloneCommands(CoreCommands):
             await self._execute_command(RequestType.LastSave, []),
         )
 
-    async def move(self, key: TEncodable, db_index: int) -> bool:
-        """
-        Move `key` from the currently selected database to the database specified by `db_index`.
-
-        See [valkey.io](https://valkey.io/commands/move/) for more details.
-
-        Args:
-            key (TEncodable): The key to move.
-            db_index (int): The index of the database to move `key` to.
-
-        Returns:
-            bool: `True` if `key` was moved.
-
-            `False` if the `key` already exists in the destination database
-            or does not exist in the source database.
-
-        Example:
-            >>> await client.move("some_key", 1)
-                True
-        """
-        return cast(
-            bool,
-            await self._execute_command(RequestType.Move, [key, str(db_index)]),
-        )
-
     async def publish(self, message: TEncodable, channel: TEncodable) -> int:
         """
         Publish a message on pubsub channel.

glide/glide_client.py

@@ -338,7 +338,7 @@ class BaseClient(CoreCommands):
                     request.callback_idx if isinstance(request, CommandRequest) else 0
                 )
                 res_future = self._available_futures.pop(callback_idx, None)
-                if res_future:
+                if res_future and not res_future.done():
                     res_future.set_exception(e)
                 else:
                     ClientLogger.log(
@@ -355,7 +355,10 @@ class BaseClient(CoreCommands):
         b_arr = bytearray()
         for request in requests:
             ProtobufCodec.encode_delimited(b_arr, request)
-        await self._stream.send(b_arr)
+        try:
+            await self._stream.send(b_arr)
+        except (anyio.ClosedResourceError, anyio.EndOfStream):
+            raise ClosingError("The communication layer was unexpectedly closed.")
 
     def _encode_arg(self, arg: TEncodable) -> bytes:
         """

glide_shared/commands/batch.py

@@ -403,6 +403,27 @@ class BaseBatch:
         """
         return self.append_command(RequestType.ConfigResetStat, [])
 
+    def move(self: TBatch, key: TEncodable, db_index: int) -> "TBatch":
+        """
+        Move `key` from the currently selected database to the database specified by `db_index`.
+
+        Note:
+            For cluster mode move command is supported since Valkey 9.0.0
+
+        See [valkey.io](https://valkey.io/commands/move/) for more details.
+
+        Args:
+            key (TEncodable): The key to move.
+            db_index (int): The index of the database to move `key` to.
+
+        Commands response:
+            bool: True if `key` was moved.
+
+            False if the `key` already exists in the destination database
+            or does not exist in the source database.
+        """
+        return self.append_command(RequestType.Move, [key, str(db_index)])
+
     def mset(self: TBatch, key_value_map: Mapping[TEncodable, TEncodable]) -> TBatch:
         """
         Set multiple keys to multiple values in a single atomic operation.
@@ -5754,25 +5775,6 @@ class Batch(BaseBatch):
 
     """
 
-    # TODO: add SLAVEOF and all SENTINEL commands
-    def move(self, key: TEncodable, db_index: int) -> "Batch":
-        """
-        Move `key` from the currently selected database to the database specified by `db_index`.
-
-        See [valkey.io](https://valkey.io/commands/move/) for more details.
-
-        Args:
-            key (TEncodable): The key to move.
-            db_index (int): The index of the database to move `key` to.
-
-        Commands response:
-            bool: True if `key` was moved.
-
-            False if the `key` already exists in the destination database
-            or does not exist in the source database.
-        """
-        return self.append_command(RequestType.Move, [key, str(db_index)])
-
     def select(self, index: int) -> "Batch":
         """
         Change the currently selected database.
@@ -5883,7 +5885,11 @@ class ClusterBatch(BaseBatch):
         self,
         source: TEncodable,
         destination: TEncodable,
+        # TODO next major release the arguments replace and destinationDB must have their order
+        # swapped to align with the standalone order.
+        # At the moment of the patch release 2.1.1. we can't have a breaking change
         replace: Optional[bool] = None,
+        destinationDB: Optional[int] = None,
     ) -> "ClusterBatch":
         """
         Copies the value stored at the `source` to the `destination` key. When `replace` is True,
@@ -5895,15 +5901,17 @@ class ClusterBatch(BaseBatch):
             source (TEncodable): The key to the source value.
             destination (TEncodable): The key where the value should be copied to.
             replace (Optional[bool]): If the destination key should be removed before copying the value to it.
-
+            destinationDB (Optional[int]): The alternative logical database index for the destination key.
         Command response:
             bool: True if the source was copied.
 
             Otherwise, return False.
 
-        Since: Valkey version 6.2.0.
+        Since: Valkey version 9.0.0.
         """
         args = [source, destination]
+        if destinationDB is not None:
+            args.extend(["DB", str(destinationDB)])
         if replace is not None:
             args.append("REPLACE")
 

{valkey_glide-2.1.0rc9.dist-info → valkey_glide-2.1.1rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: valkey-glide
-Version: 2.1.0rc9
+Version: 2.1.1rc3
 Classifier: Topic :: Database
 Classifier: Topic :: Utilities
 Classifier: License :: OSI Approved :: Apache Software License

{valkey_glide-2.1.0rc9.dist-info → valkey_glide-2.1.1rc3.dist-info}/RECORD

@@ -1,19 +1,19 @@
-valkey_glide-2.1.0rc9.dist-info/METADATA,sha256=WIAt07af8SjYV7rA0_el-wtnYcaT0yluKGnLDFWPyaA,6978
-valkey_glide-2.1.0rc9.dist-info/WHEEL,sha256=SjFvs0za84r93yXv_seM90QIJLVMin7Qs7nbzy5Blh4,104
+valkey_glide-2.1.1rc3.dist-info/METADATA,sha256=hlIous9dfGwwLPBIdYtJZABbkyDd3OwFyQ398V3a-gw,6978
+valkey_glide-2.1.1rc3.dist-info/WHEEL,sha256=SjFvs0za84r93yXv_seM90QIJLVMin7Qs7nbzy5Blh4,104
 glide/async_commands/glide_json.py,sha256=H5dnB4vJkGPpNXJZhhVyPQoTSbkN_chq5Xw6tkP0wMQ,60410
 glide/async_commands/ft.py,sha256=1v96sBCgiXtPbj85ZurY3ruLCmok3cPoaIXSiJBEv9Y,16849
 glide/async_commands/__init__.py,sha256=_tbTAFATlzp4L2qe-H77PpAQK-16VsV-y7uKNUKLC_o,136
-glide/async_commands/core.py,sha256=csbFWNGqduOgFsL378LYynLqHZURAYoewdKmmsrFsTs,328186
-glide/async_commands/standalone_commands.py,sha256=6oPesnC8WK816JbBySUZ9dSXPbdtN0dvd8rRde646NQ,40364
-glide/async_commands/cluster_commands.py,sha256=Lji6eo2LaoXwy4Ha3e6bcGOHyMQHdDBiSQLt1kf9gGo,60129
-glide/__init__.py,sha256=r0VyTcuIdVzXTTZW6TmWwCsTCIg54ciyba1iDM8PFVQ,7055
+glide/async_commands/core.py,sha256=K-aEjJqzfCNRLzm_DhFWCGgoEy6SggG-6EL5rsGtvEc,329613
+glide/async_commands/standalone_commands.py,sha256=Io98Ebd96xXbw4DYoDJcKxTpxcaMteQ8sxeaTv0UuDk,38228
+glide/async_commands/cluster_commands.py,sha256=y1Viyz-TpatVu1wPzEmBJsifJWUhHotQrUGDWwYoOI8,61722
+glide/__init__.py,sha256=6FuOMIsm52UiKxJsb2dUj06vwCT8DOsxZDqxMx8d6vQ,8767
 glide/glide.pyi,sha256=6JIpAeADQ-1fU1Mp99pyh7aJORDxAAdtQebV5aByIVI,2093
 glide/opentelemetry.py,sha256=vg9fTYXj7_rni7hVBkZBJ1ZN4-RSGde5fOH4DsnVx_4,7476
-glide/glide_client.py,sha256=4RKpPvaci7XmlFgoI5s__P3dATk8sM2QcpUBFnFVq78,32405
+glide/glide_client.py,sha256=lIxvEkMsUG6Ura42dDrFbP8OPYJ1bXk-LsFf4eN5fwo,32594
 glide/logger.py,sha256=5-bAhfH_6hYEXdcgBR9R_wdeffSLHqEN-aQeIyMHnYY,4103
 glide_shared/__init__.py,sha256=Jgl61tWsX5n1F1a5_rxPvWBuMkBYtJ7gCLFRDPwGV8o,7141
 glide_shared/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-glide_shared/commands/batch.py,sha256=HxvswR5epj2A9nx-i69xzlO0L3jRWQNAfOg9pmmg3dE,246833
+glide_shared/commands/batch.py,sha256=Ji-Ljo0lgd_9jcwVfklNns8Crfqavtlgb33k_8Duj8g,247356
 glide_shared/commands/batch_options.py,sha256=i2lDCLhMzUvpArb2bxX16xu7X-im0hLPaLXALkxWeQ8,11130
 glide_shared/commands/bitmap.py,sha256=ZHGLcKBP7RADtANqIR7PWdIW_gfDBFgpkIsQ-T4QFBQ,10125
 glide_shared/commands/command_args.py,sha256=55vpSxeQr8wFU7olkFTEecl66wPk1g6vWxVYj16UvXs,2529
@@ -35,5 +35,5 @@ glide_shared/protobuf/connection_request_pb2.py,sha256=b3jDmMetSHUrZGmQd8b5DooZZ
 glide_shared/protobuf/response_pb2.py,sha256=oT2GHUwjrxvBVdINRKCvb3_BFN0Fq2wqwHbTj7KAX2E,2110
 glide_shared/protobuf_codec.py,sha256=xwt4-D4WbvNIY_vjOd-00c73HOyNjWq7nN-Z718PBVA,3667
 glide_shared/routes.py,sha256=HFccxCzXQXSi6Y1HFsRUm9ZcbJgCrar6y6uOWpGJWe0,4746
-glide/glide.cpython-39-darwin.so,sha256=eQeuVGnhFlWE-FeyuYPyCaXTNfJKmNVEgp6xK_djV2k,9891664
-valkey_glide-2.1.0rc9.dist-info/RECORD,,
+glide/glide.cpython-39-darwin.so,sha256=OFo7SJnf5iuTsq_HdiINBFWyKBxRIhFeN0dbxkcuUbk,9891712
+valkey_glide-2.1.1rc3.dist-info/RECORD,,