From a3fd66c472258d4de010974c70ba4eb06e59e597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Fr=C3=B6hlich?= <fabian.frohlich@crick.ac.uk>
Date: Sat, 1 Nov 2025 21:31:27 +0000
Subject: [PATCH 1/2] Remove unused strip_pysb function and simplify ID
 handling in DEModel

---
 python/sdist/amici/de_model.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/python/sdist/amici/de_model.py b/python/sdist/amici/de_model.py
index 7d8508a658..ccd575fe1e 100644
--- a/python/sdist/amici/de_model.py
+++ b/python/sdist/amici/de_model.py
@@ -51,7 +51,6 @@
     _default_simplify,
     amici_time_symbol,
     smart_subs_dict,
-    strip_pysb,
     toposort_symbols,
     unique_preserve_order,
 )
@@ -1136,7 +1135,7 @@ def _generate_symbol(self, name: str) -> None:
                 components = sorted(
                     components,
                     key=lambda x: int(
-                        str(strip_pysb(x.get_id())).replace(
+                        x.get_id().replace(
                             "observableParameter", ""
                         )
                     ),
@@ -1145,7 +1144,7 @@ def _generate_symbol(self, name: str) -> None:
                 components = sorted(
                     components,
                     key=lambda x: int(
-                        str(strip_pysb(x.get_id())).replace(
+                        x.get_id().replace(
                             "noiseParameter", ""
                         )
                     ),
@@ -1212,10 +1211,10 @@ def _generate_symbol(self, name: str) -> None:
             # sensitivities drop out, otherwise generate symbols
             self._syms[name] = sp.Matrix(
                 [
-                    [
+                        [
                         sp.Symbol(
-                            f"s{strip_pysb(tcl.get_id())}__"
-                            f"{strip_pysb(par.get_id())}",
+                            f"s{tcl.get_id()}__"
+                            f"{par.get_id()}",
                             real=True,
                         )
                         for par in self._parameters

From 168ccd5f5bbc407f3ddcfa6a7e5a191f28689b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Fr=C3=B6hlich?= <fabian.frohlich@crick.ac.uk>
Date: Sun, 2 Nov 2025 10:18:10 +0000
Subject: [PATCH 2/2] Update python/sdist/amici/de_model.py

---
 python/sdist/amici/de_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/sdist/amici/de_model.py b/python/sdist/amici/de_model.py
index 0fbe47b6cc..b69fb5a28d 100644
--- a/python/sdist/amici/de_model.py
+++ b/python/sdist/amici/de_model.py
@@ -1211,7 +1211,7 @@ def _generate_symbol(self, name: str) -> None:
             # sensitivities drop out, otherwise generate symbols
             self._syms[name] = sp.Matrix(
                 [
-                        [
+                    [
                         sp.Symbol(
                             f"s{tcl.get_id()}__"
                             f"{par.get_id()}",