address comments

Author: daric93

modules/valkey/example_basic.py

@@ -1,4 +1,4 @@
-import socket
+from glide import GlideClient, NodeAddress
 
 from testcontainers.valkey import ValkeyContainer
 
@@ -13,24 +13,22 @@ def basic_example():
         print(f"Valkey connection URL: {connection_url}")
         print(f"Host: {host}, Port: {port}")
 
-        # Connect using raw socket and RESP protocol
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.connect((host, port))
+        # Connect using Glide client
+        client = GlideClient([NodeAddress(host, port)])
 
-            # PING command
-            s.sendall(b"*1\r\n$4\r\nPING\r\n")
-            response = s.recv(1024)
-            print(f"PING response: {response.decode()}")
+        # PING command
+        pong = client.ping()
+        print(f"PING response: {pong}")
 
-            # SET command
-            s.sendall(b"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n")
-            response = s.recv(1024)
-            print(f"SET response: {response.decode()}")
+        # SET command
+        client.set("key", "value")
+        print("SET response: OK")
 
-            # GET command
-            s.sendall(b"*2\r\n$3\r\nGET\r\n$3\r\nkey\r\n")
-            response = s.recv(1024)
-            print(f"GET response: {response.decode()}")
+        # GET command
+        value = client.get("key")
+        print(f"GET response: {value}")
+
+        client.close()
 
 
 def password_example():
@@ -41,18 +39,14 @@ def password_example():
 
         print(f"\nValkey with password connection URL: {connection_url}")
 
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.connect((host, port))
+        # Connect using Glide client with password
+        client = GlideClient([NodeAddress(host, port)], password="mypassword")
 
-            # AUTH command
-            s.sendall(b"*2\r\n$4\r\nAUTH\r\n$10\r\nmypassword\r\n")
-            response = s.recv(1024)
-            print(f"AUTH response: {response.decode()}")
+        # PING after auth
+        pong = client.ping()
+        print(f"PING response: {pong}")
 
-            # PING after auth
-            s.sendall(b"*1\r\n$4\r\nPING\r\n")
-            response = s.recv(1024)
-            print(f"PING response: {response.decode()}")
+        client.close()
 
 
 def version_example():
@@ -70,11 +64,11 @@ def bundle_example():
         host = valkey_container.get_host()
         port = valkey_container.get_exposed_port()
 
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.connect((host, port))
-            s.sendall(b"*1\r\n$4\r\nPING\r\n")
-            response = s.recv(1024)
-            print(f"PING response: {response.decode()}")
+        # Connect using Glide client
+        client = GlideClient([NodeAddress(host, port)])
+        pong = client.ping()
+        print(f"PING response: {pong}")
+        client.close()
 
 
 if __name__ == "__main__":

modules/valkey/testcontainers/valkey/__init__.py

@@ -11,29 +11,16 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import socket
 from typing import Optional
 
 from testcontainers.core.container import DockerContainer
-from testcontainers.core.waiting_utils import wait_container_is_ready
-
-
-class ValkeyNotReady(Exception):
-    pass
+from testcontainers.core.wait_strategies import ExecWaitStrategy
 
 
 class ValkeyContainer(DockerContainer):
     """
     Valkey container.
 
-    Example:
-
-        .. doctest::
-
-            >>> from testcontainers.valkey import ValkeyContainer
-
-            >>> with ValkeyContainer() as valkey_container:
-            ...     connection_url = valkey_container.get_connection_url()
     """
 
     def __init__(self, image: str = "valkey/valkey:latest", port: int = 6379, **kwargs) -> None:
@@ -53,7 +40,7 @@ def with_password(self, password: str) -> "ValkeyContainer":
             self: Container instance for method chaining.
         """
         self.password = password
-        self.with_command(f"valkey-server --requirepass {password}")
+        self.with_command(["valkey-server", "--requirepass", password])
         return self
 
     def with_image_tag(self, tag: str) -> "ValkeyContainer":
@@ -111,28 +98,17 @@ def get_exposed_port(self) -> int:
         """
         return int(super().get_exposed_port(self.port))
 
-    @wait_container_is_ready(ValkeyNotReady)
-    def _connect(self) -> None:
-        """Wait for Valkey to be ready by sending PING command."""
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.connect((self.get_host(), self.get_exposed_port()))
-            if self.password:
-                s.sendall(f"*2\r\n$4\r\nAUTH\r\n${len(self.password)}\r\n{self.password}\r\n".encode())
-                auth_response = s.recv(1024)
-                if b"+OK" not in auth_response:
-                    raise ValkeyNotReady("Authentication failed")
-            s.sendall(b"*1\r\n$4\r\nPING\r\n")
-            response = s.recv(1024)
-            if b"+PONG" not in response:
-                raise ValkeyNotReady("Valkey not ready yet")
-
     def start(self) -> "ValkeyContainer":
         """
         Start the container and wait for it to be ready.
 
         Returns:
             self: Started container instance.
         """
+        if self.password:
+            self.waiting_for(ExecWaitStrategy(["valkey-cli", "-a", self.password, "ping"]))
+        else:
+            self.waiting_for(ExecWaitStrategy(["valkey-cli", "ping"]))
+
         super().start()
-        self._connect()
         return self