Fix setup assistant post-install validation

Author: ROMERUU-dev

app/ui/setup_tab.py

@@ -637,9 +637,10 @@ def apply_selected_pdk_candidate(self) -> None:
                     f"The detected PDK at {sky130a_path} was adopted.\n",
                 )
             )
-            self._set_step(self.STEP_APPLY)
+            self._route_after_pdk_ready()
             self._finish_activity(True, pick(self.lang, "PDK listo para usar", "PDK ready to use"))
             return
+        self._route_after_pdk_ready()
         self._finish_activity(True, pick(self.lang, "El PDK ya estaba aplicado", "The PDK was already applied"))
 
     def install_managed_pdk(self) -> None:
@@ -658,7 +659,7 @@ def install_managed_pdk(self) -> None:
             self.send_status.emit(pick(self.lang, "PDK gestionado listo", "Managed PDK ready"))
             self.refresh_detection()
             self.refresh_validation()
-            self._set_step(self.STEP_APPLY)
+            self._route_after_pdk_ready()
             self._finish_activity(True, pick(self.lang, "PDK gestionado instalado", "Managed PDK installed"))
             return
         self.log.append(pick(self.lang, f"{result.message}\n", f"{result.message}\n"))
@@ -828,6 +829,7 @@ def _on_finished(self, code: int, status: str) -> None:
             self.refresh_detection()
             self.refresh_validation()
             self._apply_detected_defaults(automatic=True)
+            self._route_after_tools_ready()
             self._finish_activity(True, pick(self.lang, "Instalación lista", "Installation ready"))
             return
 
@@ -842,7 +844,7 @@ def _on_finished(self, code: int, status: str) -> None:
             self.send_status.emit(pick(self.lang, "Build de PDK listo", "PDK build ready"))
             self.refresh_detection()
             self.refresh_validation()
-            self._set_step(self.STEP_APPLY)
+            self._route_after_pdk_ready()
             self._finish_activity(True, pick(self.lang, "Build de PDK listo", "PDK build ready"))
             return
 
@@ -858,7 +860,7 @@ def _on_finished(self, code: int, status: str) -> None:
             self.refresh_detection()
             self.refresh_validation()
             self._apply_detected_defaults(automatic=True)
-            self._set_step(self.STEP_APPLY)
+            self._route_after_pdk_ready()
             self._finish_activity(True, pick(self.lang, "Bundle PDK listo", "PDK bundle ready"))
             return
 
@@ -889,18 +891,46 @@ def _on_finished(self, code: int, status: str) -> None:
             return
 
         if action == "install_tools":
+            self._handle_install_tools_failure(code, status)
+            return
+
+        self._finish_activity(code == 0, pick(self.lang, "Acción completada", "Action finished"))
+
+    def _handle_install_tools_failure(self, code: int, status: str) -> None:
+        self.log.append(
+            pick(
+                self.lang,
+                f"\nEl instalador terminó con advertencia/error (exit={code}, status={status}). Revalidando lo que quedó instalado.\n",
+                f"\nThe installer ended with a warning/error (exit={code}, status={status}). Revalidating what is installed now.\n",
+            )
+        )
+        self.refresh_detection()
+        self.refresh_validation()
+        self._apply_detected_defaults(automatic=True)
+        diagnosis = self._last_diagnosis
+        if diagnosis is not None and self._tools_ready(diagnosis):
             self.log.append(
                 pick(
                     self.lang,
-                    f"\nEl proceso terminó con error (exit={code}, status={status}). Revisa el log; si falló `pkexec` o `apt`, el `.venv` no fue tocado.\n",
-                    f"\nThe process ended with an error (exit={code}, status={status}). Review the log; if `pkexec` or `apt` failed, `.venv` was not modified.\n",
+                    "Las tools base ya se detectan correctamente; se conserva el log porque el proceso reportó error al salir.\n",
+                    "The base tools are now detected correctly; the log is kept because the process reported an error on exit.\n",
                 )
             )
