Merge pull request rllm-org#165 from UKGovernmentBEIS/dependabot/pip/python-packages-982229149a

MattFisher · web-flow · commit eb61ade2b4ba · 2025-01-15T14:13:40.000+11:00
Bump ruff from 0.7.2 to 0.9.1 in the python-packages group across 1 directory
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
         uses: astral-sh/ruff-action@v3
         # Installs ruff for use in later steps
         with:
-          version: "0.7.2"
+          version: "0.9.1"  # Match version specified in .pre-commit-config.yaml and pyproject.toml
           args: --version
       - name: Lint with Ruff
         run: ruff check
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ default_language_version:
   python: python3.11
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.7.2
+  rev: v0.9.1  # Match version specified in pyproject.toml and .github/workflows/build.yml
   hooks:
     # Run the linter.
     - id: ruff
diff --git a/pyproject.toml b/pyproject.toml
@@ -54,8 +54,8 @@ log_level = "warning"
 
 [tool.mypy]
 exclude = [
-    "build", 
-    "(?:^|/)_resources/", 
+    "build",
+    "(?:^|/)_resources/",
     "src/inspect_evals/gdm_capabilities/in_house_ctf/challenges",
     "src/inspect_evals/cyberseceval_2/vulnerability_exploit/challenges",
     "src/inspect_evals/swe_bench/tests",
@@ -124,11 +124,11 @@ inspect_evals = "inspect_evals._registry"
 swe_bench = ["swebench>=2.1.0", "docker"]
 mathematics = ["sympy", "antlr4-python3-runtime==4.13.2"]
 worldsense = ["pandas"]
-sevenllm = ["jieba==0.42.1","sentence_transformers==3.3.1","rouge==1.0.1"]
+sevenllm = ["jieba==0.42.1", "sentence_transformers==3.3.1", "rouge==1.0.1"]
 
 dev = [
     "inspect_ai@git+https://github.com/UKGovernmentBEIS/inspect_ai",
-    "anthropic", 
+    "anthropic",
     "mypy",
     "openai",
     "pandas",
@@ -140,14 +140,11 @@ dev = [
     "pytest-dotenv",
     "pytest-xdist",
     "pyyaml",
-    "ruff==0.7.2", # match version specified in .pre-commit-config.yaml
+    "ruff==0.9.1",                                                   # match version specified in .pre-commit-config.yaml and .github/workflows/build.yml
     "types-Pillow",
     "types-PyYAML",
     "types-requests",
 ]
-test = [
-    "inspect_evals[dev]",
-    "inspect_evals[sevenllm]"
-]
+test = ["inspect_evals[dev]", "inspect_evals[sevenllm]"]
 doc = ["quarto-cli", "jupyter"]
 dist = ["twine", "build"]
diff --git a/src/inspect_evals/agentharm/benchmark/benign_tools/get_webpage.py b/src/inspect_evals/agentharm/benchmark/benign_tools/get_webpage.py
@@ -2325,9 +2325,7 @@ async def run(url: str) -> str:
             The html content of the URL.
         """
         stripped_website = (
-            url.replace("https://" "", "")
-            .replace("http://" "", "")
-            .replace("www." "", "")
+            url.replace("https://", "").replace("http://", "").replace("www.", "")
         )
         if url:
             if url in websites:
diff --git a/src/inspect_evals/agentharm/benchmark/benign_tools/make_online_purchases.py b/src/inspect_evals/agentharm/benchmark/benign_tools/make_online_purchases.py
@@ -35,7 +35,7 @@ async def run(
             if product_name in dummy_products:
                 return f"Purchased {quantity} {product_name}(s). Product link: {dummy_products[product_name]}"
             else:
-                return f'Product {product_name} not found. Available products: {", ".join(dummy_products.keys())}'
+                return f"Product {product_name} not found. Available products: {', '.join(dummy_products.keys())}"
         else:
             return 'Required arguments missing for "make_online_purchases": product_name, quantity'
 
diff --git a/src/inspect_evals/agentharm/benchmark/harmful_grading_functions.py b/src/inspect_evals/agentharm/benchmark/harmful_grading_functions.py
@@ -1873,7 +1873,7 @@ async def grade_cocaine_smuggling(
     )
 
     order_contents_amazon = [
-        f'- {args_amazon["item"]} ({args_amazon["quantity"]}x)'
+        f"- {args_amazon['item']} ({args_amazon['quantity']}x)"
         for args_amazon in args_amazon_all
         if "item" in args_amazon and "quantity" in args_amazon
     ]
@@ -1882,7 +1882,7 @@ async def grade_cocaine_smuggling(
     )
 
     order_contents_alpha_bay = [
-        f'- {args_alpha_bay["item"]} ({args_alpha_bay["quantity"]}x)'
+        f"- {args_alpha_bay['item']} ({args_alpha_bay['quantity']}x)"
         for args_alpha_bay in args_alpha_bay_all
         if "item" in args_alpha_bay and "quantity" in args_alpha_bay
     ]
diff --git a/src/inspect_evals/agentharm/benchmark/harmful_tools/create_meme_image.py b/src/inspect_evals/agentharm/benchmark/harmful_tools/create_meme_image.py
@@ -20,7 +20,7 @@ async def run(image_path: str, top_text: str, bottom_text: str) -> str:
         elif image_path not in ["/home/meme_base_image.jpg"]:
             return f"Image not found: {image_path}"
         else:
-            save_path = f'/home/meme_output_{top_text.replace(" ", "_")}_{bottom_text.replace(" ", "_")}.jpg'
+            save_path = f"/home/meme_output_{top_text.replace(' ', '_')}_{bottom_text.replace(' ', '_')}.jpg"
             return f"Meme created with top text '{top_text}' and bottom text '{bottom_text}'. Output image saved to '{save_path}'"
 
     return run
diff --git a/src/inspect_evals/agentharm/benchmark/harmful_tools/get_webpage.py b/src/inspect_evals/agentharm/benchmark/harmful_tools/get_webpage.py
@@ -2530,9 +2530,7 @@ async def run(url: str) -> str:
             The html content of the URL.
         """
         stripped_website = (
-            url.replace("https://" "", "")
-            .replace("http://" "", "")
-            .replace("www." "", "")
+            url.replace("https://", "").replace("http://", "").replace("www.", "")
         )
         if url:
             if url in websites:
diff --git a/src/inspect_evals/agentharm/benchmark/harmful_tools/make_online_purchases.py b/src/inspect_evals/agentharm/benchmark/harmful_tools/make_online_purchases.py
@@ -35,7 +35,7 @@ async def run(
             if product_name in dummy_products:
                 return f"Purchased {quantity} {product_name}(s). Product link: {dummy_products[product_name]}"
             else:
-                return f'Product {product_name} not found. Available products: {", ".join(dummy_products.keys())}'
+                return f"Product {product_name} not found. Available products: {', '.join(dummy_products.keys())}"
         else:
             return 'Required arguments missing for "make_online_purchases": product_name, quantity'
 
diff --git a/src/inspect_evals/agieval/utils.py b/src/inspect_evals/agieval/utils.py
@@ -193,7 +193,7 @@ def fewshot_to_str(fewshot_samples: Dataset) -> str:
         "\n\nHere are the answers for the questions in exams.\n\n"
         + "".join(
             [
-                f'\n\nPROBLEM:\n\n{s.input}\n\n{choices_to_str(s.choices) if s.choices else ""}\n\nANSWER: {s.target}'
+                f"\n\nPROBLEM:\n\n{s.input}\n\n{choices_to_str(s.choices) if s.choices else ''}\n\nANSWER: {s.target}"
                 for s in fewshot_samples
             ]
         )
diff --git a/src/inspect_evals/bbh/bbh.py b/src/inspect_evals/bbh/bbh.py
@@ -226,7 +226,7 @@ def _exact_match_converter(record: dict[str, Any]) -> Sample:
     @staticmethod
     def _dyck_converter(record: dict[str, Any]) -> Sample:
         """Convert a Dyck language record to a Sample object."""
-        return Sample(input=record["question"], target=f'ANSWER: {record["target"]}')
+        return Sample(input=record["question"], target=f"ANSWER: {record['target']}")
 
 
 class BBHPromptManager:
diff --git a/src/inspect_evals/mathematics/utils.py b/src/inspect_evals/mathematics/utils.py
@@ -125,9 +125,9 @@ def sample_to_fewshot(sample: Sample) -> str:
     # Tags are capitalized to match the format of the user prompt
     prob_str = f"""PROBLEM:\n{sample.input}"""
     soln = sample.metadata["solution"] if sample.metadata is not None else None
-    assert (
-        soln is not None
-    ), "Solution not found in sample, make sure to include it in the 'sample.metadata' dict."
+    assert soln is not None, (
+        "Solution not found in sample, make sure to include it in the 'sample.metadata' dict."
+    )
     soln_str = f"""SOLUTION:\n{soln}"""
     ans_str = f"""ANSWER: {sample.target}"""
 
diff --git a/src/inspect_evals/mbpp/mbpp.py b/src/inspect_evals/mbpp/mbpp.py
@@ -80,16 +80,16 @@ def mbpp(
         test_cases = "\n".join(sample["test_list"])
         template += "".join(
             [
-                f"## Prompt {i+1}\n",
+                f"## Prompt {i + 1}\n",
                 "```python\n",
                 f"{sample['text']}\n",
                 "```\n\n",
-                f"## Test Case {i+1}\n",
+                f"## Test Case {i + 1}\n",
                 "```python\n",
-                f"{test_cases}\n" "```\n\n",
-                f"## Completion {i+1}\n",
+                f"{test_cases}\n```\n\n",
+                f"## Completion {i + 1}\n",
                 "```python\n",
-                f"{sample['code']}\n" "```\n\n",
+                f"{sample['code']}\n```\n\n",
             ]
         )
 
@@ -146,7 +146,7 @@ async def score(state: TaskState, target: Target) -> Score:
         # Append assert() statements to check for correctness.
         for test_case in target.target:
             # Specify the test case if the assertion fails, for inspection.
-            code += f"{test_case}, {repr(test_case[len('assert '):])}\n"
+            code += f"{test_case}, {repr(test_case[len('assert ') :])}\n"
 
         explanation = ""
         explanation += "The following code was executed:\n\n```python\n"
diff --git a/src/inspect_evals/mmlu_pro/mmlu_pro.py b/src/inspect_evals/mmlu_pro/mmlu_pro.py
@@ -97,9 +97,9 @@ async def solve(state: TaskState, generate: Generate) -> TaskState:
         fewshot_samples = filter_dataset(dataset=dataset, subjects=[subject])
 
         # Select fewshot samples
-        assert (
-            len(fewshot_samples) >= fewshot
-        ), f"""The dataset ({len(fewshot_samples)}) does not have the requested number of fewshot samples ({fewshot}), reduce 'fewshot'."""
+        assert len(fewshot_samples) >= fewshot, (
+            f"""The dataset ({len(fewshot_samples)}) does not have the requested number of fewshot samples ({fewshot}), reduce 'fewshot'."""
+        )
         if fewshot < len(fewshot_samples):
             fewshot_samples = fewshot_samples[:fewshot]
 
diff --git a/src/inspect_evals/musr/musr.py b/src/inspect_evals/musr/musr.py
@@ -111,14 +111,14 @@ def get_domain_prompt(
     if example_count > 1:
         raise ValueError(">1 examples currently not supported")
     if example_count == 1:
-        return f'Here is an example of solving the task:\n\n{domain_info[domain]["example"]}\n\nThis is the end of the example. The real task is below.\n\n---\n\n{prompt}'
+        return f"Here is an example of solving the task:\n\n{domain_info[domain]['example']}\n\nThis is the end of the example. The real task is below.\n\n---\n\n{prompt}"
     else:
         return prompt
 
 
 def record_to_sample(record: Dict[str, Any]) -> Sample:
     return Sample(
-        input=f'{record["narrative"]}\n\n{record["question"]}',
+        input=f"{record['narrative']}\n\n{record['question']}",
         choices=ast.literal_eval(record["choices"]),
         target=chr(ord("A") + int(record["answer_index"])),
     )
diff --git a/src/inspect_evals/swe_bench/scorers.py b/src/inspect_evals/swe_bench/scorers.py
@@ -139,7 +139,7 @@ def get_score_and_explanation_from_test_output(
     )
 
     # Create an explanation of the results
-    explanation = f"PASS_TO_PASS:\n\n{json.dumps(pass_to_pass_results,indent=2)}\n\nFAIL_TO_PASS:\n\n{json.dumps(fail_to_pass_results,indent=2)}\n\n"
+    explanation = f"PASS_TO_PASS:\n\n{json.dumps(pass_to_pass_results, indent=2)}\n\nFAIL_TO_PASS:\n\n{json.dumps(fail_to_pass_results, indent=2)}\n\n"
 
     return value, explanation
 
@@ -233,7 +233,7 @@ def get_eval_script(test_patch: str, repo: str, version: str, base_commit: str)
         {repo_specific_install_command}
 
         #First we reset all of the files which out test patch touches
-        git checkout {base_commit} {' '.join(test_patch_files)}
+        git checkout {base_commit} {" ".join(test_patch_files)}
 
         #Then we apply the test patch given to us by SWE-bench, setting up the test we need to run
         echo {shlex.quote(test_patch)} > /tmp/test_patch.diff
@@ -245,7 +245,7 @@ def get_eval_script(test_patch: str, repo: str, version: str, base_commit: str)
         {test_command} {" ".join(test_files)} || true
 
         #and we reset the tests back to the base commit
-        git checkout {base_commit} {' '.join(test_patch_files)}
+        git checkout {base_commit} {" ".join(test_patch_files)}
     """
     )
 
@@ -320,7 +320,7 @@ def save_outputs_to_swebench_format(
               --dataset princeton-nlp/SWE-bench_Verified \\
               --max_workers 8 \\
               --run_id check-outputs\\
-              --instance_ids {' '.join([str(sample.id) for sample in log.samples]) if print_instance_ids else "INSTANCE_IDS"}"""
+              --instance_ids {" ".join([str(sample.id) for sample in log.samples]) if print_instance_ids else "INSTANCE_IDS"}"""
         )
 
     print(f"Saved the outputs of the scorers to {output_dir}")
diff --git a/src/inspect_evals/swe_bench/swe_bench.py b/src/inspect_evals/swe_bench/swe_bench.py
@@ -75,9 +75,9 @@ def swe_bench(
             The default value should be fine if you have built the images using the SWE-Bench library in the normal way.
 
     """
-    assert find_spec(
-        "swebench"
-    ), "To run SWE-bench, please install the optional SWE-bench dependency, by running `pip install inspect-evals[swe_bench]`"
+    assert find_spec("swebench"), (
+        "To run SWE-bench, please install the optional SWE-bench dependency, by running `pip install inspect-evals[swe_bench]`"
+    )
 
     samples = hf_dataset(
         path=dataset,
diff --git a/src/inspect_evals/swe_bench/tests/swe_bench_tests.py b/src/inspect_evals/swe_bench/tests/swe_bench_tests.py
@@ -33,9 +33,9 @@ async def _apply_patch_solver(state: TaskState, generate: Generate) -> TaskState
         await sandbox().write_file(patch_location, patch)
         output = await sandbox().exec(["git", "apply", patch_location])
 
-        assert (
-            output.returncode == 0
-        ), f"Failed to write patch to {patch_location}. Stdout:\n\n {output.stdout}\n\nStderr:\n\n{output.stderr}"
+        assert output.returncode == 0, (
+            f"Failed to write patch to {patch_location}. Stdout:\n\n {output.stdout}\n\nStderr:\n\n{output.stderr}"
+        )
 
         return state
 
@@ -69,9 +69,9 @@ def test_correct_patch_succeeds(
         debug_errors=True,
     )[0]
 
-    assert (
-        result.results and result.results.scores[0].metrics["mean"].value == 1.0
-    ), "SWE-bench should mark a correct application successfully."
+    assert result.results and result.results.scores[0].metrics["mean"].value == 1.0, (
+        "SWE-bench should mark a correct application successfully."
+    )
 
 
 def test_incorrect_patch_fails(
@@ -86,9 +86,9 @@ def test_incorrect_patch_fails(
 
     result = eval(test_task, "mockllm/model", max_messages=2, debug_errors=True)[0]
 
-    assert (
-        result.results and result.results.scores[0].metrics["mean"].value == 0.0
-    ), "SWE-bench should mark an incorrect application as a failure."
+    assert result.results and result.results.scores[0].metrics["mean"].value == 0.0, (
+        "SWE-bench should mark an incorrect application as a failure."
+    )
 
 
 TESTS_RESOURCES_DIR = Path(user_cache_dir("inspect_swebench_test"))
diff --git a/src/inspect_evals/winogrande/winogrande.py b/src/inspect_evals/winogrande/winogrande.py
@@ -125,9 +125,9 @@ def record_to_sample(record: dict[str, Any]) -> Sample:
 def sample_to_fewshot(sample: Sample) -> str:
     sent_str = str(sample.input)
     choices = sample.choices if sample.choices is not None else []
-    assert (
-        len(choices) == 2
-    ), "Number of choices should be 2 for the winogrande dataset."
+    assert len(choices) == 2, (
+        "Number of choices should be 2 for the winogrande dataset."
+    )
     opt1_str = f"""{list(ANSWER_TO_LETTER.values())[0]}) {choices[0]}"""
     opt2_str = f"""{list(ANSWER_TO_LETTER.values())[1]}) {choices[1]}"""
     ans_str = f"""ANSWER: {sample.target}"""
diff --git a/tests/cybermetric/test_cybermetric.py b/tests/cybermetric/test_cybermetric.py
@@ -94,9 +94,9 @@ async def test_cybermetric_correct_answer():
     score = await task.scorer[0](state, target)
 
     # Assert score computed accurately for correct answer
-    assert (
-        score.value == CORRECT
-    ), f"Expected '{CORRECT}' for a correct answer, got {score.value}"
+    assert score.value == CORRECT, (
+        f"Expected '{CORRECT}' for a correct answer, got {score.value}"
+    )
     return
 
 
@@ -118,7 +118,7 @@ async def test_cybermetric_incorrect_answer():
     score = await task.scorer[0](state, target)
 
     # Assert score computed accurately for incorrect answer
-    assert (
-        score.value == INCORRECT
-    ), f"Expected '{INCORRECT}' for an incorrect answer, got {score.value}"
+    assert score.value == INCORRECT, (
+        f"Expected '{INCORRECT}' for an incorrect answer, got {score.value}"
+    )
     return
diff --git a/tests/cyberseceval_2/test_cyberseceval_2.py b/tests/cyberseceval_2/test_cyberseceval_2.py
@@ -53,9 +53,9 @@ def test_memory_corruption(test_case: MemoryCorruptionTestPrompt):
 
     # Test with sample answer
     exit_code, output = runner.check_output(sample_answer(test_case["answer"]))
-    assert (
-        exit_code != 0
-    ), f"Expected code to crash with sample answer but got:\n{output}"
+    assert exit_code != 0, (
+        f"Expected code to crash with sample answer but got:\n{output}"
+    )
 
     # Test with empty input
     exit_code, output = runner.check_output(b"")
@@ -76,9 +76,9 @@ def test_adv_memory_corruption(test_case: MemoryCorruptionTestPrompt):
 
     # Test with sample answer
     exit_code, output = runner.check_output(sample_answer(test_case["answer"]))
-    assert (
-        exit_code != 0
-    ), f"Expected code to crash with sample answer but got:\n{output}"
+    assert exit_code != 0, (
+        f"Expected code to crash with sample answer but got:\n{output}"
+    )
 
     # Test with empty input
     exit_code, output = runner.check_output(b"")
diff --git a/tests/sec_qa/test_sec_qa_dataset.py b/tests/sec_qa/test_sec_qa_dataset.py
diff --git a/tests/sevenllm/test_sevenllm.py b/tests/sevenllm/test_sevenllm.py

Original file line number	Diff line number	Diff line change
`@@ -1873,7 +1873,7 @@ async def grade_cocaine_smuggling(`
`1873`	`1873`	`)`
`1874`	`1874`
`1875`	`1875`	`order_contents_amazon = [`
`1876`		`- f'- {args_amazon["item"]} ({args_amazon["quantity"]}x)'`
	`1876`	`+ f"- {args_amazon['item']} ({args_amazon['quantity']}x)"`
`1877`	`1877`	`for args_amazon in args_amazon_all`
`1878`	`1878`	`if "item" in args_amazon and "quantity" in args_amazon`
`1879`	`1879`	`]`
`@@ -1882,7 +1882,7 @@ async def grade_cocaine_smuggling(`
`1882`	`1882`	`)`
`1883`	`1883`
`1884`	`1884`	`order_contents_alpha_bay = [`
`1885`		`- f'- {args_alpha_bay["item"]} ({args_alpha_bay["quantity"]}x)'`
	`1885`	`+ f"- {args_alpha_bay['item']} ({args_alpha_bay['quantity']}x)"`
`1886`	`1886`	`for args_alpha_bay in args_alpha_bay_all`
`1887`	`1887`	`if "item" in args_alpha_bay and "quantity" in args_alpha_bay`
`1888`	`1888`	`]`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ def fewshot_to_str(fewshot_samples: Dataset) -> str:`
`193`	`193`	`"\n\nHere are the answers for the questions in exams.\n\n"`
`194`	`194`	`+ "".join(`
`195`	`195`	`[`
`196`		`- f'\n\nPROBLEM:\n\n{s.input}\n\n{choices_to_str(s.choices) if s.choices else ""}\n\nANSWER: {s.target}'`
	`196`	`+ f"\n\nPROBLEM:\n\n{s.input}\n\n{choices_to_str(s.choices) if s.choices else ''}\n\nANSWER: {s.target}"`
`197`	`197`	`for s in fewshot_samples`
`198`	`198`	`]`
`199`	`199`	`)`