langroid 0.56.3__py3-none-any.whl → 0.56.4__py3-none-any.whl

langroid/agent/base.py

@@ -265,8 +265,10 @@ class Agent(ABC):
         """
         sig = inspect.signature(handler_method)
         params = list(sig.parameters.values())
-        # Remove 'self' parameter
-        params = [p for p in params if p.name != "self"]
+        # Remove the first 'self' parameter
+        params = params[1:]
+        # Don't use name
+        # [p for p in params if p.name != "self"]
 
         agent_param = None
         chat_doc_param = None
@@ -277,18 +279,30 @@ class Agent(ABC):
             if param.annotation != inspect.Parameter.empty:
                 ann_str = str(param.annotation)
                 # Check for Agent-like types
+                print(param, inspect.isclass(param.annotation))
+                print(param, issubclass(param.annotation, Agent))
+                print(param, param.annotation is ChatDocument)
                 if (
-                    param.annotation == self.__class__
-                    or "Agent" in ann_str
-                    or (
-                        hasattr(param.annotation, "__name__")
-                        and "Agent" in param.annotation.__name__
+                    inspect.isclass(param.annotation)
+                    and issubclass(param.annotation, Agent)
+                ) or (
+                    not inspect.isclass(param.annotation)
+                    and (
+                        "Agent" in ann_str
+                        or (
+                            hasattr(param.annotation, "__name__")
+                            and "Agent" in param.annotation.__name__
+                        )
                     )
                 ):
                     agent_param = param.name
                     has_annotations = True
                 # Check for ChatDocument-like types
-                elif "ChatDocument" in ann_str or "ChatDoc" in ann_str:
+                elif (
+                    param.annotation is ChatDocument
+                    or "ChatDocument" in ann_str
+                    or "ChatDoc" in ann_str
+                ):
                     chat_doc_param = param.name
                     has_annotations = True
 
@@ -298,12 +312,12 @@ class Agent(ABC):
             elif param.name == "chat_doc":
                 chat_doc_param = param.name
 
+        print(has_annotations, agent_param, chat_doc_param)
         return has_annotations, agent_param, chat_doc_param
 
     @no_type_check
     def _create_handler_wrapper(
         self,
-        message_class: Type[ToolMessage],
         handler_method: Any,
         is_async: bool = False,
     ) -> Any:
@@ -320,7 +334,8 @@ class Agent(ABC):
         """
         sig = inspect.signature(handler_method)
         params = list(sig.parameters.values())
-        params = [p for p in params if p.name != "self"]
+        params = params[1:]
+        # params = [p for p in params if p.name != "self"]
 
         has_annotations, agent_param, chat_doc_param = self._analyze_handler_params(
             handler_method,
@@ -471,7 +486,6 @@ class Agent(ABC):
             See `tests/main/test_stateless_tool_messages.py` for an example.
             """
             wrapper = self._create_handler_wrapper(
-                message_class,
                 message_class.handle,
                 is_async=False,
             )
@@ -521,7 +535,6 @@ class Agent(ABC):
             and not hasattr(self, async_handler_name)
         ):
             wrapper = self._create_handler_wrapper(
-                message_class,
                 message_class.handle_async,
                 is_async=True,
             )

{langroid-0.56.3.dist-info → langroid-0.56.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.56.3
+Version: 0.56.4
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT

{langroid-0.56.3.dist-info → langroid-0.56.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ langroid/exceptions.py,sha256=OPjece_8cwg94DLPcOGA1ddzy5bGh65pxzcHMnssTz8,2995
 langroid/mytypes.py,sha256=HIcYAqGeA9OK0Hlscym2FI5Oax9QFljDZoVgRlomhRk,4014
 langroid/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
-langroid/agent/base.py,sha256=a45iqoWet2W60h4wUIOyHDYlotgS0asqIjfbONT4fZQ,85706
+langroid/agent/base.py,sha256=EMZGPVSqd4_optr9_FG1TLRF8-noEAloen8J4c7Ayto,86262
 langroid/agent/batch.py,sha256=wpE9RqCNDVDhAXkCB7wEqfCIEAi6qKcrhaZ-Zr9T4C0,21375
 langroid/agent/chat_agent.py,sha256=2HIYzYxkrGkRIS97ioKfIqjaW3RbX89M39LjzBobBEY,88381
 langroid/agent/chat_document.py,sha256=0e6zYkqIorMIVbCsxOul9ziwAPPOWDsBsRV9E8ux-WI,18055
@@ -137,7 +137,7 @@ langroid/vector_store/pineconedb.py,sha256=otxXZNaBKb9f_H75HTaU3lMHiaR2NUp5MqwLZ
 langroid/vector_store/postgres.py,sha256=wHPtIi2qM4fhO4pMQr95pz1ZCe7dTb2hxl4VYspGZoA,16104
 langroid/vector_store/qdrantdb.py,sha256=O6dSBoDZ0jzfeVBd7LLvsXu083xs2fxXtPa9gGX3JX4,18443
 langroid/vector_store/weaviatedb.py,sha256=Yn8pg139gOy3zkaPfoTbMXEEBCiLiYa1MU5d_3UA1K4,11847
-langroid-0.56.3.dist-info/METADATA,sha256=P1MyFhTAmuXHUsTO6qPMUPs4GRhAMCAVReMNBHJYkZU,65744
-langroid-0.56.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.56.3.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.56.3.dist-info/RECORD,,
+langroid-0.56.4.dist-info/METADATA,sha256=punxDL35bHKw4J-PDHEMYfWvwb7gu3ccpuMlTPmU1GU,65744
+langroid-0.56.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.56.4.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.56.4.dist-info/RECORD,,