fastworkflow 2.15.0__py3-none-any.whl → 2.15.2__py3-none-any.whl

fastworkflow/chat_session.py

@@ -121,6 +121,8 @@ class ChatSession:
         self._command_output_queue = Queue()
         self._status = SessionStatus.STOPPED
         self._chat_worker = None
+
+        self._conversation_history = dspy.History(messages=[])
         
         # Import here to avoid circular imports
         from fastworkflow.command_executor import CommandExecutor
@@ -297,6 +299,11 @@ class ChatSession:
     def workflow_is_complete(self, value: bool) -> None:
         if workflow := ChatSession.get_active_workflow():
             workflow.is_complete = value
+    
+    @property
+    def conversation_history(self) -> dspy.History:
+        """Return the conversation history."""
+        return self._conversation_history
        
 
     def _run_workflow_loop(self) -> Optional[fastworkflow.CommandOutput]:
@@ -421,7 +428,10 @@ class ChatSession:
 
         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)
+            agent_result = self._workflow_tool_agent(
+                user_query=refined_message,
+                conversation_history=self.conversation_history
+            )
             # dspy.inspect_history(n=1)
 
         # Extract the final result from the agent
@@ -431,6 +441,11 @@ class ChatSession:
             else str(agent_result)
         )
 
+        self.conversation_history.messages.append(
+            {"user_query": message, 
+             "agent_response": result_text}
+        )
+
         # Create CommandOutput with the agent's response
         command_response = fastworkflow.CommandResponse(response=result_text)
         # Attach actions captured during agent execution as artifacts if available

fastworkflow/command_executor.py

@@ -52,7 +52,7 @@ class CommandExecutor(CommandExecutorInterface):
             record = {
                 "command" if command_output.success else "failing command": command,
                 "command_name": command_output.command_name, 
-                "parameters": command_output.command_parametersr.model_dump(),
+                "parameters": command_output.command_parameters.model_dump() if command_output.command_parameters else None,
                 "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")
@@ -99,7 +99,7 @@ class CommandExecutor(CommandExecutorInterface):
         record = {
             "command": command, 
             "command_name": command_name, 
-            "parameters": input_obj.model_dump(),
+            "parameters": input_obj.model_dump() if input_obj else None,
             "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")

fastworkflow/workflow_agent.py

@@ -18,6 +18,7 @@ class WorkflowAgentSignature(dspy.Signature):
     All the tasks in the todo list must be completed before returning the final answer.
     """
     user_query = dspy.InputField(desc="The natural language user query.")
+    conversation_history: dspy.History = dspy.InputField()
     final_answer = dspy.OutputField(desc="Comprehensive final answer with supporting evidence to demonstrate that all the tasks in the todo list have been completed.")
 
 def _what_can_i_do(chat_session_obj: fastworkflow.ChatSession) -> str:
@@ -119,7 +120,8 @@ def _ask_user_tool(clarification_request: str, chat_session_obj: fastworkflow.Ch
         command_responses=[fastworkflow.CommandResponse(response=clarification_request)]
     )
     chat_session_obj.command_output_queue.put(command_output)
-    return chat_session_obj.user_message_queue.get()
+    user_query = chat_session_obj.user_message_queue.get()
+    return _think_and_plan(user_query, chat_session_obj)
 
 def initialize_workflow_tool_agent(mcp_server: FastWorkflowMCPServer, max_iters: int = 25):
     """
