Merge branch 'master' into fixing_mypy_errors

Author: petyaslavova

redis/commands/search/aggregation.py

@@ -27,9 +27,15 @@ class Reducer:
     NAME = None
 
     def __init__(self, *args: str) -> None:
+<<<<<<< fixing_mypy_errors
         self._args: tuple[str, ...] = args
         self._field: Optional[str] = None
         self._alias: Optional[str] = None
+=======
+        self._args = args
+        self._field = None
+        self._alias = None
+>>>>>>> master
 
     def alias(self, alias: str) -> "Reducer":
         """
@@ -105,6 +111,7 @@ def __init__(self, query: str = "*") -> None:
         All member methods (except `build_args()`)
         return the object itself, making them useful for chaining.
         """
+<<<<<<< fixing_mypy_errors
         self._query: str = query
         self._aggregateplan: List[str] = []
         self._loadfields: List[str] = []
@@ -116,6 +123,19 @@ def __init__(self, query: str = "*") -> None:
         self._dialect: int = DEFAULT_DIALECT
         self._add_scores: bool = False
         self._scorer: str = "TFIDF"
+=======
+        self._query = query
+        self._aggregateplan = []
+        self._loadfields = []
+        self._loadall = False
+        self._max = 0
+        self._with_schema = False
+        self._verbatim = False
+        self._cursor = []
+        self._dialect = DEFAULT_DIALECT
+        self._add_scores = False
+        self._scorer = "TFIDF"
+>>>>>>> master
 
     def load(self, *fields: str) -> "AggregateRequest":
         """

redis/commands/search/commands.py

@@ -542,7 +542,7 @@ def explain_cli(self, query: Union[str, Query]):  # noqa
 
     def aggregate(
         self,
-        query: Union[str, Query],
+        query: Union[AggregateRequest, Cursor],
         query_params: Optional[Dict[str, Union[str, int, float]]] = None,
     ):
         """
@@ -573,7 +573,7 @@ def aggregate(
         )
 
     def _get_aggregate_result(
-        self, raw: List, query: Union[str, Query, AggregateRequest], has_cursor: bool
+        self, raw: List, query: Union[AggregateRequest, Cursor], has_cursor: bool
     ):
         if has_cursor:
             if isinstance(query, Cursor):
@@ -967,7 +967,7 @@ async def search(
 
     async def aggregate(
         self,
-        query: Union[str, Query],
+        query: Union[AggregateResult, Cursor],
         query_params: Dict[str, Union[str, int, float]] = None,
     ):
         """