update base

BradyAJohnston · Feb 25, 2025 · 9ca4ee1 · 9ca4ee1
1 parent 8faa159
commit 9ca4ee1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/molecularnodes/entities/molecule/base.py b/molecularnodes/entities/molecule/base.py
@@ -20,7 +20,7 @@
 from databpy import Domains, AttributeTypes
 import databpy
 from ..base import MolecularEntity, EntityType
-
+from .ui import parse
 
 class Molecule(MolecularEntity, metaclass=ABCMeta):
     """
@@ -100,6 +100,20 @@ def from_array(cls, array: struc.AtomArray, name: str = "FromArray"):
         instance.create_object(name=name)
         return instance
 
+    @classmethod
+    def load(cls, mol: Union[str, Path, io.BytesIO, struc.AtomArray]):
+        match mol:
+            case str() :
+                return parse(mol)
+            case Path():
+                return parse(mol)
+            case io.BytesIO():
+                return parse(mol)
+            case struc.AtomArray():
+                return Molecule.from_array(mol)
+            case _:
+                raise ValueError("Invalid Parsing Type")
+
     @property
     def frames(self) -> bpy.types.Collection:
         """

diff --git a/tests/test_load_biotite.py b/tests/test_load_biotite.py
@@ -25,3 +25,6 @@ def test_loading():
     # use the class method
     mol = mn.entities.Molecule.from_array(arr)
     assert isinstance(mol,  mn.entities.Molecule)
+
+    mol = mn.entities.Molecule.load(arr)
+    assert isinstance(mol,  mn.entities.Molecule)