fastworkflow 2.15.6__py3-none-any.whl → 2.15.8__py3-none-any.whl

fastworkflow/cli.py

@@ -12,7 +12,6 @@ import time
 from pathlib import Path
 import importlib.resources
 from rich import print as rprint
-from rich.console import Console
 from rich.live import Live
 from rich.spinner import Spinner
 
@@ -175,72 +174,6 @@ def fetch_example(args):
         traceback.print_exc(file=sys.stderr)
         sys.exit(1)
 
-def train_example(args):
-    # sourcery skip: extract-duplicate-method, extract-method, remove-redundant-fstring, split-or-ifs
-    """Train an existing example workflow."""
-    # Create a spinner for the initial check
-    spinner = Spinner("dots", text="[bold green]Preparing to train example...[/bold green]")
-
-    with Live(spinner, refresh_per_second=10):
-        # Check if example exists in the local examples directory
-        local_examples_dir = Path("./examples")
-        workflow_path = local_examples_dir / args.name
-
-        if workflow_path.is_dir():
-            # Get the appropriate env files for this example workflow
-            env_file_path, passwords_file_path = find_default_env_files(local_examples_dir)
-
-            # Check if the files exist
-            env_file = Path(env_file_path)
-            passwords_file = Path(passwords_file_path)
-
-            # Create args object for train_main
-            train_args = argparse.Namespace(
-                workflow_folderpath=str(workflow_path),
-                env_file_path=str(env_file),
-                passwords_file_path=str(passwords_file)
-            )
-
-    # After the spinner, handle any errors or proceed with training
-    if not workflow_path.is_dir():
-        rprint(f"[bold red]Error:[/bold red] Example '{args.name}' not found in '{local_examples_dir}'.")
-        rprint(f"Use 'fastworkflow examples fetch {args.name}' to fetch the example first.")
-        rprint("Or use 'fastworkflow examples list' to see available examples.")
-        sys.exit(1)
-
-    if not env_file.exists() or not passwords_file.exists():
-        rprint(f"[bold red]Error:[/bold red] Required environment files not found:")
-        if not env_file.exists():
-            rprint(f"  - {env_file} (not found)")
-        if not passwords_file.exists():
-            rprint(f"  - {passwords_file} (not found)")
-        rprint("\nPlease run the following command to fetch the example and its environment files:")
-        rprint(f"  fastworkflow examples fetch {args.name}")
-        rprint("\nAfter fetching, edit the passwords file to add your API keys:")
-        rprint(f"  {local_examples_dir}/fastworkflow.passwords.env")
-        sys.exit(1)
-
-    rprint(f"[bold green]Training example[/bold green] '{args.name}' in '{workflow_path}'...")
-
-    try:
-        # Lazy import train_main only when actually training
-        from .train.__main__ import train_main as _train_main
-        # Call train_main directly instead of using subprocess
-        result = _train_main(train_args)
-
-        if result is None or result == 0:
-            rprint(f"\n✅ Successfully trained example '{args.name}'.")
-            rprint(f"You can now run it with:\nfastworkflow examples run {args.name}")
-        else:
-            rprint(f"\n❌ Training failed.")
-            sys.exit(1)
-
-    except Exception as e:
-        rprint(f"[bold red]An unexpected error occurred during training:[/bold red] {e}")
-        import traceback
-        traceback.print_exc(file=sys.stderr)
-        sys.exit(1)
-
 def find_default_env_files(workflow_path):
     """Find the appropriate default env files based on context.
     
@@ -338,12 +271,6 @@ 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
@@ -363,7 +290,7 @@ def train_with_defaults(args):  # sourcery skip: extract-duplicate-method
             example_name = os.path.basename(args.workflow_folderpath)
             print("\nThis appears to be an example workflow. Please run:")
             print(f"  fastworkflow examples fetch {example_name}")
-            print(f"  fastworkflow examples train {example_name}")
+            print(f"  fastworkflow train ./examples/{example_name} ./examples/fastworkflow.env ./examples/fastworkflow.passwords.env")
         else:
             print("\nPlease ensure this file exists with required environment variables.")
             print("You can create a basic .env file in your current directory.")
@@ -376,7 +303,7 @@ def train_with_defaults(args):  # sourcery skip: extract-duplicate-method
             example_name = os.path.basename(args.workflow_folderpath)
             print("\nThis appears to be an example workflow. Please run:")
             print(f"  fastworkflow examples fetch {example_name}")
-            print(f"  fastworkflow examples train {example_name}")
+            print(f"  fastworkflow train ./examples/{example_name} ./examples/fastworkflow.env ./examples/fastworkflow.passwords.env")
         else:
             print("\nPlease ensure this file exists with required API keys.")
             print("You can create a basic passwords.env file in your current directory.")
@@ -403,7 +330,7 @@ def run_with_defaults(args):  # sourcery skip: extract-duplicate-method
             example_name = os.path.basename(args.workflow_path)
             print("\nThis appears to be an example workflow. Please run:")
             print(f"  fastworkflow examples fetch {example_name}")
-            print(f"  fastworkflow examples train {example_name}")
+            print(f"  fastworkflow train ./examples/{example_name} ./examples/fastworkflow.env ./examples/fastworkflow.passwords.env")
         else:
             print("\nPlease ensure this file exists with required environment variables.")
             print("You can create a basic .env file in your current directory.")
@@ -416,7 +343,7 @@ def run_with_defaults(args):  # sourcery skip: extract-duplicate-method
             example_name = os.path.basename(args.workflow_path)
             print("\nThis appears to be an example workflow. Please run:")
             print(f"  fastworkflow examples fetch {example_name}")
-            print(f"  fastworkflow examples train {example_name}")
+            print(f"  fastworkflow train ./examples/{example_name} ./examples/fastworkflow.env ./examples/fastworkflow.passwords.env")
         else:
             print("\nPlease ensure this file exists with required API keys.")
             print("You can create a basic passwords.env file in your current directory.")
@@ -426,86 +353,6 @@ def run_with_defaults(args):  # sourcery skip: extract-duplicate-method
     from .run.__main__ import run_main as _run_main
     return _run_main(args)
 
-def run_example(args):
-    # sourcery skip: extract-duplicate-method, extract-method, remove-redundant-fstring, split-or-ifs
-    """Run an existing example workflow."""
-    # Create a spinner for the initial check
-    spinner = Spinner("dots", text="[bold green]Preparing to run example...[/bold green]")
-
-    with Live(spinner, refresh_per_second=10):
-        # Check if example exists in the local examples directory
-        local_examples_dir = Path("./examples")
-        workflow_path = local_examples_dir / args.name
-
-        if workflow_path.is_dir():
-            # Get the appropriate env files for this example workflow
-            env_file_path, passwords_file_path = find_default_env_files(local_examples_dir)
-
-            # Check if the files exist
-            env_file = Path(env_file_path)
-            passwords_file = Path(passwords_file_path)
-
-            # Check if the example has been trained
-            command_info_dir = workflow_path / "___command_info"
-
-    # After the spinner, handle any errors or proceed with running
-    if not workflow_path.is_dir():
-        rprint(f"[bold red]Error:[/bold red] Example '{args.name}' not found in '{local_examples_dir}'.")
-        rprint(f"Use 'fastworkflow examples fetch {args.name}' to fetch the example first.")
-        rprint("Or use 'fastworkflow examples list' to see available examples.")
-        sys.exit(1)
-
-    if not env_file.exists() or not passwords_file.exists():
-        rprint(f"[bold red]Error:[/bold red] Required environment files not found:")
-        if not env_file.exists():
-            rprint(f"  - {env_file} (not found)")
-        if not passwords_file.exists():
-            rprint(f"  - {passwords_file} (not found)")
-        rprint("\nPlease run the following command to fetch the example and its environment files:")
-        rprint(f"  fastworkflow examples fetch {args.name}")
-        rprint("\nAfter fetching, edit the passwords file to add your API keys:")
-        rprint(f"  {local_examples_dir}/fastworkflow.passwords.env")
-        rprint("\nThen train the example before running it:")
-        rprint(f"  fastworkflow examples train {args.name}")
-        sys.exit(1)
-
-    # Check if the example has been trained
-    if not command_info_dir.exists() or not any(command_info_dir.iterdir()):
-        rprint(f"[bold yellow]Warning:[/bold yellow] Example '{args.name}' does not appear to be trained yet.")
-        rprint(f"Please train the example first with:")
-        rprint(f"  fastworkflow examples train {args.name}")
-        response = input("Do you want to continue anyway? [y/N] ")
-        if response.lower() != 'y':
-            rprint("Operation cancelled.")
-            sys.exit(0)
-
-    rprint(f"[bold green]Running example[/bold green] '{args.name}'...")
-
-    # For interactive applications, we need to use os.execvp to replace the current process
-    # This ensures that stdin/stdout/stderr are properly connected for interactive use
-    cmd = [
-        sys.executable,
-        "-m", "fastworkflow.run",
-        str(workflow_path),
-        str(env_file),
-        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
-        # This ensures that the interactive prompt works correctly
-        os.execvp(sys.executable, cmd)
-    except Exception as e:
-        rprint(f"[bold red]An unexpected error occurred while running the example:[/bold red] {e}")
-        import traceback
-        traceback.print_exc(file=sys.stderr)
-        sys.exit(1)
-
 def main():
     """Main function for the fastworkflow CLI."""
     
@@ -528,22 +375,6 @@ def main():
     parser_fetch.add_argument("--force", action="store_true", help="Force overwrite if example already exists")
     parser_fetch.set_defaults(func=fetch_example)
     
-    # 'examples train' command
-    parser_train_example = examples_subparsers.add_parser("train", help="Train a specific example")
-    parser_train_example.add_argument("name", help="The name of the example to train")
-    parser_train_example.set_defaults(func=train_example)
-    
-    # '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
     add_build_parser(subparsers)
     add_refine_parser(subparsers)

fastworkflow/examples/fastworkflow.env

@@ -1,7 +1,7 @@
 LLM_SYNDATA_GEN=mistral/mistral-small-latest
 LLM_PARAM_EXTRACTION=mistral/mistral-small-latest
 LLM_RESPONSE_GEN=mistral/mistral-small-latest
-LLM_PLANNER=openrouter/openai/gpt-oss-20b:free
+LLM_PLANNER=mistral/mistral-small-latest
 LLM_AGENT=mistral/mistral-small-latest
 
 SPEEDDICT_FOLDERNAME=___workflow_contexts

fastworkflow/examples/retail_workflow/_commands/exchange_delivered_order_items.py

@@ -24,7 +24,7 @@ class Signature:
         item_ids: List[str] = Field(
             default_factory=list,
             description="The item IDs to be exchanged",
-            examples=["1008292230"],
+            examples=["'34742388', '59475928'"],
             json_schema_extra={
                 "available_from": ["get_order_details"]
             }
@@ -32,7 +32,7 @@ class Signature:
         new_item_ids: List[str] = Field(
             default_factory=list,
             description="The new item IDs to exchange for",
-            examples=["1008292230"],
+            examples=["'45854949', '68789960'"],
             json_schema_extra={
                 "available_from": ["get_product_details"]
             }
@@ -75,7 +75,36 @@ class Signature:
     ) -> tuple[bool, str]:
         if not cmd_parameters.order_id.startswith('#'):
             cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
-        return (True, '')
+
+        error_message = ''
+        if len(cmd_parameters.item_ids) == 0:
+            error_message = 'item ids must be specified\n'
+        for item_id in cmd_parameters.item_ids:
+            try:
+                int(item_id)
+            except ValueError:
+                error_message += 'item ids must be integers\n'
+                break
+
+        if len(cmd_parameters.new_item_ids) == 0:
+            error_message += 'new item ids must be specified\n'
+        for item_id in cmd_parameters.new_item_ids:
+            try:
+                int(item_id)
+            except ValueError:
+                error_message += 'new item ids must be integers\n'
+                break
+
+        if len(cmd_parameters.new_item_ids) != len(cmd_parameters.item_ids):
+            error_message += 'the number of item ids and new item ids must match for a valid exchange\n'
+
+        if common_items := set(cmd_parameters.item_ids).intersection(
+            set(cmd_parameters.new_item_ids)
+        ):
+            common_items_str = ', '.join(common_items)
+            error_message += f'cannot exchange items for themselves: {common_items_str}. new item ids must differ from item ids\n'
+
+        return (False, error_message) if error_message else (True, '')
 
 
 class ResponseGenerator:

fastworkflow/examples/retail_workflow/_commands/modify_pending_order_items.py

@@ -24,7 +24,7 @@ class Signature:
         item_ids: List[str] = Field(
             default_factory=list,
             description="List of item IDs to be modified",
-            examples=["1008292230", "2468135790"],
+            examples=["'62727828', '76938178'"],
             json_schema_extra={
                 "available_from": ["get_order_details"]
             }
@@ -32,7 +32,7 @@ class Signature:
         new_item_ids: List[str] = Field(
             default_factory=list,
             description="List of new item IDs to replace with",
-            examples=["1008292231", "2468135791"],
+            examples=["'2352352', '42674747'"],
             json_schema_extra={
                 "available_from": ["get_product_details"]
             }
@@ -75,7 +75,36 @@ class Signature:
     ) -> tuple[bool, str]:
         if not cmd_parameters.order_id.startswith('#'):
             cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
-        return (True, '')
+
+        error_message = ''
+        if len(cmd_parameters.item_ids) == 0:
+            error_message = 'item ids must be specified\n'
+        for item_id in cmd_parameters.item_ids:
+            try:
+                int(item_id)
+            except ValueError:
+                error_message += 'item ids must be integers\n'
+                break
+
+        if len(cmd_parameters.new_item_ids) == 0:
+            error_message += 'new item ids must be specified\n'
+        for item_id in cmd_parameters.new_item_ids:
+            try:
+                int(item_id)
+            except ValueError:
+                error_message += 'new item ids must be integers\n'
+                break
+
+        if len(cmd_parameters.new_item_ids) != len(cmd_parameters.item_ids):
+            error_message += 'the number of item ids and new item ids must match for a valid exchange\n'
+
+        if common_items := set(cmd_parameters.item_ids).intersection(
+            set(cmd_parameters.new_item_ids)
+        ):
+            common_items_str = ', '.join(common_items)
+            error_message += f'cannot modify items for themselves: {common_items_str}. new item ids must differ from item ids\n'
+
+        return (False, error_message) if error_message else (True, '')
 
 
 class ResponseGenerator:

fastworkflow/examples/retail_workflow/_commands/return_delivered_order_items.py

@@ -24,7 +24,7 @@ class Signature:
         item_ids: List[str] = Field(
             default_factory=list,
             description="List of item IDs to be returned",
-            examples=["1008292230"],
+            examples=["'57347828', '8646987326'"],
             json_schema_extra={
                 "available_from": ["get_order_details"]
             }
@@ -69,7 +69,18 @@ class Signature:
     ) -> tuple[bool, str]:
         if not cmd_parameters.order_id.startswith('#'):
             cmd_parameters.order_id = f'#{cmd_parameters.order_id}'
-        return (True, '')
+
+        error_message = ''
+        if len(cmd_parameters.item_ids) == 0:
+            error_message = 'item ids must be specified\n'
+        for item_id in cmd_parameters.item_ids:
+            try:
+                int(item_id)
+            except ValueError:
+                error_message += 'item ids must be integers\n'
+                break
+
+        return (False, error_message) if error_message else (True, '')
 
 
 class ResponseGenerator:

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 ONLY AS THE LAST RESORT"""
+    """Transfer to a human agent ONLY if the user demands it explicitly."""
     class Input(BaseModel):
         summary: str = Field(
             default="NOT_FOUND",

fastworkflow/run/__main__.py

@@ -23,6 +23,7 @@ def run_main(args):
     from rich.spinner import Spinner
     from prompt_toolkit import PromptSession
     from prompt_toolkit.patch_stdout import patch_stdout
+    from prompt_toolkit.formatted_text import HTML
 
     import fastworkflow
     from fastworkflow.utils.logging import logger
@@ -34,7 +35,7 @@ def run_main(args):
     # Instantiate a global console for consistent styling
     global console
     console = Console()
-    prompt_session = PromptSession("User > ")
+    prompt_session = PromptSession(HTML('<b>User ></b> '))
 
     def _build_artifact_table(artifacts: dict[str, str]) -> Table:
         """Return a rich.Table representation for artifact key-value pairs."""
@@ -138,7 +139,9 @@ def run_main(args):
         raise ValueError("Cannot provide both startup_command and startup_action")
 
     console.print(Panel(f"Running fastWorkflow: [bold]{args.workflow_path}[/bold]", title="[bold green]fastworkflow[/bold green]", border_style="green"))
-    console.print("[bold green]Tip:[/bold green] Type 'exit' to quit the application.")
+    console.print(
+        "[bold green]Tips:[/bold green] Type '//exit' to quit the application. Type '//new' to start a new conversation. " 
+        "[bold green]Tips:[/bold green] Prefix natural language commands with a single '/' to execute them in deterministic (non-agentic) mode")
 
     # ------------------------------------------------------------------
     # Startup progress bar ------------------------------------------------
@@ -168,9 +171,9 @@ def run_main(args):
         with open(args.context_file_path, 'r') as file:
             context_dict = json.load(file)
 
-    # Create the chat session with agent mode if specified
-    run_as_agent = args.run_as_agent if hasattr(args, 'run_as_agent') else False
-    fastworkflow.chat_session = fastworkflow.ChatSession(run_as_agent=run_as_agent)
+    # Create the chat session in agent mode always
+    # run_as_agent = args.run_as_agent if hasattr(args, 'run_as_agent') else False
+    fastworkflow.chat_session = fastworkflow.ChatSession(run_as_agent=True)
     
     # Start the workflow within the chat session
     fastworkflow.chat_session.start_workflow(
@@ -193,8 +196,12 @@ def run_main(args):
     while not fastworkflow.chat_session.workflow_is_complete or args.keep_alive:
         with patch_stdout():
             user_command = prompt_session.prompt()
-        if user_command == "exit":
+        if user_command.startswith("//exit"):
             break
+        if user_command.startswith("//new"):
+            fastworkflow.chat_session.clear_conversation_history()
+            console.print("[bold]Agent >[/bold] New conversation started!\n", end="")
+            user_command = prompt_session.prompt()
 
         fastworkflow.chat_session.user_message_queue.put(user_command)
 
@@ -219,28 +226,25 @@ def run_main(args):
         with console.status("[bold cyan]Processing command...[/bold cyan]", spinner="dots") as status:
             counter = 0
             while wait_thread.is_alive():
-                # Check for agent traces if in agent mode
-                if args.run_as_agent:
-                    while True:
-                        try:
-                            evt = fastworkflow.chat_session.command_trace_queue.get_nowait()
-                        except queue.Empty:
-                            break
-                        
-                        # Choose styles based on success
-                        info_style = "dim orange3" if (evt.success is False) else "dim yellow"
-                        resp_style = "dim orange3" if (evt.success is False) else "dim green"
+                # Always show agent traces (run mode is always agentic)
+                while True:
+                    try:
+                        evt = fastworkflow.chat_session.command_trace_queue.get_nowait()
+                    except queue.Empty:
+                        break
+                    
+                    # Choose styles based on success
+                    info_style = "dim orange3" if (evt.success is False) else "dim yellow"
+                    resp_style = "dim orange3" if (evt.success is False) else "dim green"
 
-                        if evt.direction == fastworkflow.CommandTraceEventDirection.AGENT_TO_WORKFLOW:
-                            console.print(Text("Agent -> Workflow: ", style=info_style), end="")
-                            console.print(Text(str(evt.raw_command or ""), style=info_style))
-                        else:
-                            # command info (dim yellow or dim orange3)
-                            info = f"{evt.command_name or ''}, {evt.parameters}: "
-                            console.print(Text("Workflow -> Agent: ", style=info_style), end="")
-                            console.print(Text(info, style=info_style), end="")
-                            # response (dim green or dim orange3)
-                            console.print(Text(str(evt.response_text or ""), style=resp_style))
+                    if evt.direction == fastworkflow.CommandTraceEventDirection.AGENT_TO_WORKFLOW:
+                        console.print(f'[bold]Agent >[/bold] {evt.raw_command}', style=info_style)
+                    else:
+                        # command info (dim yellow or dim orange3)
+                        info = f"[bold]Workflow >[/bold] {evt.command_name or ''}, {evt.parameters}: "
+                        console.print(info, style=info_style, end="")
+                        # response (dim green or dim orange3)
+                        console.print(f'[bold]Workflow >[/bold] {evt.response_text}', style=resp_style)
 
                 time.sleep(0.5)
                 counter += 1
@@ -273,11 +277,6 @@ if __name__ == "__main__":
     parser.add_argument(
         "--project_folderpath", help="Optional path to project folder containing application code", default=None
     )
-    parser.add_argument(
-        "--run_as_agent", 
-        help="Run in agent mode (uses DSPy for tool selection)", 
-        action="store_true",
-        default=False
-    )
+    # run mode is always agentic; deterministic NL execution can be forced by prefixing '/' to a command
     args = parser.parse_args()
     run_main(args)