lark-oapi 2.0.0.dev2__py3-none-any.whl → 2.0.0.dev3__py3-none-any.whl

lark_oapi/channel/channel.py

@@ -70,6 +70,7 @@ from .config import (
 from .driver import LarkClientDriver
 from .errors import FeishuChannelError, FeishuChannelErrorCode
 from .identity import IdentityResolver, NameCache
+from .normalize.comment import normalize_comment
 from .normalize.dedup import Deduper, InMemoryDedupStore
 from .normalize.pipeline import InboundPipeline, PipelineConfig, PipelineDeps
 from .outbound.routing import infer_receive_id_type
@@ -95,6 +96,22 @@ EventHandler = Callable[..., Any]
 Unsubscribe = Callable[[], None]
 
 
+def _card_action_identity(action: Any) -> str:
+    """Stable dedup fragment for a card action.
+
+    Node-SDK aligned: different buttons on the same card click to different
+    ``(tag, value)`` pairs, and those must dedup-distinctly; a genuine WS
+    redelivery of the *same* click hashes identically and is suppressed.
+    """
+    tag = getattr(action, "tag", "") or ""
+    value = getattr(action, "value", None)
+    try:
+        value_repr = json.dumps(value, sort_keys=True, ensure_ascii=False)
+    except (TypeError, ValueError):
+        value_repr = repr(value)
+    return f"{tag}:{value_repr}"
+
+
 # ---------------------------------------------------------------------------
 # FeishuChannel
 # ---------------------------------------------------------------------------
@@ -771,6 +788,14 @@ class FeishuChannel:
                 b = getattr(b, register)(handler)
             except Exception:  # pragma: no cover
                 pass
+        # drive.notice.comment_add_v1 is a legacy p1-schema event; there is no
+        # typed processor for it in the generated SDK, so register a
+        # customized-event callback so the WS dispatcher has an entry and
+        # we can fan it out to ``channel.on("comment", ...)`` handlers
+        # instead of the SDK logging "processor not found".
+        b = b.register_p1_customized_event(
+            "drive.notice.comment_add_v1", self._on_p1_comment_add
+        )
         return b.build()
 
     # ------------------------------------------------------------------
@@ -804,6 +829,9 @@ class FeishuChannel:
     def _on_p2_message_read(self, data: Any) -> None:
         self.schedule(self._handle_message_read_event(data))
 
+    def _on_p1_comment_add(self, data: Any) -> None:
+        self.schedule(self._handle_comment_event(data))
+
     # ------------------------------------------------------------------
     # Async event handlers
     # ------------------------------------------------------------------
@@ -866,25 +894,80 @@ class FeishuChannel:
             operator_open_id = getattr(
                 getattr(event, "operator", None), "open_id", None
             )
-            await self._invoke(
-                "cardAction",
-                CardActionEvent(
-                    message_id=message_id or "",
-                    chat_id=chat_id or "",
-                    operator=EventOperator(open_id=operator_open_id or ""),
-                    action=CardActionPayload(
-                        tag=tag or "",
-                        value=raw_value,
-                        name=getattr(raw_value, "name", None)
-                        if hasattr(raw_value, "name")
-                        else None,
-                    ),
-                    raw=_coerce.obj_to_dict(data) or {},
+            payload = CardActionEvent(
+                message_id=message_id or "",
+                chat_id=chat_id or "",
+                operator=EventOperator(open_id=operator_open_id or ""),
+                action=CardActionPayload(
+                    tag=tag or "",
+                    value=raw_value,
+                    name=getattr(raw_value, "name", None)
+                    if hasattr(raw_value, "name")
+                    else None,
                 ),
+                raw=_coerce.obj_to_dict(data) or {},
+            )
+            # Route through safety.push_action (tier 2): dedup on a stable
+            # action identity (tag + value payload) so Feishu's at-least-once
+            # WS redelivery can't double-invoke the handler, and serialize by
+            # chat_id so two fast clicks in the same chat are processed in
+            # order. Node-SDK aligned.
+            await self._through_action_safety(
+                event_id=f"card:{payload.message_id}:{payload.operator.open_id}:"
+                         f"{_card_action_identity(payload.action)}",
+                queue_scope=payload.chat_id or payload.message_id or "",
+                handler=lambda: self._invoke("cardAction", payload),
             )
         except Exception as e:
             logger.exception("FeishuChannel cardAction dispatch failed: %s", e)
 
+    async def _through_action_safety(
+        self,
+        *,
+        event_id: str,
+        queue_scope: str,
+        handler: Callable[[], Any],
+    ) -> None:
+        """Run ``handler`` through the safety tier-2 gate (dedup + lock +
+        per-scope serial queue) when the pipeline exists; fall back to a
+        direct invocation when it hasn't been built yet (early events during
+        startup, unit tests that bypass ``connect``)."""
+        safety = self._safety
+        if safety is None:
+            result = handler()
+            if inspect.isawaitable(result):
+                await result
+            return
+
+        async def _run() -> None:
+            result = handler()
+            if inspect.isawaitable(result):
+                await result
+
+        await safety.push_action(event_id, queue_scope or event_id, _run)
+
+    async def _through_light_safety(
+        self,
+        *,
+        event_id: str,
+        handler: Callable[[], Any],
+    ) -> None:
+        """Tier-3 variant: dedup only (reaction add/remove). Same fallback
+        semantics as :meth:`_through_action_safety`."""
+        safety = self._safety
+        if safety is None:
+            result = handler()
+            if inspect.isawaitable(result):
+                await result
+            return
+
+        async def _run() -> None:
+            result = handler()
+            if inspect.isawaitable(result):
+                await result
+
+        await safety.push_light(event_id, _run)
+
     async def _handle_reaction_event(self, data: Any, *, action: str) -> None:
         cfg = self._config.inbound.reaction_notifications
         if cfg == "off":
@@ -905,16 +988,25 @@ class FeishuChannel:
                 if message_id and message_id not in self._sent_messages:
                     return
 
-            await self._invoke(
-                "reaction",
-                ReactionEvent(
-                    message_id=message_id,
-                    operator=EventOperator(open_id=operator_open_id or ""),
-                    emoji_type=emoji_type or "",
-                    action="added" if action == "create" else "removed",
-                    action_time=action_time,
-                    raw=_coerce.obj_to_dict(data) or {},
+            direction = "added" if action == "create" else "removed"
+            payload = ReactionEvent(
+                message_id=message_id,
+                operator=EventOperator(open_id=operator_open_id or ""),
+                emoji_type=emoji_type or "",
+                action=direction,
+                action_time=action_time,
+                raw=_coerce.obj_to_dict(data) or {},
+            )
+            # Tier 3: dedup only. Reactions are idempotent state changes so
+            # lock / serial queue would add latency for no benefit, but
+            # WS redelivery would double-invoke without this guard.
+            # Node-SDK aligned (pushLight).
+            await self._through_light_safety(
+                event_id=(
+                    f"reaction:{message_id}:{operator_open_id or ''}:"
+                    f"{emoji_type or ''}:{direction}"
                 ),
+                handler=lambda: self._invoke("reaction", payload),
             )
         except Exception as e:
             logger.exception("FeishuChannel reaction dispatch failed: %s", e)
@@ -961,6 +1053,28 @@ class FeishuChannel:
         except Exception as e:
             logger.exception("FeishuChannel messageRead dispatch failed: %s", e)
 
+    async def _handle_comment_event(self, data: Any) -> None:
+        try:
+            # ``CustomizedEvent.event`` is the raw inner event payload as a
+            # plain dict, which is exactly what normalize_comment expects.
+            raw_event = getattr(data, "event", None)
+            normalized = normalize_comment(
+                raw_event if raw_event is not None else data,
+                bot_open_id=self._bot_open_id,
+            )
+            if normalized is None:
+                return
+            # Tier 2: dedup + lock + per-file_token serial queue. Multiple
+            # comments on the same document are ordered; redeliveries of the
+            # same comment event are dropped. Node-SDK aligned.
+            await self._through_action_safety(
+                event_id=f"comment:{normalized.file_token}:{normalized.comment_id}",
+                queue_scope=normalized.file_token,
+                handler=lambda: self._invoke("comment", normalized),
+            )
+        except Exception as e:
+            logger.exception("FeishuChannel comment dispatch failed: %s", e)
+
     def _notify_reconnecting(self) -> None:
         for h in list(self._handlers.get("reconnecting", [])):
             try:

lark_oapi/core/const.py

@@ -1,6 +1,6 @@
 # Info
 PROJECT = "oapi-sdk-python"
-VERSION = "2.0.0.dev2"
+VERSION = "2.0.0.dev3"
 
 # Domain
 FEISHU_DOMAIN = "https://open.feishu.cn"

{lark_oapi-2.0.0.dev2.dist-info → lark_oapi-2.0.0.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lark-oapi
-Version: 2.0.0.dev2
+Version: 2.0.0.dev3
 Summary: Lark OpenAPI SDK for Python
 Home-page: https://github.com/larksuite/oapi-sdk-python
 Author: Wenbo Mao

{lark_oapi-2.0.0.dev2.dist-info → lark_oapi-2.0.0.dev3.dist-info}/RECORD

@@ -10003,7 +10003,7 @@ lark_oapi/channel/__init__.py,sha256=yZeVV8Zeyv53YufjfX6lHrDblyeMmhMS2I40sHRv0kM
 lark_oapi/channel/_api_helpers.py,sha256=mv0pNmf1X2gG0gSCNfFXOFf_Y2Bl08FhOQCATc_vzqM,8874
 lark_oapi/channel/_coerce.py,sha256=nHdt-y6iHuo_Fp7ZdLFkydG1pTMM-_wQJGJbOzcUiEI,7490
 lark_oapi/channel/bot_identity.py,sha256=E2zMl1AYFCENi-HXtXH47WgZrWRpPMXiXyM38cvMdrw,5488
-lark_oapi/channel/channel.py,sha256=KNvvf6-y3eTUr1Hn08lNbPnG_8dMx_2UFP6ofi_BHnI,54225
+lark_oapi/channel/channel.py,sha256=O4EalY-txsf0g6PQ4-nSGhsVyR9X9NEE2ejfPxWWTsA,59104
 lark_oapi/channel/config.py,sha256=PEYUDqG_r3sOqAF7acrA3pDgVPmk16ChWVB71l1xd_U,9877
 lark_oapi/channel/driver.py,sha256=5Ij0WaQP3kEhUqZqUoREgfwv052118lyj2A6bCiIg7Y,11863
 lark_oapi/channel/errors.py,sha256=MbQIH95dxt3m99ofaMp_3oM1RJVvAMxW1A3SKiavAfk,7179
@@ -10073,7 +10073,7 @@ lark_oapi/channel/safety/processing_lock.py,sha256=G4Kcm8-aRCfrIKD_6aXu-inWG28tB
 lark_oapi/channel/safety/stale_detector.py,sha256=FKVBdYwRddpFynpRZxTyznxL3gkJVaoTXnn_iQ9uY04,691
 lark_oapi/channel/safety/types.py,sha256=WaWhUleLe21-57HTFH4cOwJpZb2OiwKuDxWxPAE0OYA,2124
 lark_oapi/core/__init__.py,sha256=z286YdAEQ4kRDGuKsZb0Osua5KMcg4yqBsLmKsdW1Hw,263
-lark_oapi/core/const.py,sha256=Nzn_gukWAtdLCrjRSojYlIlYsdALTOBHU102XRWqUuA,608
+lark_oapi/core/const.py,sha256=1evFaIZKXM40ynmes6XUT6_G89uhiMP-wGcNH2Xjp5U,608
 lark_oapi/core/construct.py,sha256=CKsC-5bza7R01PDE2pWbyThlXi1oLAtjR0YD3Lex_sM,1980
 lark_oapi/core/enum.py,sha256=ehxuylOjD3btFHTRtpA--QvEcvUlWimuqXIqglcg4Kw,471
 lark_oapi/core/env_var.py,sha256=6xonyZzC_6Jyaotazj-ip0_yzB4wpZ4xArXIdPdPTck,169
@@ -10174,8 +10174,8 @@ lark_oapi/ws/pb/google/protobuf/pyext/cpp_message.py,sha256=GCWPkLCXd0QxY3yzNN-G
 lark_oapi/ws/pb/google/protobuf/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lark_oapi/ws/pb/google/protobuf/util/json_format_pb2.py,sha256=4QRyr6gfGO_e2MNpt3z3MT1ZHfoR5SXRpmIs4aWrv6g,6375
 lark_oapi/ws/pb/google/protobuf/util/json_format_proto3_pb2.py,sha256=uA8FCLxKYYUrFOlpjSlyWQWbtpodzBMZrIxM25dyJhM,14610
-lark_oapi-2.0.0.dev2.dist-info/licenses/LICENSE,sha256=N2ZgITrKZ1yufqVdfmr4ixMPp4qJ_ly-1_YeCs3w-Uk,1083
-lark_oapi-2.0.0.dev2.dist-info/METADATA,sha256=Rslg-_LRvQwuubEyhu17sS60bTx-pSEfDiu_tlVslxo,4743
-lark_oapi-2.0.0.dev2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-lark_oapi-2.0.0.dev2.dist-info/top_level.txt,sha256=sDloiIa3R4quQp19_e1mf206wAxH0Wg1bvNnKzV8QJg,10
-lark_oapi-2.0.0.dev2.dist-info/RECORD,,
+lark_oapi-2.0.0.dev3.dist-info/licenses/LICENSE,sha256=N2ZgITrKZ1yufqVdfmr4ixMPp4qJ_ly-1_YeCs3w-Uk,1083
+lark_oapi-2.0.0.dev3.dist-info/METADATA,sha256=pZ6mifvUtzUBIGJ3dTggW4zawsx5MCHUTbKNyYU8IZ0,4743
+lark_oapi-2.0.0.dev3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+lark_oapi-2.0.0.dev3.dist-info/top_level.txt,sha256=sDloiIa3R4quQp19_e1mf206wAxH0Wg1bvNnKzV8QJg,10
+lark_oapi-2.0.0.dev3.dist-info/RECORD,,