langroid 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

langroid/agent/base.py

@@ -45,7 +45,13 @@ from langroid.mytypes import Entity
 from langroid.parsing.parse_json import extract_top_level_json
 from langroid.parsing.parser import Parser, ParsingConfig
 from langroid.prompts.prompts_config import PromptsConfig
-from langroid.pydantic_v1 import BaseSettings, Field, ValidationError, validator
+from langroid.pydantic_v1 import (
+    BaseModel,
+    BaseSettings,
+    Field,
+    ValidationError,
+    validator,
+)
 from langroid.utils.configuration import settings
 from langroid.utils.constants import DONE, NO_ANSWER, PASS, PASS_TO, SEND_TO
 from langroid.utils.object_registry import ObjectRegistry
@@ -1300,8 +1306,25 @@ class Agent(ABC):
                     # else wrap it in an agent response and return it so
                     # orchestrator can find a respondent
                     result = self.create_agent_response(tool_messages=[maybe_result])
-            else:
+            elif isinstance(maybe_result, (ChatDocument, str)):
                 result = maybe_result
+            elif isinstance(maybe_result, BaseModel):
+                result = maybe_result.json()
+            else:
+                # last resort: use json.dumps() or str() to make it a str
+                try:
+                    result = json.dumps(maybe_result)
+                except Exception:
+                    try:
+                        result = str(maybe_result)
+                    except Exception as e:
+                        logger.error(
+                            f"""
+                            Error converting result of {tool_name} to str: {e}", 
+                            """,
+                            exc_info=True,
+                        )
+                        result = None
         except Exception as e:
             # raise the error here since we are sure it's
             # not a pydantic validation error,

langroid/language_models/prompt_formatter/hf_formatter.py

@@ -18,7 +18,7 @@ from langroid.language_models.prompt_formatter.base import PromptFormatter
 logger = logging.getLogger(__name__)
 
 
-def try_import_hf_modules() -> Tuple[Type[Any], Type[Any], Type[Any]]:
+def try_import_hf_modules() -> Tuple[Type[Any], Type[Any]]:
     """
     Attempts to import the AutoTokenizer class from the transformers package.
     Returns:
@@ -27,17 +27,16 @@ def try_import_hf_modules() -> Tuple[Type[Any], Type[Any], Type[Any]]:
         ImportError: If the transformers package is not installed.
     """
     try:
-        from huggingface_hub import HfApi, ModelFilter
+        from huggingface_hub import HfApi
         from transformers import AutoTokenizer
 
