Merge commit 'b7c333cf3fee117779515c9ebfd7b2beb164fa81' into sync-20260813

# Conflicts: # README.md # SConstruct # conftest.py # docs/CARS.md # msgq_repo # opendbc_repo # openpilot/common/params_keys.h # openpilot/common/params_pyx.pyx # openpilot/common/tests/test_swaglog.cc # openpilot/selfdrive/car/card.py # openpilot/selfdrive/car/tests/test_car_interfaces.py # openpilot/selfdrive/car/tests/test_cruise_speed.py # openpilot/selfdrive/car/tests/test_models.py # openpilot/selfdrive/controls/controlsd.py # openpilot/selfdrive/controls/lib/latcontrol_torque.py # openpilot/selfdrive/controls/lib/longitudinal_planner.py # openpilot/selfdrive/controls/plannerd.py # openpilot/selfdrive/controls/radard.py # openpilot/selfdrive/controls/tests/test_longcontrol.py # openpilot/selfdrive/locationd/torqued.py # openpilot/selfdrive/modeld/modeld.py # openpilot/selfdrive/monitoring/dmonitoringd.py # openpilot/selfdrive/monitoring/test_monitoring.py # openpilot/selfdrive/selfdrived/selfdrived.py # openpilot/selfdrive/selfdrived/tests/test_alertmanager.py # openpilot/selfdrive/test/longitudinal_maneuvers/plant.py # openpilot/selfdrive/test/process_replay/migration.py # openpilot/selfdrive/test/process_replay/process_replay.py # openpilot/selfdrive/ui/feedback/feedbackd.py # openpilot/selfdrive/ui/layouts/settings/device.py # openpilot/selfdrive/ui/layouts/settings/toggles.py # openpilot/selfdrive/ui/mici/layouts/onboarding.py # openpilot/selfdrive/ui/onroad/augmented_road_view.py # openpilot/selfdrive/ui/tests/test_soundd.py # openpilot/selfdrive/ui/translations/app.pot # openpilot/selfdrive/ui/translations/app_de.po # openpilot/selfdrive/ui/translations/app_en.po # openpilot/selfdrive/ui/translations/app_es.po # openpilot/selfdrive/ui/translations/app_fr.po # openpilot/selfdrive/ui/translations/app_ja.po # openpilot/selfdrive/ui/translations/app_ko.po # openpilot/selfdrive/ui/translations/app_pt-BR.po # openpilot/selfdrive/ui/translations/app_th.po # openpilot/selfdrive/ui/translations/app_tr.po # openpilot/selfdrive/ui/translations/app_uk.po # openpilot/selfdrive/ui/translations/app_zh-CHS.po # openpilot/selfdrive/ui/translations/app_zh-CHT.po # openpilot/system/athena/athenad.py # openpilot/system/hardware/hardwared.py # openpilot/system/loggerd/deleter.py # openpilot/system/manager/process_config.py # openpilot/system/ui/lib/application.py # panda # pyproject.toml # tinygrad_repo # uv.lock
2026-08-24 00:03:45 +08:00 · 2026-08-13 15:02:39 -04:00
parent 2d859a8ca6 b7c333cf3f
commit 7461f70fdb
418 changed files with 7350 additions and 5694 deletions
@@ -1,63 +0,0 @@
-"""
-  wrapper that materializes symlinks in docs/ before build
-
-  we can delete this once zensical supports symlinks:
-  https://github.com/zensical/backlog/issues/55
-"""
-import os
-import shutil
-import signal
-import sys
-from pathlib import Path
-
-REPO_ROOT = Path(__file__).resolve().parent.parent
-DOCS_DIR = REPO_ROOT / "docs"
-SITE_DIR = REPO_ROOT / "docs_site"
-sys.path.insert(0, str(REPO_ROOT))
-# Local docs build helpers live under docs/ so they stay near the content
-# source. The wrapper prunes them from docs_site/ after build.
-sys.path.insert(0, str(DOCS_DIR))
-
-
-def _materialize(docs: Path) -> dict[Path, str]:
-  originals: dict[Path, str] = {}
-  for link in docs.rglob("*"):
-    if not link.is_symlink():
-      continue
-    target = link.resolve()
-    if not target.is_file():
-      continue
-    originals[link] = os.readlink(link)
-    link.unlink()
-    shutil.copy2(target, link)
-  return originals
-
-
-def _restore(originals: dict[Path, str]) -> None:
-  for link, target in originals.items():
-    link.unlink(missing_ok=True)
-    os.symlink(target, link)
-
-
-def _raise_interrupt(*_):
-  raise KeyboardInterrupt
-
-
-def _prune_site_output() -> None:
-  shutil.rmtree(SITE_DIR / "ext", ignore_errors=True)
-
-
-def main() -> None:
-  signal.signal(signal.SIGTERM, _raise_interrupt)
-  originals = _materialize(DOCS_DIR)
-  try:
-    from zensical.main import cli
-    cli(standalone_mode=False)
-    if len(sys.argv) > 1 and sys.argv[1] == "build":
-      _prune_site_output()
-  finally:
-    _restore(originals)
-
-
-if __name__ == "__main__":
-  main()
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+import argparse
+import tokenize
+
+
+# TODO: remove this once https://github.com/astral-sh/ruff/issues/8705 is closed
+def check_indentation(filename: str, indent_width: int = 2) -> bool:
+  failed = False
+  indent_stack = [0]
+
+  with tokenize.open(filename) as f:
+    tokens = tokenize.generate_tokens(f.readline)
+    for token in tokens:
+      if token.type == tokenize.INDENT:
+        indentation = token.string
+        width = len(indentation)
+        expected = indent_stack[-1] + indent_width
+
+        if indentation != " " * expected:
+          found = "indentation containing tabs" if "\t" in indentation else f"{width} spaces"
+          print(f"{filename}:{token.start[0]}:1: expected {expected} spaces, found {found}")
+          failed = True
+        indent_stack.append(width)
+      elif token.type == tokenize.DEDENT:
+        indent_stack.pop()
+
+  return failed
+
+
+if __name__ == "__main__":
+  parser = argparse.ArgumentParser(description="Check Python block indentation.")
+  parser.add_argument("filenames", nargs="+")
+  args = parser.parse_args()
+
+  failed = False
+  for filename in args.filenames:
+    failed |= check_indentation(filename)
+  raise SystemExit(failed)
@@ -46,6 +46,7 @@ function run_tests() {
  PYTHON_FILES=$2

  run "ruff" ruff check openpilot --quiet
+  run "check_indentation" $DIR/check_indentation.py $PYTHON_FILES
  run "check_added_large_files" $DIR/check_added_large_files.py --maxkb=120 $ALL_FILES
  run "check_shebang_scripts_are_executable" $DIR/check_shebang_scripts_are_executable.py $ALL_FILES
  run "check_shebang_format" $DIR/check_shebang_format.sh $ALL_FILES
@@ -66,6 +67,7 @@ function help() {
  echo ""
  echo -e "${BOLD}${UNDERLINE}Tests:${NC}"
  echo -e "  ${BOLD}ruff${NC}"
+  echo -e "  ${BOLD}check_indentation${NC}"
  echo -e "  ${BOLD}ty${NC}"
  echo -e "  ${BOLD}codespell${NC}"
  echo -e "  ${BOLD}check_added_large_files${NC}"
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-import os
-import glob
-
-from tinygrad.nn.onnx import OnnxPBParser
-
-BASEDIR = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../"))
-
-MASTER_PATH = os.getenv("MASTER_PATH", BASEDIR)
-MODEL_PATH = "/openpilot/selfdrive/modeld/models/"
-
-
-class MetadataOnnxPBParser(OnnxPBParser):
-  def _parse_ModelProto(self) -> dict:
-    obj = {"metadata_props": []}
-    for fid, wire_type in self._parse_message(self.reader.len):
-      match fid:
-        case 14:
-          obj["metadata_props"].append(self._parse_StringStringEntryProto())
-        case _:
-          self.reader.skip_field(wire_type)
-    return obj
-
-
-def get_checkpoint(f):
-  model = MetadataOnnxPBParser(f).parse()
-  metadata = {prop["key"]: prop["value"] for prop in model["metadata_props"]}
-  # "<uuid>" or ".../<run_uuid>/<step>"; combined models list vision then policy
-  parts = metadata['model_checkpoint'].split('/')
-  return parts[-2] if len(parts) > 1 else parts[0]
-
-
-if __name__ == "__main__":
-  print("| | master | PR branch |")
-  print("|-| -----  | --------- |")
-
-  for f in glob.glob(BASEDIR + MODEL_PATH + "/*.onnx"):
-    fn = os.path.basename(f)
-    master_path = MASTER_PATH + MODEL_PATH + fn
-    if os.path.exists(master_path):
-      master = get_checkpoint(master_path)
-      master_col = f"[{master}](https://reporter.comma.life/{master})"
-    else:
-      master_col = "N/A (new model)"
-    pr = get_checkpoint(BASEDIR + MODEL_PATH + fn)
-    print("|", fn, "|", master_col, "|", f"[{pr}](https://reporter.comma.life/{pr})", "|")