Refactor type hinting and clean up whitespace in sorting methods

Author: dkmstr

server/src/uds/REST/handlers.py

@@ -392,16 +392,16 @@ def get_param(self, *names: str) -> str:
                 return self._params[name]
         return ''
 
-    def get_sort_field_info(self, *args: str) -> tuple[str, bool]|None:
+    def get_sort_field_info(self, *args: str) -> tuple[str, bool] | None:
         """
         Returns sorting information for the first sorting if it is contained in the odata orderby list.
 
         Args:
             args: The  possible name of the field name to check for sorting information.
-            
+
         Returns:
             A tuple containing the clean field name found and a boolean indicating if the sorting is descending,
-            
+
         Note:
             We only use the first in case of table sort translations, so this only returns info for the first field
         """
@@ -413,7 +413,7 @@ def get_sort_field_info(self, *args: str) -> tuple[str, bool]|None:
                     is_descending = order_field.startswith('-')
                     return (clean_field, is_descending)
         return None
-    
+
     def apply_sort(self, qs: QuerySet[typing.Any]) -> list[typing.Any] | QuerySet[typing.Any]:
         """
         Custom sorting function to apply to querysets.
@@ -452,7 +452,7 @@ def filter_odata_queryset(self, qs: QuerySet[typing.Any]) -> list[typing.Any]:
             result = self.apply_sort(qs)
         else:
             result = qs
-            
+
         # If odata start/limit are set, apply them
         if self.odata.start is not None:
             result = result[self.odata.start :]
@@ -464,13 +464,6 @@ def filter_odata_queryset(self, qs: QuerySet[typing.Any]) -> list[typing.Any]:
         # to avoid issues later
         result = list(result)
 
-        # Get total items and set it on X-Filtered-Count
-        try:
-            total_items = len(result)
-            self.add_header('X-Filtered-Count', total_items)
-        except Exception as e:
-            raise exceptions.rest.RequestError(f'Invalid odata: {e}')
-
         return result
 
     def filter_odata_data(self, data: collections.abc.Iterable[T]) -> list[T]: