stjames 0.0.92__tar.gz → 0.0.93__tar.gz

{stjames-0.0.92/stjames.egg-info → stjames-0.0.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stjames
-Version: 0.0.92
+Version: 0.0.93
 Summary: standardized JSON atom/molecule encoding scheme
 Author-email: Corin Wagen <corin@rowansci.com>
 Project-URL: Homepage, https://github.com/rowansci/stjames

{stjames-0.0.92 → stjames-0.0.93}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stjames"
-version = "0.0.92"
+version = "0.0.93"
 description = "standardized JSON atom/molecule encoding scheme"
 readme = "README.md"
 requires-python = ">=3.11"

{stjames-0.0.92 → stjames-0.0.93}/stjames/pdb.py

@@ -448,6 +448,7 @@ def _format_atom_line(
         chg = "  "
 
     atom_name = atom.name if atom.name else atom.element
+
     occupancy = atom.occupancy if atom.occupancy else 1.0
 
     # Construct the line.
@@ -455,7 +456,7 @@ def _format_atom_line(
     line = (
         f"{record_type}"
         f"{serial:5d} "  # atom serial number (columns 7-11)
-        f"{atom_name:<4}"  # atom name (columns 13-16, left-justified in this snippet)
+        f"{(' ' + atom_name if len(atom_name) < 4 else atom_name):<4}"  # atom name (columns 13-16, left-justified in this snippet)
         f"{alt_loc_char}"  # altLoc (column 17)
         f"{residue_name:>3}"  # residue name (columns 18-20)
         f" {chain_char}"  # chain ID (column 22)

{stjames-0.0.92 → stjames-0.0.93}/stjames/workflows/docking.py

@@ -7,6 +7,7 @@ from pydantic import AfterValidator, ConfigDict, field_validator, model_validato
 from ..base import Base, round_float
 from ..pdb import PDB
 from ..types import UUID, Vector3D
+from .conformer_search import ConformerGenSettings, ETKDGSettings
 from .workflow import MoleculeWorkflow
 
 
@@ -20,6 +21,28 @@ class Score(Base):
 
     pose: UUID | None  # for calculation
     score: Annotated[float, AfterValidator(round_float(3))]
+    posebusters_valid: bool
+
+
+class DockingSettings(Base):
+    """
+    Base class for controlling how docked poses are generated.
+
+    :param max_poses: the maximum number of poses generated per input molecule
+    """
+
+    max_poses: int = 4
+
+
+class VinaSettings(DockingSettings):
+    """
+    Controls how AutoDock Vina is run.
+
+    :param exhaustiveness: how many times Vina attempts to find a pose.
+        8 is typical, 32 is considered relatively careful.
+    """
+
+    exhaustiveness: int = 8
 
 
 class DockingWorkflow(MoleculeWorkflow):
@@ -35,31 +58,38 @@ class DockingWorkflow(MoleculeWorkflow):
     :param mode: Mode for workflow (currently unused)
 
     New:
-    :param molecules: Molecules to dock (optional)
-    :param smiles: SMILES strings of the ligands (optional)
+    :param docking_engine: which docking method to use
     :param do_csearch: whether to csearch starting structures
+    :param csearch_settings: settings for initial conformer search.
     :param do_optimization: whether to optimize starting structures
+    :param opt_settings: settings for conformer optimization.
     :param do_pose_refinement: whether to optimize non-rotatable bonds in output poses
-    :param conformers: UUIDs of optimized conformers
     :param target: PDB of the protein.
     :param target_uuid: UUID of the protein.
     :param pocket: center (x, y, z) and size (x, y, z) of the pocket
 
     Results:
+    :param conformers: UUIDs of optimized conformers
     :param scores: docked poses sorted by score
     """
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    do_csearch: bool = True
-    do_optimization: bool = True
-    conformers: list[UUID] = []
-
     target: PDB | None = None
     target_uuid: UUID | None = None
     pocket: tuple[Vector3D, Vector3D]
 
+    do_csearch: bool = True
+    conformer_gen_settings: ConformerGenSettings = ETKDGSettings(mode="reckless")
+
+    do_optimization: bool = True
+    # optimization_settings - here in future once we have a cleaner mode sol'n, ccw 7.9.25
+
+    docking_settings: DockingSettings = VinaSettings()
+
     do_pose_refinement: bool = True
+
+    conformers: list[UUID] = []
     scores: list[Score] = []
 
     def __str__(self) -> str:
@@ -80,7 +110,7 @@ class DockingWorkflow(MoleculeWorkflow):
     def check_protein(self) -> Self:
         """Check if protein is provided."""
         if not self.target and not self.target_uuid:
-            raise ValueError("Must provide either molecules or smiles")
+            raise ValueError("Must provide either target or target_uuid")
         return self
 
     @field_validator("pocket", mode="after")

{stjames-0.0.92 → stjames-0.0.93/stjames.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stjames
-Version: 0.0.92
+Version: 0.0.93
 Summary: standardized JSON atom/molecule encoding scheme
 Author-email: Corin Wagen <corin@rowansci.com>
 Project-URL: Homepage, https://github.com/rowansci/stjames