langroid 0.45.2__py3-none-any.whl → 0.45.4__py3-none-any.whl

langroid/agent/base.py

@@ -1363,8 +1363,7 @@ class Agent(ABC):
 
         has_orch = any(isinstance(t, ORCHESTRATION_TOOLS) for t in tools)
         if has_orch and len(tools) > 1:
-            err_str = "ERROR: Use ONE tool at a time!"
-            return [err_str for _ in tools]
+            return ["ERROR: Use ONE tool at a time!"] * len(tools)
 
         return []
 
@@ -1499,8 +1498,6 @@ class Agent(ABC):
             # as a response to the tool message even though the tool was not intended
             # for this agent.
             return None
-        if len(tools) > 1 and not self.config.allow_multiple_tools:
-            return self.to_ChatDocument("ERROR: Use ONE tool at a time!")
         if len(tools) == 0:
             fallback_result = self.handle_message_fallback(msg)
             if fallback_result is None:
@@ -1509,10 +1506,14 @@ class Agent(ABC):
                 fallback_result,
                 chat_doc=msg if isinstance(msg, ChatDocument) else None,
             )
-        chat_doc = msg if isinstance(msg, ChatDocument) else None
 
-        results = self._get_multiple_orch_tool_errs(tools)
+        results: List[str | ChatDocument | None] = []
+        if len(tools) > 1 and not self.config.allow_multiple_tools:
+            results = ["ERROR: Use ONE tool at a time!"] * len(tools)
+        if not results:
+            results = self._get_multiple_orch_tool_errs(tools)
         if not results:
+            chat_doc = msg if isinstance(msg, ChatDocument) else None
             results = [self.handle_tool_message(t, chat_doc=chat_doc) for t in tools]
             # if there's a solitary ChatDocument|str result, return it as is
             if len(results) == 1 and isinstance(results[0], (str, ChatDocument)):

langroid/agent/chat_agent.py

@@ -85,6 +85,8 @@ class ChatAgentConfig(AgentConfig):
             enabled when such tool calls are not desired.
         output_format_include_defaults: Whether to include fields with default arguments
             in the output schema
+        full_citations: Whether to show source reference citation + content for each
+            citation, or just the main reference citation.
     """
 
     system_message: str = "You are a helpful assistant."

langroid/parsing/document_parser.py

@@ -404,8 +404,8 @@ class DocumentParser(Parser):
             # that it needs to be combined with the next chunk.
             while len(split) > self.config.chunk_size:
                 # pretty formatting of pages (e.g. 1-3, 4, 5-7)
-                p_0 = int(pages[0])
-                p_n = int(pages[-1])
+                p_0 = int(pages[0]) - self.config.page_number_offset
+                p_n = int(pages[-1]) - self.config.page_number_offset
                 page_str = f"pages {p_0}-{p_n}" if p_0 != p_n else f"page {p_0}"
                 text = self.tokenizer.decode(split[: self.config.chunk_size])
                 docs.append(
@@ -426,8 +426,8 @@ class DocumentParser(Parser):
         # since it's already included in the prior chunk;
         # the only exception is if there have been no chunks so far.
         if len(split) > self.config.overlap or n_chunks == 0:
-            p_0 = int(pages[0])
-            p_n = int(pages[-1])
+            p_0 = int(pages[0]) - self.config.page_number_offset
+            p_n = int(pages[-1]) - self.config.page_number_offset
             page_str = f"pages {p_0}-{p_n}" if p_0 != p_n else f"page {p_0}"
             text = self.tokenizer.decode(split[: self.config.chunk_size])
             docs.append(

langroid/parsing/parser.py

@@ -103,6 +103,9 @@ class ParsingConfig(BaseSettings):
     chunk_size: int = 200  # aim for this many tokens per chunk
     overlap: int = 50  # overlap between chunks
     max_chunks: int = 10_000
+    # offset to subtract from page numbers:
+    # e.g. if physical page 12 is displayed as page 1, set page_number_offset = 11
+    page_number_offset: int = 0
     # aim to have at least this many chars per chunk when truncating due to punctuation
     min_chunk_chars: int = 350
     discard_chunk_chars: int = 5  # discard chunks with fewer than this many chars

langroid/utils/output/citations.py

@@ -1,7 +1,10 @@
+import logging
 from typing import List, Tuple
 
 from langroid.mytypes import Document
 
+logger = logging.getLogger(__name__)
+
 
 def extract_markdown_references(md_string: str) -> List[int]:
     """
