fix pylint

Author: Sean Sullivan

elastic_datashader/config.py

@@ -46,7 +46,7 @@ def load_datashader_headers(header_path_str: str) -> Dict[Any, Any]:
     try:
         loaded_yaml = yaml.safe_load(header_path.read_text(encoding='utf8'))
     except (OSError, IOError, yaml.YAMLError) as ex:
-        raise Exception(f"Failed to load HEADER_FILE from {header_path_str}") from ex
+        raise IOError(f"Failed to load HEADER_FILE from {header_path_str}") from ex
 
     if type(loaded_yaml) is not dict:
         raise ValueError(f"HEADER_FILE YAML should be a dict mapping, but received {loaded_yaml}")
@@ -60,7 +60,7 @@ def get_log_level(level_name: Optional[str]) -> int:
     level_value = getLevelName(level_name.upper())
 
     if type(level_value) is not int:
-        raise Exception(f"Invalid logging level {level_name}")
+        raise ValueError(f"Invalid logging level {level_name}")
 
     return level_value
 
@@ -78,13 +78,13 @@ def is_base64_encoded(value: str) -> bool:
 
 def check_config(c: Config) -> None:
     if not c.cache_path.exists():
-        raise Exception(f"DATASHADER_CACHE_DIRECTORY '{c.cache_path}' does not exist")
+        raise IOError(f"DATASHADER_CACHE_DIRECTORY '{c.cache_path}' does not exist")
 
     if not c.cache_path.is_dir():
-        raise Exception(f"DATASHADER_CACHE_DIRECTORY '{c.cache_path}' is not a directory")
+        raise IOError(f"DATASHADER_CACHE_DIRECTORY '{c.cache_path}' is not a directory")
 
     if c.api_key and not is_base64_encoded(c.api_key):
-        raise Exception(f"DATASHADER_ELASTIC_API_KEY '{c.api_key}' does not appear to be base64 encoded")
+        raise ValueError(f"DATASHADER_ELASTIC_API_KEY '{c.api_key}' does not appear to be base64 encoded")
 
 def config_from_env(env) -> Config:
     return Config(

elastic_datashader/elastic.py

@@ -382,7 +382,7 @@ def load_datashader_headers(header_file_path_str: Optional[str]) -> Dict[Any, An
     try:
         loaded_yaml = yaml.safe_load(header_file_path.read_text(encoding='utf8'))
     except (OSError, IOError, yaml.YAMLError) as ex:
-        raise Exception(f"Failed to load HEADER_FILE from {header_file_path_str}") from ex
+        raise IOError(f"Failed to load HEADER_FILE from {header_file_path_str}") from ex
 
     if type(loaded_yaml) is not dict:
         raise ValueError(f"HEADER_FILE YAML should be a dict mapping, but received {loaded_yaml}")
@@ -576,14 +576,14 @@ def chunk_iter(iterable, chunk_size):
     chunks = [None] * chunk_size
     i = -1
     for i, v in enumerate(iterable):
-        idx = (i % chunk_size)
+        idx = i % chunk_size
         if idx == 0 and i > 0:
             i = -1
             yield (True, chunks)
         chunks[idx] = v
 
     if i >= 0:
-        last_written_idx = (i % chunk_size)
+        last_written_idx = i % chunk_size
         yield (False, chunks[0:last_written_idx+1])
 
 def bucket_noop(bucket, search):

elastic_datashader/parameters.py

@@ -228,14 +228,14 @@ def get_time_bounds(now: datetime, from_time: Optional[str], to_time: Optional[s
             start_time = convert_kibana_time(from_time, now, 'down')
         except ValueError as err:
             logger.exception("invalid from_time parameter")
-            raise Exception("invalid from_time parameter") from err
+            raise ValueError("invalid from_time parameter") from err
 
     if to_time:
         try:
             stop_time = convert_kibana_time(to_time, now, 'up')
         except ValueError as err:
             logger.exception("invalid to_time parameter")
-            raise Exception("invalid to_time parameter") from err
+            raise ValueError("invalid to_time parameter") from err
 
     if start_time and stop_time:
         start_time, stop_time = quantize_time_range(start_time, stop_time)
@@ -297,11 +297,11 @@ def extract_parameters(headers: Dict[Any, Any], query_params: Dict[Any, Any]) ->
     params["bucket_max"] = float(query_params.get("bucket_max", 1))
     params["timeOverlap"] = query_params.get("timeOverlap", "false") == "true"
     params["timeOverlapSize"] = query_params.get("timeOverlapSize", "auto")
-    params["debug"] = (query_params.get("debug", False) == 'true')
+    params["debug"] = query_params.get("debug", False) == 'true'
 
     if params["geopoint_field"] is None:
         logger.error("missing geopoint_field")
-        raise Exception("missing geopoint_field")
+        raise ValueError("missing geopoint_field")
 
     parameter_hash = get_parameter_hash(params)
     all_params = {**params, **unhashed_params}

elastic_datashader/tilegen.py

@@ -730,7 +730,7 @@ def generate_nonaggregated_tile(
             metrics.get("locations", 0),
             metrics.get("hits", 0),
         )
-        metrics["query_time"] = (s2 - s1)
+        metrics["query_time"] = s2 - s1
 
         estimated_points_per_tile = get_estimated_points_per_tile(span_range, global_bounds, z, global_doc_cnt)
 
@@ -1259,7 +1259,7 @@ def remap_bucket(bucket, search):
 
         s2 = time.time()
         logger.info("ES took %s (%s) for %s with %s searches", (s2 - s1), resp.total_took, len(df), resp.num_searches)
-        metrics["query_time"] = (s2 - s1)
+        metrics["query_time"] = s2 - s1
         metrics["query_took"] = resp.total_took
         metrics["num_searches"] = resp.num_searches
         metrics["aborted"] = resp.aborted