Merge pull request #74 from jlowin/agent-viz

Give agents greater visibility into activity

Author: jlowin

src/controlflow/core/controller/instruction_template.py

@@ -110,9 +110,10 @@ class TasksTemplate(Template):
 
         ### Providing a result
         
-        Tasks may require a typed result, which is an artifact satisfying the task's objective. If a
-        task does not require a result artifact (e.g. `result_type=None`), you must still
-        complete its stated objective before marking the task as complete.
+        Tasks may require a typed result, which is an artifact satisfying the
+        task's objective. If a task does not require a result artifact (e.g.
+        `result_type=None`), you must still complete its stated objective before
+        marking the task as complete.
                 
         """
     tasks: list[Task]
@@ -149,8 +150,9 @@ class CommunicationTemplate(Template):
         posted as messages to the thread, so you never need to write out task
         results as messages before marking a task as complete.
                 
-        Note that all agents post messages with the "assistant" role, so
-        each agent's messages are automatically prefixed with that agent's name for clarity.
+        Note that all agents post messages with the "assistant" role, so each
+        agent's name will be automatically prefixed to their messages. You do
+        NOT need to include your name in your messages.
         
         ### Talking to human users
         

src/controlflow/core/controller/moderators.py

@@ -25,6 +25,7 @@ def classify_moderator(
     instructions = get_instructions()
     context = context or {}
     context.update(tasks=tasks, history=history, instructions=instructions)
+
     agent = classify(
         context,
         labels=agents,

src/controlflow/core/flow.py

@@ -81,8 +81,10 @@ def get_flow_messages(limit: int = None) -> list[MessageType]:
 
     Will error if no flow is found in the context.
     """
+    if limit is None:
+        limit = 50
     flow = get_flow()
     if flow:
-        get_default_history().load_messages(flow.thread_id, limit=limit)
+        return get_default_history().load_messages(flow.thread_id, limit=limit)
     else:
         return []

src/controlflow/core/task.py

@@ -450,16 +450,21 @@ def mark_successful(self, result: T = None, validate_upstreams: bool = True):
 
         self.result = validate_result(result, self.result_type)
         self.set_status(TaskStatus.SUCCESSFUL)
-
+        if agent := ctx.get("controller_agent"):
+            return f"{self.friendly_name()} marked successful by {agent.name}."
         return f"{self.friendly_name()} marked successful."
 
     def mark_failed(self, message: Union[str, None] = None):
         self.error = message
         self.set_status(TaskStatus.FAILED)
+        if agent := ctx.get("controller_agent"):
+            return f"{self.friendly_name()} marked failed by {agent.name}."
         return f"{self.friendly_name()} marked failed."
 
     def mark_skipped(self):
         self.set_status(TaskStatus.SKIPPED)
+        if agent := ctx.get("controller_agent"):
+            return f"{self.friendly_name()} marked skipped by {agent.name}."
         return f"{self.friendly_name()} marked skipped."
 
 

src/controlflow/llm/formatting.py

@@ -63,6 +63,11 @@ def format_text_message(message: MessageType) -> Panel:
 def format_assistant_message_with_tool_calls(message: AssistantMessage) -> Group:
     panels = []
     for tool_call in get_tool_calls(message):
+        if message.role == "assistant" and message.name:
+            title = f"Tool Call: {message.name}"
+        else:
+            title = "Tool Call"
+
         content = Markdown(
             inspect.cleandoc("""
                 🦾 Calling `{name}` with the following arguments:
@@ -74,10 +79,11 @@ def format_assistant_message_with_tool_calls(message: AssistantMessage) -> Group
                 name=tool_call.function.name, args=tool_call.function.arguments
             )
         )
+
         panels.append(
             Panel(
                 content,
-                title="[bold]Tool Call[/]",
+                title=f"[bold]{title}[/]",
                 subtitle=f"[italic]{format_timestamp(message.timestamp)}[/]",
                 title_align="left",
                 subtitle_align="right",

src/controlflow/utilities/context.py

@@ -27,7 +27,7 @@ class ScopedContext:
     """
 
     def __init__(self, initial_value: dict = None):
-        """Initializes the ScopedContext with an initial valuedictionary."""
+        """Initializes the ScopedContext with an initial value dictionary."""
         self._context_storage = contextvars.ContextVar(
             "scoped_context_storage", default=initial_value or {}
         )
@@ -44,8 +44,7 @@ def __getitem__(self, key: str) -> Any:
 
     def set(self, **kwargs: Any) -> None:
         ctx = self._context_storage.get()
-        updated_ctx = {**ctx, **kwargs}
-        token = self._context_storage.set(updated_ctx)
+        token = self._context_storage.set(ctx | kwargs)
         return token
 
     @contextmanager
@@ -74,5 +73,6 @@ def __call__(self, **kwargs: Any) -> Generator[None, None, Any]:
         flow=None,
         tasks=[],
         tui=None,
+        controller_agent=None,
     )
 )