Merge pull request #604 from opencobra/fix-unique

Fix unique metabolites finding

HISTORY.rst

@@ -3,6 +3,7 @@ History
 
 Next Release
 ------------
+* Enhance the function for finding unique metabolites and make it more robust.
 * Improve logging output when there is a problem with serializing a result to
   JSON.
 * Fix some test cases that got broken by cobrapy's new boundary identification.

memote/support/basic.py

@@ -250,7 +250,17 @@ def find_oxygen_reactions(model):
 
 def find_unique_metabolites(model):
     """Return set of metabolite IDs without duplicates from compartments."""
-    return set(met.id.split("_", 1)[0] for met in model.metabolites)
+    unique = set()
+    for met in model.metabolites:
+        is_missing = True
+        for comp in model.compartments:
+            if met.id.endswith("_{}".format(comp)):
+                unique.add(met.id[:-(len(comp) + 1)])
+                is_missing = False
+                break
+        if is_missing:
+            unique.add(met.id)
+    return unique
 
 
 @lrudecorator(size=2)