langroid 0.1.260__py3-none-any.whl → 0.1.261__py3-none-any.whl

langroid/agent/chat_document.py

@@ -45,8 +45,6 @@ class ChatDocMetaData(DocMetaData):
     parent: Optional["ChatDocument"] = None
     sender: Entity
     tool_ids: List[str] = []  # stack of tool_ids; used by OpenAIAssistant
-    # when result returns to parent, pretend message is from this entity
-    parent_responder: None | Entity = None
     block: None | Entity = None
     sender_name: str = ""
     recipient: str = ""

langroid/agent/task.py

@@ -72,7 +72,7 @@ class TaskConfig(BaseModel):
 
     inf_loop_cycle_len: int = 10
     inf_loop_dominance_factor: float = 1.5
-    inf_loop_wait_factor: float = 5.0
+    inf_loop_wait_factor: int = 5
 
 
 class Task:
@@ -190,7 +190,11 @@ class Task:
         # counts of distinct pending messages in history,
         # to help detect (exact) infinite loops
         self.message_counter: Counter[str] = Counter()
-        self.history_count: Deque[int] = deque(maxlen=self.config.inf_loop_cycle_len)
+        self._init_message_counter()
+
+        self.history: Deque[str] = deque(
+            maxlen=self.config.inf_loop_cycle_len * self.config.inf_loop_wait_factor
+        )
         # copy the agent's config, so that we don't modify the original agent's config,
         # which may be shared by other agents.
         try:
@@ -334,6 +338,12 @@ class Task:
     def __str__(self) -> str:
         return f"{self.name}"
 
+    def _init_message_counter(self) -> None:
+        self.message_counter.clear()
+        # create a unique string that will not likely be in any message,
+        # so we always have a message with count=1
+        self.message_counter.update([hash("___NO_MESSAGE___")])
+
     def _cache_session_store(self, key: str, value: str) -> None:
         """
         Cache a key-value pair for the current session.
@@ -445,7 +455,7 @@ class Task:
                 ),
             )
         else:
-            self.pending_message = msg
+            self.pending_message = copy.deepcopy(msg)
             if self.pending_message is not None and self.caller is not None:
                 # msg may have come from `caller`, so we pretend this is from
                 # the CURRENT task's USER entity
@@ -485,8 +495,8 @@ class Task:
         self.max_tokens = max_tokens
         self.session_id = session_id
         self._set_alive()
-        self.message_counter.clear()
-        self.history_count.clear()
+        self._init_message_counter()
+        self.history.clear()
 
         assert (
             msg is None or isinstance(msg, str) or isinstance(msg, ChatDocument)
@@ -585,8 +595,8 @@ class Task:
         self.max_tokens = max_tokens
         self.session_id = session_id
         self._set_alive()
-        self.message_counter.clear()
-        self.history_count.clear()
+        self._init_message_counter()
+        self.history.clear()
 
         if (
             isinstance(msg, ChatDocument)
@@ -666,9 +676,7 @@ class Task:
             )
         # TODO decide on whether or not to print, based on is_async
         llm_model = (
-            "no-LLM"
-            if self.agent.config.llm is None
-            else self.agent.config.llm.chat_model
+            "no-LLM" if self.agent.llm is None else self.agent.llm.config.chat_model
         )
         if not settings.quiet:
             print(
@@ -779,7 +787,7 @@ class Task:
                 # skip trying other responders in this step
                 break
         if not found_response:
-            self._process_invalid_step_result(parent)
+            self._process_invalid_step_result()
         self._show_pending_message_if_debug()
         return self.pending_message
 
@@ -871,7 +879,7 @@ class Task:
                 # skip trying other responders in this step
                 break
         if not found_response:
-            self._process_invalid_step_result(parent)
+            self._process_invalid_step_result()
         self._show_pending_message_if_debug()
         return self.pending_message
 
@@ -906,34 +914,13 @@ class Task:
         if self.pending_message is not None:
             hashed_msg = hash(str(self.pending_message))
             self.message_counter.update([hashed_msg])
-            self.history_count.append(self.message_counter[hashed_msg])
+            self.history.append(hashed_msg)
 
-    def _process_invalid_step_result(self, parent: ChatDocument | None) -> None:
+    def _process_invalid_step_result(self) -> None:
         """
