langroid 0.27.4__py3-none-any.whl → 0.28.1__py3-none-any.whl

langroid/agent/base.py

@@ -282,17 +282,27 @@ class Agent(ABC):
         if not issubclass(message_class, ToolMessage):
             raise ValueError("message_class must be a subclass of ToolMessage")
         tool = message_class.default_value("request")
+
+        """
+        if tool has handler method explicitly defined - use it,
+        otherwise use the tool name as the handler
+        """
+        if hasattr(message_class, "_handler"):
+            handler = getattr(message_class, "_handler", tool)
+        else:
+            handler = tool
+
         self.llm_tools_map[tool] = message_class
         if (
             hasattr(message_class, "handle")
             and inspect.isfunction(message_class.handle)
-            and not hasattr(self, tool)
+            and not hasattr(self, handler)
         ):
             """
             If the message class has a `handle` method,
-            and agent does NOT have a method with the same name as the tool,
+            and agent does NOT have a tool handler method,
             then we create a method for the agent whose name
-            is the value of `tool`, and whose body is the `handle` method.
+            is the value of `handler`, and whose body is the `handle` method.
             This removes a separate step of having to define this method
             for the agent, and also keeps the tool definition AND handling
             in one place, i.e. in the message class.
@@ -302,21 +312,23 @@ class Agent(ABC):
                 len(inspect.signature(message_class.handle).parameters) > 1
             )
             if has_chat_doc_arg:
-                setattr(self, tool, lambda obj, chat_doc: obj.handle(chat_doc))
+                setattr(self, handler, lambda obj, chat_doc: obj.handle(chat_doc))
             else:
-                setattr(self, tool, lambda obj: obj.handle())
+                setattr(self, handler, lambda obj: obj.handle())
         elif (
             hasattr(message_class, "response")
             and inspect.isfunction(message_class.response)
-            and not hasattr(self, tool)
+            and not hasattr(self, handler)
         ):
             has_chat_doc_arg = (
                 len(inspect.signature(message_class.response).parameters) > 2
             )
             if has_chat_doc_arg:
-                setattr(self, tool, lambda obj, chat_doc: obj.response(self, chat_doc))
+                setattr(
+                    self, handler, lambda obj, chat_doc: obj.response(self, chat_doc)
+                )
             else:
-                setattr(self, tool, lambda obj: obj.response(self))
+                setattr(self, handler, lambda obj: obj.response(self))
 
         if hasattr(message_class, "handle_message_fallback") and (
             inspect.isfunction(message_class.handle_message_fallback)
@@ -327,11 +339,11 @@ class Agent(ABC):
                 lambda msg: message_class.handle_message_fallback(self, msg),
             )
 
-        async_tool_name = f"{tool}_async"
+        async_handler_name = f"{handler}_async"
         if (
             hasattr(message_class, "handle_async")
             and inspect.isfunction(message_class.handle_async)
-            and not hasattr(self, async_tool_name)
+            and not hasattr(self, async_handler_name)
         ):
             has_chat_doc_arg = (
                 len(inspect.signature(message_class.handle_async).parameters) > 1
@@ -349,11 +361,11 @@ class Agent(ABC):
                 async def handler(obj):
                     return await obj.handle_async()
 
-            setattr(self, async_tool_name, handler)
+            setattr(self, async_handler_name, handler)
         elif (
             hasattr(message_class, "response_async")
             and inspect.isfunction(message_class.response_async)
-            and not hasattr(self, async_tool_name)
+            and not hasattr(self, async_handler_name)
         ):
             has_chat_doc_arg = (
                 len(inspect.signature(message_class.response_async).parameters) > 2
@@ -371,7 +383,7 @@ class Agent(ABC):
                 async def handler(obj):
                     return await obj.response_async(self)
 
-            setattr(self, async_tool_name, handler)
+            setattr(self, async_handler_name, handler)
 
         return [tool]
 
@@ -1742,7 +1754,11 @@ class Agent(ABC):
         Asynch version of `handle_tool_message`. See there for details.
         """
         tool_name = tool.default_value("request")
