Add model type constants; add type code to class; add list of known t…

…ypes

petab/models/__init__.py

@@ -1 +1,5 @@
+MODEL_TYPE_SBML = 'sbml'
+
+known_model_types = {MODEL_TYPE_SBML}
+
 from .model import Model  # noqa F401

petab/models/model.py

@@ -3,6 +3,7 @@
 
 import abc
 from typing import Any, Iterable, Tuple
+from . import MODEL_TYPE_SBML, known_model_types
 
 
 class Model:
@@ -24,6 +25,12 @@ def from_file(filepath_or_buffer: Any) -> Model:
         """
         ...
 
+    @classmethod
+    @property
+    @abc.abstractmethod
+    def type_id(cls):
+        ...
+
     @abc.abstractmethod
     def get_parameter_ids(self) -> Iterable[str]:
         """Get all parameter IDs from this model
@@ -114,9 +121,12 @@ def model_factory(filepath_or_buffer: Any, model_language: str) -> Model:
     :param model_language: PEtab model language ID for the given model
     :returns: A :py:class:`Model` instance representing the given model
     """
-
-    if model_language == "sbml":
+    if model_language == MODEL_TYPE_SBML:
         from .sbml_model import SbmlModel
         return SbmlModel.from_file(filepath_or_buffer)
 
-    raise ValueError(f"Unsupported model format: {model_language}")
+    if model_language in known_model_types:
+        raise NotImplementedError(
+            f"Unsupported model format: {model_language}")
+
+    raise ValueError(f"Unknown model format: {model_language}")

petab/models/sbml_model.py

@@ -5,13 +5,17 @@
 
 import libsbml
 
+from . import MODEL_TYPE_SBML
 from .model import Model
 from ..sbml import (get_sbml_model, is_sbml_consistent, load_sbml_from_string,
                     log_sbml_errors)
 
 
 class SbmlModel(Model):
     """PEtab wrapper for SBML models"""
+
+    type_id = MODEL_TYPE_SBML
+
     def __init__(
             self,
             sbml_model: libsbml.Model = None,

petab/problem.py

@@ -13,6 +13,7 @@
 from . import (conditions, core, format_version, measurements, observables,
                parameter_mapping, parameters, sampling, sbml, yaml)
 from .C import *  # noqa: F403
+from .models import MODEL_TYPE_SBML
 from .models.model import Model, model_factory
 from .models.sbml_model import SbmlModel
 
@@ -127,7 +128,8 @@ def from_files(
              "future version. Use `petab.Problem.from_yaml instead.",
              DeprecationWarning, stacklevel=2)
 
-        model = model_factory(sbml_file, 'sbml') if sbml_file else None
+        model = model_factory(sbml_file, MODEL_TYPE_SBML) \
+            if sbml_file else None
 
         condition_df = conditions.get_condition_df(condition_file) \
             if condition_file else None
@@ -219,7 +221,8 @@ def from_yaml(yaml_config: Union[Dict, Path, str]) -> 'Problem':
                 get_path(yaml_config[PARAMETER_FILE])) \
                 if yaml_config[PARAMETER_FILE] else None
 
-        model = model_factory(get_path(problem0[SBML_FILES][0]), 'sbml') \
+        model = model_factory(get_path(problem0[SBML_FILES][0]),
+                              MODEL_TYPE_SBML) \
             if problem0[SBML_FILES] else None
 
         if problem0[MEASUREMENT_FILES]: