fastworkflow 2.14.2__tar.gz → 2.15.0__tar.gz

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastworkflow
-Version: 2.14.2
+Version: 2.15.0
 Summary: A framework for rapidly building large-scale, deterministic, interactive workflows with a fault-tolerant, conversational UX
 License: Apache-2.0
 Keywords: fastworkflow,ai,workflow,llm,openai

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/_workflows/command_metadata_extraction/_commands/ErrorCorrection/abort.py

@@ -29,7 +29,7 @@ class Signature:
 
 class ResponseGenerator:
     def _process_command(self, workflow: Workflow, command: str) -> Signature.Output:
-        workflow.is_complete = True
+        workflow.end_command_processing()
         return Signature.Output(command=command, command_name="abort")
 
     def __call__(self, workflow: Workflow, command: str) -> CommandOutput:

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/_workflows/command_metadata_extraction/_commands/wildcard.py

@@ -560,7 +560,8 @@ class ParameterExtraction:
                     return params
         
         except Exception as exc:
-            logger.warning(PARAMETER_EXTRACTION_ERROR_MSG.format(error=exc))
+            # logger.warning(PARAMETER_EXTRACTION_ERROR_MSG.format(error=exc))
+            pass
 
         return params    
 
@@ -589,8 +590,6 @@ class ResponseGenerator:
         workflow: fastworkflow.Workflow, 
         command: str,
     ) -> CommandOutput:  # sourcery skip: hoist-if-from-if
-        workflow.is_complete = False
-
         app_workflow = workflow.context["app_workflow"]   # type: fastworkflow.Workflow
         cmd_ctxt_obj_name = app_workflow.current_command_context_name
         nlu_pipeline_stage = workflow.context.get(
@@ -603,8 +602,6 @@ class ResponseGenerator:
         if cnp_output.error_msg:
             workflow_context = workflow.context
             workflow_context["NLU_Pipeline_Stage"] = NLUPipelineStage.INTENT_AMBIGUITY_CLARIFICATION
-            if "command" not in workflow_context:
-                workflow_context["command"] = command
             workflow.context = workflow_context
             return CommandOutput(
                 command_responses=[
@@ -617,17 +614,19 @@ class ResponseGenerator:
                     )
                 ]
             )
+        else:
+            if nlu_pipeline_stage == NLUPipelineStage.INTENT_DETECTION and \
+                cnp_output.command_name != 'ErrorCorrection/you_misunderstood':
+                workflow_context = workflow.context
+                workflow_context["command"] = command
+                workflow.context = workflow_context
         
         if cnp_output.is_cme_command:
             workflow_context = workflow.context
             if cnp_output.command_name == 'ErrorCorrection/you_misunderstood':
                 workflow_context["NLU_Pipeline_Stage"] = NLUPipelineStage.INTENT_MISUNDERSTANDING_CLARIFICATION
-                if "command" not in workflow_context:
-                    workflow_context["command"] = command
             else:
-                workflow.is_complete = True
-                workflow_context["NLU_Pipeline_Stage"] = NLUPipelineStage.INTENT_DETECTION
-                workflow_context.pop("command", None)
+                workflow.end_command_processing()
             workflow.context = workflow_context
 
             startup_action = Action(
@@ -664,8 +663,6 @@ class ResponseGenerator:
                         workflow_context = workflow.context
                         workflow_context["NLU_Pipeline_Stage"] = \
                             NLUPipelineStage.INTENT_MISUNDERSTANDING_CLARIFICATION
-                        if "command" not in workflow_context:
-                            workflow_context["command"] = command
                         workflow.context = workflow_context
 
                         startup_action = Action(
@@ -689,9 +686,6 @@ class ResponseGenerator:
             workflow_context = workflow.context
             workflow_context["NLU_Pipeline_Stage"] = NLUPipelineStage.PARAMETER_EXTRACTION
             workflow_context["command_name"] = cnp_output.command_name
-            # Only update command if it's not already set (preserve original command with parameters)
-            if "command" not in workflow_context:
-                workflow_context["command"] = command
             workflow.context = workflow_context
 
         command_name = workflow.context["command_name"]
@@ -699,6 +693,7 @@ class ResponseGenerator:
         pe_output = extractor.extract()
         if not pe_output.parameters_are_valid:
             return CommandOutput(
+                command_name = command_name,
                 command_responses=[
                     CommandResponse(
                         response=(
@@ -710,16 +705,14 @@ class ResponseGenerator:
                 ]
             )
 
-        workflow.is_complete = True
-        workflow.context["NLU_Pipeline_Stage"] = \
-            NLUPipelineStage.INTENT_DETECTION
+        workflow.end_command_processing()
 
         return CommandOutput(
             command_responses=[
                 CommandResponse(
                     response="",
                     artifacts={
-                        "command": workflow.context["command"],
+                        "command": command,
                         "command_name": command_name,
                         "cmd_parameters": pe_output.cmd_parameters,
                     },

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/chat_session.py

@@ -7,6 +7,7 @@ import json
 import contextlib
 import uuid
 from pathlib import Path
+import os
 
 import dspy
 
@@ -15,6 +16,7 @@ from fastworkflow.utils.logging import logger
 from fastworkflow.utils import dspy_utils
 from fastworkflow.model_pipeline_training import CommandRouter
 from fastworkflow.utils.startup_progress import StartupProgress
+from fastworkflow.command_metadata_api import CommandMetadataAPI
 
 
 class SessionStatus(Enum):
@@ -310,7 +312,11 @@ class ChatSession:
         try:
             # Handle startup command/action
             if self._startup_command:
-                last_output = self._process_message(self._startup_command)
+                if self._run_as_agent:
+                    # In agent mode, use workflow tool agent for processing
+                    last_output = self._process_agent_message(self._startup_command)
+                else:
+                    last_output = self._process_message(self._startup_command)
             elif self._startup_action:
                 last_output = self._process_action(self._startup_action)
 
@@ -407,31 +413,13 @@ class ChatSession:
         # The agent processes the user's message and may make multiple tool calls
         # to the workflow internally (directly via CommandExecutor)
 
-        planner_lm = dspy_utils.get_lm("LLM_PLANNER", "LITELLM_API_KEY_PLANNER")
-        lm = dspy_utils.get_lm("LLM_AGENT", "LITELLM_API_KEY_AGENT")
-
-        class TaskPlannerSignature(dspy.Signature):
-            """
-            Breakdown the user query into a todo list, based only on the user query and available_commands and nothing else.
-            """
-            user_query: str = dspy.InputField()
-            available_commands: list[str] = dspy.InputField()
-            todo_list: list[str] = dspy.OutputField(desc="task descriptions as short sentences")
+        # Ensure any prior action log is removed before a fresh agent run
+        if os.path.exists("action.json"):
+            os.remove("action.json")
 
-        app_workflow = self.get_active_workflow()
-        crd = fastworkflow.RoutingRegistry.get_definition(app_workflow.folderpath)
-        available_commands = crd.get_command_names('*')
-
-        with dspy.context(lm=planner_lm):
-            task_planner_func = dspy.ChainOfThought(TaskPlannerSignature)
-            prediction = task_planner_func(user_query=message, available_commands=available_commands)
-            prediction.todo_list.insert(0, "Use the 'what_can_i_do' tool to get details on available commands")
-            refined_message = (
-                f"{message}\n"
-                "Todo list:\n"
-                f"{'\n'.join([f'{i+1}. {task}' for i, task in enumerate(prediction.todo_list)])}"
-            )
+        refined_message = f'messsage\n{self._think_and_plan(message)}'
 
+        lm = dspy_utils.get_lm("LLM_AGENT", "LITELLM_API_KEY_AGENT")
         with dspy.context(lm=lm):
             agent_result = self._workflow_tool_agent(user_query=refined_message)
             # dspy.inspect_history(n=1)
@@ -444,8 +432,15 @@ class ChatSession:
         )
 
         # Create CommandOutput with the agent's response
+        command_response = fastworkflow.CommandResponse(response=result_text)
+        # Attach actions captured during agent execution as artifacts if available
+        if os.path.exists("action.json"):
+            with open("action.json", "r", encoding="utf-8") as f:
+                actions = [json.loads(line) for line in f if line.strip()]
+            command_response.artifacts["extracted_actions"] = actions
+
         command_output = fastworkflow.CommandOutput(
-            command_responses=[fastworkflow.CommandResponse(response=result_text)]
+            command_responses=[command_response]
         )
 
         # Put output in queue (following same pattern as _process_message)
@@ -470,7 +465,6 @@ class ChatSession:
         Returns:
             The result of the invoke_command call
         """
-        import os
         from datetime import datetime
         
         # Generate a unique filename with timestamp
@@ -480,7 +474,6 @@ class ChatSession:
         import cProfile
         import pstats
         import io
-        import os
         import time
         
         # Create a Profile object
@@ -579,3 +572,33 @@ class ChatSession:
             workflow.flush()
 
         return command_output
+
+    def _think_and_plan(self, user_query: str) -> str:
+        """
+        Returns a refined plan by breaking down a user_query into simpler tasks based only on available commands and returns a todo list.
+        """
+        class TaskPlannerSignature(dspy.Signature):
+            """
+            Break down a user_query into simpler tasks based only on available commands and return a todo list.
+            If user_query is simple, return a single todo that is the user_query as-is
+            """
+            user_query: str = dspy.InputField()
+            available_commands: list[str] = dspy.InputField()
+            todo_list: list[str] = dspy.OutputField(desc="task descriptions as short sentences")
+
+        current_workflow = ChatSession.get_active_workflow()
+        available_commands = CommandMetadataAPI.get_command_display_text(
+            subject_workflow_path=current_workflow.folderpath,
+            cme_workflow_path=fastworkflow.get_internal_workflow_path("command_metadata_extraction"),
+            active_context_name=current_workflow.current_command_context_name,
+        )
+
+        planner_lm = dspy_utils.get_lm("LLM_PLANNER", "LITELLM_API_KEY_PLANNER")
+        with dspy.context(lm=planner_lm):
+            task_planner_func = dspy.ChainOfThought(TaskPlannerSignature)
+            prediction = task_planner_func(user_query=user_query, available_commands=available_commands)
+
+            if not prediction.todo_list or (len(prediction.todo_list) == 1 and prediction.todo_list[0] == user_query):
+                return user_query
+
+            return f"{user_query}\nNext steps:\n{'\n'.join([f'{i + 1}. {task}' for i, task in enumerate(prediction.todo_list)])}"

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/cli.py

@@ -338,6 +338,12 @@ def add_run_parser(subparsers):
     parser_run.add_argument("--startup_action", help="Optional startup action", default="")
     parser_run.add_argument("--keep_alive", help="Optional keep_alive", default=True)
     parser_run.add_argument("--project_folderpath", help="Optional path to project folder containing application code", default=None)
+    parser_run.add_argument(
+        "--run_as_agent",
+        help="Run in agent mode (uses DSPy for tool selection)",
+        action="store_true",
+        default=False,
+    )
     parser_run.set_defaults(func=lambda args: run_with_defaults(args))
 
 def train_with_defaults(args):  # sourcery skip: extract-duplicate-method
@@ -485,6 +491,10 @@ def run_example(args):
         str(passwords_file)
     ]
 
+    # Forward agent mode flag if requested
+    if getattr(args, "run_as_agent", False):
+        cmd.append("--run_as_agent")
+
     try:
         rprint(f"[bold green]Starting interactive session...[/bold green]")
         # Replace the current process with the run command
@@ -526,6 +536,12 @@ def main():
     # 'examples run' command
     parser_run_example = examples_subparsers.add_parser("run", help="Run a specific example")
     parser_run_example.add_argument("name", help="The name of the example to run")
+    parser_run_example.add_argument(
+        "--run_as_agent",
+        help="Run the example in agent mode (uses DSPy for tool selection)",
+        action="store_true",
+        default=False,
+    )
     parser_run_example.set_defaults(func=run_example)
     
     # Add top-level commands

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/command_executor.py

@@ -45,10 +45,20 @@ class CommandExecutor(CommandExecutorInterface):
                 command = command)
         )
 
+        import json
+
         if command_output.command_handled or not command_output.success:           
+            # Append executed action to action.json for external consumers
+            record = {
+                "command" if command_output.success else "failing command": command,
+                "command_name": command_output.command_name, 
+                "parameters": command_output.command_parametersr.model_dump(),
+                "response": command_output.command_responses[0].response if command_output.success else ''}
+            with open("action.json", "a", encoding="utf-8") as f:
+                f.write(json.dumps(record, ensure_ascii=False) + "\n")
+
             return command_output
 
-        command = command_output.command_responses[0].artifacts["command"]
         command_name = command_output.command_responses[0].artifacts["command_name"]
         input_obj = command_output.command_responses[0].artifacts["cmd_parameters"]
 
@@ -84,7 +94,16 @@ class CommandExecutor(CommandExecutorInterface):
         command_output.context = context
         command_output.command_name = command_name
         command_output.command_parameters = str(input_obj) if input_obj else ''
-            
+
+        # Append executed action to action.json for external consumers
+        record = {
+            "command": command, 
+            "command_name": command_name, 
+            "parameters": input_obj.model_dump(),
+            "response": command_output.command_responses[0].response}
+        with open("action.json", "a", encoding="utf-8") as f:
+            f.write(json.dumps(record, ensure_ascii=False) + "\n")
+
         return command_output
 
     @classmethod

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/cancel_pending_order.py

@@ -22,9 +22,9 @@ class Signature:
             str,
             Field(
                 default="NOT_FOUND",
-                description="The order ID to cancel (must start with #)",
-                pattern=r"^(#[\w\d]+|NOT_FOUND)$",
-                examples=["#123", "#abc123", "#order456"],
+                description="The order ID to cancel",
+                pattern=r"^(#?[\w\d]+|NOT_FOUND)$",
+                examples=["123", "#abc123", "order456"],
                 json_schema_extra={
                     "available_from": ["get_user_details"]
                 }
@@ -34,10 +34,10 @@ class Signature:
         reason: Annotated[
             str,
             Field(
-                default="NOT_FOUND",
-                description="Reason for cancellation",
+                default="ordered by mistake",
+                description="Reason for cancellation. If reason is invalid, use the default reason value",
                 json_schema_extra={
-                    "enum": ["no longer needed", "ordered by mistake", "NOT_FOUND"]
+                    "enum": ["no longer needed", "ordered by mistake"]
                 },
                 examples=["no longer needed", "ordered by mistake"]
             )
@@ -78,6 +78,15 @@ class Signature:
             utterances_obj.plain_utterances, command_name
         )
 
+    @staticmethod
+    def validate_extracted_parameters(
+        workflow: fastworkflow.Workflow, 
+        command: str, cmd_parameters: "Signature.Input"
+    ) -> tuple[bool, str]:
+        if not cmd_parameters.order_id.startswith('#'):
+            cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
+        return (True, '')
+
 
 class ResponseGenerator:
     def __call__(

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/exchange_delivered_order_items.py

@@ -14,9 +14,9 @@ class Signature:
     class Input(BaseModel):
         order_id: str = Field(
             default="NOT_FOUND",
-            description="The order ID to exchange (must start with #)",
-            pattern=r"^(#[\w\d]+|NOT_FOUND)$",
-            examples=["#W0000000"],
+            description="The order ID to exchange",
+            pattern=r"^(#?[\w\d]+|NOT_FOUND)$",
+            examples=["#W00000000"],
             json_schema_extra={
                 "available_from": ["get_user_details"]
             }
@@ -40,7 +40,8 @@ class Signature:
         payment_method_id: str = Field(
             default="NOT_FOUND",
             description="Payment method ID for price difference.",
-            examples=["gift_card_0000000", "credit_card_0000000"],
+            pattern=r"^((gift_card|credit_card|paypal)_\d+|NOT_FOUND)$",
+            examples=["gift_card_0000000", "credit_card_0000000", "paypal_0000000"],
             json_schema_extra={
                 "available_from": ["get_order_details", "get_user_details"]
             }
@@ -67,6 +68,15 @@ class Signature:
         from fastworkflow.train.generate_synthetic import generate_diverse_utterances
         return generate_diverse_utterances(utterances_obj.plain_utterances, command_name)
 
+    @staticmethod
+    def validate_extracted_parameters(
+        workflow: fastworkflow.Workflow, 
+        command: str, cmd_parameters: "Signature.Input"
+    ) -> tuple[bool, str]:
+        if not cmd_parameters.order_id.startswith('#'):
+            cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
+        return (True, '')
+
 
 class ResponseGenerator:
     def __call__(self, workflow: Workflow, command: str, command_parameters: Signature.Input) -> CommandOutput:

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/find_user_id_by_email.py

@@ -19,7 +19,7 @@ class Signature:
             default="NOT_FOUND",
             description=(
                 "The email address to search for. If email is not available, "
-                "use `find_user_id_by_name_zip` instead."
+                "use `find_user_id_by_name_zip` instead. As a last resort transfer to a human agent"
             ),
             pattern=r"^(NOT_FOUND|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$",
             examples=["user@example.com"],

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/get_order_details.py

@@ -16,9 +16,9 @@ class Signature:
         order_id: str = Field(
             default="NOT_FOUND",
             description=(
-                "The order ID to get details for (must start with #)"
+                "The order ID to get details for"
             ),
-            pattern=r"^(#[\w\d]+|NOT_FOUND)$",
+            pattern=r"^(#?[\w\d]+|NOT_FOUND)$",
             examples=["#W0000000"],
             json_schema_extra={
                 "available_from": ["get_user_details"]
@@ -66,6 +66,15 @@ class Signature:
 
         return generate_diverse_utterances(utterances_obj.plain_utterances, command_name)
 
+    @staticmethod
+    def validate_extracted_parameters(
+        workflow: fastworkflow.Workflow, 
+        command: str, cmd_parameters: "Signature.Input"
+    ) -> tuple[bool, str]:
+        if not cmd_parameters.order_id.startswith('#'):
+            cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
+        return (True, '')
+
 
 class ResponseGenerator:
     def __call__(

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/modify_pending_order_address.py

@@ -14,8 +14,8 @@ class Signature:
     class Input(BaseModel):
         order_id: str = Field(
             default="NOT_FOUND",
-            description="The order ID to modify (must start with #)",
-            pattern=r"^(#W\d+|NOT_FOUND)$",
+            description="The order ID to modify",
+            pattern=r"^(#?[\w\d]+|NOT_FOUND)$",
             examples=["#W0000000"],
             json_schema_extra={
                 "available_from": ["get_user_details"]
@@ -59,6 +59,15 @@ class Signature:
         from fastworkflow.train.generate_synthetic import generate_diverse_utterances
         return generate_diverse_utterances(utterances_obj.plain_utterances, command_name)
 
+    @staticmethod
+    def validate_extracted_parameters(
+        workflow: fastworkflow.Workflow, 
+        command: str, cmd_parameters: "Signature.Input"
+    ) -> tuple[bool, str]:
+        if not cmd_parameters.order_id.startswith('#'):
+            cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
+        return (True, '')
+
 
 class ResponseGenerator:
     def __call__(self, workflow: Workflow, command: str, command_parameters: Signature.Input) -> CommandOutput:

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/modify_pending_order_items.py

@@ -14,8 +14,8 @@ class Signature:
     class Input(BaseModel):
         order_id: str = Field(
             default="NOT_FOUND",
-            description="The order ID to modify (must start with #)",
-            pattern=r"^(#W\d+|NOT_FOUND)$",
+            description="The order ID to modify",
+            pattern=r"^(#?[\w\d]+|NOT_FOUND)$",
             examples=["#W0000000"],
             json_schema_extra={
                 "available_from": ["get_user_details"]
@@ -40,8 +40,8 @@ class Signature:
         payment_method_id: str = Field(
             default="NOT_FOUND",
             description="Payment method ID for price differences",
-            pattern=r"^((gift_card|credit_card)_\d+|NOT_FOUND)$",
-            examples=["gift_card_0000000", "credit_card_0000000"],
+            pattern=r"^((gift_card|credit_card|paypal)_\d+|NOT_FOUND)$",
+            examples=["gift_card_0000000", "credit_card_0000000", "paypal_0000000"],
             json_schema_extra={
                 "available_from": ["get_order_details", "get_user_details"]
             }
@@ -68,6 +68,15 @@ class Signature:
         from fastworkflow.train.generate_synthetic import generate_diverse_utterances
         return generate_diverse_utterances(utterances_obj.plain_utterances, command_name)
 
+    @staticmethod
+    def validate_extracted_parameters(
+        workflow: fastworkflow.Workflow, 
+        command: str, cmd_parameters: "Signature.Input"
+    ) -> tuple[bool, str]:
+        if not cmd_parameters.order_id.startswith('#'):
+            cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
+        return (True, '')
+
 
 class ResponseGenerator:
     def __call__(self, workflow: Workflow, command: str, command_parameters: Signature.Input) -> CommandOutput:

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/modify_pending_order_payment.py

@@ -14,8 +14,8 @@ class Signature:
     class Input(BaseModel):
         order_id: str = Field(
             default="NOT_FOUND",
-            description="The order ID to modify (must start with #)",
-            pattern=r"^(#W\d+|NOT_FOUND)$",
+            description="The order ID to modify",
+            pattern=r"^(#?[\w\d]+|NOT_FOUND)$",
             examples=["#W0000000"],
             json_schema_extra={
                 "available_from": ["get_user_details"]
@@ -24,8 +24,8 @@ class Signature:
         payment_method_id: str = Field(
             default="NOT_FOUND",
             description="Payment method ID to switch to",
-            pattern=r"^((gift_card|credit_card)_\d+|NOT_FOUND)$",
-            examples=["gift_card_0000000", "credit_card_0000000"],
+            pattern=r"^((gift_card|credit_card|paypal)_\d+|NOT_FOUND)$",
+            examples=["gift_card_0000000", "credit_card_0000000", "paypal_0000000"],
             json_schema_extra={
                 "available_from": ["get_user_details"]
             }
@@ -52,6 +52,15 @@ class Signature:
         from fastworkflow.train.generate_synthetic import generate_diverse_utterances
         return generate_diverse_utterances(utterances_obj.plain_utterances, command_name)
 
+    @staticmethod
+    def validate_extracted_parameters(
+        workflow: fastworkflow.Workflow, 
+        command: str, cmd_parameters: "Signature.Input"
+    ) -> tuple[bool, str]:
+        if not cmd_parameters.order_id.startswith('#'):
+            cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
+        return (True, '')
+
 
 class ResponseGenerator:
     def __call__(self, workflow: Workflow, command: str, command_parameters: Signature.Input) -> CommandOutput:

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/return_delivered_order_items.py

@@ -14,9 +14,9 @@ class Signature:
     class Input(BaseModel):
         order_id: str = Field(
             default="NOT_FOUND",
-            description="The order ID for return (must start with #)",
-            pattern=r"^(#W\d+|NOT_FOUND)$",
-            examples=["#W3456890"],
+            description="The order ID of return items",
+            pattern=r"^(#?[\w\d]+|NOT_FOUND)$",
+            examples=["#W00000000"],
             json_schema_extra={
                 "available_from": ["get_user_details"]
             }
@@ -32,8 +32,8 @@ class Signature:
         payment_method_id: str = Field(
             default="NOT_FOUND",
             description="Payment method ID for refund",
-            pattern=r"^((gift_card|credit_card)_\d+|NOT_FOUND)$",
-            examples=["gift_card_0000000", "credit_card_0000000"],
+            pattern=r"^((gift_card|credit_card|paypal)_\d+|NOT_FOUND)$",
+            examples=["gift_card_0000000", "credit_card_0000000", "paypal_0000000"],
             json_schema_extra={
                 "available_from": ["get_order_details"]
             }
@@ -62,6 +62,15 @@ class Signature:
         from fastworkflow.train.generate_synthetic import generate_diverse_utterances
         return generate_diverse_utterances(utterances_obj.plain_utterances, command_name)
 
+    @staticmethod
+    def validate_extracted_parameters(
+        workflow: fastworkflow.Workflow, 
+        command: str, cmd_parameters: "Signature.Input"
+    ) -> tuple[bool, str]:
+        if not cmd_parameters.order_id.startswith('#'):
+            cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
+        return (True, '')
+
 
 class ResponseGenerator:
     def __call__(self, workflow: Workflow, command: str, command_parameters: Signature.Input) -> CommandOutput:

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/examples/retail_workflow/_commands/transfer_to_human_agents.py

@@ -10,7 +10,7 @@ from ..tools.transfer_to_human_agents import TransferToHumanAgents
 
 
 class Signature:
-    """Transfer to a human agent as the last resort"""
+    """Transfer to a human agent ONLY AS THE LAST RESORT"""
     class Input(BaseModel):
         summary: str = Field(
             default="NOT_FOUND",

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/utils/signatures.py

@@ -408,7 +408,13 @@ Today's date is {today}.
             ):
                 return (True, "All required parameters are valid.", {})
             
-            is_valid, message = self.input_for_param_extraction_class.validate_extracted_parameters(app_workflow, subject_command_name, cmd_parameters)
+            try:
+                is_valid, message = self.input_for_param_extraction_class.validate_extracted_parameters(app_workflow, subject_command_name, cmd_parameters)
+            except Exception as e:
+                message = f"Exception in {subject_command_name}'s validate_extracted_parameters function: {str(e)}"
+                logger.critical(message)                    
+                return (False, message, {})
+            
             if is_valid:
                 return (True, "All required parameters are valid.", {})
             return (False, message, {})
@@ -422,7 +428,7 @@ Today's date is {today}.
                 if hasattr(type(cmd_parameters).model_fields.get(missing_field), "json_schema_extra") and type(cmd_parameters).model_fields.get(missing_field).json_schema_extra:
                     is_available_from = type(cmd_parameters).model_fields.get(missing_field).json_schema_extra.get("available_from")
                 if is_available_from:
-                    message += f"abort and use the {' or '.join(is_available_from)} command(s) to get {missing_field} information\n"
+                    message += f"abort and use the {' or '.join(is_available_from)} command(s) to get {missing_field} information. OR...\n"
 
         if invalid_fields:
             message += f"{INVALID_INFORMATION_ERRMSG}" + ", ".join(invalid_fields) + "\n"

{fastworkflow-2.14.2 → fastworkflow-2.15.0}/fastworkflow/workflow.py

@@ -285,6 +285,24 @@ class Workflow:
     def is_complete(self, value: bool) -> None:
         self._is_complete = value
         self._mark_dirty()
+    
+    def end_command_processing(self) -> None:
+        """Process the end of a command"""
+        mark_dirty = False
+        # important to clear the current command from the workflow context
+        if "command" in self._context:
+            del self._context["command"]
+            mark_dirty = True
+
+        # important to clear parameter extraction error state (if any)
+        if "stored_parameters" in self._context:
+            del self._context["stored_parameters"]
+            mark_dirty = True
+
+        self._context["NLU_Pipeline_Stage"] = fastworkflow.NLUPipelineStage.INTENT_DETECTION
+
+        if mark_dirty:
+            self._mark_dirty()
 
     def close(self) -> bool:
         """close the session"""