Sn1 509 Fix Precommit, Remove Ruff

.github/workflows/python-package.yml

@@ -41,18 +41,14 @@ jobs:
         poetry run pip list
 
     # Style/format checks.
-    - name: Run Black (code formatter)
-      run: |
-        poetry run black --check --diff .
-
-    - name: Run isort (import sorting)
-      run: |
-        poetry run isort --check-only --diff --profile black .
-
     - name: Run Ruff (linter)
       run: |
         poetry run ruff check --diff .
 
+    - name: Run Ruff (formatter)
+      run: |
+        poetry run ruff format --check --diff .
+
     - name: Test with pytest
       run: |
         # run tests in tests/ dir and only fail if there are failures or errors

.pre-commit-config.yaml

@@ -20,18 +20,4 @@ repos:
   hooks:
     - id: ruff
       args: [--fix]
-
-- repo: https://github.com/psf/black
-  rev: 23.7.0
-  hooks:
-    - id: black
-      name: black (code formatter)
-      language_version: python3.10
-      additional_dependencies: ["black[jupyter]"]
-
-- repo: https://github.com/pycqa/isort
-  rev: 5.13.2
-  hooks:
-    - id: isort
-      name: isort (import sorting)
-      args: ["--profile", "black"]
+    - id: ruff-format

pyproject.toml

@@ -81,7 +81,8 @@ target-version = "py310"
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
 # Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
 # McCabe complexity (`C901`) by default.
-select = ["C9", "E4", "E7", "E9", "F"]
+# Also enable isort (I) for import sorting
+select = ["C9", "E4", "E7", "E9", "F", "I"]
 # Ignore "Module top level import" due to the settings initialization.
 ignore = ["E402"]
 

scripts/test_api_empty_responses.py

@@ -7,6 +7,7 @@
 Additional requirements:
 pip install plotly kaleido
 """
+
 import argparse
 import asyncio
 import csv

scripts/test_api_load.py

@@ -7,6 +7,7 @@
 Additional requirements:
 pip install plotly kaleido
 """
+
 import argparse
 import asyncio
 import csv

shared/base.py

@@ -53,8 +53,7 @@ class BaseDataset(ABC, BaseModel):
     max_tries: int = 10
 
     @abstractmethod
-    def random(self) -> DatasetEntry:
-        ...
+    def random(self) -> DatasetEntry: ...
 
     def get(self) -> DatasetEntry:
         return self.next()

tests/prompting/llms/vllm_llm.py

@@ -9,7 +9,10 @@
 def _fake_tokenizer():
     tok = MagicMock()
     tok.apply_chat_template.side_effect = (
-        lambda conversation, tokenize, add_generation_prompt, continue_final_message: f"TEMPLATE::{conversation[-1]['role']}::{conversation[-1]['content']}"
+        lambda conversation,
+        tokenize,
+        add_generation_prompt,
+        continue_final_message: f"TEMPLATE::{conversation[-1]['role']}::{conversation[-1]['content']}"
     )
     tok.decode.side_effect = lambda ids: "<s>" if ids == [0] else f"tok{ids[0]}"
     return tok
@@ -41,8 +44,9 @@ async def test_generate_logits(monkeypatch, messages, continue_last):
     tokenizer_stub = _fake_tokenizer()
     llm_stub = _fake_llm(fake_logprobs)
 
-    with patch("prompting.llms.vllm_llm.LLM", return_value=llm_stub), patch(
-        "prompting.llms.vllm_llm.SamplingParams", lambda **kw: kw
+    with (
+        patch("prompting.llms.vllm_llm.LLM", return_value=llm_stub),
+        patch("prompting.llms.vllm_llm.SamplingParams", lambda **kw: kw),
     ):
         model = ReproducibleVLLM(model_id="mock-model")
         # Swap tokenizer (LLM stub has none).