Disable PDK bundle release path and harden Magic launch

Author: ROMERUU-dev

app/core/magic_launcher.py

@@ -30,13 +30,22 @@ def build(self, target_path: str | None = None) -> MagicLaunchSpec:
         env = os.environ.copy()
         command = [self.settings.tool_paths.magic]
         cwd: str | None = None
+        magic_rc: Path | None = None
+        magic_dir: Path | None = None
 
         sky130a = self.validator._find_sky130a(self.settings)
         if sky130a is not None:
             env["PDK_ROOT"] = str(sky130a.parent)
             env["SKY130A"] = str(sky130a)
+            env.setdefault("MAGTYPE", "mag")
+            magic_dir = sky130a / "libs.tech" / "magic"
+            derived_rc = magic_dir / "sky130A.magicrc"
+            if derived_rc.is_file():
+                magic_rc = derived_rc
 
-        magic_rc = Path(self.settings.pdk_paths.magic_rc).expanduser() if self.settings.pdk_paths.magic_rc else None
+        configured_rc = Path(self.settings.pdk_paths.magic_rc).expanduser() if self.settings.pdk_paths.magic_rc else None
+        if configured_rc and configured_rc.is_file():
+            magic_rc = configured_rc
         if magic_rc and magic_rc.is_file():
             command.extend(["-rcfile", str(magic_rc.resolve())])
 
@@ -50,5 +59,7 @@ def build(self, target_path: str | None = None) -> MagicLaunchSpec:
             else:
                 cwd = str(target.parent)
                 command.append(str(target))
+        elif magic_dir and magic_dir.is_dir():
+            cwd = str(magic_dir)
 
         return MagicLaunchSpec(command=command, cwd=cwd, env=env)

app/data/dependency_manifest.json

@@ -56,15 +56,15 @@
           "--enable-sky130-pdk"
         ],
         "bundle": {
-          "enabled": true,
+          "enabled": false,
           "name": "tt-pdk-sky130a",
-          "version": "0.2.0-beta.4",
+          "version": "",
           "install_root": "~/pdk",
           "cache_root": "~/.cache/sky130-flow-gui/pdk",
           "minimum_free_gb": 10,
-          "asset_url": "https://github.com/ROMERUU-dev/sky130-flow-gui/releases/download/v0.2.0-beta.4/tt-pdk-sky130a_0.2.0-beta.4.tar.gz",
-          "asset_filename": "tt-pdk-sky130a_0.2.0-beta.4.tar.gz",
-          "asset_sha256": "25acfcdaace6e6b8ca0ca828407ecf1a896a1c0e04560465d2259cda8b9b4c24"
+          "asset_url": "",
+          "asset_filename": "",
+          "asset_sha256": ""
         },
         "preferred_sources": [
           "settings",
@@ -137,15 +137,15 @@
           "--enable-sky130-pdk"
         ],
         "bundle": {
-          "enabled": true,
+          "enabled": false,
           "name": "tt-pdk-sky130a",
-          "version": "0.2.0-beta.4",
+          "version": "",
           "install_root": "~/pdk",
           "cache_root": "~/.cache/sky130-flow-gui/pdk",
           "minimum_free_gb": 10,
-          "asset_url": "https://github.com/ROMERUU-dev/sky130-flow-gui/releases/download/v0.2.0-beta.4/tt-pdk-sky130a_0.2.0-beta.4.tar.gz",
-          "asset_filename": "tt-pdk-sky130a_0.2.0-beta.4.tar.gz",
-          "asset_sha256": "25acfcdaace6e6b8ca0ca828407ecf1a896a1c0e04560465d2259cda8b9b4c24"
+          "asset_url": "",
+          "asset_filename": "",
+          "asset_sha256": ""
         },
         "preferred_sources": [
           "settings",

app/ui/preferences_tab.py

@@ -115,6 +115,16 @@ def _build_ui(self) -> None:
         self._add_path_row(form, "pdk.klayout_antenna_deck", "KLayout antenna deck", pdk["klayout_antenna_deck"])
 
         general_layout.addLayout(form)
+        pdk_usage_note = QLabel(
+            pick(
+                self.lang,
+                "Uso real de estas rutas PDK: PDK_ROOT y SKY130A se usan para detección y contexto general; Magic rcfile lo usan Extracción y Magic; Netgen setup lo usa LVS; KLayout antenna deck lo usa Antena.",
+                "Actual use of these PDK paths: PDK_ROOT and SKY130A are used for detection and general context; Magic rcfile is used by Extraction and Magic; Netgen setup is used by LVS; KLayout antenna deck is used by Antenna.",
+            )
+        )
+        pdk_usage_note.setWordWrap(True)
+        pdk_usage_note.setStyleSheet("color: #667085;")
+        general_layout.addWidget(pdk_usage_note)
 
         btns = QHBoxLayout()
         save = QPushButton(pick(self.lang, "Guardar preferencias", "Save Preferences"))

app/ui/setup_tab.py

@@ -677,18 +677,20 @@ def refresh_pdk_bundle_preflight(self) -> None:
             pick(
                 self.lang,
                 f"Bundle: {summary.bundle_name}\n"
-                f"Versión: {summary.bundle_version or 'pendiente'}\n"
-                f"Instalación TT: {summary.target_sky130a}\n"
+                f"Versión: {summary.bundle_version or 'no publicado'}\n"
+                f"Instalación canónica: {summary.target_sky130a}\n"
                 f"Cache: {summary.cache_root}\n"
                 f"Espacio libre: {summary.free_bytes / (1024 ** 3):.1f} GB\n"
                 f"Asset configurado: {'sí' if bool(summary.asset_url and summary.asset_filename) else 'no'}\n"
+                f"Publicado por la app: {'sí' if summary.enabled else 'no'}\n"
                 f"Listo para instalar: {'sí' if summary.ready else 'no'}",
                 f"Bundle: {summary.bundle_name}\n"
-                f"Version: {summary.bundle_version or 'pending'}\n"
-                f"TT install: {summary.target_sky130a}\n"
+                f"Version: {summary.bundle_version or 'not published'}\n"
+                f"Canonical install: {summary.target_sky130a}\n"
                 f"Cache: {summary.cache_root}\n"
                 f"Free space: {summary.free_bytes / (1024 ** 3):.1f} GB\n"
                 f"Asset configured: {'yes' if bool(summary.asset_url and summary.asset_filename) else 'no'}\n"
+                f"Published by the app: {'yes' if summary.enabled else 'no'}\n"
                 f"Ready to install: {'yes' if summary.ready else 'no'}",
             )
         )

