pythonclaw 0.6.3__py3-none-any.whl → 0.6.5__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,98 +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])
-                        sent_any = True
-                    except Exception:
-                        pass
-                live_msg = None
-                live_text = ""
-                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:
@@ -356,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,

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/core/skillhub.py

@@ -15,10 +15,14 @@ Available ClawHub endpoints
   GET /api/certified       — security-verified skills
   GET /api/stats           — platform statistics
   GET /api/health          — API status
+
+Skill download (full ZIP with SKILL.md + assets):
+  GET https://wry-manatee-359.convex.site/api/v1/download?slug=SLUG
 """
 
 from __future__ import annotations
 
+import io
 import json
 import logging
 import os
@@ -26,12 +30,14 @@ import re
 import ssl
 import urllib.error
 import urllib.request
+import zipfile
 from typing import Any
 
 logger = logging.getLogger(__name__)
 
 CLAWHUB_API = "https://topclawhubskills.com/api"
 CLAWHUB_WEB = "https://clawhub.com"
+CLAWHUB_DOWNLOAD = "https://wry-manatee-359.convex.site/api/v1/download"
 
 
 def _get_ssl_ctx() -> ssl.SSLContext:
@@ -128,26 +134,16 @@ def browse(
 
 
 def get_skill_detail(skill_id: str) -> dict | None:
-    """Fetch detail for a skill.
-
-    ClawHub search results already contain summary info.  For full
-    instructions, the skill must be installed (``clawhub install``).
-    We return whatever metadata we have from the listing.
-    """
+    """Fetch metadata for a skill from ClawHub search API."""
     try:
         result = _api_get("/search", params={"q": skill_id})
         data = result.get("data", [])
         for s in data:
             if s.get("slug") == skill_id:
-                normalized = _normalize([s])[0]
-                normalized["skill_md"] = _build_skill_md(s)
-                return normalized
+                return _normalize([s])[0]
 
         if data:
-            s = data[0]
-            normalized = _normalize([s])[0]
-            normalized["skill_md"] = _build_skill_md(s)
-            return normalized
+            return _normalize([data[0]])[0]
     except Exception as exc:
         logger.warning("ClawHub detail fetch failed for '%s': %s", skill_id, exc)
 
@@ -180,41 +176,19 @@ def verify_api() -> dict:
 
 # ── Install ───────────────────────────────────────────────────────────────────
 
-def _build_skill_md(skill: dict) -> str:
-    """Build a SKILL.md from ClawHub metadata."""
-    name = skill.get("display_name", skill.get("slug", "unknown"))
-    slug = skill.get("slug", "")
-    summary = skill.get("summary", "No description.")
-    author = skill.get("owner_handle", "")
-    safe_name = re.sub(r"[^a-zA-Z0-9_]", "_", name.lower()).strip("_")
-
-    lines = [
-        "---",
-        f"name: {safe_name}",
-        "description: >",
-        f"  {summary}",
-        "---",
-        "",
-        f"# {name}",
-        "",
-    ]
-    if author:
-        lines.append(f"*By @{author} on ClawHub*")
-        lines.append("")
-    lines.append(f"Source: {CLAWHUB_WEB}/skills/{slug}")
-    lines.append("")
-    lines.append("## Instructions")
-    lines.append("")
-    lines.append(f"This skill was imported from ClawHub (`{slug}`).")
-    lines.append("Refer to the source page for full documentation and usage instructions.")
-    lines.append("")
-    if summary:
-        lines.append("## Description")
-        lines.append("")
-        lines.append(summary)
-        lines.append("")
-
-    return "\n".join(lines)
+def _download_skill_zip(slug: str) -> bytes:
+    """Download the full skill ZIP from ClawHub's Convex CDN."""
+    url = f"{CLAWHUB_DOWNLOAD}?slug={urllib.request.quote(slug)}"
+    req = urllib.request.Request(
+        url, headers={"User-Agent": "PythonClaw/1.0"},
+    )
+    try:
+        with urllib.request.urlopen(req, timeout=30, context=_get_ssl_ctx()) as resp:
+            return resp.read()
+    except Exception as exc:
+        raise RuntimeError(
+            f"Failed to download skill '{slug}' from ClawHub: {exc}"
+        ) from exc
 
 
 def install_skill(
@@ -225,24 +199,16 @@ def install_skill(
 ) -> str:
     """Download and install a skill from ClawHub into the local skills directory.
 
+    Downloads the full ZIP archive from ClawHub (contains SKILL.md plus
+    any assets, scripts, references, etc.) and extracts it.
+
     Returns the path to the installed skill directory.
     """
     if target_dir is None:
         from .. import config as _cfg
         target_dir = os.path.join(str(_cfg.PYTHONCLAW_HOME), "context", "skills")
 
-    detail = None
-    if not skill_md_override:
-        detail = get_skill_detail(skill_id)
-        if not detail:
-            raise RuntimeError(f"Could not fetch skill '{skill_id}' from ClawHub.")
-
-    skill_md = skill_md_override or detail.get("skill_md", "")
-    if not skill_md:
-        raise RuntimeError(f"No SKILL.md content found for '{skill_id}'.")
-
-    skill_name = _derive_skill_name(skill_id, skill_md, detail)
-    safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", skill_name).strip("_")
+    safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", skill_id).strip("_")
     if not safe_name:
         safe_name = "imported_skill"
 
@@ -250,33 +216,47 @@ def install_skill(
     skill_dir = os.path.join(target_dir, category, safe_name)
     os.makedirs(skill_dir, exist_ok=True)
 
-    md_path = os.path.join(skill_dir, "SKILL.md")
-    if not skill_md.startswith("---"):
-        skill_md = f"---\nname: {safe_name}\ndescription: Imported from ClawHub ({skill_id})\n---\n\n{skill_md}"
-
-    with open(md_path, "w", encoding="utf-8") as f:
-        f.write(skill_md + "\n")
-
-    fallback_url = f"{CLAWHUB_WEB}/skills/{skill_id}"
-    source_url = detail.get("source_url", fallback_url) if detail else fallback_url
+    if skill_md_override:
+        md_path = os.path.join(skill_dir, "SKILL.md")
+        md = skill_md_override
+        if not md.startswith("---"):
+            md = f"---\nname: {safe_name}\ndescription: Imported from ClawHub ({skill_id})\n---\n\n{md}"
+        with open(md_path, "w", encoding="utf-8") as f:
+            f.write(md + "\n")
+    else:
+        raw_zip = _download_skill_zip(skill_id)
+        try:
+            zf = zipfile.ZipFile(io.BytesIO(raw_zip))
+        except zipfile.BadZipFile as exc:
+            raise RuntimeError(
+                f"ClawHub returned invalid ZIP for '{skill_id}'."
+            ) from exc
+
+        for member in zf.namelist():
+            if member.startswith("__MACOSX") or member.startswith("."):
+                continue
+            dest = os.path.join(skill_dir, member)
+            if member.endswith("/"):
+                os.makedirs(dest, exist_ok=True)
+            else:
+                os.makedirs(os.path.dirname(dest), exist_ok=True)
+                with open(dest, "wb") as f:
+                    f.write(zf.read(member))
+
+        if not os.path.exists(os.path.join(skill_dir, "SKILL.md")):
+            logger.warning("No SKILL.md found in ZIP for '%s'", skill_id)
+
+    source_url = f"{CLAWHUB_WEB}/skills/{skill_id}"
     meta_path = os.path.join(skill_dir, ".clawhub.json")
     with open(meta_path, "w", encoding="utf-8") as f:
-        json.dump({"id": skill_id, "source": source_url, "installed_by": "pythonclaw"}, f, indent=2)
+        json.dump(
+            {"id": skill_id, "source": source_url, "installed_by": "pythonclaw"},
+            f, indent=2,
+        )
 
     return skill_dir
 
 
-def _derive_skill_name(skill_id: str, skill_md: str, detail: dict | None) -> str:
-    """Extract a reasonable skill name from available data."""
-    name_match = re.search(r"^name:\s*(.+)$", skill_md, re.MULTILINE)
-    if name_match:
-        return name_match.group(1).strip()
-    if detail and detail.get("name"):
-        return detail["name"]
-    parts = skill_id.rsplit("-", 1)
-    return parts[-1] if parts else skill_id
-
-
 def format_search_results(results: list[dict]) -> str:
     """Format search results for CLI display."""
     if not results:

{pythonclaw-0.6.3.dist-info → pythonclaw-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonclaw
-Version: 0.6.3
+Version: 0.6.5
 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.3.dist-info → pythonclaw-0.6.5.dist-info}/RECORD

@@ -8,22 +8,22 @@ 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=WGZFgDcHIOLKNSphMT79ZrpC_6XbsZ-WU8t9Yto8LsQ,21944
+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=75cLwIF2HH9-IH9YpHoujyPGg9Sapg6vCTMMfHRY1vk,50158
+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
 pythonclaw/core/skill_loader.py,sha256=CE4ffrgkTxSMILESQTtFa3vo59U9oi3olJqW8FtCCUA,14582
-pythonclaw/core/skillhub.py,sha256=3MGJ81DFcgcVDCD_Wvf5vHJhcDLZf6IKOhzGzaHkPPQ,10341
+pythonclaw/core/skillhub.py,sha256=WdEpDJCIjYMYIqCPPvwy_J9IEZlDmHES-ix_i63UgoA,9765
 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.3.dist-info/licenses/LICENSE,sha256=wbYsm5Ofe8cnxHgWSnSG1vUJDNiY1DIeTyxHSbo1HqM,1066
-pythonclaw-0.6.3.dist-info/METADATA,sha256=7uJE3m-kzB0X-DKqlHM5D2GLGfSY7yFrmx-6Xb3NiJc,14919
-pythonclaw-0.6.3.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-pythonclaw-0.6.3.dist-info/entry_points.txt,sha256=4uGCuBw-id_22IRdkoxPVOOcwgiPX5lNEpD1XKQWE4I,52
-pythonclaw-0.6.3.dist-info/top_level.txt,sha256=S_lM2VH3gP3UeZbSWHXIrBOCNtoqn5pk491IAzgsV7M,11
-pythonclaw-0.6.3.dist-info/RECORD,,
+pythonclaw-0.6.5.dist-info/licenses/LICENSE,sha256=wbYsm5Ofe8cnxHgWSnSG1vUJDNiY1DIeTyxHSbo1HqM,1066
+pythonclaw-0.6.5.dist-info/METADATA,sha256=yPGiMt8r11nq1IuBY-MPNIbF2Vbx6lFc2A1rrFWBVF4,14919
+pythonclaw-0.6.5.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+pythonclaw-0.6.5.dist-info/entry_points.txt,sha256=4uGCuBw-id_22IRdkoxPVOOcwgiPX5lNEpD1XKQWE4I,52
+pythonclaw-0.6.5.dist-info/top_level.txt,sha256=S_lM2VH3gP3UeZbSWHXIrBOCNtoqn5pk491IAzgsV7M,11
+pythonclaw-0.6.5.dist-info/RECORD,,