@@ -133,11 +135,6 @@ def initialize_workflow_tool_agent(mcp_server: FastWorkflowMCPServer, max_iters:
     Returns:
         DSPy ReAct agent configured with workflow tools
     """
-    # available_tools = mcp_server.list_tools()
-
-    # if not available_tools:
-    #     return None
-
     chat_session_obj = mcp_server.chat_session
     if not chat_session_obj:
         return None
@@ -185,7 +182,7 @@ def initialize_workflow_tool_agent(mcp_server: FastWorkflowMCPServer, max_iters:
         """
         Executes the command and returns either a response, or a clarification request.
         Use the "what_can_i_do" tool to get details on available commands, including their names and parameters. Fyi, values in the 'examples' field are fake and for illustration purposes only.
-        Commands must be formatted as follows: command_name <param1_name>param1_value</param1_name> <param2_name>param2_value</param2_name> ...
+        Commands must be formatted using plain text for command name followed by XML tags enclosing parameter values (if any) as follows: command_name <param1_name>param1_value</param1_name> <param2_name>param2_value</param2_name> ...
         Don't use this tool to respond to a clarification requests in PARAMETER EXTRACTION ERROR state
         """
         try:
@@ -225,3 +222,33 @@ def initialize_workflow_tool_agent(mcp_server: FastWorkflowMCPServer, max_iters:
         tools=tools,
         max_iters=max_iters,
     )
+
+def _think_and_plan(user_query: str, chat_session_obj: fastworkflow.ChatSession) -> 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 = chat_session_obj.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.15.0.dist-info → fastworkflow-2.15.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastworkflow
-Version: 2.15.0
+Version: 2.15.2
 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.15.0.dist-info → fastworkflow-2.15.2.dist-info}/RECORD

@@ -33,11 +33,11 @@ fastworkflow/build/navigator_stub_generator.py,sha256=_DSvHC6r1xWQiFHtUgPhI51nQf
 fastworkflow/build/pydantic_model_generator.py,sha256=oNyoANyUWBpHG-fE3tGL911RNvDzQXjxAm0ssvuXUH4,1854
 fastworkflow/build/utterance_generator.py,sha256=UrtkF0wyAZ1hiFitHX0g8w7Wh-D0leLCrP1aUACSfHo,299
 fastworkflow/cache_matching.py,sha256=OoB--1tO6-O4BKCuCrUbB0CkUr76J62K4VAf6MShi-w,7984
-fastworkflow/chat_session.py,sha256=hSreXG-sjjVeSonGTs2kgWKGqDsp3ziz8-9DBZ9qULo,25315
+fastworkflow/chat_session.py,sha256=EOtPy3XG6tDR_FW1j-FAxcdgwRM668t13NuusEa_smg,25776
 fastworkflow/cli.py,sha256=RB78V78NAZsZtNqF4_kk-TnEKCOy-cFLF6wSwz8aP14,26345
 fastworkflow/command_context_model.py,sha256=nWxLP3TR7WJr3yWCedqcdFOxo_kwae_mS3VRN2cOmK8,13437
 fastworkflow/command_directory.py,sha256=aJ6UQCwevfF11KbcQB2Qz6mQ7Kj91pZtvHmQY6JFnao,29030
-fastworkflow/command_executor.py,sha256=gUPkXWqXmvNe610eQDvQWVfQsVD62qDhUmBxi1DRxcg,8961
+fastworkflow/command_executor.py,sha256=nlg-vzZI78f-9tcacrOB4_SK4vVhvszsZd6cwfDP9hc,9030
 fastworkflow/command_interfaces.py,sha256=PWIKlcp0G8nmYl0vkrg1o6QzJL0pxXkfrn1joqTa0eU,460
 fastworkflow/command_metadata_api.py,sha256=KtidE3PM9HYfY-nmEXZ8Y4nnaw2qn23p_gvwFVT3F8Y,39770
 fastworkflow/command_routing.py,sha256=R7194pcY0d2VHzmCu9ALacm1UvNuIRIvTn8mLp-EZIM,17219
@@ -166,10 +166,10 @@ fastworkflow/utils/python_utils.py,sha256=OzSf-bGve1401SHM3QXXFauBOBrlGQzPNgvvGJ
 fastworkflow/utils/signatures.py,sha256=3B3EafS5b76L4hOwDyABKMuY_bfEwmCYdK6T5DxWM1w,20968
 fastworkflow/utils/startup_progress.py,sha256=9icSdnpFAxzIq0sUliGpNaH0Efvrt5lDtGfURV5BD98,3539
 fastworkflow/workflow.py,sha256=F7kGoNQbAMwy71zT1V_KF8PbRTCY4Dz-16Zv4ApK8m8,18939
-fastworkflow/workflow_agent.py,sha256=xRY8Y9KSSyTsqg6327HrTN1NQ2s9E-8Ug9CjNY-bzJU,11443
+fastworkflow/workflow_agent.py,sha256=9l1P8_6Ej5BwomMjHJa8PlxSGkd9g9l9IWw0o8AtPBo,13183
 fastworkflow/workflow_inheritance_model.py,sha256=Pp-qSrQISgPfPjJVUfW84pc7HLmL2evuq0UVIYR51K0,7974
-fastworkflow-2.15.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fastworkflow-2.15.0.dist-info/METADATA,sha256=um9i-KH5Xti64MlRJD3-no8XKFvp2mXkk6J52Ozxwxw,29867
-fastworkflow-2.15.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastworkflow-2.15.0.dist-info/entry_points.txt,sha256=m8HqoPzCyaZLAx-V5X8MJgw3Lx3GiPDlxNEZ7K-Gb-U,54
-fastworkflow-2.15.0.dist-info/RECORD,,
+fastworkflow-2.15.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fastworkflow-2.15.2.dist-info/METADATA,sha256=-z606kQh8w5hHKtF78paGR5EEQ8rWpMaj13h99bGNZY,29867
+fastworkflow-2.15.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastworkflow-2.15.2.dist-info/entry_points.txt,sha256=m8HqoPzCyaZLAx-V5X8MJgw3Lx3GiPDlxNEZ7K-Gb-U,54
+fastworkflow-2.15.2.dist-info/RECORD,,