Ishaan/infer oxygen

esm/__init__.py

@@ -1 +1 @@
-__version__ = "3.2.3"
+__version__ = "3.2.4.a0"

esm/sdk/api.py

@@ -77,6 +77,7 @@ def from_protein_chain(
                 sasa=protein_chain.sasa().tolist(),
                 function_annotations=None,
                 coordinates=torch.tensor(protein_chain.atom37_positions),
+                plddt=torch.tensor(protein_chain.confidence),
             )
         else:
             return ESMProtein(
@@ -85,6 +86,7 @@ def from_protein_chain(
                 sasa=None,
                 function_annotations=None,
                 coordinates=torch.tensor(protein_chain.atom37_positions),
+                plddt=torch.tensor(protein_chain.confidence),
             )
 
     @classmethod
@@ -104,6 +106,7 @@ def from_protein_complex(
             coordinates=torch.tensor(
                 protein_complex.atom37_positions, dtype=torch.float32
             ),
+            plddt=torch.tensor(protein_complex.confidence),
         )
 
     def to_pdb(self, pdb_path: PathOrBuffer) -> None:
@@ -325,7 +328,9 @@ def use_generative_unmasking_strategy(self):
 @define
 class InverseFoldingConfig:
     invalid_ids: Sequence[int] = []
-    temperature: float = 1.0
+    temperature: float = 0.1
+    seed: int | None = None
+    decode_in_residue_index_order: bool = False
 
 
 ## Low Level Endpoint Types

esm/sdk/forge.py

@@ -119,6 +119,8 @@ def process_inverse_fold_request(
         inverse_folding_config = {
             "invalid_ids": config.invalid_ids,
             "temperature": config.temperature,
+            "seed": config.seed,
+            "decode_in_residue_index_order": config.decode_in_residue_index_order,
         }
         request = {
             "coordinates": maybe_list(coordinates, convert_nan_to_none=True),

esm/utils/structure/molecular_complex.py

@@ -707,8 +707,9 @@ def to_mmcif(self) -> str:
         atom_array.chain_id = np.array(atom_chain_ids, dtype="U4")
         atom_array.res_name = np.array(atom_res_names, dtype="U4")
         atom_array.hetero = atom_hetero
-        atom_array.b_factor = atom_bfactors
         atom_array.atom_name = np.array(atom_names, dtype="U4")
+        atom_array.add_annotation("b_factor", dtype=float)
+        atom_array.b_factor = atom_bfactors
 
         # Use existing elements or infer them from atom names
         if self.atom_elements is not None and len(self.atom_elements) == n_atoms:

esm/utils/structure/protein_chain.py

@@ -1121,7 +1121,9 @@ def normalize_coordinates(self) -> ProteinChain:
 
     def infer_oxygen(self) -> ProteinChain:
         """Oxygen position is fixed given N, CA, C atoms. Infer it if not provided."""
-        O_missing_indices = np.argwhere(np.isnan(self.atoms["O"]).any(axis=1)).squeeze()
+        O_missing_indices = np.argwhere(
+            ~np.isfinite(self.atoms["O"]).all(axis=1)
+        ).squeeze()
 
         O_vector = torch.tensor([0.6240, -1.0613, 0.0103], dtype=torch.float32)
         N, CA, C = torch.from_numpy(self.atoms[["N", "CA", "C"]]).float().unbind(dim=1)

esm/utils/structure/protein_complex.py

@@ -562,7 +562,9 @@ def join_arrays(arrays: Sequence[np.ndarray], sep: np.ndarray):
 
     def infer_oxygen(self) -> ProteinComplex:
         """Oxygen position is fixed given N, CA, C atoms. Infer it if not provided."""
-        O_missing_indices = np.argwhere(np.isnan(self.atoms["O"]).any(axis=1)).squeeze()
+        O_missing_indices = np.argwhere(
+            ~np.isfinite(self.atoms["O"]).all(axis=1)
+        ).squeeze()
 
         O_vector = torch.tensor([0.6240, -1.0613, 0.0103], dtype=torch.float32)
         N, CA, C = torch.from_numpy(self.atoms[["N", "CA", "C"]]).float().unbind(dim=1)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "esm"
-version = "3.2.3"
+version = "3.2.4.a0"
 description = "EvolutionaryScale open model repository"
 readme = "README.md"
 requires-python = ">=3.12,<3.13"
@@ -24,7 +24,7 @@ dependencies = [
   "torch>=2.2.0",
   "torchvision",
   "torchtext",
-  "transformers<4.48.2",
+  "transformers==4.52.4",
   "ipython",
   "einops",
   "biotite>=1.0.0",

tests/Makefile

@@ -3,7 +3,11 @@ DOCKER_TAG ?= dev
 DOCKER_IMAGE_OSS=oss_pytests:${DOCKER_TAG}
 
 build-oss-ci:
-	docker build -f oss_pytests/Dockerfile oss_pytests -t $(DOCKER_IMAGE_OSS)
+	docker build \
+		--output=type=docker \
+		-f oss_pytests/Dockerfile \
+		-t $(DOCKER_IMAGE_OSS) \
+		oss_pytests
 
 start-docker-oss:
 	docker run \