update CI/CD to match redisvl flow

Author: tylerhutcherson

.github/workflows/test.yml

@@ -7,29 +7,26 @@ on:
     branches:
       - main
 
+  workflow_dispatch:
+
 env:
   POETRY_VERSION: "1.8.3"
 
 jobs:
   test:
-    name: Python ${{ matrix.python-version }} - ${{ matrix.connection }} [redis-stack ${{matrix.redis-stack-version}}]
+    name: Python ${{ matrix.python-version }} - [redis ${{ matrix.redis-version }}]
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, '3.10', 3.11, 3.12]
-        connection: ['hiredis', 'plain']
-        redis-stack-version: ['6.2.6-v9', 'latest', 'edge']
-
-    services:
-      redis:
-        image: redis/redis-stack-server:${{matrix.redis-stack-version}}
-        ports:
-          - 6379:6379
+        python-version: [3.9, 3.11, 3.13]
+        redis-version: ['6.2.6-v9', 'latest', '8.0-M03']
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v3
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -45,15 +42,22 @@ jobs:
       run: |
         poetry install --all-extras
 
-    - name: Install hiredis if needed
-      if: matrix.connection == 'hiredis'
+    - name: Set Redis image name
       run: |
-        poetry add hiredis
-
-    - name: Set Redis version
+        if [[ "${{ matrix.redis-version }}" == "8.0-M03" ]]; then
+          echo "REDIS_IMAGE=redis:${{ matrix.redis-version }}" >> $GITHUB_ENV
+        else
+          echo "REDIS_IMAGE=redis/redis-stack-server:${{ matrix.redis-version }}" >> $GITHUB_ENV
+        fi
+
+    - name: Run API tests
+      if: matrix.redis-version == 'latest'
+      env:
+        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       run: |
-        echo "REDIS_VERSION=${{ matrix.redis-stack-version }}" >> $GITHUB_ENV
+        make test-all
 
     - name: Run tests
+      if:  matrix.redis-version != 'latest'
       run: |
         make test

Makefile

@@ -1,4 +1,4 @@
-.PHONY: install format lint test clean redis-start redis-stop check-types check
+.PHONY: install format lint test test-all clean redis-start redis-stop check-types check
 
 install:
 	poetry install --all-extras
@@ -21,6 +21,9 @@ lint: format check-types
 test:
 	poetry run test-verbose
 
+test-all:
+	poetry run test-verbose --run-api-tests
+
 check: lint test
 
 clean:

langgraph/store/redis/aio.py

