@@ -91,6 +91,15 @@ fn param_type_to_expr_type(pt: TaskParameterType) -> openjd_expr::ExprType {
9191 }
9292}
9393
94+ /// Lock the iterator mutex, recovering the guard if a previous holder
95+ /// panicked. A panic inside `next()` / `contains()` / `validate_containment()`
96+ /// would otherwise poison the mutex, and every subsequent `.lock().unwrap()`
97+ /// would raise an uncatchable `PanicException` on the Python side — wedging
98+ /// the iterator object permanently. Recovering keeps it usable.
99+ fn lock_recover < T > ( m : & Mutex < T > ) -> std:: sync:: MutexGuard < ' _ , T > {
100+ m. lock ( ) . unwrap_or_else ( |poisoned| poisoned. into_inner ( ) )
101+ }
102+
94103#[ cfg_attr( feature = "stub-gen" , gen_stub_pyclass( module = "openjd._openjd_rs" ) ) ]
95104#[ pyclass( module = "openjd.model._v1.job" , name = "StepParameterSpaceIterator" ) ]
96105pub ( crate ) struct PyStepParameterSpaceIterator {
@@ -154,7 +163,7 @@ impl PyStepParameterSpaceIterator {
154163 // Match the pure-Python reference: adaptive-chunked spaces
155164 // cannot answer `len()` because the count depends on the
156165 // dynamic chunk size that may change during execution.
157- let iter = self . iter . lock ( ) . unwrap ( ) ;
166+ let iter = lock_recover ( & self . iter ) ;
158167 if iter. chunks_adaptive ( ) {
159168 return Err ( pyo3:: exceptions:: PyValueError :: new_err (
160169 "Length is not available because the parameter space uses adaptive chunking." ,
@@ -195,7 +204,7 @@ impl PyStepParameterSpaceIterator {
195204 }
196205
197206 fn __next__ ( & self , py : Python < ' _ > ) -> PyResult < Option < Py < PyDict > > > {
198- let mut iter = self . iter . lock ( ) . unwrap ( ) ;
207+ let mut iter = lock_recover ( & self . iter ) ;
199208 match iter. next ( ) {
200209 Some ( params) => Ok ( Some ( task_param_set_to_py ( py, & params) ?) ) ,
201210 None => Ok ( None ) ,
@@ -204,7 +213,7 @@ impl PyStepParameterSpaceIterator {
204213
205214 fn __contains__ ( & self , item : & Bound < ' _ , PyDict > ) -> PyResult < bool > {
206215 let params = extract_task_parameter_set ( item) ?;
207- let iter = self . iter . lock ( ) . unwrap ( ) ;
216+ let iter = lock_recover ( & self . iter ) ;
208217 Ok ( iter. contains ( & params) )
209218 }
210219
@@ -217,13 +226,13 @@ impl PyStepParameterSpaceIterator {
217226 /// crate's ``StepParameterSpaceIterator::validate_containment``.
218227 fn validate_containment ( & self , params : & Bound < ' _ , PyDict > ) -> PyResult < ( ) > {
219228 let params = extract_task_parameter_set ( params) ?;
220- let iter = self . iter . lock ( ) . unwrap ( ) ;
229+ let iter = lock_recover ( & self . iter ) ;
221230 iter. validate_containment ( & params)
222231 . map_err ( pyo3:: exceptions:: PyValueError :: new_err)
223232 }
224233
225234 fn reset_iter ( & self ) {
226- let mut iter = self . iter . lock ( ) . unwrap ( ) ;
235+ let mut iter = lock_recover ( & self . iter ) ;
227236 iter. reset ( ) ;
228237 }
229238
@@ -234,19 +243,19 @@ impl PyStepParameterSpaceIterator {
234243
235244 #[ getter]
236245 fn chunks_adaptive ( & self ) -> bool {
237- let iter = self . iter . lock ( ) . unwrap ( ) ;
246+ let iter = lock_recover ( & self . iter ) ;
238247 iter. chunks_adaptive ( )
239248 }
240249
241250 #[ getter]
242251 fn chunks_parameter_name ( & self ) -> Option < String > {
243- let iter = self . iter . lock ( ) . unwrap ( ) ;
252+ let iter = lock_recover ( & self . iter ) ;
244253 iter. chunks_parameter_name ( ) . map ( |s| s. to_string ( ) )
245254 }
246255
247256 #[ getter]
248257 fn chunks_default_task_count ( & self ) -> Option < usize > {
249- let iter = self . iter . lock ( ) . unwrap ( ) ;
258+ let iter = lock_recover ( & self . iter ) ;
250259 iter. chunks_default_task_count ( )
251260 }
252261
@@ -257,7 +266,7 @@ impl PyStepParameterSpaceIterator {
257266 "chunks_default_task_count must be a positive integer." ,
258267 ) ) ;
259268 }
260- let mut iter = self . iter . lock ( ) . unwrap ( ) ;
269+ let mut iter = lock_recover ( & self . iter ) ;
261270 if !iter. chunks_adaptive ( ) {
262271 return Err ( pyo3:: exceptions:: PyValueError :: new_err (
263272 "The parameter space does not use adaptive chunking, so cannot modify chunks_default_task_count." ,
0 commit comments