Skip to content

Commit 60dd7d4

Browse files
committed
fix: ruff check
1 parent 228d494 commit 60dd7d4

6 files changed

Lines changed: 13 additions & 29 deletions

File tree

examples/eval_via_opsin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,3 @@ def try_name_smiles(smi):
6161
accuracy = np.mean(matches)
6262

6363
print(f"Accuracy: {accuracy:.2%}")
64-

examples/opsin_eval_ZINC22.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ def load_parquet_shard(parquet_path):
9494

9595
if SMILES_COLUMN not in ds.column_names:
9696
raise RuntimeError(
97-
f"Column {SMILES_COLUMN!r} not found in {parquet_path}. "
98-
f"Available columns: {ds.column_names}"
97+
f"Column {SMILES_COLUMN!r} not found in {parquet_path}. Available columns: {ds.column_names}"
9998
)
10099

101100
return ds
@@ -133,15 +132,10 @@ def sample_zinc22_from_random_parquet_batches(parquet_files, seed):
133132
)
134133

135134
for batch_start in range(0, len(shuffled_parquets), PARQUET_BATCH_SIZE):
136-
batch = shuffled_parquets[
137-
batch_start : batch_start + PARQUET_BATCH_SIZE
138-
]
135+
batch = shuffled_parquets[batch_start : batch_start + PARQUET_BATCH_SIZE]
139136
parquet_batches_read += 1
140137

141-
print(
142-
f"Seed {seed}: reading parquet batch {parquet_batches_read} "
143-
f"with {len(batch)} shard(s)"
144-
)
138+
print(f"Seed {seed}: reading parquet batch {parquet_batches_read} with {len(batch)} shard(s)")
145139

146140
for parquet_path in batch:
147141
if len(pool) >= target_pool_size:
@@ -276,10 +270,7 @@ def opsin_batch_with_fallback(names):
276270
converted = [converted]
277271

278272
if len(converted) != len(name_chunk):
279-
raise ValueError(
280-
f"OPSIN returned {len(converted)} results for "
281-
f"{len(name_chunk)} names"
282-
)
273+
raise ValueError(f"OPSIN returned {len(converted)} results for {len(name_chunk)} names")
283274

284275
except Exception:
285276
converted = [opsin_one(name) for name in name_chunk]
@@ -511,6 +502,7 @@ def main():
511502
print(f"Total failures: {len(all_failures):,}")
512503
print(f"Wrote results to: {OUT_DIR.resolve()}")
513504

505+
514506
if __name__ == "__main__":
515507
mp.freeze_support()
516508
main()

examples/opsin_eval_pubchem.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@ def opsin_batch_with_fallback(names):
106106
converted = [converted]
107107

108108
if len(converted) != len(name_chunk):
109-
raise ValueError(
110-
f"OPSIN returned {len(converted)} results for "
111-
f"{len(name_chunk)} names"
112-
)
109+
raise ValueError(f"OPSIN returned {len(converted)} results for {len(name_chunk)} names")
113110

114111
except Exception:
115112
converted = [opsin_one(name) for name in name_chunk]

examples/test_qm9_opsin_batch.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ def main():
160160
else:
161161
smiles_col = ds.column_names[0]
162162

163-
164163
dataset = list([smiles_col])
165164

166165
print("Converting SMILES to IUPAC names...")

src/bluenamer/opsin_verify.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ def verify_with_opsin(name: str, smiles: str, standardize_smiles: bool = True) -
115115
return OpsinCheck(status="skipped_no_java", name=name)
116116

117117
if standardize_smiles:
118-
119118
canonical_original = standardize_mol(smiles)
120119
else:
121120
canonical_original = _canonicalize(smiles)
@@ -147,7 +146,9 @@ def verify_with_opsin(name: str, smiles: str, standardize_smiles: bool = True) -
147146
canonical_original=canonical_original,
148147
opsin_smiles=opsin_smiles,
149148
canonical_roundtrip=canonical_roundtrip,
150-
error_message= "Failed to standardize SMILES for comparison." if standardize_smiles else "Failed to canonicalize SMILES for comparison.",
149+
error_message="Failed to standardize SMILES for comparison."
150+
if standardize_smiles
151+
else "Failed to canonicalize SMILES for comparison.",
151152
)
152153

153154
if equivalent_smiles(smiles, opsin_smiles):

test_opsin_qm9_batch.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1+
import multiprocessing as mp
12
import os
23
import random
3-
import multiprocessing as mp
44
from concurrent.futures import ProcessPoolExecutor
55

66
import numpy as np
77
import py2opsin
88
from datasets import load_dataset
9-
from structure_to_iupac.namer import name_smiles
109
from rdkit.Chem import CanonSmiles
10+
from structure_to_iupac.namer import name_smiles
1111
from tqdm import tqdm
1212

13-
1413
# --- Configuration ---
1514
N_TEST = 5_000
1615
SEED = 42
@@ -51,7 +50,7 @@ def main():
5150

5251
indices = random.sample(range(len(all_smiles)), min(N_TEST, len(all_smiles)))
5352
dataset = [all_smiles[i] for i in indices]
54-
#dataset = all_smiles
53+
# dataset = all_smiles
5554

5655
# 2. Parallelize SMILES -> IUPAC
5756
print("Converting SMILES to IUPAC names...")
@@ -85,10 +84,7 @@ def main():
8584

8685
# 5. Calculate Accuracy
8786
matches = np.array(
88-
[
89-
predicted == original and predicted is not None
90-
for predicted, original in zip(smiles_strings, original_canon)
91-
]
87+
[predicted == original and predicted is not None for predicted, original in zip(smiles_strings, original_canon)]
9288
)
9389

9490
accuracy = np.mean(matches)

0 commit comments

Comments
 (0)