langroid 0.1.184__tar.gz → 0.1.186__tar.gz

{langroid-0.1.184 → langroid-0.1.186}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.184
+Version: 0.1.186
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -37,7 +37,7 @@ Requires-Dist: google-api-python-client (>=2.95.0,<3.0.0)
 Requires-Dist: halo (>=0.0.31,<0.0.32)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: lancedb (>=0.4.1,<0.5.0)
-Requires-Dist: litellm (>=1.22.3,<2.0.0) ; extra == "litellm"
+Requires-Dist: litellm (>=1.22.5,<2.0.0) ; extra == "litellm"
 Requires-Dist: lxml (>=4.9.3,<5.0.0)
 Requires-Dist: meilisearch (>=0.28.3,<0.29.0)
 Requires-Dist: meilisearch-python-sdk (>=2.2.3,<3.0.0)
@@ -75,6 +75,7 @@ Requires-Dist: pytest-postgresql (>=5.0.0,<6.0.0) ; extra == "postgres"
 Requires-Dist: pytest-redis (>=3.0.2,<4.0.0)
 Requires-Dist: python-docx (>=1.1.0,<2.0.0)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
+Requires-Dist: python-socketio (>=5.11.0,<6.0.0) ; extra == "chainlit"
 Requires-Dist: qdrant-client (>=1.7.0,<2.0.0)
 Requires-Dist: rank-bm25 (>=0.2.2,<0.3.0)
 Requires-Dist: redis (>=5.0.1,<6.0.0)

{langroid-0.1.184 → langroid-0.1.186}/langroid/agent/base.py

@@ -105,6 +105,7 @@ class Agent(ABC):
             get_user_response=None,
             get_last_step=noop_fn,
             set_parent_agent=noop_fn,
+            show_error_message=noop_fn,
         )
 
     def entity_responders(

{langroid-0.1.184 → langroid-0.1.186}/langroid/agent/callbacks/chainlit.py

@@ -54,7 +54,7 @@ async def setup_llm() -> None:
     context_length = llm_settings.get("context_length", 16_000)
     temperature = llm_settings.get("temperature", 0.2)
     timeout = llm_settings.get("timeout", 90)
-    print(f"Using model: {model}")
+    logger.info(f"Using model: {model}")
     llm_config = lm.OpenAIGPTConfig(
         chat_model=model or lm.OpenAIChatModel.GPT4_TURBO,
         # or, other possibilities for example:
@@ -271,7 +271,10 @@ class ChainlitAgentCallbacks:
     stream: Optional[cl.Step] = None  # pushed into openai_gpt.py to stream tokens
     parent_agent: Optional[lr.Agent] = None  # used to get parent id, for step nesting
 
-    def __init__(self, agent: lr.Agent):
+    def __init__(self, agent: lr.Agent, msg: cl.Message = None):
+        """Add callbacks to the agent, and save the initial message,
+        so we can alter the display of the first user message.
+        """
         agent.callbacks.start_llm_stream = self.start_llm_stream
         agent.callbacks.cancel_llm_stream = self.cancel_llm_stream
         agent.callbacks.finish_llm_stream = self.finish_llm_stream
@@ -280,8 +283,11 @@ class ChainlitAgentCallbacks:
         agent.callbacks.get_user_response = self.get_user_response
         agent.callbacks.get_last_step = self.get_last_step
         agent.callbacks.set_parent_agent = self.set_parent_agent
+        agent.callbacks.show_error_message = self.show_error_message
         self.agent: lr.Agent = agent
         self.name = agent.config.name
+        if msg is not None:
+            self.show_first_user_message(msg)
 
     def _get_parent_id(self) -> str | None:
         """Get step id under which we need to nest the current step:
@@ -310,6 +316,7 @@ class ChainlitAgentCallbacks:
 
     def start_llm_stream(self) -> Callable[[str], None]:
         """Returns a streaming fn that can be passed to the LLM class"""
+        model = self.agent.llm.config.chat_model
         logger.info(
             f"""
             Starting LLM stream for {self.agent.config.name} 
@@ -317,7 +324,7 @@ class ChainlitAgentCallbacks:
         """
         )
         self.stream = cl.Step(
-            name=self.agent.config.name + "(LLM 🧠)",
+            name=self.agent.config.name + f"(LLM {model} 🧠)",
             type="llm",
             parent_id=self._get_parent_id(),
         )
@@ -372,6 +379,18 @@ class ChainlitAgentCallbacks:
         step.output = content or NO_ANSWER
         run_sync(step.send())  # type: ignore
 
+    def show_error_message(self, error: str) -> None:
+        """Show error message as a step."""
+        step = cl.Step(
+            name=self.agent.config.name + "(Error 🚫)",
+            type="run",
+            parent_id=self._get_parent_id(),
+            language="text",
+        )
+        self.last_step = step
+        step.output = error
+        run_sync(step.send())
+
     def show_agent_response(self, content: str) -> None:
         """Show message from agent (typically tool handler).
         Agent response can be considered as a "step"
@@ -430,19 +449,44 @@ class ChainlitAgentCallbacks:
             )
         )
 
+    def show_user_response(self, message: str) -> None:
+        """Show user response as a step."""
+        step = cl.Step(
+            id=cl.context.current_step.id,
+            name=self.agent.config.name + "(You 😃)",
+            type="run",
+            parent_id=self._get_parent_id(),
+        )
+        step.output = message
+        run_sync(step.send())
+
+    def show_first_user_message(self, msg: cl.Message):
+        """Show first user message as a step."""
+        step = cl.Step(
+            id=msg.id,
+            name=self.agent.config.name + "(You 😃)",
+            type="run",
+            parent_id=self._get_parent_id(),
+        )
+        self.last_step = step
+        step.output = msg.content
+        run_sync(step.update())
+
 
 class ChainlitTaskCallbacks:
     """
-    Inject ChainlitCallbacks into a Langroid Task's agent and
+    Recursively inject ChainlitAgentCallbacks into a Langroid Task's agent and
     agents of sub-tasks.
     """
 
