Merge branch 'master' into DOC-4736-geo-index-examples

andy-stark-redis · web-flow · commit af64fd27cea5 · 2025-02-06T09:03:12.000Z
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
@@ -35,6 +35,10 @@ runs:
         CLIENT_LIBS_TEST_IMAGE: "redislabs/client-libs-test:${{ inputs.redis-version }}"
       run: |
         set -e
+        
+        if [ "${{inputs.redis-version}}" == "8.0-M04-pre" ]; then
+          export REDIS_IMAGE=redis:8.0-M03
+        fi
                 
         echo "::group::Installing dependencies"
         pip install -U setuptools wheel
@@ -56,9 +60,9 @@ runs:
         
           # Mapping of redis version to stack version  
           declare -A redis_stack_version_mapping=(
-            ["7.4.1"]="7.4.0-v1"
-            ["7.2.6"]="7.2.0-v13"
-            ["6.2.16"]="6.2.6-v17"
+            ["7.4.2"]="7.4.0-v2"
+            ["7.2.7"]="7.2.0-v14"
+            ["6.2.17"]="6.2.6-v18"
           )
                   
           if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -29,7 +29,7 @@ env:
   COVERAGE_CORE: sysmon
   REDIS_IMAGE: redis:latest
   REDIS_STACK_IMAGE: redis/redis-stack-server:latest
-  CURRENT_REDIS_VERSION: '7.4.1'
+  CURRENT_REDIS_VERSION: '7.4.2'
 
 jobs:
   dependency-audit:
@@ -74,7 +74,7 @@ jobs:
       max-parallel: 15
       fail-fast: false
       matrix:
