LogReader: remove commaCarSegments selector (#35750)

* a source should not be a readmode... and readmode should be logtype

* fix that

* fixup

tools/car_porting/examples/find_segments_with_message.ipynb

@@ -76,7 +76,7 @@
     "  if platform not in database:\n",
     "    print(f\"No segments available for {platform}\")\n",
     "    continue\n",
-    "  \n",
+    "\n",
     "  all_segments = database[platform]\n",
     "  NUM_SEGMENTS = min(len(all_segments), MAX_SEGS_PER_PLATFORM)\n",
     "  TEST_SEGMENTS.extend(random.sample(all_segments, NUM_SEGMENTS))\n",
@@ -147,7 +147,7 @@
     }
    ],
    "source": [
-    "from openpilot.tools.lib.logreader import LogReader\n",
+    "from openpilot.tools.lib.logreader import LogReader, comma_car_segments_source\n",
     "from tqdm.notebook import tqdm, tnrange\n",
     "\n",
     "# Example search for CAN ignition messages\n",
@@ -169,7 +169,7 @@
     "progress_bar = tnrange(len(TEST_SEGMENTS), desc=\"segments searched\")\n",
     "\n",
     "for segment in TEST_SEGMENTS:\n",
-    "  lr = LogReader(segment)\n",
+    "  lr = LogReader(segment, sources=[comma_car_segments_source])\n",
     "  CP = lr.first(\"carParams\")\n",
     "  if CP is None:\n",
     "    progress_bar.update()\n",

tools/car_porting/examples/ford_vin_fingerprint.ipynb

@@ -20,7 +20,7 @@
    "source": [
     "\"\"\"In this example, we use the public comma car segments database to check if vin fingerprinting is feasible for ford.\"\"\"\n",
     "\n",
-    "from openpilot.tools.lib.logreader import LogReader\n",
+    "from openpilot.tools.lib.logreader import LogReader, comma_car_segments_source\n",
     "from openpilot.tools.lib.comma_car_segments import get_comma_car_segments_database\n",
     "from opendbc.car.ford.values import CAR\n",
     "\n",
@@ -100,7 +100,7 @@
     "  if platform not in database:\n",
     "    print(f\"Skipping platform: {platform}, no data available\")\n",
     "    continue\n",
-    "  \n",
+    "\n",
     "  all_segments = database[platform]\n",
     "\n",
     "  NUM_SEGMENTS = min(len(all_segments), MAX_SEGS_PER_PLATFORM)\n",
@@ -110,7 +110,7 @@
     "  segments = random.sample(all_segments, NUM_SEGMENTS)\n",
     "\n",
     "  for segment in segments:\n",
-    "    lr = LogReader(segment)\n",
+    "    lr = LogReader(segment, sources=[comma_car_segments_source])\n",
     "    CP = lr.first(\"carParams\")\n",
     "    if \"FORD\" not in CP.carFingerprint:\n",
     "      print(segment, CP.carFingerprint)\n",

tools/car_porting/examples/hkg_canfd_gear_message.ipynb

@@ -72,7 +72,7 @@
     "  #if platform not in database:\n",
     "  #  print(f\"Skipping platform: {platform}, no data available\")\n",
     "  #  continue\n",
-    "  \n",
+    "\n",
     "  all_segments = database[platform]\n",
     "\n",
     "  NUM_SEGMENTS = min(len(all_segments), MAX_SEGS_PER_PLATFORM)\n",
@@ -198,12 +198,12 @@
     "from opendbc.car.hyundai.hyundaicanfd import CanBus\n",
     "\n",
     "from openpilot.selfdrive.pandad import can_capnp_to_list\n",
-    "from openpilot.tools.lib.logreader import LogReader\n",
+    "from openpilot.tools.lib.logreader import LogReader, comma_car_segments_source\n",
     "\n",
     "message_names = [\"GEAR_SHIFTER\", \"ACCELERATOR\", \"GEAR\", \"GEAR_ALT\", \"GEAR_ALT_2\"]\n",
     "\n",
     "for segment in TEST_SEGMENTS:\n",
-    "  lr = LogReader(segment)\n",
+    "  lr = LogReader(segment, sources=[comma_car_segments_source])\n",
     "  CP = lr.first(\"carParams\")\n",
     "  if CP is None:\n",
     "    continue\n",

tools/lib/comma_car_segments.py

@@ -14,7 +14,8 @@ def get_comma_car_segments_database():
 
   ret = {}
   for platform in database:
-    ret[MIGRATION.get(platform, platform)] = database[platform]
+    # TODO: remove this when commaCarSegments is updated to remove selector
+    ret[MIGRATION.get(platform, platform)] = [s.rstrip('/s') for s in database[platform]]
 
   return ret
 

tools/lib/helpers.py

@@ -9,7 +9,7 @@ class RE:
 
   INDEX = r'-?[0-9]+'
   SLICE = fr'(?P<start>{INDEX})?:?(?P<end>{INDEX})?:?(?P<step>{INDEX})?'
-  SEGMENT_RANGE = fr'{ROUTE_NAME}(?:(--|/)(?P<slice>({SLICE})))?(?:/(?P<selector>([qras])))?'
+  SEGMENT_RANGE = fr'{ROUTE_NAME}(?:(--|/)(?P<slice>({SLICE})))?(?:/(?P<selector>([qra])))?'
 
   BOOTLOG_NAME = ROUTE_NAME
 

tools/lib/logreader.py

@@ -96,7 +96,6 @@ class _LogFileReader:
 class ReadMode(enum.StrEnum):
   RLOG = "r"  # only read rlogs
   QLOG = "q"  # only read qlogs
-  SANITIZED = "s"  # read from the commaCarSegments database
   AUTO = "a"  # default to rlogs, fallback to qlogs
   AUTO_INTERACTIVE = "i"  # default to rlogs, fallback to qlogs with a prompt from the user
 
@@ -216,9 +215,6 @@ def check_source(source: Source, *args) -> list[LogPath]:
 
 
 def auto_source(sr: SegmentRange, sources: list[Source], mode: ReadMode = ReadMode.RLOG) -> list[LogPath]:
-  if mode == ReadMode.SANITIZED:
-    return comma_car_segments_source(sr, mode)
-
   exceptions = {}
 
   # for automatic fallback modes, auto_source needs to first check if rlogs exist for any source