pythonclaw 0.6.2__py3-none-any.whl → 0.6.4__py3-none-any.whl

pythonclaw/channels/telegram_bot.py

@@ -244,8 +244,7 @@ class TelegramBot:
         except Exception:
             pass
 
-    # Max wall-clock time for a single agent invocation (seconds).
-    _AGENT_TIMEOUT = 180
+    _AGENT_TIMEOUT = 600
 
     async def _flush_stream(
         self,
@@ -253,105 +252,47 @@ class TelegramBot:
         token_queue: "_queue.Queue[str]",
         future: "asyncio.Future[str]",
     ) -> None:
-        """Progressively stream tokens to Telegram via edit-in-place.
+        """Collect streamed tokens and deliver as 2-3 large messages.
 
-        Uses send-then-edit (like OpenClaw): one live message that gets
-        updated as tokens arrive (~1.5 s throttle).  Tool-call markers
-        produce a short status line and start a fresh message.
+        Strategy: accumulate all tokens silently. Tool-call markers are
+        stripped but do NOT trigger new messages.  Content is edit-in-place
+        updated into a single live message; only when a message hits the
+        Telegram 4096 char limit is a new message started.
 
-        Safeguards against hangs:
-        - **Heartbeat**: if no tokens arrive for 15 s, sends a "still
-          working" notification so the user knows the bot is alive.
-        - **Overall timeout**: after ``_AGENT_TIMEOUT`` seconds the
-          future is abandoned and a timeout message is sent.
+        No heartbeat / "still working" messages are sent.
         """
         buf: list[str] = []
         live_msg = None
         live_text = ""
         sent_any = False
-        THROTTLE = 1.5
-        HEARTBEAT_INTERVAL = 15.0
+        THROTTLE = 2.0
         last_edit = time.monotonic()
-        last_token_time = time.monotonic()
         start_time = time.monotonic()
-        heartbeat_sent = False
         _MARKER = re.compile(r'`\[calling:\s*([^\]]+)\]`')
 
         while not future.done():
-            # ── Overall timeout guard ─────────────────────────────────
             if (time.monotonic() - start_time) > self._AGENT_TIMEOUT:
                 logger.warning(
                     "[Telegram] Agent timeout after %ds", self._AGENT_TIMEOUT,
                 )
-                try:
-                    await update.message.reply_text(
-                        "\u23f0 The operation timed out. "
-                        "Please try a simpler request."
-                    )
-                except Exception:
-                    pass
-                return
+                break
 
-            # ── Drain token queue ─────────────────────────────────────
             drained = False
             while True:
                 try:
                     buf.append(token_queue.get_nowait())
                     drained = True
-                    last_token_time = time.monotonic()
-                    heartbeat_sent = False
                 except _queue.Empty:
                     break
 
-            # ── Heartbeat: notify user during long silences ───────────
-            if (
-                not drained
-                and not heartbeat_sent
-                and (time.monotonic() - last_token_time) > HEARTBEAT_INTERVAL
-            ):
-                try:
-                    await update.message.reply_text(
-                        "\u23f3 Still working\u2026"
-                    )
-                except Exception:
-                    pass
-                heartbeat_sent = True
-
             if not drained:
-                await asyncio.sleep(0.3)
+                await asyncio.sleep(0.4)
                 continue
 
-            raw = "".join(buf)
+            raw = _MARKER.sub("", "".join(buf))
+            text = _clean_response(raw)
             now = time.monotonic()
 
-            # ── Tool-call marker → status line + new message ──────────
-            marker = _MARKER.search(raw)
-            if marker:
-                before = _clean_response(raw[:marker.start()])
-                if before and before != live_text:
-                    try:
-                        if live_msg:
-                            await live_msg.edit_text(before[:4096])
-                        else:
-                            await update.message.reply_text(before[:4096])
-                    except Exception:
-                        pass
-                live_msg = None
-                live_text = ""
-                tools = marker.group(1)
-                try:
-                    await update.message.reply_text(
-                        f"\U0001f527 {tools}\u2026"
-                    )
-                except Exception:
-                    pass
-                sent_any = True
-                buf = [raw[marker.end():].lstrip()]
-                last_edit = now
-                continue
-
-            # ── Regular text → edit-in-place ──────────────────────────
-            text = _clean_response(raw)
             if text and text != live_text and (now - last_edit) >= THROTTLE:
                 try:
                     if live_msg is None:
@@ -363,26 +304,27 @@ class TelegramBot:
                         await live_msg.edit_text(text)
                         live_text = text
                     else:
-                        await live_msg.edit_text(text[:4096])
+                        await live_msg.edit_text(live_text)
                         live_msg = None
                         live_text = ""
-                        buf = [text[4096:]]
+                        buf = [text[len(live_text):] if live_text else text]
                     sent_any = True
                 except Exception:
                     pass
                 last_edit = now
 
-            await asyncio.sleep(0.3)
+            await asyncio.sleep(0.4)
 
         # ── Final drain ───────────────────────────────────────────────
-        response = future.result()
+        response = future.result() if future.done() else "(timed out)"
         while True:
             try:
                 buf.append(token_queue.get_nowait())
             except _queue.Empty:
                 break
 
-        remaining = _clean_response("".join(buf).strip())
+        raw = _MARKER.sub("", "".join(buf))
+        remaining = _clean_response(raw.strip())
         if remaining and remaining != live_text:
             try:
                 if live_msg and len(remaining) <= 4096:

pythonclaw/core/agent.py

@@ -120,9 +120,9 @@ class Agent:
     cron_manager       : CronScheduler instance (enables cron_add/remove/list tools)
     """
 
