Merge branch 'main' into sorted_periods

Author: dweindl

doc/modules.rst

@@ -37,5 +37,4 @@ API Reference
    petab.v2.experiments
    petab.v2.lint
    petab.v2.models
-   petab.v2.problem
    petab.v2.petab1to2

petab/v1/math/printer.py

@@ -37,7 +37,13 @@ def _print_BooleanFalse(self, expr):
     def _print_Pow(self, expr: sp.Pow):
         """Custom printing for the power operator"""
         base, exp = expr.as_base_exp()
-        return f"{self._print(base)} ^ {self._print(exp)}"
+        str_base = self._print(base)
+        str_exp = self._print(exp)
+        if not base.is_Atom:
+            str_base = f"({str_base})"
+        if not exp.is_Atom:
+            str_exp = f"({str_exp})"
+        return f"{str_base} ^ {str_exp}"
 
     def _print_Infinity(self, expr):
         """Custom printing for infinity"""

petab/v2/C.py

@@ -38,6 +38,9 @@
 #: Replicate ID column in the measurement table
 REPLICATE_ID = "replicateId"
 
+#: The model ID column in the measurement table
+MODEL_ID = "modelId"
+
 #: Mandatory columns of measurement table
 MEASUREMENT_DF_REQUIRED_COLS = [
     OBSERVABLE_ID,
@@ -52,6 +55,7 @@
     NOISE_PARAMETERS,
     DATASET_ID,
     REPLICATE_ID,
+    MODEL_ID,
 ]
 
 #: Measurement table columns

petab/v2/converters.py

@@ -71,6 +71,11 @@ def __init__(self, problem: Problem, default_priority: float = None):
             To ensure that the PEtab condition-start-events are executed before
             any other events, all events should have a priority set.
         """
+        if len(problem.models) > 1:
+            #  https://github.com/PEtab-dev/libpetab-python/issues/392
+            raise NotImplementedError(
+                "Only single-model PEtab problems are supported."
+            )
         if not isinstance(problem.model, SbmlModel):
             raise ValueError("Only SBML models are supported.")
 
@@ -401,7 +406,7 @@ def _add_indicators_to_conditions(self) -> None:
         #  removed. Only keep the conditions setting our indicators.
         problem.condition_tables = [
             ConditionTable(
-                conditions=[
+                [
                     condition
                     for condition in problem.conditions
                     if condition.id.startswith("_petab")