-        return AutoTokenizer, HfApi, ModelFilter
+        return AutoTokenizer, HfApi
     except ImportError:
         raise ImportError(
             """
             You are trying to use some/all of:
             HuggingFace transformers.AutoTokenizer,
-            huggingface_hub.HfApi, 
-            huggingface_hub.ModelFilter,
+            huggingface_hub.HfApi,
             but these are not not installed 
             by default with Langroid. Please install langroid using the 
             `transformers` extra, like so:
@@ -48,7 +47,7 @@ def try_import_hf_modules() -> Tuple[Type[Any], Type[Any], Type[Any]]:
 
 
 def find_hf_formatter(model_name: str) -> str:
-    AutoTokenizer, HfApi, ModelFilter = try_import_hf_modules()
+    AutoTokenizer, HfApi = try_import_hf_modules()
     hf_api = HfApi()
     # try to find a matching model, with progressivly shorter prefixes of model_name
     model_name = model_name.lower().split("/")[-1]
@@ -57,19 +56,19 @@ def find_hf_formatter(model_name: str) -> str:
     for i in range(len(parts), 0, -1):
         prefix = "-".join(parts[:i])
         models = hf_api.list_models(
-            filter=ModelFilter(
-                task="text-generation",
-                model_name=prefix,
-            )
+            task="text-generation",
+            model_name=prefix,
         )
         try:
             mdl = next(models)
-        except StopIteration:
+            tokenizer = AutoTokenizer.from_pretrained(mdl.id)
+            if tokenizer.chat_template is not None:
+                return str(mdl.id)
+            else:
+                continue
+        except Exception:
             continue
 
-        tokenizer = AutoTokenizer.from_pretrained(mdl.id)
-        if tokenizer.chat_template is not None:
-            return str(mdl.id)
     return ""
 
 
@@ -78,14 +77,12 @@ class HFFormatter(PromptFormatter):
 
     def __init__(self, config: HFPromptFormatterConfig):
         super().__init__(config)
-        AutoTokenizer, HfApi, ModelFilter = try_import_hf_modules()
+        AutoTokenizer, HfApi = try_import_hf_modules()
         self.config: HFPromptFormatterConfig = config
         hf_api = HfApi()
         models = hf_api.list_models(
-            filter=ModelFilter(
-                task="text-generation",
-                model_name=config.model_name,
-            )
+            task="text-generation",
+            model_name=config.model_name,
         )
         try:
             mdl = next(models)

{langroid-0.9.3.dist-info → langroid-0.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.9.3
+Version: 0.9.5
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani

{langroid-0.9.3.dist-info → langroid-0.9.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 langroid/__init__.py,sha256=z_fCOLQJPOw3LLRPBlFB5-2HyCjpPgQa4m4iY5Fvb8Y,1800
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
-langroid/agent/base.py,sha256=dCGYbT2s35OEgbYtuDWOBhpeJzjo2TPnbbG4NrjVv70,58201
+langroid/agent/base.py,sha256=MYG3kBduJxgQsGUpcS97SE2clTq4VUnGm1Ky6tKJhnM,58995
 langroid/agent/batch.py,sha256=feRA_yRG768ElOQjrKEefcRv6Aefd_yY7qktuYUQDwc,10040
 langroid/agent/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/callbacks/chainlit.py,sha256=Qedk1-CBCgo9PdaIa7AboLBFCTgAMg9q5nGmoqpZ378,22050
@@ -74,7 +74,7 @@ langroid/language_models/mock_lm.py,sha256=2Ka05SVGSUy096bsa2AyjaqC5jmcFoe7Hycpd
 langroid/language_models/openai_gpt.py,sha256=T-Gznbv8Nqrkf8rmO3L6pRVracYE1oG_LhrfenzdfNA,61386
 langroid/language_models/prompt_formatter/__init__.py,sha256=2-5cdE24XoFDhifOLl8yiscohil1ogbP1ECkYdBlBsk,372
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
-langroid/language_models/prompt_formatter/hf_formatter.py,sha256=TFL6ppmeQWnzr6CKQzRZFYY810zE1mr8DZnhw6i85ok,5217
+langroid/language_models/prompt_formatter/hf_formatter.py,sha256=PVJppmjRvD-2DF-XNC6mE05vTZ9wbu37SmXwZBQhad0,5055
 langroid/language_models/prompt_formatter/llama2_formatter.py,sha256=YdcO88qyBeuMENVIVvVqSYuEpvYSTndUe_jd6hVTko4,2899
 langroid/language_models/utils.py,sha256=o6Zo2cnnvKrfSgF26knVQ1xkSxEoE7yN85296gNdVOw,4858
 langroid/mytypes.py,sha256=ptAFxEAtiwmIfUnGisNotTe8wT9LKBf22lOfPgZoQIY,2368
@@ -133,8 +133,8 @@ langroid/vector_store/meilisearch.py,sha256=6frB7GFWeWmeKzRfLZIvzRjllniZ1cYj3Hmh
 langroid/vector_store/momento.py,sha256=qR-zBF1RKVHQZPZQYW_7g-XpTwr46p8HJuYPCkfJbM4,10534
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=v88lqFkepADvlN6lByUj9I4NEKa9X9lWH16uTPPbYrE,17457
-pyproject.toml,sha256=e_Hl1GsHZewj8GP8pkES4Uae4go14w3E4mTMTE7hHi0,7087
-langroid-0.9.3.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.9.3.dist-info/METADATA,sha256=1ztTQxmzQdlj7U4G3kHozii28FTsgzgU7dXL-ptLtm4,54751
-langroid-0.9.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.9.3.dist-info/RECORD,,
+pyproject.toml,sha256=STQ2CYykc2Cf2J4p_RgIb0nXTw8esZs7k2gqurI6HSY,7087
+langroid-0.9.5.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.9.5.dist-info/METADATA,sha256=OoluP4y6n-wu3Jsx2p9Ah5SRyhMTKQOA3_R5CyNvA7g,54751
+langroid-0.9.5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.9.5.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.9.3"
+version = "0.9.5"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"