Patch for Xopt 2.5.4

pyproject.toml

@@ -30,8 +30,7 @@ dependencies = [
     "qdarkstyle>=3.0",
     "pillow",
     "requests",
-    "xopt>=2.2.2",
-    "botorch==0.12.0"
+    "xopt>=2.5.4",
 ]
 dynamic = ["version"]
 [tool.setuptools_scm]

src/badger/environment.py

@@ -188,13 +188,20 @@ def _get_bounds(
         variable_names_new = [
             name for name in variable_names if not len(self.variables.get(name, []))
         ]
-        if len(variable_names_new):
-            self.variables.update(self.get_bounds(variable_names_new))
 
-        # Set a default value for the bounds if not defined
-        default_value = [-1, 1]
+        # Get bound one by one due to potential failure
+        for name in variable_names_new:
+            try:
+                bound = self.get_bound(name)
+            except Exception:
+                raise BadgerEnvVarError(f"Failed to get bound for {name}")
 
-        return {k: self.variables.get(k, default_value) for k in variable_names}
+            if bound[1] <= bound[0]:
+                raise BadgerEnvVarError(f"Invalid bound for {name}: {bound}")
+
+            self.variables.update({name: bound})
+
+        return {k: self.variables[k] for k in variable_names}
 
 
 def instantiate_env(env_class, configs, manager=None):

src/badger/gui/acr/components/routine_page.py

@@ -312,13 +312,7 @@ def refresh_ui(self, routine: Routine = None, silent: bool = False):
             all_variables.update(i)
         if routine.additional_variables:  # there are additional variables
             env = self.create_env()
-            # Have to check each variable since some could fail
-            for v in routine.additional_variables:
-                try:
-                    b = env.get_bound(v)
-                except Exception:
-                    b = [-1000, 1000]  # default wide range
-                all_variables.update({v: b})
+            all_variables.update(env._get_bounds(routine.additional_variables))
         # Format for update_variables method
         all_variables = dict(sorted(all_variables.items()))
         all_variables = [{key: value} for key, value in all_variables.items()]
@@ -939,7 +933,6 @@ def _compose_vocs(self) -> (VOCS, list[str]):
 
     def _compose_routine(self) -> Routine:
         # Compose the routine
-
         # Metadata
         name = self.edit_save.text() or self.edit_save.placeholderText()
         description = self.edit_descr.toPlainText()
@@ -967,6 +960,7 @@ def _compose_routine(self) -> Routine:
             if "turbo_controller" not in generator_params:
                 generator_params["turbo_controller"] = "optimize"
 
+            # TODO: remove this patch when Xopt reset API works
             # Nullify a few properties in turbo that can cause issues
             turbo_config = generator_params["turbo_controller"]
             if type(turbo_config) is dict:
@@ -985,21 +979,6 @@ def _compose_routine(self) -> Routine:
             raise BadgerRoutineError("no variables selected")
         if not vocs.objectives:
             raise BadgerRoutineError("no objectives selected")
-        # Sanity check on BO + VOCS cross-compatibility
-        flag_safety_bo = False
-        if generator_name in all_generator_names["bo"]:
-            turbo_config = generator_params["turbo_controller"]
-            if type(turbo_config) is dict:
-                if turbo_config["name"] == "safety":
-                    flag_safety_bo = True
-            elif turbo_config == "safety":
-                flag_safety_bo = True
-
-        if flag_safety_bo and not vocs.constraints:
-            raise BadgerRoutineError(
-                "TuRBO in safety mode requires constraints, "
-                "please add at least one constraint in the VOCS config panel"
-            )
 
         # Initial points
         init_points_df = pd.DataFrame.from_dict(

src/badger/gui/default/components/var_table.py

@@ -311,11 +311,6 @@ def add_additional_variable(self, item):
                 # TODO: handle this case? Right now I don't think it should happen
                 raise "Environment cannot be found for new variable bounds!"
 
-            # Sanitize vrange
-            # TODO: raise a heads-up regarding the invalid bounds
-            if vrange[1] <= vrange[0]:
-                vrange = [-1000, 1000]  # fallback to some default values
-
             # Add checkbox only when a PV is entered
             self.setCellWidget(idx, 0, QCheckBox())
 
@@ -350,8 +345,8 @@ def get_bounds(self, name):
         self.env = instantiate_env(self.env_class, self.configs)
 
         value = self.env.get_variable(name)
-        bounds = self.env.get_bound(name)
-        return value, bounds
+        bound = self.env._get_bounds([name])[name]
+        return value, bound
 
     def add_variable(self, name, lb, ub):
         var = {name: [lb, ub]}