langroid 0.19.0__py3-none-any.whl → 0.19.1__py3-none-any.whl

langroid/agent/xml_tool_message.py

@@ -1,4 +1,5 @@
-from typing import Any, Dict, List, Optional
+from collections.abc import Mapping
+from typing import Any, Dict, List, Optional, get_args, get_origin
 
 from lxml import etree
 
@@ -133,15 +134,6 @@ class XMLToolMessage(ToolMessage):
 
     @classmethod
     def format_instructions(cls, tool: bool = False) -> str:
-        """
-        Instructions to the LLM showing how to use the XML tool.
-
-        Args:
-            tool: Not used in this implementation, kept for compatibility.
-
-        Returns:
-            str: instructions on how to use the XML message
-        """
         fields = [
             f
             for f in cls.__fields__.keys()
@@ -165,35 +157,62 @@ class XMLToolMessage(ToolMessage):
             nonlocal preamble, xml_format
             current_path = f"{path}.{field_name}" if path else field_name
 
-            if issubclass(field_type, BaseModel):
+            origin = get_origin(field_type)
+            args = get_args(field_type)
+
+            if (
+                origin is None
+                and isinstance(field_type, type)
+                and issubclass(field_type, BaseModel)
+            ):
                 preamble += (
                     f"{field_name.upper()} = [nested structure for {field_name}]\n"
                 )
                 xml_format += f"{indent}<{field_name}>\n"
                 for sub_field, sub_field_info in field_type.__fields__.items():
                     format_field(
-                        sub_field, sub_field_info.type_, indent + "  ", current_path
+                        sub_field,
+                        sub_field_info.outer_type_,
+                        indent + "  ",
+                        current_path,
                     )
                 xml_format += f"{indent}</{field_name}>\n"
-            elif issubclass(field_type, List):
-                item_type = getattr(field_type, "__args__", [Any])[0]
-                preamble += f"{field_name.upper()} = [list of {item_type.__name__}]\n"
+            elif origin in (list, List) or (field_type is list):
+                item_type = args[0] if args else Any
+                if isinstance(item_type, type) and issubclass(item_type, BaseModel):
+                    preamble += (
+                        f"{field_name.upper()} = "
+                        f"[list of nested structures for {field_name}]\n"
+                    )
+                else:
+                    preamble += (
+                        f"{field_name.upper()} = "
+                        f"[list of {getattr(item_type, '__name__', str(item_type))} "
+                        f"for {field_name}]\n"
+                    )
                 xml_format += f"{indent}<{field_name}>\n"
-                xml_format += f"{indent}  <item>[{item_type.__name__} value]</item>\n"
+                xml_format += (
+                    f"{indent}  <item>"
+                    f"[{getattr(item_type, '__name__', str(item_type))} value]"
+                    f"</item>\n"
+                )
                 xml_format += f"{indent}  ...\n"
                 xml_format += f"{indent}</{field_name}>\n"
-            elif issubclass(field_type, Dict):
-                key_type, value_type = getattr(field_type, "__args__", [Any, Any])
+            elif origin in (dict, Dict) or (
+                isinstance(field_type, type) and issubclass(field_type, Mapping)
+            ):
+                key_type, value_type = args if len(args) == 2 else (Any, Any)
                 preamble += (
                     f"{field_name.upper()} = "
-                    f"[dictionary with {key_type.__name__} keys and "
-                    f"{value_type.__name__} values]\n"
+                    f"[dictionary with "
+                    f"{getattr(key_type, '__name__', str(key_type))} keys and "
+                    f"{getattr(value_type, '__name__', str(value_type))} values]\n"
                 )
                 xml_format += f"{indent}<{field_name}>\n"
                 xml_format += (
-                    f"{indent}  <{key_type.__name__}>"
-                    f"[{value_type.__name__} value]"
-                    f"</{key_type.__name__}>\n"
+                    f"{indent}  <{getattr(key_type, '__name__', str(key_type))}>"
+                    f"[{getattr(value_type, '__name__', str(value_type))} value]"
+                    f"</{getattr(key_type, '__name__', str(key_type))}>\n"
                 )
                 xml_format += f"{indent}  ...\n"
                 xml_format += f"{indent}</{field_name}>\n"
@@ -213,7 +232,10 @@ class XMLToolMessage(ToolMessage):
         verbatim_fields = cls.find_verbatim_fields()
 
         for field in fields:
-            field_type = cls.__fields__[field].type_
+            field_info = cls.__fields__[field]
+            field_type = (
+                field_info.outer_type_
+            )  # Use outer_type_ to get the actual type including List, etc.
             format_field(field, field_type)
 
         xml_format += f"</{cls.Config.root_element}>"
@@ -260,6 +282,9 @@ class XMLToolMessage(ToolMessage):
         def create_element(
             parent: etree._Element, name: str, value: Any, path: str = ""
         ) -> None:
+            if value is None:
+                return
+
             elem = etree.SubElement(parent, name)
             current_path = f"{path}.{name}" if path else name
 

{langroid-0.19.0.dist-info → langroid-0.19.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.19.0
+Version: 0.19.1
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -153,7 +153,8 @@ This Multi-Agent paradigm is inspired by the
 (but you do not need to know anything about this!). 
 
 `Langroid` is a fresh take on LLM app-development, where considerable thought has gone 
-into simplifying the developer experience; it does not use `Langchain`.
+into simplifying the developer experience; 
+it does not use `Langchain`, or any other LLM framework.
 
 :fire: Read the (WIP) [overview of the langroid architecture](https://langroid.github.io/langroid/blog/2024/08/15/overview-of-langroids-multi-agent-architecture-prelim/)
 

{langroid-0.19.0.dist-info → langroid-0.19.1.dist-info}/RECORD

@@ -46,7 +46,7 @@ langroid/agent/tools/retrieval_tool.py,sha256=2q2pfoYbZNfbWQ0McxrtmfF0ekGglIgRl-
 langroid/agent/tools/rewind_tool.py,sha256=XAXL3BpNhCmBGYq_qi_sZfHJuIw7NY2jp4wnojJ7WRs,5606
 langroid/agent/tools/segment_extract_tool.py,sha256=__srZ_VGYLVOdPrITUM8S0HpmX4q7r5FHWMDdHdEv8w,1440
 langroid/agent/typed_task.py,sha256=oxja0Z3uLTv0BcR1xIMqDpo85MIGOruz4XsZ4ghjsW4,689
-langroid/agent/xml_tool_message.py,sha256=WcwCWe9Ad3t4D0cExKOb6dhjL5YM6Cz3gsg3nnVoVh0,13347
+langroid/agent/xml_tool_message.py,sha256=OwmHqHqagJOvC7U000z767WOqWztlJXa7A5gK0csfck,14429
 langroid/agent_config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/cachedb/__init__.py,sha256=icAT2s7Vhf-ZGUeqpDQGNU6ob6o0aFEyjwcxxUGRFjg,225
 langroid/cachedb/base.py,sha256=ztVjB1DtN6pLCujCWnR6xruHxwVj3XkYniRTYAKKqk0,1354
@@ -137,8 +137,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=XuRvlqpTV_ElysTBe0HFQQ18fa8kQ0PxA4Rb-LqQzZY,7251
-langroid-0.19.0.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.19.0.dist-info/METADATA,sha256=SVEU3MdLLeCzg4dzcVt9vrAIzujlCSTM3b9dosHuBug,56484
-langroid-0.19.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-langroid-0.19.0.dist-info/RECORD,,
+pyproject.toml,sha256=cs7STWXoyn2Mat0iWQcywwjrxRYO7Y4nw5gc8udj9vo,7251
+langroid-0.19.1.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.19.1.dist-info/METADATA,sha256=9tkOu9XsqdS4RAc9-aySyDaarwDt5ybBrehttG9vqys,56513
+langroid-0.19.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+langroid-0.19.1.dist-info/RECORD,,

pyproject.toml

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