pythonclaw 0.5.0__tar.gz → 0.6.1__tar.gz

{pythonclaw-0.5.0/pythonclaw.egg-info → pythonclaw-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonclaw
-Version: 0.5.0
+Version: 0.6.1
 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
@@ -78,7 +78,7 @@ Dynamic: license-file
 | | Feature | Details |
 |---|---------|---------|
 | 🧠 | **Provider-agnostic** | DeepSeek, Grok, Claude, Gemini, Kimi, GLM — or any OpenAI-compatible API |
-| 🛠️ | **Three-tier skills** | Progressive loading: metadata → instructions → resources. Community marketplace via [SkillHub](https://www.skillhub.club) |
+| 🛠️ | **Three-tier skills** | Progressive loading: metadata → instructions → resources. Community marketplace via [ClawHub](https://clawhub.com) (13K+ free skills) |
 | 💾 | **Persistent memory** | Markdown-based long-term memory with daily logs and semantic recall |
 | 🔍 | **Hybrid RAG** | BM25 + dense embeddings + RRF fusion + LLM re-ranking |
 | 🌐 | **Web dashboard** | Browser UI for chat, config, skill catalog, identity editing, and marketplace |
@@ -133,7 +133,7 @@ pythonclaw onboard
 | `pythonclaw stop` | Stop the running daemon |
 | `pythonclaw status` | Show daemon status (PID, uptime, port) |
 | `pythonclaw chat` | Interactive CLI chat (foreground REPL) |
-| `pythonclaw skill search <query>` | Search skills on [SkillHub](https://www.skillhub.club) |
+| `pythonclaw skill search <query>` | Search skills on [ClawHub](https://clawhub.com) |
 | `pythonclaw skill browse` | Browse top-rated skills |
 | `pythonclaw skill install <id>` | Install a community skill |
 | `pythonclaw skill info <id>` | View skill details |
@@ -191,7 +191,7 @@ $ pythonclaw start
 │               LLM Provider Abstraction Layer                 │
 │ DeepSeek │ Grok │ Claude │ Gemini │ Kimi │ GLM              │
 ├──────────────────────────────────────────────────────────────┤
-│              SkillHub Marketplace (skillhub.club)            │
+│              ClawHub Marketplace (clawhub.com)               │
 └──────────────────────────────────────────────────────────────┘
 ```
 
@@ -204,7 +204,7 @@ Start with `pythonclaw start` and open **http://localhost:7788**.
 - **Dashboard** — agent status, soul/persona preview, tool list
 - **Chat** — real-time chat with voice input (Deepgram)
 - **Skill Catalog** — browse installed skills by category
-- **Marketplace** — search and install skills from [SkillHub](https://www.skillhub.club)
+- **Marketplace** — search and install skills from [ClawHub](https://clawhub.com)
 - **Configuration** — edit LLM provider, API keys, and settings in-browser
 
 ---
@@ -272,9 +272,9 @@ description: Execute Python code safely in an isolated subprocess.
 Run `python {skill_path}/run_code.py "expression"`
 ```
 
-### SkillHub Marketplace
+### ClawHub Marketplace
 
-Browse and install 22,000+ community skills from [skillhub.club](https://www.skillhub.club):
+Browse and install 13,000+ community skills from [ClawHub](https://clawhub.com) — free, no API key required:
 
 ```bash
 pythonclaw skill search "database backup"
@@ -351,7 +351,7 @@ PythonClaw/
 │   │   ├── agent.py           # Core reasoning loop
 │   │   ├── tools.py           # Tool schemas and execution
 │   │   ├── skill_loader.py    # Three-tier skill system
-│   │   ├── skillhub.py        # SkillHub marketplace client
+│   │   ├── skillhub.py        # ClawHub marketplace client
 │   │   ├── persistent_agent.py
 │   │   ├── compaction.py      # Context compaction
 │   │   ├── llm/               # Provider adapters
@@ -397,7 +397,7 @@ We welcome contributions! See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
 | CLI | `openclaw start/stop` | `pythonclaw start/stop/status` |
 | Dashboard | Web UI | Web UI (localhost:7788) |
 | Memory | Markdown | Markdown (long-term + daily) |
-| Skills | Plugin system | Three-tier + SkillHub marketplace |
+| Skills | Plugin system | Three-tier + ClawHub marketplace |
 | Channels | Discord, Telegram, WhatsApp | CLI, Web, Telegram, Discord, WhatsApp |
 | Voice | — | Deepgram STT |
 | LLM Providers | OpenAI, Anthropic, Gemini | DeepSeek, Grok, Claude, Gemini, Kimi, GLM |

{pythonclaw-0.5.0 → pythonclaw-0.6.1}/README.md

@@ -36,7 +36,7 @@
 | | Feature | Details |
 |---|---------|---------|
 | 🧠 | **Provider-agnostic** | DeepSeek, Grok, Claude, Gemini, Kimi, GLM — or any OpenAI-compatible API |
-| 🛠️ | **Three-tier skills** | Progressive loading: metadata → instructions → resources. Community marketplace via [SkillHub](https://www.skillhub.club) |
+| 🛠️ | **Three-tier skills** | Progressive loading: metadata → instructions → resources. Community marketplace via [ClawHub](https://clawhub.com) (13K+ free skills) |
 | 💾 | **Persistent memory** | Markdown-based long-term memory with daily logs and semantic recall |
 | 🔍 | **Hybrid RAG** | BM25 + dense embeddings + RRF fusion + LLM re-ranking |
 | 🌐 | **Web dashboard** | Browser UI for chat, config, skill catalog, identity editing, and marketplace |
@@ -91,7 +91,7 @@ pythonclaw onboard
 | `pythonclaw stop` | Stop the running daemon |
 | `pythonclaw status` | Show daemon status (PID, uptime, port) |
 | `pythonclaw chat` | Interactive CLI chat (foreground REPL) |
-| `pythonclaw skill search <query>` | Search skills on [SkillHub](https://www.skillhub.club) |
+| `pythonclaw skill search <query>` | Search skills on [ClawHub](https://clawhub.com) |
 | `pythonclaw skill browse` | Browse top-rated skills |
 | `pythonclaw skill install <id>` | Install a community skill |
 | `pythonclaw skill info <id>` | View skill details |
@@ -149,7 +149,7 @@ $ pythonclaw start
 │               LLM Provider Abstraction Layer                 │
 │ DeepSeek │ Grok │ Claude │ Gemini │ Kimi │ GLM              │
 ├──────────────────────────────────────────────────────────────┤
-│              SkillHub Marketplace (skillhub.club)            │
+│              ClawHub Marketplace (clawhub.com)               │
 └──────────────────────────────────────────────────────────────┘
 ```
 
@@ -162,7 +162,7 @@ Start with `pythonclaw start` and open **http://localhost:7788**.
 - **Dashboard** — agent status, soul/persona preview, tool list
 - **Chat** — real-time chat with voice input (Deepgram)
 - **Skill Catalog** — browse installed skills by category
-- **Marketplace** — search and install skills from [SkillHub](https://www.skillhub.club)
+- **Marketplace** — search and install skills from [ClawHub](https://clawhub.com)
 - **Configuration** — edit LLM provider, API keys, and settings in-browser
 
 ---
@@ -230,9 +230,9 @@ description: Execute Python code safely in an isolated subprocess.
 Run `python {skill_path}/run_code.py "expression"`
 ```
 
-### SkillHub Marketplace
+### ClawHub Marketplace
 
-Browse and install 22,000+ community skills from [skillhub.club](https://www.skillhub.club):
+Browse and install 13,000+ community skills from [ClawHub](https://clawhub.com) — free, no API key required:
 
 ```bash
 pythonclaw skill search "database backup"
@@ -309,7 +309,7 @@ PythonClaw/
 │   │   ├── agent.py           # Core reasoning loop
 │   │   ├── tools.py           # Tool schemas and execution
 │   │   ├── skill_loader.py    # Three-tier skill system
-│   │   ├── skillhub.py        # SkillHub marketplace client
+│   │   ├── skillhub.py        # ClawHub marketplace client
 │   │   ├── persistent_agent.py
 │   │   ├── compaction.py      # Context compaction
 │   │   ├── llm/               # Provider adapters
@@ -355,7 +355,7 @@ We welcome contributions! See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
 | CLI | `openclaw start/stop` | `pythonclaw start/stop/status` |
 | Dashboard | Web UI | Web UI (localhost:7788) |
 | Memory | Markdown | Markdown (long-term + daily) |
-| Skills | Plugin system | Three-tier + SkillHub marketplace |
+| Skills | Plugin system | Three-tier + ClawHub marketplace |
 | Channels | Discord, Telegram, WhatsApp | CLI, Web, Telegram, Discord, WhatsApp |
 | Voice | — | Deepgram STT |
 | LLM Providers | OpenAI, Anthropic, Gemini | DeepSeek, Grok, Claude, Gemini, Kimi, GLM |

{pythonclaw-0.5.0 → pythonclaw-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pythonclaw"
-version = "0.5.0"
+version = "0.6.1"
 description = "OpenClaw reimagined in pure Python — autonomous AI agent with memory, RAG, skills, web dashboard, and multi-channel support."
 readme = "README.md"
 license = {text = "MIT"}

{pythonclaw-0.5.0 → pythonclaw-0.6.1}/pythonclaw/channels/discord_bot.py

@@ -1,7 +1,7 @@
 """
 Discord channel for PythonClaw.
 
-Session IDs: "discord:{user_id}" (DMs) or "discord:{channel_id}" (guilds)
+Session IDs: "discord:dm:{user_id}" (DMs) or "discord:{channel_id}" (guilds)
 
 Commands
 --------
@@ -9,21 +9,29 @@ Commands
   !status         — show session info
   !compact [hint] — compact conversation history
   <text>          — forwarded to Agent.chat(), reply sent back
+  <image>         — image attachments sent to LLM for analysis
 
 The bot responds to:
   - Direct messages (always)
-  - Channel mentions (@bot message) in guilds
-  - Optionally all messages in whitelisted channels
+  - Channel mentions (@bot message) in guilds (when requireMention=true)
+  - All messages in whitelisted channels (when requireMention=false)
 
 Access control
 --------------
 Set DISCORD_ALLOWED_USERS to a comma-separated list of Discord user IDs.
 Set DISCORD_ALLOWED_CHANNELS to restrict which guild channels the bot listens in.
 Leave empty to allow all.
+
+Group behaviour
+---------------
+Set ``channels.discord.requireMention`` to ``true`` to require @bot mention
+in guild channels. Default is ``false`` (respond when mentioned OR in
+whitelisted channels).
 """
 
 from __future__ import annotations
 
+import base64
 import logging
 from typing import TYPE_CHECKING
 
@@ -52,11 +60,13 @@ class DiscordBot:
         token: str,
         allowed_users: list[int] | None = None,
         allowed_channels: list[int] | None = None,
+        require_mention: bool = False,
     ) -> None:
         self._sm = session_manager
         self._token = token
         self._allowed_users: set[int] = set(allowed_users) if allowed_users else set()
         self._allowed_channels: set[int] = set(allowed_channels) if allowed_channels else set()
+        self._require_mention = require_mention
 
         intents = discord.Intents.default()
         intents.message_content = True
@@ -113,20 +123,27 @@ class DiscordBot:
             is_dm = isinstance(message.channel, discord.DMChannel)
             is_mentioned = client.user in message.mentions if not is_dm else False
 
-            # In guilds, only respond to mentions or whitelisted channels
-            if not is_dm and not is_mentioned and not self._is_allowed_channel(message.channel.id):
-                return
+            if not is_dm:
+                if self._require_mention and not is_mentioned:
+                    return
+                if not self._require_mention and not is_mentioned:
+                    if not self._is_allowed_channel(message.channel.id):
+                        return
 
             if not self._is_allowed_user(message.author.id):
                 await message.reply("Sorry, you are not authorised to use this bot.")
                 return
 
             content = message.content.strip()
-            # Remove bot mention from the beginning
             if is_mentioned and client.user:
                 content = content.replace(f"<@{client.user.id}>", "").strip()
 
-            if not content:
+            has_image = any(
+                a.content_type and a.content_type.startswith("image/")
+                for a in message.attachments
+            )
+
+            if not content and not has_image:
                 return
 
             # Command dispatch
@@ -141,7 +158,35 @@ class DiscordBot:
                 await self._cmd_compact(message, is_dm, hint)
                 return
 
-            await self._handle_chat(message, content, is_dm)
+            chat_input = content or ""
+            if has_image:
+                chat_input = await self._build_image_input(
+                    message, content or "What's in this image?"
+                )
+
+            await self._handle_chat(message, chat_input, is_dm)
+
+    # ── Image handling ────────────────────────────────────────────────────────
+
+    @staticmethod
+    async def _build_image_input(message: discord.Message, caption: str) -> list:
+        """Download image attachments and build multimodal content array."""
+        parts: list[dict] = [{"type": "text", "text": caption}]
+        for att in message.attachments:
+            if att.content_type and att.content_type.startswith("image/"):
+                try:
+                    data = await att.read()
+                    b64 = base64.b64encode(data).decode()
+                    media_type = att.content_type.split(";")[0]
+                    parts.append({
+                        "type": "image_url",
+                        "image_url": {
+                            "url": f"data:{media_type};base64,{b64}",
+                        },
+                    })
+                except Exception:
+                    logger.warning("[Discord] Failed to download attachment %s", att.filename)
+        return parts
 
     # ── Command implementations ───────────────────────────────────────────────
 
@@ -180,12 +225,17 @@ class DiscordBot:
         for chunk in self._split_message(result or "(no result)"):
             await message.reply(chunk)
 
-    async def _handle_chat(self, message: discord.Message, content: str, is_dm: bool) -> None:
+    async def _handle_chat(
+        self,
+        message: discord.Message,
+        content: str | list,
+        is_dm: bool,
+    ) -> None:
         sid = self._session_id(message.author.id if is_dm else message.channel.id, is_dm)
         agent = self._sm.get_or_create(sid)
 
         if self._sm.is_locked(sid):
-            await message.reply("Processing previous message…")
+            await message.reply("Processing previous message\u2026")
 
         async with message.channel.typing():
             try:
@@ -226,11 +276,15 @@ def create_bot(session_manager: "SessionManager") -> "DiscordBot":
     allowed_channels = config.get_int_list(
         "channels", "discord", "allowedChannels", env="DISCORD_ALLOWED_CHANNELS",
     )
+    require_mention = config.get_bool(
+        "channels", "discord", "requireMention", default=False,
+    )
     return DiscordBot(
         session_manager=session_manager,
         token=token,
         allowed_users=allowed_users or None,
         allowed_channels=allowed_channels or None,
+        require_mention=require_mention,
     )