webex-message-handler 0.6.3__tar.gz → 0.6.4__tar.gz

{webex_message_handler-0.6.3 → webex_message_handler-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex-message-handler
-Version: 0.6.3
+Version: 0.6.4
 Summary: Lightweight Webex Mercury WebSocket + KMS decryption for receiving bot messages without the full Webex SDK
 Project-URL: Homepage, https://github.com/3rg0n/webex-message-handler
 Project-URL: Repository, https://github.com/3rg0n/webex-message-handler

{webex_message_handler-0.6.3 → webex_message_handler-0.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "webex-message-handler"
-version = "0.6.3"
+version = "0.6.4"
 description = "Lightweight Webex Mercury WebSocket + KMS decryption for receiving bot messages without the full Webex SDK"
 readme = "README.md"
 license = "MIT"

{webex_message_handler-0.6.3 → webex_message_handler-0.6.4}/src/webex_message_handler/__init__.py

@@ -10,6 +10,7 @@ from .errors import (
     WebexError,
 )
 from .handler import WebexMessageHandler
+from .id_utils import from_rest_id, to_rest_id
 from .kms_client import KmsClient
 from .logger import Logger, console_logger, noop_logger
 from .mercury_socket import MercurySocket
@@ -29,6 +30,7 @@ from .types import (
     MercuryActor,
     MercuryEnvelope,
     MercuryObject,
+    MercuryParent,
     MercuryTarget,
     NetworkMode,
     WebexMessageHandlerConfig,
@@ -54,11 +56,15 @@ __all__ = [
     "Logger",
     "noop_logger",
     "console_logger",
+    # ID utilities
+    "to_rest_id",
+    "from_rest_id",
     # Types
     "WebexMessageHandlerConfig",
     "DeviceRegistration",
     "MercuryActor",
     "MercuryObject",
+    "MercuryParent",
     "MercuryTarget",
     "MercuryActivity",
     "MercuryEnvelope",

{webex_message_handler-0.6.3 → webex_message_handler-0.6.4}/src/webex_message_handler/handler.py

@@ -463,13 +463,14 @@ class WebexMessageHandler:
 
             decrypted = await self._message_decryptor.decrypt_activity(activity)
             message = DecryptedMessage(
-                id=decrypted.object.id,
+                id=decrypted.id,
                 room_id=decrypted.target.id,
                 person_id=decrypted.actor.id,
                 person_email=decrypted.actor.email_address or "",
                 text=decrypted.object.display_name or "",
-                html=decrypted.object.content,
                 created=decrypted.published,
+                parent_id=decrypted.parent.id if decrypted.parent else None,
+                html=decrypted.object.content,
                 room_type=self._infer_room_type(decrypted),
                 raw=decrypted,
             )

webex_message_handler-0.6.4/src/webex_message_handler/id_utils.py

@@ -0,0 +1,39 @@
+"""Convert between Mercury activity UUIDs and Webex REST API IDs."""
+
+import base64
+
+
+def to_rest_id(uuid: str, resource_type: str) -> str:
+    """Convert a Mercury activity UUID to a Webex REST API ID.
+
+    Mercury uses raw UUIDs; the REST API uses base64-encoded
+    ``ciscospark://us/{type}/{uuid}`` URIs.
+
+    Args:
+        uuid: Mercury UUID (e.g. activity.id).
+        resource_type: Resource type — 'MESSAGE', 'PEOPLE', or 'ROOM'.
+
+    Returns:
+        REST API–compatible ID string.
+    """
+    uri = f"ciscospark://us/{resource_type}/{uuid}"
+    return base64.b64encode(uri.encode()).decode()
+
+
+def from_rest_id(rest_id: str) -> str:
+    """Convert a Webex REST API ID back to a raw UUID.
+
+    Args:
+        rest_id: Base64-encoded REST API ID.
+
+    Returns:
+        The raw UUID portion.
+
+    Raises:
+        ValueError: If the format is invalid.
+    """
+    decoded = base64.b64decode(rest_id).decode()
+    last_slash = decoded.rfind("/")
+    if last_slash == -1:
+        raise ValueError(f"Invalid REST ID format: {rest_id}")
+    return decoded[last_slash + 1 :]

{webex_message_handler-0.6.3 → webex_message_handler-0.6.4}/src/webex_message_handler/mercury_socket.py

@@ -15,7 +15,7 @@ import aiohttp
 
 from .errors import AuthError, MercuryConnectionError
 from .logger import Logger, noop_logger
-from .types import InjectedWebSocket, MercuryActivity, MercuryActor, MercuryObject, MercuryTarget, WebSocketFactory
+from .types import InjectedWebSocket, MercuryActivity, MercuryActor, MercuryObject, MercuryParent, MercuryTarget, WebSocketFactory
 
 
 class MercurySocket:
@@ -388,6 +388,14 @@ def _parse_activity(raw: dict[str, Any]) -> MercuryActivity:
     actor_raw = raw.get("actor", {})
     object_raw = raw.get("object", {})
     target_raw = raw.get("target", {})
+    parent_raw = raw.get("parent")
+
+    parent = None
+    if parent_raw:
+        parent = MercuryParent(
+            id=parent_raw.get("id", ""),
+            type=parent_raw.get("type", ""),
+        )
 
     return MercuryActivity(
         id=raw.get("id", ""),
@@ -412,4 +420,5 @@ def _parse_activity(raw: dict[str, Any]) -> MercuryActivity:
         ),
         published=raw.get("published", ""),
         encryption_key_url=raw.get("encryptionKeyUrl"),
+        parent=parent,
     )

{webex_message_handler-0.6.3 → webex_message_handler-0.6.4}/src/webex_message_handler/types.py

@@ -132,6 +132,14 @@ class DeviceRegistration:
 
 # --- Mercury Activity ---
 
+@dataclass
+class MercuryParent:
+    """Parent reference for threaded replies."""
+
+    id: str
+    type: str
+
+
 @dataclass
 class MercuryActor:
     """Actor in a Mercury activity."""
@@ -173,6 +181,7 @@ class MercuryActivity:
     target: MercuryTarget
     published: str
     encryption_key_url: str | None = None
+    parent: MercuryParent | None = None
 
 
 @dataclass
@@ -193,7 +202,7 @@ class DecryptedMessage:
     """A decrypted Webex message."""
 
     id: str
-    """Unique message ID."""
+    """Mercury activity UUID. Works as parentId for threaded replies."""
 
     room_id: str
     """Conversation/space ID."""
@@ -210,6 +219,9 @@ class DecryptedMessage:
     created: str
     """ISO 8601 timestamp."""
 
+    parent_id: str | None = None
+    """Parent activity UUID for threaded replies. None if not a thread reply."""
+
     html: str | None = None
     """Decrypted HTML content (rich text messages)."""
 

{webex_message_handler-0.6.3 → webex_message_handler-0.6.4}/tests/test_handler.py

@@ -10,6 +10,7 @@ from webex_message_handler.types import (
     MercuryActivity,
     MercuryActor,
     MercuryObject,
+    MercuryParent,
     MercuryTarget,
     WebexMessageHandlerConfig,
 )
@@ -228,13 +229,32 @@ class TestMessageHandling:
 
         assert len(messages) == 1
         msg = messages[0]
-        assert msg.id == "comment-789"
+        assert msg.id == "msg-123"
         assert msg.room_id == "room-101"
         assert msg.person_id == "person-456"
         assert msg.person_email == "user@example.com"
         assert msg.text == "Test Message"
         assert msg.html == "<p>Test Message</p>"
         assert msg.room_type == "group"
+        assert msg.parent_id is None
+
+    async def test_handle_threaded_reply(self):
+        handler = _make_handler()
+        handler._message_decryptor = MagicMock()
+        activity = _make_activity(
+            parent=MercuryParent(id="parent-activity-uuid", type="reply"),
+        )
+        handler._message_decryptor.decrypt_activity = AsyncMock(return_value=activity)
+
+        messages = []
+        handler.on("message:created", lambda msg: messages.append(msg))
+
+        await handler._handle_activity(activity)
+
+        assert len(messages) == 1
+        msg = messages[0]
+        assert msg.id == "msg-123"
+        assert msg.parent_id == "parent-activity-uuid"
 
     async def test_handle_message_deleted(self):
         handler = _make_handler()

webex_message_handler-0.6.4/tests/test_id_utils.py

@@ -0,0 +1,37 @@
+"""Tests for ID conversion utilities."""
+
+import pytest
+
+from webex_message_handler.id_utils import from_rest_id, to_rest_id
+
+
+class TestToRestId:
+    def test_roundtrip(self):
+        uuid = "abc-123-def"
+        rest_id = to_rest_id(uuid, "MESSAGE")
+        assert from_rest_id(rest_id) == uuid
+
+    def test_resource_types(self):
+        for rt in ("MESSAGE", "PEOPLE", "ROOM"):
+            rest_id = to_rest_id("uuid-1", rt)
+            assert from_rest_id(rest_id) == "uuid-1"
+
+    def test_non_empty(self):
+        rest_id = to_rest_id("test-uuid", "MESSAGE")
+        assert rest_id != ""
+        assert rest_id != "test-uuid"
+
+
+class TestFromRestId:
+    def test_invalid_base64(self):
+        # Not valid base64 — should raise
+        with pytest.raises(Exception):
+            from_rest_id("!!!invalid!!!")
+
+    def test_invalid_format(self):
+        # Valid base64 but no slash in decoded string
+        import base64
+
+        encoded = base64.b64encode(b"noslash").decode()
+        with pytest.raises(ValueError):
+            from_rest_id(encoded)