-    MAX_TOOL_ROUNDS = 8
+    MAX_TOOL_ROUNDS = 12
     MAX_PARALLEL_SKILLS = 5
-    TOOL_TIMEOUT = 90
+    TOOL_TIMEOUT = 300
 
     def __init__(
         self,
@@ -323,23 +323,32 @@ class Agent:
 - **Memory**: `remember(key,val)`, `recall(query)`, `memory_get(path)`, `memory_list_files()`, `forget(key)`, `update_index(content)`
 - **Skill creation**: `create_skill` — create generic reusable skills when none fit{web_search_section}
 
+### Task Execution Modes
+Choose your approach based on task complexity:
+
+**ReAct** (simple tasks, 1-2 steps): Act directly — call tools and respond immediately.
+
+**Plan & Execute** (complex tasks, 3+ steps, research, multi-source analysis):
+1. Output a short numbered plan (3-6 steps) as your first response
+2. Execute each step using tools — call multiple tools in parallel when steps are independent (up to {self.MAX_PARALLEL_SKILLS} parallel skills)
+3. After each step, briefly summarize what you found before moving on
+4. After all steps, synthesize a concise final answer
+
+You decide which mode fits. Don't announce the mode name.
+
 ### Rules
-- **Parallel skill execution**: For complex tasks, call multiple `use_skill` in ONE response (up to {self.MAX_PARALLEL_SKILLS} skills). They run in parallel for speed. Example: researching a topic? Activate `news`, `web_search`, and `summarize` simultaneously.
 - Batch independent tool calls in one response (parallel execution).
 - Minimize search rounds (1-3 max). Combine queries. Don't repeat.
 - Proactively `remember` user preferences, decisions, key facts.
 - Use `recall` when user references past context.
 - Memory auto-loaded at session start. INDEX.md = curated system info.
-
-Always verify command output.
+- NEVER output tool calls as XML or text. Always use the function calling API.
 
 ### Response Guidelines
 - Answer the user's question directly and concisely.
-- For complex multi-step tasks: share a **brief plan** first (2-4 bullet points), then work step by step. Report progress after each major step — don't wait until the end.
-- Keep responses focused and concise — under 300 words when possible. Break long answers into short paragraphs.
+- Keep responses focused — under 300 words when possible. Break long answers into short paragraphs.
 - Do NOT mention what skills or tools you have available, unless explicitly asked.
 - Do NOT list other things you can do at the end of your response.
-- NEVER output tool calls as XML or text. Always use the function calling API.
 """
         # ── Auto-inject memory context ────────────────────────────────────
         boot_mem = self.memory.boot_context(max_chars=3000)

pythonclaw/core/llm/anthropic_client.py

@@ -29,7 +29,7 @@ class AnthropicProvider(LLMProvider):
     def __init__(self, api_key: str, model_name: str = "claude-sonnet-4-20250514"):
         self.client = anthropic.Anthropic(
             api_key=api_key,
-            timeout=120.0,
+            timeout=300.0,
         )
         self.model_name = model_name
         self._auth_type = (

pythonclaw/core/llm/gemini_client.py

@@ -104,7 +104,7 @@ class GeminiProvider(LLMProvider):
         response = self.model.generate_content(
             contents=gemini_history,
             tools=gemini_tools,
-            request_options={"timeout": 120},
+            request_options={"timeout": 300},
         )
 
         # Convert to OpenAI-compatible format

pythonclaw/core/llm/openai_compatible.py

@@ -22,7 +22,7 @@ class OpenAICompatibleProvider(LLMProvider):
         self.client = OpenAI(
             api_key=api_key,
             base_url=base_url,
-            timeout=120.0,
+            timeout=300.0,
         )
         self.model_name = model_name
 

{pythonclaw-0.6.2.dist-info → pythonclaw-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonclaw
-Version: 0.6.2
+Version: 0.6.4
 Summary: OpenClaw reimagined in pure Python — autonomous AI agent with memory, RAG, skills, web dashboard, and multi-channel support.
 Author-email: Eric Wang <wangchen2007915@gmail.com>
 License: MIT

{pythonclaw-0.6.2.dist-info → pythonclaw-0.6.4.dist-info}/RECORD

@@ -8,10 +8,10 @@ pythonclaw/onboard.py,sha256=X6ViAduToi9P9J_WdWm9mKQtTb48IwGj5DiqS4jjt0Y,13921
 pythonclaw/server.py,sha256=zUV09uNTmzK597swGwt45gdmVxuHPsF7ogVV0DHBIhA,4521
 pythonclaw/session_manager.py,sha256=LKRolNa2i3evb6Ps1zRbajlk4AfvujbR1iPlhfAMBj8,5981
 pythonclaw/channels/discord_bot.py,sha256=95IJcBJlcnOSbsg0LILq6uBYfhdpb-iLLlRw_41Xz7U,11744
-pythonclaw/channels/telegram_bot.py,sha256=Yb2kKQy9V1VAJWJzHNvCtGAxircxi4h7fImh7Qg1A3U,22183
+pythonclaw/channels/telegram_bot.py,sha256=QCwGZlTm6bZIr-E557EEwQktFXvmwvJ4DJJviXgfG00,19610
 pythonclaw/channels/whatsapp_bot.py,sha256=60n6W3ONEIKAdpmI6gCS9RWf5KkLtMUU4J5NJH8vQEY,10650
 pythonclaw/core/__init__.py,sha256=G5LCqUcCIcYYbMv6SreqS-kj8T9n-IvBAhHEG7wDF5w,661
-pythonclaw/core/agent.py,sha256=rzZdB8RJehife0hBIgxa0omgP-vsiTmYwZniPpdM1D8,49995
+pythonclaw/core/agent.py,sha256=kNXHAZRy0NcL3lktI4E3P7dz_d2ubTrp3bE7HaUYFGk,50160
 pythonclaw/core/compaction.py,sha256=b3zrqwBhPmsmQdfRjrvKK6j0hcfNLpiRrZ8qFxY1h1U,8966
 pythonclaw/core/persistent_agent.py,sha256=nnY1vaZFsn0Wd_MQ27wbG7sRjO1v2ZxbwXjnJGKsBZc,4932
 pythonclaw/core/session_store.py,sha256=V44wMBbMpbDCh1aiCa5lb0_iXrKA_7VrR1rOHGGZYhs,9458
@@ -20,10 +20,10 @@ pythonclaw/core/skillhub.py,sha256=3MGJ81DFcgcVDCD_Wvf5vHJhcDLZf6IKOhzGzaHkPPQ,1
 pythonclaw/core/tools.py,sha256=e3ZZnZ5uZt1bj30IBMJP9ZAwhXUEs-3F_q1tmE2Uk90,23205
 pythonclaw/core/utils.py,sha256=Ih_ZYnulGlxctdyVy4oKknjvkwFS6ZHcdrznIFIAwxo,1919
 pythonclaw/core/knowledge/rag.py,sha256=_6GKs8ZFirMQhOeT-CAJBkwLcPkEz7Og-gWKMfUezDw,2895
-pythonclaw/core/llm/anthropic_client.py,sha256=w6mXlpxvdmulZMD8_ocC8cufDON-RjLIvslWiPb-GnM,11797
+pythonclaw/core/llm/anthropic_client.py,sha256=MrzXK79V5brWnfUdl8HPD3sEZ__8iRgILATb4tSRWes,11797
 pythonclaw/core/llm/base.py,sha256=y1muHBuK14rvzWlXmoSf6ahz6Xi0BojpnDUTRhaD3pI,1683
-pythonclaw/core/llm/gemini_client.py,sha256=Oarzq12YnuMdivAYLLsVmMUTvNCmXXxHfitbUAebYu8,7218
-pythonclaw/core/llm/openai_compatible.py,sha256=4FK1OB93tB_ARs_0vdvBADtP3cuNReixNWf6PUkfCys,3567
+pythonclaw/core/llm/gemini_client.py,sha256=pCFcxBov7Kp9uVZ_TEgo7MRFsqxyd71lX2A9NqAwGSs,7218
+pythonclaw/core/llm/openai_compatible.py,sha256=PeqIaZNyCKEyqTnHpmzmIn7djoGN2HJUU4E4uRP47Ts,3567
 pythonclaw/core/llm/response.py,sha256=hNCsi0aV1ffXsFuDNnBpRp96cFtVDfX_XEC34QZoykc,1223
 pythonclaw/core/memory/manager.py,sha256=JzNT6CGVRmmIqbOflRzF7HxSfPfI5jLu8tmF6-91ZVA,8945
 pythonclaw/core/memory/storage.py,sha256=mHDN8yCVUZ5srOwYWDNjUhbELXka-X8zSexFWEBUB1M,9119
@@ -112,9 +112,9 @@ pythonclaw/web/app.py,sha256=uudrxieo5oGwhQUBLzkmn6GU6SnR4VKlRYOg1bFAYQg,32208
 pythonclaw/web/static/favicon.png,sha256=zJA13uE8mSe6lOlR5NyAhiOmnZkfv7ZlBbSBNCH7iTM,2557
 pythonclaw/web/static/index.html,sha256=wU4Lw0NcenS0i0HsJS6a6ceFefDxpRsUQnCXVUXYWVU,93734
 pythonclaw/web/static/logo.png,sha256=h7v0HHllD23FtmCL2UvjjTDt0UgqKjGy5jOhI3rb7lM,28359
-pythonclaw-0.6.2.dist-info/licenses/LICENSE,sha256=wbYsm5Ofe8cnxHgWSnSG1vUJDNiY1DIeTyxHSbo1HqM,1066
-pythonclaw-0.6.2.dist-info/METADATA,sha256=YgdWePd76TK3ypl8RECUMqkDI4E2JxY_xUDdFoUb0hM,14919
-pythonclaw-0.6.2.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-pythonclaw-0.6.2.dist-info/entry_points.txt,sha256=4uGCuBw-id_22IRdkoxPVOOcwgiPX5lNEpD1XKQWE4I,52
-pythonclaw-0.6.2.dist-info/top_level.txt,sha256=S_lM2VH3gP3UeZbSWHXIrBOCNtoqn5pk491IAzgsV7M,11
-pythonclaw-0.6.2.dist-info/RECORD,,
+pythonclaw-0.6.4.dist-info/licenses/LICENSE,sha256=wbYsm5Ofe8cnxHgWSnSG1vUJDNiY1DIeTyxHSbo1HqM,1066
+pythonclaw-0.6.4.dist-info/METADATA,sha256=cQ3xhWP9WNNTkyUJehSl2sxJuuZUwVdCiwifLnRYhmM,14919
+pythonclaw-0.6.4.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+pythonclaw-0.6.4.dist-info/entry_points.txt,sha256=4uGCuBw-id_22IRdkoxPVOOcwgiPX5lNEpD1XKQWE4I,52
+pythonclaw-0.6.4.dist-info/top_level.txt,sha256=S_lM2VH3gP3UeZbSWHXIrBOCNtoqn5pk491IAzgsV7M,11
+pythonclaw-0.6.4.dist-info/RECORD,,