-    def __init__(self, task: lr.Task):
-        ChainlitTaskCallbacks._inject_callbacks(task)
+    def __init__(self, task: lr.Task, msg: cl.Message = None):
+        """Inject callbacks recursively, ensuring msg is passed to the
+        top-level agent"""
+        ChainlitTaskCallbacks._inject_callbacks(task, msg)
 
     @staticmethod
-    def _inject_callbacks(task: lr.Task) -> None:
-        # recursively apply ChainlitCallbacks to agents of sub-tasks
-        ChainlitAgentCallbacks(task.agent)
+    def _inject_callbacks(task: lr.Task, msg: cl.Message = None) -> None:
+        # recursively apply ChainlitAgentCallbacks to agents of sub-tasks
+        ChainlitAgentCallbacks(task.agent, msg)
         for t in task.sub_tasks:
             ChainlitTaskCallbacks._inject_callbacks(t)

langroid-0.1.186/langroid/agent/tools/duckduckgo_search_tool.py

@@ -0,0 +1,66 @@
+"""
+A tool to trigger a Metaphor search for a given query,
+(https://docs.exa.ai/reference/getting-started)
+and return the top results with their titles, links, summaries.
+Since the tool is stateless (i.e. does not need
+access to agent state), it can be enabled for any agent, without having to define a
+special method inside the agent: `agent.enable_message(MetaphorSearchTool)`
+
+NOTE: To use this tool, you need to:
+
+* set the METAPHOR_API_KEY environment variables in
+your `.env` file, e.g. `METAPHOR_API_KEY=your_api_key_here`
+(Note as of 28 Jan 2023, Metaphor renamed to Exa, so you can also use
+`EXA_API_KEY=your_api_key_here`)
+
+* install langroid with the `metaphor` extra, e.g.
+`pip install langroid[metaphor]` or `poetry add langroid[metaphor]`
+(it installs the `metaphor-python` package from pypi).
+
+For more information, please refer to the official docs:
+https://metaphor.systems/
+"""
+from typing import List
+
+from langroid.agent.tool_message import ToolMessage
+from langroid.parsing.web_search import metaphor_search
+
+
+class DuckduckgoSearchTool(ToolMessage):
+    request: str = "duckduckgo_search"
+    purpose: str = """
+            To search the web and return up to <num_results> 
+            links relevant to the given <query>. When using this tool,
+            ONLY show the required JSON, DO NOT SAY ANYTHING ELSE.
+            Wait for the results of the web search, and then use them to
+            compose your response.
+            """
+    query: str
+    num_results: int
+
+    def handle(self) -> str:
+        """
+        Conducts a search using the metaphor API based on the provided query
+        and number of results by triggering a metaphor_search.
+
+        Returns:
+            str: A formatted string containing the titles, links, and
+                summaries of each search result, separated by two newlines.
+        """
+
+        search_results = metaphor_search(self.query, self.num_results)
+        # return Title, Link, Summary of each result, separated by two newlines
+        results_str = "\n\n".join(str(result) for result in search_results)
+        return f"""
+        BELOW ARE THE RESULTS FROM THE WEB SEARCH. USE THESE TO COMPOSE YOUR RESPONSE:
+        {results_str}
+        """
+
+    @classmethod
+    def examples(cls) -> List["ToolMessage"]:
+        return [
+            cls(
+                query="When was the Llama2 Large Language Model (LLM) released?",
+                num_results=3,
+            ),
+        ]

{langroid-0.1.184 → langroid-0.1.186}/langroid/language_models/utils.py

@@ -134,11 +134,3 @@ def async_retry_with_exponential_backoff(
                 raise e
 
     return wrapper
-
-
-# @retry_with_exponential_backoff
-# def completions_with_backoff(**kwargs):
-#     return openai.Completion.create(**kwargs)
-
-
-# completions_with_backoff(model="text-davinci-002", prompt="Once upon a time,")

{langroid-0.1.184 → langroid-0.1.186}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.1.184"
+version = "0.1.186"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"
@@ -75,7 +75,7 @@ docstring-parser = "^0.15"
 farm-haystack = {extras = ["ocr", "preprocessing", "file-conversion", "pdf"], version = "^1.21.1"}
 meilisearch = "^0.28.3"
 meilisearch-python-sdk = "^2.2.3"
-litellm = {version = "^1.22.3", optional = true}
+litellm = {version = "^1.22.5", optional = true}
 scrapy = "^2.11.0"
 async-generator = "^1.10"
 lancedb = "^0.4.1"
@@ -86,6 +86,7 @@ python-docx = "^1.1.0"
 aiohttp = "^3.9.1"
 metaphor-python = {version = "^0.1.23", optional = true}
 chainlit = {version = "^1.0.200", optional = true}
+python-socketio = {version="^5.11.0", optional=true}
 
 [tool.poetry.extras]
 # install these using `poetry install -E [...]` where [...] is one of the extras below
@@ -97,7 +98,7 @@ litellm = ["litellm"]
 neo4j = ["neo4j"]
 sciphi = ["agent-search"]
 metaphor = ["metaphor-python"]
-chainlit = ["chainlit"]
+chainlit = ["chainlit", "python-socketio"]
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.3.1"