Merge pull request #64 from jlowin/llm

New backend

Author: jlowin

docs/concepts/execution.mdx

@@ -48,6 +48,7 @@
                 "concepts/tasks",
                 "concepts/flows",
                 "concepts/agents",
+                "concepts/workflow-design",
                 "concepts/execution"
             ]
         },

docs/concepts/workflow-design.mdx

@@ -1,6 +1,6 @@
 [project]
 name = "controlflow"
-version = "0.3.0"
+version = "0.4.0"
 description = "A framework for agentic workflows"
 authors = [
     { name = "Jeremiah Lowin", email = "153965+jlowin@users.noreply.github.com" },

docs/mint.json

@@ -237,7 +237,7 @@ markupsafe==2.1.5
     # via mkdocs-autorefs
     # via mkdocstrings
     # via werkzeug
-marvin @ git+https://github.com/prefecthq/marvin@fbfa2e6d2f8f65d611f3519941966e7fc382a880
+marvin @ git+https://github.com/prefecthq/marvin@9ff559318af3dd1185ab7d6a1e85b39967915b81
     # via controlflow
 matplotlib-inline==0.1.6
     # via ipython
@@ -325,7 +325,7 @@ pluggy==1.4.0
     # via pytest
 pre-commit==3.7.0
     # via prefect
-prefect @ git+https://github.com/prefecthq/prefect@b7ce5ed9eb0cf813dfb20a9f1fe8815dd2008ca1
+prefect @ git+https://github.com/prefecthq/prefect@aad7f63ccfc7767729f65fe20b0defb208b2c451
     # via controlflow
 prompt-toolkit==3.0.43
     # via ipython

pyproject.toml

@@ -237,7 +237,7 @@ markupsafe==2.1.5
     # via mkdocs-autorefs
     # via mkdocstrings
     # via werkzeug
-marvin @ git+https://github.com/prefecthq/marvin@fbfa2e6d2f8f65d611f3519941966e7fc382a880
+marvin @ git+https://github.com/prefecthq/marvin@9ff559318af3dd1185ab7d6a1e85b39967915b81
     # via controlflow
 matplotlib-inline==0.1.7
     # via ipython
@@ -325,7 +325,7 @@ pluggy==1.5.0
     # via pytest
 pre-commit==3.7.1
     # via prefect
-prefect @ git+https://github.com/prefecthq/prefect@b7ce5ed9eb0cf813dfb20a9f1fe8815dd2008ca1
+prefect @ git+https://github.com/prefecthq/prefect@aad7f63ccfc7767729f65fe20b0defb208b2c451
     # via controlflow
 prompt-toolkit==3.0.43
     # via ipython

requirements-dev.lock

@@ -1,7 +1,4 @@
 from .settings import settings
-import controlflow.llm
-
-default_history = controlflow.llm.history.InMemoryHistory()
 
 from .core.flow import Flow
 from .core.task import Task
@@ -10,3 +7,17 @@
 
 from .instructions import instructions
 from .decorators import flow, task
+
+# --- Default agent ---
+
+from .core.agent import DEFAULT_AGENT
+
+default_agent = DEFAULT_AGENT
+del DEFAULT_AGENT
+
+# --- Default history ---
+
+from .llm.history import DEFAULT_HISTORY
+
+default_history = DEFAULT_HISTORY
+del DEFAULT_HISTORY

requirements.lock

@@ -1,13 +1,12 @@
 import logging
 from typing import Callable, Optional, Union
 
-from litellm import Message
 from marvin.utilities.asyncio import ExposeSyncMethodsMixin, expose_sync_method
 from pydantic import Field
 
+import controlflow
 from controlflow.core.flow import Flow, get_flow
 from controlflow.core.task import Task
-from controlflow.llm.completions import Response, completion, completion_async
 from controlflow.tools.talk_to_human import talk_to_human
 from controlflow.utilities.prefect import (
     wrap_prefect_tool,
@@ -17,17 +16,11 @@
 logger = logging.getLogger(__name__)
 
 
-def default_agent():
-    return Agent(
-        name="Marvin",
-        instructions="""
-            You are a diligent AI assistant. You complete 
-            your tasks efficiently and without error.
-            """,
-    )
+def get_default_agent() -> "Agent":
+    return controlflow.default_agent
 
 
-class Agent(Assistant, ControlFlowModel, ExposeSyncMethodsMixin):
+class AgentOLD(Assistant, ControlFlowModel, ExposeSyncMethodsMixin):
     name: str
     user_access: bool = Field(
         False,
@@ -62,11 +55,8 @@ async def run_async(
         controller = Controller(agents=[self], tasks=tasks or [], flow=flow)
         return await controller.run_agent_async(agent=self)
 
-    def __hash__(self):
-        return id(self)
-
 
-class LiteAgent(ControlFlowModel, ExposeSyncMethodsMixin):
+class Agent(ControlFlowModel, ExposeSyncMethodsMixin):
     name: str = Field(
         ...,
         description="The name of the agent. This is used to identify the agent in the system and should be unique per assigned task.",
@@ -84,31 +74,53 @@ class LiteAgent(ControlFlowModel, ExposeSyncMethodsMixin):
         False,
         description="If True, the agent is given tools for interacting with a human user.",
     )
-    model: Optional[str] = Field(
-        None,
+    model: str = Field(
         description="The model used by the agent. If not provided, the default model will be used.",
+        default_factory=lambda: controlflow.settings.model,
     )
 
-    async def run_async(self, messages: Union[str, dict]) -> Response:
-        if not isinstance(messages, list):
-            raise ValueError("Messages must be provided as a list.")
-
-        messages = [
-            Message(role="user", content=m) if isinstance(m, str) else m
-            for m in messages
-        ]
-
-        return await completion_async(
-            messages=messages, model=self.model, tools=self.tools
-        )
-
-    async def run(self, messages: Union[str, dict]) -> Response:
-        if not isinstance(messages, list):
-            raise ValueError("Messages must be provided as a list.")
+    def __init__(self, name, **kwargs):
+        super().__init__(name=name, **kwargs)
 
-        messages = [
-            Message(role="user", content=m) if isinstance(m, str) else m
-            for m in messages
-        ]
-
-        return completion(messages=messages, model=self.model, tools=self.tools)
+    def get_tools(self) -> list[Callable]:
+        tools = self.tools.copy()
+        if self.user_access:
+            tools.append(talk_to_human)
+        return tools
+
+    # def say(
+    #     self, messages: Union[str, dict], thread_id: str = None, history: History = None
+    # ) -> Response:
+
+    #     if thread_id is None:
+    #         thread_id = self.default_thread_id
+    #     if history is None:
+    #         history = get_default_history()
+    #     if not isinstance(messages, list):
+    #         raise ValueError("Messages must be provided as a list.")
+
+    #     messages = [
+    #         Message(role="user", content=m) if isinstance(m, str) else m
+    #         for m in messages
+    #     ]
+    #     history_messages = history.load_messages(thread_id=thread_id, limit=50)
+
+    #     response = completion(
+    #         messages=history_messages + messages,
+    #         model=self.model,
+    #         tools=self.tools,
+    #     )
+    #     history.save_messages(
+    #         thread_id=thread_id,
+    #         messages=messages + history_messages + response.messages,
+    #     )
+    #     return response
+
+
+DEFAULT_AGENT = Agent(
+    name="Marvin",
+    instructions="""
+        You are a diligent AI assistant. You complete 
+        your tasks efficiently and without error.
+        """,
+)