@@ -87,15 +90,21 @@ def format_cited_references(
     full_citations_str = ""
     if len(citations) > 0:
         # append [i] source, content for each citation
+        good_citations = [c for c in citations if c > 0 and c <= len(passages)]
+        if len(good_citations) < len(citations):
+            logger.warning(f"Invalid citations: {set(citations) - set(good_citations)}")
+
+        # source and content for each citation
         full_citations_str = "\n".join(
             [
                 f"[^{c}] {passages[c-1].metadata.source}"
                 f"\n{format_footnote_text(passages[c-1].content)}"
-                for c in citations
+                for c in good_citations
             ]
         )
-        # append [i] source for each citation
+
+        # source for each citation
         citations_str = "\n".join(
-            [f"[^{c}] {passages[c-1].metadata.source}" for c in citations]
+            [f"[^{c}] {passages[c-1].metadata.source}" for c in good_citations]
         )
     return full_citations_str, citations_str

{langroid-0.45.2.dist-info → langroid-0.45.4.dist-info}/METADATA

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

{langroid-0.45.2.dist-info → langroid-0.45.4.dist-info}/RECORD

@@ -3,9 +3,9 @@ langroid/exceptions.py,sha256=OPjece_8cwg94DLPcOGA1ddzy5bGh65pxzcHMnssTz8,2995
 langroid/mytypes.py,sha256=wfb320SFnZVTv_CgcLWsvoKBXxAFfY4EISeue8MFqpQ,2912
 langroid/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
-langroid/agent/base.py,sha256=LSRtSjXE1If49K14H_8BFoWiK4pHsO0-obgYehyC2DQ,79517
+langroid/agent/base.py,sha256=yM7ul2byHhwCFm6w8_4RULkPdhI8XR3n7XqNBS0hD20,79567
 langroid/agent/batch.py,sha256=vi1r5i1-vN80WfqHDSwjEym_KfGsqPGUtwktmiK1nuk,20635
-langroid/agent/chat_agent.py,sha256=1SKFOv74eFbTiLQ4bkvx6CTGXmKIyebZVOSkbKnc5V8,85070
+langroid/agent/chat_agent.py,sha256=Z53oleOUcOXVs_UL90spttGoAooe0mrx3tDtOuhKVms,85214
 langroid/agent/chat_document.py,sha256=xzMtrPbaW-Y-BnF7kuhr2dorsD-D5rMWzfOqJ8HAoo8,17885
 langroid/agent/openai_assistant.py,sha256=JkAcs02bIrgPNVvUWVR06VCthc5-ulla2QMBzux_q6o,34340
 langroid/agent/task.py,sha256=HB6N-Jn80HFqCf0ZYOC1v3Bn3oO7NLjShHQJJFwW0q4,90557
@@ -81,10 +81,10 @@ langroid/language_models/prompt_formatter/llama2_formatter.py,sha256=YdcO88qyBeu
 langroid/parsing/__init__.py,sha256=2oUWJJAxIavq9Wtw5RGlkXLq3GF3zgXeVLLW4j7yeb8,1138
 langroid/parsing/agent_chats.py,sha256=sbZRV9ujdM5QXvvuHVjIi2ysYSYlap-uqfMMUKulrW0,1068
 langroid/parsing/code_parser.py,sha256=5ze0MBytrGGkU69pA_bJDjRm6QZz_QYfPcIwkagUa7U,3796
-langroid/parsing/document_parser.py,sha256=Q58y8BHovJJAOi8kwgN8MEH66BxGVlrVjbZMBSJ_Cts,52822
+langroid/parsing/document_parser.py,sha256=fyCx4X1192asom5tp3DNV4J5Em2u4Z7rCC0FA8dNsSQ,52954
 langroid/parsing/para_sentence_split.py,sha256=AJBzZojP3zpB-_IMiiHismhqcvkrVBQ3ZINoQyx_bE4,2000
 langroid/parsing/parse_json.py,sha256=aADo38bAHQhC8on4aWZZzVzSDy-dK35vRLZsFI2ewh8,4756
-langroid/parsing/parser.py,sha256=ArAPWQ2Op_1B8i26xpkWHwnZiXgDrcyih2A6l8R49aI,14136
+langroid/parsing/parser.py,sha256=ZUvBhzMZQWKerbb9UECbcqkNc9wWKuUgPyC8L6baxao,14295
 langroid/parsing/pdf_utils.py,sha256=rmNJ9UzuBgXTAYwj1TtRJcD8h53x7cizhgyYHKO88I4,1513
 langroid/parsing/repo_loader.py,sha256=NpysuyzRHvgL3F4BB_wGo5sCUnZ3FOlVCJmZ7CaUdbs,30202
 langroid/parsing/routing.py,sha256=-FcnlqldzL4ZoxuDwXjQPNHgBe9F9-F4R6q7b_z9CvI,1232
@@ -115,7 +115,7 @@ langroid/utils/types.py,sha256=-BvyIf_LmAJ5jR9NC7S4CSVNEr3XayAaxJ5o0TiIej0,2992
 langroid/utils/algorithms/__init__.py,sha256=WylYoZymA0fnzpB4vrsH_0n7WsoLhmuZq8qxsOCjUpM,41
 langroid/utils/algorithms/graph.py,sha256=JbdpPnUOhw4-D6O7ou101JLA3xPCD0Lr3qaPoFCaRfo,2866
 langroid/utils/output/__init__.py,sha256=7P0f--4IZneNsTxXY5fd6d6iW-CeVe-KSsl-87sbBPc,340
-langroid/utils/output/citations.py,sha256=ltdhBNRlF5qh8XnCVeeGKp1k0XZRcF22avDO4fadxH0,3547
+langroid/utils/output/citations.py,sha256=5mhg2-kpBF7qgV82gJbIiUHfoJcpJiK1sAWdDF0o0Wc,3866
 langroid/utils/output/printing.py,sha256=yzPJZN-8_jyOJmI9N_oLwEDfjMwVgk3IDiwnZ4eK_AE,2962
 langroid/utils/output/status.py,sha256=rzbE7mDJcgNNvdtylCseQcPGCGghtJvVq3lB-OPJ49E,1049
 langroid/vector_store/__init__.py,sha256=8ktJUVsVUoc7FMmkUFpFBZu7VMWUqQY9zpm4kEJ8yTs,1537
@@ -127,7 +127,7 @@ langroid/vector_store/pineconedb.py,sha256=otxXZNaBKb9f_H75HTaU3lMHiaR2NUp5MqwLZ
 langroid/vector_store/postgres.py,sha256=wHPtIi2qM4fhO4pMQr95pz1ZCe7dTb2hxl4VYspGZoA,16104
 langroid/vector_store/qdrantdb.py,sha256=O6dSBoDZ0jzfeVBd7LLvsXu083xs2fxXtPa9gGX3JX4,18443
 langroid/vector_store/weaviatedb.py,sha256=Yn8pg139gOy3zkaPfoTbMXEEBCiLiYa1MU5d_3UA1K4,11847
-langroid-0.45.2.dist-info/METADATA,sha256=86UjdUNW5UpWQ0kP8_sz7EkMIgdrklulwipPm0fOcpQ,63335
-langroid-0.45.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.45.2.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.45.2.dist-info/RECORD,,
+langroid-0.45.4.dist-info/METADATA,sha256=_OkZa9etwNRz12dFklGCKBl8k58cZC-XefrycQA8-1g,63335
+langroid-0.45.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.45.4.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.45.4.dist-info/RECORD,,