-        Since step had no valid result from any responder, decide whether to update the
-        self.pending_message to a NO_ANSWER message from the opposite entity,
-        or leave it as is.
-        Args:
-            parent (ChatDocument|None): parent message of the current message
+        No valid result from any responder => increment stalled counter.
         """
         self.n_stalled_steps += 1
-        user_dummy_response = self.pending_sender != Entity.USER and self.interactive
-        if (not self.is_pass_thru) and (
-            not self.task_progress or self.allow_null_result or user_dummy_response
-        ):
-
-            # There has been no progress at all in this task, so we
-            # update the pending_message to a dummy NO_ANSWER msg
-            # from the entity 'opposite' to the current pending_sender,
-            # so we show "progress" and avoid getting stuck in an infinite loop.
-            responder = (
-                Entity.LLM if self.pending_sender == Entity.USER else Entity.USER
-            )
-            self.pending_message = ChatDocument(
-                content=NO_ANSWER,
-                metadata=ChatDocMetaData(sender=responder, parent=parent),
-            )
-            self.pending_sender = responder
         self.log_message(self.pending_sender, self.pending_message, mark=True)
 
     def _show_pending_message_if_debug(self) -> None:
@@ -1068,7 +1055,6 @@ class Task:
         tool_messages = result_msg.tool_messages if result_msg else []
         block = result_msg.metadata.block if result_msg else None
         recipient = result_msg.metadata.recipient if result_msg else None
-        responder = result_msg.metadata.parent_responder if result_msg else None
         tool_ids = result_msg.metadata.tool_ids if result_msg else []
         status = result_msg.metadata.status if result_msg else None
 
@@ -1084,7 +1070,6 @@ class Task:
                 sender=Entity.USER,
                 block=block,
                 status=status,
-                parent_responder=responder,
                 sender_name=self.name,
                 recipient=recipient,
                 tool_ids=tool_ids,
@@ -1154,9 +1139,9 @@ class Task:
             So if you plot these frequencies in decreasing order,
             you will see a big drop in the plot, from m to m+1.
             We call the freqs until m the "dominant" freqs.
-        2. Say we found m such dominant frequencies.
-           If these are the same as the freqs of the last m messages,
-           then we are likely in a loop.
+        2. Say we found m such dominant messages
+           If the set of last (W * m) messages are the same as the
+           set of m dominant messages,  then we are likely in a loop.
         """
         max_cycle_len = self.config.inf_loop_cycle_len
         if max_cycle_len <= 0:
@@ -1167,6 +1152,7 @@ class Task:
             # we haven't seen enough messages to detect a loop
             return False
 
+        # recall there's always a dummy msg with freq = 1
         most_common_msg_counts: List[Tuple[str, int]] = (
             self.message_counter.most_common(max_cycle_len + 1)
         )
@@ -1179,7 +1165,7 @@ class Task:
         ratios = counts[:-1] / counts[1:]
         diffs = counts[:-1] - counts[1:]
         indices = np.where((ratios > F) & (diffs > wait_factor))[0]
-        m = indices[0] if indices.size > 0 else -1
+        m = indices[-1] if indices.size > 0 else -1
         if m < 0:
             # no dominance found, but...
             if len(most_common_msg_counts) <= max_cycle_len:
@@ -1195,12 +1181,13 @@ class Task:
                 return False
 
         dominant_msg_counts = most_common_msg_counts[: m + 1]