-        handler_method = getattr(self, tool_name + "_async", None)
+        if hasattr(tool, "_handler"):
+            handler_name = getattr(tool, "_handler", tool_name)
+        else:
+            handler_name = tool_name
+        handler_method = getattr(self, handler_name + "_async", None)
         if handler_method is None:
             return self.handle_tool_message(tool, chat_doc=chat_doc)
         has_chat_doc_arg = (
@@ -1781,7 +1797,11 @@ class Agent(ABC):
 
         """
         tool_name = tool.default_value("request")
-        handler_method = getattr(self, tool_name, None)
+        if hasattr(tool, "_handler"):
+            handler_name = getattr(tool, "_handler", tool_name)
+        else:
+            handler_name = tool_name
+        handler_method = getattr(self, handler_name, None)
         if handler_method is None:
             return None
         has_chat_doc_arg = (

langroid/language_models/openai_gpt.py

@@ -105,6 +105,7 @@ class GeminiModel(str, Enum):
     GEMINI_1_5_FLASH = "gemini/gemini-1.5-flash"
     GEMINI_1_5_FLASH_8B = "gemini/gemini-1.5-flash-8b"
     GEMINI_1_5_PRO = "gemini/gemini-1.5-pro"
+    GEMINI_2_FLASH = "gemini/gemini-2.0-flash-exp"
 
 
 class OpenAICompletionModel(str, Enum):
@@ -443,6 +444,7 @@ class OpenAIGPT(LanguageModel):
         config = config.copy()
         super().__init__(config)
         self.config: OpenAIGPTConfig = config
+        self.chat_model_orig = self.config.chat_model
 
         # Run the first time the model is used
         self.run_on_first_use = cache(self.config.run_on_first_use)
@@ -451,6 +453,7 @@ class OpenAIGPT(LanguageModel):
         # to allow quick testing with other models
         if settings.chat_model != "":
             self.config.chat_model = settings.chat_model
+            self.chat_model_orig = settings.chat_model
             self.config.completion_model = settings.chat_model
 
         if len(parts := self.config.chat_model.split("//")) > 1:
@@ -565,7 +568,7 @@ class OpenAIGPT(LanguageModel):
 
         self.is_groq = self.config.chat_model.startswith("groq/")
         self.is_cerebras = self.config.chat_model.startswith("cerebras/")
-        self.is_gemini = self.config.chat_model.startswith("gemini/")
+        self.is_gemini = self.is_gemini_model()
         self.is_glhf = self.config.chat_model.startswith("glhf/")
         self.is_openrouter = self.config.chat_model.startswith("openrouter/")
 
@@ -690,6 +693,20 @@ class OpenAIGPT(LanguageModel):
         openai_completion_models = [e.value for e in OpenAICompletionModel]
         return self.config.completion_model in openai_completion_models
 
+    def is_gemini_model(self) -> bool:
+        gemini_models = [e.value for e in GeminiModel]
+        return self.chat_model_orig in gemini_models or self.chat_model_orig.startswith(
+            "gemini/"
+        )
+
+    def requires_first_user_message(self) -> bool:
+        """
+        Does the chat_model require a non-empty first user message?
+        TODO: Add other models here; we know gemini requires a non-empty
+        user message, after the system message.
+        """
+        return self.is_gemini_model()
+
     def unsupported_params(self) -> List[str]:
         """
         List of params that are not supported by the current model
@@ -1663,6 +1680,20 @@ class OpenAIGPT(LanguageModel):
             ]
         else:
             llm_messages = messages
+            if (
+                len(llm_messages) == 1
+                and llm_messages[0].role == Role.SYSTEM
+                and self.requires_first_user_message()
+            ):
+                # some LLMs, notable Gemini as of 12/11/24,
+                # require the first message to be from the user,
+                # so insert a dummy user msg if needed.
+                llm_messages.insert(
+                    1,
+                    LLMMessage(
+                        role=Role.USER, content="Follow the above instructions."
+                    ),
+                )
 
         # Azure uses different parameters. It uses ``engine`` instead of ``model``
         # and the value should be the deployment_name not ``self.config.chat_model``

{langroid-0.27.4.dist-info → langroid-0.28.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.27.4
+Version: 0.28.1
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -83,8 +83,9 @@ Requires-Dist: pygments (>=2.15.1,<3.0.0)
 Requires-Dist: pymupdf (>=1.23.3,<2.0.0) ; extra == "doc-chat" or extra == "all" or extra == "pdf-parsers"
 Requires-Dist: pymysql (>=1.1.0,<2.0.0) ; extra == "db" or extra == "all" or extra == "mysql" or extra == "sql"
 Requires-Dist: pyparsing (>=3.0.9,<4.0.0)
-Requires-Dist: pypdf (>=3.12.2,<4.0.0) ; extra == "doc-chat" or extra == "all" or extra == "pdf-parsers"
+Requires-Dist: pypdf (>=5.1.0) ; extra == "doc-chat" or extra == "all" or extra == "pdf-parsers"
 Requires-Dist: pytesseract (>=0.3.10,<0.4.0) ; extra == "doc-chat" or extra == "all" or extra == "pdf-parsers"
+Requires-Dist: pytest-rerunfailures (>=15.0,<16.0)
 Requires-Dist: python-arango (>=8.1.2,<9.0.0) ; extra == "all" or extra == "arango"
 Requires-Dist: python-docx (>=1.1.0,<2.0.0) ; extra == "doc-chat" or extra == "all" or extra == "docx"
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)

