rasa-pro 3.14.0.dev1__py3-none-any.whl → 3.14.0.dev2__py3-none-any.whl

rasa/dialogue_understanding/commands/clarify_command.py

@@ -13,6 +13,10 @@ from rasa.dialogue_understanding.commands.command_syntax_manager import (
 )
 from rasa.dialogue_understanding.commands.utils import extract_cleaned_options
 from rasa.dialogue_understanding.patterns.clarify import ClarifyPatternFlowStackFrame
+from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
+    AgentStackFrame,
+    AgentState,
+)
 from rasa.shared.core.events import Event
 from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
@@ -85,6 +89,12 @@ class ClarifyCommand(Command):
             if flow is not None
         ]
 
+        # if the top stack frame is an agent stack frame, we need to
+        # update the state to INTERRUPTED
+        if top_stack_frame := stack.top():
+            if isinstance(top_stack_frame, AgentStackFrame):
+                top_stack_frame.state = AgentState.INTERRUPTED
+
         stack.push(ClarifyPatternFlowStackFrame(names=names))
         return tracker.create_stack_updated_events(stack)
 

rasa/dialogue_understanding/commands/restart_agent_command.py

@@ -16,6 +16,7 @@ from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
 )
 from rasa.shared.core.events import AgentStarted, Event
 from rasa.shared.core.flows import FlowsList
+from rasa.shared.core.flows.steps import CallFlowStep
 from rasa.shared.core.trackers import DialogueStateTracker
 
 
@@ -66,7 +67,9 @@ class RestartAgentCommand(Command):
         agent_flow_id = self._get_agent_flow(original_tracker)
 
         # create a new agent stack frame to restart the agent
-        restart_agent_frame = self.create_restart_agent_stack_frame(agent_flow_id)
+        restart_agent_frame = self.create_restart_agent_stack_frame(
+            all_flows, agent_flow_id
+        )
 
         # if the stack contains an agent stack frame with status
         # "waiting for input" update the status to "interrupted"
@@ -115,15 +118,28 @@ class RestartAgentCommand(Command):
             mapper[CommandSyntaxManager.get_default_syntax_version()],
         )
 
-    def create_restart_agent_stack_frame(self, agent_flow_id: str) -> AgentStackFrame:
-        # Create a new AgentStackFrame for restarting the agent
-        return AgentStackFrame(
-            frame_id=f"restart_agent_{self.agent_id}",
-            flow_id=agent_flow_id,
-            step_id=f"call_{self.agent_id}",
-            agent_id=self.agent_id,
-            state=AgentState.WAITING_FOR_INPUT,
-        )
+    def create_restart_agent_stack_frame(
+        self, all_flows: FlowsList, agent_flow_id: str
+    ) -> AgentStackFrame:
+        # get the agent flow
+        agent_flow = all_flows.flow_by_id(agent_flow_id)
+        if not agent_flow:
+            raise ValueError(f"Agent flow {agent_flow_id} not found")
+
+        # find the call flow step for the agent
+        # set the state to "waiting for input" so that the agent can process
+        # the latest user message
+        for step in agent_flow.steps:
+            if isinstance(step, CallFlowStep) and step.call == self.agent_id:
+                return AgentStackFrame(
+                    frame_id=f"restart_agent_{self.agent_id}",
+                    flow_id=agent_flow_id,
+                    step_id=step.id,
+                    agent_id=self.agent_id,
+                    state=AgentState.WAITING_FOR_INPUT,
+                )
+
+        raise ValueError(f"Call step in agent flow {agent_flow_id} not found")
 
     def update_agent_stack_frames_on_stack(self, stack: DialogueStack) -> None:
         for frame in stack.frames:

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.14.0.dev1"
+__version__ = "3.14.0.dev2"

