Merge branch 'master' into truncate-pipeline-exception

Author: vladvildanov

.github/actions/run-tests/action.yml

@@ -38,7 +38,7 @@ runs:
         echo "::group::Installing dependencies"
         pip install -r dev_requirements.txt
         pip uninstall -y redis  # uninstall Redis package installed via redis-entraid
-        pip install -e .  # install the working copy
+        pip install -e .[jwt]  # install the working copy
         if [ "${{inputs.parser-backend}}" == "hiredis" ]; then
           pip install "hiredis${{inputs.hiredis-version}}"
           echo "PARSER_BACKEND=$(echo "${{inputs.parser-backend}}_${{inputs.hiredis-version}}" | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_ENV        

CONTRIBUTING.md

@@ -32,13 +32,13 @@ Here's how to get started with your code contribution:
 
 1.  Create your own fork of redis-py
 2.  Do the changes in your fork
-3.
-    *Create a virtualenv and install the development dependencies from the dev_requirements.txt file:*
-
-        a.  python -m venv .venv
-        b.  source .venv/bin/activate
-        c.  pip install -r dev_requirements.txt
-        c.  pip install -e .
+3.  Create a virtualenv and install the development dependencies from the dev_requirements.txt file:
+    ```
+    python -m venv .venv
+    source .venv/bin/activate
+    pip install -r dev_requirements.txt
+    pip install -e .[jwt]
+    ```
 
 4.  If you need a development environment, run `invoke devenv`. Note: this relies on docker-compose to build environments, and assumes that you have a version supporting [docker profiles](https://docs.docker.com/compose/profiles/).
 5.  While developing, make sure the tests pass by running `invoke tests`

pyproject.toml

@@ -37,7 +37,6 @@ classifiers = [
 ]
 dependencies = [
     'async-timeout>=4.0.3; python_full_version<"3.11.3"',
-    "PyJWT~=2.9.0",
 ]
 
 [project.optional-dependencies]
@@ -49,6 +48,9 @@ ocsp = [
     "pyopenssl==20.0.1",
     "requests>=2.31.0",
 ]
+jwt = [
+    "PyJWT~=2.9.0",
+]
 
 [project.urls]
 Changes = "https://github.com/redis/redis-py/releases"

redis/asyncio/sentinel.py

@@ -198,6 +198,7 @@ def __init__(
         sentinels,
         min_other_sentinels=0,
         sentinel_kwargs=None,
+        force_master_ip=None,
         **connection_kwargs,
     ):
         # if sentinel_kwargs isn't defined, use the socket_* options from
@@ -214,6 +215,7 @@ def __init__(
         ]
         self.min_other_sentinels = min_other_sentinels
         self.connection_kwargs = connection_kwargs
+        self._force_master_ip = force_master_ip
 
     async def execute_command(self, *args, **kwargs):
         """
@@ -277,7 +279,13 @@ async def discover_master(self, service_name: str):
                     sentinel,
                     self.sentinels[0],
                 )
-                return state["ip"], state["port"]
+
+                ip = (
+                    self._force_master_ip
+                    if self._force_master_ip is not None
+                    else state["ip"]
+                )
+                return ip, state["port"]
 
         error_info = ""
         if len(collected_errors) > 0:

redis/auth/token.py

@@ -1,7 +1,6 @@
 from abc import ABC, abstractmethod
 from datetime import datetime, timezone
 
-import jwt
 from redis.auth.err import InvalidTokenSchemaErr
 
 
@@ -81,6 +80,12 @@ class JWToken(TokenInterface):
     REQUIRED_FIELDS = {"exp"}
 
     def __init__(self, token: str):
+        try:
+            import jwt
+        except ImportError as ie:
+            raise ImportError(
+                f"The PyJWT library is required for {self.__class__.__name__}.",
+            ) from ie
         self._value = token
         self._decoded = jwt.decode(
             self._value,

redis/commands/core.py

@@ -5,6 +5,7 @@
 import warnings
 from typing import (
     TYPE_CHECKING,
+    Any,
     AsyncIterator,
     Awaitable,
     Callable,
@@ -6397,12 +6398,12 @@ def function_list(
         return self.execute_command("FUNCTION LIST", *args)
 
     def _fcall(
-        self, command: str, function, numkeys: int, *keys_and_args: Optional[List]
+        self, command: str, function, numkeys: int, *keys_and_args: Any
     ) -> Union[Awaitable[str], str]:
         return self.execute_command(command, function, numkeys, *keys_and_args)
 
     def fcall(
-        self, function, numkeys: int, *keys_and_args: Optional[List]
+        self, function, numkeys: int, *keys_and_args: Any
     ) -> Union[Awaitable[str], str]:
         """
         Invoke a function.
@@ -6412,7 +6413,7 @@ def fcall(
         return self._fcall("FCALL", function, numkeys, *keys_and_args)
 
     def fcall_ro(
-        self, function, numkeys: int, *keys_and_args: Optional[List]
+        self, function, numkeys: int, *keys_and_args: Any
     ) -> Union[Awaitable[str], str]:
         """
         This is a read-only variant of the FCALL command that cannot

tests/conftest.py

@@ -10,7 +10,6 @@
 from unittest.mock import Mock
 from urllib.parse import urlparse
 
-import jwt
 import pytest
 import redis
 from packaging.version import Version
@@ -615,6 +614,7 @@ def cache_key(request) -> CacheKey:
 
 
 def mock_identity_provider() -> IdentityProviderInterface:
+    jwt = pytest.importorskip("jwt")
     mock_provider = Mock(spec=IdentityProviderInterface)
     token = {"exp": datetime.now(timezone.utc).timestamp() + 3600, "oid": "username"}
     encoded = jwt.encode(token, "secret", algorithm="HS256")

tests/test_asyncio/conftest.py

@@ -5,7 +5,6 @@
 from enum import Enum
 from typing import Union
 
-import jwt
 import pytest
 import pytest_asyncio
 import redis.asyncio as redis
@@ -152,8 +151,10 @@ async def sentinel_setup(local_cache, request):
         for ip, port in (endpoint.split(":") for endpoint in sentinel_ips.split(","))
     ]
     kwargs = request.param.get("kwargs", {}) if hasattr(request, "param") else {}
+    force_master_ip = request.param.get("force_master_ip", None)
     sentinel = Sentinel(
         sentinel_endpoints,
+        force_master_ip=force_master_ip,
         socket_timeout=0.1,
         client_cache=local_cache,
         protocol=3,
@@ -247,6 +248,7 @@ async def mock_cluster_resp_slaves(create_redis, **kwargs):
 
 
 def mock_identity_provider() -> IdentityProviderInterface:
+    jwt = pytest.importorskip("jwt")
     mock_provider = Mock(spec=IdentityProviderInterface)
     token = {"exp": datetime.now(timezone.utc).timestamp() + 3600, "oid": "username"}
     encoded = jwt.encode(token, "secret", algorithm="HS256")

tests/test_auth/test_token.py

@@ -1,6 +1,5 @@
 from datetime import datetime, timezone
 
-import jwt
 import pytest
 from redis.auth.err import InvalidTokenSchemaErr
 from redis.auth.token import JWToken, SimpleToken
@@ -39,6 +38,8 @@ def test_simple_token(self):
         assert token.get_expires_at_ms() == -1
 
     def test_jwt_token(self):
+        jwt = pytest.importorskip("jwt")
+
         token = {
             "exp": datetime.now(timezone.utc).timestamp() + 100,
             "iat": datetime.now(timezone.utc).timestamp(),