rasa-pro 3.14.0.dev1__tar.gz → 3.14.0.dev2__tar.gz

{rasa_pro-3.14.0.dev1 → rasa_pro-3.14.0.dev2}/PKG-INFO

@@ -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 → rasa_pro-3.14.0.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.14.0.dev1"
+version = "3.14.0.dev2"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -373,6 +373,7 @@ convention = "google"
 "tests/shared/core/test_domain.py" = [ "E501",]
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.14.0.dev1 → rasa_pro-3.14.0.dev2}/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_pro-3.14.0.dev1 → rasa_pro-3.14.0.dev2}/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_pro-3.14.0.dev1 → rasa_pro-3.14.0.dev2}/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"