Fix solver query in queue manager

Must get solver from inputs table, not subscenario table.
blue-marble · Oct 29, 2020 · 698f448 · 698f448
1 parent f8bfaeb
commit 698f448
Showing 1 changed file with 34 additions and 11 deletions.
diff --git a/ui/server/run_queue_manager.py b/ui/server/run_queue_manager.py
@@ -50,23 +50,46 @@ def manage_queue(db_path):
                         GROUP BY scenario_id
                     """).fetchone()
 
-                    # # Get the requested solver
-                    solver_query = c.execute("""
-                        SELECT name
-                        FROM subscenarios_options_solver
-                        WHERE solver_options_id = (
-                            SELECT solver_options_id
+                    # Get the requested solver
+                    solver_options_id = c.execute("""
+                        SELECT solver_options_id
                             FROM scenarios
                             WHERE scenario_id = {}
-                            );
-                        """.format(next_scenario_to_run[0])
-                                       ).fetchone()
+                    """.format(next_scenario_to_run[0])
+                    ).fetchone()[0]
+
+                    solver_query = c.execute("""
+                        SELECT DISTINCT solver
+                        FROM inputs_options_solver
+                        WHERE solver_options_id = {};
+                        """.format(solver_options_id)
+                    ).fetchone()
                     if solver_query is None:
-                        # TODO: we shoud specify the default solver as a
+                        # TODO: we should specify the default solver as a
                         #  global variable somewhere
                         solver = 'cbc'
                     else:
-                        solver = solver_query[0]
+                        # Check that there's only one solver specified for the
+                        # solver_options_id
+                        one_solver_check = c.execute("""
+                              SELECT COUNT()
+                              FROM (
+                                  SELECT DISTINCT solver
+                                  FROM inputs_options_solver
+                                  WHERE solver_options_id = {}
+                                  )
+                              ;
+                              """.format(solver_options_id)
+                        ).fetchone()[0]
+                        if one_solver_check > 1:
+                            raise ValueError("""
+                              Only one solver can be specified per
+                              solver_options_id. Check the solver_options_id {}
+                              in the the inputs_options_solver table.
+                            """.format(solver_options_id)
+                        )
+                        else:
+                            solver = solver_query[0]
                     sio.emit(
                         "launch_scenario_process",
                         {"scenario": next_scenario_to_run[0], "solver": solver,