From 33c164629f2270ce3ee40c260231f9deb4ea13cc Mon Sep 17 00:00:00 2001
From: Trey Moen <50057480+greatgitsby@users.noreply.github.com>
Date: Wed, 14 May 2025 15:44:57 -0700
Subject: [PATCH] fix(clip): ignore unknown Params keys (#35226)

* fix: ignore params configured by forks

* comment

* dont bother logging count or in normal flow

* better log
---
 tools/clip/run.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/clip/run.py b/tools/clip/run.py
index fce1b02e98..fb9ffbbaee 100755
--- a/tools/clip/run.py
+++ b/tools/clip/run.py
@@ -16,7 +16,7 @@ from typing import Literal
 
 from cereal.messaging import SubMaster
 from openpilot.common.basedir import BASEDIR
-from openpilot.common.params import Params
+from openpilot.common.params import Params, UnknownKeyName
 from openpilot.common.prefix import OpenpilotPrefix
 from openpilot.tools.lib.route import Route
 from openpilot.tools.lib.logreader import LogReader, ReadMode, comma_api_source
@@ -126,8 +126,12 @@ def populate_car_params(route: Route):
   entries = init_data.params.entries
   for cp in entries:
     key, value = cp.key, cp.value
-    params.put(key, value)
-  logger.info(f'persisted {len(entries)} CarParam(s)')
+    try:
+      params.put(key, value)
+    except UnknownKeyName:
+      # forks of openpilot may have other Params keys configured. ignore these
+      logger.warning(f"unknown Params key '{key}', skipping")
+  logger.debug('persisted CarParams')
 
 
 def start_proc(args: list[str], env: dict[str, str]):