diff --git a/openpilot/sunnypilot/models/fetcher.py b/openpilot/sunnypilot/models/fetcher.py index d0115be04..f997dbbc5 100644 --- a/openpilot/sunnypilot/models/fetcher.py +++ b/openpilot/sunnypilot/models/fetcher.py @@ -138,8 +138,8 @@ class ModelCache: class ModelFetcher: """Handles fetching and caching of model data from remote source""" - MODEL_URL = "https://raw.githubusercontent.com/sunnypilot/sunnypilot-models/refs/heads/gh-pages/docs/driving_models_v21.json" - MODEL_URL_CHESTNUT = "https://raw.githubusercontent.com/sunnypilot/sunnypilot-models/refs/heads/gh-pages/docs/driving_models_chestnut_v22.json" + MODEL_URL = "https://raw.githubusercontent.com/sunnypilot/sunnypilot-models/refs/heads/gh-pages/docs/driving_models_v22.json" + MODEL_URL_CHESTNUT = "https://raw.githubusercontent.com/sunnypilot/sunnypilot-models/refs/heads/gh-pages/docs/driving_models_chestnut_v23.json" MODEL_SOURCES = { "qcom": (MODEL_URL, ""), diff --git a/openpilot/sunnypilot/models/helpers.py b/openpilot/sunnypilot/models/helpers.py index 3c3cc1107..ac6909659 100644 --- a/openpilot/sunnypilot/models/helpers.py +++ b/openpilot/sunnypilot/models/helpers.py @@ -19,7 +19,7 @@ from openpilot.common.hardware.hw import Paths from openpilot.selfdrive.modeld.helpers import chestnut_present # SET ME TO THE EXACT JSON VERSION WE SET IN SUNNYPILOT_MODELS REPO -REQUIRED_JSON_VERSION = 18 +REQUIRED_JSON_VERSION = 19 CUSTOM_MODEL_PATH = Paths.model_root() METADATA_PATH = Path(__file__).parent / '../models/supercombo_metadata.pkl' diff --git a/openpilot/sunnypilot/models/tests/test_manager_download.py b/openpilot/sunnypilot/models/tests/test_manager_download.py index 489e0bc09..b995d4fbd 100644 --- a/openpilot/sunnypilot/models/tests/test_manager_download.py +++ b/openpilot/sunnypilot/models/tests/test_manager_download.py @@ -386,7 +386,7 @@ class TestManagerDownload(ManagerDownloadTestBase): def body(): artifact = self.make_artifact(chunked=True) self._bundle.ref = "test-ref" - self._bundle.minimumSelectorVersion = 18 + self._bundle.minimumSelectorVersion = helpers.REQUIRED_JSON_VERSION params, store = self._make_params_with_store() self.manager.params = params asyncio.run(self.manager._download_bundle(self._bundle, self.dest, "qcom")) @@ -406,7 +406,7 @@ class TestManagerDownload(ManagerDownloadTestBase): def body(): self.make_artifact(chunked=True) self._bundle.ref = "big-ref" - self._bundle.minimumSelectorVersion = 18 + self._bundle.minimumSelectorVersion = helpers.REQUIRED_JSON_VERSION params, store = self._make_params_with_store() self.manager.params = params asyncio.run(self.manager._download_bundle(self._bundle, self.dest, "chestnut")) @@ -469,7 +469,7 @@ def manifest_bundle(short_name: str, ref: str, index: int = 0, is_big: bool = Fa "environment": "release", "runner": "tinygrad", "is_big": is_big, - "minimum_selector_version": "18", + "minimum_selector_version": str(helpers.REQUIRED_JSON_VERSION), "ref": ref, "models": [{ "type": "supercombo", @@ -655,7 +655,7 @@ class TestActiveBundleValidation(OpenpilotTestCase): def _raw_bundle(ref: str, runner: int | None = None) -> dict: bundle = custom.ModelManagerSP.ModelBundle.new_message() bundle.ref = ref - bundle.minimumSelectorVersion = 18 + bundle.minimumSelectorVersion = helpers.REQUIRED_JSON_VERSION if runner is not None: bundle.runner = runner return bundle.to_dict() @@ -697,7 +697,7 @@ class TestActiveBundleSelection(OpenpilotTestCase): def _raw_bundle(ref: str) -> dict: bundle = custom.ModelManagerSP.ModelBundle.new_message() bundle.ref = ref - bundle.minimumSelectorVersion = 18 + bundle.minimumSelectorVersion = helpers.REQUIRED_JSON_VERSION return bundle.to_dict() def _params(self, qcom=None, chestnut=None): @@ -744,7 +744,7 @@ class TestEffectiveSource(OpenpilotTestCase): def _raw_bundle(ref: str) -> dict: bundle = custom.ModelManagerSP.ModelBundle.new_message() bundle.ref = ref - bundle.minimumSelectorVersion = 18 + bundle.minimumSelectorVersion = helpers.REQUIRED_JSON_VERSION return bundle.to_dict() def test_runtime_no_gpu(self): diff --git a/tinygrad_repo b/tinygrad_repo index 66ee3cfb4..966a8f511 160000 --- a/tinygrad_repo +++ b/tinygrad_repo @@ -1 +1 @@ -Subproject commit 66ee3cfb4f3a3908a6a20ddfbec7774ba7c09b4e +Subproject commit 966a8f5112dbc0e4f6d8120c1ec4d98e95fa2bcb