mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-09 18:03:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

models: persist model selection per catalog across chestnut state changes (#1960)

Browse Source
This commit is contained in:
Jason Wen
2026-08-25 01:12:12 -04:00
committed by GitHub
parent cefe5737b9
commit d7382a8a49
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openpilot/common/params_keys.h
+2
View File
@@ -196,6 +196,8 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
// Model Manager params
{"ModelManager_ActiveBundle", {PERSISTENT, JSON}},
{"ModelManager_ActiveJson", {CLEAR_ON_MANAGER_START, STRING}},
{"ModelManager_PrevBundle", {PERSISTENT, JSON}},
{"ModelManager_PrevBundle_USBGPU", {PERSISTENT, JSON}},
{"ModelManager_ClearCache", {CLEAR_ON_MANAGER_START, BOOL}},
{"ModelManager_DownloadIndex", {CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION, INT}},
{"ModelManager_Favs", {PERSISTENT | BACKUP, STRING}},
openpilot/sunnypilot/models/helpers.py
+18 -1
View File
@@ -106,14 +106,31 @@ def _bundle_needs_reset(active_bundle: custom.ModelManagerSP.ModelBundle, availa
return False
def validate_active_bundle(params: Params, available_bundles: list[custom.ModelManagerSP.ModelBundle] | None = None) -> None:
def _prev_bundle_key(is_usbgpu: bool) -> str:
return "ModelManager_PrevBundle_USBGPU" if is_usbgpu else "ModelManager_PrevBundle"
def validate_active_bundle(params: Params, available_bundles: list[custom.ModelManagerSP.ModelBundle] | None = None,
is_usbgpu: bool = False) -> None:
raw_bundle = params.get("ModelManager_ActiveBundle")
if not raw_bundle:
prev = params.get(_prev_bundle_key(is_usbgpu))
if prev and (prev_bundle := get_active_bundle(params, raw_bundle_dict=prev)) is not None:
if not _bundle_needs_reset(prev_bundle, available_bundles):
params.put("ModelManager_ActiveBundle", prev, block=True)
return
active_bundle = get_active_bundle(params, raw_bundle_dict=raw_bundle)
if active_bundle is None or _bundle_needs_reset(active_bundle, available_bundles):
cloudlog.warning("Active model bundle invalid; resetting to default")
params.put(_prev_bundle_key(not is_usbgpu), raw_bundle, block=True)
prev = params.get(_prev_bundle_key(is_usbgpu))
if prev and (prev_bundle := get_active_bundle(params, raw_bundle_dict=prev)) is not None:
if not _bundle_needs_reset(prev_bundle, available_bundles):
params.put("ModelManager_ActiveBundle", prev, block=True)
return
params.remove("ModelManager_ActiveBundle")
params.put("ModelRunnerTypeCache", int(custom.ModelManagerSP.Runner.stock), block=True)
openpilot/sunnypilot/models/manager.py
+3 -2
View File
@@ -267,9 +267,10 @@ class ModelManagerSP:
while True:
try:
self.sm.update(0)
self.available_models = self.model_fetcher.get_available_bundles(self.sm['deviceState'].chestnutPresent)
chestnut_present = self.sm['deviceState'].chestnutPresent
self.available_models = self.model_fetcher.get_available_bundles(chestnut_present)
if boot_ticks >= self.BOOT_SETTLE_TICKS:
validate_active_bundle(self.params, self.available_models)
validate_active_bundle(self.params, self.available_models, is_usbgpu=chestnut_present)
boot_ticks = min(boot_ticks + 1, self.BOOT_SETTLE_TICKS)
self.active_bundle = get_active_bundle(self.params)