turnstack 0.1.0__tar.gz → 0.1.2__tar.gz

{turnstack-0.1.0 → turnstack-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: turnstack
-Version: 0.1.0
+Version: 0.1.2
 Summary: WhatsApp bot engine with node-based flows and interactive replies
 Author-email: IdrisFallout <dev@waithakasam.com>
 License: MIT

{turnstack-0.1.0 → turnstack-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "turnstack"
-version = "0.1.0"
+version = "0.1.2"
 description = "WhatsApp bot engine with node-based flows and interactive replies"
 authors = [{ name = "IdrisFallout", email = "dev@waithakasam.com" }]
 license = { text = "MIT" }

{turnstack-0.1.0 → turnstack-0.1.2}/turnstack/engine.py

@@ -189,6 +189,8 @@ class BotEngine:
         if incoming.type == "text" and incoming.text:
             cmd_reply = await self._handle_global_command(session, incoming.text.strip().lower())
             if cmd_reply:
+                if cmd_reply.type == "end":
+                    return [cmd_reply]
                 # Command handled – render the resulting node
                 reply = await self._render_current(session)
                 if reply is None:
@@ -212,6 +214,24 @@ class BotEngine:
                 phone=session.user_id,
                 current_node=session.current_node,
             )
+
+        # ── 7a. action two-message split ──────────────────────────────
+        # ActionHandler tags the reply with _action_replies=[action_reply, next_reply]
+        # when the fn returned text/Reply.  Unwrap them and send as two
+        # separate messages so the action text and the follow-up node
+        # always arrive as distinct WhatsApp bubbles.
+        from .handlers.action import ActionHandler
+        action_pair = getattr(reply, ActionHandler.MULTI_REPLY_ATTR, None)
+        if action_pair and len(action_pair) == 2:
+            action_reply, next_reply = action_pair
+            next_reply = self._enrich_menu_reply(next_reply, session)
+            action_reply.session_state = session.lifecycle_state
+            action_reply.current_node  = session.current_node
+            next_reply.session_state   = session.lifecycle_state
+            next_reply.current_node    = session.current_node
+            await self.session_store.save(session)
+            return [action_reply, next_reply]
+
         reply = self._enrich_menu_reply(reply, session)
 
         # ── 8. attach meta and save ───────────────────────────────────
@@ -246,14 +266,13 @@ class BotEngine:
         """
         # Exit / reset
         if text in self.exit_keywords:
-            session.reset(self.tree.entry)
-            # Optionally send a goodbye message (could be configured)
+            await self.session_store.delete(session.user_id)
             return Reply(
-                type="text",
-                body="👋 Session reset. Type anything to start over.",
+                type="end",
+                body="👋 Goodbye! Send us a message anytime to start a new session.",
                 phone=session.user_id,
                 node_type="text",
-                current_node=session.current_node,
+                current_node=None,
             )
 
         # Go home

{turnstack-0.1.0 → turnstack-0.1.2}/turnstack/handlers/action.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 import inspect
-from typing import Any, Dict, TYPE_CHECKING
+from typing import Any, Dict, List, TYPE_CHECKING
 
 from ..message import IncomingMessage
 from ..reply import Reply
@@ -16,14 +16,21 @@ class ActionHandler(NodeHandler):
     Handles ``action`` nodes.
 
     The developer's ``fn`` may return:
-    - A ``str``   — sent as a text message, then the flow advances to ``next``.
+    - A ``str``   — sent as a separate text message, then the next node is
+                    sent as a second message.
     - A ``Reply`` — used as-is (allows sending media, ending session, etc.),
-                    then the flow advances to ``next``.
-    - ``None``    — nothing extra is sent; the flow advances to ``next``.
+                    then the next node is sent as a second message.
+    - ``None``    — nothing extra is sent; only the next node reply is sent.
 
     Both sync and async functions are supported.
+
+    The engine receives a list and sends each reply in order, so the action
+    text and the follow-up node always arrive as two distinct messages.
     """
 
+    # Sentinel attribute the engine checks to unwrap multi-reply actions.
+    MULTI_REPLY_ATTR = "_action_replies"
+
     async def handle(
         self,
         node: Dict[str, Any],
@@ -65,39 +72,28 @@ class ActionHandler(NodeHandler):
 
         self._transition_to(session, next_key)
 
-        # ── build the combined reply ──────────────────────────────────
-        # Enter next node (may chain another action/router silently)
+        # ── get next node reply ───────────────────────────────────────
         next_reply = await self._enter_node(session, tree, _depth + 1)
         if next_reply is None:
             next_reply = self._error(session, "Next node returned no reply.")
 
+        # ── no action text → just return next reply as usual ─────────
+        if result is None:
+            return next_reply
+
+        # ── action produced text or a Reply → send as TWO messages ───
+        # We attach the pair on the reply object; engine.py unwraps it.
         if isinstance(result, Reply):
-            # Developer returned a full Reply — send it, then queue next render
-            # We concatenate bodies so the user sees both in one message
-            if next_reply.body:
-                result.body = result.body + "\n\n" + next_reply.body
-            result.current_node = next_reply.current_node
-            result.options = next_reply.options
-            result.node_type = next_reply.node_type
-            return result
-
-        # Developer returned a str or None
-        action_text = str(result) if result is not None else ""
-        if action_text and next_reply.body:
-            combined = action_text + "\n\n" + next_reply.body
-        elif action_text:
-            combined = action_text
+            action_reply = result
         else:
-            combined = next_reply.body
-
-        return Reply(
-            type=next_reply.type,
-            body=combined,
-            phone=session.user_id,
-            options=next_reply.options,
-            node_type=next_reply.node_type,
-            file_bytes=next_reply.file_bytes,
-            filename=next_reply.filename,
-            mime_type=next_reply.mime_type,
-            current_node=next_reply.current_node,
-        )
+            action_reply = Reply(
+                type="text",
+                body=str(result),
+                phone=session.user_id,
+                current_node=session.current_node,
+            )
+
+        # Carry options/node_type only on the SECOND (next_reply) message.
+        # Tag the first reply so the engine knows to split them.
+        setattr(action_reply, self.MULTI_REPLY_ATTR, [action_reply, next_reply])
+        return action_reply

{turnstack-0.1.0 → turnstack-0.1.2}/turnstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: turnstack
-Version: 0.1.0
+Version: 0.1.2
 Summary: WhatsApp bot engine with node-based flows and interactive replies
 Author-email: IdrisFallout <dev@waithakasam.com>
 License: MIT