Support multiple assistants for tasks

README.md

@@ -10,7 +10,7 @@ ControlFlow is a framework for integrating AI agents into traditional workflows.
 ## Example
 
 ```python
-from control_flow import ai_flow, ai_task, run_agent, instructions
+from control_flow import ai_flow, ai_task, run_ai_task, instructions
 from pydantic import BaseModel
 
 
@@ -40,7 +40,7 @@ def demo():
         name = get_user_name()
 
         # define an AI task inline
-        interests = run_agent("ask user for three interests", cast=list[str], user_access=True)
+        interests = run_ai_task("ask user for three interests", cast=list[str], user_access=True)
 
         # set instructions for just the next task
         with instructions("no more than 8 lines"):

examples/documentation.py

@@ -4,7 +4,7 @@
 import control_flow
 from control_flow import ai_flow, ai_task
 from marvin.beta.assistants import Assistant, Thread
-from marvin.tools.filesystem import ls, read, read_lines, write
+from marvin.tools.filesystem import read, write
 
 ROOT = Path(control_flow.__file__).parents[2]
 
@@ -23,7 +23,7 @@ def glob(pattern: str) -> list[str]:
     You are an expert technical writer who writes wonderful documentation for 
     open-source tools and believes that documentation is a product unto itself.
     """,
-    tools=[read, read_lines, ls, write, glob],
+    tools=[read, write, glob],
 )
 
 
@@ -35,7 +35,7 @@ def examine_source_code(source_dir: Path, extensions: list[str]):
     """
 
 
-@ai_task
+@ai_task(model="gpt-3.5-turbo")
 def read_docs(docs_dir: Path):
     """
     Read all documentation in the docs dir and subdirectories, if any.
@@ -52,7 +52,7 @@ def write_docs(docs_dir: Path, instructions: str = None):
 @ai_flow(assistant=assistant)
 def docs_flow(instructions: str):
     examine_source_code(ROOT / "src", extensions=[".py"])
-    read_docs(ROOT / "docs")
+    # read_docs(ROOT / "docs")
     write_docs(ROOT / "docs", instructions=instructions)
 
 

examples/readme_example.py

@@ -1,4 +1,4 @@
-from control_flow import ai_flow, ai_task, instructions, run_agent
+from control_flow import ai_flow, ai_task, instructions, run_ai_task
 from pydantic import BaseModel
 
 
@@ -26,7 +26,7 @@ def demo():
         name = get_user_name()
 
         # define an AI task inline
-        interests = run_agent(
+        interests = run_ai_task(
             "ask user for three interests",
             cast=list[str],
             user_access=True,

src/control_flow/__init__.py

@@ -1,5 +1,7 @@
 from .settings import settings
 
-from .agent import ai_task, Agent, run_agent
+from .agent import ai_task, Agent, run_ai_task
 from .flow import ai_flow
 from .instructions import instructions
+
+from marvin.beta.assistants import Assistant