🐛 Fix some bugs found via 1.8.6-dev smoke tests

[shnizzedy]

Fixes

• Fixes

  TypeError: string indices must be integers

  in https://github.com/FCP-INDI/C-PAC/actions/runs/6669328783/job/18127204189

• Fixes

  TypeError: cannot unpack non-iterable NoneType object

  in https://github.com/FCP-INDI/C-PAC/actions/runs/6669328783/job/18127204189

• Fixes

  Where it seems to try to look up the error message itself in a list?

  by @nx10 on Slack

Technical details

string indices must be integers

Dashes Underscores and spaces in the regressor names were causing problems in the regressors downstream from forked filters, so I updated the regressor naming to only include alphanumeric characters and no-more-than-one-in-a-row underscores, which renamed some regressors in some preconfigs to names including underscores, which doesn't play well with

C-PAC/CPAC/nuisance/nuisance.py

Line 2521 in 7ff4a93

regressor_strat_name = regressor_prov[-1].split('_')[-1]

C-PAC/CPAC/nuisance/nuisance.py

Lines 2529 to 2532 in 7ff4a93

	for regressor_dct in cfg['nuisance_corrections']['2-nuisance_regression'][
	'Regressors']:
	if regressor_dct['Name'] == regressor_strat_name:
	opt = regressor_dct

, so I abstracted this lookup into a strat_pool (ResourcePool) method that tries names with zero underscores up through as many as are in the prov in

C-PAC/CPAC/pipeline/engine.py

Lines 276 to 282 in a873f68

	strat_name_components = prov[-1].split('_')
	for _ in list(range(prov[-1].count('_'))):
	reg_name = '_'.join(strat_name_components[-_:])
	if reg_name in self.regressors:
	self._regressor_dct = self.regressors[reg_name]
	return self._regressor_dct
	raise key_error

C-PAC/CPAC/nuisance/nuisance.py

Line 2517 in a873f68

opt = strat_pool.regressor_dct(cfg)

cannot unpack non-iterable NoneType object

I overtrimmed in 6ca33b9, repaired the damage with

C-PAC/CPAC/pipeline/engine.py

Lines 360 to 364 in a873f68

	if optional:
	if report_fetched:
	return (None, None)
	return None
	raise LookupError(info_msg)

These tests will still be failing after these changes, but they should be more-helpful missing-resource exceptions

Where it seems to try to look up the error message itself in a list?

This one was some exception handling that needed updated. The lookup was from trying to parse the key out of the error to see if we should

C-PAC/CPAC/pipeline/cpac_pipeline.py

Lines 1498 to 1503 in a873f68

	raise FileNotFoundError(
	'The provided pipeline configuration requires functional '
	'data but no functional data were found for ' +
	'/'.join([sub_dict[key] for key in ['site', 'subject_id',
	'unique_id'] if key in sub_dict]) + '. Please check '
	'your data and pipeline configurations.') from lookup_error

instead of a less-informative-to-an-end-user error. This PR beefs up the key searching and should gracefully just fall back to the original exception if it fails to find the key in the exception message.

Tests

Manually launched smoke tests

Checklist

• My pull request has a descriptive title (not a vague title like Update index.md).
• My pull request targets the develop branch of the repository.
• My commit messages follow best practices.
• My code follows the established code style of the repository.
• I added tests for the changes I made (if applicable).
• I updated the changelog.
• I added or updated documentation (if applicable).
• I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.