fix python to match interface

src/pybmds/bmdscore.pyi

@@ -373,7 +373,7 @@ class python_multitumor_result:
     nmodels: list[int]
     selectedModelIndex: list[int]
     slopeFactor: float
-    validResult: list[bool]
+    validResult: bool
     def __init__(self) -> None: ...
     def setSlopeFactor(self, arg0: float) -> None: ...
 

src/pybmds/models/multi_tumor.py

@@ -231,7 +231,7 @@ def execute(self):
         self.structs.execute()
         for i, models in enumerate(self.structs.result.models):
             for j, model in enumerate(models):
-                if model.bmdsRes.BMD > 0:
+                if model.bmdsRes.validResult:
                     bmr = self.structs.analysis.models[i][j].BMR
                     model.bmdsRes.setSlopeFactor(bmr)
         self.results = MultitumorResult.from_model(self)

src/pybmds/types/multi_tumor.py

@@ -45,7 +45,7 @@ class MultitumorResult(BaseModel):
     models: list[list[BmdModelDichotomousSchema]]  # all degrees for all datasets
     selected_model_indexes: list[int | None]
     slope_factor: float
-    valid_result: list[bool]
+    valid_result: bool
 
     @classmethod
     def from_model(cls, model) -> Self:

tests/test_pybmds/models/test_multi_tumor.py

@@ -1,5 +1,4 @@
 import numpy as np
-import pytest
 
 import pybmds
 
@@ -57,6 +56,7 @@ def test_one_no_recommend(self, rewrite_data_files, data_path):
         session.execute()
         assert session.results.selected_model_indexes == [0, None]
         assert np.isclose(session.results.bmd, 37.69, atol=0.01)
+        assert session.results.valid_result is True
 
         # check we can build reports w/ none
         text = session.text()
@@ -68,10 +68,8 @@ def test_one_no_recommend(self, rewrite_data_files, data_path):
             df.to_excel(data_path / "reports/multitumor-no-selection.xlsx", index=False)
             docx.save(data_path / "reports/multitumor-no-selection.docx")
 
-    @pytest.mark.skip(reason="currently segfaults; we need to fix at lower level")
     def test_all_no_recommend(self):
         # Check case all datasets have no model recommendation
-        # TODO - REMOVE pytest.mark.skip; assert that recommended_model is None for some cases
         datasets = [
             pybmds.DichotomousDataset(
                 doses=[0, 50, 100, 200, 400],
@@ -83,3 +81,4 @@ def test_all_no_recommend(self):
         session.execute()
 
         assert session.results.selected_model_indexes == [None]
+        assert session.results.valid_result is False