Support CARVEME and GAPSEQ external IDs

release-notes/next-release.md

@@ -9,7 +9,10 @@
 * Fixed a bug with SBML group parsing that affects the Debian package.
 
 ## Other
+
 * Adding a duplicate boundary reaction (with `add_boundary`) no longer errors, but instead just returns the existing reaction.
+* Automatic detection of the external comprtment now recognizes CARVEME and GAPSEQ ids and will no longer
+  show a warning for models generated with those tools.
 
 ## Deprecated features
 

src/cobra/medium/annotations.py

@@ -55,6 +55,8 @@
         "intracellular",
         "intracellular region",
         "intracellular space",
+        "c0",  # GAPSEQ
+        "C_c"  # CARVEME
     ],
     "er": ["endoplasmic reticulum"],
     "erm": ["endoplasmic reticulum membrane"],
@@ -68,6 +70,8 @@
         "extra-organism",
         "external",
         "external medium",
+        "e0",  # GAPSEQ
+        "C_e"  # CARVEME
     ],
     "f": ["flagellum", "bacterial-type flagellum"],
     "g": ["golgi", "golgi apparatus"],
@@ -78,7 +82,12 @@
     "mm": ["mitochondrial membrane"],
     "m": ["mitochondrion", "mitochondria"],
     "n": ["nucleus"],
-    "p": ["periplasm", "periplasmic space"],
+    "p": [
+        "periplasm",
+        "periplasmic space",
+        "p0",  # GAPSEQ
+        "C_p"  # CARVEME
+    ],
     "x": ["peroxisome", "glyoxysome"],
     "u": ["thylakoid"],
     "vm": ["vacuolar membrane"],

src/cobra/medium/boundary_types.py

@@ -94,7 +94,7 @@ def find_external_compartment(model: "Model") -> str:
             "Consider renaming your compartments using "
             "`Model.compartments` to fix this."
         )
-        return most[0]
+        return most.iloc[0]
 
     # No info in the model, so give up
     raise RuntimeError(

tests/test_medium/test_boundary_types.py

@@ -8,6 +8,7 @@
     find_external_compartment,
     is_boundary_type,
 )
+import logging
 
 
 def test_find_external_compartment_single(model: Model) -> None:
@@ -40,6 +41,17 @@ def test_find_external_compartment_multi(model: Model) -> None:
         find_external_compartment(model)
 
 
+@pytest.mark.parametrize("compartment", ["C_e", "e0"])
+def test_find_external_popular_reconstructions(model: Model, compartment, caplog) -> None:
+    """Test some additional id formats."""
+    for ex in model.exchanges:
+        ex.reactants[0].compartment = compartment
+    with caplog.at_level(logging.WARNING):
+        external = find_external_compartment(model)
+    assert external == compartment
+    assert "complete nonsense" not in caplog.text
+
+
 def test_no_names_or_boundary_reactions(empty_model: Model) -> None:
     """Test absence of name or boundary reactions."""
     with pytest.raises(RuntimeError):