Merge master to 5.0

CHANGES

@@ -1,3 +1,13 @@
+    * Fix incorrect redis.asyncio.Cluster type hint for `retry_on_error`
+    * Fix dead weakref in sentinel connection causing ReferenceError (#2767)
+    * Fix #2768, Fix KeyError: 'first-entry' in parse_xinfo_stream.
+    * Fix #2749, remove unnecessary __del__ logic to close connections.
+    * Fix #2754, adding a missing argument to SentinelManagedConnection
+    * Fix `xadd` command to accept non-negative `maxlen` including 0
+    * Revert #2104, #2673, add `disconnect_on_error` option to `read_response()` (issues #2506, #2624)
+    * Add `address_remap` parameter to `RedisCluster`
+    * Fix incorrect usage of once flag in async Sentinel
+    * asyncio: Fix memory leak caused by hiredis (#2693)
     * Allow data to drain from async PythonParser when reading during a disconnect()
     * Use asyncio.timeout() instead of async_timeout.timeout() for python >= 3.11 (#2602)
     * Add test and fix async HiredisParser when reading during a disconnect() (#2349)
@@ -40,6 +50,8 @@
     * Fix Sentinel.execute_command doesn't execute across the entire sentinel cluster bug (#2458)
     * Added a replacement for the default cluster node in the event of failure (#2463)
     * Fix for Unhandled exception related to self.host with unix socket (#2496)
+    * Improve error output for master discovery 
+    * Make `ClusterCommandsProtocol` an actual Protocol
 
 * 4.1.3 (Feb 8, 2022)
     * Fix flushdb and flushall (#1926)

CONTRIBUTING.md

@@ -2,15 +2,15 @@
 
 ## Introduction
 
-First off, thank you for considering contributing to redis-py. We value
-community contributions!
+We appreciate your interest in considering contributing to redis-py.
+Community contributions mean a lot to us.
 
-## Contributions We Need
+## Contributions we need
 
-You may already know what you want to contribute \-- a fix for a bug you
+You may already know how you'd like to contribute, whether it's a fix for a bug you
 encountered, or a new feature your team wants to use.
 
-If you don't know what to contribute, keep an open mind! Improving
+If you don't know where to start, consider improving
 documentation, bug triaging, and writing tutorials are all examples of
 helpful contributions that mean less work for you.
 
@@ -166,19 +166,19 @@ When filing an issue, make sure to answer these five questions:
 4.  What did you expect to see?
 5.  What did you see instead?
 
-## How to Suggest a Feature or Enhancement
+## Suggest a feature or enhancement
 
 If you'd like to contribute a new feature, make sure you check our
 issue list to see if someone has already proposed it. Work may already
-be under way on the feature you want -- or we may have rejected a
+be underway on the feature you want or we may have rejected a
 feature like it already.
 
 If you don't see anything, open a new issue that describes the feature
 you would like and how it should work.
 
-## Code Review Process
+## Code review process
 
-The core team looks at Pull Requests on a regular basis. We will give
-feedback as as soon as possible. After feedback, we expect a response
+The core team regularly looks at pull requests. We will provide
+feedback as as soon as possible. After receiving our feedback, please respond
 within two weeks. After that time, we may close your PR if it isn't
 showing any activity.

docs/examples/connection_examples.ipynb

@@ -267,28 +267,60 @@
     }
    ],
    "source": [
+    "from typing import Tuple, Union\n",
+    "from urllib.parse import ParseResult, urlencode, urlunparse\n",
+    "\n",
+    "import botocore.session\n",
     "import redis\n",
-    "import boto3\n",
-    "import cachetools.func\n",
+    "from botocore.model import ServiceId\n",
+    "from botocore.signers import RequestSigner\n",
+    "from cachetools import TTLCache, cached\n",
     "\n",
     "class ElastiCacheIAMProvider(redis.CredentialProvider):\n",
-    "    def __init__(self, user, endpoint, port=6379, region=\"us-east-1\"):\n",
-    "        self.ec_client = boto3.client('elasticache')\n",
+    "    def __init__(self, user, cluster_name, region=\"us-east-1\"):\n",
     "        self.user = user\n",
-    "        self.endpoint = endpoint\n",
-    "        self.port = port\n",
+    "        self.cluster_name = cluster_name\n",
     "        self.region = region\n",
     "\n",
+    "        session = botocore.session.get_session()\n",
+    "        self.request_signer = RequestSigner(\n",
+    "            ServiceId(\"elasticache\"),\n",
+    "            self.region,\n",
+    "            \"elasticache\",\n",
+    "            \"v4\",\n",
+    "            session.get_credentials(),\n",
+    "            session.get_component(\"event_emitter\"),\n",
+    "        )\n",
+    "\n",
+    "    # Generated IAM tokens are valid for 15 minutes\n",
+    "    @cached(cache=TTLCache(maxsize=128, ttl=900))\n",
     "    def get_credentials(self) -> Union[Tuple[str], Tuple[str, str]]:\n",
-    "        @cachetools.func.ttl_cache(maxsize=128, ttl=15 * 60) # 15m\n",
-    "        def get_iam_auth_token(user, endpoint, port, region):\n",
-    "            return self.ec_client.generate_iam_auth_token(user, endpoint, port, region)\n",
-    "        iam_auth_token = get_iam_auth_token(self.endpoint, self.port, self.user, self.region)\n",
-    "        return iam_auth_token\n",
+    "        query_params = {\"Action\": \"connect\", \"User\": self.user}\n",
+    "        url = urlunparse(\n",
+    "            ParseResult(\n",
+    "                scheme=\"https\",\n",
+    "                netloc=self.cluster_name,\n",
+    "                path=\"/\",\n",
+    "                query=urlencode(query_params),\n",
+    "                params=\"\",\n",
+    "                fragment=\"\",\n",
+    "            )\n",
+    "        )\n",
+    "        signed_url = self.request_signer.generate_presigned_url(\n",
+    "            {\"method\": \"GET\", \"url\": url, \"body\": {}, \"headers\": {}, \"context\": {}},\n",
+    "            operation_name=\"connect\",\n",
+    "            expires_in=900,\n",
+    "            region_name=self.region,\n",
+    "        )\n",
+    "        # RequestSigner only seems to work if the URL has a protocol, but\n",
+    "        # Elasticache only accepts the URL without a protocol\n",
+    "        # So strip it off the signed URL before returning\n",
+    "        return (self.user, signed_url.removeprefix(\"https://\"))\n",
     "\n",
     "username = \"barshaul\"\n",
+    "cluster_name = \"test-001\"\n",
     "endpoint = \"test-001.use1.cache.amazonaws.com\"\n",
-    "creds_provider = ElastiCacheIAMProvider(user=username, endpoint=endpoint)\n",
+    "creds_provider = ElastiCacheIAMProvider(user=username, cluster_name=cluster_name)\n",
     "user_connection = redis.Redis(host=endpoint, port=6379, credential_provider=creds_provider)\n",
     "user_connection.ping()"
    ]

docs/examples/opentelemetry/main.py

@@ -2,12 +2,11 @@
 
 import time
 
+import redis
 import uptrace
 from opentelemetry import trace
 from opentelemetry.instrumentation.redis import RedisInstrumentor
 
-import redis
-
 tracer = trace.get_tracer("app_or_package_name", "1.0.0")