langroid 0.1.178__py3-none-any.whl → 0.1.181__py3-none-any.whl

langroid/agent/base.py

@@ -536,6 +536,19 @@ class Agent(ABC):
         cdoc.metadata.tool_ids = [] if isinstance(msg, str) else msg.metadata.tool_ids
         return cdoc
 
+    def has_tool_message_attempt(self, msg: str | ChatDocument | None) -> bool:
+        """Check whether msg contains a Tool/fn-call attempt (by the LLM)"""
+        if msg is None:
+            return False
+        try:
+            tools = self.get_tool_messages(msg)
+            return len(tools) > 0
+        except ValidationError:
+            # there is a tool/fn-call attempt but had a validation error,
+            # so we still consider this a tool message "attempt"
+            return True
+        return False
+
     def get_tool_messages(self, msg: str | ChatDocument) -> List[ToolMessage]:
         if isinstance(msg, str):
             return self.get_json_tool_messages(msg)

langroid/agent/batch.py

@@ -49,9 +49,9 @@ def run_batch_tasks(
 
     async def _do_task(input: str | ChatDocument, i: int) -> Any:
         task_i = task.clone(i)
-        if task_i.agent.config.llm is not None:
-            task_i.agent.config.llm.stream = False
-            task_i.agent.config.show_stats = False
+        if task_i.agent.llm is not None:
+            task_i.agent.llm.set_stream(False)
+        task_i.agent.config.show_stats = False
 
         result = await task_i.run_async(input)
         return output_map(result)

langroid/agent/task.py

@@ -538,9 +538,21 @@ class Task:
             return error_doc
 
         responders: List[Responder] = self.non_human_responders.copy()
-        if Entity.USER in self.responders and not self.human_tried:
-            # give human first chance if they haven't been tried in last step:
-            # ensures human gets chance at each turn.
+
+        if (
+            Entity.USER in self.responders
+            and not self.human_tried
+            and not self.agent.has_tool_message_attempt(self.pending_message)
+        ):
+            # Give human first chance if they haven't been tried in last step,
+            # and the msg is not a tool-call attempt;
+            # This ensures human gets a chance to respond,
+            #   other than to a LLM tool-call.
+            # When there's a tool msg attempt we want the
+            #  Agent to be the next responder; this only makes a difference in an
+            #  interactive setting: LLM generates tool, then we don't want user to
+            #  have to respond, and instead let the agent_response handle the tool.
+
             responders.insert(0, Entity.USER)
 
         found_response = False
@@ -620,9 +632,20 @@ class Task:
             return error_doc
 
         responders: List[Responder] = self.non_human_responders_async.copy()
-        if Entity.USER in self.responders_async and not self.human_tried:
-            # give human first chance if they haven't been tried in last step:
-            # ensures human gets chance at each turn.
+
+        if (
+            Entity.USER in self.responders
+            and not self.human_tried
+            and not self.agent.has_tool_message_attempt(self.pending_message)
+        ):
+            # Give human first chance if they haven't been tried in last step,
+            # and the msg is not a tool-call attempt;
+            # This ensures human gets a chance to respond,
+            #   other than to a LLM tool-call.
+            # When there's a tool msg attempt we want the
+            #  Agent to be the next responder; this only makes a difference in an
+            #  interactive setting: LLM generates tool, then we don't want user to
+            #  have to respond, and instead let the agent_response handle the tool.
             responders.insert(0, Entity.USER)
 
         found_response = False

langroid/language_models/openai_gpt.py

@@ -212,6 +212,7 @@ class OpenAIGPTConfig(LLMConfig):
     # a string that roughly matches a HuggingFace chat_template,
     # e.g. "mistral-instruct-v0.2 (a fuzzy search is done to find the closest match)
     formatter: str | None = None
+    hf_formatter: HFFormatter | None = None
 
     def __init__(self, **kwargs) -> None:  # type: ignore
         local_model = "api_base" in kwargs and kwargs["api_base"] is not None
@@ -264,6 +265,7 @@ class OpenAIGPTConfig(LLMConfig):
                 """
             )
         litellm.telemetry = False
+        litellm.drop_params = True  # drop un-supported params without crashing
         self.seed = None  # some local mdls don't support seed
         keys_dict = litellm.validate_environment(self.chat_model)
         missing_keys = keys_dict.get("missing_keys", [])
@@ -368,6 +370,11 @@ class OpenAIGPT(LanguageModel):
                 # e.g. "local/localhost:8000/v1//mistral-instruct-v0.2"
                 self.config.formatter = formatter
 
+        if self.config.formatter is not None:
+            self.config.hf_formatter = HFFormatter(
+                HFPromptFormatterConfig(model_name=self.config.formatter)
+            )
+
         # if model name starts with "litellm",
         # set the actual model name by stripping the "litellm/" prefix
         # and set the litellm flag to True
@@ -952,15 +959,12 @@ class OpenAIGPT(LanguageModel):
             )
         if self.config.use_completion_for_chat and not self.is_openai_chat_model():
             # only makes sense for non-OpenAI models
-            if self.config.formatter is None:
+            if self.config.formatter is None or self.config.hf_formatter is None:
                 raise ValueError(
                     """
                     `formatter` must be specified in config to use completion for chat.
                     """
                 )
-            formatter = HFFormatter(
-                HFPromptFormatterConfig(model_name=self.config.formatter)
-            )
             if isinstance(messages, str):
                 messages = [
                     LLMMessage(
@@ -968,7 +972,7 @@ class OpenAIGPT(LanguageModel):
                     ),
                     LLMMessage(role=Role.USER, content=messages),
                 ]
-            prompt = formatter.format(messages)
+            prompt = self.config.hf_formatter.format(messages)
             return self.generate(prompt=prompt, max_tokens=max_tokens)
         try:
             return self._chat(messages, max_tokens, functions, function_call)

langroid/language_models/prompt_formatter/hf_formatter.py

@@ -63,6 +63,16 @@ class HFFormatter(PromptFormatter):
             raise ValueError(
                 f"Model {config.model_name} does not support chat template"
             )
+        else:
+            logger.warning(
+                f"""
+            Using HuggingFace {mdl.id} for prompt formatting: 
+            This is the CHAT TEMPLATE. If this is not what you intended,
+            consider specifying a more complete model name for the formatter.
+             
+            {self.tokenizer.chat_template}
+            """
+            )
 
     def format(self, messages: List[LLMMessage]) -> str:
         sys_msg, chat_msgs, user_msg = LanguageModel.get_chat_history_components(

langroid/parsing/utils.py

@@ -1,4 +1,5 @@
 import difflib
+import logging
 import random
 import re
 from functools import cache
@@ -8,9 +9,17 @@ from typing import Any, Iterable, List
 import nltk
 from faker import Faker
 
+from langroid.mytypes import Document
+from langroid.parsing.parser import Parser, ParsingConfig
+from langroid.parsing.repo_loader import RepoLoader
+from langroid.parsing.url_loader import URLLoader
+from langroid.parsing.urls import get_urls_and_paths
+
 Faker.seed(23)
 random.seed(43)
 
+logger = logging.getLogger(__name__)
+
 
 # Ensures the NLTK resource is available
 @cache
@@ -298,3 +307,42 @@ def extract_numbered_segments(s: str, specs: str) -> str:
             extracted_paragraphs.append(" ".join(extracted_segments))
 
     return "\n\n".join(extracted_paragraphs)
+
+
+def extract_content_from_path(
+    path: str | List[str], parsing: ParsingConfig
+) -> str | List[str]:
+    """
+    Extract the content from a file path or URL, or a list of file paths or URLs.
+
+    Args:
+        path (str | List[str]): The file path or URL, or a list of file paths or URLs.
+        parsing (ParsingConfig): The parsing configuration.
+
+    Returns:
+        str | List[str]: The extracted content if a single file path or URL is provided,
+                or a list of extracted contents if a
+                list of file paths or URLs is provided.
+    """
+    if isinstance(path, str):
+        path = [path]
+    elif isinstance(path, list) and len(path) == 0:
+        return ""
+    urls, path_list = get_urls_and_paths(path)
+    parser = Parser(parsing)
+    docs: List[Document] = []
+    try:
+        if len(urls) > 0:
+            loader = URLLoader(urls=urls, parser=parser)
+            docs = loader.load()
+        if len(path_list) > 0:
+            for p in path_list:
+                path_docs = RepoLoader.get_documents(p, parser=parser)
+                docs.extend(path_docs)
+    except Exception as e:
+        logger.warning(f"Error loading path {path}: {e}")
+        return ""
+    if len(docs) == 1:
+        return docs[0].content
+    else:
+        return [d.content for d in docs]

{langroid-0.1.178.dist-info → langroid-0.1.181.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.178
+Version: 0.1.181
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -35,7 +35,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.0.0,<2.0.0) ; extra == "litellm"
+Requires-Dist: litellm (>=1.20.6,<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)

{langroid-0.1.178.dist-info → langroid-0.1.181.dist-info}/RECORD

@@ -1,7 +1,7 @@
 langroid/__init__.py,sha256=I9edNDkpmfd5C4WvTONaGaTFzIlvFyp5GpFEaMCAKMk,778
 langroid/agent/__init__.py,sha256=w2pap-rHrp41gMzdtzur2YY_m62LqQhF2Du-AmoIQi4,752
-langroid/agent/base.py,sha256=X_B9WxTwRfTNTkDwNGzGU-tvgdwJ6AnW22vL0kl_97g,33285
-langroid/agent/batch.py,sha256=cp8E_DiSKddC2H2Wbry_emT1vR2MVpEXFsD-9wBxoJA,6479
+langroid/agent/base.py,sha256=dzPuQ0R1AH7fYQ9cM2gslJ0-dhOeDjXv_P2UP0u9oRs,33803
+langroid/agent/batch.py,sha256=8zHdM-863pRD3UoCXUPKEQ4Z4iqjkNVD2xXu1WspBak,6464
 langroid/agent/chat_agent.py,sha256=Rp2a_KZA58U8zexQuTUkVjzTsQmyG4qT3Vya-jSDTCQ,35374
 langroid/agent/chat_document.py,sha256=MRp2YCy5f3Q_yPoFXVyr1vGu48wz33UGxAUtMn7MJpo,7958
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,7 +30,7 @@ langroid/agent/special/sql/utils/populate_metadata.py,sha256=zRjw31a1ZXvpx9bcmbt
 langroid/agent/special/sql/utils/system_message.py,sha256=qKLHkvQWRQodTtPLPxr1GSLUYUFASZU8x-ybV67cB68,1885
 langroid/agent/special/sql/utils/tools.py,sha256=6uB2424SLtmapui9ggcEr0ZTiB6_dL1-JRGgN8RK9Js,1332
 langroid/agent/special/table_chat_agent.py,sha256=GEUTP-VdtMXq4CcPV80gDQrCEn-ZFb9IhuRMtLN5I1o,9030
-langroid/agent/task.py,sha256=oa6SDHusxwvut2u8CGQ_0AQ-aONexFx5Bk2Yol3LeN8,46538
+langroid/agent/task.py,sha256=V2cagppWMwpMy6d3o_0ljoo4k86cho3YpTHHonhMuDI,47589
 langroid/agent/tool_message.py,sha256=ngmWdiqMYbjF4Am0hsLyA9zK0Q9QF2ziec6FW0lPD90,7399
 langroid/agent/tools/__init__.py,sha256=q-maq3k2BXhPAU99G0H6-j_ozoRvx15I1RFpPVicQIU,304
 langroid/agent/tools/extract_tool.py,sha256=u5lL9rKBzaLBOrRyLnTAZ97pQ1uxyLP39XsWMnpaZpw,3789
@@ -55,10 +55,10 @@ langroid/language_models/azure_openai.py,sha256=ncRCbKooqLVOY-PWQUIo9C3yTuKEFbAw
 langroid/language_models/base.py,sha256=N9Jn-veKBCd_ky9mhHVSmf1iRQ1RBdaxm45yrY9Njl0,20616
 langroid/language_models/config.py,sha256=5UF3DzO1a-Dfsc3vghE0XGq7g9t_xDsRCsuRiU4dgBg,366
 langroid/language_models/openai_assistants.py,sha256=9K-DEAL2aSWHeXj2hwCo2RAlK9_1oCPtqX2u1wISCj8,36
-langroid/language_models/openai_gpt.py,sha256=TnIvA0aNk6NlwgPpjqadf7nF7A-Rvr4kQLc41xDUyno,47864
+langroid/language_models/openai_gpt.py,sha256=vpAYgfo-Ezo9eqZa0ymy-e5hJ_XdtFFENYIOEI3Q7kQ,48101
 langroid/language_models/prompt_formatter/__init__.py,sha256=9JXFF22QNMmbQV1q4nrIeQVTtA3Tx8tEZABLtLBdFyc,352
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
-langroid/language_models/prompt_formatter/hf_formatter.py,sha256=_XT5oHM6TmT1x4hU38lGR_b7ej6rAMHEBQUJ-w2nSDY,3587
+langroid/language_models/prompt_formatter/hf_formatter.py,sha256=iO2OVfRnq7iRxxXdD1T-_TcINt_4oHVQsWAm7fyKYcc,3951
 langroid/language_models/prompt_formatter/llama2_formatter.py,sha256=YdcO88qyBeuMENVIVvVqSYuEpvYSTndUe_jd6hVTko4,2899
 langroid/language_models/utils.py,sha256=3stQOt3sAdbGT70thurlxfnQ4xPxH75YjFm-jaRuXlg,4474
 langroid/mytypes.py,sha256=-0q-SyicLbdjFSIEcwt5u-EwhRcMWllSoWYE3OWk78M,2501
@@ -78,7 +78,7 @@ langroid/parsing/table_loader.py,sha256=qNM4obT_0Y4tjrxNBCNUYjKQ9oETCZ7FbolKBTcz
 langroid/parsing/url_loader.py,sha256=54c6yt9grfUyImauSdM5UM4_ulU4JEz0ehdugAkxKI4,2391
 langroid/parsing/url_loader_cookies.py,sha256=Lg4sNpRz9MByWq2mde6T0hKv68VZSV3mtMjNEHuFeSU,2327
 langroid/parsing/urls.py,sha256=Nv4yCWQLLBEjaiRdaZZVQNBEl_cfK_V6cVuPm91wGtU,7686
-langroid/parsing/utils.py,sha256=NVX4D43taqjnQJ0P4tRKB5tX6iXfVXWKxWgGNhQsc5c,10030
+langroid/parsing/utils.py,sha256=Ft0YytDQh2-S1xjk3FDA4IZI9Qp1odrIYm8cuK8H81s,11642
 langroid/parsing/web_search.py,sha256=sS6UPeVB_KSsIUNlv4VHHvc0uFywMExEbQ15k40TLcc,3951
 langroid/prompts/__init__.py,sha256=B0vpJzIJlMR3mFRtoQwyALsFzBHvLp9f92acD8xJA_0,185
 langroid/prompts/dialog.py,sha256=SpfiSyofSgy2pwD1YboHR_yHO3LEEMbv6j2sm874jKo,331
@@ -111,7 +111,7 @@ langroid/vector_store/meilisearch.py,sha256=d2huA9P-NoYRuAQ9ZeXJmMKr7ry8u90RUSR2
 langroid/vector_store/momento.py,sha256=j6Eo6oIDN2fe7lsBOlCXJn3uvvERHHTFL5QJfeREeOM,10044
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=_egbsP9SWBwmI827EDYSSOqfIQSmwNsmJfFTxrLpWYE,13457
-langroid-0.1.178.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.178.dist-info/METADATA,sha256=AOK2HYWCiOViPJoiq3IJhMkzZd_VAqRaw5nvNb8p6iU,45218
-langroid-0.1.178.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.178.dist-info/RECORD,,
+langroid-0.1.181.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.181.dist-info/METADATA,sha256=K5aL_WW9QSsuTt-XKslR2WhBNxwj6LNwLnKbhhk6X8U,45219
+langroid-0.1.181.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.181.dist-info/RECORD,,