{langroid-0.27.4.dist-info → langroid-0.28.1.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=UIsiM8SQjDVShOyaFJZbPkBStM5bMexFfyd0M1j4u_w,76866
+langroid/agent/base.py,sha256=ZgWsRBC9rugcWp9aZLAmFFteU47pqKIEoTy_dgkYtBI,77529
 langroid/agent/batch.py,sha256=qK3ph6VNj_1sOhfXCZY4r6gh035DglDKU751p8BU0tY,14665
 langroid/agent/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/callbacks/chainlit.py,sha256=C6zzzYC30qC4eMA7al7eFpRoTgoe3475kaMKyXgQM0Q,20695
@@ -75,7 +75,7 @@ langroid/language_models/azure_openai.py,sha256=DdWq_pRFI9PT5LwUy9TXDox90TY-mkP5
 langroid/language_models/base.py,sha256=6hXR-bclyPif-BvFbyXevP-gEwiawQAJHX3N1AKNei0,23786
 langroid/language_models/config.py,sha256=9Q8wk5a7RQr8LGMT_0WkpjY8S4ywK06SalVRjXlfCiI,378
 langroid/language_models/mock_lm.py,sha256=5BgHKDVRWFbUwDT_PFgTZXz9-k8wJSA2e3PZmyDgQ1k,4022
-langroid/language_models/openai_gpt.py,sha256=jejB-LbMFMqzw2GMOLBVl_FdP6vwYbFj7g4nZqxQdOI,73970
+langroid/language_models/openai_gpt.py,sha256=IPZ5bOyfQO-pWHharQ5fMsBuW87Cpwfy1Ywce6ARbfQ,75204
 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=PVJppmjRvD-2DF-XNC6mE05vTZ9wbu37SmXwZBQhad0,5055
@@ -142,8 +142,8 @@ langroid/vector_store/meilisearch.py,sha256=6frB7GFWeWmeKzRfLZIvzRjllniZ1cYj3Hmh
 langroid/vector_store/momento.py,sha256=UNHGT6jXuQtqY9f6MdqGU14bVnS0zHgIJUa30ULpUJo,10474
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=v7mCsijc2GdRJyil-yFaUVAX4SX5D75mD3vzlpjCMuo,17393
-pyproject.toml,sha256=GVys_bKiJSCE7MbEyywTx7ppSormv_BXLe0VcAA2EwU,7501
-langroid-0.27.4.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.27.4.dist-info/METADATA,sha256=shORd7_WDwpblucBYtuKwvyNFa4vVRBHosTuY7Xiqlw,57526
-langroid-0.27.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-langroid-0.27.4.dist-info/RECORD,,
+pyproject.toml,sha256=YO18NE-r-Ark_n-cjgvflJWmA3uqXXo2Ee5dQzT_Qw8,7532
+langroid-0.28.1.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.28.1.dist-info/METADATA,sha256=IExM86cC-ymkK90BCMiULmuodg9E7amGcyi0g3aN_j0,57569
+langroid-0.28.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+langroid-0.28.1.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.27.4"
+version = "0.28.1"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"
@@ -29,7 +29,7 @@ huggingface-hub = {version="^0.21.2", optional=true}
 transformers = {version="^4.40.1", optional=true}
 lancedb = {version="^0.8.2", optional=true}
 tantivy = {version="^0.21.0", optional=true}
-pypdf = {version="^3.12.2", optional=true}
+pypdf = {version=">=5.1.0", optional=true}
 pymupdf = {version="^1.23.3", optional=true}
 pdf2image = {version="^1.17.0", optional=true}
 pytesseract = {version="^0.3.10", optional=true}
@@ -93,6 +93,7 @@ gitpython = "^3.1.43"
 python-arango = {version="^8.1.2", optional=true}
 arango-datasets = {version="^1.2.2", optional=true}
 adb-cloud-connector = "^1.0.2"
+pytest-rerunfailures = "^15.0"
 
 
 [tool.poetry.extras]