Ci/add ruff format to openfe protocols (#1604)

* add more checks

* make precommit manual

* apply formatting to pyproject.toml

* add TODO

* remove unneeded, add a few more

* add ruff, but turn everything off

* add openfe known first party

* format highest-level files

* first half of openfe protocols

* second half of openfe protocols

* openfe protocols formatting, with alyssa's fmt skips

* add ruff formatter to precommit

* fmt: off all vendored _rfe_utils code

* addressing review comments
This commit is contained in:
Alyssa Travitz
2025-10-22 16:04:13 -07:00
committed by GitHub
parent 135393e193
commit 3a08b6809f
42 changed files with 1551 additions and 1542 deletions

View File

@@ -4,6 +4,7 @@ Useful if Settings are ever changed in a backwards-incompatible way
Will expect "rbfe_results.tar.gz" in this directory, will overwrite this file
"""
from gufe.tokenization import JSON_HANDLER
import glob
import json
@@ -20,38 +21,38 @@ def untar(fn):
def retar(loc, name):
"""create tar.gz called *name* of directory *loc*"""
with tarfile.open(name, mode='w:gz') as f:
with tarfile.open(name, mode="w:gz") as f:
f.add(loc, arcname=os.path.basename(loc))
def replace_settings(fn, new_settings):
"""replace settings instances in *fn* with *new_settings*"""
with open(fn, 'r') as f:
with open(fn, "r") as f:
data = json.load(f)
for k in data['protocol_result']['data']:
data['protocol_result']['data'][k][0]['inputs']['settings'] = new_settings
for k in data["protocol_result"]["data"]:
data["protocol_result"]["data"][k][0]["inputs"]["settings"] = new_settings
for k in data['unit_results']:
data['unit_results'][k]['inputs']['settings'] = new_settings
for k in data["unit_results"]:
data["unit_results"][k]["inputs"]["settings"] = new_settings
with open(fn, 'w') as f:
with open(fn, "w") as f:
json.dump(data, f, cls=JSON_HANDLER.encoder)
def fix_rbfe_results():
untar('rbfe_results.tar.gz')
untar("rbfe_results.tar.gz")
# generate valid settings as defaults
new_settings = openmm_rfe.RelativeHybridTopologyProtocol.default_settings()
# walk over all result jsons
for fn in glob.glob('./results/*json'):
for fn in glob.glob("./results/*json"):
# replace instances of settings within with valid settings
replace_settings(fn, new_settings)
retar('results', 'rbfe_results.tar.gz')
retar("results", "rbfe_results.tar.gz")
if __name__ == '__main__':
if __name__ == "__main__":
fix_rbfe_results()

View File

@@ -13,18 +13,15 @@ Generates
- MDProtocol_json_results.gz
- used in md_json fixture
"""
import gzip
import json
import logging
import pathlib
from rdkit import Chem
import tempfile
from openff.toolkit import (
Molecule, RDKitToolkitWrapper, AmberToolsToolkitWrapper
)
from openff.toolkit.utils.toolkit_registry import (
toolkit_registry_manager, ToolkitRegistry
)
from openff.toolkit import Molecule, RDKitToolkitWrapper, AmberToolsToolkitWrapper
from openff.toolkit.utils.toolkit_registry import toolkit_registry_manager, ToolkitRegistry
from openff.units import unit
from kartograf.atom_aligner import align_mol_shape
from kartograf import KartografAtomMapper
@@ -46,20 +43,18 @@ from openfecli.utils import configure_logger
sys.stdout.reconfigure(line_buffering=True)
stdout_handler = logging.StreamHandler(sys.stdout)
configure_logger('gufekey', handler=stdout_handler)
configure_logger('gufe', handler=stdout_handler)
configure_logger('openfe', handler=stdout_handler)
configure_logger('openmmtools.multistate.multistatereporter', level=logging.DEBUG, handler=stdout_handler)
configure_logger('openmmtools.multistate.multistatesampler', level=logging.DEBUG, handler=stdout_handler)
configure_logger("gufekey", handler=stdout_handler)
configure_logger("gufe", handler=stdout_handler)
configure_logger("openfe", handler=stdout_handler)
configure_logger("openmmtools.multistate.multistatereporter", level=logging.DEBUG, handler=stdout_handler) # fmt: skip
configure_logger("openmmtools.multistate.multistatesampler", level=logging.DEBUG, handler=stdout_handler) # fmt: skip
logger = logging.getLogger(__name__)
LIGA = "[H]C([H])([H])C([H])([H])C(=O)C([H])([H])C([H])([H])[H]"
LIGB = "[H]C([H])([H])C(=O)C([H])([H])C([H])([H])C([H])([H])[H]"
amber_rdkit = ToolkitRegistry(
[RDKitToolkitWrapper(), AmberToolsToolkitWrapper()]
)
amber_rdkit = ToolkitRegistry([RDKitToolkitWrapper(), AmberToolsToolkitWrapper()])
def get_molecule(smi, name):
@@ -71,12 +66,14 @@ def get_molecule(smi, name):
def get_hif2a_inputs():
with gzip.open('inputs/hif2a_protein.pdb.gz', 'r') as f:
protcomp = openfe.ProteinComponent.from_pdb_file(f, name='hif2a_prot')
with gzip.open("inputs/hif2a_protein.pdb.gz", "r") as f:
protcomp = openfe.ProteinComponent.from_pdb_file(f, name="hif2a_prot")
with gzip.open('inputs/hif2a_ligands.sdf.gz', 'r') as f:
smcs = [openfe.SmallMoleculeComponent(mol) for mol in
list(Chem.ForwardSDMolSupplier(f, removeHs=False))]
with gzip.open("inputs/hif2a_ligands.sdf.gz", "r") as f:
smcs = [
openfe.SmallMoleculeComponent(mol)
for mol in list(Chem.ForwardSDMolSupplier(f, removeHs=False))
]
return smcs, protcomp
@@ -86,7 +83,7 @@ def execute_and_serialize(
protocol,
simname,
new_serialization: bool = False
):
): # fmt: skip
"""
Execute & serialize a DAG
@@ -127,9 +124,9 @@ def execute_and_serialize(
unit.key: unit.to_keyed_dict()
for unit in dagres.protocol_unit_results
}
}
} # fmt: skip
with gzip.open(f"{simname}_json_results.gz", 'wt') as zipfile:
with gzip.open(f"{simname}_json_results.gz", "wt") as zipfile:
json.dump(outdict, zipfile, cls=JSON_HANDLER.encoder)
@@ -165,13 +162,13 @@ def generate_abfe_settings():
settings.complex_simulation_settings.equilibration_length = 100 * unit.picosecond
settings.complex_simulation_settings.production_length = 500 * unit.picosecond
settings.complex_simulation_settings.time_per_iteration = 2.5 * unit.ps
settings.solvent_solvation_settings.box_shape = 'dodecahedron'
settings.complex_solvation_settings.box_shape = 'dodecahedron'
settings.solvent_solvation_settings.box_shape = "dodecahedron"
settings.complex_solvation_settings.box_shape = "dodecahedron"
settings.solvent_solvation_settings.solvent_padding = 1.5 * unit.nanometer
settings.complex_solvation_settings.solvent_padding = 1.0 * unit.nanometer
settings.forcefield_settings.nonbonded_cutoff = 0.8 * unit.nanometer
settings.protocol_repeats = 3
settings.engine_settings.compute_platform = 'CUDA'
settings.engine_settings.compute_platform = "CUDA"
return settings
@@ -210,29 +207,25 @@ def generate_ahfe_settings():
settings.vacuum_simulation_settings.production_length = 1000 * unit.picosecond
settings.lambda_settings.lambda_elec = [0.0, 0.25, 0.5, 0.75, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0]
1.0] # fmt: skip
settings.lambda_settings.lambda_vdw = [0.0, 0.0, 0.0, 0.0, 0.0, 0.12, 0.24,
0.36, 0.48, 0.6, 0.7, 0.77, 0.85,
1.0]
1.0] # fmt: skip
settings.protocol_repeats = 3
settings.solvent_simulation_settings.n_replicas = 14
settings.vacuum_simulation_settings.n_replicas = 14
settings.solvent_simulation_settings.early_termination_target_error = 0.12 * unit.kilocalorie_per_mole
settings.vacuum_simulation_settings.early_termination_target_error = 0.12 * unit.kilocalorie_per_mole
settings.vacuum_engine_settings.compute_platform = 'CPU'
settings.solvent_engine_settings.compute_platform = 'CUDA'
settings.solvent_simulation_settings.early_termination_target_error = 0.12 * unit.kilocalorie_per_mole # fmt: skip
settings.vacuum_simulation_settings.early_termination_target_error = 0.12 * unit.kilocalorie_per_mole # fmt: skip
settings.vacuum_engine_settings.compute_platform = "CPU"
settings.solvent_engine_settings.compute_platform = "CUDA"
return settings
def generate_ahfe_json(smc):
protocol = AbsoluteSolvationProtocol(settings=generate_ahfe_settings())
sysA = openfe.ChemicalSystem(
{"ligand": smc, "solvent": openfe.SolventComponent()}
)
sysB = openfe.ChemicalSystem(
{"solvent": openfe.SolventComponent()}
)
sysA = openfe.ChemicalSystem({"ligand": smc, "solvent": openfe.SolventComponent()})
sysB = openfe.ChemicalSystem({"solvent": openfe.SolventComponent()})
dag = protocol.create(stateA=sysA, stateB=sysB, mapping=None)
@@ -255,12 +248,10 @@ def generate_rfe_json(smcA, smcB):
mapper = KartografAtomMapper(atom_map_hydrogens=True)
mapping = next(mapper.suggest_mappings(smcA, a_smcB))
systemA = openfe.ChemicalSystem({'ligand': smcA})
systemB = openfe.ChemicalSystem({'ligand': a_smcB})
systemA = openfe.ChemicalSystem({"ligand": smcA})
systemB = openfe.ChemicalSystem({"ligand": a_smcB})
dag = protocol.create(
stateA=systemA, stateB=systemB, mapping=mapping
)
dag = protocol.create(stateA=systemA, stateB=systemB, mapping=mapping)
execute_and_serialize(dag, protocol, "RHFEProtocol")
@@ -279,13 +270,13 @@ def generate_septop_settings():
settings.complex_simulation_settings.equilibration_length = 10 * unit.picosecond
settings.complex_simulation_settings.production_length = 50 * unit.picosecond
settings.complex_simulation_settings.time_per_iteration = 2.5 * unit.ps
settings.solvent_solvation_settings.box_shape = 'dodecahedron'
settings.complex_solvation_settings.box_shape = 'dodecahedron'
settings.solvent_solvation_settings.box_shape = "dodecahedron"
settings.complex_solvation_settings.box_shape = "dodecahedron"
settings.solvent_solvation_settings.solvent_padding = 1.2 * unit.nanometer
settings.complex_solvation_settings.solvent_padding = 1.0 * unit.nanometer
settings.forcefield_settings.nonbonded_cutoff = 0.9 * unit.nanometer
settings.protocol_repeats = 1
settings.engine_settings.compute_platform = 'CUDA'
settings.engine_settings.compute_platform = "CUDA"
return settings