model panel - give it some love

selfdrive/ui/sunnypilot/layouts/settings/models.py

@@ -41,7 +41,7 @@ class ModelsLayout(Widget):
 
     self._initialize_items()
 
-    self.clear_cache_item.action_item.set_value(f"{self._calculate_cache_size():.2f} MB")
+    self.clear_cache_item.action_item.set_value(f"{self.calculate_cache_size():.2f} MB")
     for ctrl, key in [(self.lane_turn_value_control, "LaneTurnValue"), (self.delay_control, "LagdToggleDelay")]:
       ctrl.action_item.set_value(int(float(ui_state.params.get(key, return_default=True)) * 100))
 
@@ -110,7 +110,7 @@ class ModelsLayout(Widget):
             self.model_manager.selectedBundle.status == custom.ModelManagerSP.DownloadStatus.downloading)
 
   @staticmethod
-  def _calculate_cache_size():
+  def calculate_cache_size():
     cache_size = 0.0
     if os.path.exists(CUSTOM_MODEL_PATH):
       cache_size = sum(os.path.getsize(os.path.join(CUSTOM_MODEL_PATH, file)) for file in os.listdir(CUSTOM_MODEL_PATH)) / (1024**2)
@@ -120,7 +120,7 @@ class ModelsLayout(Widget):
     def _callback(response):
       if response == DialogResult.CONFIRM:
         ui_state.params.put_bool("ModelManager_ClearCache", True)
-        self.clear_cache_item.action_item.set_value(f"{self._calculate_cache_size():.2f} MB")
+        self.clear_cache_item.action_item.set_value(f"{self.calculate_cache_size():.2f} MB")
 
     gui_app.set_modal_overlay(ConfirmDialog(tr("This will delete ALL downloaded models from the cache except the currently active model. Are you sure?"),
                                             tr("Clear Cache")), callback=_callback)
@@ -150,7 +150,7 @@ class ModelsLayout(Widget):
 
     if (current_time := time.monotonic()) - self.last_cache_calc_time > 0.5:
       self.last_cache_calc_time = current_time
-      self.clear_cache_item.action_item.set_value(f"{self._calculate_cache_size():.2f} MB")
+      self.clear_cache_item.action_item.set_value(f"{self.calculate_cache_size():.2f} MB")
 
     if self.download_status == custom.ModelManagerSP.DownloadStatus.downloading:
       device._reset_interactive_timeout()

selfdrive/ui/sunnypilot/mici/layouts/models.py