-            self.send_status.emit(pick(self.lang, "Setup falló", "Setup failed"))
-            self._finish_activity(False, pick(self.lang, "Instalación falló", "Installation failed"))
+            self.send_status.emit(pick(self.lang, "Tools detectadas", "Tools detected"))
+            self._route_after_tools_ready()
+            self._finish_activity(True, pick(self.lang, "Tools detectadas", "Tools detected"))
             return
 
-        self._finish_activity(code == 0, pick(self.lang, "Acción completada", "Action finished"))
+        self.log.append(
+            pick(
+                self.lang,
+                "Siguen faltando tools después de revalidar. Revisa el log del instalador para ver el paquete o comando bloqueante.\n",
+                "Tools are still missing after revalidation. Review the installer log for the blocking package or command.\n",
+            )
+        )
+        self.send_status.emit(pick(self.lang, "Setup falló", "Setup failed"))
+        self._set_step(self.STEP_TOOLS)
+        self._finish_activity(False, pick(self.lang, "Instalación falló", "Installation failed"))
 
     def _apply_detected_defaults(self, automatic: bool) -> None:
         self._begin_activity(
@@ -952,9 +982,38 @@ def _apply_detected_defaults(self, automatic: bool) -> None:
             )
         self._finish_activity(True, pick(self.lang, "Sin cambios pendientes", "No pending changes"))
 
+    @staticmethod
+    def _tools_ready(diagnosis) -> bool:
+        return all(tool.status in {"ok", "alias"} for tool in diagnosis.tools.values())
+
+    @staticmethod
+    def _pdk_ready(diagnosis) -> bool:
+        return diagnosis.pdk.status == "present"
+
+    def _route_after_pdk_ready(self) -> None:
+        diagnosis = self._last_diagnosis
+        if diagnosis is not None and not self._tools_ready(diagnosis):
+            self.log.append(
+                pick(
+                    self.lang,
+                    "PDK listo. Aún faltan tools base, continúa con el paso de instalación de tools.\n",
+                    "PDK is ready. Base tools are still missing, continue with the tools installation step.\n",
+                )
+            )
+            self._set_step(self.STEP_TOOLS)
+            return
+        self._set_step(self.STEP_APPLY)
+
+    def _route_after_tools_ready(self) -> None:
+        diagnosis = self._last_diagnosis
+        if diagnosis is not None and self._pdk_ready(diagnosis):
+            self._set_step(self.STEP_APPLY)
+            return
+        self._set_step(self.STEP_PDK)
+
     def _update_ready_state(self, diagnosis) -> None:
-        tools_ready = all(tool.status in {"ok", "alias"} for tool in diagnosis.tools.values())
-        pdk_ready = diagnosis.pdk.status == "present"
+        tools_ready = self._tools_ready(diagnosis)
+        pdk_ready = self._pdk_ready(diagnosis)
         python_ready = not diagnosis.python_env.problems and diagnosis.python_env.requirements_ok
 
         def summary(ready: bool, partial: bool = False) -> str:
@@ -1069,7 +1128,7 @@ def _sync_action_gates(self) -> None:
         if self._active_operations > 0:
             return
         diagnosis = self._last_diagnosis
-        tools_ready = bool(diagnosis) and all(tool.status in {"ok", "alias"} for tool in diagnosis.tools.values())
+        tools_ready = bool(diagnosis) and self._tools_ready(diagnosis)
 
         self.validate_btn.setEnabled(True)
         self.refresh_detect_btn.setEnabled(True)

tests/test_setup_tab_routing.py