-        # if the dominant m message counts are the same as the
-        # counts of the last m messages, then we are likely in a loop
-        dominant_counts = sorted([c for _, c in dominant_msg_counts])
-        recent_counts = sorted(list(self.history_count)[-(m + 1) :])
-
-        return dominant_counts == recent_counts
+        # if the SET of dominant m messages is the same as the
+        # the SET of last m*w messages, (where w = config.inf_loop_wait_factor),
+        # then we are likely in a loop
+        dominant_msgs = set([msg for msg, _ in dominant_msg_counts])
+        lookback = wait_factor * (m + 1)
+        recent_msgs = set(list(self.history)[-lookback:])
+        return dominant_msgs == recent_msgs
 
     def done(
         self, result: ChatDocument | None = None, r: Responder | None = None

{langroid-0.1.260.dist-info → langroid-0.1.261.dist-info}/METADATA

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

{langroid-0.1.260.dist-info → langroid-0.1.261.dist-info}/RECORD

@@ -5,7 +5,7 @@ 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=6gkk9Qf_i4fOD13w8ZdUfMcgKYPzLMw30hzFUN60AIc,22044
 langroid/agent/chat_agent.py,sha256=hnmeOxdi4i5w8WaL2kPjQOEpenoRW_hG5EfeMWuuVsQ,39478
-langroid/agent/chat_document.py,sha256=uwCq53SHRyxQw6qyhjzPYuJG48VHBgOf2122Ew3fk6c,9316
+langroid/agent/chat_document.py,sha256=Xx4uFVI77YxDc99x5P4JGprDINT5umqvTzCgHsvJpDc,9200
 langroid/agent/helpers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/junk,sha256=LxfuuW7Cijsg0szAzT81OjWWv1PMNI-6w_-DspVIO2s,339
 langroid/agent/openai_assistant.py,sha256=kIVDI4r-xGvplLU5s0nShPVHs6Jq-wOsfWE0kcMhAdQ,33056
@@ -32,7 +32,7 @@ langroid/agent/special/sql/utils/populate_metadata.py,sha256=1J22UsyEPKzwK0XlJZt
 langroid/agent/special/sql/utils/system_message.py,sha256=qKLHkvQWRQodTtPLPxr1GSLUYUFASZU8x-ybV67cB68,1885
 langroid/agent/special/sql/utils/tools.py,sha256=6uB2424SLtmapui9ggcEr0ZTiB6_dL1-JRGgN8RK9Js,1332
 langroid/agent/special/table_chat_agent.py,sha256=d9v2wsblaRx7oMnKhLV7uO_ujvk9gh59pSGvBXyeyNc,9659
-langroid/agent/task.py,sha256=Su1TpEmt3aPVTzXnTvJdyjSqZsXmUUcHN12KAs-gMY0,60408
+langroid/agent/task.py,sha256=acGBUrme5txxzyLRvwvoMmB-xFK1UXoBMOvw5_nmMyY,59636
 langroid/agent/tool_message.py,sha256=7t-UGEbykosKHAvaLI0Rm59sgxvN31IO3-P7bg7gLug,9730
 langroid/agent/tools/__init__.py,sha256=8Pc9BlGCB5FQ2IDGKS_WPpHCoWp5jblMU8EHJwwikAY,303
 langroid/agent/tools/duckduckgo_search_tool.py,sha256=NhsCaGZkdv28nja7yveAhSK_w6l_Ftym8agbrdzqgfo,1935
@@ -126,8 +126,8 @@ langroid/vector_store/meilisearch.py,sha256=6frB7GFWeWmeKzRfLZIvzRjllniZ1cYj3Hmh
 langroid/vector_store/momento.py,sha256=QaPzUnTwlswoawGB-paLtUPyLRvckFXLfLDfvbTzjNQ,10505
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=wYOuu5c2vIKn9ZgvTXcAiZXMpV8AOXEWFAzI8S8UP-0,16828
-pyproject.toml,sha256=6Vqvoq2dWP_JzMKXoKVlTteWCZGmWPW4tFQV0KfRtVQ,7026
-langroid-0.1.260.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.260.dist-info/METADATA,sha256=ftMLe9Jwmp1GkP9bsiO4kdxABtcgFuR1hsOdaXrKNkI,52506
-langroid-0.1.260.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.260.dist-info/RECORD,,
+pyproject.toml,sha256=TKd6Vvp5TeV62PB_3u78Iyv6yeiQpl3vdeer0p52uuI,7026
+langroid-0.1.261.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.261.dist-info/METADATA,sha256=Mlx16iPiQulcoWucigfFbJnJ4Br47qofiV_A7lPDSUE,52506
+langroid-0.1.261.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.261.dist-info/RECORD,,

pyproject.toml

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