mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-05-12 03:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix(msgraph): normalize webhook dedupe and resource matching

Browse source
This commit is contained in:
Dilee 2026-05-08 00:52:25 +03:00 • committed by Teknium
parent 2a215de9af
commit 26a59e4f6c
2 changed files with 84 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

46
gateway/platforms/msgraph_webhook.py
View file

@ -80,19 +80,15 @@ class MSGraphWebhookAdapter(BasePlatformAdapter):
return raw if raw.startswith("/") else f"/{raw}"
@staticmethod
def _build_receipt_key(notification: Dict[str, Any]) -> str:
def _build_receipt_key(notification: Dict[str, Any]) -> Optional[str]:
explicit_id = str(notification.get("id") or "").strip()
if explicit_id:
return f"id:{explicit_id}"
payload = "|".join(
[
str(notification.get("subscriptionId") or ""),
str(notification.get("changeType") or ""),
str(notification.get("resource") or ""),
json.dumps(notification.get("resourceData") or {}, sort_keys=True),
]
)
return f"sha1:{sha1(payload.encode('utf-8')).hexdigest()}"
return None
@staticmethod
def _normalize_resource_value(resource: str) -> str:
return str(resource or "").strip().strip("/")
def set_notification_scheduler(self, scheduler: Optional[NotificationScheduler]) -> None:
self._notification_scheduler = scheduler
@ -178,10 +174,11 @@ class MSGraphWebhookAdapter(BasePlatformAdapter):
continue
receipt_key = self._build_receipt_key(notification)
if self._has_seen_receipt(receipt_key):
duplicates += 1
continue
self._remember_receipt(receipt_key)
if receipt_key is not None:
if self._has_seen_receipt(receipt_key):
duplicates += 1
continue
self._remember_receipt(receipt_key)
accepted += 1
scheduled += 1
@ -205,10 +202,20 @@ class MSGraphWebhookAdapter(BasePlatformAdapter):
def _resource_accepted(self, resource: str) -> bool:
if not self._accepted_resources:
return True
normalized_resource = self._normalize_resource_value(resource)
for pattern in self._accepted_resources:
if pattern.endswith("*") and resource.startswith(pattern[:-1]):
return True
if resource == pattern or resource.startswith(f"{pattern}/"):
normalized_pattern = self._normalize_resource_value(pattern)
if not normalized_pattern:
continue
if normalized_pattern.endswith("*"):
prefix = normalized_pattern[:-1].rstrip("/")
if normalized_resource == prefix or normalized_resource.startswith(f"{prefix}/"):
return True
continue
if (
normalized_resource == normalized_pattern
or normalized_resource.startswith(f"{normalized_pattern}/")
):
return True
return False
@ -232,8 +239,9 @@ class MSGraphWebhookAdapter(BasePlatformAdapter):
def _build_message_event(
self,
notification: Dict[str, Any],
receipt_key: str,
receipt_key: Optional[str],
) -> MessageEvent:
message_id = receipt_key or f"sha1:{sha1(json.dumps(notification, sort_keys=True).encode('utf-8')).hexdigest()}"
source = self.build_source(
chat_id=f"msgraph:{notification.get('subscriptionId', 'unknown')}",
chat_name="msgraph/webhook",
@ -246,7 +254,7 @@ class MSGraphWebhookAdapter(BasePlatformAdapter):
message_type=MessageType.TEXT,
source=source,
raw_message=notification,
message_id=receipt_key,
message_id=message_id,
internal=True,
)