tests/test_dependency_manifest.py

@@ -23,9 +23,9 @@ def test_loads_default_channel_and_packages(self) -> None:
         self.assertEqual(channel.pdk_managed_root, "~/pdk")
         self.assertEqual(channel.pdk_bundle_install_root, "~/pdk")
         self.assertEqual(channel.pdk_bundle_name, "tt-pdk-sky130a")
-        self.assertTrue(channel.pdk_bundle_enabled)
-        self.assertEqual(channel.pdk_bundle_version, "0.2.0-beta.4")
-        self.assertTrue(channel.pdk_bundle_asset_url.endswith("tt-pdk-sky130a_0.2.0-beta.4.tar.gz"))
+        self.assertFalse(channel.pdk_bundle_enabled)
+        self.assertEqual(channel.pdk_bundle_version, "")
+        self.assertEqual(channel.pdk_bundle_asset_url, "")
 
     def test_unknown_channel_raises(self) -> None:
         manifest = DependencyManifest()

tests/test_magic_launcher.py

@@ -41,6 +41,25 @@ def test_build_injects_pdk_context_and_magicrc(self) -> None:
         self.assertEqual(spec.cwd, str(layout_dir.resolve()))
         self.assertEqual(spec.env["PDK_ROOT"], str(sky130a.parent))
         self.assertEqual(spec.env["SKY130A"], str(sky130a))
+        self.assertEqual(spec.env["MAGTYPE"], "mag")
+
+    def test_build_derives_magicrc_from_sky130a_when_not_explicitly_configured(self) -> None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            sky130a = Path(tmpdir) / "pdk" / "sky130A"
+            magic_dir = sky130a / "libs.tech" / "magic"
+            magic_dir.mkdir(parents=True)
+            magic_rc = magic_dir / "sky130A.magicrc"
+            magic_rc.write_text("# magicrc\n", encoding="utf-8")
+
+            settings = AppSettings()
+            settings.tool_paths.magic = "magic"
+            settings.pdk_paths.sky130a = str(sky130a)
+
+            with mock.patch.dict(os.environ, {}, clear=True):
+                spec = MagicLaunchBuilder(settings).build()
+
+        self.assertEqual(spec.command, ["magic", "-rcfile", str(magic_rc.resolve())])
+        self.assertEqual(spec.cwd, str(magic_dir.resolve()))
 
     def test_build_opens_mag_file_by_cell_name_in_parent_directory(self) -> None:
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -51,7 +70,10 @@ def test_build_opens_mag_file_by_cell_name_in_parent_directory(self) -> None:
             settings = AppSettings()
             settings.tool_paths.magic = "magic"
 
-            with mock.patch.dict(os.environ, {}, clear=True):
+            with mock.patch.dict(os.environ, {}, clear=True), mock.patch(
+                "app.core.magic_launcher.EnvValidator._find_sky130a",
+                return_value=None,
+            ):
                 spec = MagicLaunchBuilder(settings).build(str(mag_path))
 
         self.assertEqual(spec.command, ["magic", "tt_um_demo"])