Fix an issue where "spot providers enabled by default" was still being fetched through WEB_UI_OPTIONS on a path that required spot providers to have a "name" field in *config* rather than at runtime. Closes #124

core/config.py

@@ -24,12 +24,3 @@ WEB_UI_OPTIONS = config["web-ui-options"]
 API_ONLY_MODE = config.get("api-only-mode", False)
 LOG_LEVEL = config.get("log-level", "INFO")
 LOG_WEB_REQUESTS = config.get("log-web-requests", False)
-
-# For ease of config, each spot provider owns its own config about whether it should be enabled by default in the web UI
-# but for consistency we provide this to the front-end in web-ui-options because it has no impact outside of the web UI.
-WEB_UI_OPTIONS["spot-providers-enabled-by-default"] = [p["name"] for p in config["spot-providers"] if p["enabled"] and (
-        "enabled-by-default-in-web-ui" not in p or p["enabled-by-default-in-web-ui"])]
-# If spotting to this server is enabled, "API" is another valid spot source even though it does not come from
-# one of our proviers. We set that to also be enabled by default.
-if ALLOW_SPOTTING:
-    WEB_UI_OPTIONS["spot-providers-enabled-by-default"].append("API")

core/status_reporter.py

@@ -60,7 +60,8 @@ class StatusReporter:
         self._status_data["num_spots"] = len(self._spots)
         self._status_data["num_alerts"] = len(self._alerts)
         self._status_data["spot_providers"] = list(
-            map(lambda p: {"name": p.name, "enabled": p.enabled, "status": p.status,
+            map(lambda p: {"name": p.name, "enabled": p.enabled,
+                           "enabled_by_default_in_web_ui": p.enabled_by_default_in_web_ui, "status": p.status,
                            "last_updated": p.last_update_time.replace(
                                tzinfo=pytz.UTC).timestamp() if p.last_update_time.year > 2000 else 0,
                            "last_spot": p.last_spot_time.replace(