Merge pull request #1796 from clane9/bugfix/random_seed

🐛 fix type handling in `set_up_random_state`

Author: sgiavasis

CHANGELOG.md

@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated `rbc-options` preconfig to use `fmriprep-options` preprocessing
 
 ### Fixed
+- Fixed [bug](https://github.com/FCP-INDI/C-PAC/issues/1795) that was causing `cpac run` to fail when passing a manual random seed via `--random_seed`.
 - Replaces ``DwellTime`` with ``EffectiveEchoSpacing`` for FSL usage of the term
 
 ## [v1.8.4] - 2022-06-27

CPAC/pipeline/random_state/seed.py

@@ -166,16 +166,15 @@ def set_up_random_state(seed):
     if seed is not None:
         if seed == 'random':
             seed = random_random_seed()
-        if (seed != 'random' and not (
-            isinstance(seed, int) and
-            (0 < int(seed) <= np.iinfo(np.int32).max)
-        )):
-            raise ValueError('Valid random seeds are positive integers up to '
-                             f'2147483647, "random", or None, not {seed}')
-    try:
-        _seed['seed'] = int(seed)
-    except (TypeError, ValueError):
-        _seed['seed'] = seed
+        else:
+            try:
+                seed = int(seed)
+                assert 0 < seed <= np.iinfo(np.int32).max
+            except(ValueError, TypeError, AssertionError):
+                raise ValueError('Valid random seeds are positive integers up to '
+                                    f'2147483647, "random", or None, not {seed}')
+    
+    _seed['seed'] = seed
     return random_seed()