From 7baa20d17fc85bdaf62deaaadec3b05a228ec5ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 20:27:58 +0000 Subject: [PATCH 1/4] Bump the uv group across 1 directory with 2 updates Bumps the uv group with 2 updates in the / directory: [black](https://github.com/psf/black) and [pyasn1](https://github.com/pyasn1/pyasn1). Updates `black` from 25.12.0 to 26.3.1 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/25.12.0...26.3.1) Updates `pyasn1` from 0.6.2 to 0.6.3 - [Release notes](https://github.com/pyasn1/pyasn1/releases) - [Changelog](https://github.com/pyasn1/pyasn1/blob/main/CHANGES.rst) - [Commits](https://github.com/pyasn1/pyasn1/compare/v0.6.2...v0.6.3) --- updated-dependencies: - dependency-name: black dependency-version: 26.3.1 dependency-type: direct:development dependency-group: uv - dependency-name: pyasn1 dependency-version: 0.6.3 dependency-type: indirect dependency-group: uv ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- uv.lock | 46 +++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fbd9b46d..827b3d59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -99,7 +99,7 @@ dev = [ "pytest-mock>=3.12.0,<4.0.0", "pytest-timeout>=2.3.1,<3.0.0", "mypy>=1.7.1,<2.0.0", - "black>=25.1.0,<26.0.0", + "black>=25.1.0,<27.0.0", "beautifulsoup4>=4.12.3,<5.0.0", "flaky>=3.8.1,<4.0.0", "types-beautifulsoup4>=4.12.0.20240229,<5.0.0", diff --git a/uv.lock b/uv.lock index 736be474..43de2040 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 2 +revision = 3 requires-python = ">=3.12, !=3.12.5, <4" resolution-markers = [ "python_full_version >= '3.13'", @@ -274,7 +274,7 @@ wheels = [ [[package]] name = "black" -version = "25.12.0" +version = "26.3.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "click" }, @@ -284,24 +284,24 @@ dependencies = [ { name = "platformdirs" }, { name = "pytokens" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c4/d9/07b458a3f1c525ac392b5edc6b191ff140b596f9d77092429417a54e249d/black-25.12.0.tar.gz", hash = "sha256:8d3dd9cea14bff7ddc0eb243c811cdb1a011ebb4800a5f0335a01a68654796a7", size = 659264, upload-time = "2025-12-08T01:40:52.501Z" } +sdist = { url = "https://files.pythonhosted.org/packages/e1/c5/61175d618685d42b005847464b8fb4743a67b1b8fdb75e50e5a96c31a27a/black-26.3.1.tar.gz", hash = "sha256:2c50f5063a9641c7eed7795014ba37b0f5fa227f3d408b968936e24bc0566b07", size = 666155, upload-time = "2026-03-12T03:36:03.593Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d1/bd/26083f805115db17fda9877b3c7321d08c647df39d0df4c4ca8f8450593e/black-25.12.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:31f96b7c98c1ddaeb07dc0f56c652e25bdedaac76d5b68a059d998b57c55594a", size = 1924178, upload-time = "2025-12-08T01:49:51.048Z" }, - { url = "https://files.pythonhosted.org/packages/89/6b/ea00d6651561e2bdd9231c4177f4f2ae19cc13a0b0574f47602a7519b6ca/black-25.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:05dd459a19e218078a1f98178c13f861fe6a9a5f88fc969ca4d9b49eb1809783", size = 1742643, upload-time = "2025-12-08T01:49:59.09Z" }, - { url = "https://files.pythonhosted.org/packages/6d/f3/360fa4182e36e9875fabcf3a9717db9d27a8d11870f21cff97725c54f35b/black-25.12.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c1f68c5eff61f226934be6b5b80296cf6939e5d2f0c2f7d543ea08b204bfaf59", size = 1800158, upload-time = "2025-12-08T01:44:27.301Z" }, - { url = "https://files.pythonhosted.org/packages/f8/08/2c64830cb6616278067e040acca21d4f79727b23077633953081c9445d61/black-25.12.0-cp312-cp312-win_amd64.whl", hash = "sha256:274f940c147ddab4442d316b27f9e332ca586d39c85ecf59ebdea82cc9ee8892", size = 1426197, upload-time = "2025-12-08T01:45:51.198Z" }, - { url = "https://files.pythonhosted.org/packages/d4/60/a93f55fd9b9816b7432cf6842f0e3000fdd5b7869492a04b9011a133ee37/black-25.12.0-cp312-cp312-win_arm64.whl", hash = "sha256:169506ba91ef21e2e0591563deda7f00030cb466e747c4b09cb0a9dae5db2f43", size = 1237266, upload-time = "2025-12-08T01:45:10.556Z" }, - { url = "https://files.pythonhosted.org/packages/c8/52/c551e36bc95495d2aa1a37d50566267aa47608c81a53f91daa809e03293f/black-25.12.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a05ddeb656534c3e27a05a29196c962877c83fa5503db89e68857d1161ad08a5", size = 1923809, upload-time = "2025-12-08T01:46:55.126Z" }, - { url = "https://files.pythonhosted.org/packages/a0/f7/aac9b014140ee56d247e707af8db0aae2e9efc28d4a8aba92d0abd7ae9d1/black-25.12.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9ec77439ef3e34896995503865a85732c94396edcc739f302c5673a2315e1e7f", size = 1742384, upload-time = "2025-12-08T01:49:37.022Z" }, - { url = "https://files.pythonhosted.org/packages/74/98/38aaa018b2ab06a863974c12b14a6266badc192b20603a81b738c47e902e/black-25.12.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e509c858adf63aa61d908061b52e580c40eae0dfa72415fa47ac01b12e29baf", size = 1798761, upload-time = "2025-12-08T01:46:05.386Z" }, - { url = "https://files.pythonhosted.org/packages/16/3a/a8ac542125f61574a3f015b521ca83b47321ed19bb63fe6d7560f348bfe1/black-25.12.0-cp313-cp313-win_amd64.whl", hash = "sha256:252678f07f5bac4ff0d0e9b261fbb029fa530cfa206d0a636a34ab445ef8ca9d", size = 1429180, upload-time = "2025-12-08T01:45:34.903Z" }, - { url = "https://files.pythonhosted.org/packages/e6/2d/bdc466a3db9145e946762d52cd55b1385509d9f9004fec1c97bdc8debbfb/black-25.12.0-cp313-cp313-win_arm64.whl", hash = "sha256:bc5b1c09fe3c931ddd20ee548511c64ebf964ada7e6f0763d443947fd1c603ce", size = 1239350, upload-time = "2025-12-08T01:46:09.458Z" }, - { url = "https://files.pythonhosted.org/packages/35/46/1d8f2542210c502e2ae1060b2e09e47af6a5e5963cb78e22ec1a11170b28/black-25.12.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:0a0953b134f9335c2434864a643c842c44fba562155c738a2a37a4d61f00cad5", size = 1917015, upload-time = "2025-12-08T01:53:27.987Z" }, - { url = "https://files.pythonhosted.org/packages/41/37/68accadf977672beb8e2c64e080f568c74159c1aaa6414b4cd2aef2d7906/black-25.12.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2355bbb6c3b76062870942d8cc450d4f8ac71f9c93c40122762c8784df49543f", size = 1741830, upload-time = "2025-12-08T01:54:36.861Z" }, - { url = "https://files.pythonhosted.org/packages/ac/76/03608a9d8f0faad47a3af3a3c8c53af3367f6c0dd2d23a84710456c7ac56/black-25.12.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9678bd991cc793e81d19aeeae57966ee02909877cb65838ccffef24c3ebac08f", size = 1791450, upload-time = "2025-12-08T01:44:52.581Z" }, - { url = "https://files.pythonhosted.org/packages/06/99/b2a4bd7dfaea7964974f947e1c76d6886d65fe5d24f687df2d85406b2609/black-25.12.0-cp314-cp314-win_amd64.whl", hash = "sha256:97596189949a8aad13ad12fcbb4ae89330039b96ad6742e6f6b45e75ad5cfd83", size = 1452042, upload-time = "2025-12-08T01:46:13.188Z" }, - { url = "https://files.pythonhosted.org/packages/b2/7c/d9825de75ae5dd7795d007681b752275ea85a1c5d83269b4b9c754c2aaab/black-25.12.0-cp314-cp314-win_arm64.whl", hash = "sha256:778285d9ea197f34704e3791ea9404cd6d07595745907dd2ce3da7a13627b29b", size = 1267446, upload-time = "2025-12-08T01:46:14.497Z" }, - { url = "https://files.pythonhosted.org/packages/68/11/21331aed19145a952ad28fca2756a1433ee9308079bd03bd898e903a2e53/black-25.12.0-py3-none-any.whl", hash = "sha256:48ceb36c16dbc84062740049eef990bb2ce07598272e673c17d1a7720c71c828", size = 206191, upload-time = "2025-12-08T01:40:50.963Z" }, + { url = "https://files.pythonhosted.org/packages/dc/f8/da5eae4fc75e78e6dceb60624e1b9662ab00d6b452996046dfa9b8a6025b/black-26.3.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5e6f89631eb88a7302d416594a32faeee9fb8fb848290da9d0a5f2903519fc1", size = 1895920, upload-time = "2026-03-12T03:40:13.921Z" }, + { url = "https://files.pythonhosted.org/packages/2c/9f/04e6f26534da2e1629b2b48255c264cabf5eedc5141d04516d9d68a24111/black-26.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41cd2012d35b47d589cb8a16faf8a32ef7a336f56356babd9fcf70939ad1897f", size = 1718499, upload-time = "2026-03-12T03:40:15.239Z" }, + { url = "https://files.pythonhosted.org/packages/04/91/a5935b2a63e31b331060c4a9fdb5a6c725840858c599032a6f3aac94055f/black-26.3.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f76ff19ec5297dd8e66eb64deda23631e642c9393ab592826fd4bdc97a4bce7", size = 1794994, upload-time = "2026-03-12T03:40:17.124Z" }, + { url = "https://files.pythonhosted.org/packages/e7/0a/86e462cdd311a3c2a8ece708d22aba17d0b2a0d5348ca34b40cdcbea512e/black-26.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:ddb113db38838eb9f043623ba274cfaf7d51d5b0c22ecb30afe58b1bb8322983", size = 1420867, upload-time = "2026-03-12T03:40:18.83Z" }, + { url = "https://files.pythonhosted.org/packages/5b/e5/22515a19cb7eaee3440325a6b0d95d2c0e88dd180cb011b12ae488e031d1/black-26.3.1-cp312-cp312-win_arm64.whl", hash = "sha256:dfdd51fc3e64ea4f35873d1b3fb25326773d55d2329ff8449139ebaad7357efb", size = 1230124, upload-time = "2026-03-12T03:40:20.425Z" }, + { url = "https://files.pythonhosted.org/packages/f5/77/5728052a3c0450c53d9bb3945c4c46b91baa62b2cafab6801411b6271e45/black-26.3.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:855822d90f884905362f602880ed8b5df1b7e3ee7d0db2502d4388a954cc8c54", size = 1895034, upload-time = "2026-03-12T03:40:21.813Z" }, + { url = "https://files.pythonhosted.org/packages/52/73/7cae55fdfdfbe9d19e9a8d25d145018965fe2079fa908101c3733b0c55a0/black-26.3.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8a33d657f3276328ce00e4d37fe70361e1ec7614da5d7b6e78de5426cb56332f", size = 1718503, upload-time = "2026-03-12T03:40:23.666Z" }, + { url = "https://files.pythonhosted.org/packages/e1/87/af89ad449e8254fdbc74654e6467e3c9381b61472cc532ee350d28cfdafb/black-26.3.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f1cd08e99d2f9317292a311dfe578fd2a24b15dbce97792f9c4d752275c1fa56", size = 1793557, upload-time = "2026-03-12T03:40:25.497Z" }, + { url = "https://files.pythonhosted.org/packages/43/10/d6c06a791d8124b843bf325ab4ac7d2f5b98731dff84d6064eafd687ded1/black-26.3.1-cp313-cp313-win_amd64.whl", hash = "sha256:c7e72339f841b5a237ff14f7d3880ddd0fc7f98a1199e8c4327f9a4f478c1839", size = 1422766, upload-time = "2026-03-12T03:40:27.14Z" }, + { url = "https://files.pythonhosted.org/packages/59/4f/40a582c015f2d841ac24fed6390bd68f0fc896069ff3a886317959c9daf8/black-26.3.1-cp313-cp313-win_arm64.whl", hash = "sha256:afc622538b430aa4c8c853f7f63bc582b3b8030fd8c80b70fb5fa5b834e575c2", size = 1232140, upload-time = "2026-03-12T03:40:28.882Z" }, + { url = "https://files.pythonhosted.org/packages/d5/da/e36e27c9cebc1311b7579210df6f1c86e50f2d7143ae4fcf8a5017dc8809/black-26.3.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2d6bfaf7fd0993b420bed691f20f9492d53ce9a2bcccea4b797d34e947318a78", size = 1889234, upload-time = "2026-03-12T03:40:30.964Z" }, + { url = "https://files.pythonhosted.org/packages/0e/7b/9871acf393f64a5fa33668c19350ca87177b181f44bb3d0c33b2d534f22c/black-26.3.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:f89f2ab047c76a9c03f78d0d66ca519e389519902fa27e7a91117ef7611c0568", size = 1720522, upload-time = "2026-03-12T03:40:32.346Z" }, + { url = "https://files.pythonhosted.org/packages/03/87/e766c7f2e90c07fb7586cc787c9ae6462b1eedab390191f2b7fc7f6170a9/black-26.3.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b07fc0dab849d24a80a29cfab8d8a19187d1c4685d8a5e6385a5ce323c1f015f", size = 1787824, upload-time = "2026-03-12T03:40:33.636Z" }, + { url = "https://files.pythonhosted.org/packages/ac/94/2424338fb2d1875e9e83eed4c8e9c67f6905ec25afd826a911aea2b02535/black-26.3.1-cp314-cp314-win_amd64.whl", hash = "sha256:0126ae5b7c09957da2bdbd91a9ba1207453feada9e9fe51992848658c6c8e01c", size = 1445855, upload-time = "2026-03-12T03:40:35.442Z" }, + { url = "https://files.pythonhosted.org/packages/86/43/0c3338bd928afb8ee7471f1a4eec3bdbe2245ccb4a646092a222e8669840/black-26.3.1-cp314-cp314-win_arm64.whl", hash = "sha256:92c0ec1f2cc149551a2b7b47efc32c866406b6891b0ee4625e95967c8f4acfb1", size = 1258109, upload-time = "2026-03-12T03:40:36.832Z" }, + { url = "https://files.pythonhosted.org/packages/8e/0d/52d98722666d6fc6c3dd4c76df339501d6efd40e0ff95e6186a7b7f0befd/black-26.3.1-py3-none-any.whl", hash = "sha256:2bd5aa94fc267d38bb21a70d7410a89f1a1d318841855f698746f8e7f51acd1b", size = 207542, upload-time = "2026-03-12T03:36:01.668Z" }, ] [[package]] @@ -1367,7 +1367,7 @@ requires-dist = [ [package.metadata.requires-dev] dev = [ { name = "beautifulsoup4", specifier = ">=4.12.3,<5.0.0" }, - { name = "black", specifier = ">=25.1.0,<26.0.0" }, + { name = "black", specifier = ">=25.1.0,<27.0.0" }, { name = "flaky", specifier = ">=3.8.1,<4.0.0" }, { name = "freezegun", specifier = ">=1.5.5,<2.0.0" }, { name = "httpx", specifier = ">=0.27.2,<0.29.0" }, @@ -2015,11 +2015,11 @@ wheels = [ [[package]] name = "pyasn1" -version = "0.6.2" +version = "0.6.3" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/fe/b6/6e630dff89739fcd427e3f72b3d905ce0acb85a45d4ec3e2678718a3487f/pyasn1-0.6.2.tar.gz", hash = "sha256:9b59a2b25ba7e4f8197db7686c09fb33e658b98339fadb826e9512629017833b", size = 146586, upload-time = "2026-01-16T18:04:18.534Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5c/5f/6583902b6f79b399c9c40674ac384fd9cd77805f9e6205075f828ef11fb2/pyasn1-0.6.3.tar.gz", hash = "sha256:697a8ecd6d98891189184ca1fa05d1bb00e2f84b5977c481452050549c8a72cf", size = 148685, upload-time = "2026-03-17T01:06:53.382Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/44/b5/a96872e5184f354da9c84ae119971a0a4c221fe9b27a4d94bd43f2596727/pyasn1-0.6.2-py3-none-any.whl", hash = "sha256:1eb26d860996a18e9b6ed05e7aae0e9fc21619fcee6af91cca9bad4fbea224bf", size = 83371, upload-time = "2026-01-16T18:04:17.174Z" }, + { url = "https://files.pythonhosted.org/packages/5d/a0/7d793dce3fa811fe047d6ae2431c672364b462850c6235ae306c0efd025f/pyasn1-0.6.3-py3-none-any.whl", hash = "sha256:a80184d120f0864a52a073acc6fc642847d0be408e7c7252f31390c0f4eadcde", size = 83997, upload-time = "2026-03-17T01:06:52.036Z" }, ] [[package]] From 1de39124b629862e6e775467d8a17664ed082716 Mon Sep 17 00:00:00 2001 From: rogthefrog Date: Mon, 30 Mar 2026 17:05:37 -0400 Subject: [PATCH 2/4] noop; lint --- src/modelbench/benchmark_runner_items.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modelbench/benchmark_runner_items.py b/src/modelbench/benchmark_runner_items.py index 0c944cf3..93bd9c9c 100644 --- a/src/modelbench/benchmark_runner_items.py +++ b/src/modelbench/benchmark_runner_items.py @@ -17,7 +17,6 @@ ) from modelgauge.sut import PromptResponseSUT, SUTResponse - # in their own file to solve circular import problems From 2aabb56374ab8c0d94abd0e107fb4f6af4162b92 Mon Sep 17 00:00:00 2001 From: rogthefrog Date: Mon, 30 Mar 2026 17:06:32 -0400 Subject: [PATCH 3/4] noop; lint --- src/modelgauge/annotators/cheval/annotator.py | 1 - src/modelgauge/annotators/cheval/registration.py | 1 - src/modelgauge/data_schema.py | 1 - src/modelgauge/ensemble_strategies.py | 1 - src/modelgauge/suts/azure_client.py | 4 ++-- src/modelgauge/suts/meta_llama_client.py | 4 ++-- src/modelgauge/suts/nvidia_nim_api_client.py | 1 - src/modelgauge/suts/together_client.py | 4 ++-- 8 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/modelgauge/annotators/cheval/annotator.py b/src/modelgauge/annotators/cheval/annotator.py index ae84f43d..0319cde1 100644 --- a/src/modelgauge/annotators/cheval/annotator.py +++ b/src/modelgauge/annotators/cheval/annotator.py @@ -11,7 +11,6 @@ from modelgauge.secret_values import RequiredSecret, SecretDescription from modelgauge.sut import SUTResponse - _CHEVAL_SCOPE = "cheval" diff --git a/src/modelgauge/annotators/cheval/registration.py b/src/modelgauge/annotators/cheval/registration.py index 66b5971d..068282f4 100644 --- a/src/modelgauge/annotators/cheval/registration.py +++ b/src/modelgauge/annotators/cheval/registration.py @@ -3,7 +3,6 @@ from modelgauge.annotators.cheval.ids import SAFETY_ANNOTATOR_V1_1_UID, SECURITY_ANNOTATOR_V0_5_UID from modelgauge.secret_values import InjectSecret - ANNOTATORS.register( ChevalAnnotator, SAFETY_ANNOTATOR_V1_1_UID, diff --git a/src/modelgauge/data_schema.py b/src/modelgauge/data_schema.py index aa6844c2..f352f73f 100644 --- a/src/modelgauge/data_schema.py +++ b/src/modelgauge/data_schema.py @@ -1,7 +1,6 @@ from abc import ABC, abstractmethod from typing import Optional - # The first value is the preferred name. PROMPT_UID_COLS = ["prompt_uid", "release_prompt_id"] PROMPT_TEXT_COLS = ["prompt_text"] diff --git a/src/modelgauge/ensemble_strategies.py b/src/modelgauge/ensemble_strategies.py index b9e98023..991e25e0 100644 --- a/src/modelgauge/ensemble_strategies.py +++ b/src/modelgauge/ensemble_strategies.py @@ -3,7 +3,6 @@ from modelgauge.annotation import SafetyAnnotation - T = TypeVar("T", bound=SafetyAnnotation) diff --git a/src/modelgauge/suts/azure_client.py b/src/modelgauge/suts/azure_client.py index 040a1c57..03e9461b 100644 --- a/src/modelgauge/suts/azure_client.py +++ b/src/modelgauge/suts/azure_client.py @@ -1,9 +1,9 @@ from abc import ABC, abstractmethod from typing import List, Optional -import requests # type:ignore +import requests # type: ignore from pydantic import BaseModel -from requests.adapters import HTTPAdapter, Retry # type:ignore +from requests.adapters import HTTPAdapter, Retry # type: ignore from modelgauge.general import APIException from modelgauge.prompt import TextPrompt diff --git a/src/modelgauge/suts/meta_llama_client.py b/src/modelgauge/suts/meta_llama_client.py index b83221e9..16a4b78d 100644 --- a/src/modelgauge/suts/meta_llama_client.py +++ b/src/modelgauge/suts/meta_llama_client.py @@ -1,6 +1,6 @@ from typing import List, Optional -import requests # type:ignore +import requests # type: ignore from httpx import Timeout from llama_api_client import LlamaAPIClient from llama_api_client.types import CreateChatCompletionResponse, MessageTextContentItem, ModerationCreateResponse @@ -14,7 +14,7 @@ from modelgauge.sut_decorator import modelgauge_sut from modelgauge.sut_registry import SUTS from pydantic import BaseModel -from requests.adapters import HTTPAdapter, Retry # type:ignore +from requests.adapters import HTTPAdapter, Retry # type: ignore class MetaLlamaApiKey(RequiredSecret): diff --git a/src/modelgauge/suts/nvidia_nim_api_client.py b/src/modelgauge/suts/nvidia_nim_api_client.py index 351c2f43..31c89b07 100644 --- a/src/modelgauge/suts/nvidia_nim_api_client.py +++ b/src/modelgauge/suts/nvidia_nim_api_client.py @@ -14,7 +14,6 @@ from modelgauge.sut_decorator import modelgauge_sut from modelgauge.sut_registry import SUTS - BASE_URL = "https://integrate.api.nvidia.com/v1" diff --git a/src/modelgauge/suts/together_client.py b/src/modelgauge/suts/together_client.py index c1103f3e..9a17df2a 100644 --- a/src/modelgauge/suts/together_client.py +++ b/src/modelgauge/suts/together_client.py @@ -1,10 +1,10 @@ import time from typing import List, Optional -import requests # type:ignore +import requests # type: ignore from airrlogger.log_config import get_logger from pydantic import BaseModel -from requests.adapters import HTTPAdapter, Retry # type:ignore +from requests.adapters import HTTPAdapter, Retry # type: ignore from modelgauge.auth.together_key import TogetherApiKey from modelgauge.general import APIException From 4876435ca94341b3fc4dae46e8a21249d1b74cfb Mon Sep 17 00:00:00 2001 From: rogthefrog Date: Mon, 30 Mar 2026 17:08:29 -0400 Subject: [PATCH 4/4] noop; lint --- .../sut_tests/test_baseten_api.py | 1 - .../sut_tests/test_google_genai.py | 16 ++++----------- .../sut_tests/test_meta_llama.py | 2 +- .../sut_tests/test_nvidia_nim_api_client.py | 6 ++---- .../sut_tests/test_openai_client.py | 14 +++++-------- .../sut_tests/test_together_client.py | 20 +++++++------------ .../test_annotation_pipeline.py | 1 - tests/modelgauge_tests/test_config.py | 16 ++++----------- tests/modelgauge_tests/test_external_data.py | 1 - .../test_multiple_choice_questions.py | 15 +++----------- .../test_prompt_formatting.py | 15 +++----------- tests/modelgauge_tests/test_records.py | 5 +---- tests/modelgauge_tests/test_secret_values.py | 10 ++-------- tests/modelgauge_tests/test_typed_data.py | 15 +++----------- 14 files changed, 35 insertions(+), 102 deletions(-) diff --git a/tests/modelgauge_tests/sut_tests/test_baseten_api.py b/tests/modelgauge_tests/sut_tests/test_baseten_api.py index cd7ed579..7b3250a0 100644 --- a/tests/modelgauge_tests/sut_tests/test_baseten_api.py +++ b/tests/modelgauge_tests/sut_tests/test_baseten_api.py @@ -14,7 +14,6 @@ from modelgauge.prompt import TextPrompt from modelgauge.typed_data import is_typeable - FAKE_MODEL_NAME = "xyzzy" diff --git a/tests/modelgauge_tests/sut_tests/test_google_genai.py b/tests/modelgauge_tests/sut_tests/test_google_genai.py index 189d636d..b9f67152 100644 --- a/tests/modelgauge_tests/sut_tests/test_google_genai.py +++ b/tests/modelgauge_tests/sut_tests/test_google_genai.py @@ -165,9 +165,7 @@ def test_google_genai_translate_response_finish_reason_other(google_default_sut, def test_google_genai_translate_response_no_completions(google_default_sut, some_request): - no_completions = GenerateContentResponse( - **json.loads( - """{ + no_completions = GenerateContentResponse(**json.loads("""{ "candidates": [], "usage_metadata": { "prompt_token_count": 19, @@ -176,18 +174,14 @@ def test_google_genai_translate_response_no_completions(google_default_sut, some "candidates_token_count": 0 } } -""" - ) - ) +""")) response = google_default_sut.translate_response(some_request, no_completions) assert response == SUTResponse(text=REFUSAL_RESPONSE) def test_google_genai_translate_response_none_completions(google_default_sut, some_request): - no_completions = GenerateContentResponse( - **json.loads( - """{ + no_completions = GenerateContentResponse(**json.loads("""{ "candidates": null, "usage_metadata": { "prompt_token_count": 19, @@ -196,9 +190,7 @@ def test_google_genai_translate_response_none_completions(google_default_sut, so "candidates_token_count": 0 } } -""" - ) - ) +""")) response = google_default_sut.translate_response(some_request, no_completions) assert response == SUTResponse(text=REFUSAL_RESPONSE) diff --git a/tests/modelgauge_tests/sut_tests/test_meta_llama.py b/tests/modelgauge_tests/sut_tests/test_meta_llama.py index c6e09fcc..62f7d62f 100644 --- a/tests/modelgauge_tests/sut_tests/test_meta_llama.py +++ b/tests/modelgauge_tests/sut_tests/test_meta_llama.py @@ -7,7 +7,7 @@ from modelgauge.model_options import ModelOptions from modelgauge.suts.meta_llama_client import InputMessage, MetaLlamaApiKey, MetaLlamaChatRequest, MetaLlamaSUT from pytest import fixture -from requests import HTTPError # type:ignore +from requests import HTTPError # type: ignore llama_chat_response_text = """ { diff --git a/tests/modelgauge_tests/sut_tests/test_nvidia_nim_api_client.py b/tests/modelgauge_tests/sut_tests/test_nvidia_nim_api_client.py index 034a0894..2da3b7bd 100644 --- a/tests/modelgauge_tests/sut_tests/test_nvidia_nim_api_client.py +++ b/tests/modelgauge_tests/sut_tests/test_nvidia_nim_api_client.py @@ -30,8 +30,7 @@ def test_openai_chat_translate_response(): messages=[], ) # response is base on openai request: https://platform.openai.com/docs/api-reference/chat/create - response = ChatCompletion.model_validate_json( - """\ + response = ChatCompletion.model_validate_json("""\ { "id": "chatcmpl-123", "object": "chat.completion", @@ -53,7 +52,6 @@ def test_openai_chat_translate_response(): "total_tokens": 21 } } -""" - ) +""") result = client.translate_response(request, response) assert result == SUTResponse(text="Hello there, how may I assist you today?", top_logprobs=None) diff --git a/tests/modelgauge_tests/sut_tests/test_openai_client.py b/tests/modelgauge_tests/sut_tests/test_openai_client.py index cf4ede89..80cfd219 100644 --- a/tests/modelgauge_tests/sut_tests/test_openai_client.py +++ b/tests/modelgauge_tests/sut_tests/test_openai_client.py @@ -50,7 +50,7 @@ def test_openai_constructor(): with_client = OpenAIChat( uid="test-model", model="some-model", - client=client, # type:ignore + client=client, # type: ignore ) # these should all fail @@ -114,8 +114,7 @@ def test_openai_chat_translate_response(): messages=[], ) # Pulled from https://platform.openai.com/docs/api-reference/chat/create - response = ChatCompletion.model_validate_json( - """\ + response = ChatCompletion.model_validate_json("""\ { "id": "chatcmpl-123", "object": "chat.completion", @@ -137,8 +136,7 @@ def test_openai_chat_translate_response(): "total_tokens": 21 } } -""" - ) +""") result = client.translate_response(request, response) assert result == SUTResponse(text="Hello there, how may I assist you today?", top_logprobs=None) @@ -151,8 +149,7 @@ def test_openai_chat_translate_response_logprobs(): logprobs=True, ) # Copied from a real response. - response = ChatCompletion.model_validate_json( - """\ + response = ChatCompletion.model_validate_json("""\ { "id": "made-this-fake", "choices": [ @@ -234,8 +231,7 @@ def test_openai_chat_translate_response_logprobs(): "total_tokens": 11 } } -""" - ) +""") result = client.translate_response(request, response) assert result == SUTResponse( text="Hello!", diff --git a/tests/modelgauge_tests/sut_tests/test_together_client.py b/tests/modelgauge_tests/sut_tests/test_together_client.py index e865a26c..b72b299e 100644 --- a/tests/modelgauge_tests/sut_tests/test_together_client.py +++ b/tests/modelgauge_tests/sut_tests/test_together_client.py @@ -1,7 +1,7 @@ from unittest.mock import patch, MagicMock import pytest -from requests import HTTPError # type:ignore +from requests import HTTPError # type: ignore import json from modelgauge.general import APIException @@ -186,8 +186,7 @@ def test_together_completions_translate_response(): prompt="My favorite colors are red and ", max_tokens=2, ) - response = TogetherCompletionsResponse.model_validate_json( - """\ + response = TogetherCompletionsResponse.model_validate_json("""\ { "id": "87cc221c3b411064-ORD", "object": "text.completion", @@ -209,8 +208,7 @@ def test_together_completions_translate_response(): } } -""" - ) +""") result = client.translate_response(request, response) assert result == SUTResponse(text=" blue.", top_logprobs=None) @@ -223,8 +221,7 @@ def test_together_completions_translate_response_logprobs(): max_tokens=2, logprobs=1, ) - response = TogetherCompletionsResponse.model_validate_json( - """\ + response = TogetherCompletionsResponse.model_validate_json("""\ { "id": "87cc221c3b411064-ORD", "object": "text.completion", @@ -259,8 +256,7 @@ def test_together_completions_translate_response_logprobs(): "total_tokens": 10 } } -""" - ) +""") result = client.translate_response(request, response) assert result == SUTResponse( text=" blue.", @@ -302,8 +298,7 @@ def test_together_chat_translate_response_logprobs(): max_tokens=2, logprobs=1, ) - response = TogetherChatResponse.model_validate_json( - """\ + response = TogetherChatResponse.model_validate_json("""\ { "id": "87ca703b9c6710af-ORD", "object": "chat.completion", @@ -332,8 +327,7 @@ def test_together_chat_translate_response_logprobs(): "total_tokens": 7 } } -""" - ) +""") result = client.translate_response(request, response) assert result == SUTResponse( text="Some response", diff --git a/tests/modelgauge_tests/test_annotation_pipeline.py b/tests/modelgauge_tests/test_annotation_pipeline.py index d472229a..3975d373 100644 --- a/tests/modelgauge_tests/test_annotation_pipeline.py +++ b/tests/modelgauge_tests/test_annotation_pipeline.py @@ -33,7 +33,6 @@ from modelgauge_tests.fake_ensemble_strategy import FakeEnsembleStrategy from modelgauge_tests.test_prompt_pipeline import FakePromptInput - PROMPT_RESPONSE_SCHEMA = PromptResponseSchema.default() diff --git a/tests/modelgauge_tests/test_config.py b/tests/modelgauge_tests/test_config.py index 5cf51b2b..fec0db45 100644 --- a/tests/modelgauge_tests/test_config.py +++ b/tests/modelgauge_tests/test_config.py @@ -72,12 +72,10 @@ def test_load_secrets_works_with_file_path(tmpdir): os.makedirs(config_dir) secrets_file = config_dir.join("secrets.toml") with open(secrets_file, "w") as f: - f.write( - """\ + f.write("""\ [scope] api_key = "12345" - """ - ) + """) secrets = load_secrets_from_config(secrets_file) assert secrets == {"scope": {"api_key": "12345"}} @@ -113,15 +111,12 @@ def test_raise_if_missing_from_config_single(): raise_if_missing_from_config([missing], config_path="some/path.toml") absolute_path = str(pathlib.Path("some/path.toml").absolute()) - assert ( - str(err_info.value) - == f"""\ + assert str(err_info.value) == f"""\ To perform this run you need to add the following values to your secrets file '{absolute_path}': [some-scope] # some-instructions some-key="" """ - ) def test_raise_if_missing_from_config_combines(): @@ -139,9 +134,7 @@ def test_raise_if_missing_from_config_combines(): absolute_path = str(pathlib.Path("some/path.toml").absolute()) - assert ( - str(err_info.value) - == f"""\ + assert str(err_info.value) == f"""\ To perform this run you need to add the following values to your secrets file '{absolute_path}': [scope1] # instructions1 @@ -153,4 +146,3 @@ def test_raise_if_missing_from_config_combines(): # instructions3 key1="" """ - ) diff --git a/tests/modelgauge_tests/test_external_data.py b/tests/modelgauge_tests/test_external_data.py index 8a9b62dc..ce3a720c 100644 --- a/tests/modelgauge_tests/test_external_data.py +++ b/tests/modelgauge_tests/test_external_data.py @@ -8,7 +8,6 @@ from tenacity import wait_none - WebDataMockResponse = namedtuple("WebDataMockResponse", ("ok", "content")) GDriveFileToDownload = namedtuple("GDriveFileToDownload", ("id", "path")) diff --git a/tests/modelgauge_tests/test_multiple_choice_questions.py b/tests/modelgauge_tests/test_multiple_choice_questions.py index a0c44825..0b237f46 100644 --- a/tests/modelgauge_tests/test_multiple_choice_questions.py +++ b/tests/modelgauge_tests/test_multiple_choice_questions.py @@ -15,16 +15,13 @@ def test_question_to_text_basic_with_answer(): correct_option=2, ) text = question_to_text(question, formatting, include_answer=True) - assert ( - text - == """\ + assert text == """\ Question: What color is the sky? A) Red B) Green C) Blue Answer: C """ - ) def test_question_to_text_basic_without_answer(): @@ -36,15 +33,12 @@ def test_question_to_text_basic_without_answer(): ) text = question_to_text(question, formatting, include_answer=False) # No whitespace after "Answer:" - assert ( - text - == """\ + assert text == """\ Question: What color is the sky? A) Red B) Green C) Blue Answer:""" - ) def test_question_to_text_alternate_formatting(): @@ -84,9 +78,7 @@ def test_question_with_training_to_text_basic(): correct_option=0, ) text = question_with_training_to_text(eval_question, [training_1, training_2], formatting) - assert ( - text - == """\ + assert text == """\ The following are multiple choice questions (with answers). Question: What goes up A) Keeps going @@ -105,4 +97,3 @@ def test_question_with_training_to_text_basic(): B) Green C) Blue Answer:""" - ) diff --git a/tests/modelgauge_tests/test_prompt_formatting.py b/tests/modelgauge_tests/test_prompt_formatting.py index f4cb2d76..3e1a0dcc 100644 --- a/tests/modelgauge_tests/test_prompt_formatting.py +++ b/tests/modelgauge_tests/test_prompt_formatting.py @@ -4,13 +4,10 @@ def test_format_chat_just_user(): chat = ChatPrompt(messages=[ChatMessage(text="some-text", role=ChatRole.user)]) - assert ( - format_chat(chat) - == """\ + assert format_chat(chat) == """\ user: some-text assistant: """ - ) def test_format_chat_multi_turn(): @@ -20,15 +17,12 @@ def test_format_chat_multi_turn(): ChatMessage(text="second-text", role=ChatRole.user), ] ) - assert ( - format_chat(chat) - == """\ + assert format_chat(chat) == """\ assistant: first-text user: second-text assistant: """ - ) def test_format_chat_override_names(): @@ -38,12 +32,9 @@ def test_format_chat_override_names(): ChatMessage(text="second-text", role=ChatRole.user), ] ) - assert ( - format_chat(chat, user_role="human", sut_role="bot") - == """\ + assert format_chat(chat, user_role="human", sut_role="bot") == """\ bot: first-text human: second-text bot: """ - ) diff --git a/tests/modelgauge_tests/test_records.py b/tests/modelgauge_tests/test_records.py index 05769675..35f848b2 100644 --- a/tests/modelgauge_tests/test_records.py +++ b/tests/modelgauge_tests/test_records.py @@ -61,9 +61,7 @@ def test_serialize_test_record(): result=TestResult.from_instance(MockResult(mock_result=2.0)), ) - assert ( - record.model_dump_json(indent=2) - == """\ + assert record.model_dump_json(indent=2) == """\ { "run_timestamp": "2017-08-21T11:47:00.123456-07:00", "test_uid": "some-test", @@ -161,7 +159,6 @@ def test_serialize_test_record(): } } }""" - ) def test_round_trip_test_item(): diff --git a/tests/modelgauge_tests/test_secret_values.py b/tests/modelgauge_tests/test_secret_values.py index d7da20a9..bc5d77bf 100644 --- a/tests/modelgauge_tests/test_secret_values.py +++ b/tests/modelgauge_tests/test_secret_values.py @@ -43,13 +43,10 @@ def test_make_required_present(): def test_make_required_missing(): with pytest.raises(MissingSecretValues) as err_info: secret = SomeRequiredSecret.make({"some-scope": {"different-key": "some-value"}}) - assert ( - str(err_info.value) - == """\ + assert str(err_info.value) == """\ Missing the following secrets: scope='some-scope' key='some-key' instructions='some-instructions' """ - ) def test_make_optional_present(): @@ -71,14 +68,11 @@ def test_missing_required_secrets_combine(): combined = MissingSecretValues.combine([e1, e2]) - assert ( - str(combined) - == """\ + assert str(combined) == """\ Missing the following secrets: scope='s1' key='k1' instructions='i1' scope='s2' key='k2' instructions='i2' """ - ) def test_get_all_secrets(): diff --git a/tests/modelgauge_tests/test_typed_data.py b/tests/modelgauge_tests/test_typed_data.py index 4c00aa9e..66b95fec 100644 --- a/tests/modelgauge_tests/test_typed_data.py +++ b/tests/modelgauge_tests/test_typed_data.py @@ -74,9 +74,7 @@ def test_polymorphic_round_trip(): ) typed_data = TypedData.from_instance(original) as_json = typed_data.model_dump_json(indent=2) - assert ( - as_json - == """\ + assert as_json == """\ { "module": "modelgauge_tests.test_typed_data", "class_name": "TopLevel", @@ -113,7 +111,6 @@ def test_polymorphic_round_trip(): } } }""" - ) returned = TypedData.model_validate_json(as_json) assert typed_data == returned returned_type = returned.to_instance(TopLevel) @@ -137,9 +134,7 @@ def test_multiple_polymorphic_layers(): ) typed_data = TypedData.from_instance(original) as_json = typed_data.model_dump_json(indent=2) - assert ( - as_json - == """\ + assert as_json == """\ { "module": "modelgauge_tests.test_typed_data", "class_name": "TopLevel", @@ -172,7 +167,6 @@ def test_multiple_polymorphic_layers(): } } }""" - ) returned = TypedData.model_validate_json(as_json) assert typed_data == returned returned_type = returned.to_instance(TopLevel) @@ -197,9 +191,7 @@ def test_nested_classes(): original = NestedClasses(layer_1=NestedClasses.Layer1(layer_2=NestedClasses.Layer1.Layer2(value="some-value"))) typed_data = TypedData.from_instance(original) as_json = typed_data.model_dump_json(indent=2) - assert ( - as_json - == """\ + assert as_json == """\ { "module": "modelgauge_tests.test_typed_data", "class_name": "NestedClasses", @@ -211,7 +203,6 @@ def test_nested_classes(): } } }""" - ) returned = TypedData.model_validate_json(as_json) assert typed_data == returned