langroid 0.39.1__tar.gz → 0.39.3__tar.gz

{langroid-0.39.1 → langroid-0.39.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.39.1
+Version: 0.39.3
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT

{langroid-0.39.1 → langroid-0.39.3}/langroid/agent/chat_agent.py

@@ -46,6 +46,7 @@ logger = logging.getLogger(__name__)
 class ChatAgentConfig(AgentConfig):
     """
     Configuration for ChatAgent
+
     Attributes:
         system_message: system message to include in message sequence
              (typically defines role and task of agent).
@@ -53,7 +54,8 @@ class ChatAgentConfig(AgentConfig):
         user_message: user message to include in message sequence.
              Used only if `task` is not specified in the constructor.
         use_tools: whether to use our own ToolMessages mechanism
-        handle_llm_no_tool (NonToolAction|str): routing when LLM generates non-tool msg.
+        handle_llm_no_tool (Any): desired agent_response when
+            LLM generates non-tool msg.
         use_functions_api: whether to use functions/tools native to the LLM API
                 (e.g. OpenAI's `function_call` or `tool_call` mechanism)
         use_tools_api: When `use_functions_api` is True, if this is also True,
@@ -86,7 +88,7 @@ class ChatAgentConfig(AgentConfig):
 
     system_message: str = "You are a helpful assistant."
     user_message: Optional[str] = None
-    handle_llm_no_tool: NonToolAction | None = None
+    handle_llm_no_tool: Any = None
     use_tools: bool = False
     use_functions_api: bool = True
     use_tools_api: bool = False
@@ -601,11 +603,20 @@ class ChatAgent(Agent):
         if isinstance(msg, ChatDocument) and msg.metadata.sender == Entity.LLM:
             from langroid.agent.tools.orchestration import AgentDoneTool, ForwardTool
 
-            match self.config.handle_llm_no_tool:
-                case NonToolAction.FORWARD_USER:
-                    return ForwardTool(agent="User")
-                case NonToolAction.DONE:
-                    return AgentDoneTool(content=msg.content, tools=msg.tool_messages)
+            no_tool_option = self.config.handle_llm_no_tool
+            if no_tool_option in list(NonToolAction):
+                # in case the `no_tool_option` is one of the special NonToolAction vals
+                match self.config.handle_llm_no_tool:
+                    case NonToolAction.FORWARD_USER:
+                        return ForwardTool(agent="User")
+                    case NonToolAction.DONE:
+                        return AgentDoneTool(
+                            content=msg.content, tools=msg.tool_messages
+                        )
+            # Otherwise just return `no_tool_option` as is:
+            # This can be any string, such as a specific nudge/reminder to the LLM,
+            # or even something like ResultTool etc.
+            return no_tool_option
 
     def unhandled_tools(self) -> set[str]:
         """The set of tools that are known but not handled.

{langroid-0.39.1 → langroid-0.39.3}/langroid/agent/special/doc_chat_agent.py

@@ -58,7 +58,7 @@ from langroid.utils.object_registry import ObjectRegistry
 from langroid.utils.output import show_if_debug, status
 from langroid.utils.output.citations import (
     extract_markdown_references,
-    format_footnote_text,
+    format_cited_references,
 )
 from langroid.utils.pydantic_utils import dataframe_to_documents, extract_fields
 from langroid.vector_store.base import VectorStore, VectorStoreConfig
@@ -859,18 +859,10 @@ class DocChatAgent(ChatAgent):
         final_answer = answer_doc.content.strip()
         show_if_debug(final_answer, "SUMMARIZE_RESPONSE= ")
 
+        # extract references like [^2], [^3], etc. from the final answer
         citations = extract_markdown_references(final_answer)
-
-        citations_str = ""
-        if len(citations) > 0:
-            # append [i] source, content for each citation
-            citations_str = "\n".join(
-                [
-                    f"[^{c}] {passages[c-1].metadata.source}"
-                    f"\n{format_footnote_text(passages[c-1].content)}"
-                    for c in citations
-                ]
-            )
+        # format the cited references as a string suitable for markdown footnote
+        citations_str = format_cited_references(citations, passages)
 
         return ChatDocument(
             content=final_answer,  # does not contain citations

{langroid-0.39.1 → langroid-0.39.3}/langroid/mytypes.py

@@ -97,7 +97,7 @@ class Document(BaseModel):
 
 class NonToolAction(str, Enum):
     """
-    Possible Routing options. Mainly used to handle non-tool msgs from LLM.
+    Possible options to handle non-tool msgs from LLM.
     """
 
     FORWARD_USER = "user"  # forward msg to user

{langroid-0.39.1 → langroid-0.39.3}/langroid/utils/output/citations.py

@@ -1,4 +1,9 @@
-def extract_markdown_references(md_string: str) -> list[int]:
+from typing import List
+
+from langroid.mytypes import Document
+
+
+def extract_markdown_references(md_string: str) -> List[int]:
     """
     Extracts markdown references (e.g., [^1], [^2]) from a string and returns
     them as a sorted list of integers.
@@ -59,3 +64,28 @@ def format_footnote_text(content: str, width: int = 0) -> str:
 
     # Join them with newline so we preserve the paragraph/blank line structure
     return "\n".join(output_lines)
+
+
+def format_cited_references(citations: List[int], passages: list[Document]) -> str:
+    """
+    Given a list of (integer) citations, and a list of passages, return a string
+    that can be added as a footer to the main text, to show sources cited.
+
+    Args:
+        citations (list[int]): list of citations, presumably from main text
+        passages (list[Document]): list of passages (Document objects)
+
+    Returns:
+        str: formatted string of citations for footnote in markdown
+    """
+    citations_str = ""
+    if len(citations) > 0:
+        # append [i] source, content for each citation
+        citations_str = "\n".join(
+            [
+                f"[^{c}] {passages[c-1].metadata.source}"
+                f"\n{format_footnote_text(passages[c-1].content)}"
+                for c in citations
+            ]
+        )
+    return citations_str

{langroid-0.39.1 → langroid-0.39.3}/langroid/utils/system.py

@@ -14,11 +14,7 @@ from typing import Any, Literal
 
 logger = logging.getLogger(__name__)
 
-DELETION_ALLOWED_PATHS = [
-    ".qdrant",
-    ".chroma",
-    ".lancedb",
-]
+DELETION_ALLOWED_PATHS = [".qdrant", ".chroma", ".lancedb", ".weaviate"]
 
 
 def pydantic_major_version() -> int:

{langroid-0.39.1 → langroid-0.39.3}/langroid/vector_store/weaviatedb.py

@@ -32,6 +32,8 @@ class WeaviateDBConfig(VectorStoreConfig):
     collection_name: str | None = "temp"
     embedding: EmbeddingModelsConfig = OpenAIEmbeddingsConfig()
     distance: str = VectorDistances.COSINE
+    cloud: bool = False
+    storage_path: str = ".weaviate_embedded/data"
 
 
 class WeaviateDB(VectorStore):
@@ -39,19 +41,25 @@ class WeaviateDB(VectorStore):
         super().__init__(config)
         self.config: WeaviateDBConfig = config
         load_dotenv()
-        key = os.getenv("WEAVIATE_API_KEY")
-        url = os.getenv("WEAVIATE_API_URL")
-        if url is None or key is None:
-            raise ValueError(
-                """WEAVIATE_API_KEY, WEAVIATE_API_URL env variable must be set to use
-                WeaviateDB in cloud mode. Please set these values
-                in your .env file.
-                """
+        if not self.config.cloud:
+            self.client = weaviate.connect_to_embedded(
+                version="latest", persistence_data_path=self.config.storage_path
             )
-        self.client = weaviate.connect_to_weaviate_cloud(
-            cluster_url=url,
-            auth_credentials=Auth.api_key(key),
-        )
+        else:  # Cloud mode
+            key = os.getenv("WEAVIATE_API_KEY")
+            url = os.getenv("WEAVIATE_API_URL")
+            if url is None or key is None:
+                raise ValueError(
+                    """WEAVIATE_API_KEY, WEAVIATE_API_URL env variables must be set to 
+                    use WeaviateDB in cloud mode. Please set these values
+                    in your .env file.
+                    """
+                )
+            self.client = weaviate.connect_to_weaviate_cloud(
+                cluster_url=url,
+                auth_credentials=Auth.api_key(key),
+            )
+
         if config.collection_name is not None:
             WeaviateDB.validate_and_format_collection_name(config.collection_name)
 
@@ -267,3 +275,8 @@ class WeaviateDB(VectorStore):
             )
 
         return formatted_name
+
+    def __del__(self) -> None:
+        # Gracefully close the connection with local client
+        if not self.config.cloud:
+            self.client.close()

{langroid-0.39.1 → langroid-0.39.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "langroid"
-version = "0.39.1"
+version = "0.39.3"
 authors = [
     {name = "Prasad Chalasani", email = "pchalasani@gmail.com"},
 ]