qapu-cli 0.63.0__tar.gz → 0.65.0__tar.gz

{qapu_cli-0.63.0 → qapu_cli-0.65.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qapu-cli
-Version: 0.63.0
+Version: 0.65.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

{qapu_cli-0.63.0 → qapu_cli-0.65.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qapu-cli"
-version = "0.63.0"
+version = "0.65.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.63.0 → qapu_cli-0.65.0}/qapu_cli/client.py

@@ -473,6 +473,14 @@ def auth_post(path: str, json_body: dict[str, Any] | None = None) -> Any:
 	return _auth_request("POST", path, json_body=json_body)
 
 
+def auth_put(path: str, params: dict[str, Any] | None = None, json_body: dict[str, Any] | None = None) -> Any:
+
+	# Issue a Bearer-Authenticated PUT Request to services/auth (2026-10-05,
+	# Operator-Access Tiers - the First PUT Caller on This Seam, e.g.
+	# PUT /user/{user_id}/tier)
+	return _auth_request("PUT", path, params=params, json_body=json_body)
+
+
 def auth_delete(path: str, params: dict[str, Any] | None = None) -> Any:
 
 	# Issue a Bearer-Authenticated DELETE Request to services/auth

{qapu_cli-0.63.0 → qapu_cli-0.65.0}/qapu_cli/main.py

@@ -6012,6 +6012,68 @@ def user_delete(user_id: int = typer.Argument(...)):
 	typer.echo(result.get("Message", result))
 
 
+# Operator-Access Tiers (2026-10-05) - These 3 Commands go Through
+# services/auth's own Bearer-JWT Seam (client.auth_get/auth_put, Requires
+# `qapu login` First), not the Hermes Shared-Secret Seam Every Other
+# `user *` Command Above Uses - Tier/Permission-Package Management Lives
+# Exclusively on services/auth, Admin-Only (require_token_management_or_
+# admin, Which Also Accepts the Scope-Limited Token a Normal `qapu login`
+# Issues, as Long as the Logged-in Account's own Role_ID is Admin).
+@user_app.command("tiers")
+def user_tiers(as_json: bool = typer.Option(False, "--json")):
+	"""List the 3 named operator-access tiers (user/supervisor/admin) and the permission package codes each one carries (GET /tiers, admin only)."""
+	result: dict[str, list[str]] = client.auth_get("/tiers")
+	if as_json:
+		typer.echo(json.dumps(result, indent=2, ensure_ascii=False))
+		return
+	table = Table(title="Operatör Yetki Seviyeleri", box=box.ROUNDED)
+	table.add_column("SEVİYE", style="bold")
+	table.add_column("PAKETLER")
+	for tier, packages in result.items():
+		table.add_row(tier, ", ".join(sorted(packages)))
+	console.print(table)
+
+
+# List a User's Currently Granted Permission Packages - the Underlying
+# Grants a Tier Assignment (set-role Below) Actually Writes, Exposed
+# Directly for When Someone's Access Looks Off and the Real Question is
+# "what packages does this account ACTUALLY hold right now."
+@user_app.command("permissions")
+def user_permissions(user_id: int = typer.Argument(...), as_json: bool = typer.Option(False, "--json")):
+	"""List a user's currently granted permission packages (GET /user/{user_id}/permissions, admin only)."""
+	items: list[dict[str, Any]] = client.auth_get(f"/user/{user_id}/permissions")
+	if as_json:
+		typer.echo(json.dumps(items, indent=2, ensure_ascii=False))
+		return
+	if not items:
+		console.print(f"[dim]Kullanıcı {user_id} için tanımlı yetki paketi yok.[/dim]")
+		return
+	table = Table(title=f"Kullanıcı {user_id} - Yetki Paketleri", box=box.ROUNDED)
+	table.add_column("PAKET", style="bold")
+	table.add_column("AÇIKLAMA")
+	table.add_column("VEREN", justify="right")
+	table.add_column("TARİH")
+	for item in sorted(items, key=lambda i: (i.get("Package") or {}).get("Code") or ""):
+		package = item.get("Package") or {}
+		table.add_row(package.get("Code") or "-", package.get("Description") or "-", str(item.get("Granted_By") or "-"), str(item.get("Create_Time") or "-"))
+	console.print(table)
+
+
+# Set a User's Operator-Access Tier - the Real Admin Command This Whole
+# 3-Tier Redesign (2026-10-05) was Built For: Grants Everything the
+# Target Tier Carries, Revokes Anything From a Higher Tier the Account
+# Might Currently Hold, in One Call (apply_tier()'s own "EXACT Sync"
+# Semantics - see common/qapu_common/domain/permission.py).
+@user_app.command("set-role")
+def user_set_role(
+	user_id: int = typer.Argument(...),
+	tier: str = typer.Argument(..., help="One of: user, supervisor, admin."),
+):
+	"""Apply a named operator-access tier to a user - readonly packages for 'user', plus write/mcp:full-access for 'supervisor', plus admin-only packages for 'admin' (PUT /user/{user_id}/tier, admin only)."""
+	result = client.auth_put(f"/user/{user_id}/tier", params={"tier": tier})
+	typer.echo(result.get("Message", result))
+
+
 # List One Device's Irrigation Events
 @irrigation_app.command("list")
 def irrigation_list(device_id: str = typer.Argument(...), as_json: bool = typer.Option(False, "--json")):

{qapu_cli-0.63.0 → qapu_cli-0.65.0}/qapu_cli/tui/screens/device_edit.py

@@ -116,35 +116,52 @@ class DeviceEditScreen(ModalScreen[bool]):
 		self._all_groups = groups
 		self._original_group_ids = group_ids
 
-		# Proje
+		# Proje - Cihazın Şu Anki Project.ID Katalogda Bulunmayabilir (en
+		# Başta id=0 "Unknown" Placeholder - GET /hermes/projects Onu
+		# Bilerek Hariç Tutuyor, bkz. Device.list()'in Aynı Kuralı) -
+		# Select.value'yu Sadece Gerçekten Seçenekler Arasındaysa Set Et,
+		# Yoksa Boş Bırak (Select.NULL) - Kör Atama Textual'ın Kendi
+		# InvalidSelectValueError'ını Fırlatıp Tüm TUI'yi Çökertiyordu
+		# (Canlı Yakalandı, 2026-10-05: Project_ID=0 Olan Gerçek bir Cihaz
+		# Üzerinde). _do_save() zaten Select.NULL'ü "Kullanıcı Seçim
+		# Yapmadı" Olarak Okuyor, o Yüzden Boş Bırakmak Mevcut Değeri
+		# Sessizce Korur - Kullanıcı Elle Yeni bir Proje Seçerse Yine
+		# Normal Şekilde pending'e Girer.
+		project_options = [(p.get("Name") or f"#{p['ID']}", p["ID"]) for p in projects if p.get("ID") is not None]
 		project_select = self.query_one("#edit-project", Select)
-		project_select.set_options([(p.get("Name") or f"#{p['ID']}", p["ID"]) for p in projects if p.get("ID") is not None])
-		if self._initial_project_id is not None:
+		project_select.set_options(project_options)
+		if self._initial_project_id is not None and self._initial_project_id in {pid for _, pid in project_options}:
 			project_select.value = self._initial_project_id
 
 		# Cihaz Durumu - Sadece 1xx (Cihaz Durumları) Aralığı, Başlık
-		# Satırı (id=100) Hariç - device_edit()'in Kendi Filtresiyle Birebir
+		# Satırı (id=100) Hariç - device_edit()'in Kendi Filtresiyle Birebir.
+		# Aynı Gerekçeyle (Yukarıdaki Proje Notu) Mevcut Status.ID Filtreli
+		# Listede Yoksa Boş Bırak.
 		device_statuses = [s for s in statuses if s.get("ID") is not None and 100 <= s["ID"] < 200 and s["ID"] != 100]
+		status_options = [(s.get("Name") or f"#{s['ID']}", s["ID"]) for s in device_statuses]
 		status_select = self.query_one("#edit-status", Select)
-		status_select.set_options([(s.get("Name") or f"#{s['ID']}", s["ID"]) for s in device_statuses])
-		if self._initial_status_id is not None:
+		status_select.set_options(status_options)
+		if self._initial_status_id is not None and self._initial_status_id in {sid for _, sid in status_options}:
 			status_select.value = self._initial_status_id
 
 		# Üretici - Yuvarlak-Bin Kategori Başlık Satırlarını Hariç Tut (Aynı
 		# device_edit()/manufacturer_list Konvansiyonu)
 		real_manufacturers = [m for m in manufacturers if m.get("ID") is not None and m["ID"] % 1000 != 0]
+		manufacturer_options = [(m.get("Name") or f"#{m['ID']}", m["ID"]) for m in real_manufacturers]
 		manufacturer_select = self.query_one("#edit-manufacturer", Select)
-		manufacturer_select.set_options([(m.get("Name") or f"#{m['ID']}", m["ID"]) for m in real_manufacturers])
+		manufacturer_select.set_options(manufacturer_options)
 
 		# Model - Mevcut Modelin Üreticisini manufacturer_models'daki Kendi
 		# Kaydından Çöz (Hardware.Model'in Manufacturer_ID Taşıdığı
-		# Varsayılmıyor - Doğrulanmadı), Sonra o Üreticiye Göre Filtrele
+		# Varsayılmıyor - Doğrulanmadı), Sonra o Üreticiye Göre Filtrele.
+		# initial_manufacturer_id'nin Üretici Listesinde Gerçekten Var
+		# Olduğu da Ayrıca Doğrulanıyor (Aynı Gerekçe).
 		initial_manufacturer_id: Optional[int] = None
 		if self._initial_model_id is not None:
 			current_model = next((mo for mo in models if mo.get("ID") == self._initial_model_id), None)
 			if current_model:
 				initial_manufacturer_id = current_model.get("Manufacturer_ID")
-		if initial_manufacturer_id is not None:
+		if initial_manufacturer_id is not None and initial_manufacturer_id in {mid for _, mid in manufacturer_options}:
 			manufacturer_select.value = initial_manufacturer_id
 			self._set_model_options(initial_manufacturer_id, preselect=self._initial_model_id)
 
@@ -184,8 +201,12 @@ class DeviceEditScreen(ModalScreen[bool]):
 	def _set_model_options(self, manufacturer_id: int, preselect: Optional[int]) -> None:
 		model_select = self.query_one("#edit-model", Select)
 		matching = [mo for mo in self._all_models if mo.get("Manufacturer_ID") == manufacturer_id]
-		model_select.set_options([(mo.get("Name") or f"#{mo['ID']}", mo["ID"]) for mo in matching if mo.get("ID") is not None])
-		if preselect is not None:
+		model_options = [(mo.get("Name") or f"#{mo['ID']}", mo["ID"]) for mo in matching if mo.get("ID") is not None]
+		model_select.set_options(model_options)
+		# Aynı Gerekçe (Yukarıdaki Proje/Durum/Üretici Notu) - preselect Bu
+		# Üreticinin Filtrelenmiş Model Listesinde Gerçekten Yoksa Boş
+		# Bırak, Kör Atama Çökertmesin.
+		if preselect is not None and preselect in {mid for _, mid in model_options}:
 			model_select.value = preselect
 		else:
 			model_select.value = Select.NULL

{qapu_cli-0.63.0 → qapu_cli-0.65.0}/qapu_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qapu-cli
-Version: 0.63.0
+Version: 0.65.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

{qapu_cli-0.63.0 → qapu_cli-0.65.0}/tests/test_tui_device_edit.py

@@ -127,6 +127,37 @@ async def test_group_change_with_assigned_by_calls_assign(monkeypatch):
 		assert assign_calls == [(2, "TEST-DEVICE-1", 204)]
 
 
+@pytest.mark.asyncio
+async def test_device_with_project_not_in_catalog_opens_without_crashing(monkeypatch):
+	# Real Crash Caught Live (2026-10-05): a Device Whose Current
+	# Project.ID is 0 ("Unknown" Placeholder, Deliberately Excluded From
+	# GET /hermes/projects - Same Exclusion Project.list() Already
+	# Applies) has no Matching Entry in the Catalog-Fetched Options, so
+	# Blindly Assigning Select.value = 0 Raised Textual's own
+	# InvalidSelectValueError and Crashed the Whole TUI. The Fix Leaves
+	# the Field Blank (Select.NULL) Instead of Crashing - Confirmed Here
+	# for Project/Status/Manufacturer/Model all at Once (Same Bug Class,
+	# Same Fix Shape, in _apply_options()/_set_model_options()).
+	_install_catalog_mocks(monkeypatch, device_group_ids=[])
+	device_with_unknown_everything = {
+		"ID": "TEST-DEVICE-2",
+		"Name": "Eski Cihaz",
+		"Description": "",
+		"Project": {"ID": 0, "Name": "Unknown"},
+		"Status": {"ID": 999, "Name": "Not In Catalog"},
+		"Hardware": {"Model": {"ID": 9999, "Name": "Not In Catalog"}},
+	}
+	app = QapuTUIApp()
+	async with app.run_test() as pilot:
+		await app.push_screen(DeviceEditScreen("TEST-DEVICE-2", device_with_unknown_everything))
+		await pilot.pause(0.2)
+		from textual.widgets import Select
+		assert isinstance(app.screen, DeviceEditScreen)
+		assert app.screen.query_one("#edit-project", Select).value is Select.NULL
+		assert app.screen.query_one("#edit-status", Select).value is Select.NULL
+		assert app.screen.query_one("#edit-model", Select).value is Select.NULL
+
+
 @pytest.mark.asyncio
 async def test_save_with_nothing_changed_calls_no_mutation(monkeypatch):
 	_install_catalog_mocks(monkeypatch, device_group_ids=[1])