langroid 0.1.263__tar.gz → 0.1.265__tar.gz

{langroid-0.1.263 → langroid-0.1.265}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.263
+Version: 0.1.265
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -19,7 +19,6 @@ Provides-Extra: docx
 Provides-Extra: hf-embeddings
 Provides-Extra: hf-transformers
 Provides-Extra: lancedb
-Provides-Extra: langroid-pydantic-v1
 Provides-Extra: litellm
 Provides-Extra: meilisearch
 Provides-Extra: metaphor
@@ -53,10 +52,8 @@ Requires-Dist: halo (>=0.0.31,<0.0.32)
 Requires-Dist: huggingface-hub (>=0.21.2,<0.22.0) ; extra == "hf-transformers" or extra == "all" or extra == "transformers"
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: lancedb (>=0.8.2,<0.9.0) ; extra == "vecdbs" or extra == "lancedb"
-Requires-Dist: langroid_pydantic_v1 (>=0.1.0,<0.2.0) ; extra == "langroid-pydantic-v1" or extra == "lancedb"
 Requires-Dist: litellm (>=1.30.1,<2.0.0) ; extra == "all" or extra == "litellm"
 Requires-Dist: lxml (>=4.9.3,<5.0.0)
-Requires-Dist: meilisearch (>=0.28.3,<0.29.0) ; extra == "meilisearch"
 Requires-Dist: meilisearch-python-sdk (>=2.2.3,<3.0.0) ; extra == "meilisearch"
 Requires-Dist: metaphor-python (>=0.1.23,<0.2.0) ; extra == "all" or extra == "metaphor"
 Requires-Dist: momento (>=1.10.2,<2.0.0) ; extra == "momento"

{langroid-0.1.263 → langroid-0.1.265}/langroid/agent/task.py

@@ -106,7 +106,7 @@ class Task:
     """
 
     # class variable called `cache` that is a RedisCache object
-    cache: RedisCache = RedisCache(RedisCacheConfig(fake=False))
+    _cache: RedisCache | None = None
 
     def __init__(
         self,
@@ -332,6 +332,12 @@ class Task:
             config=self.config,
         )
 
+    @classmethod
+    def cache(cls) -> RedisCache:
+        if cls._cache is None:
+            cls._cache = RedisCache(RedisCacheConfig(fake=False))
+        return cls._cache
+
     def __repr__(self) -> str:
         return f"{self.name}"
 
@@ -350,7 +356,7 @@ class Task:
         E.g. key = "kill", value = "1"
         """
         try:
-            self.cache.store(f"{self.session_id}:{key}", value)
+            self.cache().store(f"{self.session_id}:{key}", value)
         except Exception as e:
             logging.error(f"Error in Task._cache_session_store: {e}")
 
@@ -360,7 +366,7 @@ class Task:
         """
         session_id_key = f"{self.session_id}:{key}"
         try:
-            cached_val = self.cache.retrieve(session_id_key)
+            cached_val = self.cache().retrieve(session_id_key)
         except Exception as e:
             logging.error(f"Error in Task._cache_session_lookup: {e}")
             return None
@@ -384,7 +390,7 @@ class Task:
         Kill the session with the given session_id.
         """
         session_id_kill_key = f"{session_id}:kill"
-        cls.cache.store(session_id_kill_key, "1")
+        cls.cache().store(session_id_kill_key, "1")
 
     def kill(self) -> None:
         """
@@ -567,13 +573,15 @@ class Task:
         Runs asynchronously.
 
         Args:
-            msg (str|ChatDocument): initial message to process; if None,
+            msg (str|ChatDocument): initial *user-role* message to process; if None,
                 the LLM will respond to its initial `self.task_messages`
                 which set up and kick off the overall task.
                 The agent tries to achieve this goal by looping
                 over `self.step()` until the task is considered
                 done; this can involve a series of messages produced by Agent,
-                LLM or Human (User).
+                LLM or Human (User). Note that `msg`, if passed, is treated as
+                message with role `user`; a "system" role message should not be
+                passed here.
             turns (int): number of turns to run the task for;
                 default is -1, which means run until task is done.
             caller (Task|None): the calling task, if any

{langroid-0.1.263 → langroid-0.1.265}/langroid/cachedb/redis_cachedb.py

@@ -23,6 +23,8 @@ class RedisCacheConfig(CacheDBConfig):
 class RedisCache(CacheDB):
     """Redis implementation of the CacheDB."""
 
+    _warned_password: bool = False
+
     def __init__(self, config: RedisCacheConfig):
         """
         Initialize a RedisCache with the given config.
@@ -40,10 +42,12 @@ class RedisCache(CacheDB):
             redis_host = os.getenv("REDIS_HOST")
             redis_port = os.getenv("REDIS_PORT")
             if None in [redis_password, redis_host, redis_port]:
-                logger.warning(
-                    """REDIS_PASSWORD, REDIS_HOST, REDIS_PORT not set in .env file,
-                    using fake redis client"""
-                )
+                if not RedisCache._warned_password:
+                    logger.warning(
+                        """REDIS_PASSWORD, REDIS_HOST, REDIS_PORT not set in .env file,
+                        using fake redis client"""
+                    )
+                    RedisCache._warned_password = True
                 self.pool = fakeredis.FakeStrictRedis()  # type: ignore
             else:
                 self.pool = redis.ConnectionPool(  # type: ignore

{langroid-0.1.263 → langroid-0.1.265}/langroid/utils/system.py

@@ -1,6 +1,7 @@
 import getpass
 import hashlib
 import importlib
+import importlib.metadata
 import inspect
 import logging
 import shutil
@@ -18,6 +19,15 @@ DELETION_ALLOWED_PATHS = [
 ]
 
 
+def pydantic_major_version() -> int:
+    try:
+        pydantic_version = importlib.metadata.version("pydantic")
+        major_version = int(pydantic_version.split(".")[0])
+        return major_version
+    except importlib.metadata.PackageNotFoundError:
+        return -1
+
+
 class LazyLoad:
     """Lazy loading of modules or classes."""
 

{langroid-0.1.263 → langroid-0.1.265}/langroid/vector_store/lancedb.py

@@ -38,6 +38,7 @@ from langroid.utils.pydantic_utils import (
     flatten_pydantic_model,
     nested_dict_from_flat,
 )
+from langroid.utils.system import pydantic_major_version
 from langroid.vector_store.base import VectorStore, VectorStoreConfig
 
 try:
@@ -121,17 +122,21 @@ class LanceDB(VectorStore):
                 else self.unflattened_schema
             )
         except (AttributeError, TypeError) as e:
-            raise ValueError(
-                f"""
-                {e}
-                ====
-                One reason for this error is that you may be using Pydantic v2,
-                which is not yet compatible with Langroid's LanceDB integration.
-                If so, to use Lancedb with Langroid, please install the 
-                latest pydantic 1.10.15 instead of pydantic v2, e.g. 
-                pip install pydantic==1.10.15
-                """
-            )
+            pydantic_version = pydantic_major_version()
+            if pydantic_version > 1:
+                raise ValueError(
+                    f"""
+                    {e}
+                    ====
+                    You are using Pydantic v{pydantic_version},
+                    which is not yet compatible with Langroid's LanceDB integration.
+                    To use Lancedb with Langroid, please install the 
+                    latest pydantic 1.x instead of pydantic v2, e.g. 
+                    pip install "pydantic<2.0.0"
+                    """
+                )
+            else:
+                raise e
 
     def clear_empty_collections(self) -> int:
         coll_names = self.list_collections()
@@ -264,18 +269,22 @@ class LanceDB(VectorStore):
             self.client.create_table(
                 collection_name, schema=self.schema, mode="overwrite"
             )
-        except TypeError as e:
-            raise TypeError(
-                f"""
-                {e}
-                ====
-                One reason for this error is that you may be using Pydantic v2,
-                which is not yet compatible with Langroid's LanceDB integration.
-                If so, to use Lancedb with Langroid, please install the 
-                latest pydantic 1.10.15 instead of pydantic v2, e.g. 
-                pip install pydantic==1.10.15
-                """
-            )
+        except (AttributeError, TypeError) as e:
+            pydantic_version = pydantic_major_version()
+            if pydantic_version > 1:
+                raise ValueError(
+                    f"""
+                    {e}
+                    ====
+                    You are using Pydantic v{pydantic_version},
+                    which is not yet compatible with Langroid's LanceDB integration.
+                    To use Lancedb with Langroid, please install the 
+                    latest pydantic 1.x instead of pydantic v2, e.g. 
+                    pip install "pydantic<2.0.0"
+                    """
+                )
+            else:
+                raise e
 
         if settings.debug:
             level = logger.getEffectiveLevel()

{langroid-0.1.263 → langroid-0.1.265}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.1.263"
+version = "0.1.265"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"
@@ -20,7 +20,6 @@ sentence-transformers = {version="2.2.2", optional=true}
 torch = {version="2.0.0", optional=true}
 psycopg2 = {version="^2.9.7", optional=true}
 pymysql = {version = "^1.1.0", optional = true}
-meilisearch = {version="^0.28.3", optional=true}
 meilisearch-python-sdk = {version="^2.2.3", optional=true}
 litellm = {version = "^1.30.1", optional = true}
 metaphor-python = {version = "^0.1.23", optional = true}
@@ -30,7 +29,6 @@ neo4j = {version = "^5.14.1", optional = true}
 huggingface-hub = {version="^0.21.2", optional=true}
 transformers = {version="^4.40.1", optional=true}
 lancedb = {version="^0.8.2", optional=true}
-langroid_pydantic_v1 = {version="^0.1.0", optional=true}
 tantivy = {version="^0.21.0", optional=true}
 pypdf = {version="^3.12.2", optional=true}
 pymupdf = {version="^1.23.3", optional=true}
@@ -115,8 +113,7 @@ all = [
     "chainlit", "python-socketio",
 ]
 # more granular groupings
-langroid_pydantic_v1 = ["langroid_pydantic_v1"]
-lancedb = ["lancedb", "tantivy", "pyarrow", "langroid_pydantic_v1"]
+lancedb = ["lancedb", "tantivy", "pyarrow"]
 pdf-parsers = ["pdfplumber", "pypdf", "pymupdf", "pdf2image", "pytesseract"]
 docx = ["python-docx"]
 scrapy = ["scrapy"]
@@ -136,7 +133,7 @@ mkdocs = [
     "mkdocs-gen-files", "mkdocs-literate-nav",
     "mkdocs-section-index", "mkdocs-jupyter", "mkdocs-rss-plugin"
 ]
-meilisearch = ["meilisearch", "meilisearch-python-sdk"]
+meilisearch = ["meilisearch-python-sdk"]
 momento = ["momento"]