Lint: add FIX, SIM, C, N and PERF rulesets

Also includes fixes

Author: Epse

hooks/pre-commit

@@ -11,4 +11,5 @@
 exec 1>&2
 
 uv run ruff format --check
+uv run ruff check
 uv run mypy

pyproject.toml

@@ -59,5 +59,6 @@ strict = true
 include = ["src/obelisk/**/*.py"]
 
 [tool.ruff.lint]
-select = ["E4", "E7", "E9", "F", "ASYNC", "S", "B"]
-ignore = []
+select = ["E4", "E7", "E9", "F", "ASYNC", "S", "B", "FIX", "SIM", "C90", "N", "PERF"]
+# Ignore N815, camelcase field names are usually for serialisation reasons
+ignore = ["N815"]

src/obelisk/asynchronous/base.py

@@ -74,7 +74,7 @@ async def _get_token(self) -> None:
                     )
 
                     response = request.json()
-                except Exception as e:
+                except Exception as e:  # noqa: PERF203 # retry strategy should add delay
                     last_error = e
                     self.log.error(e)
                     continue
@@ -88,7 +88,7 @@ async def _get_token(self) -> None:
             if request.status_code != 200:
                 if "error" in response:
                     self.log.warning(f"Could not authenticate, {response['error']}")
-                    raise AuthenticationError
+                raise AuthenticationError
 
             self._token = response["access_token"]
             self._token_expires = datetime.now() + timedelta(

src/obelisk/asynchronous/core.py

@@ -107,11 +107,11 @@ def check_metric_type(self) -> Self:
                 f"Type suffix mismatch, expected number, got {type(self.value)}"
             )
 
-        if suffix == "number[]":
-            if type(self.value) is not list or any(
-                [not isinstance(x, Number) for x in self.value]
-            ):
-                raise ValueError("Type suffix mismatch, expected value of number[]")
+        if suffix == "number[]" and (
+            type(self.value) is not list
+            or any([not isinstance(x, Number) for x in self.value])
+        ):
+            raise ValueError("Type suffix mismatch, expected value of number[]")
 
         # Do not check json, most things should be serialisable
 
@@ -153,9 +153,8 @@ class QueryParams(BaseModel):
 
     @model_validator(mode="after")
     def check_datatype_needed(self) -> Self:
-        if self.fields is None or "value" in self.fields:
-            if self.dataType is None:
-                raise ValueError("Value field requested, must specify datatype")
+        if (self.fields is None or "value" in self.fields) and self.dataType is None:
+            raise ValueError("Value field requested, must specify datatype")
 
         return self
 
@@ -182,9 +181,8 @@ class ChunkedParams(BaseModel):
 
     @model_validator(mode="after")
     def check_datatype_needed(self) -> Self:
-        if self.fields is None or "value" in self.fields:
-            if self.dataType is None:
-                raise ValueError("Value field requested, must specify datatype")
+        if (self.fields is None or "value" in self.fields) and self.dataType is None:
+            raise ValueError("Value field requested, must specify datatype")
 
         return self