fastworkflow 2.17.8__py3-none-any.whl → 2.17.10__py3-none-any.whl

fastworkflow/utils/signatures.py

@@ -407,7 +407,7 @@ Today's date is {today}.
                                         parsed = ast.literal_eval(text)
                                         if isinstance(parsed, list):
                                             return parsed
-                                # Fallback: comma-separated
+                                # Comma-separated values
                                 if "," in text:
                                     parts = [p.strip() for p in text.split(",")]
                                     cleaned = [
@@ -415,6 +415,12 @@ Today's date is {today}.
                                         for p in parts
                                     ]
                                     return cleaned
+                                # Single value - treat as a list with one element
+                                if text:
+                                    # Remove quotes if present
+                                    if len(text) >= 2 and ((text[0] == text[-1] == '"') or (text[0] == text[-1] == "'")):
+                                        return [text[1:-1]]
+                                    return [text]
                                 return None
 
                         def _coerce_scalar(expected_type: Type[Any], val: Any) -> Tuple[bool, Optional[Any]]:
@@ -511,7 +517,48 @@ Today's date is {today}.
 
                         if valid_by_type:
                             if corrected_value is not None:
-                                setattr(cmd_parameters, field_name, corrected_value)
+                                pattern = next(
+                                    (meta.pattern
+                                        for meta in getattr(field_info, "metadata", [])
+                                        if hasattr(meta, "pattern")),
+                                    None,
+                                )
+                                if pattern and field_value is not None and field_value != NOT_FOUND:
+                                    invalid_value = None
+                                    if hasattr(field_info, "json_schema_extra") and field_info.json_schema_extra:
+                                        invalid_value = field_info.json_schema_extra.get("invalid_value")
+
+                                    # if invalid_value and field_value == invalid_value:
+                                    #     invalid_fields.append(f"{field_name} '{field_value}'")
+                                    #     pattern_str = str(pattern)
+                                    #     examples = getattr(field_info, "examples", [])
+                                    #     example = examples[0] if examples else ""
+                                    #     all_suggestions[field_name] = [f"Please use the format matching pattern {pattern_str} (e.g., {example})"]
+                                    #     is_valid = False
+
+                                    # else:
+                                    pattern_regex = re.compile(pattern)
+                                    if not pattern_regex.fullmatch(str(field_value)):
+                                        invalid_fields.append(f"{field_name} '{field_value}'")
+                                        pattern_str = str(pattern)
+                                        examples = getattr(field_info, "examples", [])
+                                        example = examples[0] if examples else ""
+
+                                        invalid_fields.append(f"{field_name} '{field_value}'")
+                                        all_suggestions[field_name] = [f"Please use the format matching pattern {pattern_str} (e.g., {example})"]
+                                        is_valid = False
+                                    else:
+                                        try:
+                                            setattr(cmd_parameters, field_name, corrected_value)
+                                        except Exception as e:
+                                            logger.critical(f"Failed to set attribute {field_name} with value {corrected_value}")
+                                            raise e
+                                else:
+                                    try:
+                                        setattr(cmd_parameters, field_name, corrected_value)
+                                    except Exception as e:
+                                        logger.critical(f"Failed to set attribute {field_name} with value {corrected_value}")
+                                        raise e
                         else:
                             invalid_fields.append(f"{field_name} '{field_value}'")
                             all_suggestions[field_name] = build_type_suggestion()
@@ -539,35 +586,6 @@ Today's date is {today}.
                     missing_fields.append(field_name)
                     is_valid = False
 
-                pattern = next(
-                    (meta.pattern
-                        for meta in getattr(field_info, "metadata", [])
-                        if hasattr(meta, "pattern")),
-                    None,
-                )
-                if pattern and field_value is not None and field_value != NOT_FOUND:
-                    invalid_value = None
-                    if hasattr(field_info, "json_schema_extra") and field_info.json_schema_extra:
-                        invalid_value = field_info.json_schema_extra.get("invalid_value")
-
-                    if invalid_value and field_value == invalid_value:
-                        invalid_fields.append(f"{field_name} '{field_value}'")
-                        pattern_str = str(pattern)
-                        examples = getattr(field_info, "examples", [])
-                        example = examples[0] if examples else ""
-                        all_suggestions[field_name] = [f"Please use the format matching pattern {pattern_str} (e.g., {example})"]
-                        is_valid = False
-
-                    else:
-                        pattern_regex = re.compile(pattern)
-                        if not pattern_regex.fullmatch(str(field_value)):
-                            invalid_fields.append(f"{field_name} '{field_value}'")
-                            pattern_str = str(pattern)
-                            examples = getattr(field_info, "examples", [])
-                            example = examples[0] if examples else ""
-                            all_suggestions[field_name] = [f"Please use the format matching pattern {pattern_str} (e.g., {example})"]
-                            is_valid = False
-
         for field_name, field_info in type(cmd_parameters).model_fields.items():
             field_value = getattr(cmd_parameters, field_name, None)
 

