USEPA · shapiromatron · Aug 27, 2024 · Aug 21, 2024 · Aug 21, 2024 · Aug 21, 2024
diff --git a/bmds_ui/analysis/executor.py b/bmds_ui/analysis/executor.py
@@ -4,7 +4,6 @@
 
 import pybmds
 from pybmds.constants import DistType, ModelClass
-from pybmds.models.multi_tumor import Multitumor
 from pybmds.session import Session
 from pybmds.types.nested_dichotomous import IntralitterCorrelation, LitterSpecificCovariate
 
@@ -179,7 +178,7 @@ class MultiTumorSession(NamedTuple):
     """
 
     option_index: int
-    session: Multitumor | None
+    session: pybmds.Multitumor | None
 
     @classmethod
     def run(cls, inputs: dict, option_index: int) -> AnalysisSessionSchema:
@@ -202,7 +201,7 @@ def create(cls, inputs: dict, option_index: int) -> Self:
         model_settings = build_model_settings(
             dataset_type, PriorEnum.frequentist_restricted, options, {}
         )
-        session = Multitumor(datasets, degrees=degrees, settings=model_settings)
+        session = pybmds.Multitumor(datasets, degrees=degrees, settings=model_settings)
         return cls(option_index=option_index, session=session)
 
     def execute(self):
@@ -213,7 +212,7 @@ def deserialize(cls, data: dict) -> Self:
         obj = AnalysisSessionSchema.model_validate(data)
         return cls(
             option_index=obj.option_index,
-            session=Multitumor.from_serialized(obj.frequentist),
+            session=pybmds.Multitumor.from_serialized(obj.frequentist),
         )
 
     def to_schema(self) -> AnalysisSessionSchema:

diff --git a/bmds_ui/desktop/actions.py b/bmds_ui/desktop/actions.py
@@ -203,8 +203,8 @@ def create_shortcut(no_input: bool = False):
             shortcut.write_text(script)
 
     console = Console()
-    console.print("BMDS Desktop Manger Created:", style="magenta")
-    console.print("----------------------------", style="magenta")
+    console.print("BMDS Desktop Manager Created:", style="magenta")
+    console.print("-----------------------------", style="magenta")
     console.print(shortcut, style="cyan")
     console.print("\nOpening this file will start BMDS Desktop.")
     console.print("You can move this file or create a shortcut to it.\n")

diff --git a/bmds_ui/desktop/components/database_form.py b/bmds_ui/desktop/components/database_form.py
@@ -73,6 +73,18 @@ def additional_path_checks(path: Path):
             raise ValueError(f"Cannot edit database {path}. Is this a sqlite database?") from None
 
 
+def check_duplicates(dbs: list[Database], db: Database):
+    duplicate = next((el for el in dbs if el.id != db.id and el.path == db.path), None)
+    if duplicate:
+        raise ValueError(
+            f"An existing project ({duplicate.name}) already exists with this filename: {db.path}"
+        )
+
+    duplicate = next((el for el in dbs if el.id != db.id and el.name == db.name), None)
+    if duplicate:
+        raise ValueError(f"An existing project already exists with this name: {db.name}")
+
+
 class NullWidget(Widget):
     DEFAULT_CSS = """
     NullWidget {
@@ -190,12 +202,19 @@ def compose(self) -> ComposeResult:
         )
 
     def db_valid(self) -> Database:
-        db = Database(
+        kw = dict(
             name=self.query_one("#name").value,
             description=self.query_one("#description").value,
             path=Path(self.query_one("#path").value) / self.query_one("#filename").value,
         )
+        if self.db is None:
+            db = Database(**kw)
+        else:
+            db = self.db.model_copy()
+            for key, value in kw.items():
+                setattr(db, key, value)
         additional_path_checks(db.path)
+        check_duplicates(Config.get().databases, db)
         return db
 
     @on(Button.Pressed, "#db-create")

diff --git a/docs/development.md b/docs/development.md
@@ -3,10 +3,10 @@
 Make sure you have the following applications installed locally:
 
 - [Git](https://git-scm.com/)
-- [Python](https://www.python.org/) == 3.11
-- [Node.js](https://nodejs.org) == 18
+- [Python](https://www.python.org/) ≥ 3.12
+- [Node.js](https://nodejs.org) ≥ 20
 - [Yarn](https://yarnpkg.com/)
-- [PostgreSQL](https://www.postgresql.org/) >= 16
+- [PostgreSQL](https://www.postgresql.org/) ≥ 16
 
 If installing on Windows, these packages are available using [miniconda](https://docs.conda.io/en/latest/miniconda.html).
 

diff --git a/frontend/src/components/Data/SelectModelType.js b/frontend/src/components/Data/SelectModelType.js
@@ -20,9 +20,9 @@ class SelectModelType extends Component {
                     text="New"
                     onClick={dataStore.addDataset}
                 />
-                <LabelInput label="New dataset" htmlFor="idFilteredDatasets" />{" "}
+                <LabelInput label="New dataset" htmlFor="datasetType" />
                 <SelectInput
-                    id="idFilteredDatasets"
+                    id="datasetType"
                     onChange={value => dataStore.setModelType(value)}
                     value={dataStore.model_type}
                     choices={dataStore.getFilteredDatasetTypes.map(item => {

diff --git a/frontend/src/components/IndividualModel/Summary.js b/frontend/src/components/IndividualModel/Summary.js
@@ -51,7 +51,7 @@ class Summary extends Component {
             }
         }
 
-        return <TwoColumnTable id="info-table" data={data} label="Modeling Summary" />;
+        return <TwoColumnTable data={data} label="Modeling Summary" />;
     }
 }
 Summary.propTypes = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ class Summary extends Component { @@
                 }
             }
-            return <TwoColumnTable id="info-table" data={data} label="Modeling Summary" />;
+            return <TwoColumnTable data={data} label="Modeling Summary" />;
         }
     }
     Summary.propTypes = {
@@ Expand Down @@