ci: move to ruff (#20)

Author: JacobCoffee

.pre-commit-config.yaml

@@ -1,3 +1,5 @@
+default_language_version:
+  python: "3.11"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
@@ -9,50 +11,29 @@ repos:
       - id: end-of-file-fixer
         exclude: "\\.idea/(.)*|test_data"
       - id: trailing-whitespace
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: "v0.0.280"
     hooks:
-      - id: pyupgrade
-        args: ["--py311-plus"]
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
+      - id: ruff
+        args: ["--fix"]
+        exclude: "frameworks*"
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.7.0
     hooks:
       - id: black
         args: [--config=./pyproject.toml]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.2
+    rev: v2.2.5
     hooks:
       - id: codespell
         exclude: "test_data*"
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.6"
+    rev: "v3.0.0"
     hooks:
       - id: prettier
         exclude: "test_data*"
-  - repo: https://github.com/hadialqattan/pycln
-    rev: v2.1.3
-    hooks:
-      - id: pycln
-        args: [--config=pyproject.toml]
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          [
-            "flake8-bugbear",
-            "flake8-comprehensions",
-            "flake8-mutable",
-            "flake8-print",
-            "flake8-simplify",
-          ]
-        exclude: "frameworks*"
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.1.1"
+    rev: "v1.4.1"
     hooks:
       - id: mypy
         exclude: "frameworks|test_data"

.sourcery.yaml

@@ -0,0 +1,40 @@
+ignore:
+  - .tox/
+  - .venv/
+  - dist/
+  - node_modules/
+  - vendor/
+  - venv/
+
+rule_settings:
+  enable: [default]
+  disable: [dont-import-test-modules]
+  rule_types:
+    - refactoring
+    - suggestion
+    - comment
+  python_version: "3.11"
+
+rules: []
+
+metrics:
+  quality_threshold: 25.0
+
+github:
+  ignore_labels:
+    - sourcery-ignore
+    - docs
+  labels:
+    - build-ignore
+  request_review:
+    origin: owner
+    forked: author
+  sourcery_branch: sourcery/{base_branch}
+
+clone_detection:
+  min_lines: 3
+  min_duplicates: 2
+  identical_clones_only: false
+
+proxy:
+  no_ssl_verify: false

asgi_bench/cli.py

@@ -58,9 +58,7 @@ def run(
 ) -> None:
     if not frameworks:
         frameworks = FRAMEWORKS
-    benchmark_modes: tuple[BenchmarkMode, ...] = ()
-    if rps:
-        benchmark_modes = ("rps",)
+    benchmark_modes: tuple[BenchmarkMode, ...] = ("rps",) if rps else ()
     if latency:
         benchmark_modes = (*benchmark_modes, "latency")
 
@@ -120,7 +118,7 @@ def run(
 @click.option("-P", "--plots", is_flag=True, help="output plots")
 def results_command(
     run_name: int | None,
-    format: tuple[str, ...],
+    format: tuple[str, ...],  # noqa: A002
     percentile: tuple[str, ...],
     split_percentiles: bool,
     tolerance: float,

asgi_bench/results.py

@@ -106,8 +106,7 @@ def _data_for_plot(
 
     if ret:
         data = sorted(ret, key=lambda r: r["target"])
-        df = pd.DataFrame(data)
-        return df
+        return pd.DataFrame(data)
 
     return None
 
@@ -121,10 +120,7 @@ def _draw_plot(
     category: str | None = None,
     percentile: str | None = None,
 ):
-    if benchmark_mode == "rps":
-        title = "Requests per second (higher is better)"
-    else:
-        title = "Latency (lower is better)"
+    title = "Requests per second (higher is better)" if benchmark_mode == "rps" else "Latency (lower is better)"
 
     df = df.query(f"category == '{category}'")
 
@@ -149,8 +145,6 @@ def _draw_plot(
         height=280 * percentile_count if percentile_count > 1 else None,
         width=600 if percentile_count > 1 else None,
         labels={"score": "RPS", "endpoint_mode": "mode", "name": "", "target": "framework"},
-        # hover_data=["stddev"],
-        # color_discrete_map={target: COLOR_PALETTE[i] for i, target in enumerate(df["target"].unique())},
     )
 
     for format_ in formats:
@@ -183,7 +177,7 @@ def make_plots(
     benchmark_modes: tuple[BenchmarkMode, ...] = ("rps", "latency")
 
     for benchmark_mode in benchmark_modes:
-        if not all(benchmark_mode in mode_results for mode_results in results.values()):
+        if any(benchmark_mode not in mode_results for mode_results in results.values()):
             continue
         df = _data_for_plot(
             results, benchmark_mode, tolerance=tolerance, percentiles=percentiles, frameworks=frameworks
@@ -218,7 +212,7 @@ def _data_for_tables(
 
     for benchmark_mode in benchmark_modes:
         acc_bench_mode_results = accumulated_results.setdefault(benchmark_mode, {})
-        if not all(benchmark_mode in mode_results for mode_results in results.values()):
+        if any(benchmark_mode not in mode_results for mode_results in results.values()):
             continue
         for framework, framework_results in results.items():
             if frameworks and framework not in frameworks:

asgi_bench/runner.py

@@ -121,10 +121,7 @@ def _init_results_file(self) -> Path:
         return self.results_dir / f"run_{run_number}.json"
 
     def _write_results(self, target: str, spec: TestSpec, results: dict[str, Any]) -> None:
-        if not self.results_file.exists():
-            current_results = {}
-        else:
-            current_results = json.loads(self.results_file.read_text())
+        current_results = json.loads(self.results_file.read_text()) if self.results_file.exists() else {}
         current_results.setdefault(target, {})
         current_results[target].setdefault(spec.benchmark_mode, {})
         current_results[target][spec.benchmark_mode].setdefault(spec.endpoint_mode, {})

asgi_bench/spec.py

@@ -50,7 +50,6 @@ class TestCategory:
             Endpoint(path="plaintext-100K", name="plaintext 100 kB"),
             Endpoint(path="plaintext-500K", name="plaintext 500 kB"),
             Endpoint(path="plaintext-1M", name="plaintext 1 MB"),
-            # Endpoint(path="plaintext-5M", name="plaintext 5 MB"),
         ],
     ),
     TestCategory(
@@ -61,7 +60,6 @@ class TestCategory:
             Endpoint(path="json-100K", name="json 100 kB"),
             Endpoint(path="json-500K", name="json 500 kB"),
             Endpoint(path="json-1M", name="json 1 MB"),
-            # Endpoint(path="json-5M", name="json 5 MB"),
         ],
     ),
     TestCategory(
@@ -233,7 +231,7 @@ def make_spec(
                         slug_name=f"{endpoint_mode}-{endpoint.path.split('?')[0]}",
                         is_supported=(
                             framework_name in category.frameworks
-                            and endpoint.supports_framework(framework_name, endpoint_mode)  # noqa: W503
+                            and endpoint.supports_framework(framework_name, endpoint_mode)
                         ),
                         body_file=endpoint.body_file,
                     )

asgi_bench/types.py

@@ -17,7 +17,7 @@
 ]
 BenchmarkMode = Literal["rps", "latency"]
 VersionPrefix = Literal["pip", "git", "docker", "file"]
-Framework = Literal["starlite", "starlette", "fastapi", "sanic", "blacksheep"]
+Framework = Literal["starlite", "starlette", "fastapi", "sanic", "blacksheep", "quart", "litestar"]
 
 
 @dataclass
@@ -89,9 +89,7 @@ def image_tag(self) -> str:
 
     @property
     def build_stage_image(self) -> str | None:
-        if self.is_docker_target:
-            return self.typed_version[1]
-        return None
+        return self.typed_version[1] if self.is_docker_target else None
 
     @property
     def version_name(self) -> str:
@@ -118,16 +116,12 @@ def pip_package(self) -> str:
             from .spec import FRAMEWORK_REPOS
 
             return f"git+{FRAMEWORK_REPOS[self.name]}@{version}"
-        elif prefix == "file":
-            return version
-        return f"{self.name}=={self.version}"
+        return version if prefix == "file" else f"{self.name}=={self.version}"
 
     @property
     def extra_requirements(self) -> list[str]:
         path = self.path.parent / f"requirements-{self.name}.txt"
-        if path.exists():
-            return path.read_text().splitlines()
-        return []
+        return path.read_text().splitlines() if path.exists() else []
 
     @property
     def pip_install_targets(self) -> str:

asgi_bench/util.py

@@ -15,13 +15,11 @@ def get_error_percentage(test_result: TestResult) -> float:
     success_count = get_success_response_count(test_result)
     error_count = get_error_response_count(test_result)
     total_count = success_count + error_count
-    if not error_count:
-        return 0
-    return 100 * (error_count / total_count)
+    return 100 * (error_count / total_count) if error_count else 0
 
 
 def has_no_responses(test_result: TestResult) -> bool:
     return not get_error_response_count(test_result) + get_success_response_count(test_result)
 
 
-template_env = jinja2.Environment(loader=jinja2.FileSystemLoader("templates"))
+template_env = jinja2.Environment(loader=jinja2.FileSystemLoader("templates"), autoescape=True)