qapu-cli 0.76.0__tar.gz → 0.78.0__tar.gz

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qapu-cli
-Version: 0.76.0
+Version: 0.78.0
 Summary: CLI client for the Qapu API - built for the Hermes agent, but usable by anyone talking to api.ovoo.com.tr from outside the Swarm.
 Author: OVOO Technology
 Classifier: Programming Language :: Python :: 3
@@ -730,7 +730,7 @@ Live-tested: a real 404 (`synthesis get 99999`) rendered as a red panel with the
 
 Getting set up: `qapu login` (Username+Password, the default - prompts for whatever's missing), then `qapu auth-token create <label> --packages catalog:read,telemetry:read,...` (must be a subset of your own account's granted packages - ask an admin if a `403` says you're missing one) - that command offers to save the freshly-minted token as this machine's active one right there, since the raw value is only ever shown once. `qapu auth-token use <token>` saves one you already have (e.g. minted on another machine, or printed by an earlier run you didn't save at the time) without minting a new one. The saved value lives at `~/.config/qapu/credentials.json`'s `Hermes_API_Token` key (mode 600) - a SEPARATE key from `Access_Token` (the `qapu login`-issued JWT, deliberately scope-limited to token management only and not itself a valid Hermes credential) - `qapu logout` clears the login session but deliberately leaves a saved Hermes token alone, since it has its own independent expiry/revocation lifecycle. `qapu whoami` shows whether each of the two is currently configured.
 
-This is the exact same token `services/mcp`'s full-access instance and `services/cinga_ai` now use to reach Hermes too (forwarded/minted per-caller rather than a shared secret) - see those services' own READMEs.
+This is the exact same token `services/mcp`'s full-access instance and `Cinga_AI/runtime/service` now use to reach Hermes too (forwarded/minted per-caller rather than a shared secret) - see those services' own READMEs.
 
 ## Running locally
 

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/README.md

@@ -713,7 +713,7 @@ Live-tested: a real 404 (`synthesis get 99999`) rendered as a red panel with the
 
 Getting set up: `qapu login` (Username+Password, the default - prompts for whatever's missing), then `qapu auth-token create <label> --packages catalog:read,telemetry:read,...` (must be a subset of your own account's granted packages - ask an admin if a `403` says you're missing one) - that command offers to save the freshly-minted token as this machine's active one right there, since the raw value is only ever shown once. `qapu auth-token use <token>` saves one you already have (e.g. minted on another machine, or printed by an earlier run you didn't save at the time) without minting a new one. The saved value lives at `~/.config/qapu/credentials.json`'s `Hermes_API_Token` key (mode 600) - a SEPARATE key from `Access_Token` (the `qapu login`-issued JWT, deliberately scope-limited to token management only and not itself a valid Hermes credential) - `qapu logout` clears the login session but deliberately leaves a saved Hermes token alone, since it has its own independent expiry/revocation lifecycle. `qapu whoami` shows whether each of the two is currently configured.
 
-This is the exact same token `services/mcp`'s full-access instance and `services/cinga_ai` now use to reach Hermes too (forwarded/minted per-caller rather than a shared secret) - see those services' own READMEs.
+This is the exact same token `services/mcp`'s full-access instance and `Cinga_AI/runtime/service` now use to reach Hermes too (forwarded/minted per-caller rather than a shared secret) - see those services' own READMEs.
 
 ## Running locally
 

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qapu-cli"
-version = "0.76.0"
+version = "0.78.0"
 description = "CLI client for the Qapu API - built for the Hermes agent, but usable by anyone talking to api.ovoo.com.tr from outside the Swarm."
 readme = "README.md"
 requires-python = ">=3.10"

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/qapu_cli/command_packages.py

@@ -200,8 +200,11 @@ COMMAND_REQUIRED_PACKAGES: dict[str, frozenset[str]] = {
 	"score_watch": frozenset({"scores:read", "telemetry:read"}),
 	"setting_get": frozenset({"settings:read"}),
 	"setting_update": frozenset({"settings:write"}),
+	"sim_add": frozenset({"hardware-catalog:write"}),
+	"sim_delete": frozenset({"hardware-catalog:write"}),
 	"sim_get": frozenset({"hardware-catalog:read"}),
 	"sim_list": frozenset({"hardware-catalog:read"}),
+	"sim_update": frozenset({"hardware-catalog:write"}),
 	"site_add": frozenset({"infrastructure:write"}),
 	"site_context": frozenset({"infrastructure:read"}),
 	"site_delete": frozenset({"infrastructure:write"}),

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/qapu_cli/main.py

@@ -4277,7 +4277,6 @@ def sim_list(
 	as_json: bool = typer.Option(False, "--json"),
 	operator_id: Optional[int] = typer.Option(None, "--operator-id"),
 	active: Optional[bool] = typer.Option(None, "--active/--inactive"),
-	online: Optional[bool] = typer.Option(None, "--online/--offline"),
 	limit: Optional[int] = typer.Option(None, "--limit"),
 ):
 	"""List the SIM inventory (GET /hermes/sims)."""
@@ -4286,15 +4285,13 @@ def sim_list(
 		params["operator_id"] = operator_id
 	if active is not None:
 		params["active"] = active
-	if online is not None:
-		params["online"] = online
 	items: list[dict[str, Any]] = client.get("/hermes/sims", params=params)
 	if limit is not None:
 		items = items[:limit]
 	if as_json:
 		typer.echo(json.dumps(items, indent=2))
 		return
-	_print_paginated(items, _simple_table_builder([("ICCID", "ICCID"), ("NUMBER", "Number"), ("OPERATOR", "Operator.MNC_Operator"), ("STATIC_IP", "Static_IP"), ("STATUS", "Status")]), limit=limit, noun="SIM")
+	_print_paginated(items, _simple_table_builder([("ICCID", "ICCID"), ("NUMBER", "Number"), ("OPERATOR", "Operator.MNC_Brand"), ("APN", "APN"), ("INSTITUTIONAL", "Institutional"), ("STATIC_IP", "Static_IP"), ("STATUS", "Status")]), limit=limit, noun="SIM")
 
 
 # Get One SIM's Detail
@@ -4308,6 +4305,63 @@ def sim_get(iccid: str = typer.Argument(...), as_json: bool = typer.Option(False
 	_print_detail(result)
 
 
+# SIM Body From CLI Options - Only What was Given
+def _sim_body(operator_id: Optional[int], number: Optional[str], static_ip: Optional[str], apn: Optional[str], institutional: Optional[bool], active: Optional[bool]) -> dict[str, Any]:
+	body: dict[str, Any] = {}
+	if operator_id is not None:
+		body["Operator"] = {"ID": operator_id}
+	for key, value in (("Number", number), ("Static_IP", static_ip), ("APN", apn), ("Institutional", institutional), ("Status", active)):
+		if value is not None:
+			body[key] = value
+	return body
+
+
+# Add a SIM
+@sim_app.command("add")
+def sim_add(
+	iccid: str = typer.Argument(..., help="ICCID (18-22 digits)."),
+	operator_id: Optional[int] = typer.Option(None, "--operator-id", help="GSM operator ID (e.g. 28601 Turkcell); defaults to Unknown until the device reports it."),
+	number: Optional[str] = typer.Option(None, "--number"),
+	static_ip: Optional[str] = typer.Option(None, "--static-ip"),
+	apn: Optional[str] = typer.Option(None, "--apn"),
+	institutional: Optional[bool] = typer.Option(None, "--institutional/--not-institutional", help="SIM supplied by a customer institution."),
+	active: Optional[bool] = typer.Option(None, "--active/--inactive"),
+):
+	"""Add a SIM (POST /hermes/sims)."""
+	result = client.post("/hermes/sims", json_body={"ICCID": iccid, **_sim_body(operator_id, number, static_ip, apn, institutional, active)})
+	typer.echo(result.get("Message", result))
+
+
+# Update a SIM
+@sim_app.command("update")
+def sim_update(
+	iccid: str = typer.Argument(...),
+	operator_id: Optional[int] = typer.Option(None, "--operator-id"),
+	number: Optional[str] = typer.Option(None, "--number"),
+	static_ip: Optional[str] = typer.Option(None, "--static-ip"),
+	apn: Optional[str] = typer.Option(None, "--apn"),
+	institutional: Optional[bool] = typer.Option(None, "--institutional/--not-institutional"),
+	active: Optional[bool] = typer.Option(None, "--active/--inactive"),
+):
+	"""Update a SIM - only the options given change (PUT /hermes/sims/{iccid}). APN/operator are also refreshed from the device's own reports."""
+	body = _sim_body(operator_id, number, static_ip, apn, institutional, active)
+	if not body:
+		typer.echo("Nothing to update - give at least one option.")
+		raise typer.Exit(1)
+	result = client.put(f"/hermes/sims/{iccid}", json_body=body)
+	typer.echo(result.get("Message", result))
+
+
+# Delete a SIM - Refused by the API if a Device or any Stored Packet Uses it
+@sim_app.command("delete")
+def sim_delete(iccid: str = typer.Argument(...), yes: bool = typer.Option(False, "--yes", "-y", help="Skip the confirmation prompt.")):
+	"""Delete an unused SIM (DELETE /hermes/sims/{iccid}). A SIM used by a device or any stored packet can't be deleted - deactivate it with `qapu sim update ICCID --inactive`."""
+	if not yes and not typer.confirm(f"Delete SIM {iccid}?"):
+		raise typer.Exit(0)
+	result = client.delete(f"/hermes/sims/{iccid}")
+	typer.echo(result.get("Message", result))
+
+
 # List Firmware Versions
 @firmware_app.command("list")
 def firmware_list(

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/qapu_cli/tui/screens/equipment_form.py

@@ -24,6 +24,30 @@ from textual.screen import ModalScreen
 from textual.widgets import Button, Select, Static, Input
 
 
+# Electrical Parent Choices (2026-10-21) - Every Item on the Same Site/Tree
+# Except the Item Itself and Anything it (Transitively) Feeds, Since
+# Picking One of Those Would Close a Loop. Pure, so it's Testable Without
+# Textual; the API Refuses a Loop on its own Too.
+def electrical_parent_candidates(items: list[dict[str, Any]], equipment_id: Optional[int] = None) -> list[tuple[str, Any]]:
+	fed_by: dict[Any, list[Any]] = {}
+	for item in items:
+		fed_by.setdefault(item.get("Electrical_Parent_ID"), []).append(item.get("ID"))
+	excluded: set = set()
+	if equipment_id is not None:
+		frontier = [equipment_id]
+		while frontier:
+			current = frontier.pop()
+			if current in excluded:
+				continue
+			excluded.add(current)
+			frontier.extend(fed_by.get(current, []))
+	return [
+		(f"#{item['ID']} {(item.get('Type') or {}).get('Name') or '?'}: {item.get('Name') or '-'}", item["ID"])
+		for item in items
+		if item.get("ID") is not None and item["ID"] not in excluded
+	]
+
+
 class EquipmentFormScreen(ModalScreen[Optional[dict[str, Any]]]):
 
 	def __init__(
@@ -32,10 +56,12 @@ class EquipmentFormScreen(ModalScreen[Optional[dict[str, Any]]]):
 		controls_options: list[tuple[str, Any]],
 		parent_equipment_id: Optional[int] = None,
 		equipment: Optional[dict[str, Any]] = None,
+		electrical_parent_options: Optional[list[tuple[str, Any]]] = None,
 	) -> None:
 		super().__init__()
 		self.equipment_type_options = equipment_type_options
 		self.controls_options = controls_options
+		self.electrical_parent_options = electrical_parent_options or []
 		self.parent_equipment_id = parent_equipment_id
 		self.equipment = equipment
 		self.is_edit = equipment is not None
@@ -44,6 +70,9 @@ class EquipmentFormScreen(ModalScreen[Optional[dict[str, Any]]]):
 		equipment = self.equipment or {}
 		type_name = (equipment.get("Type") or {}).get("Name")
 		current_controls = equipment.get("Controls_Equipment_ID")
+		current_electrical_parent = equipment.get("Electrical_Parent_ID")
+		if current_electrical_parent not in {value for _, value in self.electrical_parent_options}:
+			current_electrical_parent = None
 		specs = equipment.get("Specs") or {}
 
 		with VerticalScroll(id="equipment-form"):
@@ -63,6 +92,8 @@ class EquipmentFormScreen(ModalScreen[Optional[dict[str, Any]]]):
 			yield Input(value=equipment.get("Serial_Number") or "", id="form-serial-number")
 			yield Static("Besler/Sürer (Controls)")
 			yield Select(self.controls_options, allow_blank=True, value=current_controls if current_controls is not None else Select.NULL, id="form-controls")
+			yield Static("Elektrik Beslemesi (Electrical Parent)")
+			yield Select(self.electrical_parent_options, allow_blank=True, value=current_electrical_parent if current_electrical_parent is not None else Select.NULL, id="form-electrical-parent")
 			yield Static("Özellikler (Specs, JSON)")
 			yield Input(value=json.dumps(specs, ensure_ascii=False) if specs else "", id="form-specs")
 			yield Static("Not")
@@ -120,6 +151,10 @@ class EquipmentFormScreen(ModalScreen[Optional[dict[str, Any]]]):
 		if controls_select.value is not Select.NULL:
 			body["Controls_Equipment_ID"] = controls_select.value
 
+		electrical_parent_select = self.query_one("#form-electrical-parent", Select)
+		if electrical_parent_select.value is not Select.NULL:
+			body["Electrical_Parent_ID"] = electrical_parent_select.value
+
 		self.dismiss(body)
 
 # End of File

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/qapu_cli/tui/screens/infrastructure.py

@@ -37,7 +37,7 @@ from textual.widgets.tree import TreeNode
 from qapu_cli import main as cli_main
 from qapu_cli.tui import data as tui_data
 from qapu_cli.tui.screens.confirm import ConfirmScreen
-from qapu_cli.tui.screens.equipment_form import EquipmentFormScreen
+from qapu_cli.tui.screens.equipment_form import EquipmentFormScreen, electrical_parent_candidates
 
 # A Unique Sentinel, Distinct From None - MeasurementPointScreen's "İptal"
 # (Cancel the Whole Assign Action) vs. Picking "Bilinmiyor"/Leaving it
@@ -217,6 +217,8 @@ class InfrastructureScreen(Screen):
 		model_str = " ".join(part for part in (model.get("Manufacturer_Name"), model.get("Name")) if part) or "-"
 		controls_id = item.get("Controls_Equipment_ID")
 		controls_str = f"#{controls_id}" if controls_id is not None else "-"
+		electrical_parent_id = item.get("Electrical_Parent_ID")
+		enclosure_id = item.get("Enclosure_ID")
 		return "\n".join([
 			f"[bold]{(item.get('Type') or {}).get('Name') or '-'}[/bold] (#{item.get('ID')})",
 			f"Ad: {item.get('Name') or '-'}",
@@ -225,6 +227,8 @@ class InfrastructureScreen(Screen):
 			f"Seri No: {item.get('Serial_Number') or '-'}",
 			f"Özellikler: {specs or '-'}",
 			f"Besler/Sürer: {controls_str}",
+			f"Elektrik Beslemesi: {f'#{electrical_parent_id}' if electrical_parent_id is not None else '-'}",
+			f"Bulunduğu Pano: {f'#{enclosure_id}' if enclosure_id is not None else '-'}",
 			f"Not: {item.get('Notes') or '-'}",
 		])
 
@@ -258,7 +262,7 @@ class InfrastructureScreen(Screen):
 			return
 		type_options = [(t.get("Name") or f"#{t.get('ID')}", t.get("ID")) for t in equipment_types if t.get("ID") is not None]
 		parent_id = self._current_item.get("ID") if self._current_item else None
-		body = await self.app.push_screen_wait(EquipmentFormScreen(type_options, self._controls_options(), parent_equipment_id=parent_id))
+		body = await self.app.push_screen_wait(EquipmentFormScreen(type_options, self._controls_options(), parent_equipment_id=parent_id, electrical_parent_options=electrical_parent_candidates(list(self._equipment_by_id.values()))))
 		if body is None:
 			return
 		result, error = await self.run_worker(partial(tui_data.add_equipment, body), thread=True).wait()
@@ -276,7 +280,7 @@ class InfrastructureScreen(Screen):
 			self.app.notify("Önce bir ekipman seçin.", severity="warning", title="Altyapı")
 			return
 		item = self._current_item
-		body = await self.app.push_screen_wait(EquipmentFormScreen([], self._controls_options(exclude_id=item.get("ID")), equipment=item))
+		body = await self.app.push_screen_wait(EquipmentFormScreen([], self._controls_options(exclude_id=item.get("ID")), equipment=item, electrical_parent_options=electrical_parent_candidates(list(self._equipment_by_id.values()), item.get("ID"))))
 		if body is None:
 			return
 		result, error = await self.run_worker(partial(tui_data.update_equipment, item["ID"], body), thread=True).wait()

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/qapu_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qapu-cli
-Version: 0.76.0
+Version: 0.78.0
 Summary: CLI client for the Qapu API - built for the Hermes agent, but usable by anyone talking to api.ovoo.com.tr from outside the Swarm.
 Author: OVOO Technology
 Classifier: Programming Language :: Python :: 3
@@ -730,7 +730,7 @@ Live-tested: a real 404 (`synthesis get 99999`) rendered as a red panel with the
 
 Getting set up: `qapu login` (Username+Password, the default - prompts for whatever's missing), then `qapu auth-token create <label> --packages catalog:read,telemetry:read,...` (must be a subset of your own account's granted packages - ask an admin if a `403` says you're missing one) - that command offers to save the freshly-minted token as this machine's active one right there, since the raw value is only ever shown once. `qapu auth-token use <token>` saves one you already have (e.g. minted on another machine, or printed by an earlier run you didn't save at the time) without minting a new one. The saved value lives at `~/.config/qapu/credentials.json`'s `Hermes_API_Token` key (mode 600) - a SEPARATE key from `Access_Token` (the `qapu login`-issued JWT, deliberately scope-limited to token management only and not itself a valid Hermes credential) - `qapu logout` clears the login session but deliberately leaves a saved Hermes token alone, since it has its own independent expiry/revocation lifecycle. `qapu whoami` shows whether each of the two is currently configured.
 
-This is the exact same token `services/mcp`'s full-access instance and `services/cinga_ai` now use to reach Hermes too (forwarded/minted per-caller rather than a shared secret) - see those services' own READMEs.
+This is the exact same token `services/mcp`'s full-access instance and `Cinga_AI/runtime/service` now use to reach Hermes too (forwarded/minted per-caller rather than a shared secret) - see those services' own READMEs.
 
 ## Running locally
 

{qapu_cli-0.76.0 → qapu_cli-0.78.0}/qapu_cli.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ tests/test_logout.py
 tests/test_tui_authorization.py
 tests/test_tui_catalog.py
 tests/test_tui_device_edit.py
+tests/test_tui_electrical_parent.py
 tests/test_tui_groups.py
 tests/test_tui_infrastructure.py
 tests/test_tui_smoke.py

qapu_cli-0.78.0/tests/test_tui_electrical_parent.py

@@ -0,0 +1,62 @@
+# Electrical Parent in the Equipment Form (2026-10-21) - the candidate list
+# never offers the item itself or anything it feeds, and the chosen value
+# is sent as Electrical_Parent_ID. Same headless App.run_test() pattern as
+# test_tui_infrastructure.py.
+
+import pytest
+
+from qapu_cli.tui.app import QapuTUIApp
+from qapu_cli.tui.screens.equipment_form import EquipmentFormScreen, electrical_parent_candidates
+
+BOX = {"ID": 17, "Type": {"Name": "Electric_Box"}, "Name": "Pano"}
+MAIN = {"ID": 19, "Type": {"Name": "Main_Contactor"}, "Name": "Ana Kontaktör", "Electrical_Parent_ID": 17}
+PUMP = {"ID": 18, "Type": {"Name": "Pump"}, "Name": "Pompa", "Electrical_Parent_ID": 19}
+FUSE = {"ID": 28, "Type": {"Name": "Main_Fuse"}, "Name": "Sigorta", "Electrical_Parent_ID": 17}
+ITEMS = [BOX, MAIN, PUMP, FUSE]
+
+
+def _ids(options):
+	return [value for _, value in options]
+
+
+def test_candidates_exclude_the_item_and_everything_it_feeds():
+	assert _ids(electrical_parent_candidates(ITEMS, 17)) == []             # the panel feeds everything here
+	assert _ids(electrical_parent_candidates(ITEMS, 19)) == [17, 28]       # not itself, not the pump it feeds
+	assert _ids(electrical_parent_candidates(ITEMS, 18)) == [17, 19, 28]   # a leaf can pick anything else
+
+
+def test_candidates_for_a_new_item_offer_everything():
+	assert _ids(electrical_parent_candidates(ITEMS)) == [17, 19, 18, 28]
+
+
+def test_candidates_survive_a_loop_already_in_the_data():
+	looped = [{"ID": 1, "Electrical_Parent_ID": 2}, {"ID": 2, "Electrical_Parent_ID": 1}, {"ID": 3}]
+	assert _ids(electrical_parent_candidates(looped, 1)) == [3]
+
+
+@pytest.mark.asyncio
+async def test_form_sends_the_chosen_electrical_parent():
+	results = []
+	app = QapuTUIApp()
+	async with app.run_test() as pilot:
+		form = EquipmentFormScreen([], [], equipment=PUMP, electrical_parent_options=electrical_parent_candidates(ITEMS, 18))
+		await app.push_screen(form, results.append)
+		await pilot.pause(0.2)
+		from textual.widgets import Button, Select
+		select = app.screen.query_one("#form-electrical-parent", Select)
+		assert select.value == 19                     # current value pre-selected
+		select.value = 17
+		app.screen.query_one("#form-save", Button).press()
+		await pilot.pause(0.2)
+	assert results and results[0]["Electrical_Parent_ID"] == 17
+
+
+@pytest.mark.asyncio
+async def test_form_does_not_preselect_a_value_that_would_loop():
+	app = QapuTUIApp()
+	async with app.run_test() as pilot:
+		looped = dict(MAIN, Electrical_Parent_ID=18)  # bad data: the contactor "fed" by its own pump
+		await app.push_screen(EquipmentFormScreen([], [], equipment=looped, electrical_parent_options=electrical_parent_candidates(ITEMS, 19)))
+		await pilot.pause(0.2)
+		from textual.widgets import Select
+		assert app.screen.query_one("#form-electrical-parent", Select).value is Select.NULL