Clean up: remove dead UUID code, fix method placement and spacing, deduplicate checkpoint key logic

milanofthe · milanofthe · commit 528b26ed6b35 · 2026-03-17T09:42:02.000+01:00
diff --git a/src/pathsim/blocks/_block.py b/src/pathsim/blocks/_block.py
@@ -11,7 +11,6 @@
 # IMPORTS ===============================================================================
 
 import inspect
-from uuid import uuid4
 from functools import lru_cache
 
 from ..utils.deprecation import deprecated
@@ -85,9 +84,6 @@ class definition for other blocks to be inherited.
 
     def __init__(self):
 
-        #unique identifier for checkpointing and diagnostics
-        self.id = uuid4().hex
-
         #registers to hold input and output values
         self.inputs = Register(
             mapping=self.input_port_labels and self.input_port_labels.copy()
diff --git a/src/pathsim/blocks/fir.py b/src/pathsim/blocks/fir.py
@@ -120,6 +120,7 @@ def to_checkpoint(self, prefix, recordings=False):
         npz_data[f"{prefix}/fir_buffer"] = np.array(list(self._buffer))
         return json_data, npz_data
 
+
     def load_checkpoint(self, prefix, json_data, npz):
         """Restore FIR state including input buffer."""
         super().load_checkpoint(prefix, json_data, npz)
@@ -131,4 +132,4 @@ def load_checkpoint(self, prefix, json_data, npz):
 
     def __len__(self):
         """This block has no direct passthrough"""
-        return 0
+        return 0
diff --git a/src/pathsim/blocks/kalman.py b/src/pathsim/blocks/kalman.py
@@ -150,6 +150,7 @@ def to_checkpoint(self, prefix, recordings=False):
         npz_data[f"{prefix}/kf_P"] = self.P
         return json_data, npz_data
 
+
     def load_checkpoint(self, prefix, json_data, npz):
         """Restore Kalman filter state estimate and covariance."""
         super().load_checkpoint(prefix, json_data, npz)
diff --git a/src/pathsim/blocks/noise.py b/src/pathsim/blocks/noise.py
@@ -44,17 +44,6 @@ class WhiteNoise(Block):
         random seed for reproducibility
     """
 
-    def to_checkpoint(self, prefix, recordings=False):
-        """Serialize WhiteNoise state including current sample."""
-        json_data, npz_data = super().to_checkpoint(prefix, recordings=recordings)
-        json_data["_current_sample"] = float(self._current_sample)
-        return json_data, npz_data
-
-    def load_checkpoint(self, prefix, json_data, npz):
-        """Restore WhiteNoise state including current sample."""
-        super().load_checkpoint(prefix, json_data, npz)
-        self._current_sample = json_data.get("_current_sample", 0.0)
-
     input_port_labels = {}
     output_port_labels = {"out": 0}
 
@@ -135,6 +124,19 @@ def update(self, t):
         pass
 
 
+    def to_checkpoint(self, prefix, recordings=False):
+        """Serialize WhiteNoise state including current sample."""
+        json_data, npz_data = super().to_checkpoint(prefix, recordings=recordings)
+        json_data["_current_sample"] = float(self._current_sample)
+        return json_data, npz_data
+
+
+    def load_checkpoint(self, prefix, json_data, npz):
+        """Restore WhiteNoise state including current sample."""
+        super().load_checkpoint(prefix, json_data, npz)
+        self._current_sample = json_data.get("_current_sample", 0.0)
+
+
 class PinkNoise(Block):
     """Pink noise (1/f noise) source using the Voss-McCartney algorithm.
 
@@ -167,22 +169,6 @@ class PinkNoise(Block):
         random seed for reproducibility
     """
 
-    def to_checkpoint(self, prefix, recordings=False):
-        """Serialize PinkNoise state including algorithm state."""
-        json_data, npz_data = super().to_checkpoint(prefix, recordings=recordings)
-        json_data["n_samples"] = self.n_samples
-        json_data["_current_sample"] = float(self._current_sample)
-        npz_data[f"{prefix}/octave_values"] = self.octave_values
-        return json_data, npz_data
-
-    def load_checkpoint(self, prefix, json_data, npz):
-        """Restore PinkNoise state including algorithm state."""
-        super().load_checkpoint(prefix, json_data, npz)
-        self.n_samples = json_data.get("n_samples", 0)
-        self._current_sample = json_data.get("_current_sample", 0.0)
-        if f"{prefix}/octave_values" in npz:
-            self.octave_values = npz[f"{prefix}/octave_values"]
-
     input_port_labels = {}
     output_port_labels = {"out": 0}
 
@@ -295,4 +281,22 @@ def sample(self, t, dt):
 
 
     def update(self, t):
-        pass
+        pass
+
+
+    def to_checkpoint(self, prefix, recordings=False):
+        """Serialize PinkNoise state including algorithm state."""
+        json_data, npz_data = super().to_checkpoint(prefix, recordings=recordings)
+        json_data["n_samples"] = self.n_samples
+        json_data["_current_sample"] = float(self._current_sample)
+        npz_data[f"{prefix}/octave_values"] = self.octave_values
+        return json_data, npz_data
+
+
+    def load_checkpoint(self, prefix, json_data, npz):
+        """Restore PinkNoise state including algorithm state."""
+        super().load_checkpoint(prefix, json_data, npz)
+        self.n_samples = json_data.get("n_samples", 0)
+        self._current_sample = json_data.get("_current_sample", 0.0)
+        if f"{prefix}/octave_values" in npz:
+            self.octave_values = npz[f"{prefix}/octave_values"]
diff --git a/src/pathsim/blocks/rng.py b/src/pathsim/blocks/rng.py
@@ -103,6 +103,7 @@ def to_checkpoint(self, prefix, recordings=False):
             json_data["_sample"] = float(self._sample)
         return json_data, npz_data
 
+
     def load_checkpoint(self, prefix, json_data, npz):
         """Restore RNG state including current sample."""
         super().load_checkpoint(prefix, json_data, npz)
diff --git a/src/pathsim/blocks/switch.py b/src/pathsim/blocks/switch.py
@@ -87,6 +87,7 @@ def to_checkpoint(self, prefix, recordings=False):
         json_data["switch_state"] = self.switch_state
         return json_data, npz_data
 
+
     def load_checkpoint(self, prefix, json_data, npz):
         super().load_checkpoint(prefix, json_data, npz)
         self.switch_state = json_data.get("switch_state", None)
diff --git a/src/pathsim/events/_event.py b/src/pathsim/events/_event.py
@@ -11,8 +11,6 @@
 
 import numpy as np
 
-from uuid import uuid4
-
 from .. _constants import EVT_TOLERANCE
 
 
@@ -66,9 +64,6 @@ def __init__(
         tolerance=EVT_TOLERANCE
         ):
             
-        #unique identifier for checkpointing and diagnostics
-        self.id = uuid4().hex
-
         #event detection function
         self.func_evt = func_evt
 
diff --git a/src/pathsim/subsystem.py b/src/pathsim/subsystem.py
@@ -462,6 +462,16 @@ def reset(self):
             block.reset()
 
 
+    @staticmethod
+    def _checkpoint_key(type_name, type_counts):
+        """Generate a deterministic checkpoint key from block/event type
+        and occurrence index (e.g. 'Integrator_0', 'Scope_1').
+        """
+        idx = type_counts.get(type_name, 0)
+        type_counts[type_name] = idx + 1
+        return f"{type_name}_{idx}"
+
+
     def to_checkpoint(self, prefix, recordings=False):
         """Serialize subsystem state by recursively checkpointing internal blocks.
 
@@ -494,10 +504,7 @@ def to_checkpoint(self, prefix, recordings=False):
         #checkpoint internal blocks by type + insertion order
         type_counts = {}
         for block in self.blocks:
-            type_name = block.__class__.__name__
-            idx = type_counts.get(type_name, 0)
-            type_counts[type_name] = idx + 1
-            key = f"{prefix}/{type_name}_{idx}"
+            key = f"{prefix}/{self._checkpoint_key(block.__class__.__name__, type_counts)}"
             b_json, b_npz = block.to_checkpoint(key, recordings=recordings)
             b_json["_key"] = key
             json_data["blocks"].append(b_json)
@@ -545,10 +552,7 @@ def load_checkpoint(self, prefix, json_data, npz):
         block_data = {b["_key"]: b for b in json_data.get("blocks", [])}
         type_counts = {}
         for block in self.blocks:
-            type_name = block.__class__.__name__
-            idx = type_counts.get(type_name, 0)
-            type_counts[type_name] = idx + 1
-            key = f"{prefix}/{type_name}_{idx}"
+            key = f"{prefix}/{self._checkpoint_key(block.__class__.__name__, type_counts)}"
             if key in block_data:
                 block.load_checkpoint(key, block_data[key], npz)
 
diff --git a/tests/pathsim/test_checkpoint.py b/tests/pathsim/test_checkpoint.py
@@ -277,10 +277,6 @@ def test_cross_instance_load(self):
                 dt=0.01
             )
 
-            #UUIDs differ
-            assert src1.id != src2.id
-            assert integ1.id != integ2.id
-
             sim2.load_checkpoint(path)
             assert sim2.time == saved_time
             assert np.allclose(integ2.state, saved_state)
