fastworkflow 2.13.5__py3-none-any.whl → 2.14.1__py3-none-any.whl

fastworkflow/_workflows/command_metadata_extraction/_commands/ErrorCorrection/you_misunderstood.py

@@ -41,7 +41,7 @@ class ResponseGenerator:
         fully_qualified_command_names = (
             set(cme_command_names) | 
             set(subject_crd.get_command_names(app_workflow.current_command_context_name))
-        ) - {'wildcard'}
+        )
 
         valid_command_names = [
             fully_qualified_command_name.split('/')[-1] 

fastworkflow/_workflows/command_metadata_extraction/_commands/IntentDetection/go_up.py

@@ -6,7 +6,7 @@ from fastworkflow.train.generate_synthetic import generate_diverse_utterances
 
 
 class Signature:  # noqa: D101
-    """Change context to the parent of the current context."""
+    """Change context to the parent of the current context. This could change the commands that are available."""
 
     plain_utterances = [
         "go up",

fastworkflow/_workflows/command_metadata_extraction/_commands/IntentDetection/reset_context.py

@@ -5,7 +5,7 @@ from fastworkflow.train.generate_synthetic import generate_diverse_utterances
 
 
 class Signature:  # noqa: D101
-    """Reset the current context to the global context (*)."""
+    """Reset the current context to the global context (*). This could change the commands that are available."""
     plain_utterances = [
         "reset context",
         "clear context",

fastworkflow/_workflows/command_metadata_extraction/_commands/IntentDetection/what_can_i_do.py

@@ -2,15 +2,16 @@ from __future__ import annotations
 
 import contextlib
 from pathlib import Path
-from typing import Set, Dict, Any, List
+from typing import Dict, Any
 from pydantic import BaseModel
 import json
 
 import fastworkflow
-
-from fastworkflow.command_routing import RoutingDefinition
 from fastworkflow.train.generate_synthetic import generate_diverse_utterances
+from fastworkflow.command_metadata_api import CommandMetadataAPI
+
 class Signature:
+    """List all the commands available in the current context along with their metadata"""
     class Output(BaseModel):
         valid_command_names: list[str]
 
@@ -38,154 +39,95 @@ class Signature:
 
 
 class ResponseGenerator:
-    def _get_enhanced_command_info(self, workflow: fastworkflow.Workflow) -> Dict[str, Any]:
-        """
-        Get enhanced command information for agent mode.
-        Returns structured JSON with context info, command details, etc.
-        """
-        app_workflow = workflow.context["app_workflow"]
-
-        # Get the current context information
-        context_info = {
-            "name": app_workflow.current_command_context_name,
-            "display_name": app_workflow.current_command_context_displayname,
-            "description": "",  # Could be extracted from context class docstring
-            "inheritance": [],  # Could be extracted from context_inheritance_model.json
-            "containment": []   # Could be extracted from context_containment_model.json
-        }
-
-        # Try to load context hierarchy information if available
-        with contextlib.suppress(Exception):
-            inheritance_path = Path(app_workflow.folderpath) / "context_inheritance_model.json"
-            if inheritance_path.exists():
-                with open(inheritance_path) as f:
-                    inheritance_data = json.load(f)
-                    context_info["inheritance"] = inheritance_data.get(context_info["name"], [])
-
-            containment_path = Path(app_workflow.folderpath) / "context_containment_model.json"
-            if containment_path.exists():
-                with open(containment_path) as f:
-                    containment_data = json.load(f)
-                    context_info["containment"] = containment_data.get(context_info["name"], [])
-        # Get command information
-        subject_crd = fastworkflow.RoutingRegistry.get_definition(app_workflow.folderpath)
-        cme_crd = fastworkflow.RoutingRegistry.get_definition(workflow.folderpath)
-
-        # Get available commands
-        cme_command_names = cme_crd.get_command_names('IntentDetection')
-        subject_command_names = subject_crd.get_command_names(app_workflow.current_command_context_name)
-
-        candidate_commands = set(cme_command_names) | set(subject_command_names)
-
-        # Filter and build command details
-        commands = []
-        for fq_cmd in candidate_commands:
-            if fq_cmd == "wildcard":
-                continue
-
-            # Check if command has utterances
-            utterance_meta = (
-                subject_crd.command_directory.get_utterance_metadata(fq_cmd) or
-                cme_crd.command_directory.get_utterance_metadata(fq_cmd)
-            )
-
-            if not utterance_meta:
-                continue
-
-            cmd_name = fq_cmd.split("/")[-1]
-
-            # Get command signature information if available
-            signature_info = {}
-            with contextlib.suppress(Exception):
-                # Try to get command module for signature extraction
-                cmd_module = None
-                try:
-                    cmd_module = subject_crd.get_command_module(fq_cmd)
-                except Exception:
-                    with contextlib.suppress(Exception):
-                        cmd_module = cme_crd.get_command_module(fq_cmd)
-                
-                if cmd_module and hasattr(cmd_module, 'Signature'):
-                    sig_class = cmd_module.Signature
-                    if hasattr(sig_class, 'Input'):
-                        input_class = sig_class.Input
-                        signature_info["inputs"] = [
-                            {
-                                "name": field_name,
-                                "type": str(field_info.annotation),
-                                "description": field_info.description or "",
-                                "examples": getattr(field_info, 'examples', []),
-                                "default": str(field_info.default) if field_info.default else None
-                            }
-                            for field_name, field_info in input_class.model_fields.items()
-                        ]
-
-                    # Get plain utterances if available
-                    if hasattr(sig_class, 'plain_utterances'):
-                        signature_info["plain_utterances"] = sig_class.plain_utterances
-            # Get docstring from utterance metadata if available
-            docstring = ""
-            if hasattr(utterance_meta, 'docstring'):
-                docstring = utterance_meta.docstring or ""
-
-            commands.append({
-                "qualified_name": fq_cmd,
-                "name": cmd_name,
-                "signature_docstring": docstring,
-                **signature_info
-            })
-
-        return {
-            "context": context_info,
-            "commands": sorted(commands, key=lambda x: x["name"])
-        }
+    # def _get_enhanced_command_info(self, workflow: fastworkflow.Workflow) -> Dict[str, Any]:
+    #     """
+    #     Get enhanced command information for agent mode.
+    #     Returns structured JSON with context info, command details, etc.
+    #     """
+    #     app_workflow = workflow.context["app_workflow"]
+
+    #     # Get the current context information
+    #     context_info = {
+    #         "name": app_workflow.current_command_context_name,
+    #         "display_name": app_workflow.current_command_context_displayname,
+    #         "description": "",
+    #         "inheritance": [],
+    #         "containment": []
+    #     }
+
+    #     # Try to load context hierarchy information if available
+    #     with contextlib.suppress(Exception):
+    #         inheritance_path = Path(app_workflow.folderpath) / "context_inheritance_model.json"
+    #         if inheritance_path.exists():
+    #             with open(inheritance_path) as f:
+    #                 inheritance_data = json.load(f)
+    #                 context_info["inheritance"] = inheritance_data.get(context_info["name"], [])
+
+    #         containment_path = Path(app_workflow.folderpath) / "context_containment_model.json"
+    #         if containment_path.exists():
+    #             with open(containment_path) as f:
+    #                 containment_data = json.load(f)
+    #                 context_info["containment"] = containment_data.get(context_info["name"], [])
+
+    #     from fastworkflow.command_metadata_api import CommandMetadataAPI
+
+    #     meta = CommandMetadataAPI.get_enhanced_command_info(
+    #         subject_workflow_path=app_workflow.folderpath,
+    #         cme_workflow_path=workflow.folderpath,
+    #         active_context_name=app_workflow.current_command_context_name,
+    #     )
+
+    #     return {
+    #         "context": context_info,
+    #         "commands": meta.get("commands", [])
+    #     }
     
-    def _process_command(
-        self, workflow: fastworkflow.Workflow
-    ) -> Signature.Output:
-        """
-        Provides helpful information about this type of work-item.
-        If the workitem_path is not provided, it provides information about the current work-item.
-
-        :param input: The input parameters for the function.
-        """
-        app_workflow = workflow.context["app_workflow"]
-        subject_crd = fastworkflow.RoutingRegistry.get_definition(
-            app_workflow.folderpath)
+    # def _process_command(
+    #     self, workflow: fastworkflow.Workflow
+    # ) -> Signature.Output:
+    #     """
+    #     Provides helpful information about this type of work-item.
+    #     If the workitem_path is not provided, it provides information about the current work-item.
+
+    #     :param input: The input parameters for the function.
+    #     """
+    #     app_workflow = workflow.context["app_workflow"]
+    #     subject_crd = fastworkflow.RoutingRegistry.get_definition(
+    #         app_workflow.folderpath)
         
-        crd = fastworkflow.RoutingRegistry.get_definition(
-            workflow.folderpath)
-        cme_command_names = crd.get_command_names('IntentDetection')
-
-        # ------------------------------------------------------------------
-        # Build the union of command names that *should* be visible, then
-        # filter out any command that (a) is the special wildcard helper or
-        # (b) has no user-facing utterances in *any* command directory.
-        # ------------------------------------------------------------------
-
-        candidate_commands: set[str] = (
-            set(cme_command_names)
-            | set(subject_crd.get_command_names(app_workflow.current_command_context_name))
-        )
-
-        def _has_utterances(fq_cmd: str) -> bool:
-            """Return True if *fq_cmd* has at least one utterance definition in
-            either the subject workflow or the CME workflow."""
-            return (
-                subject_crd.command_directory.get_utterance_metadata(fq_cmd) is not None
-                or crd.command_directory.get_utterance_metadata(fq_cmd) is not None
-            )
-
-        visible_commands = [
-            fq_cmd for fq_cmd in candidate_commands
-            if fq_cmd != "wildcard" and _has_utterances(fq_cmd)
-        ]
-
-        valid_command_names = [
-            cmd.split("/")[-1] for cmd in sorted(visible_commands)
-        ]
-
-        return Signature.Output(valid_command_names=valid_command_names)
+    #     crd = fastworkflow.RoutingRegistry.get_definition(
+    #         workflow.folderpath)
+    #     cme_command_names = crd.get_command_names('IntentDetection')
+
+    #     # ------------------------------------------------------------------
+    #     # Build the union of command names that *should* be visible, then
+    #     # filter out any command that (a) is the special wildcard helper or
+    #     # (b) has no user-facing utterances in *any* command directory.
+    #     # ------------------------------------------------------------------
+
+    #     candidate_commands: set[str] = (
+    #         set(cme_command_names)
+    #         | set(subject_crd.get_command_names(app_workflow.current_command_context_name))
+    #     )
+
+    #     def _has_utterances(fq_cmd: str) -> bool:
+    #         """Return True if *fq_cmd* has at least one utterance definition in
+    #         either the subject workflow or the CME workflow."""
+    #         return (
+    #             subject_crd.command_directory.get_utterance_metadata(fq_cmd) is not None
+    #             or crd.command_directory.get_utterance_metadata(fq_cmd) is not None
+    #         )
+
+    #     visible_commands = [
+    #         fq_cmd for fq_cmd in candidate_commands
+    #         if fq_cmd != "wildcard" and _has_utterances(fq_cmd)
+    #     ]
+
+    #     valid_command_names = [
+    #         cmd.split("/")[-1] for cmd in sorted(visible_commands)
+    #     ]
+
+    #     return Signature.Output(valid_command_names=valid_command_names)
 
     def __call__(
         self,
@@ -198,23 +140,13 @@ class ResponseGenerator:
             if fastworkflow.chat_session:
                 is_agent_mode = fastworkflow.chat_session.run_as_agent
         
-        if is_agent_mode:
-            # Return enhanced JSON structure for agent mode
-            enhanced_info = self._get_enhanced_command_info(workflow)
-            response = json.dumps(enhanced_info, indent=2)
-        else:
-            # Return traditional text format for assistant mode
-            output = self._process_command(workflow)
-
-            # Include the current context display name in the header so callers see
-            # which context is active (e.g., "TodoListManager" or "global/*").
-            app_workflow = workflow.context["app_workflow"]
-            context_name_for_display = app_workflow.current_command_context_displayname
-            response_body = "\n".join(output.valid_command_names)
-            response = (
-                f"Commands available in the current context: {context_name_for_display}\n"
-                f"{response_body}\n"
-            )
+        app_workflow = workflow.context["app_workflow"]
+        response = CommandMetadataAPI.get_command_display_text(
+            subject_workflow_path=app_workflow.folderpath,
+            cme_workflow_path=workflow.folderpath,
+            active_context_name=app_workflow.current_command_context_name,
+            for_agents=is_agent_mode,
+        )
 
         return fastworkflow.CommandOutput(
             workflow_id=workflow.id,

fastworkflow/_workflows/command_metadata_extraction/_commands/wildcard.py

@@ -80,7 +80,7 @@ class CommandNamePrediction:
             valid_command_names = (
                 set(cme_command_names) | 
                 set(app_crd.get_command_names(command_context_name))
-            ) - {'wildcard'}
+            )
 
         command_name_dict = {
             fully_qualified_command_name.split('/')[-1]: fully_qualified_command_name 
@@ -338,7 +338,11 @@ class ParameterExtraction:
 
         stored_params = self._get_stored_parameters(self.cme_workflow)
 
-        input_for_param_extraction = InputForParamExtraction.create(self.app_workflow, self.command_name, self.command)
+        self.command = self.command.replace(self.command_name, "").strip()
+
+        input_for_param_extraction = InputForParamExtraction.create(
+            self.app_workflow, self.command_name, 
+            self.command)
 
         if stored_params:
             _, _, _, stored_missing_fields = self._extract_missing_fields(input_for_param_extraction, self.app_workflow, self.command_name, stored_params)
@@ -372,7 +376,7 @@ class ParameterExtraction:
             if params_str := self._format_parameters_for_display(merged_params):
                 error_msg = f"Extracted parameters so far:\n{params_str}\n\n{error_msg}"
 
-            error_msg += "\nEnter 'abort' if you want to abort the command."
+            error_msg += "\nEnter 'abort' to get out of this error state and/or execute a different command."
             error_msg += "\nEnter 'you misunderstood' if the wrong command was executed."
             return self.Output(
                 parameters_are_valid=False,