bazaar-compute-node 0.2.2rc2__tar.gz → 0.2.3__tar.gz

{bazaar_compute_node-0.2.2rc2 → bazaar_compute_node-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bazaar-compute-node
-Version: 0.2.2rc2
+Version: 0.2.3
 Summary: Runtime-agnostic computer node daemon for agents and channels.
 License-Expression: AGPL-3.0-only
 License-File: LICENSE

{bazaar_compute_node-0.2.2rc2 → bazaar_compute_node-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.2rc2"
+version = "0.2.3"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"

{bazaar_compute_node-0.2.2rc2 → bazaar_compute_node-0.2.3}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.2rc2"
+version = "0.2.3"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"

{bazaar_compute_node-0.2.2rc2 → bazaar_compute_node-0.2.3}/src/bazaar_compute_node/contrib/lark/channel.py

@@ -437,6 +437,7 @@ class LarkChannel(IChannel):
 
         quoted: Message | None = None
         if parent_id is not None:
+            metadata["provider_reply_to_message_id"] = parent_id
             quoted, failure = await self._quoted_message(
                 parent_id,
                 chat_id=fields.chat_id,
@@ -462,7 +463,6 @@ class LarkChannel(IChannel):
             mentions_agent=target_kind is ChannelTargetKind.GROUP,
             notifies_runtime=True,
             received_at_ms=received_at_ms,
-            reply_to_message_id=quoted.message_id if quoted is not None else None,
             provider_payload_metadata=metadata,
         )
         await self._queue_inbound(
@@ -485,7 +485,6 @@ class LarkChannel(IChannel):
         mentions_agent: bool,
         notifies_runtime: bool,
         received_at_ms: int,
-        reply_to_message_id: str | None = None,
         provider_payload_metadata: Mapping[str, object] | None = None,
     ) -> Message:
         provider_message_id = _provider_text(message.get("message_id"))
@@ -546,7 +545,6 @@ class LarkChannel(IChannel):
             notifies_runtime=notifies_runtime,
             attachments=attachments,
             provider_time_ms=_provider_time_ms(message.get("create_time")),
-            reply_to_message_id=reply_to_message_id,
             metadata=metadata,
         )
 

{bazaar_compute_node-0.2.2rc2 → bazaar_compute_node-0.2.3}/src/bazaar_compute_node/contrib/telegram/channel.py

@@ -779,9 +779,9 @@ class TelegramChannel(IChannel):
         reply = message.get("reply_to_message")
 
         received_at_ms = time_ns() // 1_000_000
-        reply_to_message_id: str | None = None
+        reference: str | None = None
         if isinstance(reply, Mapping):
-            reply_to_message_id = await self._queue_reply_backfill(
+            reference = await self._queue_reply_backfill(
                 reply,
                 update_id=update_id,
                 identity=identity,
@@ -818,8 +818,8 @@ class TelegramChannel(IChannel):
                 notifies_runtime=activation.notifies_runtime,
                 attachments=update.content.attachments,
                 provider_time_ms=update.provider_time_s * 1_000,
-                reply_to_message_id=reply_to_message_id,
                 metadata={
+                    "provider_reply_to_message_id": reference,
                     "telegram_update_id": update_id,
                     "telegram_chat_id": update.chat_id,
                     "telegram_message_thread_id": update.topic_id,
@@ -866,20 +866,20 @@ class TelegramChannel(IChannel):
         bot_username = self._bot_username or ""
         if bot_id is None:
             raise RuntimeError("Telegram bot identity is not initialized")
-        # what the bot itself said is on record as sent; quoted back, it is
-        # not heard a second time as if someone else had said it
         quoted_sender = reply.get("from")
-        if isinstance(quoted_sender, Mapping) and quoted_sender.get("id") == bot_id:
-            return None
         content = await self._content(
             reply,
             bot_id=bot_id,
             bot_username=bot_username,
         )
         if content is None:
-            return None
+            return str(provider_message_id)
 
-        sender = self._sender(reply)
+        sender = (
+            None
+            if isinstance(quoted_sender, Mapping) and quoted_sender.get("id") == bot_id
+            else self._sender(reply)
+        )
         provider_time_s = reply.get("date")
         provider_time_ms: int | None = None
         historical: bool | None = None
@@ -892,12 +892,11 @@ class TelegramChannel(IChannel):
             historical = provider_time_s < self._started_at_s
 
         channel_session_id = identity.channel_session_id
-        message_id = identity.message_id(provider_message_id)
         await self._inbound.put(
             Message(
                 direction=MessageDirection.INBOUND,
                 seq=0,
-                message_id=message_id,
+                message_id=identity.message_id(provider_message_id),
                 thread_id=identity.session_id,
                 channel_session_id=channel_session_id,
                 channel="telegram",
@@ -935,7 +934,7 @@ class TelegramChannel(IChannel):
         )
         self._messages_queued += 1
         self._quoted_messages_queued += 1
-        return message_id
+        return str(provider_message_id)
 
     async def _content(
         self,

{bazaar_compute_node-0.2.2rc2 → bazaar_compute_node-0.2.3}/src/bazaar_compute_node/contrib/wecom/channel.py

@@ -1067,6 +1067,9 @@ class WeComChannel(IChannel):
                     return
                 await self._backoff(auth_attempt)
             except Exception as error:  # noqa: BLE001
+                self._observe(
+                    "wecom.connection.failed", error_type=type(error).__name__
+                )
                 network_attempt += 1
                 self._network_attempts = network_attempt
                 self._state = "reconnecting"
@@ -1110,6 +1113,21 @@ class WeComChannel(IChannel):
             if response.type is aiohttp.WSMsgType.ERROR:
                 raise ConnectionError("WeCom WebSocket reader failed")
             frame = self._frame(self._message_data(response))
+            body = frame.get("body")
+            event = body.get("event") if isinstance(body, dict) else None
+            self._observe(
+                "wecom.frame.received",
+                command=frame.get("cmd"),
+                request_id=self._request_id(frame),
+                error_code=frame.get("errcode"),
+                body_keys=sorted(body) if isinstance(body, dict) else None,
+                message_type=body.get("msgtype") if isinstance(body, dict) else None,
+                provider_message_id=(
+                    body.get("msgid") if isinstance(body, dict) else None
+                ),
+                topic_id=body.get("topic_id") if isinstance(body, dict) else None,
+                event_type=event.get("eventtype") if isinstance(event, dict) else None,
+            )
             self._last_frame_at_ms = time_ns() // 1_000_000
             if self._is_disconnected_event(frame):
                 self._last_event_type = "disconnected_event"
@@ -1133,6 +1151,7 @@ class WeComChannel(IChannel):
             if frame.get("cmd") in {
                 "aibot_msg_callback",
                 "aibot_event_callback",
+                "aibot_topic_event_callback",
             }:
                 await self._receive_message(frame)
 
@@ -1292,7 +1311,7 @@ class WeComChannel(IChannel):
             )
             return None
         quote_content = await self._content(quote, quote_type)
-        reply_to_message_id = str(
+        message_id = str(
             uuid5(
                 NAMESPACE_URL,
                 f"bcn:wecom:{self._bot_id}:quoted-message:{conversation}:"
@@ -1303,7 +1322,7 @@ class WeComChannel(IChannel):
             Message(
                 direction=MessageDirection.INBOUND,
                 seq=0,
-                message_id=reply_to_message_id,
+                message_id=message_id,
                 thread_id=session_id,
                 channel_session_id=channel_session_id,
                 channel=self.name,
@@ -1322,7 +1341,7 @@ class WeComChannel(IChannel):
                 metadata={"sender_kind": SenderKind.HUMAN.value},
             )
         )
-        return reply_to_message_id
+        return quote_content.fingerprint
 
     def _update_approval_card(
         self,
@@ -1446,7 +1465,7 @@ class WeComChannel(IChannel):
     async def _receive_message(self, frame: Mapping[str, object]) -> None:
         command = frame.get("cmd")
         body = frame.get("body")
-        if command == "aibot_event_callback":
+        if command in {"aibot_event_callback", "aibot_topic_event_callback"}:
             await self._receive_event(frame)
             return
         now_ms = time_ns() // 1_000_000
@@ -1479,7 +1498,7 @@ class WeComChannel(IChannel):
         create_time = body.get("create_time")
         if isinstance(create_time, int) and not isinstance(create_time, bool):
             metadata["provider_create_time"] = create_time
-        reply_to_message_id = await self._queue_quoted_message(
+        reference = await self._queue_quoted_message(
             body.get("quote"),
             provider_message_id=provider_message_id,
             conversation=conversation,
@@ -1489,6 +1508,8 @@ class WeComChannel(IChannel):
             target_kind=target_kind,
             received_at_ms=received_at_ms,
         )
+        if reference is not None:
+            metadata["provider_reply_to_message_id"] = reference
         await self._inbound.put(
             Message(
                 direction=MessageDirection.INBOUND,
@@ -1513,7 +1534,6 @@ class WeComChannel(IChannel):
                 target_kind=target_kind,
                 mentions_agent=mentions_agent,
                 attachments=content.attachments,
-                reply_to_message_id=reply_to_message_id,
                 metadata=metadata,
             )
         )
@@ -1527,7 +1547,7 @@ class WeComChannel(IChannel):
             session_id=session_id,
             target_kind=target_kind.value,
             message_type=message_type,
-            referenced=reply_to_message_id is not None,
+            referenced=reference is not None,
         )
 
     async def _send_approval_card_update(