@@ -98,7 +98,7 @@ def __init__(
         self.configure_client(
             redis_url=redis_url,
             redis_client=redis_client,
-            connection_args=connection_args or {}
+            connection_args=connection_args or {},
         )
 
         # Create store index

scripts.py

@@ -1,4 +1,5 @@
 import subprocess
+import sys
 
 
 def format():
@@ -29,10 +30,18 @@ def check_mypy():
 
 
 def test():
-    subprocess.run(["python", "-m", "pytest", "-n", "auto", "--log-level=CRITICAL"], check=True)
+    test_cmd = ["python", "-m", "pytest", "-n", "auto", "--log-level=CRITICAL"]
+    # Get any extra arguments passed to the script
+    extra_args = sys.argv[1:]
+    if extra_args:
+        test_cmd.extend(extra_args)
+    subprocess.run(test_cmd, check=True)
 
 
 def test_verbose():
-    subprocess.run(
-        ["python", "-m", "pytest", "-n", "auto", "-vv", "-s", "--log-level=CRITICAL"], check=True
-    )
+    test_cmd = ["python", "-m", "pytest", "-n", "auto", "-vv", "-s", "--log-level=CRITICAL"]
+    # Get any extra arguments passed to the script
+    extra_args = sys.argv[1:]
+    if extra_args:
+        test_cmd.extend(extra_args)
+    subprocess.run(test_cmd, check=True)

tests/conftest.py

@@ -1,5 +1,4 @@
 import os
-import subprocess
 
 import pytest
 from redis.asyncio import Redis
@@ -8,55 +7,28 @@
 
 VECTOR_TYPES = ["vector", "halfvec"]
 
-# try:
-#     from testcontainers.compose import DockerCompose
-
-#     TESTCONTAINERS_AVAILABLE = True
-# except ImportError:
-#     TESTCONTAINERS_AVAILABLE = False
-
-# if TESTCONTAINERS_AVAILABLE:
-
 
 @pytest.fixture(autouse=True)
 def set_tokenizers_parallelism():
     """Disable tokenizers parallelism in tests to avoid deadlocks"""
     os.environ["TOKENIZERS_PARALLELISM"] = "false"
 
-    # @pytest.fixture(scope="session", autouse=True)
-    # def redis_container() -> DockerCompose:
-    #     # Set the default Redis version if not already set
-    #     os.environ.setdefault("REDIS_VERSION", "edge")
-
-    #     try:
-    #         compose = DockerCompose(
-    #             "tests", compose_file_name="docker-compose.yml", pull=True
-    #         )
-    #         compose.start()
-
-    #         redis_host, redis_port = compose.get_service_host_and_port("redis", 6379)
-    #         redis_url = f"redis://{redis_host}:{redis_port}"
-    #         os.environ["DEFAULT_REDIS_URI"] = redis_url
-
-    #         yield compose
-
-    #         compose.stop()
-    #     except subprocess.CalledProcessError:
-    #         yield None
-
 
 @pytest.fixture(scope="session", autouse=True)
 def redis_container(request):
     """
-    Create a unique Compose project for each xdist worker by setting
-    COMPOSE_PROJECT_NAME. That prevents collisions on container/volume names.
+    If using xdist, create a unique Compose project for each xdist worker by
+    setting COMPOSE_PROJECT_NAME. That prevents collisions on container/volume
+    names.
     """
     # In xdist, the config has "workerid" in workerinput
-    worker_id = request.config.workerinput.get("workerid", "master")
+    workerinput = getattr(request.config, "workerinput", {})
+    worker_id = workerinput.get("workerid", "master")
+
 
     # Set the Compose project name so containers do not clash across workers
     os.environ["COMPOSE_PROJECT_NAME"] = f"redis_test_{worker_id}"
-    os.environ.setdefault("REDIS_VERSION", "edge")
+    os.environ.setdefault("REDIS_IMAGE", "redis/redis-stack-server:latest")
 
     compose = DockerCompose(
         context="tests",
@@ -70,11 +42,6 @@ def redis_container(request):
     compose.stop()
 
 
-# @pytest.fixture(scope="session")
-# def redis_url() -> str:
-#     return os.getenv("DEFAULT_REDIS_URI", "redis://localhost:6379")
-
-
 @pytest.fixture(scope="session")
 def redis_url(redis_container):
     """
@@ -85,6 +52,15 @@ def redis_url(redis_container):
     return f"redis://{host}:{port}"
 
 
+@pytest.fixture
+async def async_client(redis_url):
+    """
+    An async Redis client that uses the dynamic `redis_url`.
+    """
+    async with await RedisConnectionFactory._get_aredis_connection(redis_url) as client:
+        yield client
+
+
 @pytest.fixture
 def client(redis_url):
     """

tests/test_shallow_async.py

@@ -1,15 +1,15 @@
 from typing import Any, AsyncGenerator, Dict
 
 import pytest
-from redis.asyncio import Redis
-from redis.exceptions import ConnectionError as RedisConnectionError
 from langchain_core.runnables import RunnableConfig
 from langgraph.checkpoint.base import (
     Checkpoint,
     CheckpointMetadata,
     create_checkpoint,
     empty_checkpoint,
 )
+from redis.asyncio import Redis
+from redis.exceptions import ConnectionError as RedisConnectionError
 
 from langgraph.checkpoint.redis.ashallow import AsyncShallowRedisSaver