hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-09 03:10:46 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions 2

fix(ume): accept empty JSON body on successful delete-subscription

Browse source 
Parse 204/empty UME responses without JSONDecodeError; improve request error messages and orphan-delete failure reporting.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-05-22 21:01:24 +08:00
parent a8b359f60d
commit 635cd52d4f
3 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
netx_api/ume_alarm_ws.py
View file

@ -162,7 +162,12 @@ def establish_alarm_subscription_manual(client: UMEClient, db: Session) -> dict[
if not orphan_id:
raise
_ws_log.warning("establish: UME reports existing subscription id=%s, deleting then retry", orphan_id)
_delete_subscription_on_ume(client, orphan_id)
try:
_delete_subscription_on_ume(client, orphan_id)
except RuntimeError as del_exc:
raise RuntimeError(
f"ume_orphan_subscription_delete_failed:id={orphan_id}:{str(del_exc)[:180]}"
) from del_exc
sub_id, uri = client.establish_alarm_subscription(topic=topic)
save_subscription(db, subscription_id=sub_id, wss_uri=uri, topic=topic)
db.commit()

29
netx_api/ume_client.py
View file

@ -23,6 +23,21 @@ def _coerce_list(value: Any) -> list[Any]:
return value if isinstance(value, list) else []
def _parse_json_response(resp: httpx.Response) -> dict[str, Any]:
"""Parse JSON body; UME often returns 204/empty body on successful DELETE operations."""
raw = str(resp.text or "").strip()
if not raw:
return {}
try:
return _coerce_dict(resp.json())
except json.JSONDecodeError as exc:
if resp.is_success:
return {}
raise RuntimeError(
f"ume_request_failed:{int(resp.status_code)}:non_json_body:{raw[:200]}"
) from exc
@dataclass
class RequestDiagnostics:
method: str
@ -422,8 +437,9 @@ class UMEClient:
marker=marker,
is_end_of_reply=is_end_of_reply,
)
raise RuntimeError(f"ume_request_failed:{resp.status_code}:{resp.text[:240]}")
data = _coerce_dict(resp.json())
body_snip = raw[:240] if (raw := str(resp.text or "").strip()) else "(empty body)"
raise RuntimeError(f"ume_request_failed:{m} {path} {resp.status_code}:{body_snip}")
data = _parse_json_response(resp)
diag = RequestDiagnostics(
method=m,
path=path,
@ -437,7 +453,7 @@ class UMEClient:
except Exception as exc:
if isinstance(exc, RuntimeError):
raise
raise RuntimeError(f"ume_request_failed:{str(exc)[:240]}") from exc
raise RuntimeError(f"ume_request_failed:{m} {path}:{str(exc)[:200]}") from exc
def request_json(
self,
@ -477,8 +493,9 @@ class UMEClient:
marker=marker,
is_end_of_reply=is_end_of_reply,
)
raise RuntimeError(f"ume_request_failed:{resp.status_code}:{resp.text[:240]}")
data = _coerce_dict(resp.json())
body_snip = raw[:240] if (raw := str(resp.text or "").strip()) else "(empty body)"
raise RuntimeError(f"ume_request_failed:{m} {path} {resp.status_code}:{body_snip}")
data = _parse_json_response(resp)
diag = RequestDiagnostics(
method=m,
path=path,
@ -492,7 +509,7 @@ class UMEClient:
except Exception as exc:
if isinstance(exc, RuntimeError):
raise
raise RuntimeError(f"ume_request_failed:{str(exc)[:240]}") from exc
raise RuntimeError(f"ume_request_failed:{m} {path}:{str(exc)[:200]}") from exc
def _extract_named_list(self, payload: dict[str, Any], keys: list[str]) -> list[dict[str, Any]]:
target_keys = {str(k).lower() for k in keys}