fastworkflow/workflow_agent.py

@@ -99,10 +99,10 @@ def _execute_workflow_query(command: str, chat_session_obj: fastworkflow.ChatSes
     # Extract command name and parameters from command_output
     name = command_output.command_name
     params = command_output.command_parameters
-    
+
     # Handle parameter serialization
     params_dict = params.model_dump() if params else None
-    
+
     # Extract response text
     response_text = ""
     if command_output.command_responses:
@@ -135,8 +135,81 @@ def _execute_workflow_query(command: str, chat_session_obj: fastworkflow.ChatSes
     with open("action.jsonl", "a", encoding="utf-8") as f:
         f.write(json.dumps(record, ensure_ascii=False) + "\n")
 
-    if 'PARAMETER EXTRACTION ERROR' in response_text or 'The command is ambiguous' in response_text:
-        abort_confirmation = _execute_workflow_query('abort', chat_session_obj = chat_session_obj)
+    # Check workflow context to determine if we're in an error state that needs specialized handling
+    cme_workflow = chat_session_obj.cme_workflow
+    nlu_stage = cme_workflow.context.get("NLU_Pipeline_Stage")
+
+    # Handle intent ambiguity clarification state with specialized agent
+    if nlu_stage == fastworkflow.NLUPipelineStage.INTENT_AMBIGUITY_CLARIFICATION:
+        if intent_agent := chat_session_obj.intent_clarification_agent:
+            # Get suggested commands from intent detection system
+            from fastworkflow._workflows.command_metadata_extraction.intent_detection import CommandNamePrediction
+            predictor = CommandNamePrediction(cme_workflow)
+            suggested_commands = predictor._get_suggested_commands(predictor.path)
+
+            suggested_commands = list(suggested_commands) if suggested_commands is not None else []
+
+            # Get metadata for only the suggested commands
+            current_workflow = chat_session_obj.get_active_workflow()
+            suggested_commands_metadata = CommandMetadataAPI.get_suggested_commands_metadata(
+                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,
+                suggested_command_names=suggested_commands
+            )
+
+            # Get the workflow agent's trajectory and inputs for context
+            workflow_tool_agent = chat_session_obj.workflow_tool_agent
+            agent_inputs = workflow_tool_agent.inputs if workflow_tool_agent else {}
+            agent_trajectory = workflow_tool_agent.current_trajectory if workflow_tool_agent else {}
+
+            lm = dspy_utils.get_lm("LLM_AGENT", "LITELLM_API_KEY_AGENT")
+            with dspy.context(lm=lm):
+                result = intent_agent(
+                    original_command=command,
+                    error_message=response_text,
+                    agent_inputs=agent_inputs,
+                    agent_trajectory=agent_trajectory,
+                    suggested_commands_metadata=suggested_commands_metadata
+                )
+            # The clarified command should have the correct name with all original parameters
+            clarified_cmd = result.clarified_command if hasattr(result, 'clarified_command') else str(result)
+            # Execute the clarified command
+            return _execute_workflow_query(clarified_cmd, chat_session_obj=chat_session_obj)
+        else:
+            # No intent clarification agent available, fall back to abort
+            abort_confirmation = _execute_workflow_query('abort', chat_session_obj=chat_session_obj)
+            return f'{response_text}\n{abort_confirmation}'
+
+    # Handle intent misunderstanding clarification state with specialized agent
+    if nlu_stage == fastworkflow.NLUPipelineStage.INTENT_MISUNDERSTANDING_CLARIFICATION:
+        if intent_agent := chat_session_obj.intent_clarification_agent:
+            # Get the workflow agent's trajectory and inputs for context
+            workflow_tool_agent = chat_session_obj.workflow_tool_agent
+            agent_inputs = workflow_tool_agent.inputs if workflow_tool_agent else {}
+            agent_trajectory = workflow_tool_agent.current_trajectory if workflow_tool_agent else {}
+
+            lm = dspy_utils.get_lm("LLM_AGENT", "LITELLM_API_KEY_AGENT")
+            with dspy.context(lm=lm):
+                result = intent_agent(
+                    original_command=command,
+                    error_message=response_text,
+                    agent_inputs=agent_inputs,
+                    agent_trajectory=agent_trajectory,
+                    suggested_commands_metadata=""
+                )
+
+            clarified_cmd = result.clarified_command if hasattr(result, 'clarified_command') else str(result)
+
+            return _execute_workflow_query(clarified_cmd, chat_session_obj=chat_session_obj)
+        else:
+            # No intent clarification agent available, fall back to abort
+            abort_confirmation = _execute_workflow_query('abort', chat_session_obj=chat_session_obj)
+            return f'{response_text}\n{abort_confirmation}'
+
+    # Handle parameter extraction errors with abort
+    if nlu_stage == fastworkflow.NLUPipelineStage.PARAMETER_EXTRACTION:
+        abort_confirmation = _execute_workflow_query('abort', chat_session_obj=chat_session_obj)
         return f'{response_text}\n{abort_confirmation}'
 
     return response_text
@@ -253,6 +326,7 @@ def initialize_workflow_tool_agent(chat_session: fastworkflow.ChatSession, max_i
         The clarification_request must be plain text without any formatting.
         Note that using the wrong command name can produce missing information errors. Double-check with the what_can_i_do tool to verify that the correct command name is being used 
         """
+        chat_session_obj.workflow_tool_agent.iteration_counter = 0  # reset iteration counter, everytime we ask the user
         return _ask_user_tool(clarification_request, chat_session_obj=chat_session_obj)
 
     tools = [

{fastworkflow-2.17.8.dist-info → fastworkflow-2.17.10.dist-info}/METADATA

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

@@ -13,7 +13,7 @@ fastworkflow/_workflows/command_metadata_extraction/_commands/__init__.py,sha256
 fastworkflow/_workflows/command_metadata_extraction/_commands/wildcard.py,sha256=Sqpc2hwM-DgmsqiHu3OoOuqo3XnHLkFlmyYCJA8nj_8,7843
 fastworkflow/_workflows/command_metadata_extraction/command_context_model.json,sha256=zGWBweQSmFf7WsfR_F2DE7AJ8S8-q7F9ZbvyccysJJI,117
 fastworkflow/_workflows/command_metadata_extraction/intent_detection.py,sha256=Ci0Cut_rH8wpUlLEsTMK-OhT3AO2nKgJmXQYIsoTzJw,14543
-fastworkflow/_workflows/command_metadata_extraction/parameter_extraction.py,sha256=MgNkPgA05E1-LSw9pNKDlXdsAphulYNhuDeTTqk5dBY,13686
+fastworkflow/_workflows/command_metadata_extraction/parameter_extraction.py,sha256=Vo3ff1fivB6fXRwALRpAsTO5r3FHdOABvUq_QxpxEKY,17089
 fastworkflow/build/__main__.py,sha256=NtedkZfM56qoEJ5vQECSURbE8AMTfwHN3tAZyZoWabk,15905
 fastworkflow/build/ast_class_extractor.py,sha256=F9OG4stkp7w3kadKqxMm8h3ZDSp_zg6mwcrKMl_XqdI,13527
 fastworkflow/build/class_analysis_structures.py,sha256=UWOKcs9pCiNuXc64hNywkTJq5X5KfG1pqdSZwWiZh-c,4053
@@ -35,13 +35,13 @@ 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=u3aQauea5vYmt98_ADTkWzkF_WsJaaiA8AX6OlGeyf8,32332
+fastworkflow/chat_session.py,sha256=O1HFst4GcglS0xR8lu2iaHiXzmNv0QVhdQ-8Nn2BFRw,35175
 fastworkflow/cli.py,sha256=n-PFDC0EOkq1zIK1Ip44at-VcaP9cW9aSxZ2IVj3VoE,23796
 fastworkflow/command_context_model.py,sha256=bQadDB_IH2lc0br46IT07Iej_j2KrAMderiVKqU7gno,15914
 fastworkflow/command_directory.py,sha256=aJ6UQCwevfF11KbcQB2Qz6mQ7Kj91pZtvHmQY6JFnao,29030
 fastworkflow/command_executor.py,sha256=WTSrukv6UDQfWUDSNleIQ1TxwDnAQIKIimh4sQVwnig,8457
 fastworkflow/command_interfaces.py,sha256=PWIKlcp0G8nmYl0vkrg1o6QzJL0pxXkfrn1joqTa0eU,460
-fastworkflow/command_metadata_api.py,sha256=J5ltiwOhFRf1fggm8yWziKPrZA3trKt_rkyBtSS0H3I,42233
+fastworkflow/command_metadata_api.py,sha256=PBu9c8iwYLcRy7YipAv6wKDimK7YZOweTe_q3rFuDMg,44191
 fastworkflow/command_routing.py,sha256=R7194pcY0d2VHzmCu9ALacm1UvNuIRIvTn8mLp-EZIM,17219
 fastworkflow/docs/context_modules_prd.txt,sha256=9wvs3LgNoIVXAczo1sXBIV4YmFqVhzC2ja1T3K7FG04,2199
 fastworkflow/examples/extended_workflow_example/README.md,sha256=2O0O4Bg--fwF98YDScnkNCUL3PcH8KpX2p6I1cwNWeg,2864
@@ -140,21 +140,22 @@ fastworkflow/examples/simple_workflow_template/application/__init__.py,sha256=47
 fastworkflow/examples/simple_workflow_template/application/workitem.py,sha256=Sm-QoX-EZvynkNf7uO3dViZF2VZqUlr6PAZZ7yjQEfk,40197
 fastworkflow/examples/simple_workflow_template/simple_workflow_template.json,sha256=A-dAl5iD9ehdMGGn05O2Kjwq6ZetqQjAGzlM1st0K9U,1237
 fastworkflow/examples/simple_workflow_template/startup_action.json,sha256=gj0-B4CqTYCs8OwHKhTu95H4uZbLsDf1th06IFfNXVs,75
+fastworkflow/intent_clarification_agent.py,sha256=UW5gj4Tg0wXduLRbDTkidVgBl-Cx-Esx_z9xRigMUJc,5215
 fastworkflow/mcp_server.py,sha256=NxbLSKf2MA4lAHVcm6ZfiVuOjVO6IeV5Iw17wImFbxQ,8867
 fastworkflow/model_pipeline_training.py,sha256=P_9wrYSfJVSYCTu8VEPkgXJ16eH58LLCK4rCRbRFAVg,46740
 fastworkflow/refine/__main__.py,sha256=bDLpPNMcdp8U4EFnMdjxx1sPDQCZuEJoBURr2KebTng,3398
 fastworkflow/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastworkflow/run/__main__.py,sha256=XmybAsr1MnCx8tzvhWxtBT7xu2Om3PVZFtABXavPccU,12075
-fastworkflow/run_fastapi_mcp/README.md,sha256=THJVLHXrPQ3ePZKbSHV9o-aQcgT20lv4nbgeLZDhJDY,10806
+fastworkflow/run_fastapi_mcp/README.md,sha256=dAmG2KF-9mqSjyIPSA9vhUit-DjsDH6WJUDCkQ3C1is,11943
 fastworkflow/run_fastapi_mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastworkflow/run_fastapi_mcp/__main__.py,sha256=ggsT9o2sKR1zNyovIhBo09Ha1JZx7SzSdX8tAY6jLds,48782
-fastworkflow/run_fastapi_mcp/conversation_store.py,sha256=OuS6Yq5noXrNn5jPwld_KueVi53Jlpa0qvF_vLUIbgg,13516
-fastworkflow/run_fastapi_mcp/jwt_manager.py,sha256=6djyNebME5U5hF_d42T9PjFOb2yDvXg2B03YjiAVXC4,11878
+fastworkflow/run_fastapi_mcp/__main__.py,sha256=R3A5PUoBXtEufaTTKF92kWhBuDg3xsVG0IQEyg4XJOI,53536
+fastworkflow/run_fastapi_mcp/conversation_store.py,sha256=2qnNLO_RVHznbIzTjpdff7szsrGyr1FVt1spcKvkrKk,13534
+fastworkflow/run_fastapi_mcp/jwt_manager.py,sha256=o3JLV71WiKNhr61KFIrYDnYQvvNYrqhSqEnsWNBUya4,12480
 fastworkflow/run_fastapi_mcp/mcp_specific.py,sha256=RdOPcPn68KlxNSM9Vb2yeYEDNGoNTcKZq-AC0cd86cw,4506
 fastworkflow/run_fastapi_mcp/redoc_2_standalone_html.py,sha256=oYWn30O-xKX6pVjunCeLupyOM2DbeZ3QgFj-F2LalOE,1191
-fastworkflow/run_fastapi_mcp/utils.py,sha256=A09htp-8Q2ksKM-nyor5V5bwek1O7prBSwHyGsxjBoo,17142
+fastworkflow/run_fastapi_mcp/utils.py,sha256=SX6meWba0T-iYn7YmEajbwJrijfVVUuYGv4usDXzA2c,19589
 fastworkflow/train/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastworkflow/train/__main__.py,sha256=AeGja42d0QhslQkxvDVigIluxxL7DYLdQPXYFOKQ7QA,8536
+fastworkflow/train/__main__.py,sha256=03OeHVwa7MmBNHGtBrQ-0cT2rtrVtAiQtvQBzkcbp3w,8533
 fastworkflow/train/generate_synthetic.py,sha256=sTDk-E5ewkS4o-0LJeofiEv4uXGpqdGcFRYKY_Yf36Y,5322
 fastworkflow/user_message_queues.py,sha256=svbuFxQ16q6Tz6urPWfD4IEsOTMxtS1Kc1PP8EE8AWg,1422
 fastworkflow/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -171,14 +172,14 @@ fastworkflow/utils/logging.py,sha256=2SA-04fg7Lx_vGf980tfCOGDQxBvU9X6Vbhv47rbdaw
 fastworkflow/utils/parameterize_func_decorator.py,sha256=V6YJnishWRCdwiBQW6P17hmGGrga0Empk-AN5Gm7iMk,633
 fastworkflow/utils/pydantic_model_2_dspy_signature_class.py,sha256=w1pvl8rJq48ulFwaAtBgfXYn_SBIDBgq1aLMUg1zJn8,12875
 fastworkflow/utils/python_utils.py,sha256=D0JBdzkwKoyK7XvZcnIxOgsS8CRGdvuW-zcO45_pfOA,8252
-fastworkflow/utils/react.py,sha256=2nsmtwFZJ9QkZqNxDt94a1cpuFSZplTTYeH-Z2dEX5s,11668
-fastworkflow/utils/signatures.py,sha256=QOLX3j-AJkRWIkDhogbhxQo8MIt668xIKwd4SWiS2LY,31734
+fastworkflow/utils/react.py,sha256=eROhiG0TQACLqa-4aVQB36kr4KsnqqQTQjqQdMpImCs,12384
+fastworkflow/utils/signatures.py,sha256=uv1HxkVK8yzu6xt0ci8RUSgQW0Njaz22YuJVO_aNUEM,33393
 fastworkflow/utils/startup_progress.py,sha256=9icSdnpFAxzIq0sUliGpNaH0Efvrt5lDtGfURV5BD98,3539
 fastworkflow/workflow.py,sha256=37gn7e3ct-gdGw43zS6Ab_ADoJJBO4eJW2PywfUpjEg,18825
-fastworkflow/workflow_agent.py,sha256=-RXoHXH-vrEh6AWC6iYAwwR9CvaRynYuu-KrzOPCJbg,16348
+fastworkflow/workflow_agent.py,sha256=-JxcF_T7bfT1sgizyUbgQmiPc7SnYxfnJkmRWZXNcIk,20708
 fastworkflow/workflow_inheritance_model.py,sha256=Pp-qSrQISgPfPjJVUfW84pc7HLmL2evuq0UVIYR51K0,7974
-fastworkflow-2.17.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fastworkflow-2.17.8.dist-info/METADATA,sha256=gO8KAHW-610IsPFNAaowDYDLiGZyLx9EafazpL_-moo,30634
-fastworkflow-2.17.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastworkflow-2.17.8.dist-info/entry_points.txt,sha256=m8HqoPzCyaZLAx-V5X8MJgw3Lx3GiPDlxNEZ7K-Gb-U,54
-fastworkflow-2.17.8.dist-info/RECORD,,
+fastworkflow-2.17.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fastworkflow-2.17.10.dist-info/METADATA,sha256=JvxWPbCGYSxT7j_TbSTp68Zv8u4uhoU2Gy--jViCCIo,30635
+fastworkflow-2.17.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastworkflow-2.17.10.dist-info/entry_points.txt,sha256=m8HqoPzCyaZLAx-V5X8MJgw3Lx3GiPDlxNEZ7K-Gb-U,54
+fastworkflow-2.17.10.dist-info/RECORD,,