-        redis-version: ['8.0-M02', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16']
+        redis-version: ['8.0-M04-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7', '6.2.17']
         python-version: ['3.8', '3.12']
         parser-backend: ['plain']
         event-loop: ['asyncio']
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,4 @@
+    * Update URL in the readme linking to Redis University
     * Move doctests (doc code examples) to main branch
     * Update `ResponseT` type hint
     * Allow to control the minimum SSL version
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ The Python interface to the Redis key-value store.
 
 ## How do I Redis?
 
-[Learn for free at Redis University](https://redis.io/university/)
+[Learn for free at Redis University](https://redis.io/learn/university)
 
 [Try the Redis Cloud](https://redis.io/try-free/)
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -103,7 +103,7 @@ services:
       - all
 
   redis-stack:
-    image: ${REDIS_STACK_IMAGE:-redis/redis-stack-server:edge}
+    image: ${REDIS_STACK_IMAGE:-redis/redis-stack-server:latest}
     container_name: redis-stack
     ports:
       - 6479:6379
@@ -112,6 +112,7 @@ services:
     profiles:
       - standalone
       - all-stack
+      - all
 
   redis-stack-graph:
     image: redis/redis-stack-server:6.2.6-v15
diff --git a/doctests/query_agg.py b/doctests/query_agg.py
@@ -6,7 +6,7 @@
 from redis.commands.search import Search
 from redis.commands.search.aggregation import AggregateRequest
 from redis.commands.search.field import NumericField, TagField
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 import redis.commands.search.reducers as reducers
 
 r = redis.Redis(decode_responses=True)
diff --git a/doctests/query_combined.py b/doctests/query_combined.py
@@ -6,7 +6,7 @@
 import warnings
 from redis.commands.json.path import Path
 from redis.commands.search.field import NumericField, TagField, TextField, VectorField
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 from sentence_transformers import  SentenceTransformer
 
diff --git a/doctests/query_em.py b/doctests/query_em.py
@@ -4,7 +4,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import TextField, NumericField, TagField
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from redis.commands.search.query import NumericFilter, Query
 
 r = redis.Redis(decode_responses=True)
diff --git a/doctests/query_ft.py b/doctests/query_ft.py
@@ -5,7 +5,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import TextField, NumericField, TagField
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from redis.commands.search.query import NumericFilter, Query
 
 r = redis.Redis(decode_responses=True)
diff --git a/doctests/query_geo.py b/doctests/query_geo.py
@@ -5,7 +5,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import GeoField, GeoShapeField
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 
 r = redis.Redis(decode_responses=True)
diff --git a/doctests/query_range.py b/doctests/query_range.py
@@ -5,7 +5,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import TextField, NumericField, TagField
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from redis.commands.search.query import NumericFilter, Query
 
 r = redis.Redis(decode_responses=True)
diff --git a/doctests/search_quickstart.py b/doctests/search_quickstart.py
@@ -10,7 +10,7 @@
 import redis.commands.search.reducers as reducers
 from redis.commands.json.path import Path
 from redis.commands.search.field import NumericField, TagField, TextField
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 
 # HIDE_END
diff --git a/doctests/search_vss.py b/doctests/search_vss.py
@@ -20,7 +20,7 @@
     TextField,
     VectorField,
 )
-from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 from sentence_transformers import SentenceTransformer
 
diff --git a/redis/asyncio/client.py b/redis/asyncio/client.py
@@ -1554,7 +1554,7 @@ async def _disconnect_raise_reset(self, conn: Connection, error: Exception):
             await self.reset()
             raise
 
-    async def execute(self, raise_on_error: bool = True):
+    async def execute(self, raise_on_error: bool = True) -> List[Any]:
         """Execute all the commands in the current pipeline"""
         stack = self.command_stack
         if not stack and not self.watching:
diff --git a/redis/client.py b/redis/client.py
@@ -550,7 +550,7 @@ def __exit__(self, exc_type, exc_value, traceback):
     def __del__(self):
         self.close()
 
-    def close(self):
+    def close(self) -> None:
         # In case a connection property does not yet exist
         # (due to a crash earlier in the Redis() constructor), return
         # immediately as there is nothing to clean-up.
@@ -1551,11 +1551,10 @@ def _disconnect_raise_reset(
             conn.retry_on_error is None
             or isinstance(error, tuple(conn.retry_on_error)) is False
         ):
-
             self.reset()
             raise error
 
-    def execute(self, raise_on_error=True):
+    def execute(self, raise_on_error: bool = True) -> List[Any]:
         """Execute all the commands in the current pipeline"""
         stack = self.command_stack
         if not stack and not self.watching:
diff --git a/redis/cluster.py b/redis/cluster.py
@@ -1227,7 +1227,7 @@ def _execute_command(self, target_node, *args, **kwargs):
 
         raise ClusterError("TTL exhausted.")
 
-    def close(self):
+    def close(self) -> None:
         try:
             with self._lock:
                 if self.nodes_manager:
@@ -1669,7 +1669,7 @@ def initialize(self):
         # If initialize was called after a MovedError, clear it
         self._moved_exception = None
 
-    def close(self):
+    def close(self) -> None:
         self.default_node = None
         for node in self.nodes_cache.values():
             if node.redis_connection:
@@ -2050,7 +2050,7 @@ def annotate_exception(self, exception, number, command):
         )
         exception.args = (msg,) + exception.args[1:]
 
-    def execute(self, raise_on_error=True):
+    def execute(self, raise_on_error: bool = True) -> List[Any]:
         """
         Execute all the commands in the current pipeline
         """
diff --git a/redis/commands/search/commands.py b/redis/commands/search/commands.py
@@ -692,6 +692,10 @@ def dict_dump(self, name: str):
         cmd = [DICT_DUMP_CMD, name]
         return self.execute_command(*cmd)
 
+    @deprecated_function(
+        version="8.0.0",
+        reason="deprecated since Redis 8.0, call config_set from core module instead",
+    )
     def config_set(self, option: str, value: str) -> bool:
         """Set runtime configuration option.
 
@@ -706,6 +710,10 @@ def config_set(self, option: str, value: str) -> bool:
         raw = self.execute_command(*cmd)
         return raw == "OK"
 
+    @deprecated_function(
+        version="8.0.0",
+        reason="deprecated since Redis 8.0, call config_get from core module instead",
+    )
     def config_get(self, option: str) -> str:
         """Get runtime configuration option value.
 
diff --git a/redis/commands/search/query.py b/redis/commands/search/query.py
@@ -179,6 +179,8 @@ def scorer(self, scorer: str) -> "Query":
         Use a different scoring function to evaluate document relevance.
         Default is `TFIDF`.
 
+        Since Redis 8.0 default was changed to BM25STD.
+
         :param scorer: The scoring function to use
                        (e.g. `TFIDF.DOCNORM` or `BM25`)
         """
diff --git a/redis/connection.py b/redis/connection.py
@@ -9,7 +9,7 @@
 from itertools import chain
 from queue import Empty, Full, LifoQueue
 from time import time
-from typing import Any, Callable, Dict, List, Optional, Type, Union
+from typing import Any, Callable, Dict, List, Optional, Type, TypeVar, Union
 from urllib.parse import parse_qs, unquote, urlparse
 
 from redis.cache import (
@@ -1263,6 +1263,9 @@ def parse_url(url):
     return kwargs
 
 
+_CP = TypeVar("_CP", bound="ConnectionPool")
+
+
 class ConnectionPool:
     """
     Create a connection pool. ``If max_connections`` is set, then this
@@ -1278,7 +1281,7 @@ class ConnectionPool:
     """
 
     @classmethod
-    def from_url(cls, url, **kwargs):
+    def from_url(cls: Type[_CP], url: str, **kwargs) -> _CP:
         """
         Return a connection pool configured from the given URL.
 
diff --git a/tests/test_asyncio/test_commands.py b/tests/test_asyncio/test_commands.py
diff --git a/tests/test_asyncio/test_connection.py b/tests/test_asyncio/test_connection.py
diff --git a/tests/test_asyncio/test_search.py b/tests/test_asyncio/test_search.py
diff --git a/tests/test_commands.py b/tests/test_commands.py
diff --git a/tests/test_connection.py b/tests/test_connection.py
diff --git a/tests/test_multiprocessing.py b/tests/test_multiprocessing.py
diff --git a/tests/test_search.py b/tests/test_search.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+ * Update URL in the readme linking to Redis University`
`1`	`2`	`* Move doctests (doc code examples) to main branch`
`2`	`3`	* Update `ResponseT` type hint
`3`	`4`	`* Allow to control the minimum SSL version`