Fix linting

elastic · Mar 31, 2022 · ed80b7f · ed80b7f
1 parent ba97ee4
commit ed80b7f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/eland/ndframe.py b/eland/ndframe.py
@@ -57,10 +57,10 @@
 class NDFrame(ABC):
     def __init__(
         self,
+        es_index_pattern: str,
         es_client: Optional[
             Union[str, List[str], Tuple[str, ...], "Elasticsearch"]
         ] = None,
-        es_index_pattern: Optional[str] = None,
         columns: Optional[List[str]] = None,
         es_index_field: Optional[str] = None,
         _query_compiler: Optional[QueryCompiler] = None,

diff --git a/eland/operations.py b/eland/operations.py
@@ -416,7 +416,7 @@ def _metric_aggs(
             fields=fields,
             es_aggs=es_aggs,
             pd_aggs=pd_aggs,
-            response=response,
+            response=response,  # type: ignore
             numeric_only=numeric_only,
             is_dataframe_agg=is_dataframe_agg,
             percentiles=percentiles,
@@ -453,7 +453,7 @@ def _terms_aggs(
             body.terms_aggs(field, func, field, es_size=es_size)
 
         response = query_compiler._client.search(
-            index=query_compiler._index_pattern, size=0, body=body.to_search_body()
+            index=query_compiler._index_pattern, size=0, **body.to_search_body()
         )
 
         results = {}
@@ -499,7 +499,7 @@ def _hist_aggs(
             body.hist_aggs(field, field, min_aggs[field], max_aggs[field], num_bins)
 
         response = query_compiler._client.search(
-            index=query_compiler._index_pattern, size=0, body=body.to_search_body()
+            index=query_compiler._index_pattern, size=0, **body.to_search_body()
         )
         # results are like
         # "aggregations" : {
@@ -1040,7 +1040,7 @@ def bucket_generator(
             res = query_compiler._client.search(
                 index=query_compiler._index_pattern,
                 size=0,
-                body=body.to_search_body(),
+                **body.to_search_body(),
             )
 
             # Pagination Logic

diff --git a/eland/query.py b/eland/query.py
@@ -322,11 +322,11 @@ def to_search_body(self) -> Dict[str, Any]:
             body["query"] = self._query.build()
         return body
 
-    def to_count_body(self) -> Optional[Dict[str, Any]]:
+    def to_count_body(self) -> Dict[str, Any]:
         if len(self._aggs) > 0:
             warnings.warn(f"Requesting count for agg query {self}")
         if self._query.empty():
-            return None
+            return {}
         else:
             return {"query": self._query.build()}
 

diff --git a/eland/query_compiler.py b/eland/query_compiler.py
@@ -77,18 +77,18 @@ class QueryCompiler:
 
     def __init__(
         self,
+        index_pattern: str,
         client: Optional[
             Union[str, List[str], Tuple[str, ...], "Elasticsearch"]
         ] = None,
-        index_pattern: Optional[str] = None,
         display_names: Optional[List[str]] = None,
         index_field: Optional[str] = None,
         to_copy: Optional["QueryCompiler"] = None,
     ) -> None:
         # Implement copy as we don't deep copy the client
         if to_copy is not None:
             self._client: "Elasticsearch" = to_copy._client
-            self._index_pattern: Optional[str] = to_copy._index_pattern
+            self._index_pattern: str = to_copy._index_pattern
             self._index: "Index" = Index(self, to_copy._index.es_index_field)
             self._operations: "Operations" = copy.deepcopy(to_copy._operations)
             self._mappings: FieldMappings = copy.deepcopy(to_copy._mappings)