@@ -5,14 +5,45 @@ This file is part of sunnypilot and is licensed under the MIT License.
 See the LICENSE.md file in the root directory for more details.
 """
 from collections.abc import Callable
+import pyray as rl
 
 from cereal import custom
 from openpilot.selfdrive.ui.mici.widgets.button import BigButton
+from openpilot.selfdrive.ui.sunnypilot.layouts.settings.models import ModelsLayout
 from openpilot.selfdrive.ui.ui_state import ui_state
+from openpilot.system.ui.lib.application import FontWeight, gui_app
 from openpilot.system.ui.lib.multilang import tr
 from openpilot.system.ui.widgets import NavWidget, Widget
+from openpilot.system.ui.widgets.label import MiciLabel
 from openpilot.system.ui.widgets.scroller import Scroller
 
+class CurrentModelInfo(Widget):
+  def __init__(self):
+    super().__init__()
+
+    self.set_rect(rl.Rectangle(0, 0, 360, 180))
+
+    header_color = rl.Color(255, 255, 255, int(255 * 0.9))
+    subheader_color = rl.Color(255, 255, 255, int(255 * 0.9 * 0.65))
+    max_width = int(self._rect.width - 20)
+    self.current_model_header = MiciLabel(tr("active model"), 48, width=max_width, color=header_color, font_weight=FontWeight.DISPLAY)
+    self.current_model_text = MiciLabel(tr("default model"), 32, width=max_width, color=subheader_color, font_weight=FontWeight.ROMAN)
+
+    self.info_header = MiciLabel("", 48, color=header_color, font_weight=FontWeight.DISPLAY)
+    self.info_text = MiciLabel("", 32, width=max_width, color=subheader_color, font_weight=FontWeight.ROMAN)
+
+  def _render(self, _):
+    self.current_model_header.set_position(self._rect.x + 20, self._rect.y - 10)
+    self.current_model_header.render()
+
+    self.current_model_text.set_position(self._rect.x + 20, self._rect.y + 68 - 25)
+    self.current_model_text.render()
+
+    self.info_header.set_position(self._rect.x + 20, self._rect.y + 114 - 30)
+    self.info_header.render()
+
+    self.info_text.set_position(self._rect.x + 20, self._rect.y + 161 - 25)
+    self.info_text.render()
 
 class ModelsLayoutMici(NavWidget):
   def __init__(self, back_callback: Callable):
@@ -21,13 +52,22 @@ class ModelsLayoutMici(NavWidget):
     self.original_back_callback = back_callback
     self.focused_widget = None
 
-    self.current_model_btn = BigButton(tr("current model"), "", "")
-    self.current_model_btn.set_click_callback(self._show_folders)
+    self.current_model_info = CurrentModelInfo()
+    self._download_progress = "."
+    self._download_frame = 0
+
+    self.select_model_btn = BigButton(tr("select model"), "", "")
+    self.select_model_btn.set_click_callback(self._show_folders)
 
     self.cancel_download_btn = BigButton(tr("cancel download"), "", "")
     self.cancel_download_btn.set_click_callback(lambda: ui_state.params.remove("ModelManager_DownloadIndex"))
 
-    self.main_items: list[Widget] = [self.current_model_btn, self.cancel_download_btn]
+    self.main_items: list[Widget] = [
+      self.current_model_info,
+      self.select_model_btn,
+      self.cancel_download_btn
+    ]
+
     self._scroller = Scroller(self.main_items, snap_items=False)
 
   @property
@@ -50,7 +90,7 @@ class ModelsLayoutMici(NavWidget):
     self.set_back_callback(back_callback)
 
   def _show_folders(self):
-    self.focused_widget = self.current_model_btn
+    self.focused_widget = self.select_model_btn
     folders = self._get_grouped_bundles()
     folder_buttons = []
     default_btn = BigButton(tr("default model"), "", "")
@@ -87,32 +127,48 @@ class ModelsLayoutMici(NavWidget):
   def _reset_main_view(self):
     self._scroller._items = self.main_items
     self.set_back_callback(self.original_back_callback)
-    if self.focused_widget and self.focused_widget in self.main_items:
-      x = self._scroller._pad_start
-      for item in self.main_items:
-        if not item.is_visible:
-          continue
-        if item == self.focused_widget:
-          break
-        x += item.rect.width + self._scroller._spacing
-      self._scroller.scroll_panel.set_offset(0)
-      self._scroller.scroll_to(x)
-      self.focused_widget = None
-    else:
-      self._scroller.scroll_panel.set_offset(0)
+    self._scroller.scroll_panel.set_offset(0)
+    self._scroller.scroll_to(0)
 
   def _update_state(self):
     super()._update_state()
 
+    self.select_model_btn.set_enabled(ui_state.is_offroad())
+    self.cancel_download_btn.set_visible(False)
+
     manager = self.model_manager
-    if manager.selectedBundle and manager.selectedBundle.status == custom.ModelManagerSP.DownloadStatus.downloading:
-      self.current_model_btn.set_value("downloading...")
+    self._download_frame += 1
+    should_update = self._download_frame % (gui_app.target_fps / 2) == 0
+    if should_update:
+      self._download_progress = self._download_progress + "." if len(self._download_progress) < 3 else ""
+
+    self.current_model_info.current_model_header.set_text(tr("active model"))
+    self.current_model_info.current_model_text.set_text(manager.activeBundle.internalName.lower() if manager.activeBundle.index > 0 else tr("default model"))
+    self.current_model_info.info_header.set_text(tr("cache size"))
+    self.current_model_info.info_text.set_text(f"{ModelsLayout.calculate_cache_size():.2f} MB")
+
+    if manager.selectedBundle and manager.selectedBundle.status == custom.ModelManagerSP.DownloadStatus.failed:
+      self.current_model_info.info_header.set_text(tr("error") + self._download_progress)
+      self.current_model_info.info_text.set_text(tr("download failed"))
+
+    elif manager.selectedBundle and manager.selectedBundle.status == custom.ModelManagerSP.DownloadStatus.downloading:
       self.cancel_download_btn.set_visible(True)
-    else:
-      self.current_model_btn.set_value(manager.activeBundle.internalName.lower() if manager.activeBundle else tr("default model"))
-      self.cancel_download_btn.set_visible(False)
-    self.current_model_btn.set_enabled(ui_state.is_offroad())
-    self.current_model_btn.set_text(tr("current model"))
+      progress = 0.0
+      count = 0
+      for model in manager.selectedBundle.models:
+        count += 1
+        p = model.artifact.downloadProgress
+        if p.status == custom.ModelManagerSP.DownloadStatus.downloading:
+          progress += p.progress
+        elif p.status in (custom.ModelManagerSP.DownloadStatus.downloaded,
+                          custom.ModelManagerSP.DownloadStatus.cached):
+          progress += 100.0
+
+      self.current_model_info.current_model_header.set_text(tr("downloading"))
+      self.current_model_info.current_model_text.set_text(f"{manager.selectedBundle.internalName.lower()}")
+      self.current_model_info.info_header.set_text(tr("progress") + self._download_progress)
+      self.current_model_info.info_text.set_text(f"{progress/count:.2f}%")
+
 
   def _render(self, rect):
     self._scroller.render(rect)