Two Yukawa is causing issues in the windows installer

[butlerpd]

Describe the bug
While the Two Yukawa structure factor has been merged into the master branch of sasmodels, it still does not show up in the structure factor drop down at least in the windows installer. Moreover, when saving a plugin model it causes an error to be thrown (copied from the log explorer window below)

10:45:56 - ERROR: Traceback (most recent call last): File "c:\SasView-6.1.2Nightly29OCT25\sasmodels\generate.py", line 1178, in load_kernel_module __import__('sasmodels.models.'+model_name) File "c:\SasView-6.1.2Nightly29OCT25\sasmodels\models\two_yukawa.py", line 97, in from sasmodels.TwoYukawa.CalTYSk import K_MIN, Z_MIN, Z_MIN_DIFF, CalTYSk ModuleNotFoundError: No module named 'sasmodels.TwoYukawa' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "c:\SasView-6.1.2Nightly29OCT25\sasmodels\sasview_model.py", line 112, in load_standard_models MODELS[name] = _make_standard_model(name) ^^^^^^^^^^^^^^^^^^^^^^^^^^ File "c:\SasView-6.1.2Nightly29OCT25\sasmodels\sasview_model.py", line 198, in _make_standard_model kernel_module = generate.load_kernel_module(name) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "c:\SasView-6.1.2Nightly29OCT25\sasmodels\generate.py", line 1186, in load_kernel_module kernel_module = load_custom_kernel_module(model_name) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "c:\SasView-6.1.2Nightly29OCT25\sasmodels\custom\__init__.py", line 60, in load_custom_kernel_module if need_reload(path): ^^^^^^^^^^^^^^^^^ File "c:\SasView-6.1.2Nightly29OCT25\sasmodels\custom\__init__.py", line 115, in need_reload return any(cache_time return any(cache_time 
10:45:56 - INFO: C:\Users\Paul\AppData\Local\sasview\SasView\plugin_models\newsin.py successfully saved.

To Reproduce
Steps to reproduce the behavior:

1. Go to FitPage1
2. Load a model that can use a structure factor
3. Click Structure Factor drop down
4. There is no Two Yukawa
5. Go to Fitting --> Edit Custom Model
6. Load a plugin model
7. Click on save to force the model to be saved. Apparently there is no checking to see if any changes were actually made and will try to save anyway
8. Log Explorer window pops up with above error
9. See error

Expected behavior
for main the 2 Yukawa should show up in the structure factor drop down and should not cause and error to be thrown. I would argue that for 6.1.x bug fix releases the Two Yukawa should not be included at all.

SasView version (please complete the following information):

• Version: downloaded windows installer from github nightly release build of Oct 29, 2025 at: https://github.com/SasView/sasview/releases/tag/nightly-build

Operating system (please complete the following information):

• OS: Windows 10

Installation method (please complete the following information):

• Installed: see above

[smk78]

As an aside, the 2 Yukawa has apparently not yet been added to the Marketplace which means that workaround is also unavailable...

[butlerpd]

Unfortunately it goes a bit deeper than that I think. Looking at the code, it seems that the way @pkienzle dealt with the many pages of equations used in the 2 Yukawa was to keep the base python file relatively clean (but not short) and put most of that arduous pages of working and other esoteric requirement into several separate files (6 in fact) all stored in a TwoYukawa directory which is stored off of the higher level sasmodels directory. So under sasmodels is both the TwoYukawa directory and the models directory, the last being where the base two_yukawa.py is stored along with all other models.

I actually wonder if this may be where the issue is coming from that is reported here. But basically it is a rather unique problem which @pkienzle dealt with in what looks like are relatively clean and elegant solution but it is something that I don't think plugins can deal with at the moment. The marketplace was designed around the concept of python or python + c as are all our plugin editors and other magic (looking for c files with the same name as the python). In principle the marketplace and models could handle more than 2 files but I don't know how it deals with this other directory that the model is expecting to be located in the core sasview?

I think this may be something that should be discussed as part of a general sasmodels issue discussion which is already likely to happen at the contributor camp, but likely will need to go beyond?

[llimeht]

the two_yukawa structure factor works in a git checkout, so this is likely that the files are missing from the installer. Nothing will import these new files and so the pyinstaller discovery routines fail (the 'plugin' model of sasmodels means that nothing actually imports much of its code); that makes these files a hiddenimport that needs to be listed at sasmodels/__pyinstaller/hook-sasmodels.py.

[butlerpd]

This issue was fixed in PR sasmodels#682 so closing this ticket