Fixing mypy errors in redis/commands/search/aggregation.py

Author: petyaslavova

redis/commands/search/aggregation.py

@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import List, Optional, Union
 
 from redis.commands.search.dialect import DEFAULT_DIALECT
 
@@ -26,10 +26,10 @@ class Reducer:
 
     NAME = None
 
-    def __init__(self, *args: List[str]) -> None:
-        self._args = args
-        self._field = None
-        self._alias = None
+    def __init__(self, *args: str) -> None:
+        self._args: tuple[str, ...] = args
+        self._field: Optional[str] = None
+        self._alias: Optional[str] = None
 
     def alias(self, alias: str) -> "Reducer":
         """
@@ -49,13 +49,14 @@ def alias(self, alias: str) -> "Reducer":
         if alias is FIELDNAME:
             if not self._field:
                 raise ValueError("Cannot use FIELDNAME alias with no field")
-            # Chop off initial '@'
-            alias = self._field[1:]
+            else:
+                # Chop off initial '@'
+                alias = self._field[1:]
         self._alias = alias
         return self
 
     @property
-    def args(self) -> List[str]:
+    def args(self) -> tuple[str, ...]:
         return self._args
 
 
@@ -64,7 +65,7 @@ class SortDirection:
     This special class is used to indicate sort direction.
     """
 
-    DIRSTRING = None
+    DIRSTRING: Optional[str] = None
 
     def __init__(self, field: str) -> None:
         self.field = field
@@ -104,19 +105,19 @@ def __init__(self, query: str = "*") -> None:
         All member methods (except `build_args()`)
         return the object itself, making them useful for chaining.
         """
-        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"
-
-    def load(self, *fields: List[str]) -> "AggregateRequest":
+        self._query: str = query
+        self._aggregateplan: List[str] = []
+        self._loadfields: List[str] = []
+        self._loadall: bool = False
+        self._max: int = 0
+        self._with_schema: bool = False
+        self._verbatim: bool = False
+        self._cursor: List[str] = []
+        self._dialect: int = DEFAULT_DIALECT
+        self._add_scores: bool = False
+        self._scorer: str = "TFIDF"
+
+    def load(self, *fields: str) -> "AggregateRequest":
         """
         Indicate the fields to be returned in the response. These fields are
         returned in addition to any others implicitly specified.
@@ -133,7 +134,7 @@ def load(self, *fields: List[str]) -> "AggregateRequest":
         return self
 
     def group_by(
-        self, fields: List[str], *reducers: Union[Reducer, List[Reducer]]
+        self, fields: Union[str, List[str]], *reducers: Reducer
     ) -> "AggregateRequest":
         """
         Specify by which fields to group the aggregation.
@@ -147,7 +148,6 @@ def group_by(
             `aggregation` module.
         """
         fields = [fields] if isinstance(fields, str) else fields
-        reducers = [reducers] if isinstance(reducers, Reducer) else reducers
 
         ret = ["GROUPBY", str(len(fields)), *fields]
         for reducer in reducers:
@@ -223,7 +223,7 @@ def limit(self, offset: int, num: int) -> "AggregateRequest":
         self._aggregateplan.extend(_limit.build_args())
         return self
 
-    def sort_by(self, *fields: List[str], **kwargs) -> "AggregateRequest":
+    def sort_by(self, *fields: str, **kwargs) -> "AggregateRequest":
         """
         Indicate how the results should be sorted. This can also be used for
         *top-N* style queries
@@ -251,12 +251,10 @@ def sort_by(self, *fields: List[str], **kwargs) -> "AggregateRequest":
             .sort_by(Desc("@paid"), max=10)
         ```
         """
-        if isinstance(fields, (str, SortDirection)):
-            fields = [fields]
 
         fields_args = []
         for f in fields:
-            if isinstance(f, SortDirection):
+            if isinstance(f, (Asc, Desc)):
                 fields_args += [f.field, f.DIRSTRING]
             else:
                 fields_args += [f]
@@ -356,7 +354,7 @@ def build_args(self) -> List[str]:
             ret.extend(self._loadfields)
 
         if self._dialect:
-            ret.extend(["DIALECT", self._dialect])
+            ret.extend(["DIALECT", str(self._dialect)])
 
         ret.extend(self._aggregateplan)
 
@@ -393,7 +391,7 @@ def __init__(self, rows, cursor: Cursor, schema) -> None:
         self.cursor = cursor
         self.schema = schema
 
-    def __repr__(self) -> (str, str):
+    def __repr__(self) -> str:
         cid = self.cursor.cid if self.cursor else -1
         return (
             f"<{self.__class__.__name__} at 0x{id(self):x} "

redis/commands/search/commands.py

@@ -464,7 +464,7 @@ def info(self):
         return self._parse_results(INFO_CMD, res)
 
     def get_params_args(
-        self, query_params: Union[Dict[str, Union[str, int, float, bytes]], None]
+        self, query_params: Optional[Dict[str, Union[str, int, float, bytes]]]
     ):
         if query_params is None:
             return []
@@ -543,7 +543,7 @@ def explain_cli(self, query: Union[str, Query]):  # noqa
     def aggregate(
         self,
         query: Union[str, Query],
-        query_params: Dict[str, Union[str, int, float]] = None,
+        query_params: Optional[Dict[str, Union[str, int, float]]] = None,
     ):
         """
         Issue an aggregation query.