{rasa_pro-3.14.0.dev1.dist-info → rasa_pro-3.14.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.14.0.dev1
+Version: 3.14.0.dev2
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH

{rasa_pro-3.14.0.dev1.dist-info → rasa_pro-3.14.0.dev2.dist-info}/RECORD

@@ -400,7 +400,7 @@ rasa/dialogue_understanding/commands/can_not_handle_command.py,sha256=SeQysshRJi
 rasa/dialogue_understanding/commands/cancel_flow_command.py,sha256=ciHjrv6od9EWbgxdsCEwLFG5baE7fEVphawhpgCAfIs,8604
 rasa/dialogue_understanding/commands/change_flow_command.py,sha256=NnD9PM0B9o4oxTtYdcb-lDBC0-oQkbAQRB-55iYCkng,2409
 rasa/dialogue_understanding/commands/chit_chat_answer_command.py,sha256=uqQQ2BDDO9aHzhU8lWXDAC9RVd28Tctnk74jbZpd2xc,3365
-rasa/dialogue_understanding/commands/clarify_command.py,sha256=az0nHYoP66fdhBj4TcD1zKBcPYqtNk8KQKyW7BvEYZk,4506
+rasa/dialogue_understanding/commands/clarify_command.py,sha256=F8gJk8E6peMa_QioshlOS_6enZI7LWW7_hPF6hlWivs,4896
 rasa/dialogue_understanding/commands/command.py,sha256=rhxHmllTMwvb4Uq-pDqmUdlKtu-87y8nqN5DRO-KDwE,2529
 rasa/dialogue_understanding/commands/command_syntax_manager.py,sha256=2qA2m9Z7SSjG4pFAdgKbkqJCICyanicu4wU5iw5Bs1g,1907
 rasa/dialogue_understanding/commands/continue_agent_command.py,sha256=f8qxI1oX6xIxWzYKAO-LugQSlR1_blrlF_Ch38MsjhQ,2790
@@ -413,7 +413,7 @@ rasa/dialogue_understanding/commands/knowledge_answer_command.py,sha256=3RZLK1jx
 rasa/dialogue_understanding/commands/noop_command.py,sha256=aIaLBjSV84qy9X4aGlJfMIYhF57maH5CiKNWL_-giD4,1485
 rasa/dialogue_understanding/commands/prompt_command.py,sha256=slKQkvtrM353I3gltiett5xrZ7IxQ0omdqJHi6IowGk,2569
 rasa/dialogue_understanding/commands/repeat_bot_messages_command.py,sha256=skvn6xuLswtg0_LgLQ5UaEmIg3lbnBn6ItIfpvW35G8,3065
-rasa/dialogue_understanding/commands/restart_agent_command.py,sha256=7MAHgfqunr3DDXsEbsiqK0jaIdfYApBsjfF9NAMaFvs,5142
+rasa/dialogue_understanding/commands/restart_agent_command.py,sha256=FLghXeAu0C3rfOvr3kvJdxRPIA48jorlgGqLAi6dbg0,5780
 rasa/dialogue_understanding/commands/restart_command.py,sha256=vvmucwlVtfh6VMgdOn5hZfsP9U5HhfbDeBSG2IndX0Y,1639
 rasa/dialogue_understanding/commands/session_end_command.py,sha256=ZecUpYZDTX_68_kV1Hv4i317bbeBeVHHyhW_A7r5yzs,1770
 rasa/dialogue_understanding/commands/session_start_command.py,sha256=FA4yocMnFt5bn2dmXj48S4Pq_yTlEnOBxgK_mq-qAxg,1704
@@ -883,9 +883,9 @@ rasa/utils/train_utils.py,sha256=ClJx-6x3-h3Vt6mskacgkcCUJTMXjFPe3zAcy_DfmaU,212
 rasa/utils/url_tools.py,sha256=dZ1HGkVdWTJB7zYEdwoDIrEuyX9HE5WsxKKFVsXBLE0,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=fhRlHQvuBkiup0FnNYmwRmqQwC3QpdCJt0TuvW4jMaI,83125
-rasa/version.py,sha256=JzSCxiPPlvDspWQEWEAf62QItZ-CHXRTgpecMGpZgtE,122
-rasa_pro-3.14.0.dev1.dist-info/METADATA,sha256=WsC23HQ2UKIwEYi5w4iWY4FM8EdDe2eECh2nIY_Vj1U,10615
-rasa_pro-3.14.0.dev1.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.14.0.dev1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.14.0.dev1.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.14.0.dev1.dist-info/RECORD,,
+rasa/version.py,sha256=o7PAS756uUaUQnCkCsu5kbbkl1yiQqVXro0vyS2EXPQ,122
+rasa_pro-3.14.0.dev2.dist-info/METADATA,sha256=q9kbc8p59HGydwrjc0SIxyi-XEfz77lrjCV_bumqWt0,10615
+rasa_pro-3.14.0.dev2.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.14.0.dev2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.14.0.dev2.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.14.0.dev2.dist-info/RECORD,,