arcane-mage 2.2.0__tar.gz → 2.3.0__tar.gz

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: arcane-mage
-Version: 2.2.0
+Version: 2.3.0
 Summary: Automation helper for Fluxnodes
 Author-email: David White <david@runonflux.io>
 License-File: LICENSE

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arcane-mage"
-version = "2.2.0"
+version = "2.3.0"
 description = "Automation helper for Fluxnodes"
 readme = "README.md"
 authors = [

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/__main__.py

@@ -14,7 +14,6 @@ import os
 import sys
 from importlib.metadata import version as get_version
 from pathlib import Path
-from typing import Optional
 from urllib.parse import urlparse
 
 from rich.console import Console
@@ -145,9 +144,9 @@ def _resolve_hypervisor(hypervisor: str) -> ResolvedConnection:
 
 
 def _resolve_connection(
-    url: Optional[str],
-    token: Optional[str],
-    hypervisor: Optional[str],
+    url: str | None,
+    token: str | None,
+    hypervisor: str | None,
 ) -> ResolvedConnection:
     """Resolve URL and parsed token from flags, env vars, stdin, or stored hypervisor."""
     if hypervisor:
@@ -184,7 +183,9 @@ def _load_configs(config: str) -> ArcaneOsConfigGroup:
 
 @app.callback()
 def main(
-    version: Optional[bool] = typer.Option(None, "-v", "--version", callback=version_callback, is_eager=True, help="Show the application version"),
+    version: bool | None = typer.Option(
+        None, "-v", "--version", callback=version_callback, is_eager=True, help="Show the application version"
+    ),
 ) -> None:
     pass
 
@@ -197,10 +198,7 @@ def tui(
     try:
         from .arcane_mage import ArcaneMage
     except ModuleNotFoundError:
-        raise SystemExit(
-            "arcane-mage TUI requires the 'tui' extra.\n"
-            "Install with: uv add arcane-mage[tui]"
-        ) from None
+        raise SystemExit("arcane-mage TUI requires the 'tui' extra.\nInstall with: uv add arcane-mage[tui]") from None
 
     tui_app = ArcaneMage(fluxnode_config=config)
     tui_app.run()
@@ -208,12 +206,12 @@ def tui(
 
 @app.command()
 def provision(
-    url: Optional[str] = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
-    token: Optional[str] = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
-    hypervisor: Optional[str] = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
+    url: str | None = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
+    token: str | None = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
+    hypervisor: str | None = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
     config: str = typer.Option("fluxnodes.yaml", "-c", "--config", help="The config file"),
-    node_filter: Optional[str] = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
-    start: Optional[bool] = typer.Option(None, "--start/--no-start", help="Override start_on_creation setting"),
+    node_filter: str | None = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
+    start: bool | None = typer.Option(None, "--start/--no-start", help="Override start_on_creation setting"),
     use_json: bool = typer.Option(False, "--json", help="Output JSON instead of text"),
 ) -> None:
     """Provision Fluxnodes on a Proxmox hypervisor via the API."""
@@ -250,7 +248,7 @@ def provision(
 
                 steps: list[dict[str, object]] = []
 
-                def callback(ok: bool, msg: str):
+                def callback(ok: bool, msg: str, steps: list[dict[str, object]] = steps):
                     steps.append({"ok": ok, "message": msg})
                     if not use_json:
                         mark = _CHECK_MARK if ok else _CROSS_MARK
@@ -264,15 +262,17 @@ def provision(
 
                 if not use_json:
                     if result:
-                        console.print(f"  [bold green]Provisioned successfully[/bold green]")
+                        console.print("  [bold green]Provisioned successfully[/bold green]")
                     else:
-                        console.print(f"  [bold red]Provisioning failed[/bold red]")
+                        console.print("  [bold red]Provisioning failed[/bold red]")
 
                 if not result:
                     all_ok = False
 
             if use_json:
-                print(_json_ok({"nodes": results}) if all_ok else _json_error("Provisioning failed", {"nodes": results}))
+                print(
+                    _json_ok({"nodes": results}) if all_ok else _json_error("Provisioning failed", {"nodes": results})
+                )
 
             return all_ok
 
@@ -287,13 +287,13 @@ def provision(
 
 @app.command()
 def deprovision(
-    url: Optional[str] = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
-    token: Optional[str] = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
-    hypervisor: Optional[str] = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
-    config: Optional[str] = typer.Option(None, "-c", "--config", help="The config file"),
-    vm_name: Optional[str] = typer.Option(None, "--vm-name", help="Target a specific VM by name"),
-    vm_id: Optional[int] = typer.Option(None, "--vm-id", help="Target a specific VM by ID"),
-    node_filter: Optional[str] = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
+    url: str | None = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
+    token: str | None = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
+    hypervisor: str | None = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
+    config: str | None = typer.Option(None, "-c", "--config", help="The config file"),
+    vm_name: str | None = typer.Option(None, "--vm-name", help="Target a specific VM by name"),
+    vm_id: int | None = typer.Option(None, "--vm-id", help="Target a specific VM by ID"),
+    node_filter: str | None = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
     force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation prompt"),
     use_json: bool = typer.Option(False, "--json", help="Output JSON instead of text"),
 ) -> None:
@@ -324,6 +324,7 @@ def deprovision(
         _handle_error(e, use_json)
 
     if direct_vm:
+
         async def run_direct():
             async with ProxmoxApi.from_token(conn.url, conn.token) as api:
                 provisioner = Provisioner(api)
@@ -362,7 +363,7 @@ def deprovision(
                 vm_status = found_vm.get("status", "unknown")
 
                 if not force and not use_json:
-                    console.print(f"[bold red]This will stop and delete:[/bold red]")
+                    console.print("[bold red]This will stop and delete:[/bold red]")
                     console.print(f"  VM:     {vm_display} (id={found_vm['vmid']})")
                     console.print(f"  Node:   {found_node}")
                     console.print(f"  Status: {vm_status}")
@@ -371,7 +372,7 @@ def deprovision(
 
                 steps: list[dict[str, object]] = []
 
-                def callback(ok: bool, msg: str):
+                def callback(ok: bool, msg: str, steps: list[dict[str, object]] = steps):
                     steps.append({"ok": ok, "message": msg})
                     if not use_json:
                         mark = _CHECK_MARK if ok else _CROSS_MARK
@@ -381,7 +382,11 @@ def deprovision(
                     console.print(f"\n[bold]{vm_display}[/bold]")
 
                 result = await provisioner._stop_and_delete_vm(
-                    found_vm["vmid"], vm_display, vm_status, found_node, callback,
+                    found_vm["vmid"],
+                    vm_display,
+                    vm_status,
+                    found_node,
+                    callback,
                 )
 
                 vm_info = {"vm_name": vm_display, "vm_id": found_vm["vmid"], "node": found_node, "steps": steps}
@@ -390,9 +395,9 @@ def deprovision(
                     print(_json_ok(vm_info) if result else _json_error("Deprovisioning failed", vm_info))
                 else:
                     if result:
-                        console.print(f"  [bold green]Deprovisioned successfully[/bold green]")
+                        console.print("  [bold green]Deprovisioned successfully[/bold green]")
                     else:
-                        console.print(f"  [bold red]Deprovisioning failed[/bold red]")
+                        console.print("  [bold red]Deprovisioning failed[/bold red]")
 
                 return result
 
@@ -418,7 +423,7 @@ def deprovision(
         _handle_error(CliError(f"No nodes match filter '{node_filter}'"), use_json)
 
     if not force and not use_json:
-        console.print(f"[bold red]This will stop and delete the following VMs:[/bold red]")
+        console.print("[bold red]This will stop and delete the following VMs:[/bold red]")
         for node in nodes:
             hyper_node = node.hypervisor.node if node.hypervisor else "?"
             vm = node.hypervisor.vm_name if node.hypervisor else node.system.hostname
@@ -436,7 +441,7 @@ def deprovision(
                 hostname = node.system.hostname
                 steps: list[dict[str, object]] = []
 
-                def callback(ok: bool, msg: str):
+                def callback(ok: bool, msg: str, steps: list[dict[str, object]] = steps):
                     steps.append({"ok": ok, "message": msg})
                     if not use_json:
                         mark = _CHECK_MARK if ok else _CROSS_MARK
@@ -450,15 +455,17 @@ def deprovision(
 
                 if not use_json:
                     if result:
-                        console.print(f"  [bold green]Deprovisioned successfully[/bold green]")
+                        console.print("  [bold green]Deprovisioned successfully[/bold green]")
                     else:
-                        console.print(f"  [bold red]Deprovisioning failed[/bold red]")
+                        console.print("  [bold red]Deprovisioning failed[/bold red]")
 
                 if not result:
                     all_ok = False
 
             if use_json:
-                print(_json_ok({"nodes": results}) if all_ok else _json_error("Deprovisioning failed", {"nodes": results}))
+                print(
+                    _json_ok({"nodes": results}) if all_ok else _json_error("Deprovisioning failed", {"nodes": results})
+                )
 
             return all_ok
 
@@ -473,11 +480,11 @@ def deprovision(
 
 @app.command()
 def validate(
-    url: Optional[str] = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
-    token: Optional[str] = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
-    hypervisor: Optional[str] = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
+    url: str | None = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
+    token: str | None = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
+    hypervisor: str | None = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
     config: str = typer.Option("fluxnodes.yaml", "-c", "--config", help="The config file"),
-    node_filter: Optional[str] = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
+    node_filter: str | None = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
     use_json: bool = typer.Option(False, "--json", help="Output JSON instead of text"),
 ) -> None:
     """Check config, API connectivity, storage, ISO, and network without provisioning."""
@@ -511,27 +518,62 @@ def validate(
                 hyper = node.hypervisor
 
                 if not hyper:
-                    results.append({"hostname": hostname, "ok": False, "checks": [{"check": "hypervisor", "ok": False, "message": "No hypervisor config"}]})
+                    results.append(
+                        {
+                            "hostname": hostname,
+                            "ok": False,
+                            "checks": [{"check": "hypervisor", "ok": False, "message": "No hypervisor config"}],
+                        }
+                    )
                     if not use_json:
-                        console.print(Panel(f"[red]No hypervisor config[/red]", title=f"[bold]{hostname}[/bold]", border_style="red"))
+                        console.print(
+                            Panel(
+                                "[red]No hypervisor config[/red]", title=f"[bold]{hostname}[/bold]", border_style="red"
+                            )
+                        )
                     all_ok = False
                     continue
 
                 checks = []
 
                 api_ok, api_msg = await provisioner.validate_api_version(hyper.node)
-                checks.append({"check": "api_version", "ok": api_ok, "message": api_msg if not api_ok else f"v{api_msg}"})
+                checks.append(
+                    {"check": "api_version", "ok": api_ok, "message": api_msg if not api_ok else f"v{api_msg}"}
+                )
 
                 storage_ok, storage_msg = await provisioner.validate_storage(
-                    hyper.node, hyper.storage_iso, hyper.storage_images, hyper.storage_import,
+                    hyper.node,
+                    hyper.storage_iso,
+                    hyper.storage_images,
+                    hyper.storage_import,
+                )
+                checks.append(
+                    {
+                        "check": "storage",
+                        "ok": storage_ok,
+                        "message": storage_msg
+                        if storage_msg
+                        else f"iso={hyper.storage_iso}, images={hyper.storage_images}, import={hyper.storage_import}",
+                    }
                 )
-                checks.append({"check": "storage", "ok": storage_ok, "message": storage_msg if storage_msg else f"iso={hyper.storage_iso}, images={hyper.storage_images}, import={hyper.storage_import}"})
 
                 iso_ok = await provisioner.validate_iso_version(hyper.node, hyper.iso_name, hyper.storage_iso)
-                checks.append({"check": "iso", "ok": iso_ok, "message": f"{hyper.iso_name} not found" if not iso_ok else hyper.iso_name})
+                checks.append(
+                    {
+                        "check": "iso",
+                        "ok": iso_ok,
+                        "message": f"{hyper.iso_name} not found" if not iso_ok else hyper.iso_name,
+                    }
+                )
 
                 net_ok = await provisioner.validate_network(hyper.node, hyper.network)
-                checks.append({"check": "network", "ok": net_ok, "message": f"Bridge {hyper.network} not found" if not net_ok else hyper.network})
+                checks.append(
+                    {
+                        "check": "network",
+                        "ok": net_ok,
+                        "message": f"Bridge {hyper.network} not found" if not net_ok else hyper.network,
+                    }
+                )
 
                 node_ok = all(c["ok"] for c in checks)
                 results.append({"hostname": hostname, "node": hyper.node, "ok": node_ok, "checks": checks})
@@ -550,7 +592,9 @@ def validate(
                         table.add_row(mark, c["check"].replace("_", " ").title(), detail)
 
                     border = "green" if node_ok else "red"
-                    console.print(Panel(table, title=f"[bold]{hostname}[/bold] @ [bold]{hyper.node}[/bold]", border_style=border))
+                    console.print(
+                        Panel(table, title=f"[bold]{hostname}[/bold] @ [bold]{hyper.node}[/bold]", border_style=border)
+                    )
 
             if use_json:
                 print(_json_ok({"nodes": results}) if all_ok else _json_error("Validation failed", {"nodes": results}))
@@ -568,9 +612,9 @@ def validate(
 
 @app.command()
 def ping(
-    url: Optional[str] = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
-    token: Optional[str] = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
-    hypervisor: Optional[str] = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
+    url: str | None = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
+    token: str | None = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
+    hypervisor: str | None = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
     use_json: bool = typer.Option(False, "--json", help="Output JSON instead of text"),
 ) -> None:
     """Test connectivity and authentication to a Proxmox hypervisor."""
@@ -635,11 +679,11 @@ def ping(
 
 @app.command()
 def status(
-    url: Optional[str] = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
-    token: Optional[str] = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
-    hypervisor: Optional[str] = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
+    url: str | None = typer.Option(None, help="Proxmox API URL (also accepts ARCANE_MAGE_URL)"),
+    token: str | None = typer.Option(None, help="API token (also accepts stdin or ARCANE_MAGE_TOKEN)"),
+    hypervisor: str | None = typer.Option(None, "--hypervisor", "-H", help="Use stored hypervisor by name"),
     config: str = typer.Option("fluxnodes.yaml", "-c", "--config", help="The config file"),
-    node_filter: Optional[str] = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
+    node_filter: str | None = typer.Option(None, "--node", help="Cluster node to target (e.g. pve1)"),
     use_json: bool = typer.Option(False, "--json", help="Output JSON instead of text"),
 ) -> None:
     """Show which configured nodes are already provisioned on the hypervisor."""
@@ -693,12 +737,14 @@ def status(
                         provisioned = True
                         break
 
-                results.append({
-                    "hostname": hostname,
-                    "vm_name": hyper.vm_name,
-                    "node": hyper.node,
-                    "provisioned": provisioned,
-                })
+                results.append(
+                    {
+                        "hostname": hostname,
+                        "vm_name": hyper.vm_name,
+                        "node": hyper.node,
+                        "provisioned": provisioned,
+                    }
+                )
 
                 status_text = "[green]provisioned[/green]" if provisioned else "[yellow]not provisioned[/yellow]"
                 table.add_row(hostname, hyper.vm_name, hyper.node, status_text)

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/arcane_mage.py

@@ -46,9 +46,7 @@ class ArcaneMage(App):
         self.push_screen("welcome")
 
         if self.config.default_page == "welcome-proxmox":
-            screen = WelcomeScreenProxmox(
-                self.config.hypervisors, self.fluxnodes, is_homepage=True
-            )
+            screen = WelcomeScreenProxmox(self.config.hypervisors, self.fluxnodes, is_homepage=True)
             self.install_screen(screen, name="welcome-proxmox")
             self.push_screen("welcome-proxmox")
 
@@ -66,9 +64,7 @@ class ArcaneMage(App):
         screen = self.get_screen("welcome-proxmox", WelcomeScreenProxmox)
         screen.validate_hypervisors(hypervisor)
 
-    def del_hypervisor_callback(
-        self, hypervisor: HypervisorConfig, delete: bool
-    ) -> None:
+    def del_hypervisor_callback(self, hypervisor: HypervisorConfig, delete: bool) -> None:
         if not delete:
             return
 
@@ -76,17 +72,13 @@ class ArcaneMage(App):
         screen = self.get_screen("welcome-proxmox", WelcomeScreenProxmox)
         screen.validate_hypervisors()
 
-    async def provision_node_callback(
-        self, fluxnode: ArcaneOsConfig | None, delete_efi: bool = True
-    ) -> Worker | None:
+    async def provision_node_callback(self, fluxnode: ArcaneOsConfig | None, delete_efi: bool = True) -> Worker | None:
         if not fluxnode or not fluxnode.hypervisor:
             return None
 
         vm_name = fluxnode.hypervisor.vm_name
         total_steps = 9 if fluxnode.hypervisor.start_on_creation else 8
-        info_screen = ProvisioningInfoScreen(
-            vm_name=vm_name, total_steps=total_steps
-        )
+        info_screen = ProvisioningInfoScreen(vm_name=vm_name, total_steps=total_steps)
 
         # this is a bit rugged
         mounted = self.push_screen(info_screen)
@@ -103,12 +95,8 @@ class ArcaneMage(App):
 
     @on(ScreenRequested)
     def on_screen_requested(self, event: ScreenRequested) -> None:
-        if event.screen == "welcome-proxmox" and not self.is_screen_installed(
-            "welcome-proxmox"
-        ):
-            screen = WelcomeScreenProxmox(
-                self.config.hypervisors, self.fluxnodes
-            )
+        if event.screen == "welcome-proxmox" and not self.is_screen_installed("welcome-proxmox"):
+            screen = WelcomeScreenProxmox(self.config.hypervisors, self.fluxnodes)
             self.install_screen(screen, name="welcome-proxmox")
         elif event.screen != "welcome-proxmox":
             self.notify("Not implemented yet")
@@ -123,9 +111,7 @@ class ArcaneMage(App):
         # this is blocking but meh
         self.config.update_default_page(default)
 
-    def edit_hypervisor_callback(
-        self, old: HypervisorConfig, new: HypervisorConfig | None
-    ) -> None:
+    def edit_hypervisor_callback(self, old: HypervisorConfig, new: HypervisorConfig | None) -> None:
         if not new:
             return
 
@@ -146,18 +132,14 @@ class ArcaneMage(App):
         )
 
     @on(WelcomeScreenProxmox.EditHypervisor)
-    def on_edit_hypervisor(
-        self, event: WelcomeScreenProxmox.EditHypervisor
-    ) -> None:
+    def on_edit_hypervisor(self, event: WelcomeScreenProxmox.EditHypervisor) -> None:
         self.push_screen(
             AddHypervisorScreen(self.config.use_keyring, existing=event.hypervisor),
             partial(self.edit_hypervisor_callback, event.hypervisor),
         )
 
     @on(WelcomeScreenProxmox.DelHypervisor)
-    def on_del_hypervisor(
-        self, event: WelcomeScreenProxmox.DelHypervisor
-    ) -> None:
+    def on_del_hypervisor(self, event: WelcomeScreenProxmox.DelHypervisor) -> None:
         dialog = f"Are you sure?\n\n This will delete hypervisor: {event.hypervisor.url}"
         self.push_screen(
             ConfirmScreen(dialog),
@@ -165,18 +147,14 @@ class ArcaneMage(App):
         )
 
     @on(WelcomeScreenProxmox.ProvisionNode)
-    def on_provision_node(
-        self, event: WelcomeScreenProxmox.ProvisionNode
-    ) -> None:
+    def on_provision_node(self, event: WelcomeScreenProxmox.ProvisionNode) -> None:
         self.push_screen(
             ProvisionNodeScreen(event.fluxnode),
             self.provision_node_callback,
         )
 
     @on(WelcomeScreenProxmox.ProvisionAllNodes)
-    def on_provision_all_nodes(
-        self, event: WelcomeScreenProxmox.ProvisionAllNodes
-    ) -> None:
+    def on_provision_all_nodes(self, event: WelcomeScreenProxmox.ProvisionAllNodes) -> None:
         self.provision_all_nodes(event.delay)
 
     @work(name="provision_all_nodes")
@@ -230,9 +208,7 @@ class ArcaneMage(App):
 
             last = fluxnode == provisionable_nodes.last
 
-            worker = await self.provision_node_callback(
-                fluxnode, delete_efi=last
-            )
+            worker = await self.provision_node_callback(fluxnode, delete_efi=last)
 
             if not worker:
                 break

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/fat_writer.py

@@ -173,10 +173,7 @@ class FAT12Writer:
         # Write data to clusters
         bytes_written = 0
         for cluster_num in free_clusters:
-            cluster_offset = (
-                (bs.first_data_sector + ((cluster_num - 2) * bs.sectors_per_cluster))
-                * bs.bytes_per_sector
-            )
+            cluster_offset = (bs.first_data_sector + ((cluster_num - 2) * bs.sectors_per_cluster)) * bs.bytes_per_sector
             cluster_size = bs.bytes_per_sector * bs.sectors_per_cluster
             chunk = data[bytes_written : bytes_written + cluster_size]
 
@@ -394,9 +391,7 @@ class FAT12Writer:
         """Get current time in DOS format."""
         now = time.localtime()
 
-        dos_date = (
-            ((now.tm_year - 1980) << 9) | (now.tm_mon << 5) | now.tm_mday
-        )
+        dos_date = ((now.tm_year - 1980) << 9) | (now.tm_mon << 5) | now.tm_mday
         dos_time = (now.tm_hour << 11) | (now.tm_min << 5) | (now.tm_sec // 2)
 
         return dos_date, dos_time

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/helpers.py

@@ -55,9 +55,7 @@ class ExecBinaryError(ChildProcessError):
         return self.__stderr.decode(errors="ignore")
 
     def __str__(self) -> str:
-        return "Failed to execute '{}', error: {}".format(
-            " ".join(self.__cmd), self.stderr()
-        )
+        return "Failed to execute '{}', error: {}".format(" ".join(self.__cmd), self.stderr())
 
 
 def demote(user_uid: int, user_gid: int) -> Callable[[], None]:
@@ -260,9 +258,7 @@ async def do_http_iter(
                     resp: ClientResponse
 
                     if resp.status in [429, 500, 502, 503, 504]:
-                        log.warning(
-                            "URL: %s, Status: %s... retrying", url, resp.status
-                        )
+                        log.warning("URL: %s, Status: %s... retrying", url, resp.status)
                         if remaining or not max_tries:
                             await asyncio.sleep(retry_interval)
 

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/log.py

@@ -20,30 +20,32 @@ _BASE_HANDLERS: dict[str, dict[str, str | int]] = {
 
 
 def _apply_config(handlers: dict[str, dict[str, str | int]], handler_names: list[str]) -> None:
-    dictConfig({
-        "version": 1,
-        "disable_existing_loggers": True,
-        "formatters": {
-            "standard": {
-                "format": _LOG_FORMAT,
-                "datefmt": _LOG_DATEFMT,
-                "style": "{",
+    dictConfig(
+        {
+            "version": 1,
+            "disable_existing_loggers": True,
+            "formatters": {
+                "standard": {
+                    "format": _LOG_FORMAT,
+                    "datefmt": _LOG_DATEFMT,
+                    "style": "{",
+                },
             },
-        },
-        "handlers": _BASE_HANDLERS | handlers,
-        "loggers": {
-            "": {
-                "handlers": [],
-                "level": "WARNING",
-                "propagate": False,
-            },
-            "arcane_mage": {
-                "handlers": handler_names,
-                "level": "INFO",
-                "propagate": False,
+            "handlers": _BASE_HANDLERS | handlers,
+            "loggers": {
+                "": {
+                    "handlers": [],
+                    "level": "WARNING",
+                    "propagate": False,
+                },
+                "arcane_mage": {
+                    "handlers": handler_names,
+                    "level": "INFO",
+                    "propagate": False,
+                },
             },
-        },
-    })
+        }
+    )
 
 
 def configure_tui_logging() -> None:

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/models/config.py

@@ -59,7 +59,10 @@ class ArcaneOsConfig:
         ]
 
     async def write_installer_config(self, file_path: Path) -> bool:
-        res = await self.fluxnode.network.write_installer_config(file_path)
+        chain = self.fluxnode.chain
+        res = await self.fluxnode.network.write_installer_config(
+            file_path, labnet=chain is not None and chain.network == "labnet"
+        )
 
         return res
 

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/models/delegate.py

@@ -60,8 +60,7 @@ class Delegate:
         has_raw = self.delegate_private_key is not None
         if has_encrypted and has_raw:
             raise ValueError(
-                "Provide either delegate_private_key_encrypted or "
-                "delegate_private_key + delegate_passphrase, not both"
+                "Provide either delegate_private_key_encrypted or delegate_private_key + delegate_passphrase, not both"
             )
 
         return self

{arcane_mage-2.2.0 → arcane_mage-2.3.0}/src/arcane_mage/models/hypervisor.py

@@ -4,8 +4,6 @@ import contextlib
 from pathlib import Path
 from typing import ClassVar, Literal
 from urllib.parse import urlparse
-
-from ..proxmox import ProxmoxApi
 from uuid import uuid4
 
 import keyring
@@ -15,6 +13,8 @@ from pydantic import TypeAdapter
 from pydantic.dataclasses import Field
 from pydantic.dataclasses import dataclass as py_dataclass
 
+from ..proxmox import ProxmoxApi
+
 
 @py_dataclass
 class HypervisorConfig:
@@ -56,10 +56,7 @@ class HypervisorConfig:
             if parsed:
                 user = parsed.username
 
-        if self.name:
-            base = self.name
-        else:
-            base = urlparse(self.url).hostname or self.url
+        base = self.name or urlparse(self.url).hostname or self.url
 
         return f"{base} ({user})" if user else base