From a0280a1e4ac693ccb6227ec92e7163f0347e96df Mon Sep 17 00:00:00 2001 From: Manus AI Date: Thu, 5 Feb 2026 03:35:46 -0500 Subject: [PATCH 01/33] fix: update Zhipu AI API key env var and improve model prefixing --- nanobot/cli/commands.py | 2 ++ nanobot/providers/litellm_provider.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index c2241fb..641339d 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -642,12 +642,14 @@ def status(): has_anthropic = bool(config.providers.anthropic.api_key) has_openai = bool(config.providers.openai.api_key) has_gemini = bool(config.providers.gemini.api_key) + has_zhipu = bool(config.providers.zhipu.api_key) has_vllm = bool(config.providers.vllm.api_base) console.print(f"OpenRouter API: {'[green]✓[/green]' if has_openrouter else '[dim]not set[/dim]'}") console.print(f"Anthropic API: {'[green]✓[/green]' if has_anthropic else '[dim]not set[/dim]'}") console.print(f"OpenAI API: {'[green]✓[/green]' if has_openai else '[dim]not set[/dim]'}") console.print(f"Gemini API: {'[green]✓[/green]' if has_gemini else '[dim]not set[/dim]'}") + console.print(f"Zhipu AI API: {'[green]✓[/green]' if has_zhipu else '[dim]not set[/dim]'}") vllm_status = f"[green]✓ {config.providers.vllm.api_base}[/green]" if has_vllm else "[dim]not set[/dim]" console.print(f"vLLM/Local: {vllm_status}") diff --git a/nanobot/providers/litellm_provider.py b/nanobot/providers/litellm_provider.py index 8945412..1dbee8e 100644 --- a/nanobot/providers/litellm_provider.py +++ b/nanobot/providers/litellm_provider.py @@ -50,6 +50,7 @@ class LiteLLMProvider(LLMProvider): elif "gemini" in default_model.lower(): os.environ.setdefault("GEMINI_API_KEY", api_key) elif "zhipu" in default_model or "glm" in default_model or "zai" in default_model: + os.environ.setdefault("ZAI_API_KEY", api_key) os.environ.setdefault("ZHIPUAI_API_KEY", api_key) elif "groq" in default_model: os.environ.setdefault("GROQ_API_KEY", api_key) @@ -92,7 +93,8 @@ class LiteLLMProvider(LLMProvider): if ("glm" in model.lower() or "zhipu" in model.lower()) and not ( model.startswith("zhipu/") or model.startswith("zai/") or - model.startswith("openrouter/") + model.startswith("openrouter/") or + model.startswith("hosted_vllm/") ): model = f"zai/{model}" From d7b72c8f83b105674852728bea9fb534166579c0 Mon Sep 17 00:00:00 2001 From: cwu Date: Fri, 6 Feb 2026 12:24:11 -0500 Subject: [PATCH 02/33] Drop unsupported parameters for providers. --- nanobot/providers/litellm_provider.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nanobot/providers/litellm_provider.py b/nanobot/providers/litellm_provider.py index 2125b15..b227393 100644 --- a/nanobot/providers/litellm_provider.py +++ b/nanobot/providers/litellm_provider.py @@ -64,6 +64,8 @@ class LiteLLMProvider(LLMProvider): # Disable LiteLLM logging noise litellm.suppress_debug_info = True + # Drop unsupported parameters for providers (e.g., gpt-5 rejects some params) + litellm.drop_params = True async def chat( self, From 394ebccb461d108d633dcc9737ea72e24a5c2bcb Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sat, 7 Feb 2026 07:24:19 +0000 Subject: [PATCH 03/33] docs: update line count --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bde285d..bf19298 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ⚡️ Delivers core agent functionality in just **~4,000** lines of code — **99% smaller** than Clawdbot's 430k+ lines. -📏 Real-time line count: **3,428 lines** (run `bash core_agent_lines.sh` to verify anytime) +📏 Real-time line count: **3,431 lines** (run `bash core_agent_lines.sh` to verify anytime) ## 📢 News From 572eab8237abb0e8a81597e75dddc1ff2b208dff Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sat, 7 Feb 2026 08:10:05 +0000 Subject: [PATCH 04/33] feat: add AiHubMix provider support and refactor provider matching --- README.md | 3 +- nanobot/agent/loop.py | 15 +++-- nanobot/cli/commands.py | 56 +++++++------------ nanobot/config/schema.py | 80 +++++++++++---------------- nanobot/providers/litellm_provider.py | 67 +++++++++++----------- 5 files changed, 98 insertions(+), 123 deletions(-) diff --git a/README.md b/README.md index bf19298..4f170a9 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ⚡️ Delivers core agent functionality in just **~4,000** lines of code — **99% smaller** than Clawdbot's 430k+ lines. -📏 Real-time line count: **3,431 lines** (run `bash core_agent_lines.sh` to verify anytime) +📏 Real-time line count: **3,422 lines** (run `bash core_agent_lines.sh` to verify anytime) ## 📢 News @@ -352,6 +352,7 @@ Config file: `~/.nanobot/config.json` | `deepseek` | LLM (DeepSeek direct) | [platform.deepseek.com](https://platform.deepseek.com) | | `groq` | LLM + **Voice transcription** (Whisper) | [console.groq.com](https://console.groq.com) | | `gemini` | LLM (Gemini direct) | [aistudio.google.com](https://aistudio.google.com) | +| `aihubmix` | LLM (API gateway, access to all models) | [aihubmix.com](https://aihubmix.com) | | `dashscope` | LLM (Qwen) | [dashscope.console.aliyun.com](https://dashscope.console.aliyun.com) | diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.py index e4193ec..b13113f 100644 --- a/nanobot/agent/loop.py +++ b/nanobot/agent/loop.py @@ -155,7 +155,8 @@ class AgentLoop: if msg.channel == "system": return await self._process_system_message(msg) - logger.info(f"Processing message from {msg.channel}:{msg.sender_id}") + preview = msg.content[:80] + "..." if len(msg.content) > 80 else msg.content + logger.info(f"Processing message from {msg.channel}:{msg.sender_id}: {preview}") # Get or create session session = self.sessions.get_or_create(msg.session_key) @@ -216,8 +217,8 @@ class AgentLoop: # Execute tools for tool_call in response.tool_calls: - args_str = json.dumps(tool_call.arguments) - logger.debug(f"Executing tool: {tool_call.name} with arguments: {args_str}") + args_str = json.dumps(tool_call.arguments, ensure_ascii=False) + logger.info(f"Tool call: {tool_call.name}({args_str[:200]})") result = await self.tools.execute(tool_call.name, tool_call.arguments) messages = self.context.add_tool_result( messages, tool_call.id, tool_call.name, result @@ -230,6 +231,10 @@ class AgentLoop: if final_content is None: final_content = "I've completed processing but have no response to give." + # Log response preview + preview = final_content[:120] + "..." if len(final_content) > 120 else final_content + logger.info(f"Response to {msg.channel}:{msg.sender_id}: {preview}") + # Save to session session.add_message("user", msg.content) session.add_message("assistant", final_content) @@ -315,8 +320,8 @@ class AgentLoop: ) for tool_call in response.tool_calls: - args_str = json.dumps(tool_call.arguments) - logger.debug(f"Executing tool: {tool_call.name} with arguments: {args_str}") + args_str = json.dumps(tool_call.arguments, ensure_ascii=False) + logger.info(f"Tool call: {tool_call.name}({args_str[:200]})") result = await self.tools.execute(tool_call.name, tool_call.arguments) messages = self.context.add_tool_result( messages, tool_call.id, tool_call.name, result diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 2ae6e05..19e62e9 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -147,6 +147,23 @@ This file stores important information that should persist across sessions. console.print(" [dim]Created memory/MEMORY.md[/dim]") +def _make_provider(config): + """Create LiteLLMProvider from config. Exits if no API key found.""" + from nanobot.providers.litellm_provider import LiteLLMProvider + p = config.get_provider() + model = config.agents.defaults.model + if not (p and p.api_key) and not model.startswith("bedrock/"): + console.print("[red]Error: No API key configured.[/red]") + console.print("Set one in ~/.nanobot/config.json under providers section") + raise typer.Exit(1) + return LiteLLMProvider( + api_key=p.api_key if p else None, + api_base=config.get_api_base(), + default_model=model, + extra_headers=p.extra_headers if p else None, + ) + + # ============================================================================ # Gateway / Server # ============================================================================ @@ -160,7 +177,6 @@ def gateway( """Start the nanobot gateway.""" from nanobot.config.loader import load_config, get_data_dir from nanobot.bus.queue import MessageBus - from nanobot.providers.litellm_provider import LiteLLMProvider from nanobot.agent.loop import AgentLoop from nanobot.channels.manager import ChannelManager from nanobot.cron.service import CronService @@ -174,26 +190,8 @@ def gateway( console.print(f"{__logo__} Starting nanobot gateway on port {port}...") config = load_config() - - # Create components bus = MessageBus() - - # Create provider (supports OpenRouter, Anthropic, OpenAI, Bedrock) - api_key = config.get_api_key() - api_base = config.get_api_base() - model = config.agents.defaults.model - is_bedrock = model.startswith("bedrock/") - - if not api_key and not is_bedrock: - console.print("[red]Error: No API key configured.[/red]") - console.print("Set one in ~/.nanobot/config.json under providers.openrouter.apiKey") - raise typer.Exit(1) - - provider = LiteLLMProvider( - api_key=api_key, - api_base=api_base, - default_model=config.agents.defaults.model - ) + provider = _make_provider(config) # Create cron service first (callback set after agent creation) cron_store_path = get_data_dir() / "cron" / "jobs.json" @@ -290,26 +288,12 @@ def agent( """Interact with the agent directly.""" from nanobot.config.loader import load_config from nanobot.bus.queue import MessageBus - from nanobot.providers.litellm_provider import LiteLLMProvider from nanobot.agent.loop import AgentLoop config = load_config() - api_key = config.get_api_key() - api_base = config.get_api_base() - model = config.agents.defaults.model - is_bedrock = model.startswith("bedrock/") - - if not api_key and not is_bedrock: - console.print("[red]Error: No API key configured.[/red]") - raise typer.Exit(1) - bus = MessageBus() - provider = LiteLLMProvider( - api_key=api_key, - api_base=api_base, - default_model=config.agents.defaults.model - ) + provider = _make_provider(config) agent_loop = AgentLoop( bus=bus, @@ -657,12 +641,14 @@ def status(): has_gemini = bool(config.providers.gemini.api_key) has_zhipu = bool(config.providers.zhipu.api_key) has_vllm = bool(config.providers.vllm.api_base) + has_aihubmix = bool(config.providers.aihubmix.api_key) console.print(f"OpenRouter API: {'[green]✓[/green]' if has_openrouter else '[dim]not set[/dim]'}") console.print(f"Anthropic API: {'[green]✓[/green]' if has_anthropic else '[dim]not set[/dim]'}") console.print(f"OpenAI API: {'[green]✓[/green]' if has_openai else '[dim]not set[/dim]'}") console.print(f"Gemini API: {'[green]✓[/green]' if has_gemini else '[dim]not set[/dim]'}") console.print(f"Zhipu AI API: {'[green]✓[/green]' if has_zhipu else '[dim]not set[/dim]'}") + console.print(f"AiHubMix API: {'[green]✓[/green]' if has_aihubmix else '[dim]not set[/dim]'}") vllm_status = f"[green]✓ {config.providers.vllm.api_base}[/green]" if has_vllm else "[dim]not set[/dim]" console.print(f"vLLM/Local: {vllm_status}") diff --git a/nanobot/config/schema.py b/nanobot/config/schema.py index 9af6ee2..7724288 100644 --- a/nanobot/config/schema.py +++ b/nanobot/config/schema.py @@ -65,6 +65,7 @@ class ProviderConfig(BaseModel): """LLM provider configuration.""" api_key: str = "" api_base: str | None = None + extra_headers: dict[str, str] | None = None # Custom headers (e.g. APP-Code for AiHubMix) class ProvidersConfig(BaseModel): @@ -79,6 +80,7 @@ class ProvidersConfig(BaseModel): vllm: ProviderConfig = Field(default_factory=ProviderConfig) gemini: ProviderConfig = Field(default_factory=ProviderConfig) moonshot: ProviderConfig = Field(default_factory=ProviderConfig) + aihubmix: ProviderConfig = Field(default_factory=ProviderConfig) # AiHubMix API gateway class GatewayConfig(BaseModel): @@ -123,60 +125,44 @@ class Config(BaseSettings): """Get expanded workspace path.""" return Path(self.agents.defaults.workspace).expanduser() - def _match_provider(self, model: str | None = None) -> ProviderConfig | None: - """Match a provider based on model name.""" + # Default base URLs for API gateways + _GATEWAY_DEFAULTS = {"openrouter": "https://openrouter.ai/api/v1", "aihubmix": "https://aihubmix.com/v1"} + + def get_provider(self, model: str | None = None) -> ProviderConfig | None: + """Get matched provider config (api_key, api_base, extra_headers). Falls back to first available.""" model = (model or self.agents.defaults.model).lower() - # Map of keywords to provider configs - providers = { - "openrouter": self.providers.openrouter, - "deepseek": self.providers.deepseek, - "anthropic": self.providers.anthropic, - "claude": self.providers.anthropic, - "openai": self.providers.openai, - "gpt": self.providers.openai, - "gemini": self.providers.gemini, - "zhipu": self.providers.zhipu, - "glm": self.providers.zhipu, - "zai": self.providers.zhipu, - "dashscope": self.providers.dashscope, - "qwen": self.providers.dashscope, - "groq": self.providers.groq, - "moonshot": self.providers.moonshot, - "kimi": self.providers.moonshot, - "vllm": self.providers.vllm, + p = self.providers + # Keyword → provider mapping (order matters: gateways first) + keyword_map = { + "aihubmix": p.aihubmix, "openrouter": p.openrouter, + "deepseek": p.deepseek, "anthropic": p.anthropic, "claude": p.anthropic, + "openai": p.openai, "gpt": p.openai, "gemini": p.gemini, + "zhipu": p.zhipu, "glm": p.zhipu, "zai": p.zhipu, + "dashscope": p.dashscope, "qwen": p.dashscope, + "groq": p.groq, "moonshot": p.moonshot, "kimi": p.moonshot, "vllm": p.vllm, } - for keyword, provider in providers.items(): - if keyword in model and provider.api_key: + for kw, provider in keyword_map.items(): + if kw in model and provider.api_key: return provider - return None + # Fallback: gateways first (can serve any model), then specific providers + all_providers = [p.openrouter, p.aihubmix, p.anthropic, p.openai, p.deepseek, + p.gemini, p.zhipu, p.dashscope, p.moonshot, p.vllm, p.groq] + return next((pr for pr in all_providers if pr.api_key), None) def get_api_key(self, model: str | None = None) -> str | None: - """Get API key for the given model (or default model). Falls back to first available key.""" - # Try matching by model name first - matched = self._match_provider(model) - if matched: - return matched.api_key - # Fallback: return first available key - for provider in [ - self.providers.openrouter, self.providers.deepseek, - self.providers.anthropic, self.providers.openai, - self.providers.gemini, self.providers.zhipu, - self.providers.dashscope, self.providers.moonshot, - self.providers.vllm, self.providers.groq, - ]: - if provider.api_key: - return provider.api_key - return None + """Get API key for the given model. Falls back to first available key.""" + p = self.get_provider(model) + return p.api_key if p else None def get_api_base(self, model: str | None = None) -> str | None: - """Get API base URL based on model name.""" - model = (model or self.agents.defaults.model).lower() - if "openrouter" in model: - return self.providers.openrouter.api_base or "https://openrouter.ai/api/v1" - if any(k in model for k in ("zhipu", "glm", "zai")): - return self.providers.zhipu.api_base - if "vllm" in model: - return self.providers.vllm.api_base + """Get API base URL for the given model. Applies default URLs for known gateways.""" + p = self.get_provider(model) + if p and p.api_base: + return p.api_base + # Default URLs for known gateways (openrouter, aihubmix) + for name, url in self._GATEWAY_DEFAULTS.items(): + if p == getattr(self.providers, name): + return url return None class Config: diff --git a/nanobot/providers/litellm_provider.py b/nanobot/providers/litellm_provider.py index 7a2d373..7a52e7c 100644 --- a/nanobot/providers/litellm_provider.py +++ b/nanobot/providers/litellm_provider.py @@ -21,10 +21,12 @@ class LiteLLMProvider(LLMProvider): self, api_key: str | None = None, api_base: str | None = None, - default_model: str = "anthropic/claude-opus-4-5" + default_model: str = "anthropic/claude-opus-4-5", + extra_headers: dict[str, str] | None = None, ): super().__init__(api_key, api_base) self.default_model = default_model + self.extra_headers = extra_headers or {} # Detect OpenRouter by api_key prefix or explicit api_base self.is_openrouter = ( @@ -32,14 +34,20 @@ class LiteLLMProvider(LLMProvider): (api_base and "openrouter" in api_base) ) + # Detect AiHubMix by api_base + self.is_aihubmix = bool(api_base and "aihubmix" in api_base) + # Track if using custom endpoint (vLLM, etc.) - self.is_vllm = bool(api_base) and not self.is_openrouter + self.is_vllm = bool(api_base) and not self.is_openrouter and not self.is_aihubmix # Configure LiteLLM based on provider if api_key: if self.is_openrouter: # OpenRouter mode - set key os.environ["OPENROUTER_API_KEY"] = api_key + elif self.is_aihubmix: + # AiHubMix gateway - OpenAI-compatible + os.environ["OPENAI_API_KEY"] = api_key elif self.is_vllm: # vLLM/custom endpoint - uses OpenAI-compatible API os.environ["HOSTED_VLLM_API_KEY"] = api_key @@ -91,41 +99,26 @@ class LiteLLMProvider(LLMProvider): """ model = model or self.default_model - # For OpenRouter, prefix model name if not already prefixed + # Auto-prefix model names for known providers + # (keywords, target_prefix, skip_if_starts_with) + _prefix_rules = [ + (("glm", "zhipu"), "zai", ("zhipu/", "zai/", "openrouter/", "hosted_vllm/")), + (("qwen", "dashscope"), "dashscope", ("dashscope/", "openrouter/")), + (("moonshot", "kimi"), "moonshot", ("moonshot/", "openrouter/")), + (("gemini",), "gemini", ("gemini/",)), + ] + model_lower = model.lower() + for keywords, prefix, skip in _prefix_rules: + if any(kw in model_lower for kw in keywords) and not any(model.startswith(s) for s in skip): + model = f"{prefix}/{model}" + break + + # Gateway/endpoint-specific prefixes (detected by api_base/api_key, not model name) if self.is_openrouter and not model.startswith("openrouter/"): model = f"openrouter/{model}" - - # For Zhipu/Z.ai, ensure prefix is present - # Handle cases like "glm-4.7-flash" -> "zai/glm-4.7-flash" - if ("glm" in model.lower() or "zhipu" in model.lower()) and not ( - model.startswith("zhipu/") or - model.startswith("zai/") or - model.startswith("openrouter/") or - model.startswith("hosted_vllm/") - ): - model = f"zai/{model}" - - # For DashScope/Qwen, ensure dashscope/ prefix - if ("qwen" in model.lower() or "dashscope" in model.lower()) and not ( - model.startswith("dashscope/") or - model.startswith("openrouter/") - ): - model = f"dashscope/{model}" - - # For Moonshot/Kimi, ensure moonshot/ prefix (before vLLM check) - if ("moonshot" in model.lower() or "kimi" in model.lower()) and not ( - model.startswith("moonshot/") or model.startswith("openrouter/") - ): - model = f"moonshot/{model}" - - # For Gemini, ensure gemini/ prefix if not already present - if "gemini" in model.lower() and not model.startswith("gemini/"): - model = f"gemini/{model}" - - - # For vLLM, use hosted_vllm/ prefix per LiteLLM docs - # Convert openai/ prefix to hosted_vllm/ if user specified it - if self.is_vllm: + elif self.is_aihubmix: + model = f"openai/{model.split('/')[-1]}" + elif self.is_vllm: model = f"hosted_vllm/{model}" # kimi-k2.5 only supports temperature=1.0 @@ -143,6 +136,10 @@ class LiteLLMProvider(LLMProvider): if self.api_base: kwargs["api_base"] = self.api_base + # Pass extra headers (e.g. APP-Code for AiHubMix) + if self.extra_headers: + kwargs["extra_headers"] = self.extra_headers + if tools: kwargs["tools"] = tools kwargs["tool_choice"] = "auto" From 2ca15f2a9d0d9e5fb858bd68def980697f9f3137 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sat, 7 Feb 2026 09:46:53 +0000 Subject: [PATCH 05/33] feat: enhance Feishu markdown rendering --- nanobot/channels/feishu.py | 50 +++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/nanobot/channels/feishu.py b/nanobot/channels/feishu.py index 01b808e..1c176a2 100644 --- a/nanobot/channels/feishu.py +++ b/nanobot/channels/feishu.py @@ -2,6 +2,7 @@ import asyncio import json +import re import threading from collections import OrderedDict from typing import Any @@ -156,6 +157,44 @@ class FeishuChannel(BaseChannel): loop = asyncio.get_running_loop() await loop.run_in_executor(None, self._add_reaction_sync, message_id, emoji_type) + # Regex to match markdown tables (header + separator + data rows) + _TABLE_RE = re.compile( + r"((?:^[ \t]*\|.+\|[ \t]*\n)(?:^[ \t]*\|[-:\s|]+\|[ \t]*\n)(?:^[ \t]*\|.+\|[ \t]*\n?)+)", + re.MULTILINE, + ) + + @staticmethod + def _parse_md_table(table_text: str) -> dict | None: + """Parse a markdown table into a Feishu table element.""" + lines = [l.strip() for l in table_text.strip().split("\n") if l.strip()] + if len(lines) < 3: + return None + split = lambda l: [c.strip() for c in l.strip("|").split("|")] + headers = split(lines[0]) + rows = [split(l) for l in lines[2:]] + columns = [{"tag": "column", "name": f"c{i}", "display_name": h, "width": "auto"} + for i, h in enumerate(headers)] + return { + "tag": "table", + "page_size": len(rows) + 1, + "columns": columns, + "rows": [{f"c{i}": r[i] if i < len(r) else "" for i in range(len(headers))} for r in rows], + } + + def _build_card_elements(self, content: str) -> list[dict]: + """Split content into markdown + table elements for Feishu card.""" + elements, last_end = [], 0 + for m in self._TABLE_RE.finditer(content): + before = content[last_end:m.start()].strip() + if before: + elements.append({"tag": "markdown", "content": before}) + elements.append(self._parse_md_table(m.group(1)) or {"tag": "markdown", "content": m.group(1)}) + last_end = m.end() + remaining = content[last_end:].strip() + if remaining: + elements.append({"tag": "markdown", "content": remaining}) + return elements or [{"tag": "markdown", "content": content}] + async def send(self, msg: OutboundMessage) -> None: """Send a message through Feishu.""" if not self._client: @@ -170,15 +209,20 @@ class FeishuChannel(BaseChannel): else: receive_id_type = "open_id" - # Build text message content - content = json.dumps({"text": msg.content}) + # Build card with markdown + table support + elements = self._build_card_elements(msg.content) + card = { + "config": {"wide_screen_mode": True}, + "elements": elements, + } + content = json.dumps(card, ensure_ascii=False) request = CreateMessageRequest.builder() \ .receive_id_type(receive_id_type) \ .request_body( CreateMessageRequestBody.builder() .receive_id(msg.chat_id) - .msg_type("text") + .msg_type("interactive") .content(content) .build() ).build() From 625fc6028237c690b9b2896fd680de98d13136da Mon Sep 17 00:00:00 2001 From: chaohuang-ai Date: Sat, 7 Feb 2026 17:52:29 +0800 Subject: [PATCH 06/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f170a9..8a15892 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ ## 📢 News -- **2026-02-06** ✨ Added Moonshot/Kimi provider, Discord channel, and enhanced security hardening! +- **2026-02-06** ✨ Added Moonshot/Kimi provider, Discord integration, and enhanced security hardening! - **2026-02-05** ✨ Added Feishu channel, DeepSeek provider, and enhanced scheduled tasks support! - **2026-02-04** 🚀 Released v0.1.3.post4 with multi-provider & Docker support! Check [release notes](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post4) for details. - **2026-02-03** ⚡ Integrated vLLM for local LLM support and improved natural language task scheduling! From b179a028c36876efa11f9f2d4dd22d55953ddf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20H=C3=B6hne?= Date: Sat, 7 Feb 2026 11:44:20 +0000 Subject: [PATCH 07/33] Fixes Access Denied because only the LID was used. --- bridge/src/whatsapp.ts | 2 ++ nanobot/channels/whatsapp.py | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bridge/src/whatsapp.ts b/bridge/src/whatsapp.ts index a3a82fc..069d72b 100644 --- a/bridge/src/whatsapp.ts +++ b/bridge/src/whatsapp.ts @@ -20,6 +20,7 @@ const VERSION = '0.1.0'; export interface InboundMessage { id: string; sender: string; + pn: string; content: string; timestamp: number; isGroup: boolean; @@ -123,6 +124,7 @@ export class WhatsAppClient { this.options.onMessage({ id: msg.key.id || '', sender: msg.key.remoteJid || '', + pn: msg.key.remoteJidAlt || '', content, timestamp: msg.messageTimestamp as number, isGroup, diff --git a/nanobot/channels/whatsapp.py b/nanobot/channels/whatsapp.py index c14a6c3..1974017 100644 --- a/nanobot/channels/whatsapp.py +++ b/nanobot/channels/whatsapp.py @@ -100,12 +100,16 @@ class WhatsAppChannel(BaseChannel): if msg_type == "message": # Incoming message from WhatsApp + # Deprecated by whatsapp: old phone number style typically: @s.whatspp.net + pn = data.get("pn", "") + # New LID sytle typically: sender = data.get("sender", "") content = data.get("content", "") - # sender is typically: @s.whatsapp.net - # Extract just the phone number as chat_id - chat_id = sender.split("@")[0] if "@" in sender else sender + # Extract just the phone number or lid as chat_id + user_id = pn if pn else sender + sender_id = user_id.split("@")[0] if "@" in sender else sender + logger.info(f"Sender {sender}") # Handle voice transcription if it's a voice message if content == "[Voice Message]": @@ -113,8 +117,8 @@ class WhatsAppChannel(BaseChannel): content = "[Voice Message: Transcription not available for WhatsApp yet]" await self._handle_message( - sender_id=chat_id, - chat_id=sender, # Use full JID for replies + sender_id=sender_id, + chat_id=sender, # Use full LID for replies content=content, metadata={ "message_id": data.get("id"), From 3166c15cffa4217e24be4c55fa25f9436370801c Mon Sep 17 00:00:00 2001 From: alan Date: Sat, 7 Feb 2026 20:37:41 +0800 Subject: [PATCH 08/33] feat: add telegram proxy support and add error handling for channel startup --- nanobot/channels/manager.py | 13 ++++++++++--- nanobot/channels/telegram.py | 2 ++ pyproject.toml | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/nanobot/channels/manager.py b/nanobot/channels/manager.py index 64ced48..846ea70 100644 --- a/nanobot/channels/manager.py +++ b/nanobot/channels/manager.py @@ -78,8 +78,15 @@ class ChannelManager: except ImportError as e: logger.warning(f"Feishu channel not available: {e}") + async def _start_channel(self, name: str, channel: BaseChannel) -> None: + """Start a channel and log any exceptions.""" + try: + await channel.start() + except Exception as e: + logger.error(f"Failed to start channel {name}: {e}") + async def start_all(self) -> None: - """Start WhatsApp channel and the outbound dispatcher.""" + """Start all channels and the outbound dispatcher.""" if not self.channels: logger.warning("No channels enabled") return @@ -87,11 +94,11 @@ class ChannelManager: # Start outbound dispatcher self._dispatch_task = asyncio.create_task(self._dispatch_outbound()) - # Start WhatsApp channel + # Start channels tasks = [] for name, channel in self.channels.items(): logger.info(f"Starting {name} channel...") - tasks.append(asyncio.create_task(channel.start())) + tasks.append(asyncio.create_task(self._start_channel(name, channel))) # Wait for all to complete (they should run forever) await asyncio.gather(*tasks, return_exceptions=True) diff --git a/nanobot/channels/telegram.py b/nanobot/channels/telegram.py index 23e1de0..b62c63b 100644 --- a/nanobot/channels/telegram.py +++ b/nanobot/channels/telegram.py @@ -104,6 +104,8 @@ class TelegramChannel(BaseChannel): self._app = ( Application.builder() .token(self.config.token) + .proxy(self.config.proxy) + .get_updates_proxy(self.config.proxy) .build() ) diff --git a/pyproject.toml b/pyproject.toml index 2a952a1..f60f7a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,13 +23,14 @@ dependencies = [ "pydantic-settings>=2.0.0", "websockets>=12.0", "websocket-client>=1.6.0", - "httpx>=0.25.0", + "httpx[socks]>=0.25.0", "loguru>=0.7.0", "readability-lxml>=0.8.0", "rich>=13.0.0", "croniter>=2.0.0", - "python-telegram-bot>=21.0", + "python-telegram-bot[socks]>=21.0", "lark-oapi>=1.0.0", + "socksio>=1.0.0", ] [project.optional-dependencies] From cf1663af13310f993ee835d857bf78cbbc3b7a05 Mon Sep 17 00:00:00 2001 From: alan Date: Sat, 7 Feb 2026 22:18:43 +0800 Subject: [PATCH 09/33] feat: conditionally set telegram proxy --- nanobot/channels/telegram.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nanobot/channels/telegram.py b/nanobot/channels/telegram.py index b62c63b..f2b6d1f 100644 --- a/nanobot/channels/telegram.py +++ b/nanobot/channels/telegram.py @@ -101,13 +101,10 @@ class TelegramChannel(BaseChannel): self._running = True # Build the application - self._app = ( - Application.builder() - .token(self.config.token) - .proxy(self.config.proxy) - .get_updates_proxy(self.config.proxy) - .build() - ) + builder = Application.builder().token(self.config.token) + if self.config.proxy: + builder = builder.proxy(self.config.proxy).get_updates_proxy(self.config.proxy) + self._app = builder.build() # Add message handler for text, photos, voice, documents self._app.add_handler( From 544eefbc8afc27bc5c05d1cdae6f2ccd9d81c220 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sat, 7 Feb 2026 17:40:46 +0000 Subject: [PATCH 10/33] fix: correct variable references in WhatsApp LID handling --- nanobot/channels/whatsapp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nanobot/channels/whatsapp.py b/nanobot/channels/whatsapp.py index 1974017..6e00e9d 100644 --- a/nanobot/channels/whatsapp.py +++ b/nanobot/channels/whatsapp.py @@ -108,12 +108,12 @@ class WhatsAppChannel(BaseChannel): # Extract just the phone number or lid as chat_id user_id = pn if pn else sender - sender_id = user_id.split("@")[0] if "@" in sender else sender + sender_id = user_id.split("@")[0] if "@" in user_id else user_id logger.info(f"Sender {sender}") # Handle voice transcription if it's a voice message if content == "[Voice Message]": - logger.info(f"Voice message received from {chat_id}, but direct download from bridge is not yet supported.") + logger.info(f"Voice message received from {sender_id}, but direct download from bridge is not yet supported.") content = "[Voice Message: Transcription not available for WhatsApp yet]" await self._handle_message( From 9fe2c09fd3bb0041f689ff195e0812965354807b Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sat, 7 Feb 2026 18:01:14 +0000 Subject: [PATCH 11/33] bump version to 0.1.3.post5 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f60f7a7..4093474 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "nanobot-ai" -version = "0.1.3.post4" +version = "0.1.3.post5" description = "A lightweight personal AI assistant framework" requires-python = ">=3.11" license = {text = "MIT"} From 438ec66fd8134148308db7bcffd45b2e830157cf Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sat, 7 Feb 2026 18:15:18 +0000 Subject: [PATCH 12/33] docs: v0.1.3.post5 release news --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a15892..a1ea905 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,10 @@ ## 📢 News +- **2026-02-07** 🚀 Released v0.1.3.post5 with Qwen support & several improvements! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post5) for details. - **2026-02-06** ✨ Added Moonshot/Kimi provider, Discord integration, and enhanced security hardening! - **2026-02-05** ✨ Added Feishu channel, DeepSeek provider, and enhanced scheduled tasks support! -- **2026-02-04** 🚀 Released v0.1.3.post4 with multi-provider & Docker support! Check [release notes](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post4) for details. +- **2026-02-04** 🚀 Released v0.1.3.post4 with multi-provider & Docker support! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post4) for details. - **2026-02-03** ⚡ Integrated vLLM for local LLM support and improved natural language task scheduling! - **2026-02-02** 🎉 nanobot officially launched! Welcome to try 🐈 nanobot! From 8b1ef77970a4b8634dadfc1560a20adba3934c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B6=94=E7=86=99?= Date: Sun, 8 Feb 2026 10:38:32 +0800 Subject: [PATCH 13/33] fix(cli): keep prompt stable and flush stale arrow-key input --- nanobot/cli/commands.py | 40 ++++++++++++++++++++++++++++++++- tests/test_cli_input_minimal.py | 37 ++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 tests/test_cli_input_minimal.py diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 19e62e9..e70fd32 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -1,7 +1,10 @@ """CLI commands for nanobot.""" import asyncio +import os from pathlib import Path +import select +import sys import typer from rich.console import Console @@ -18,6 +21,40 @@ app = typer.Typer( console = Console() +def _flush_pending_tty_input() -> None: + """Drop unread keypresses typed while the model was generating output.""" + try: + fd = sys.stdin.fileno() + if not os.isatty(fd): + return + except Exception: + return + + try: + import termios + + termios.tcflush(fd, termios.TCIFLUSH) + return + except Exception: + pass + + try: + while True: + ready, _, _ = select.select([fd], [], [], 0) + if not ready: + break + if not os.read(fd, 4096): + break + except Exception: + return + + +def _read_interactive_input() -> str: + """Read user input with a stable prompt for terminal line editing.""" + console.print("[bold blue]You:[/bold blue] ", end="") + return input() + + def version_callback(value: bool): if value: console.print(f"{__logo__} nanobot v{__version__}") @@ -318,7 +355,8 @@ def agent( async def run_interactive(): while True: try: - user_input = console.input("[bold blue]You:[/bold blue] ") + _flush_pending_tty_input() + user_input = _read_interactive_input() if not user_input.strip(): continue diff --git a/tests/test_cli_input_minimal.py b/tests/test_cli_input_minimal.py new file mode 100644 index 0000000..49d9d4f --- /dev/null +++ b/tests/test_cli_input_minimal.py @@ -0,0 +1,37 @@ +import builtins + +import nanobot.cli.commands as commands + + +def test_read_interactive_input_uses_plain_input(monkeypatch) -> None: + captured: dict[str, object] = {} + + def fake_print(*args, **kwargs): + captured["printed"] = args + captured["print_kwargs"] = kwargs + + def fake_input(prompt: str = "") -> str: + captured["prompt"] = prompt + return "hello" + + monkeypatch.setattr(commands.console, "print", fake_print) + monkeypatch.setattr(builtins, "input", fake_input) + + value = commands._read_interactive_input() + + assert value == "hello" + assert captured["prompt"] == "" + assert captured["print_kwargs"] == {"end": ""} + assert captured["printed"] == ("[bold blue]You:[/bold blue] ",) + + +def test_flush_pending_tty_input_skips_non_tty(monkeypatch) -> None: + class FakeStdin: + def fileno(self) -> int: + return 0 + + monkeypatch.setattr(commands.sys, "stdin", FakeStdin()) + monkeypatch.setattr(commands.os, "isatty", lambda _fd: False) + + commands._flush_pending_tty_input() + From 342ba2b87976cb9c282e8d6760fbfa8133509703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B6=94=E7=86=99?= Date: Sun, 8 Feb 2026 11:10:03 +0800 Subject: [PATCH 14/33] fix(cli): stabilize wrapped CJK arrow navigation in interactive input --- nanobot/cli/commands.py | 255 +++++++++++++++++++++++++++++++- pyproject.toml | 1 + tests/test_cli_input_minimal.py | 41 +++-- 3 files changed, 282 insertions(+), 15 deletions(-) diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index e70fd32..bd7a408 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -1,10 +1,12 @@ """CLI commands for nanobot.""" import asyncio +import atexit import os from pathlib import Path import select import sys +from typing import Any import typer from rich.console import Console @@ -19,6 +21,12 @@ app = typer.Typer( ) console = Console() +_READLINE: Any | None = None +_HISTORY_FILE: Path | None = None +_HISTORY_HOOK_REGISTERED = False +_USING_LIBEDIT = False +_PROMPT_SESSION: Any | None = None +_PROMPT_SESSION_LABEL: Any = None def _flush_pending_tty_input() -> None: @@ -49,10 +57,248 @@ def _flush_pending_tty_input() -> None: return +def _save_history() -> None: + if _READLINE is None or _HISTORY_FILE is None: + return + try: + _READLINE.write_history_file(str(_HISTORY_FILE)) + except Exception: + return + + +def _enable_line_editing() -> None: + """Best-effort enable readline/libedit line editing for arrow keys/history.""" + global _READLINE, _HISTORY_FILE, _HISTORY_HOOK_REGISTERED, _USING_LIBEDIT + global _PROMPT_SESSION, _PROMPT_SESSION_LABEL + + history_file = Path.home() / ".nanobot" / "history" / "cli_history" + history_file.parent.mkdir(parents=True, exist_ok=True) + _HISTORY_FILE = history_file + + # Preferred path: prompt_toolkit handles wrapped wide-char rendering better. + try: + from prompt_toolkit import PromptSession + from prompt_toolkit.formatted_text import ANSI + from prompt_toolkit.history import FileHistory + from prompt_toolkit.key_binding import KeyBindings + + key_bindings = KeyBindings() + + @key_bindings.add("enter") + def _accept_input(event) -> None: + _clear_visual_nav_state(event.current_buffer) + event.current_buffer.validate_and_handle() + + @key_bindings.add("up") + def _handle_up(event) -> None: + count = event.arg if event.arg and event.arg > 0 else 1 + moved = _move_buffer_cursor_visual_from_render( + buffer=event.current_buffer, + event=event, + delta=-1, + count=count, + ) + if not moved: + event.current_buffer.history_backward(count=count) + _clear_visual_nav_state(event.current_buffer) + + @key_bindings.add("down") + def _handle_down(event) -> None: + count = event.arg if event.arg and event.arg > 0 else 1 + moved = _move_buffer_cursor_visual_from_render( + buffer=event.current_buffer, + event=event, + delta=1, + count=count, + ) + if not moved: + event.current_buffer.history_forward(count=count) + _clear_visual_nav_state(event.current_buffer) + + _PROMPT_SESSION = PromptSession( + history=FileHistory(str(history_file)), + multiline=True, + wrap_lines=True, + complete_while_typing=False, + key_bindings=key_bindings, + ) + _PROMPT_SESSION.default_buffer.on_text_changed += ( + lambda _event: _clear_visual_nav_state(_PROMPT_SESSION.default_buffer) + ) + _PROMPT_SESSION_LABEL = ANSI("\x1b[1;34mYou:\x1b[0m ") + _READLINE = None + _USING_LIBEDIT = False + return + except Exception: + _PROMPT_SESSION = None + _PROMPT_SESSION_LABEL = None + + try: + import readline + except Exception: + return + + _READLINE = readline + _USING_LIBEDIT = "libedit" in (readline.__doc__ or "").lower() + + try: + if _USING_LIBEDIT: + readline.parse_and_bind("bind ^I rl_complete") + else: + readline.parse_and_bind("tab: complete") + readline.parse_and_bind("set editing-mode emacs") + except Exception: + pass + + try: + readline.read_history_file(str(history_file)) + except Exception: + pass + + if not _HISTORY_HOOK_REGISTERED: + atexit.register(_save_history) + _HISTORY_HOOK_REGISTERED = True + + +def _prompt_text() -> str: + """Build a readline-friendly colored prompt.""" + if _READLINE is None: + return "You: " + # libedit on macOS does not honor GNU readline non-printing markers. + if _USING_LIBEDIT: + return "\033[1;34mYou:\033[0m " + return "\001\033[1;34m\002You:\001\033[0m\002 " + + def _read_interactive_input() -> str: - """Read user input with a stable prompt for terminal line editing.""" - console.print("[bold blue]You:[/bold blue] ", end="") - return input() + """Read user input with stable prompt rendering (sync fallback).""" + return input(_prompt_text()) + + +async def _read_interactive_input_async() -> str: + """Read user input safely inside the interactive asyncio loop.""" + if _PROMPT_SESSION is not None: + try: + return await _PROMPT_SESSION.prompt_async(_PROMPT_SESSION_LABEL) + except EOFError as exc: + raise KeyboardInterrupt from exc + try: + return await asyncio.to_thread(_read_interactive_input) + except EOFError as exc: + raise KeyboardInterrupt from exc + + +def _choose_visual_rowcol( + rowcol_to_yx: dict[tuple[int, int], tuple[int, int]], + current_rowcol: tuple[int, int], + delta: int, + preferred_x: int | None = None, +) -> tuple[tuple[int, int] | None, int | None]: + """Choose next logical row/col by rendered screen coordinates.""" + if delta not in (-1, 1): + return None, preferred_x + + current_yx = rowcol_to_yx.get(current_rowcol) + if current_yx is None: + same_row = [ + (rowcol, yx) + for rowcol, yx in rowcol_to_yx.items() + if rowcol[0] == current_rowcol[0] + ] + if not same_row: + return None, preferred_x + _, current_yx = min(same_row, key=lambda item: abs(item[0][1] - current_rowcol[1])) + + target_x = current_yx[1] if preferred_x is None else preferred_x + target_y = current_yx[0] + delta + candidates = [(rowcol, yx) for rowcol, yx in rowcol_to_yx.items() if yx[0] == target_y] + if not candidates: + return None, preferred_x + + best_rowcol, _ = min( + candidates, + key=lambda item: (abs(item[1][1] - target_x), item[1][1] < target_x, item[1][1]), + ) + return best_rowcol, target_x + + +def _clear_visual_nav_state(buffer: Any) -> None: + """Reset cached vertical-navigation anchor state.""" + setattr(buffer, "_nanobot_visual_pref_x", None) + setattr(buffer, "_nanobot_visual_last_dir", None) + setattr(buffer, "_nanobot_visual_last_cursor", None) + setattr(buffer, "_nanobot_visual_last_text", None) + + +def _can_reuse_visual_anchor(buffer: Any, delta: int) -> bool: + """Reuse anchor only for uninterrupted vertical navigation.""" + return ( + getattr(buffer, "_nanobot_visual_last_dir", None) == delta + and getattr(buffer, "_nanobot_visual_last_cursor", None) == buffer.cursor_position + and getattr(buffer, "_nanobot_visual_last_text", None) == buffer.text + ) + + +def _remember_visual_anchor(buffer: Any, delta: int) -> None: + """Remember current state as anchor baseline for repeated up/down.""" + setattr(buffer, "_nanobot_visual_last_dir", delta) + setattr(buffer, "_nanobot_visual_last_cursor", buffer.cursor_position) + setattr(buffer, "_nanobot_visual_last_text", buffer.text) + + +def _move_buffer_cursor_visual_from_render( + buffer: Any, + event: Any, + delta: int, + count: int, +) -> bool: + """Move cursor across rendered screen rows (soft-wrap/CJK aware).""" + try: + window = event.app.layout.current_window + render_info = getattr(window, "render_info", None) + rowcol_to_yx = getattr(render_info, "_rowcol_to_yx", None) + if not isinstance(rowcol_to_yx, dict) or not rowcol_to_yx: + return False + except Exception: + return False + + moved_any = False + preferred_x = ( + getattr(buffer, "_nanobot_visual_pref_x", None) + if _can_reuse_visual_anchor(buffer, delta) + else None + ) + steps = max(1, count) + + for _ in range(steps): + doc = buffer.document + current_rowcol = (doc.cursor_position_row, doc.cursor_position_col) + next_rowcol, preferred_x = _choose_visual_rowcol( + rowcol_to_yx=rowcol_to_yx, + current_rowcol=current_rowcol, + delta=delta, + preferred_x=preferred_x, + ) + if next_rowcol is None: + break + + try: + new_position = doc.translate_row_col_to_index(*next_rowcol) + except Exception: + break + if new_position == buffer.cursor_position: + break + + buffer.cursor_position = new_position + moved_any = True + + if moved_any: + setattr(buffer, "_nanobot_visual_pref_x", preferred_x) + _remember_visual_anchor(buffer, delta) + else: + _clear_visual_nav_state(buffer) + + return moved_any def version_callback(value: bool): @@ -350,13 +596,14 @@ def agent( asyncio.run(run_once()) else: # Interactive mode + _enable_line_editing() console.print(f"{__logo__} Interactive mode (Ctrl+C to exit)\n") async def run_interactive(): while True: try: _flush_pending_tty_input() - user_input = _read_interactive_input() + user_input = await _read_interactive_input_async() if not user_input.strip(): continue diff --git a/pyproject.toml b/pyproject.toml index 4093474..b1bc3de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ dependencies = [ "python-telegram-bot[socks]>=21.0", "lark-oapi>=1.0.0", "socksio>=1.0.0", + "prompt-toolkit>=3.0.47", ] [project.optional-dependencies] diff --git a/tests/test_cli_input_minimal.py b/tests/test_cli_input_minimal.py index 49d9d4f..4726ea3 100644 --- a/tests/test_cli_input_minimal.py +++ b/tests/test_cli_input_minimal.py @@ -4,25 +4,45 @@ import nanobot.cli.commands as commands def test_read_interactive_input_uses_plain_input(monkeypatch) -> None: - captured: dict[str, object] = {} - - def fake_print(*args, **kwargs): - captured["printed"] = args - captured["print_kwargs"] = kwargs - + captured: dict[str, str] = {} def fake_input(prompt: str = "") -> str: captured["prompt"] = prompt return "hello" - monkeypatch.setattr(commands.console, "print", fake_print) monkeypatch.setattr(builtins, "input", fake_input) + monkeypatch.setattr(commands, "_PROMPT_SESSION", None) + monkeypatch.setattr(commands, "_READLINE", None) value = commands._read_interactive_input() assert value == "hello" - assert captured["prompt"] == "" - assert captured["print_kwargs"] == {"end": ""} - assert captured["printed"] == ("[bold blue]You:[/bold blue] ",) + assert captured["prompt"] == "You: " + + +def test_read_interactive_input_prefers_prompt_session(monkeypatch) -> None: + captured: dict[str, object] = {} + + class FakePromptSession: + async def prompt_async(self, label: object) -> str: + captured["label"] = label + return "hello" + + monkeypatch.setattr(commands, "_PROMPT_SESSION", FakePromptSession()) + monkeypatch.setattr(commands, "_PROMPT_SESSION_LABEL", "LBL") + + value = __import__("asyncio").run(commands._read_interactive_input_async()) + + assert value == "hello" + assert captured["label"] == "LBL" + + +def test_prompt_text_for_readline_modes(monkeypatch) -> None: + monkeypatch.setattr(commands, "_READLINE", object()) + monkeypatch.setattr(commands, "_USING_LIBEDIT", True) + assert commands._prompt_text() == "\033[1;34mYou:\033[0m " + + monkeypatch.setattr(commands, "_USING_LIBEDIT", False) + assert "\001" in commands._prompt_text() def test_flush_pending_tty_input_skips_non_tty(monkeypatch) -> None: @@ -34,4 +54,3 @@ def test_flush_pending_tty_input_skips_non_tty(monkeypatch) -> None: monkeypatch.setattr(commands.os, "isatty", lambda _fd: False) commands._flush_pending_tty_input() - From 240db894b43ddf521c83850be57d8025cbc27562 Mon Sep 17 00:00:00 2001 From: w0x7ce Date: Sun, 8 Feb 2026 11:37:36 +0800 Subject: [PATCH 15/33] feat(channels): add DingTalk channel support and documentation --- README.md | 43 +++++++ nanobot/channels/dingtalk.py | 219 +++++++++++++++++++++++++++++++++++ nanobot/channels/manager.py | 11 ++ nanobot/config/schema.py | 9 ++ pyproject.toml | 1 + 5 files changed, 283 insertions(+) create mode 100644 nanobot/channels/dingtalk.py diff --git a/README.md b/README.md index a1ea905..95a5625 100644 --- a/README.md +++ b/README.md @@ -336,6 +336,49 @@ nanobot gateway +
+DingTalk (钉钉) + +Uses **Stream Mode** — no public IP required. + +```bash +pip install nanobot-ai[dingtalk] +``` + +**1. Create a DingTalk bot** +- Visit [DingTalk Open Platform](https://open-dev.dingtalk.com/) +- Create a new app -> Add **Robot** capability +- **Configuration**: + - Toggle **Stream Mode** ON +- **Permissions**: Add necessary permissions for sending messages +- Get **AppKey** (Client ID) and **AppSecret** (Client Secret) from "Credentials" +- Publish the app + +**2. Configure** + +```json +{ + "channels": { + "dingtalk": { + "enabled": true, + "clientId": "YOUR_APP_KEY", + "clientSecret": "YOUR_APP_SECRET", + "allowFrom": [] + } + } +} +``` + +> `allowFrom`: Leave empty to allow all users, or add `["staffId"]` to restrict access. + +**3. Run** + +```bash +nanobot gateway +``` + +
+ ## ⚙️ Configuration Config file: `~/.nanobot/config.json` diff --git a/nanobot/channels/dingtalk.py b/nanobot/channels/dingtalk.py new file mode 100644 index 0000000..897e5be --- /dev/null +++ b/nanobot/channels/dingtalk.py @@ -0,0 +1,219 @@ +"""DingTalk/DingDing channel implementation using Stream Mode.""" + +import asyncio +import json +import threading +import time +from typing import Any + +from loguru import logger +import httpx + +from nanobot.bus.events import OutboundMessage, InboundMessage +from nanobot.bus.queue import MessageBus +from nanobot.channels.base import BaseChannel +from nanobot.config.schema import DingTalkConfig + +try: + from dingtalk_stream import ( + DingTalkStreamClient, + Credential, + CallbackHandler, + CallbackMessage, + AckMessage + ) + from dingtalk_stream.chatbot import ChatbotMessage + DINGTALK_AVAILABLE = True +except ImportError: + DINGTALK_AVAILABLE = False + + +class NanobotDingTalkHandler(CallbackHandler): + """ + Standard DingTalk Stream SDK Callback Handler. + Parses incoming messages and forwards them to the Nanobot channel. + """ + def __init__(self, channel: "DingTalkChannel"): + super().__init__() + self.channel = channel + + async def process(self, message: CallbackMessage): + """Process incoming stream message.""" + try: + # Parse using SDK's ChatbotMessage for robust handling + chatbot_msg = ChatbotMessage.from_dict(message.data) + + # Extract content based on message type + content = "" + if chatbot_msg.text: + content = chatbot_msg.text.content.strip() + elif chatbot_msg.message_type == "text": + # Fallback manual extraction if object not populated + content = message.data.get("text", {}).get("content", "").strip() + + if not content: + logger.warning(f"Received empty or unsupported message type: {chatbot_msg.message_type}") + return AckMessage.STATUS_OK, "OK" + + sender_id = chatbot_msg.sender_staff_id or chatbot_msg.sender_id + sender_name = chatbot_msg.sender_nick or "Unknown" + + logger.info(f"Received DingTalk message from {sender_name} ({sender_id}): {content}") + + # Forward to Nanobot + # We use asyncio.create_task to avoid blocking the ACK return + asyncio.create_task( + self.channel._on_message(content, sender_id, sender_name) + ) + + return AckMessage.STATUS_OK, "OK" + + except Exception as e: + logger.error(f"Error processing DingTalk message: {e}") + # Return OK to avoid retry loop from DingTalk server if it's a parsing error + return AckMessage.STATUS_OK, "Error" + +class DingTalkChannel(BaseChannel): + """ + DingTalk channel using Stream Mode. + + Uses WebSocket to receive events via `dingtalk-stream` SDK. + Uses direct HTTP API to send messages (since SDK is mainly for receiving). + """ + + name = "dingtalk" + + def __init__(self, config: DingTalkConfig, bus: MessageBus): + super().__init__(config, bus) + self.config: DingTalkConfig = config + self._client: Any = None + self._loop: asyncio.AbstractEventLoop | None = None + + # Access Token management for sending messages + self._access_token: str | None = None + self._token_expiry: float = 0 + + async def start(self) -> None: + """Start the DingTalk bot with Stream Mode.""" + try: + if not DINGTALK_AVAILABLE: + logger.error("DingTalk Stream SDK not installed. Run: pip install dingtalk-stream") + return + + if not self.config.client_id or not self.config.client_secret: + logger.error("DingTalk client_id and client_secret not configured") + return + + self._running = True + self._loop = asyncio.get_running_loop() + + logger.info(f"Initializing DingTalk Stream Client with Client ID: {self.config.client_id}...") + credential = Credential(self.config.client_id, self.config.client_secret) + self._client = DingTalkStreamClient(credential) + + # Register standard handler + handler = NanobotDingTalkHandler(self) + + # Register using the chatbot topic standard for bots + self._client.register_callback_handler( + ChatbotMessage.TOPIC, + handler + ) + + logger.info("DingTalk bot started with Stream Mode") + + # The client.start() method is an async infinite loop that handles the websocket connection + await self._client.start() + + except Exception as e: + logger.exception(f"Failed to start DingTalk channel: {e}") + + async def stop(self) -> None: + """Stop the DingTalk bot.""" + self._running = False + # SDK doesn't expose a clean stop method that cancels loop immediately without private access + pass + + async def _get_access_token(self) -> str | None: + """Get or refresh Access Token.""" + if self._access_token and time.time() < self._token_expiry: + return self._access_token + + url = "https://api.dingtalk.com/v1.0/oauth2/accessToken" + data = { + "appKey": self.config.client_id, + "appSecret": self.config.client_secret + } + + try: + async with httpx.AsyncClient() as client: + resp = await client.post(url, json=data) + resp.raise_for_status() + res_data = resp.json() + self._access_token = res_data.get("accessToken") + # Expire 60s early to be safe + self._token_expiry = time.time() + int(res_data.get("expireIn", 7200)) - 60 + return self._access_token + except Exception as e: + logger.error(f"Failed to get DingTalk access token: {e}") + return None + + async def send(self, msg: OutboundMessage) -> None: + """Send a message through DingTalk.""" + token = await self._get_access_token() + if not token: + return + + # This endpoint is for sending to a single user in a bot chat + # https://open.dingtalk.com/document/orgapp/robot-batch-send-messages + url = "https://api.dingtalk.com/v1.0/robot/oToMessages/batchSend" + + headers = { + "x-acs-dingtalk-access-token": token + } + + # Convert markdown code blocks for basic compatibility if needed, + # but DingTalk supports markdown loosely. + + data = { + "robotCode": self.config.client_id, + "userIds": [msg.chat_id], # chat_id is the user's staffId/unionId + "msgKey": "sampleMarkdown", # Using markdown template + "msgParam": json.dumps({ + "text": msg.content, + "title": "Nanobot Reply" + }) + } + + try: + async with httpx.AsyncClient() as client: + resp = await client.post(url, json=data, headers=headers) + # Check 200 OK but also API error codes if any + if resp.status_code != 200: + logger.error(f"DingTalk send failed: {resp.text}") + else: + logger.debug(f"DingTalk message sent to {msg.chat_id}") + except Exception as e: + logger.error(f"Error sending DingTalk message: {e}") + + async def _on_message(self, content: str, sender_id: str, sender_name: str) -> None: + """Handle incoming message (called by NanobotDingTalkHandler).""" + try: + logger.info(f"DingTalk inbound: {content} from {sender_name}") + + # Correct InboundMessage usage based on events.py definition + # @dataclass class InboundMessage: + # channel: str, sender_id: str, chat_id: str, content: str, ... + msg = InboundMessage( + channel=self.name, + sender_id=sender_id, + chat_id=sender_id, # For private stats, chat_id is sender_id + content=str(content), + metadata={ + "sender_name": sender_name, + "platform": "dingtalk" + } + ) + await self.bus.publish_inbound(msg) + except Exception as e: + logger.error(f"Error publishing DingTalk message: {e}") diff --git a/nanobot/channels/manager.py b/nanobot/channels/manager.py index 846ea70..c7ab7c3 100644 --- a/nanobot/channels/manager.py +++ b/nanobot/channels/manager.py @@ -77,6 +77,17 @@ class ChannelManager: logger.info("Feishu channel enabled") except ImportError as e: logger.warning(f"Feishu channel not available: {e}") + + # DingTalk channel + if self.config.channels.dingtalk.enabled: + try: + from nanobot.channels.dingtalk import DingTalkChannel + self.channels["dingtalk"] = DingTalkChannel( + self.config.channels.dingtalk, self.bus + ) + logger.info("DingTalk channel enabled") + except ImportError as e: + logger.warning(f"DingTalk channel not available: {e}") async def _start_channel(self, name: str, channel: BaseChannel) -> None: """Start a channel and log any exceptions.""" diff --git a/nanobot/config/schema.py b/nanobot/config/schema.py index 7724288..e46b5df 100644 --- a/nanobot/config/schema.py +++ b/nanobot/config/schema.py @@ -30,6 +30,14 @@ class FeishuConfig(BaseModel): allow_from: list[str] = Field(default_factory=list) # Allowed user open_ids +class DingTalkConfig(BaseModel): + """DingTalk channel configuration using Stream mode.""" + enabled: bool = False + client_id: str = "" # AppKey + client_secret: str = "" # AppSecret + allow_from: list[str] = Field(default_factory=list) # Allowed staff_ids + + class DiscordConfig(BaseModel): """Discord channel configuration.""" enabled: bool = False @@ -45,6 +53,7 @@ class ChannelsConfig(BaseModel): telegram: TelegramConfig = Field(default_factory=TelegramConfig) discord: DiscordConfig = Field(default_factory=DiscordConfig) feishu: FeishuConfig = Field(default_factory=FeishuConfig) + dingtalk: DingTalkConfig = Field(default_factory=DingTalkConfig) class AgentDefaults(BaseModel): diff --git a/pyproject.toml b/pyproject.toml index 4093474..6fda084 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,7 @@ dependencies = [ "readability-lxml>=0.8.0", "rich>=13.0.0", "croniter>=2.0.0", + "dingtalk-stream>=0.4.0", "python-telegram-bot[socks]>=21.0", "lark-oapi>=1.0.0", "socksio>=1.0.0", From 3b61ae4fff435a4dce9675ecd2bdabf9c097f414 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 04:29:51 +0000 Subject: [PATCH 16/33] fix: skip provider prefix rules for vLLM/OpenRouter/AiHubMix endpoints --- nanobot/providers/litellm_provider.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nanobot/providers/litellm_provider.py b/nanobot/providers/litellm_provider.py index 7a52e7c..415100c 100644 --- a/nanobot/providers/litellm_provider.py +++ b/nanobot/providers/litellm_provider.py @@ -107,11 +107,12 @@ class LiteLLMProvider(LLMProvider): (("moonshot", "kimi"), "moonshot", ("moonshot/", "openrouter/")), (("gemini",), "gemini", ("gemini/",)), ] - model_lower = model.lower() - for keywords, prefix, skip in _prefix_rules: - if any(kw in model_lower for kw in keywords) and not any(model.startswith(s) for s in skip): - model = f"{prefix}/{model}" - break + if not (self.is_vllm or self.is_openrouter or self.is_aihubmix): + model_lower = model.lower() + for keywords, prefix, skip in _prefix_rules: + if any(kw in model_lower for kw in keywords) and not any(model.startswith(s) for s in skip): + model = f"{prefix}/{model}" + break # Gateway/endpoint-specific prefixes (detected by api_base/api_key, not model name) if self.is_openrouter and not model.startswith("openrouter/"): From f7f812a1774ebe20ba8e46a7e71f0ac5f1de37b5 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 05:06:41 +0000 Subject: [PATCH 17/33] feat: add /reset and /help commands for Telegram bot --- README.md | 2 +- nanobot/agent/loop.py | 3 +- nanobot/channels/manager.py | 11 ++++- nanobot/channels/telegram.py | 81 ++++++++++++++++++++++++++++++++---- nanobot/cli/commands.py | 5 ++- 5 files changed, 88 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index a1ea905..ff827be 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ⚡️ Delivers core agent functionality in just **~4,000** lines of code — **99% smaller** than Clawdbot's 430k+ lines. -📏 Real-time line count: **3,422 lines** (run `bash core_agent_lines.sh` to verify anytime) +📏 Real-time line count: **3,423 lines** (run `bash core_agent_lines.sh` to verify anytime) ## 📢 News diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.py index b13113f..a65f3a5 100644 --- a/nanobot/agent/loop.py +++ b/nanobot/agent/loop.py @@ -45,6 +45,7 @@ class AgentLoop: exec_config: "ExecToolConfig | None" = None, cron_service: "CronService | None" = None, restrict_to_workspace: bool = False, + session_manager: SessionManager | None = None, ): from nanobot.config.schema import ExecToolConfig from nanobot.cron.service import CronService @@ -59,7 +60,7 @@ class AgentLoop: self.restrict_to_workspace = restrict_to_workspace self.context = ContextBuilder(workspace) - self.sessions = SessionManager(workspace) + self.sessions = session_manager or SessionManager(workspace) self.tools = ToolRegistry() self.subagents = SubagentManager( provider=provider, diff --git a/nanobot/channels/manager.py b/nanobot/channels/manager.py index 846ea70..efb7db0 100644 --- a/nanobot/channels/manager.py +++ b/nanobot/channels/manager.py @@ -1,7 +1,9 @@ """Channel manager for coordinating chat channels.""" +from __future__ import annotations + import asyncio -from typing import Any +from typing import Any, TYPE_CHECKING from loguru import logger @@ -10,6 +12,9 @@ from nanobot.bus.queue import MessageBus from nanobot.channels.base import BaseChannel from nanobot.config.schema import Config +if TYPE_CHECKING: + from nanobot.session.manager import SessionManager + class ChannelManager: """ @@ -21,9 +26,10 @@ class ChannelManager: - Route outbound messages """ - def __init__(self, config: Config, bus: MessageBus): + def __init__(self, config: Config, bus: MessageBus, session_manager: "SessionManager | None" = None): self.config = config self.bus = bus + self.session_manager = session_manager self.channels: dict[str, BaseChannel] = {} self._dispatch_task: asyncio.Task | None = None @@ -40,6 +46,7 @@ class ChannelManager: self.config.channels.telegram, self.bus, groq_api_key=self.config.providers.groq.api_key, + session_manager=self.session_manager, ) logger.info("Telegram channel enabled") except ImportError as e: diff --git a/nanobot/channels/telegram.py b/nanobot/channels/telegram.py index f2b6d1f..4f62557 100644 --- a/nanobot/channels/telegram.py +++ b/nanobot/channels/telegram.py @@ -1,17 +1,23 @@ """Telegram channel implementation using python-telegram-bot.""" +from __future__ import annotations + import asyncio import re +from typing import TYPE_CHECKING from loguru import logger -from telegram import Update -from telegram.ext import Application, MessageHandler, filters, ContextTypes +from telegram import BotCommand, Update +from telegram.ext import Application, CommandHandler, MessageHandler, filters, ContextTypes from nanobot.bus.events import OutboundMessage from nanobot.bus.queue import MessageBus from nanobot.channels.base import BaseChannel from nanobot.config.schema import TelegramConfig +if TYPE_CHECKING: + from nanobot.session.manager import SessionManager + def _markdown_to_telegram_html(text: str) -> str: """ @@ -85,10 +91,24 @@ class TelegramChannel(BaseChannel): name = "telegram" - def __init__(self, config: TelegramConfig, bus: MessageBus, groq_api_key: str = ""): + # Commands registered with Telegram's command menu + BOT_COMMANDS = [ + BotCommand("start", "Start the bot"), + BotCommand("reset", "Reset conversation history"), + BotCommand("help", "Show available commands"), + ] + + def __init__( + self, + config: TelegramConfig, + bus: MessageBus, + groq_api_key: str = "", + session_manager: SessionManager | None = None, + ): super().__init__(config, bus) self.config: TelegramConfig = config self.groq_api_key = groq_api_key + self.session_manager = session_manager self._app: Application | None = None self._chat_ids: dict[str, int] = {} # Map sender_id to chat_id for replies @@ -106,6 +126,11 @@ class TelegramChannel(BaseChannel): builder = builder.proxy(self.config.proxy).get_updates_proxy(self.config.proxy) self._app = builder.build() + # Add command handlers + self._app.add_handler(CommandHandler("start", self._on_start)) + self._app.add_handler(CommandHandler("reset", self._on_reset)) + self._app.add_handler(CommandHandler("help", self._on_help)) + # Add message handler for text, photos, voice, documents self._app.add_handler( MessageHandler( @@ -115,20 +140,22 @@ class TelegramChannel(BaseChannel): ) ) - # Add /start command handler - from telegram.ext import CommandHandler - self._app.add_handler(CommandHandler("start", self._on_start)) - logger.info("Starting Telegram bot (polling mode)...") # Initialize and start polling await self._app.initialize() await self._app.start() - # Get bot info + # Get bot info and register command menu bot_info = await self._app.bot.get_me() logger.info(f"Telegram bot @{bot_info.username} connected") + try: + await self._app.bot.set_my_commands(self.BOT_COMMANDS) + logger.debug("Telegram bot commands registered") + except Exception as e: + logger.warning(f"Failed to register bot commands: {e}") + # Start polling (this runs until stopped) await self._app.updater.start_polling( allowed_updates=["message"], @@ -187,9 +214,45 @@ class TelegramChannel(BaseChannel): user = update.effective_user await update.message.reply_text( f"👋 Hi {user.first_name}! I'm nanobot.\n\n" - "Send me a message and I'll respond!" + "Send me a message and I'll respond!\n" + "Type /help to see available commands." ) + async def _on_reset(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: + """Handle /reset command — clear conversation history.""" + if not update.message or not update.effective_user: + return + + chat_id = str(update.message.chat_id) + session_key = f"{self.name}:{chat_id}" + + if self.session_manager is None: + logger.warning("/reset called but session_manager is not available") + await update.message.reply_text("⚠️ Session management is not available.") + return + + session = self.session_manager.get_or_create(session_key) + msg_count = len(session.messages) + session.clear() + self.session_manager.save(session) + + logger.info(f"Session reset for {session_key} (cleared {msg_count} messages)") + await update.message.reply_text("🔄 Conversation history cleared. Let's start fresh!") + + async def _on_help(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: + """Handle /help command — show available commands.""" + if not update.message: + return + + help_text = ( + "🐈 nanobot commands\n\n" + "/start — Start the bot\n" + "/reset — Reset conversation history\n" + "/help — Show this help message\n\n" + "Just send me a text message to chat!" + ) + await update.message.reply_text(help_text, parse_mode="HTML") + async def _on_message(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: """Handle incoming messages (text, photos, voice, documents).""" if not update.message or not update.effective_user: diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 19e62e9..bfb3b1d 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -179,6 +179,7 @@ def gateway( from nanobot.bus.queue import MessageBus from nanobot.agent.loop import AgentLoop from nanobot.channels.manager import ChannelManager + from nanobot.session.manager import SessionManager from nanobot.cron.service import CronService from nanobot.cron.types import CronJob from nanobot.heartbeat.service import HeartbeatService @@ -192,6 +193,7 @@ def gateway( config = load_config() bus = MessageBus() provider = _make_provider(config) + session_manager = SessionManager(config.workspace_path) # Create cron service first (callback set after agent creation) cron_store_path = get_data_dir() / "cron" / "jobs.json" @@ -208,6 +210,7 @@ def gateway( exec_config=config.tools.exec, cron_service=cron, restrict_to_workspace=config.tools.restrict_to_workspace, + session_manager=session_manager, ) # Set cron callback (needs agent) @@ -242,7 +245,7 @@ def gateway( ) # Create channel manager - channels = ChannelManager(config, bus) + channels = ChannelManager(config, bus, session_manager=session_manager) if channels.enabled_channels: console.print(f"[green]✓[/green] Channels enabled: {', '.join(channels.enabled_channels)}") From 00185f2beea1fbab70a2aa9e229d35a7aa54d6fa Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 05:44:06 +0000 Subject: [PATCH 18/33] feat: add Telegram typing indicator --- .gitignore | 1 + nanobot/channels/telegram.py | 38 +++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 316e214..55338f7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ docs/ __pycache__/ poetry.lock .pytest_cache/ +tests/ \ No newline at end of file diff --git a/nanobot/channels/telegram.py b/nanobot/channels/telegram.py index 4f62557..ff46c86 100644 --- a/nanobot/channels/telegram.py +++ b/nanobot/channels/telegram.py @@ -111,6 +111,7 @@ class TelegramChannel(BaseChannel): self.session_manager = session_manager self._app: Application | None = None self._chat_ids: dict[str, int] = {} # Map sender_id to chat_id for replies + self._typing_tasks: dict[str, asyncio.Task] = {} # chat_id -> typing loop task async def start(self) -> None: """Start the Telegram bot with long polling.""" @@ -170,6 +171,10 @@ class TelegramChannel(BaseChannel): """Stop the Telegram bot.""" self._running = False + # Cancel all typing indicators + for chat_id in list(self._typing_tasks): + self._stop_typing(chat_id) + if self._app: logger.info("Stopping Telegram bot...") await self._app.updater.stop() @@ -183,6 +188,9 @@ class TelegramChannel(BaseChannel): logger.warning("Telegram bot not running") return + # Stop typing indicator for this chat + self._stop_typing(msg.chat_id) + try: # chat_id should be the Telegram chat ID (integer) chat_id = int(msg.chat_id) @@ -335,10 +343,15 @@ class TelegramChannel(BaseChannel): logger.debug(f"Telegram message from {sender_id}: {content[:50]}...") + str_chat_id = str(chat_id) + + # Start typing indicator before processing + self._start_typing(str_chat_id) + # Forward to the message bus await self._handle_message( sender_id=sender_id, - chat_id=str(chat_id), + chat_id=str_chat_id, content=content, media=media_paths, metadata={ @@ -350,6 +363,29 @@ class TelegramChannel(BaseChannel): } ) + def _start_typing(self, chat_id: str) -> None: + """Start sending 'typing...' indicator for a chat.""" + # Cancel any existing typing task for this chat + self._stop_typing(chat_id) + self._typing_tasks[chat_id] = asyncio.create_task(self._typing_loop(chat_id)) + + def _stop_typing(self, chat_id: str) -> None: + """Stop the typing indicator for a chat.""" + task = self._typing_tasks.pop(chat_id, None) + if task and not task.done(): + task.cancel() + + async def _typing_loop(self, chat_id: str) -> None: + """Repeatedly send 'typing' action until cancelled.""" + try: + while self._app: + await self._app.bot.send_chat_action(chat_id=int(chat_id), action="typing") + await asyncio.sleep(4) + except asyncio.CancelledError: + pass + except Exception as e: + logger.debug(f"Typing indicator stopped for {chat_id}: {e}") + def _get_extension(self, media_type: str, mime_type: str | None) -> str: """Get file extension based on media type.""" if mime_type: From 299d8b33b31418bd6e4f0b38260a937f8789dca4 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 07:29:31 +0000 Subject: [PATCH 19/33] refactor: replace provider if-elif chains with declarative registry --- README.md | 48 ++++ nanobot/cli/commands.py | 33 ++- nanobot/config/schema.py | 47 ++-- nanobot/providers/litellm_provider.py | 133 ++++++----- nanobot/providers/registry.py | 323 ++++++++++++++++++++++++++ 5 files changed, 474 insertions(+), 110 deletions(-) create mode 100644 nanobot/providers/registry.py diff --git a/README.md b/README.md index ff827be..90ca9e3 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ ## 📢 News +- **2026-02-08** 🔧 Refactored Providers — adding a new LLM provider only takes just 2 steps! Check [here](#providers). - **2026-02-07** 🚀 Released v0.1.3.post5 with Qwen support & several improvements! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post5) for details. - **2026-02-06** ✨ Added Moonshot/Kimi provider, Discord integration, and enhanced security hardening! - **2026-02-05** ✨ Added Feishu channel, DeepSeek provider, and enhanced scheduled tasks support! @@ -355,6 +356,53 @@ Config file: `~/.nanobot/config.json` | `gemini` | LLM (Gemini direct) | [aistudio.google.com](https://aistudio.google.com) | | `aihubmix` | LLM (API gateway, access to all models) | [aihubmix.com](https://aihubmix.com) | | `dashscope` | LLM (Qwen) | [dashscope.console.aliyun.com](https://dashscope.console.aliyun.com) | +| `moonshot` | LLM (Moonshot/Kimi) | [platform.moonshot.cn](https://platform.moonshot.cn) | +| `zhipu` | LLM (Zhipu GLM) | [open.bigmodel.cn](https://open.bigmodel.cn) | +| `vllm` | LLM (local, any OpenAI-compatible server) | — | + +
+Adding a New Provider (Developer Guide) + +nanobot uses a **Provider Registry** (`nanobot/providers/registry.py`) as the single source of truth. +Adding a new provider only takes **2 steps** — no if-elif chains to touch. + +**Step 1.** Add a `ProviderSpec` entry to `PROVIDERS` in `nanobot/providers/registry.py`: + +```python +ProviderSpec( + name="myprovider", # config field name + keywords=("myprovider", "mymodel"), # model-name keywords for auto-matching + env_key="MYPROVIDER_API_KEY", # env var for LiteLLM + display_name="My Provider", # shown in `nanobot status` + litellm_prefix="myprovider", # auto-prefix: model → myprovider/model + skip_prefixes=("myprovider/",), # don't double-prefix +) +``` + +**Step 2.** Add a field to `ProvidersConfig` in `nanobot/config/schema.py`: + +```python +class ProvidersConfig(BaseModel): + ... + myprovider: ProviderConfig = ProviderConfig() +``` + +That's it! Environment variables, model prefixing, config matching, and `nanobot status` display will all work automatically. + +**Common `ProviderSpec` options:** + +| Field | Description | Example | +|-------|-------------|---------| +| `litellm_prefix` | Auto-prefix model names for LiteLLM | `"dashscope"` → `dashscope/qwen-max` | +| `skip_prefixes` | Don't prefix if model already starts with these | `("dashscope/", "openrouter/")` | +| `env_extras` | Additional env vars to set | `(("ZHIPUAI_API_KEY", "{api_key}"),)` | +| `model_overrides` | Per-model parameter overrides | `(("kimi-k2.5", {"temperature": 1.0}),)` | +| `is_gateway` | Can route any model (like OpenRouter) | `True` | +| `detect_by_key_prefix` | Detect gateway by API key prefix | `"sk-or-"` | +| `detect_by_base_keyword` | Detect gateway by API base URL | `"openrouter"` | +| `strip_model_prefix` | Strip existing prefix before re-prefixing | `True` (for AiHubMix) | + +
### Security diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index bfb3b1d..1dab818 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -635,25 +635,24 @@ def status(): console.print(f"Workspace: {workspace} {'[green]✓[/green]' if workspace.exists() else '[red]✗[/red]'}") if config_path.exists(): + from nanobot.providers.registry import PROVIDERS + console.print(f"Model: {config.agents.defaults.model}") - # Check API keys - has_openrouter = bool(config.providers.openrouter.api_key) - has_anthropic = bool(config.providers.anthropic.api_key) - has_openai = bool(config.providers.openai.api_key) - has_gemini = bool(config.providers.gemini.api_key) - has_zhipu = bool(config.providers.zhipu.api_key) - has_vllm = bool(config.providers.vllm.api_base) - has_aihubmix = bool(config.providers.aihubmix.api_key) - - console.print(f"OpenRouter API: {'[green]✓[/green]' if has_openrouter else '[dim]not set[/dim]'}") - console.print(f"Anthropic API: {'[green]✓[/green]' if has_anthropic else '[dim]not set[/dim]'}") - console.print(f"OpenAI API: {'[green]✓[/green]' if has_openai else '[dim]not set[/dim]'}") - console.print(f"Gemini API: {'[green]✓[/green]' if has_gemini else '[dim]not set[/dim]'}") - console.print(f"Zhipu AI API: {'[green]✓[/green]' if has_zhipu else '[dim]not set[/dim]'}") - console.print(f"AiHubMix API: {'[green]✓[/green]' if has_aihubmix else '[dim]not set[/dim]'}") - vllm_status = f"[green]✓ {config.providers.vllm.api_base}[/green]" if has_vllm else "[dim]not set[/dim]" - console.print(f"vLLM/Local: {vllm_status}") + # Check API keys from registry + for spec in PROVIDERS: + p = getattr(config.providers, spec.name, None) + if p is None: + continue + if spec.is_local: + # Local deployments show api_base instead of api_key + if p.api_base: + console.print(f"{spec.label}: [green]✓ {p.api_base}[/green]") + else: + console.print(f"{spec.label}: [dim]not set[/dim]") + else: + has_key = bool(p.api_key) + console.print(f"{spec.label}: {'[green]✓[/green]' if has_key else '[dim]not set[/dim]'}") if __name__ == "__main__": diff --git a/nanobot/config/schema.py b/nanobot/config/schema.py index 7724288..ea8f8ba 100644 --- a/nanobot/config/schema.py +++ b/nanobot/config/schema.py @@ -125,29 +125,23 @@ class Config(BaseSettings): """Get expanded workspace path.""" return Path(self.agents.defaults.workspace).expanduser() - # Default base URLs for API gateways - _GATEWAY_DEFAULTS = {"openrouter": "https://openrouter.ai/api/v1", "aihubmix": "https://aihubmix.com/v1"} - def get_provider(self, model: str | None = None) -> ProviderConfig | None: """Get matched provider config (api_key, api_base, extra_headers). Falls back to first available.""" - model = (model or self.agents.defaults.model).lower() - p = self.providers - # Keyword → provider mapping (order matters: gateways first) - keyword_map = { - "aihubmix": p.aihubmix, "openrouter": p.openrouter, - "deepseek": p.deepseek, "anthropic": p.anthropic, "claude": p.anthropic, - "openai": p.openai, "gpt": p.openai, "gemini": p.gemini, - "zhipu": p.zhipu, "glm": p.zhipu, "zai": p.zhipu, - "dashscope": p.dashscope, "qwen": p.dashscope, - "groq": p.groq, "moonshot": p.moonshot, "kimi": p.moonshot, "vllm": p.vllm, - } - for kw, provider in keyword_map.items(): - if kw in model and provider.api_key: - return provider - # Fallback: gateways first (can serve any model), then specific providers - all_providers = [p.openrouter, p.aihubmix, p.anthropic, p.openai, p.deepseek, - p.gemini, p.zhipu, p.dashscope, p.moonshot, p.vllm, p.groq] - return next((pr for pr in all_providers if pr.api_key), None) + from nanobot.providers.registry import PROVIDERS + model_lower = (model or self.agents.defaults.model).lower() + + # Match by keyword (order follows PROVIDERS registry) + for spec in PROVIDERS: + p = getattr(self.providers, spec.name, None) + if p and any(kw in model_lower for kw in spec.keywords) and p.api_key: + return p + + # Fallback: gateways first, then others (follows registry order) + for spec in PROVIDERS: + p = getattr(self.providers, spec.name, None) + if p and p.api_key: + return p + return None def get_api_key(self, model: str | None = None) -> str | None: """Get API key for the given model. Falls back to first available key.""" @@ -156,13 +150,16 @@ class Config(BaseSettings): def get_api_base(self, model: str | None = None) -> str | None: """Get API base URL for the given model. Applies default URLs for known gateways.""" + from nanobot.providers.registry import PROVIDERS p = self.get_provider(model) if p and p.api_base: return p.api_base - # Default URLs for known gateways (openrouter, aihubmix) - for name, url in self._GATEWAY_DEFAULTS.items(): - if p == getattr(self.providers, name): - return url + # Only gateways get a default URL here. Standard providers (like Moonshot) + # handle their base URL via env vars in _setup_env, NOT via api_base — + # otherwise find_gateway() would misdetect them as local/vLLM. + for spec in PROVIDERS: + if spec.is_gateway and spec.default_api_base and p == getattr(self.providers, spec.name, None): + return spec.default_api_base return None class Config: diff --git a/nanobot/providers/litellm_provider.py b/nanobot/providers/litellm_provider.py index 415100c..5e9c22f 100644 --- a/nanobot/providers/litellm_provider.py +++ b/nanobot/providers/litellm_provider.py @@ -1,5 +1,6 @@ """LiteLLM provider implementation for multi-provider support.""" +import json import os from typing import Any @@ -7,6 +8,7 @@ import litellm from litellm import acompletion from nanobot.providers.base import LLMProvider, LLMResponse, ToolCallRequest +from nanobot.providers.registry import find_by_model, find_gateway class LiteLLMProvider(LLMProvider): @@ -14,7 +16,8 @@ class LiteLLMProvider(LLMProvider): LLM provider using LiteLLM for multi-provider support. Supports OpenRouter, Anthropic, OpenAI, Gemini, and many other providers through - a unified interface. + a unified interface. Provider-specific logic is driven by the registry + (see providers/registry.py) — no if-elif chains needed here. """ def __init__( @@ -28,47 +31,17 @@ class LiteLLMProvider(LLMProvider): self.default_model = default_model self.extra_headers = extra_headers or {} - # Detect OpenRouter by api_key prefix or explicit api_base - self.is_openrouter = ( - (api_key and api_key.startswith("sk-or-")) or - (api_base and "openrouter" in api_base) - ) + # Detect gateway / local deployment from api_key and api_base + self._gateway = find_gateway(api_key, api_base) - # Detect AiHubMix by api_base - self.is_aihubmix = bool(api_base and "aihubmix" in api_base) + # Backwards-compatible flags (used by tests and possibly external code) + self.is_openrouter = bool(self._gateway and self._gateway.name == "openrouter") + self.is_aihubmix = bool(self._gateway and self._gateway.name == "aihubmix") + self.is_vllm = bool(self._gateway and self._gateway.is_local) - # Track if using custom endpoint (vLLM, etc.) - self.is_vllm = bool(api_base) and not self.is_openrouter and not self.is_aihubmix - - # Configure LiteLLM based on provider + # Configure environment variables if api_key: - if self.is_openrouter: - # OpenRouter mode - set key - os.environ["OPENROUTER_API_KEY"] = api_key - elif self.is_aihubmix: - # AiHubMix gateway - OpenAI-compatible - os.environ["OPENAI_API_KEY"] = api_key - elif self.is_vllm: - # vLLM/custom endpoint - uses OpenAI-compatible API - os.environ["HOSTED_VLLM_API_KEY"] = api_key - elif "deepseek" in default_model: - os.environ.setdefault("DEEPSEEK_API_KEY", api_key) - elif "anthropic" in default_model: - os.environ.setdefault("ANTHROPIC_API_KEY", api_key) - elif "openai" in default_model or "gpt" in default_model: - os.environ.setdefault("OPENAI_API_KEY", api_key) - elif "gemini" in default_model.lower(): - os.environ.setdefault("GEMINI_API_KEY", api_key) - elif "zhipu" in default_model or "glm" in default_model or "zai" in default_model: - os.environ.setdefault("ZAI_API_KEY", api_key) - os.environ.setdefault("ZHIPUAI_API_KEY", api_key) - elif "dashscope" in default_model or "qwen" in default_model.lower(): - os.environ.setdefault("DASHSCOPE_API_KEY", api_key) - elif "groq" in default_model: - os.environ.setdefault("GROQ_API_KEY", api_key) - elif "moonshot" in default_model or "kimi" in default_model: - os.environ.setdefault("MOONSHOT_API_KEY", api_key) - os.environ.setdefault("MOONSHOT_API_BASE", api_base or "https://api.moonshot.cn/v1") + self._setup_env(api_key, api_base, default_model) if api_base: litellm.api_base = api_base @@ -76,6 +49,55 @@ class LiteLLMProvider(LLMProvider): # Disable LiteLLM logging noise litellm.suppress_debug_info = True + def _setup_env(self, api_key: str, api_base: str | None, model: str) -> None: + """Set environment variables based on detected provider.""" + if self._gateway: + # Gateway / local: direct set (not setdefault) + os.environ[self._gateway.env_key] = api_key + return + + # Standard provider: match by model name + spec = find_by_model(model) + if spec: + os.environ.setdefault(spec.env_key, api_key) + # Resolve env_extras placeholders: + # {api_key} → user's API key + # {api_base} → user's api_base, falling back to spec.default_api_base + effective_base = api_base or spec.default_api_base + for env_name, env_val in spec.env_extras: + resolved = env_val.replace("{api_key}", api_key) + resolved = resolved.replace("{api_base}", effective_base) + os.environ.setdefault(env_name, resolved) + + def _resolve_model(self, model: str) -> str: + """Resolve model name by applying provider/gateway prefixes.""" + if self._gateway: + # Gateway mode: apply gateway prefix, skip provider-specific prefixes + prefix = self._gateway.litellm_prefix + if self._gateway.strip_model_prefix: + model = model.split("/")[-1] + if prefix and not model.startswith(f"{prefix}/"): + model = f"{prefix}/{model}" + return model + + # Standard mode: auto-prefix for known providers + spec = find_by_model(model) + if spec and spec.litellm_prefix: + if not any(model.startswith(s) for s in spec.skip_prefixes): + model = f"{spec.litellm_prefix}/{model}" + + return model + + def _apply_model_overrides(self, model: str, kwargs: dict[str, Any]) -> None: + """Apply model-specific parameter overrides from the registry.""" + model_lower = model.lower() + spec = find_by_model(model) + if spec: + for pattern, overrides in spec.model_overrides: + if pattern in model_lower: + kwargs.update(overrides) + return + async def chat( self, messages: list[dict[str, Any]], @@ -97,35 +119,8 @@ class LiteLLMProvider(LLMProvider): Returns: LLMResponse with content and/or tool calls. """ - model = model or self.default_model + model = self._resolve_model(model or self.default_model) - # Auto-prefix model names for known providers - # (keywords, target_prefix, skip_if_starts_with) - _prefix_rules = [ - (("glm", "zhipu"), "zai", ("zhipu/", "zai/", "openrouter/", "hosted_vllm/")), - (("qwen", "dashscope"), "dashscope", ("dashscope/", "openrouter/")), - (("moonshot", "kimi"), "moonshot", ("moonshot/", "openrouter/")), - (("gemini",), "gemini", ("gemini/",)), - ] - if not (self.is_vllm or self.is_openrouter or self.is_aihubmix): - model_lower = model.lower() - for keywords, prefix, skip in _prefix_rules: - if any(kw in model_lower for kw in keywords) and not any(model.startswith(s) for s in skip): - model = f"{prefix}/{model}" - break - - # Gateway/endpoint-specific prefixes (detected by api_base/api_key, not model name) - if self.is_openrouter and not model.startswith("openrouter/"): - model = f"openrouter/{model}" - elif self.is_aihubmix: - model = f"openai/{model.split('/')[-1]}" - elif self.is_vllm: - model = f"hosted_vllm/{model}" - - # kimi-k2.5 only supports temperature=1.0 - if "kimi-k2.5" in model.lower(): - temperature = 1.0 - kwargs: dict[str, Any] = { "model": model, "messages": messages, @@ -133,6 +128,9 @@ class LiteLLMProvider(LLMProvider): "temperature": temperature, } + # Apply model-specific overrides (e.g. kimi-k2.5 temperature) + self._apply_model_overrides(model, kwargs) + # Pass api_base directly for custom endpoints (vLLM, etc.) if self.api_base: kwargs["api_base"] = self.api_base @@ -166,7 +164,6 @@ class LiteLLMProvider(LLMProvider): # Parse arguments from JSON string if needed args = tc.function.arguments if isinstance(args, str): - import json try: args = json.loads(args) except json.JSONDecodeError: diff --git a/nanobot/providers/registry.py b/nanobot/providers/registry.py new file mode 100644 index 0000000..aa4a76e --- /dev/null +++ b/nanobot/providers/registry.py @@ -0,0 +1,323 @@ +""" +Provider Registry — single source of truth for LLM provider metadata. + +Adding a new provider: + 1. Add a ProviderSpec to PROVIDERS below. + 2. Add a field to ProvidersConfig in config/schema.py. + Done. Env vars, prefixing, config matching, status display all derive from here. + +Order matters — it controls match priority and fallback. Gateways first. +Every entry writes out all fields so you can copy-paste as a template. +""" + +from __future__ import annotations + +from dataclasses import dataclass +from typing import Any + + +@dataclass(frozen=True) +class ProviderSpec: + """One LLM provider's metadata. See PROVIDERS below for real examples. + + Placeholders in env_extras values: + {api_key} — the user's API key + {api_base} — api_base from config, or this spec's default_api_base + """ + + # identity + name: str # config field name, e.g. "dashscope" + keywords: tuple[str, ...] # model-name keywords for matching (lowercase) + env_key: str # LiteLLM env var, e.g. "DASHSCOPE_API_KEY" + display_name: str = "" # shown in `nanobot status` + + # model prefixing + litellm_prefix: str = "" # "dashscope" → model becomes "dashscope/{model}" + skip_prefixes: tuple[str, ...] = () # don't prefix if model already starts with these + + # extra env vars, e.g. (("ZHIPUAI_API_KEY", "{api_key}"),) + env_extras: tuple[tuple[str, str], ...] = () + + # gateway / local detection + is_gateway: bool = False # routes any model (OpenRouter, AiHubMix) + is_local: bool = False # local deployment (vLLM, Ollama) + detect_by_key_prefix: str = "" # match api_key prefix, e.g. "sk-or-" + detect_by_base_keyword: str = "" # match substring in api_base URL + default_api_base: str = "" # fallback base URL + + # gateway behavior + strip_model_prefix: bool = False # strip "provider/" before re-prefixing + + # per-model param overrides, e.g. (("kimi-k2.5", {"temperature": 1.0}),) + model_overrides: tuple[tuple[str, dict[str, Any]], ...] = () + + @property + def label(self) -> str: + return self.display_name or self.name.title() + + +# --------------------------------------------------------------------------- +# PROVIDERS — the registry. Order = priority. Copy any entry as template. +# --------------------------------------------------------------------------- + +PROVIDERS: tuple[ProviderSpec, ...] = ( + + # === Gateways (detected by api_key / api_base, not model name) ========= + # Gateways can route any model, so they win in fallback. + + # OpenRouter: global gateway, keys start with "sk-or-" + ProviderSpec( + name="openrouter", + keywords=("openrouter",), + env_key="OPENROUTER_API_KEY", + display_name="OpenRouter", + litellm_prefix="openrouter", # claude-3 → openrouter/claude-3 + skip_prefixes=(), + env_extras=(), + is_gateway=True, + is_local=False, + detect_by_key_prefix="sk-or-", + detect_by_base_keyword="openrouter", + default_api_base="https://openrouter.ai/api/v1", + strip_model_prefix=False, + model_overrides=(), + ), + + # AiHubMix: global gateway, OpenAI-compatible interface. + # strip_model_prefix=True: it doesn't understand "anthropic/claude-3", + # so we strip to bare "claude-3" then re-prefix as "openai/claude-3". + ProviderSpec( + name="aihubmix", + keywords=("aihubmix",), + env_key="OPENAI_API_KEY", # OpenAI-compatible + display_name="AiHubMix", + litellm_prefix="openai", # → openai/{model} + skip_prefixes=(), + env_extras=(), + is_gateway=True, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="aihubmix", + default_api_base="https://aihubmix.com/v1", + strip_model_prefix=True, # anthropic/claude-3 → claude-3 → openai/claude-3 + model_overrides=(), + ), + + # === Standard providers (matched by model-name keywords) =============== + + # Anthropic: LiteLLM recognizes "claude-*" natively, no prefix needed. + ProviderSpec( + name="anthropic", + keywords=("anthropic", "claude"), + env_key="ANTHROPIC_API_KEY", + display_name="Anthropic", + litellm_prefix="", + skip_prefixes=(), + env_extras=(), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", + strip_model_prefix=False, + model_overrides=(), + ), + + # OpenAI: LiteLLM recognizes "gpt-*" natively, no prefix needed. + ProviderSpec( + name="openai", + keywords=("openai", "gpt"), + env_key="OPENAI_API_KEY", + display_name="OpenAI", + litellm_prefix="", + skip_prefixes=(), + env_extras=(), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", + strip_model_prefix=False, + model_overrides=(), + ), + + # DeepSeek: needs "deepseek/" prefix for LiteLLM routing. + ProviderSpec( + name="deepseek", + keywords=("deepseek",), + env_key="DEEPSEEK_API_KEY", + display_name="DeepSeek", + litellm_prefix="deepseek", # deepseek-chat → deepseek/deepseek-chat + skip_prefixes=("deepseek/",), # avoid double-prefix + env_extras=(), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", + strip_model_prefix=False, + model_overrides=(), + ), + + # Gemini: needs "gemini/" prefix for LiteLLM. + ProviderSpec( + name="gemini", + keywords=("gemini",), + env_key="GEMINI_API_KEY", + display_name="Gemini", + litellm_prefix="gemini", # gemini-pro → gemini/gemini-pro + skip_prefixes=("gemini/",), # avoid double-prefix + env_extras=(), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", + strip_model_prefix=False, + model_overrides=(), + ), + + # Zhipu: LiteLLM uses "zai/" prefix. + # Also mirrors key to ZHIPUAI_API_KEY (some LiteLLM paths check that). + # skip_prefixes: don't add "zai/" when already routed via gateway. + ProviderSpec( + name="zhipu", + keywords=("zhipu", "glm", "zai"), + env_key="ZAI_API_KEY", + display_name="Zhipu AI", + litellm_prefix="zai", # glm-4 → zai/glm-4 + skip_prefixes=("zhipu/", "zai/", "openrouter/", "hosted_vllm/"), + env_extras=( + ("ZHIPUAI_API_KEY", "{api_key}"), + ), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", + strip_model_prefix=False, + model_overrides=(), + ), + + # DashScope: Qwen models, needs "dashscope/" prefix. + ProviderSpec( + name="dashscope", + keywords=("qwen", "dashscope"), + env_key="DASHSCOPE_API_KEY", + display_name="DashScope", + litellm_prefix="dashscope", # qwen-max → dashscope/qwen-max + skip_prefixes=("dashscope/", "openrouter/"), + env_extras=(), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", + strip_model_prefix=False, + model_overrides=(), + ), + + # Moonshot: Kimi models, needs "moonshot/" prefix. + # LiteLLM requires MOONSHOT_API_BASE env var to find the endpoint. + # Kimi K2.5 API enforces temperature >= 1.0. + ProviderSpec( + name="moonshot", + keywords=("moonshot", "kimi"), + env_key="MOONSHOT_API_KEY", + display_name="Moonshot", + litellm_prefix="moonshot", # kimi-k2.5 → moonshot/kimi-k2.5 + skip_prefixes=("moonshot/", "openrouter/"), + env_extras=( + ("MOONSHOT_API_BASE", "{api_base}"), + ), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="https://api.moonshot.ai/v1", # intl; use api.moonshot.cn for China + strip_model_prefix=False, + model_overrides=( + ("kimi-k2.5", {"temperature": 1.0}), + ), + ), + + # === Local deployment (fallback: unknown api_base → assume local) ====== + + # vLLM / any OpenAI-compatible local server. + # If api_base is set but doesn't match a known gateway, we land here. + # Placed before Groq so vLLM wins the fallback when both are configured. + ProviderSpec( + name="vllm", + keywords=("vllm",), + env_key="HOSTED_VLLM_API_KEY", + display_name="vLLM/Local", + litellm_prefix="hosted_vllm", # Llama-3-8B → hosted_vllm/Llama-3-8B + skip_prefixes=(), + env_extras=(), + is_gateway=False, + is_local=True, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", # user must provide in config + strip_model_prefix=False, + model_overrides=(), + ), + + # === Auxiliary (not a primary LLM provider) ============================ + + # Groq: mainly used for Whisper voice transcription, also usable for LLM. + # Needs "groq/" prefix for LiteLLM routing. Placed last — it rarely wins fallback. + ProviderSpec( + name="groq", + keywords=("groq",), + env_key="GROQ_API_KEY", + display_name="Groq", + litellm_prefix="groq", # llama3-8b-8192 → groq/llama3-8b-8192 + skip_prefixes=("groq/",), # avoid double-prefix + env_extras=(), + is_gateway=False, + is_local=False, + detect_by_key_prefix="", + detect_by_base_keyword="", + default_api_base="", + strip_model_prefix=False, + model_overrides=(), + ), +) + + +# --------------------------------------------------------------------------- +# Lookup helpers +# --------------------------------------------------------------------------- + +def find_by_model(model: str) -> ProviderSpec | None: + """Match a standard provider by model-name keyword (case-insensitive). + Skips gateways/local — those are matched by api_key/api_base instead.""" + model_lower = model.lower() + for spec in PROVIDERS: + if spec.is_gateway or spec.is_local: + continue + if any(kw in model_lower for kw in spec.keywords): + return spec + return None + + +def find_gateway(api_key: str | None, api_base: str | None) -> ProviderSpec | None: + """Detect gateway/local by api_key prefix or api_base substring. + Fallback: unknown api_base → treat as local (vLLM).""" + for spec in PROVIDERS: + if spec.detect_by_key_prefix and api_key and api_key.startswith(spec.detect_by_key_prefix): + return spec + if spec.detect_by_base_keyword and api_base and spec.detect_by_base_keyword in api_base: + return spec + if api_base: + return next((s for s in PROVIDERS if s.is_local), None) + return None + + +def find_by_name(name: str) -> ProviderSpec | None: + """Find a provider spec by config field name, e.g. "dashscope".""" + for spec in PROVIDERS: + if spec.name == name: + return spec + return None From f49c639b74ced46df483ad12523580cd5e51da81 Mon Sep 17 00:00:00 2001 From: chaohuang-ai Date: Sun, 8 Feb 2026 18:02:48 +0800 Subject: [PATCH 20/33] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 90ca9e3..8824570 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ ## 📢 News -- **2026-02-08** 🔧 Refactored Providers — adding a new LLM provider only takes just 2 steps! Check [here](#providers). -- **2026-02-07** 🚀 Released v0.1.3.post5 with Qwen support & several improvements! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post5) for details. +- **2026-02-08** 🔧 Refactored Providers — adding a new LLM provider now takes just 2 simple steps! Check [here](#providers). +- **2026-02-07** 🚀 🚀 Released v0.1.3.post5 with Qwen support & several key improvements! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post5) for details. - **2026-02-06** ✨ Added Moonshot/Kimi provider, Discord integration, and enhanced security hardening! - **2026-02-05** ✨ Added Feishu channel, DeepSeek provider, and enhanced scheduled tasks support! - **2026-02-04** 🚀 Released v0.1.3.post4 with multi-provider & Docker support! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post4) for details. From 9e3823ae034e16287cebbe1b36e0c486e99139b5 Mon Sep 17 00:00:00 2001 From: chaohuang-ai Date: Sun, 8 Feb 2026 18:03:00 +0800 Subject: [PATCH 21/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8824570..d1ae7ce 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ ## 📢 News - **2026-02-08** 🔧 Refactored Providers — adding a new LLM provider now takes just 2 simple steps! Check [here](#providers). -- **2026-02-07** 🚀 🚀 Released v0.1.3.post5 with Qwen support & several key improvements! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post5) for details. +- **2026-02-07** 🚀 Released v0.1.3.post5 with Qwen support & several key improvements! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post5) for details. - **2026-02-06** ✨ Added Moonshot/Kimi provider, Discord integration, and enhanced security hardening! - **2026-02-05** ✨ Added Feishu channel, DeepSeek provider, and enhanced scheduled tasks support! - **2026-02-04** 🚀 Released v0.1.3.post4 with multi-provider & Docker support! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post4) for details. From 3675758a44d2c4d49dd867e776c18a764014975e Mon Sep 17 00:00:00 2001 From: chaohuang-ai Date: Sun, 8 Feb 2026 18:10:24 +0800 Subject: [PATCH 22/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1ae7ce..a833dbe 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ ## 📢 News -- **2026-02-08** 🔧 Refactored Providers — adding a new LLM provider now takes just 2 simple steps! Check [here](#providers). +- **2026-02-08** 🔧 Refactored Providers—adding a new LLM provider now takes just 2 simple steps! Check [here](#providers). - **2026-02-07** 🚀 Released v0.1.3.post5 with Qwen support & several key improvements! Check [here](https://github.com/HKUDS/nanobot/releases/tag/v0.1.3.post5) for details. - **2026-02-06** ✨ Added Moonshot/Kimi provider, Discord integration, and enhanced security hardening! - **2026-02-05** ✨ Added Feishu channel, DeepSeek provider, and enhanced scheduled tasks support! From b6ec6a8a7686b8d3239bd9f363fa55490f9f9217 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 18:06:07 +0000 Subject: [PATCH 23/33] fix(dingtalk): security and resource fixes for DingTalk channel --- README.md | 10 +- nanobot/channels/dingtalk.py | 195 +++++++++++++++++++---------------- 2 files changed, 108 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index 8c5c387..326f253 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ⚡️ Delivers core agent functionality in just **~4,000** lines of code — **99% smaller** than Clawdbot's 430k+ lines. -📏 Real-time line count: **3,423 lines** (run `bash core_agent_lines.sh` to verify anytime) +📏 Real-time line count: **3,429 lines** (run `bash core_agent_lines.sh` to verify anytime) ## 📢 News @@ -293,10 +293,6 @@ nanobot gateway Uses **WebSocket** long connection — no public IP required. -```bash -pip install nanobot-ai[feishu] -``` - **1. Create a Feishu bot** - Visit [Feishu Open Platform](https://open.feishu.cn/app) - Create a new app → Enable **Bot** capability @@ -342,10 +338,6 @@ nanobot gateway Uses **Stream Mode** — no public IP required. -```bash -pip install nanobot-ai[dingtalk] -``` - **1. Create a DingTalk bot** - Visit [DingTalk Open Platform](https://open-dev.dingtalk.com/) - Create a new app -> Add **Robot** capability diff --git a/nanobot/channels/dingtalk.py b/nanobot/channels/dingtalk.py index 897e5be..72d3afd 100644 --- a/nanobot/channels/dingtalk.py +++ b/nanobot/channels/dingtalk.py @@ -2,30 +2,35 @@ import asyncio import json -import threading import time from typing import Any from loguru import logger import httpx -from nanobot.bus.events import OutboundMessage, InboundMessage +from nanobot.bus.events import OutboundMessage from nanobot.bus.queue import MessageBus from nanobot.channels.base import BaseChannel from nanobot.config.schema import DingTalkConfig try: from dingtalk_stream import ( - DingTalkStreamClient, + DingTalkStreamClient, Credential, CallbackHandler, CallbackMessage, - AckMessage + AckMessage, ) from dingtalk_stream.chatbot import ChatbotMessage + DINGTALK_AVAILABLE = True except ImportError: DINGTALK_AVAILABLE = False + # Fallback so class definitions don't crash at module level + CallbackHandler = object # type: ignore[assignment,misc] + CallbackMessage = None # type: ignore[assignment,misc] + AckMessage = None # type: ignore[assignment,misc] + ChatbotMessage = None # type: ignore[assignment,misc] class NanobotDingTalkHandler(CallbackHandler): @@ -33,127 +38,146 @@ class NanobotDingTalkHandler(CallbackHandler): Standard DingTalk Stream SDK Callback Handler. Parses incoming messages and forwards them to the Nanobot channel. """ + def __init__(self, channel: "DingTalkChannel"): super().__init__() self.channel = channel - + async def process(self, message: CallbackMessage): """Process incoming stream message.""" try: # Parse using SDK's ChatbotMessage for robust handling chatbot_msg = ChatbotMessage.from_dict(message.data) - - # Extract content based on message type + + # Extract text content; fall back to raw dict if SDK object is empty content = "" if chatbot_msg.text: content = chatbot_msg.text.content.strip() - elif chatbot_msg.message_type == "text": - # Fallback manual extraction if object not populated - content = message.data.get("text", {}).get("content", "").strip() - if not content: - logger.warning(f"Received empty or unsupported message type: {chatbot_msg.message_type}") + content = message.data.get("text", {}).get("content", "").strip() + + if not content: + logger.warning( + f"Received empty or unsupported message type: {chatbot_msg.message_type}" + ) return AckMessage.STATUS_OK, "OK" sender_id = chatbot_msg.sender_staff_id or chatbot_msg.sender_id sender_name = chatbot_msg.sender_nick or "Unknown" - + logger.info(f"Received DingTalk message from {sender_name} ({sender_id}): {content}") - # Forward to Nanobot - # We use asyncio.create_task to avoid blocking the ACK return - asyncio.create_task( + # Forward to Nanobot via _on_message (non-blocking). + # Store reference to prevent GC before task completes. + task = asyncio.create_task( self.channel._on_message(content, sender_id, sender_name) ) + self.channel._background_tasks.add(task) + task.add_done_callback(self.channel._background_tasks.discard) return AckMessage.STATUS_OK, "OK" - + except Exception as e: logger.error(f"Error processing DingTalk message: {e}") - # Return OK to avoid retry loop from DingTalk server if it's a parsing error + # Return OK to avoid retry loop from DingTalk server return AckMessage.STATUS_OK, "Error" + class DingTalkChannel(BaseChannel): """ DingTalk channel using Stream Mode. - + Uses WebSocket to receive events via `dingtalk-stream` SDK. - Uses direct HTTP API to send messages (since SDK is mainly for receiving). + Uses direct HTTP API to send messages (SDK is mainly for receiving). + + Note: Currently only supports private (1:1) chat. Group messages are + received but replies are sent back as private messages to the sender. """ - + name = "dingtalk" - + def __init__(self, config: DingTalkConfig, bus: MessageBus): super().__init__(config, bus) self.config: DingTalkConfig = config self._client: Any = None - self._loop: asyncio.AbstractEventLoop | None = None - + self._http: httpx.AsyncClient | None = None + # Access Token management for sending messages self._access_token: str | None = None self._token_expiry: float = 0 - + + # Hold references to background tasks to prevent GC + self._background_tasks: set[asyncio.Task] = set() + async def start(self) -> None: """Start the DingTalk bot with Stream Mode.""" try: if not DINGTALK_AVAILABLE: - logger.error("DingTalk Stream SDK not installed. Run: pip install dingtalk-stream") + logger.error( + "DingTalk Stream SDK not installed. Run: pip install dingtalk-stream" + ) return - + if not self.config.client_id or not self.config.client_secret: logger.error("DingTalk client_id and client_secret not configured") return - + self._running = True - self._loop = asyncio.get_running_loop() - - logger.info(f"Initializing DingTalk Stream Client with Client ID: {self.config.client_id}...") + self._http = httpx.AsyncClient() + + logger.info( + f"Initializing DingTalk Stream Client with Client ID: {self.config.client_id}..." + ) credential = Credential(self.config.client_id, self.config.client_secret) self._client = DingTalkStreamClient(credential) - + # Register standard handler handler = NanobotDingTalkHandler(self) - - # Register using the chatbot topic standard for bots - self._client.register_callback_handler( - ChatbotMessage.TOPIC, - handler - ) - + self._client.register_callback_handler(ChatbotMessage.TOPIC, handler) + logger.info("DingTalk bot started with Stream Mode") - - # The client.start() method is an async infinite loop that handles the websocket connection + + # client.start() is an async infinite loop handling the websocket connection await self._client.start() except Exception as e: logger.exception(f"Failed to start DingTalk channel: {e}") - + async def stop(self) -> None: """Stop the DingTalk bot.""" self._running = False - # SDK doesn't expose a clean stop method that cancels loop immediately without private access - pass + # Close the shared HTTP client + if self._http: + await self._http.aclose() + self._http = None + # Cancel outstanding background tasks + for task in self._background_tasks: + task.cancel() + self._background_tasks.clear() async def _get_access_token(self) -> str | None: """Get or refresh Access Token.""" if self._access_token and time.time() < self._token_expiry: return self._access_token - + url = "https://api.dingtalk.com/v1.0/oauth2/accessToken" data = { "appKey": self.config.client_id, - "appSecret": self.config.client_secret + "appSecret": self.config.client_secret, } - + + if not self._http: + logger.warning("DingTalk HTTP client not initialized, cannot refresh token") + return None + try: - async with httpx.AsyncClient() as client: - resp = await client.post(url, json=data) - resp.raise_for_status() - res_data = resp.json() - self._access_token = res_data.get("accessToken") - # Expire 60s early to be safe - self._token_expiry = time.time() + int(res_data.get("expireIn", 7200)) - 60 - return self._access_token + resp = await self._http.post(url, json=data) + resp.raise_for_status() + res_data = resp.json() + self._access_token = res_data.get("accessToken") + # Expire 60s early to be safe + self._token_expiry = time.time() + int(res_data.get("expireIn", 7200)) - 60 + return self._access_token except Exception as e: logger.error(f"Failed to get DingTalk access token: {e}") return None @@ -163,57 +187,52 @@ class DingTalkChannel(BaseChannel): token = await self._get_access_token() if not token: return - - # This endpoint is for sending to a single user in a bot chat + + # oToMessages/batchSend: sends to individual users (private chat) # https://open.dingtalk.com/document/orgapp/robot-batch-send-messages url = "https://api.dingtalk.com/v1.0/robot/oToMessages/batchSend" - - headers = { - "x-acs-dingtalk-access-token": token - } - - # Convert markdown code blocks for basic compatibility if needed, - # but DingTalk supports markdown loosely. - + + headers = {"x-acs-dingtalk-access-token": token} + data = { "robotCode": self.config.client_id, - "userIds": [msg.chat_id], # chat_id is the user's staffId/unionId - "msgKey": "sampleMarkdown", # Using markdown template + "userIds": [msg.chat_id], # chat_id is the user's staffId + "msgKey": "sampleMarkdown", "msgParam": json.dumps({ "text": msg.content, - "title": "Nanobot Reply" - }) + "title": "Nanobot Reply", + }), } - + + if not self._http: + logger.warning("DingTalk HTTP client not initialized, cannot send") + return + try: - async with httpx.AsyncClient() as client: - resp = await client.post(url, json=data, headers=headers) - # Check 200 OK but also API error codes if any - if resp.status_code != 200: - logger.error(f"DingTalk send failed: {resp.text}") - else: - logger.debug(f"DingTalk message sent to {msg.chat_id}") + resp = await self._http.post(url, json=data, headers=headers) + if resp.status_code != 200: + logger.error(f"DingTalk send failed: {resp.text}") + else: + logger.debug(f"DingTalk message sent to {msg.chat_id}") except Exception as e: logger.error(f"Error sending DingTalk message: {e}") async def _on_message(self, content: str, sender_id: str, sender_name: str) -> None: - """Handle incoming message (called by NanobotDingTalkHandler).""" + """Handle incoming message (called by NanobotDingTalkHandler). + + Delegates to BaseChannel._handle_message() which enforces allow_from + permission checks before publishing to the bus. + """ try: logger.info(f"DingTalk inbound: {content} from {sender_name}") - - # Correct InboundMessage usage based on events.py definition - # @dataclass class InboundMessage: - # channel: str, sender_id: str, chat_id: str, content: str, ... - msg = InboundMessage( - channel=self.name, + await self._handle_message( sender_id=sender_id, - chat_id=sender_id, # For private stats, chat_id is sender_id + chat_id=sender_id, # For private chat, chat_id == sender_id content=str(content), metadata={ "sender_name": sender_name, - "platform": "dingtalk" - } + "platform": "dingtalk", + }, ) - await self.bus.publish_inbound(msg) except Exception as e: logger.error(f"Error publishing DingTalk message: {e}") From dfa173323c1641983b51223b1a6310b61e43e56b Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 18:23:43 +0000 Subject: [PATCH 24/33] =?UTF-8?q?refactor(cli):=20simplify=20input=20handl?= =?UTF-8?q?ing=20=E2=80=94=20drop=20prompt-toolkit,=20use=20readline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nanobot/cli/commands.py | 201 ++-------------------------------------- pyproject.toml | 1 - 2 files changed, 10 insertions(+), 192 deletions(-) diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 5d198a5..c90ecde 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -6,7 +6,6 @@ import os from pathlib import Path import select import sys -from typing import Any import typer from rich.console import Console @@ -21,12 +20,15 @@ app = typer.Typer( ) console = Console() -_READLINE: Any | None = None + +# --------------------------------------------------------------------------- +# Lightweight CLI input: readline for arrow keys / history, termios for flush +# --------------------------------------------------------------------------- + +_READLINE = None _HISTORY_FILE: Path | None = None _HISTORY_HOOK_REGISTERED = False _USING_LIBEDIT = False -_PROMPT_SESSION: Any | None = None -_PROMPT_SESSION_LABEL: Any = None def _flush_pending_tty_input() -> None: @@ -40,7 +42,6 @@ def _flush_pending_tty_input() -> None: try: import termios - termios.tcflush(fd, termios.TCIFLUSH) return except Exception: @@ -67,75 +68,16 @@ def _save_history() -> None: def _enable_line_editing() -> None: - """Best-effort enable readline/libedit line editing for arrow keys/history.""" + """Enable readline for arrow keys, line editing, and persistent history.""" global _READLINE, _HISTORY_FILE, _HISTORY_HOOK_REGISTERED, _USING_LIBEDIT - global _PROMPT_SESSION, _PROMPT_SESSION_LABEL history_file = Path.home() / ".nanobot" / "history" / "cli_history" history_file.parent.mkdir(parents=True, exist_ok=True) _HISTORY_FILE = history_file - # Preferred path: prompt_toolkit handles wrapped wide-char rendering better. - try: - from prompt_toolkit import PromptSession - from prompt_toolkit.formatted_text import ANSI - from prompt_toolkit.history import FileHistory - from prompt_toolkit.key_binding import KeyBindings - - key_bindings = KeyBindings() - - @key_bindings.add("enter") - def _accept_input(event) -> None: - _clear_visual_nav_state(event.current_buffer) - event.current_buffer.validate_and_handle() - - @key_bindings.add("up") - def _handle_up(event) -> None: - count = event.arg if event.arg and event.arg > 0 else 1 - moved = _move_buffer_cursor_visual_from_render( - buffer=event.current_buffer, - event=event, - delta=-1, - count=count, - ) - if not moved: - event.current_buffer.history_backward(count=count) - _clear_visual_nav_state(event.current_buffer) - - @key_bindings.add("down") - def _handle_down(event) -> None: - count = event.arg if event.arg and event.arg > 0 else 1 - moved = _move_buffer_cursor_visual_from_render( - buffer=event.current_buffer, - event=event, - delta=1, - count=count, - ) - if not moved: - event.current_buffer.history_forward(count=count) - _clear_visual_nav_state(event.current_buffer) - - _PROMPT_SESSION = PromptSession( - history=FileHistory(str(history_file)), - multiline=True, - wrap_lines=True, - complete_while_typing=False, - key_bindings=key_bindings, - ) - _PROMPT_SESSION.default_buffer.on_text_changed += ( - lambda _event: _clear_visual_nav_state(_PROMPT_SESSION.default_buffer) - ) - _PROMPT_SESSION_LABEL = ANSI("\x1b[1;34mYou:\x1b[0m ") - _READLINE = None - _USING_LIBEDIT = False - return - except Exception: - _PROMPT_SESSION = None - _PROMPT_SESSION_LABEL = None - try: import readline - except Exception: + except ImportError: return _READLINE = readline @@ -170,137 +112,14 @@ def _prompt_text() -> str: return "\001\033[1;34m\002You:\001\033[0m\002 " -def _read_interactive_input() -> str: - """Read user input with stable prompt rendering (sync fallback).""" - return input(_prompt_text()) - - async def _read_interactive_input_async() -> str: - """Read user input safely inside the interactive asyncio loop.""" - if _PROMPT_SESSION is not None: - try: - return await _PROMPT_SESSION.prompt_async(_PROMPT_SESSION_LABEL) - except EOFError as exc: - raise KeyboardInterrupt from exc + """Read user input with arrow keys and history (runs input() in a thread).""" try: - return await asyncio.to_thread(_read_interactive_input) + return await asyncio.to_thread(input, _prompt_text()) except EOFError as exc: raise KeyboardInterrupt from exc -def _choose_visual_rowcol( - rowcol_to_yx: dict[tuple[int, int], tuple[int, int]], - current_rowcol: tuple[int, int], - delta: int, - preferred_x: int | None = None, -) -> tuple[tuple[int, int] | None, int | None]: - """Choose next logical row/col by rendered screen coordinates.""" - if delta not in (-1, 1): - return None, preferred_x - - current_yx = rowcol_to_yx.get(current_rowcol) - if current_yx is None: - same_row = [ - (rowcol, yx) - for rowcol, yx in rowcol_to_yx.items() - if rowcol[0] == current_rowcol[0] - ] - if not same_row: - return None, preferred_x - _, current_yx = min(same_row, key=lambda item: abs(item[0][1] - current_rowcol[1])) - - target_x = current_yx[1] if preferred_x is None else preferred_x - target_y = current_yx[0] + delta - candidates = [(rowcol, yx) for rowcol, yx in rowcol_to_yx.items() if yx[0] == target_y] - if not candidates: - return None, preferred_x - - best_rowcol, _ = min( - candidates, - key=lambda item: (abs(item[1][1] - target_x), item[1][1] < target_x, item[1][1]), - ) - return best_rowcol, target_x - - -def _clear_visual_nav_state(buffer: Any) -> None: - """Reset cached vertical-navigation anchor state.""" - setattr(buffer, "_nanobot_visual_pref_x", None) - setattr(buffer, "_nanobot_visual_last_dir", None) - setattr(buffer, "_nanobot_visual_last_cursor", None) - setattr(buffer, "_nanobot_visual_last_text", None) - - -def _can_reuse_visual_anchor(buffer: Any, delta: int) -> bool: - """Reuse anchor only for uninterrupted vertical navigation.""" - return ( - getattr(buffer, "_nanobot_visual_last_dir", None) == delta - and getattr(buffer, "_nanobot_visual_last_cursor", None) == buffer.cursor_position - and getattr(buffer, "_nanobot_visual_last_text", None) == buffer.text - ) - - -def _remember_visual_anchor(buffer: Any, delta: int) -> None: - """Remember current state as anchor baseline for repeated up/down.""" - setattr(buffer, "_nanobot_visual_last_dir", delta) - setattr(buffer, "_nanobot_visual_last_cursor", buffer.cursor_position) - setattr(buffer, "_nanobot_visual_last_text", buffer.text) - - -def _move_buffer_cursor_visual_from_render( - buffer: Any, - event: Any, - delta: int, - count: int, -) -> bool: - """Move cursor across rendered screen rows (soft-wrap/CJK aware).""" - try: - window = event.app.layout.current_window - render_info = getattr(window, "render_info", None) - rowcol_to_yx = getattr(render_info, "_rowcol_to_yx", None) - if not isinstance(rowcol_to_yx, dict) or not rowcol_to_yx: - return False - except Exception: - return False - - moved_any = False - preferred_x = ( - getattr(buffer, "_nanobot_visual_pref_x", None) - if _can_reuse_visual_anchor(buffer, delta) - else None - ) - steps = max(1, count) - - for _ in range(steps): - doc = buffer.document - current_rowcol = (doc.cursor_position_row, doc.cursor_position_col) - next_rowcol, preferred_x = _choose_visual_rowcol( - rowcol_to_yx=rowcol_to_yx, - current_rowcol=current_rowcol, - delta=delta, - preferred_x=preferred_x, - ) - if next_rowcol is None: - break - - try: - new_position = doc.translate_row_col_to_index(*next_rowcol) - except Exception: - break - if new_position == buffer.cursor_position: - break - - buffer.cursor_position = new_position - moved_any = True - - if moved_any: - setattr(buffer, "_nanobot_visual_pref_x", preferred_x) - _remember_visual_anchor(buffer, delta) - else: - _clear_visual_nav_state(buffer) - - return moved_any - - def version_callback(value: bool): if value: console.print(f"{__logo__} nanobot v{__version__}") diff --git a/pyproject.toml b/pyproject.toml index 3669ee5..6fda084 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,6 @@ dependencies = [ "python-telegram-bot[socks]>=21.0", "lark-oapi>=1.0.0", "socksio>=1.0.0", - "prompt-toolkit>=3.0.47", ] [project.optional-dependencies] From b4217b26906d06d500d35de715801db42554ab25 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 18:26:06 +0000 Subject: [PATCH 25/33] chore: remove test file from tracking --- tests/test_cli_input_minimal.py | 56 --------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 tests/test_cli_input_minimal.py diff --git a/tests/test_cli_input_minimal.py b/tests/test_cli_input_minimal.py deleted file mode 100644 index 4726ea3..0000000 --- a/tests/test_cli_input_minimal.py +++ /dev/null @@ -1,56 +0,0 @@ -import builtins - -import nanobot.cli.commands as commands - - -def test_read_interactive_input_uses_plain_input(monkeypatch) -> None: - captured: dict[str, str] = {} - def fake_input(prompt: str = "") -> str: - captured["prompt"] = prompt - return "hello" - - monkeypatch.setattr(builtins, "input", fake_input) - monkeypatch.setattr(commands, "_PROMPT_SESSION", None) - monkeypatch.setattr(commands, "_READLINE", None) - - value = commands._read_interactive_input() - - assert value == "hello" - assert captured["prompt"] == "You: " - - -def test_read_interactive_input_prefers_prompt_session(monkeypatch) -> None: - captured: dict[str, object] = {} - - class FakePromptSession: - async def prompt_async(self, label: object) -> str: - captured["label"] = label - return "hello" - - monkeypatch.setattr(commands, "_PROMPT_SESSION", FakePromptSession()) - monkeypatch.setattr(commands, "_PROMPT_SESSION_LABEL", "LBL") - - value = __import__("asyncio").run(commands._read_interactive_input_async()) - - assert value == "hello" - assert captured["label"] == "LBL" - - -def test_prompt_text_for_readline_modes(monkeypatch) -> None: - monkeypatch.setattr(commands, "_READLINE", object()) - monkeypatch.setattr(commands, "_USING_LIBEDIT", True) - assert commands._prompt_text() == "\033[1;34mYou:\033[0m " - - monkeypatch.setattr(commands, "_USING_LIBEDIT", False) - assert "\001" in commands._prompt_text() - - -def test_flush_pending_tty_input_skips_non_tty(monkeypatch) -> None: - class FakeStdin: - def fileno(self) -> int: - return 0 - - monkeypatch.setattr(commands.sys, "stdin", FakeStdin()) - monkeypatch.setattr(commands.os, "isatty", lambda _fd: False) - - commands._flush_pending_tty_input() From 2931694eb893b4d108e78df79c40621122589e8f Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 18:37:41 +0000 Subject: [PATCH 26/33] fix: preserve reasoning_content in conversation history for thinking models --- README.md | 2 +- nanobot/agent/context.py | 8 +++++++- nanobot/agent/loop.py | 6 ++++-- nanobot/providers/base.py | 1 + nanobot/providers/litellm_provider.py | 3 +++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 326f253..d3dcaf7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ⚡️ Delivers core agent functionality in just **~4,000** lines of code — **99% smaller** than Clawdbot's 430k+ lines. -📏 Real-time line count: **3,429 lines** (run `bash core_agent_lines.sh` to verify anytime) +📏 Real-time line count: **3,437 lines** (run `bash core_agent_lines.sh` to verify anytime) ## 📢 News diff --git a/nanobot/agent/context.py b/nanobot/agent/context.py index 3ea6c04..d807854 100644 --- a/nanobot/agent/context.py +++ b/nanobot/agent/context.py @@ -207,7 +207,8 @@ When remembering something, write to {workspace_path}/memory/MEMORY.md""" self, messages: list[dict[str, Any]], content: str | None, - tool_calls: list[dict[str, Any]] | None = None + tool_calls: list[dict[str, Any]] | None = None, + reasoning_content: str | None = None, ) -> list[dict[str, Any]]: """ Add an assistant message to the message list. @@ -216,6 +217,7 @@ When remembering something, write to {workspace_path}/memory/MEMORY.md""" messages: Current message list. content: Message content. tool_calls: Optional tool calls. + reasoning_content: Thinking output (Kimi, DeepSeek-R1, etc.). Returns: Updated message list. @@ -225,5 +227,9 @@ When remembering something, write to {workspace_path}/memory/MEMORY.md""" if tool_calls: msg["tool_calls"] = tool_calls + # Thinking models reject history without this + if reasoning_content: + msg["reasoning_content"] = reasoning_content + messages.append(msg) return messages diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.py index a65f3a5..72ea86a 100644 --- a/nanobot/agent/loop.py +++ b/nanobot/agent/loop.py @@ -213,7 +213,8 @@ class AgentLoop: for tc in response.tool_calls ] messages = self.context.add_assistant_message( - messages, response.content, tool_call_dicts + messages, response.content, tool_call_dicts, + reasoning_content=response.reasoning_content, ) # Execute tools @@ -317,7 +318,8 @@ class AgentLoop: for tc in response.tool_calls ] messages = self.context.add_assistant_message( - messages, response.content, tool_call_dicts + messages, response.content, tool_call_dicts, + reasoning_content=response.reasoning_content, ) for tool_call in response.tool_calls: diff --git a/nanobot/providers/base.py b/nanobot/providers/base.py index 08e44ac..c69c38b 100644 --- a/nanobot/providers/base.py +++ b/nanobot/providers/base.py @@ -20,6 +20,7 @@ class LLMResponse: tool_calls: list[ToolCallRequest] = field(default_factory=list) finish_reason: str = "stop" usage: dict[str, int] = field(default_factory=dict) + reasoning_content: str | None = None # Kimi, DeepSeek-R1 etc. @property def has_tool_calls(self) -> bool: diff --git a/nanobot/providers/litellm_provider.py b/nanobot/providers/litellm_provider.py index 5e9c22f..621a71d 100644 --- a/nanobot/providers/litellm_provider.py +++ b/nanobot/providers/litellm_provider.py @@ -183,11 +183,14 @@ class LiteLLMProvider(LLMProvider): "total_tokens": response.usage.total_tokens, } + reasoning_content = getattr(message, "reasoning_content", None) + return LLMResponse( content=message.content, tool_calls=tool_calls, finish_reason=choice.finish_reason or "stop", usage=usage, + reasoning_content=reasoning_content, ) def get_default_model(self) -> str: From eb2fbf80dac6a6ea0f21bd8257bea431fffc16e0 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 19:31:25 +0000 Subject: [PATCH 27/33] fix: use config key to detect provider, prevent api_base misidentifying as vLLM --- README.md | 2 +- nanobot/cli/commands.py | 1 + nanobot/config/schema.py | 35 ++++++++++++++------- nanobot/providers/litellm_provider.py | 45 +++++++++++++-------------- nanobot/providers/registry.py | 33 +++++++++++++++----- 5 files changed, 72 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index d3dcaf7..cb2c64a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ⚡️ Delivers core agent functionality in just **~4,000** lines of code — **99% smaller** than Clawdbot's 430k+ lines. -📏 Real-time line count: **3,437 lines** (run `bash core_agent_lines.sh` to verify anytime) +📏 Real-time line count: **3,448 lines** (run `bash core_agent_lines.sh` to verify anytime) ## 📢 News diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index c90ecde..59ed9e1 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -263,6 +263,7 @@ def _make_provider(config): api_base=config.get_api_base(), default_model=model, extra_headers=p.extra_headers if p else None, + provider_name=config.get_provider_name(), ) diff --git a/nanobot/config/schema.py b/nanobot/config/schema.py index ea2f1c1..edea307 100644 --- a/nanobot/config/schema.py +++ b/nanobot/config/schema.py @@ -134,8 +134,8 @@ class Config(BaseSettings): """Get expanded workspace path.""" return Path(self.agents.defaults.workspace).expanduser() - def get_provider(self, model: str | None = None) -> ProviderConfig | None: - """Get matched provider config (api_key, api_base, extra_headers). Falls back to first available.""" + def _match_provider(self, model: str | None = None) -> tuple["ProviderConfig | None", str | None]: + """Match provider config and its registry name. Returns (config, spec_name).""" from nanobot.providers.registry import PROVIDERS model_lower = (model or self.agents.defaults.model).lower() @@ -143,14 +143,24 @@ class Config(BaseSettings): for spec in PROVIDERS: p = getattr(self.providers, spec.name, None) if p and any(kw in model_lower for kw in spec.keywords) and p.api_key: - return p + return p, spec.name # Fallback: gateways first, then others (follows registry order) for spec in PROVIDERS: p = getattr(self.providers, spec.name, None) if p and p.api_key: - return p - return None + return p, spec.name + return None, None + + def get_provider(self, model: str | None = None) -> ProviderConfig | None: + """Get matched provider config (api_key, api_base, extra_headers). Falls back to first available.""" + p, _ = self._match_provider(model) + return p + + def get_provider_name(self, model: str | None = None) -> str | None: + """Get the registry name of the matched provider (e.g. "deepseek", "openrouter").""" + _, name = self._match_provider(model) + return name def get_api_key(self, model: str | None = None) -> str | None: """Get API key for the given model. Falls back to first available key.""" @@ -159,15 +169,16 @@ class Config(BaseSettings): def get_api_base(self, model: str | None = None) -> str | None: """Get API base URL for the given model. Applies default URLs for known gateways.""" - from nanobot.providers.registry import PROVIDERS - p = self.get_provider(model) + from nanobot.providers.registry import find_by_name + p, name = self._match_provider(model) if p and p.api_base: return p.api_base - # Only gateways get a default URL here. Standard providers (like Moonshot) - # handle their base URL via env vars in _setup_env, NOT via api_base — - # otherwise find_gateway() would misdetect them as local/vLLM. - for spec in PROVIDERS: - if spec.is_gateway and spec.default_api_base and p == getattr(self.providers, spec.name, None): + # Only gateways get a default api_base here. Standard providers + # (like Moonshot) set their base URL via env vars in _setup_env + # to avoid polluting the global litellm.api_base. + if name: + spec = find_by_name(name) + if spec and spec.is_gateway and spec.default_api_base: return spec.default_api_base return None diff --git a/nanobot/providers/litellm_provider.py b/nanobot/providers/litellm_provider.py index 621a71d..33c300a 100644 --- a/nanobot/providers/litellm_provider.py +++ b/nanobot/providers/litellm_provider.py @@ -26,18 +26,16 @@ class LiteLLMProvider(LLMProvider): api_base: str | None = None, default_model: str = "anthropic/claude-opus-4-5", extra_headers: dict[str, str] | None = None, + provider_name: str | None = None, ): super().__init__(api_key, api_base) self.default_model = default_model self.extra_headers = extra_headers or {} - # Detect gateway / local deployment from api_key and api_base - self._gateway = find_gateway(api_key, api_base) - - # Backwards-compatible flags (used by tests and possibly external code) - self.is_openrouter = bool(self._gateway and self._gateway.name == "openrouter") - self.is_aihubmix = bool(self._gateway and self._gateway.name == "aihubmix") - self.is_vllm = bool(self._gateway and self._gateway.is_local) + # Detect gateway / local deployment. + # provider_name (from config key) is the primary signal; + # api_key / api_base are fallback for auto-detection. + self._gateway = find_gateway(provider_name, api_key, api_base) # Configure environment variables if api_key: @@ -51,23 +49,24 @@ class LiteLLMProvider(LLMProvider): def _setup_env(self, api_key: str, api_base: str | None, model: str) -> None: """Set environment variables based on detected provider.""" - if self._gateway: - # Gateway / local: direct set (not setdefault) - os.environ[self._gateway.env_key] = api_key + spec = self._gateway or find_by_model(model) + if not spec: return - - # Standard provider: match by model name - spec = find_by_model(model) - if spec: + + # Gateway/local overrides existing env; standard provider doesn't + if self._gateway: + os.environ[spec.env_key] = api_key + else: os.environ.setdefault(spec.env_key, api_key) - # Resolve env_extras placeholders: - # {api_key} → user's API key - # {api_base} → user's api_base, falling back to spec.default_api_base - effective_base = api_base or spec.default_api_base - for env_name, env_val in spec.env_extras: - resolved = env_val.replace("{api_key}", api_key) - resolved = resolved.replace("{api_base}", effective_base) - os.environ.setdefault(env_name, resolved) + + # Resolve env_extras placeholders: + # {api_key} → user's API key + # {api_base} → user's api_base, falling back to spec.default_api_base + effective_base = api_base or spec.default_api_base + for env_name, env_val in spec.env_extras: + resolved = env_val.replace("{api_key}", api_key) + resolved = resolved.replace("{api_base}", effective_base) + os.environ.setdefault(env_name, resolved) def _resolve_model(self, model: str) -> str: """Resolve model name by applying provider/gateway prefixes.""" @@ -131,7 +130,7 @@ class LiteLLMProvider(LLMProvider): # Apply model-specific overrides (e.g. kimi-k2.5 temperature) self._apply_model_overrides(model, kwargs) - # Pass api_base directly for custom endpoints (vLLM, etc.) + # Pass api_base for custom endpoints if self.api_base: kwargs["api_base"] = self.api_base diff --git a/nanobot/providers/registry.py b/nanobot/providers/registry.py index aa4a76e..57db4dd 100644 --- a/nanobot/providers/registry.py +++ b/nanobot/providers/registry.py @@ -241,11 +241,10 @@ PROVIDERS: tuple[ProviderSpec, ...] = ( ), ), - # === Local deployment (fallback: unknown api_base → assume local) ====== + # === Local deployment (matched by config key, NOT by api_base) ========= # vLLM / any OpenAI-compatible local server. - # If api_base is set but doesn't match a known gateway, we land here. - # Placed before Groq so vLLM wins the fallback when both are configured. + # Detected when config key is "vllm" (provider_name="vllm"). ProviderSpec( name="vllm", keywords=("vllm",), @@ -302,16 +301,34 @@ def find_by_model(model: str) -> ProviderSpec | None: return None -def find_gateway(api_key: str | None, api_base: str | None) -> ProviderSpec | None: - """Detect gateway/local by api_key prefix or api_base substring. - Fallback: unknown api_base → treat as local (vLLM).""" +def find_gateway( + provider_name: str | None = None, + api_key: str | None = None, + api_base: str | None = None, +) -> ProviderSpec | None: + """Detect gateway/local provider. + + Priority: + 1. provider_name — if it maps to a gateway/local spec, use it directly. + 2. api_key prefix — e.g. "sk-or-" → OpenRouter. + 3. api_base keyword — e.g. "aihubmix" in URL → AiHubMix. + + A standard provider with a custom api_base (e.g. DeepSeek behind a proxy) + will NOT be mistaken for vLLM — the old fallback is gone. + """ + # 1. Direct match by config key + if provider_name: + spec = find_by_name(provider_name) + if spec and (spec.is_gateway or spec.is_local): + return spec + + # 2. Auto-detect by api_key prefix / api_base keyword for spec in PROVIDERS: if spec.detect_by_key_prefix and api_key and api_key.startswith(spec.detect_by_key_prefix): return spec if spec.detect_by_base_keyword and api_base and spec.detect_by_base_keyword in api_base: return spec - if api_base: - return next((s for s in PROVIDERS if s.is_local), None) + return None From 25e17717c20cd67d52e65f846efa7fc788c1bfc8 Mon Sep 17 00:00:00 2001 From: Re-bin Date: Sun, 8 Feb 2026 19:36:53 +0000 Subject: [PATCH 28/33] fix: restore terminal state on Ctrl+C exit in agent interactive mode --- nanobot/cli/commands.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 59ed9e1..fed9bbe 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -3,6 +3,7 @@ import asyncio import atexit import os +import signal from pathlib import Path import select import sys @@ -29,6 +30,7 @@ _READLINE = None _HISTORY_FILE: Path | None = None _HISTORY_HOOK_REGISTERED = False _USING_LIBEDIT = False +_SAVED_TERM_ATTRS = None # original termios settings, restored on exit def _flush_pending_tty_input() -> None: @@ -67,9 +69,27 @@ def _save_history() -> None: return +def _restore_terminal() -> None: + """Restore terminal to its original state (echo, line buffering, etc.).""" + if _SAVED_TERM_ATTRS is None: + return + try: + import termios + termios.tcsetattr(sys.stdin.fileno(), termios.TCSADRAIN, _SAVED_TERM_ATTRS) + except Exception: + pass + + def _enable_line_editing() -> None: """Enable readline for arrow keys, line editing, and persistent history.""" - global _READLINE, _HISTORY_FILE, _HISTORY_HOOK_REGISTERED, _USING_LIBEDIT + global _READLINE, _HISTORY_FILE, _HISTORY_HOOK_REGISTERED, _USING_LIBEDIT, _SAVED_TERM_ATTRS + + # Save terminal state before readline touches it + try: + import termios + _SAVED_TERM_ATTRS = termios.tcgetattr(sys.stdin.fileno()) + except Exception: + pass history_file = Path.home() / ".nanobot" / "history" / "cli_history" history_file.parent.mkdir(parents=True, exist_ok=True) @@ -421,6 +441,16 @@ def agent( # Interactive mode _enable_line_editing() console.print(f"{__logo__} Interactive mode (Ctrl+C to exit)\n") + + # input() runs in a worker thread that can't be cancelled. + # Without this handler, asyncio.run() would hang waiting for it. + def _exit_on_sigint(signum, frame): + _save_history() + _restore_terminal() + console.print("\nGoodbye!") + os._exit(0) + + signal.signal(signal.SIGINT, _exit_on_sigint) async def run_interactive(): while True: @@ -433,6 +463,8 @@ def agent( response = await agent_loop.process_direct(user_input, session_id) console.print(f"\n{__logo__} {response}\n") except KeyboardInterrupt: + _save_history() + _restore_terminal() console.print("\nGoodbye!") break From 0a2d557268c98bc5d9290aabbd8b0604b4e0d717 Mon Sep 17 00:00:00 2001 From: Chris Alexander <2815297+chris-alexander@users.noreply.github.com> Date: Sun, 8 Feb 2026 20:50:31 +0000 Subject: [PATCH 29/33] Improve agent CLI chat UX with markdown output and clearer interaction feedback --- nanobot/cli/commands.py | 268 ++++++++++++++++++++++++---------------- 1 file changed, 161 insertions(+), 107 deletions(-) diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index fed9bbe..4ae2132 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -10,7 +10,10 @@ import sys import typer from rich.console import Console +from rich.markdown import Markdown +from rich.panel import Panel from rich.table import Table +from rich.text import Text from nanobot import __version__, __logo__ @@ -21,6 +24,30 @@ app = typer.Typer( ) console = Console() +EXIT_COMMANDS = {"exit", "quit", "/exit", "/quit", ":q"} + + +def _print_agent_response(response: str, render_markdown: bool) -> None: + """Render assistant response with consistent terminal styling.""" + content = response or "" + body = Markdown(content) if render_markdown else Text(content) + console.print() + console.print( + Panel( + body, + title=f"{__logo__} Nanobot", + title_align="left", + border_style="cyan", + padding=(0, 1), + ) + ) + console.print() + + +def _is_exit_command(command: str) -> bool: + """Return True when input should end interactive chat.""" + return command.lower() in EXIT_COMMANDS + # --------------------------------------------------------------------------- # Lightweight CLI input: readline for arrow keys / history, termios for flush @@ -44,6 +71,7 @@ def _flush_pending_tty_input() -> None: try: import termios + termios.tcflush(fd, termios.TCIFLUSH) return except Exception: @@ -75,6 +103,7 @@ def _restore_terminal() -> None: return try: import termios + termios.tcsetattr(sys.stdin.fileno(), termios.TCSADRAIN, _SAVED_TERM_ATTRS) except Exception: pass @@ -87,6 +116,7 @@ def _enable_line_editing() -> None: # Save terminal state before readline touches it try: import termios + _SAVED_TERM_ATTRS = termios.tcgetattr(sys.stdin.fileno()) except Exception: pass @@ -148,9 +178,7 @@ def version_callback(value: bool): @app.callback() def main( - version: bool = typer.Option( - None, "--version", "-v", callback=version_callback, is_eager=True - ), + version: bool = typer.Option(None, "--version", "-v", callback=version_callback, is_eager=True), ): """nanobot - Personal AI Assistant.""" pass @@ -167,34 +195,34 @@ def onboard(): from nanobot.config.loader import get_config_path, save_config from nanobot.config.schema import Config from nanobot.utils.helpers import get_workspace_path - + config_path = get_config_path() - + if config_path.exists(): console.print(f"[yellow]Config already exists at {config_path}[/yellow]") if not typer.confirm("Overwrite?"): raise typer.Exit() - + # Create default config config = Config() save_config(config) console.print(f"[green]✓[/green] Created config at {config_path}") - + # Create workspace workspace = get_workspace_path() console.print(f"[green]✓[/green] Created workspace at {workspace}") - + # Create default bootstrap files _create_workspace_templates(workspace) - + console.print(f"\n{__logo__} nanobot is ready!") console.print("\nNext steps:") console.print(" 1. Add your API key to [cyan]~/.nanobot/config.json[/cyan]") console.print(" Get one at: https://openrouter.ai/keys") - console.print(" 2. Chat: [cyan]nanobot agent -m \"Hello!\"[/cyan]") - console.print("\n[dim]Want Telegram/WhatsApp? See: https://github.com/HKUDS/nanobot#-chat-apps[/dim]") - - + console.print(' 2. Chat: [cyan]nanobot agent -m "Hello!"[/cyan]') + console.print( + "\n[dim]Want Telegram/WhatsApp? See: https://github.com/HKUDS/nanobot#-chat-apps[/dim]" + ) def _create_workspace_templates(workspace: Path): @@ -238,13 +266,13 @@ Information about the user goes here. - Language: (your preferred language) """, } - + for filename, content in templates.items(): file_path = workspace / filename if not file_path.exists(): file_path.write_text(content) console.print(f" [dim]Created {filename}[/dim]") - + # Create memory directory and MEMORY.md memory_dir = workspace / "memory" memory_dir.mkdir(exist_ok=True) @@ -272,6 +300,7 @@ This file stores important information that should persist across sessions. def _make_provider(config): """Create LiteLLMProvider from config. Exits if no API key found.""" from nanobot.providers.litellm_provider import LiteLLMProvider + p = config.get_provider() model = config.agents.defaults.model if not (p and p.api_key) and not model.startswith("bedrock/"): @@ -306,22 +335,23 @@ def gateway( from nanobot.cron.service import CronService from nanobot.cron.types import CronJob from nanobot.heartbeat.service import HeartbeatService - + if verbose: import logging + logging.basicConfig(level=logging.DEBUG) - + console.print(f"{__logo__} Starting nanobot gateway on port {port}...") - + config = load_config() bus = MessageBus() provider = _make_provider(config) session_manager = SessionManager(config.workspace_path) - + # Create cron service first (callback set after agent creation) cron_store_path = get_data_dir() / "cron" / "jobs.json" cron = CronService(cron_store_path) - + # Create agent with cron service agent = AgentLoop( bus=bus, @@ -335,7 +365,7 @@ def gateway( restrict_to_workspace=config.tools.restrict_to_workspace, session_manager=session_manager, ) - + # Set cron callback (needs agent) async def on_cron_job(job: CronJob) -> str | None: """Execute a cron job through the agent.""" @@ -347,40 +377,44 @@ def gateway( ) if job.payload.deliver and job.payload.to: from nanobot.bus.events import OutboundMessage - await bus.publish_outbound(OutboundMessage( - channel=job.payload.channel or "cli", - chat_id=job.payload.to, - content=response or "" - )) + + await bus.publish_outbound( + OutboundMessage( + channel=job.payload.channel or "cli", + chat_id=job.payload.to, + content=response or "", + ) + ) return response + cron.on_job = on_cron_job - + # Create heartbeat service async def on_heartbeat(prompt: str) -> str: """Execute heartbeat through the agent.""" return await agent.process_direct(prompt, session_key="heartbeat") - + heartbeat = HeartbeatService( workspace=config.workspace_path, on_heartbeat=on_heartbeat, interval_s=30 * 60, # 30 minutes - enabled=True + enabled=True, ) - + # Create channel manager channels = ChannelManager(config, bus, session_manager=session_manager) - + if channels.enabled_channels: console.print(f"[green]✓[/green] Channels enabled: {', '.join(channels.enabled_channels)}") else: console.print("[yellow]Warning: No channels enabled[/yellow]") - + cron_status = cron.status() if cron_status["jobs"] > 0: console.print(f"[green]✓[/green] Cron: {cron_status['jobs']} scheduled jobs") - + console.print(f"[green]✓[/green] Heartbeat: every 30m") - + async def run(): try: await cron.start() @@ -395,12 +429,10 @@ def gateway( cron.stop() agent.stop() await channels.stop_all() - + asyncio.run(run()) - - # ============================================================================ # Agent Commands # ============================================================================ @@ -410,17 +442,29 @@ def gateway( def agent( message: str = typer.Option(None, "--message", "-m", help="Message to send to the agent"), session_id: str = typer.Option("cli:default", "--session", "-s", help="Session ID"), + markdown: bool = typer.Option( + True, "--markdown/--no-markdown", help="Render assistant output as Markdown" + ), + logs: bool = typer.Option( + False, "--logs/--no-logs", help="Show nanobot runtime logs during chat" + ), ): """Interact with the agent directly.""" from nanobot.config.loader import load_config from nanobot.bus.queue import MessageBus from nanobot.agent.loop import AgentLoop - + from loguru import logger + config = load_config() - + bus = MessageBus() provider = _make_provider(config) - + + if logs: + logger.enable("nanobot") + else: + logger.disable("nanobot") + agent_loop = AgentLoop( bus=bus, provider=provider, @@ -429,13 +473,14 @@ def agent( exec_config=config.tools.exec, restrict_to_workspace=config.tools.restrict_to_workspace, ) - + if message: # Single message mode async def run_once(): - response = await agent_loop.process_direct(message, session_id) - console.print(f"\n{__logo__} {response}") - + with console.status("[dim]Nanobot is thinking...[/dim]", spinner="dots"): + response = await agent_loop.process_direct(message, session_id) + _print_agent_response(response, render_markdown=markdown) + asyncio.run(run_once()) else: # Interactive mode @@ -451,23 +496,32 @@ def agent( os._exit(0) signal.signal(signal.SIGINT, _exit_on_sigint) - + async def run_interactive(): while True: try: _flush_pending_tty_input() user_input = await _read_interactive_input_async() - if not user_input.strip(): + command = user_input.strip() + if not command: continue - - response = await agent_loop.process_direct(user_input, session_id) - console.print(f"\n{__logo__} {response}\n") + + if _is_exit_command(command): + console.print("\nGoodbye!") + break + + with console.status("[dim]Nanobot is thinking...[/dim]", spinner="dots"): + response = await agent_loop.process_direct(user_input, session_id) + _print_agent_response(response, render_markdown=markdown) except KeyboardInterrupt: _save_history() _restore_terminal() console.print("\nGoodbye!") break - + except EOFError: + console.print("\nGoodbye!") + break + asyncio.run(run_interactive()) @@ -494,27 +548,15 @@ def channels_status(): # WhatsApp wa = config.channels.whatsapp - table.add_row( - "WhatsApp", - "✓" if wa.enabled else "✗", - wa.bridge_url - ) + table.add_row("WhatsApp", "✓" if wa.enabled else "✗", wa.bridge_url) dc = config.channels.discord - table.add_row( - "Discord", - "✓" if dc.enabled else "✗", - dc.gateway_url - ) - + table.add_row("Discord", "✓" if dc.enabled else "✗", dc.gateway_url) + # Telegram tg = config.channels.telegram tg_config = f"token: {tg.token[:10]}..." if tg.token else "[dim]not configured[/dim]" - table.add_row( - "Telegram", - "✓" if tg.enabled else "✗", - tg_config - ) + table.add_row("Telegram", "✓" if tg.enabled else "✗", tg_config) console.print(table) @@ -523,57 +565,57 @@ def _get_bridge_dir() -> Path: """Get the bridge directory, setting it up if needed.""" import shutil import subprocess - + # User's bridge location user_bridge = Path.home() / ".nanobot" / "bridge" - + # Check if already built if (user_bridge / "dist" / "index.js").exists(): return user_bridge - + # Check for npm if not shutil.which("npm"): console.print("[red]npm not found. Please install Node.js >= 18.[/red]") raise typer.Exit(1) - + # Find source bridge: first check package data, then source dir pkg_bridge = Path(__file__).parent.parent / "bridge" # nanobot/bridge (installed) src_bridge = Path(__file__).parent.parent.parent / "bridge" # repo root/bridge (dev) - + source = None if (pkg_bridge / "package.json").exists(): source = pkg_bridge elif (src_bridge / "package.json").exists(): source = src_bridge - + if not source: console.print("[red]Bridge source not found.[/red]") console.print("Try reinstalling: pip install --force-reinstall nanobot") raise typer.Exit(1) - + console.print(f"{__logo__} Setting up bridge...") - + # Copy to user directory user_bridge.parent.mkdir(parents=True, exist_ok=True) if user_bridge.exists(): shutil.rmtree(user_bridge) shutil.copytree(source, user_bridge, ignore=shutil.ignore_patterns("node_modules", "dist")) - + # Install and build try: console.print(" Installing dependencies...") subprocess.run(["npm", "install"], cwd=user_bridge, check=True, capture_output=True) - + console.print(" Building...") subprocess.run(["npm", "run", "build"], cwd=user_bridge, check=True, capture_output=True) - + console.print("[green]✓[/green] Bridge ready\n") except subprocess.CalledProcessError as e: console.print(f"[red]Build failed: {e}[/red]") if e.stderr: console.print(f"[dim]{e.stderr.decode()[:500]}[/dim]") raise typer.Exit(1) - + return user_bridge @@ -581,12 +623,12 @@ def _get_bridge_dir() -> Path: def channels_login(): """Link device via QR code.""" import subprocess - + bridge_dir = _get_bridge_dir() - + console.print(f"{__logo__} Starting bridge...") console.print("Scan the QR code to connect.\n") - + try: subprocess.run(["npm", "start"], cwd=bridge_dir, check=True) except subprocess.CalledProcessError as e: @@ -610,24 +652,25 @@ def cron_list( """List scheduled jobs.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + jobs = service.list_jobs(include_disabled=all) - + if not jobs: console.print("No scheduled jobs.") return - + table = Table(title="Scheduled Jobs") table.add_column("ID", style="cyan") table.add_column("Name") table.add_column("Schedule") table.add_column("Status") table.add_column("Next Run") - + import time + for job in jobs: # Format schedule if job.schedule.kind == "every": @@ -636,17 +679,19 @@ def cron_list( sched = job.schedule.expr or "" else: sched = "one-time" - + # Format next run next_run = "" if job.state.next_run_at_ms: - next_time = time.strftime("%Y-%m-%d %H:%M", time.localtime(job.state.next_run_at_ms / 1000)) + next_time = time.strftime( + "%Y-%m-%d %H:%M", time.localtime(job.state.next_run_at_ms / 1000) + ) next_run = next_time - + status = "[green]enabled[/green]" if job.enabled else "[dim]disabled[/dim]" - + table.add_row(job.id, job.name, sched, status, next_run) - + console.print(table) @@ -659,13 +704,15 @@ def cron_add( at: str = typer.Option(None, "--at", help="Run once at time (ISO format)"), deliver: bool = typer.Option(False, "--deliver", "-d", help="Deliver response to channel"), to: str = typer.Option(None, "--to", help="Recipient for delivery"), - channel: str = typer.Option(None, "--channel", help="Channel for delivery (e.g. 'telegram', 'whatsapp')"), + channel: str = typer.Option( + None, "--channel", help="Channel for delivery (e.g. 'telegram', 'whatsapp')" + ), ): """Add a scheduled job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService from nanobot.cron.types import CronSchedule - + # Determine schedule type if every: schedule = CronSchedule(kind="every", every_ms=every * 1000) @@ -673,15 +720,16 @@ def cron_add( schedule = CronSchedule(kind="cron", expr=cron_expr) elif at: import datetime + dt = datetime.datetime.fromisoformat(at) schedule = CronSchedule(kind="at", at_ms=int(dt.timestamp() * 1000)) else: console.print("[red]Error: Must specify --every, --cron, or --at[/red]") raise typer.Exit(1) - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + job = service.add_job( name=name, schedule=schedule, @@ -690,7 +738,7 @@ def cron_add( to=to, channel=channel, ) - + console.print(f"[green]✓[/green] Added job '{job.name}' ({job.id})") @@ -701,10 +749,10 @@ def cron_remove( """Remove a scheduled job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + if service.remove_job(job_id): console.print(f"[green]✓[/green] Removed job {job_id}") else: @@ -719,10 +767,10 @@ def cron_enable( """Enable or disable a job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + job = service.enable_job(job_id, enabled=not disable) if job: status = "disabled" if disable else "enabled" @@ -739,13 +787,13 @@ def cron_run( """Manually run a job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + async def run(): return await service.run_job(job_id, force=force) - + if asyncio.run(run()): console.print(f"[green]✓[/green] Job executed") else: @@ -768,14 +816,18 @@ def status(): console.print(f"{__logo__} nanobot Status\n") - console.print(f"Config: {config_path} {'[green]✓[/green]' if config_path.exists() else '[red]✗[/red]'}") - console.print(f"Workspace: {workspace} {'[green]✓[/green]' if workspace.exists() else '[red]✗[/red]'}") + console.print( + f"Config: {config_path} {'[green]✓[/green]' if config_path.exists() else '[red]✗[/red]'}" + ) + console.print( + f"Workspace: {workspace} {'[green]✓[/green]' if workspace.exists() else '[red]✗[/red]'}" + ) if config_path.exists(): from nanobot.providers.registry import PROVIDERS console.print(f"Model: {config.agents.defaults.model}") - + # Check API keys from registry for spec in PROVIDERS: p = getattr(config.providers, spec.name, None) @@ -789,7 +841,9 @@ def status(): console.print(f"{spec.label}: [dim]not set[/dim]") else: has_key = bool(p.api_key) - console.print(f"{spec.label}: {'[green]✓[/green]' if has_key else '[dim]not set[/dim]'}") + console.print( + f"{spec.label}: {'[green]✓[/green]' if has_key else '[dim]not set[/dim]'}" + ) if __name__ == "__main__": From 9c6ffa0d562de1ba7e776ffbe352be637c6ebdc1 Mon Sep 17 00:00:00 2001 From: Chris Alexander <2815297+chris-alexander@users.noreply.github.com> Date: Sun, 8 Feb 2026 21:07:02 +0000 Subject: [PATCH 30/33] Trim CLI patch to remove unrelated whitespace churn --- nanobot/cli/commands.py | 262 +++++++++++++++++++--------------------- 1 file changed, 126 insertions(+), 136 deletions(-) diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 4ae2132..875eb90 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -26,29 +26,6 @@ app = typer.Typer( console = Console() EXIT_COMMANDS = {"exit", "quit", "/exit", "/quit", ":q"} - -def _print_agent_response(response: str, render_markdown: bool) -> None: - """Render assistant response with consistent terminal styling.""" - content = response or "" - body = Markdown(content) if render_markdown else Text(content) - console.print() - console.print( - Panel( - body, - title=f"{__logo__} Nanobot", - title_align="left", - border_style="cyan", - padding=(0, 1), - ) - ) - console.print() - - -def _is_exit_command(command: str) -> bool: - """Return True when input should end interactive chat.""" - return command.lower() in EXIT_COMMANDS - - # --------------------------------------------------------------------------- # Lightweight CLI input: readline for arrow keys / history, termios for flush # --------------------------------------------------------------------------- @@ -71,7 +48,6 @@ def _flush_pending_tty_input() -> None: try: import termios - termios.tcflush(fd, termios.TCIFLUSH) return except Exception: @@ -103,7 +79,6 @@ def _restore_terminal() -> None: return try: import termios - termios.tcsetattr(sys.stdin.fileno(), termios.TCSADRAIN, _SAVED_TERM_ATTRS) except Exception: pass @@ -116,7 +91,6 @@ def _enable_line_editing() -> None: # Save terminal state before readline touches it try: import termios - _SAVED_TERM_ATTRS = termios.tcgetattr(sys.stdin.fileno()) except Exception: pass @@ -162,6 +136,28 @@ def _prompt_text() -> str: return "\001\033[1;34m\002You:\001\033[0m\002 " +def _print_agent_response(response: str, render_markdown: bool) -> None: + """Render assistant response with consistent terminal styling.""" + content = response or "" + body = Markdown(content) if render_markdown else Text(content) + console.print() + console.print( + Panel( + body, + title=f"{__logo__} Nanobot", + title_align="left", + border_style="cyan", + padding=(0, 1), + ) + ) + console.print() + + +def _is_exit_command(command: str) -> bool: + """Return True when input should end interactive chat.""" + return command.lower() in EXIT_COMMANDS + + async def _read_interactive_input_async() -> str: """Read user input with arrow keys and history (runs input() in a thread).""" try: @@ -178,7 +174,9 @@ def version_callback(value: bool): @app.callback() def main( - version: bool = typer.Option(None, "--version", "-v", callback=version_callback, is_eager=True), + version: bool = typer.Option( + None, "--version", "-v", callback=version_callback, is_eager=True + ), ): """nanobot - Personal AI Assistant.""" pass @@ -195,34 +193,34 @@ def onboard(): from nanobot.config.loader import get_config_path, save_config from nanobot.config.schema import Config from nanobot.utils.helpers import get_workspace_path - + config_path = get_config_path() - + if config_path.exists(): console.print(f"[yellow]Config already exists at {config_path}[/yellow]") if not typer.confirm("Overwrite?"): raise typer.Exit() - + # Create default config config = Config() save_config(config) console.print(f"[green]✓[/green] Created config at {config_path}") - + # Create workspace workspace = get_workspace_path() console.print(f"[green]✓[/green] Created workspace at {workspace}") - + # Create default bootstrap files _create_workspace_templates(workspace) - + console.print(f"\n{__logo__} nanobot is ready!") console.print("\nNext steps:") console.print(" 1. Add your API key to [cyan]~/.nanobot/config.json[/cyan]") console.print(" Get one at: https://openrouter.ai/keys") - console.print(' 2. Chat: [cyan]nanobot agent -m "Hello!"[/cyan]') - console.print( - "\n[dim]Want Telegram/WhatsApp? See: https://github.com/HKUDS/nanobot#-chat-apps[/dim]" - ) + console.print(" 2. Chat: [cyan]nanobot agent -m \"Hello!\"[/cyan]") + console.print("\n[dim]Want Telegram/WhatsApp? See: https://github.com/HKUDS/nanobot#-chat-apps[/dim]") + + def _create_workspace_templates(workspace: Path): @@ -266,13 +264,13 @@ Information about the user goes here. - Language: (your preferred language) """, } - + for filename, content in templates.items(): file_path = workspace / filename if not file_path.exists(): file_path.write_text(content) console.print(f" [dim]Created {filename}[/dim]") - + # Create memory directory and MEMORY.md memory_dir = workspace / "memory" memory_dir.mkdir(exist_ok=True) @@ -300,7 +298,6 @@ This file stores important information that should persist across sessions. def _make_provider(config): """Create LiteLLMProvider from config. Exits if no API key found.""" from nanobot.providers.litellm_provider import LiteLLMProvider - p = config.get_provider() model = config.agents.defaults.model if not (p and p.api_key) and not model.startswith("bedrock/"): @@ -335,23 +332,22 @@ def gateway( from nanobot.cron.service import CronService from nanobot.cron.types import CronJob from nanobot.heartbeat.service import HeartbeatService - + if verbose: import logging - logging.basicConfig(level=logging.DEBUG) - + console.print(f"{__logo__} Starting nanobot gateway on port {port}...") - + config = load_config() bus = MessageBus() provider = _make_provider(config) session_manager = SessionManager(config.workspace_path) - + # Create cron service first (callback set after agent creation) cron_store_path = get_data_dir() / "cron" / "jobs.json" cron = CronService(cron_store_path) - + # Create agent with cron service agent = AgentLoop( bus=bus, @@ -365,7 +361,7 @@ def gateway( restrict_to_workspace=config.tools.restrict_to_workspace, session_manager=session_manager, ) - + # Set cron callback (needs agent) async def on_cron_job(job: CronJob) -> str | None: """Execute a cron job through the agent.""" @@ -377,44 +373,40 @@ def gateway( ) if job.payload.deliver and job.payload.to: from nanobot.bus.events import OutboundMessage - - await bus.publish_outbound( - OutboundMessage( - channel=job.payload.channel or "cli", - chat_id=job.payload.to, - content=response or "", - ) - ) + await bus.publish_outbound(OutboundMessage( + channel=job.payload.channel or "cli", + chat_id=job.payload.to, + content=response or "" + )) return response - cron.on_job = on_cron_job - + # Create heartbeat service async def on_heartbeat(prompt: str) -> str: """Execute heartbeat through the agent.""" return await agent.process_direct(prompt, session_key="heartbeat") - + heartbeat = HeartbeatService( workspace=config.workspace_path, on_heartbeat=on_heartbeat, interval_s=30 * 60, # 30 minutes - enabled=True, + enabled=True ) - + # Create channel manager channels = ChannelManager(config, bus, session_manager=session_manager) - + if channels.enabled_channels: console.print(f"[green]✓[/green] Channels enabled: {', '.join(channels.enabled_channels)}") else: console.print("[yellow]Warning: No channels enabled[/yellow]") - + cron_status = cron.status() if cron_status["jobs"] > 0: console.print(f"[green]✓[/green] Cron: {cron_status['jobs']} scheduled jobs") - + console.print(f"[green]✓[/green] Heartbeat: every 30m") - + async def run(): try: await cron.start() @@ -429,10 +421,12 @@ def gateway( cron.stop() agent.stop() await channels.stop_all() - + asyncio.run(run()) + + # ============================================================================ # Agent Commands # ============================================================================ @@ -442,21 +436,17 @@ def gateway( def agent( message: str = typer.Option(None, "--message", "-m", help="Message to send to the agent"), session_id: str = typer.Option("cli:default", "--session", "-s", help="Session ID"), - markdown: bool = typer.Option( - True, "--markdown/--no-markdown", help="Render assistant output as Markdown" - ), - logs: bool = typer.Option( - False, "--logs/--no-logs", help="Show nanobot runtime logs during chat" - ), + markdown: bool = typer.Option(True, "--markdown/--no-markdown", help="Render assistant output as Markdown"), + logs: bool = typer.Option(False, "--logs/--no-logs", help="Show nanobot runtime logs during chat"), ): """Interact with the agent directly.""" from nanobot.config.loader import load_config from nanobot.bus.queue import MessageBus from nanobot.agent.loop import AgentLoop from loguru import logger - + config = load_config() - + bus = MessageBus() provider = _make_provider(config) @@ -464,7 +454,7 @@ def agent( logger.enable("nanobot") else: logger.disable("nanobot") - + agent_loop = AgentLoop( bus=bus, provider=provider, @@ -473,14 +463,14 @@ def agent( exec_config=config.tools.exec, restrict_to_workspace=config.tools.restrict_to_workspace, ) - + if message: # Single message mode async def run_once(): with console.status("[dim]Nanobot is thinking...[/dim]", spinner="dots"): response = await agent_loop.process_direct(message, session_id) _print_agent_response(response, render_markdown=markdown) - + asyncio.run(run_once()) else: # Interactive mode @@ -496,7 +486,7 @@ def agent( os._exit(0) signal.signal(signal.SIGINT, _exit_on_sigint) - + async def run_interactive(): while True: try: @@ -509,7 +499,7 @@ def agent( if _is_exit_command(command): console.print("\nGoodbye!") break - + with console.status("[dim]Nanobot is thinking...[/dim]", spinner="dots"): response = await agent_loop.process_direct(user_input, session_id) _print_agent_response(response, render_markdown=markdown) @@ -521,7 +511,7 @@ def agent( except EOFError: console.print("\nGoodbye!") break - + asyncio.run(run_interactive()) @@ -548,15 +538,27 @@ def channels_status(): # WhatsApp wa = config.channels.whatsapp - table.add_row("WhatsApp", "✓" if wa.enabled else "✗", wa.bridge_url) + table.add_row( + "WhatsApp", + "✓" if wa.enabled else "✗", + wa.bridge_url + ) dc = config.channels.discord - table.add_row("Discord", "✓" if dc.enabled else "✗", dc.gateway_url) - + table.add_row( + "Discord", + "✓" if dc.enabled else "✗", + dc.gateway_url + ) + # Telegram tg = config.channels.telegram tg_config = f"token: {tg.token[:10]}..." if tg.token else "[dim]not configured[/dim]" - table.add_row("Telegram", "✓" if tg.enabled else "✗", tg_config) + table.add_row( + "Telegram", + "✓" if tg.enabled else "✗", + tg_config + ) console.print(table) @@ -565,57 +567,57 @@ def _get_bridge_dir() -> Path: """Get the bridge directory, setting it up if needed.""" import shutil import subprocess - + # User's bridge location user_bridge = Path.home() / ".nanobot" / "bridge" - + # Check if already built if (user_bridge / "dist" / "index.js").exists(): return user_bridge - + # Check for npm if not shutil.which("npm"): console.print("[red]npm not found. Please install Node.js >= 18.[/red]") raise typer.Exit(1) - + # Find source bridge: first check package data, then source dir pkg_bridge = Path(__file__).parent.parent / "bridge" # nanobot/bridge (installed) src_bridge = Path(__file__).parent.parent.parent / "bridge" # repo root/bridge (dev) - + source = None if (pkg_bridge / "package.json").exists(): source = pkg_bridge elif (src_bridge / "package.json").exists(): source = src_bridge - + if not source: console.print("[red]Bridge source not found.[/red]") console.print("Try reinstalling: pip install --force-reinstall nanobot") raise typer.Exit(1) - + console.print(f"{__logo__} Setting up bridge...") - + # Copy to user directory user_bridge.parent.mkdir(parents=True, exist_ok=True) if user_bridge.exists(): shutil.rmtree(user_bridge) shutil.copytree(source, user_bridge, ignore=shutil.ignore_patterns("node_modules", "dist")) - + # Install and build try: console.print(" Installing dependencies...") subprocess.run(["npm", "install"], cwd=user_bridge, check=True, capture_output=True) - + console.print(" Building...") subprocess.run(["npm", "run", "build"], cwd=user_bridge, check=True, capture_output=True) - + console.print("[green]✓[/green] Bridge ready\n") except subprocess.CalledProcessError as e: console.print(f"[red]Build failed: {e}[/red]") if e.stderr: console.print(f"[dim]{e.stderr.decode()[:500]}[/dim]") raise typer.Exit(1) - + return user_bridge @@ -623,12 +625,12 @@ def _get_bridge_dir() -> Path: def channels_login(): """Link device via QR code.""" import subprocess - + bridge_dir = _get_bridge_dir() - + console.print(f"{__logo__} Starting bridge...") console.print("Scan the QR code to connect.\n") - + try: subprocess.run(["npm", "start"], cwd=bridge_dir, check=True) except subprocess.CalledProcessError as e: @@ -652,25 +654,24 @@ def cron_list( """List scheduled jobs.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + jobs = service.list_jobs(include_disabled=all) - + if not jobs: console.print("No scheduled jobs.") return - + table = Table(title="Scheduled Jobs") table.add_column("ID", style="cyan") table.add_column("Name") table.add_column("Schedule") table.add_column("Status") table.add_column("Next Run") - + import time - for job in jobs: # Format schedule if job.schedule.kind == "every": @@ -679,19 +680,17 @@ def cron_list( sched = job.schedule.expr or "" else: sched = "one-time" - + # Format next run next_run = "" if job.state.next_run_at_ms: - next_time = time.strftime( - "%Y-%m-%d %H:%M", time.localtime(job.state.next_run_at_ms / 1000) - ) + next_time = time.strftime("%Y-%m-%d %H:%M", time.localtime(job.state.next_run_at_ms / 1000)) next_run = next_time - + status = "[green]enabled[/green]" if job.enabled else "[dim]disabled[/dim]" - + table.add_row(job.id, job.name, sched, status, next_run) - + console.print(table) @@ -704,15 +703,13 @@ def cron_add( at: str = typer.Option(None, "--at", help="Run once at time (ISO format)"), deliver: bool = typer.Option(False, "--deliver", "-d", help="Deliver response to channel"), to: str = typer.Option(None, "--to", help="Recipient for delivery"), - channel: str = typer.Option( - None, "--channel", help="Channel for delivery (e.g. 'telegram', 'whatsapp')" - ), + channel: str = typer.Option(None, "--channel", help="Channel for delivery (e.g. 'telegram', 'whatsapp')"), ): """Add a scheduled job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService from nanobot.cron.types import CronSchedule - + # Determine schedule type if every: schedule = CronSchedule(kind="every", every_ms=every * 1000) @@ -720,16 +717,15 @@ def cron_add( schedule = CronSchedule(kind="cron", expr=cron_expr) elif at: import datetime - dt = datetime.datetime.fromisoformat(at) schedule = CronSchedule(kind="at", at_ms=int(dt.timestamp() * 1000)) else: console.print("[red]Error: Must specify --every, --cron, or --at[/red]") raise typer.Exit(1) - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + job = service.add_job( name=name, schedule=schedule, @@ -738,7 +734,7 @@ def cron_add( to=to, channel=channel, ) - + console.print(f"[green]✓[/green] Added job '{job.name}' ({job.id})") @@ -749,10 +745,10 @@ def cron_remove( """Remove a scheduled job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + if service.remove_job(job_id): console.print(f"[green]✓[/green] Removed job {job_id}") else: @@ -767,10 +763,10 @@ def cron_enable( """Enable or disable a job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + job = service.enable_job(job_id, enabled=not disable) if job: status = "disabled" if disable else "enabled" @@ -787,13 +783,13 @@ def cron_run( """Manually run a job.""" from nanobot.config.loader import get_data_dir from nanobot.cron.service import CronService - + store_path = get_data_dir() / "cron" / "jobs.json" service = CronService(store_path) - + async def run(): return await service.run_job(job_id, force=force) - + if asyncio.run(run()): console.print(f"[green]✓[/green] Job executed") else: @@ -816,18 +812,14 @@ def status(): console.print(f"{__logo__} nanobot Status\n") - console.print( - f"Config: {config_path} {'[green]✓[/green]' if config_path.exists() else '[red]✗[/red]'}" - ) - console.print( - f"Workspace: {workspace} {'[green]✓[/green]' if workspace.exists() else '[red]✗[/red]'}" - ) + console.print(f"Config: {config_path} {'[green]✓[/green]' if config_path.exists() else '[red]✗[/red]'}") + console.print(f"Workspace: {workspace} {'[green]✓[/green]' if workspace.exists() else '[red]✗[/red]'}") if config_path.exists(): from nanobot.providers.registry import PROVIDERS console.print(f"Model: {config.agents.defaults.model}") - + # Check API keys from registry for spec in PROVIDERS: p = getattr(config.providers, spec.name, None) @@ -841,9 +833,7 @@ def status(): console.print(f"{spec.label}: [dim]not set[/dim]") else: has_key = bool(p.api_key) - console.print( - f"{spec.label}: {'[green]✓[/green]' if has_key else '[dim]not set[/dim]'}" - ) + console.print(f"{spec.label}: {'[green]✓[/green]' if has_key else '[dim]not set[/dim]'}") if __name__ == "__main__": From 8fda0fcab3a62104176b1b75ce3ce458dad28948 Mon Sep 17 00:00:00 2001 From: Chris Alexander <2815297+chris-alexander@users.noreply.github.com> Date: Sun, 8 Feb 2026 21:51:13 +0000 Subject: [PATCH 31/33] Document agent markdown/log flags and interactive exit commands --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index cb2c64a..5d86820 100644 --- a/README.md +++ b/README.md @@ -458,11 +458,15 @@ That's it! Environment variables, model prefixing, config matching, and `nanobot | `nanobot onboard` | Initialize config & workspace | | `nanobot agent -m "..."` | Chat with the agent | | `nanobot agent` | Interactive chat mode | +| `nanobot agent --no-markdown` | Show plain-text replies | +| `nanobot agent --logs` | Show runtime logs during chat | | `nanobot gateway` | Start the gateway | | `nanobot status` | Show status | | `nanobot channels login` | Link WhatsApp (scan QR) | | `nanobot channels status` | Show channel status | +Interactive mode exits: `exit`, `quit`, `/exit`, `/quit`, `:q`, or `Ctrl+D`. +
Scheduled Tasks (Cron) From 20ca78c1062ca50fd5e1d3c9acf34ad1c947a1df Mon Sep 17 00:00:00 2001 From: Re-bin Date: Mon, 9 Feb 2026 04:51:58 +0000 Subject: [PATCH 32/33] docs: add Zhipu coding plan apiBase tip --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb2c64a..9f1e0fd 100644 --- a/README.md +++ b/README.md @@ -378,8 +378,9 @@ Config file: `~/.nanobot/config.json` ### Providers -> [!NOTE] -> Groq provides free voice transcription via Whisper. If configured, Telegram voice messages will be automatically transcribed. +> [!TIP] +> - **Groq** provides free voice transcription via Whisper. If configured, Telegram voice messages will be automatically transcribed. +> - **Zhipu Coding Plan**: If you're on Zhipu's coding plan, set `"apiBase": "https://open.bigmodel.cn/api/coding/paas/v4"` in your zhipu provider config. | Provider | Purpose | Get API Key | |----------|---------|-------------| From d47219ef6a094da4aa09318a2051d7262385c48e Mon Sep 17 00:00:00 2001 From: Re-bin Date: Mon, 9 Feb 2026 05:15:26 +0000 Subject: [PATCH 33/33] fix: unify exit cleanup, conditionally show spinner with --logs flag --- nanobot/cli/commands.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 875eb90..a1f426e 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -144,7 +144,7 @@ def _print_agent_response(response: str, render_markdown: bool) -> None: console.print( Panel( body, - title=f"{__logo__} Nanobot", + title=f"{__logo__} nanobot", title_align="left", border_style="cyan", padding=(0, 1), @@ -464,10 +464,17 @@ def agent( restrict_to_workspace=config.tools.restrict_to_workspace, ) + # Show spinner when logs are off (no output to miss); skip when logs are on + def _thinking_ctx(): + if logs: + from contextlib import nullcontext + return nullcontext() + return console.status("[dim]nanobot is thinking...[/dim]", spinner="dots") + if message: # Single message mode async def run_once(): - with console.status("[dim]Nanobot is thinking...[/dim]", spinner="dots"): + with _thinking_ctx(): response = await agent_loop.process_direct(message, session_id) _print_agent_response(response, render_markdown=markdown) @@ -475,7 +482,7 @@ def agent( else: # Interactive mode _enable_line_editing() - console.print(f"{__logo__} Interactive mode (Ctrl+C to exit)\n") + console.print(f"{__logo__} Interactive mode (type [bold]exit[/bold] or [bold]Ctrl+C[/bold] to quit)\n") # input() runs in a worker thread that can't be cancelled. # Without this handler, asyncio.run() would hang waiting for it. @@ -497,10 +504,12 @@ def agent( continue if _is_exit_command(command): + _save_history() + _restore_terminal() console.print("\nGoodbye!") break - with console.status("[dim]Nanobot is thinking...[/dim]", spinner="dots"): + with _thinking_ctx(): response = await agent_loop.process_direct(user_input, session_id) _print_agent_response(response, render_markdown=markdown) except KeyboardInterrupt: @@ -509,6 +518,8 @@ def agent( console.print("\nGoodbye!") break except EOFError: + _save_history() + _restore_terminal() console.print("\nGoodbye!") break