@@ -0,0 +1,130 @@
+"""Regression tests for setup assistant step routing."""
+
+from __future__ import annotations
+
+import sys
+import unittest
+from types import SimpleNamespace
+
+
+class _DummySignal:
+    def __init__(self, *args, **kwargs) -> None:
+        pass
+
+    def connect(self, *args, **kwargs) -> None:
+        pass
+
+    def emit(self, *args, **kwargs) -> None:
+        pass
+
+
+class _DummyWidget:
+    def __init__(self, *args, **kwargs) -> None:
+        pass
+
+
+class _DummyQProcess:
+    NotRunning = 0
+    Running = 1
+
+    class ExitStatus:
+        pass
+
+    class ProcessError:
+        FailedToStart = 0
+
+
+class _DummyQt:
+    class AlignmentFlag:
+        AlignCenter = 0
+
+    ItemIsEnabled = 1
+    ItemIsSelectable = 2
+    WA_StyledBackground = 3
+
+
+qtcore_stub = SimpleNamespace(
+    QObject=_DummyWidget,
+    QCoreApplication=object,
+    QProcess=_DummyQProcess,
+    QSettings=object,
+    QTimer=object,
+    Qt=_DummyQt,
+    Signal=_DummySignal,
+)
+qtwidgets_stub = SimpleNamespace(
+    QComboBox=_DummyWidget,
+    QFrame=_DummyWidget,
+    QGridLayout=_DummyWidget,
+    QHBoxLayout=_DummyWidget,
+    QLabel=_DummyWidget,
+    QListWidget=_DummyWidget,
+    QListWidgetItem=_DummyWidget,
+    QProgressBar=_DummyWidget,
+    QPushButton=_DummyWidget,
+    QScrollArea=_DummyWidget,
+    QSizePolicy=_DummyWidget,
+    QStackedWidget=_DummyWidget,
+    QTableWidget=_DummyWidget,
+    QTableWidgetItem=_DummyWidget,
+    QTextEdit=_DummyWidget,
+    QVBoxLayout=_DummyWidget,
+    QWidget=_DummyWidget,
+)
+sys.modules["PySide6"] = SimpleNamespace(QtCore=qtcore_stub, QtWidgets=qtwidgets_stub)
+sys.modules["PySide6.QtCore"] = qtcore_stub
+sys.modules["PySide6.QtWidgets"] = qtwidgets_stub
+
+from app.ui.setup_tab import SetupTab
+
+
+class _Log:
+    def __init__(self) -> None:
+        self.lines: list[str] = []
+
+    def append(self, text: str) -> None:
+        self.lines.append(text)
+
+
+class SetupTabRoutingTest(unittest.TestCase):
+    def _tab_with_diagnosis(self, diagnosis: SimpleNamespace) -> SetupTab:
+        tab = SetupTab.__new__(SetupTab)
+        tab.lang = "es"
+        tab.log = _Log()
+        tab._last_diagnosis = diagnosis
+        tab.selected_steps = []
+        tab._set_step = tab.selected_steps.append
+        return tab
+
+    def test_after_pdk_ready_routes_to_tools_when_tools_are_missing(self) -> None:
+        diagnosis = SimpleNamespace(
+            tools={
+                "xschem": SimpleNamespace(status="missing"),
+                "ngspice": SimpleNamespace(status="ok"),
+            },
+            pdk=SimpleNamespace(status="present"),
+        )
+        tab = self._tab_with_diagnosis(diagnosis)
+
+        tab._route_after_pdk_ready()
+
+        self.assertEqual(tab.selected_steps, [SetupTab.STEP_TOOLS])
+        self.assertIn("faltan tools", tab.log.lines[-1])
+
+    def test_after_pdk_ready_routes_to_apply_when_tools_are_ready(self) -> None:
+        diagnosis = SimpleNamespace(
+            tools={
+                "xschem": SimpleNamespace(status="ok"),
+                "netgen": SimpleNamespace(status="alias"),
+            },
+            pdk=SimpleNamespace(status="present"),
+        )
+        tab = self._tab_with_diagnosis(diagnosis)
+
+        tab._route_after_pdk_ready()
+
+        self.assertEqual(tab.selected_steps, [SetupTab.STEP_APPLY])
+
+
+if __name__ == "__main__":
+    unittest.main()