chattool 5.3.0__tar.gz → 5.4.0__tar.gz

{chattool-5.3.0/src/chattool.egg-info → chattool-5.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chattool
-Version: 5.3.0
+Version: 5.4.0
 Summary: Toolkit for Chat API
 Author-email: Rex Wang <1073853456@qq.com>
 License: MIT license
@@ -19,6 +19,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Click>=7.0
+Requires-Dist: questionary>=2.1.0
 Requires-Dist: requests>=2.20
 Requires-Dist: aiohttp>=3.8
 Requires-Dist: tqdm>=4.60
@@ -35,13 +36,22 @@ Requires-Dist: httpx
 Requires-Dist: gitpython
 Requires-Dist: PyGithub
 Requires-Dist: filelock
+Provides-Extra: dns
+Requires-Dist: netifaces; extra == "dns"
+Requires-Dist: alibabacloud_alidns20150109>=3.5.10; extra == "dns"
+Requires-Dist: alibabacloud_tea_openapi>=0.3.0; extra == "dns"
+Requires-Dist: tencentcloud-sdk-python; extra == "dns"
+Provides-Extra: lark
+Requires-Dist: lark-oapi==1.5.3; extra == "lark"
+Requires-Dist: flask; extra == "lark"
+Provides-Extra: images
+Requires-Dist: dashscope; extra == "images"
+Provides-Extra: screenshot
+Requires-Dist: selenium; extra == "screenshot"
+Requires-Dist: pillow; extra == "screenshot"
+Requires-Dist: imageio; extra == "screenshot"
 Provides-Extra: tools
-Requires-Dist: alibabacloud_alidns20150109>=3.5.10; extra == "tools"
-Requires-Dist: alibabacloud_tea_openapi>=0.3.0; extra == "tools"
-Requires-Dist: tencentcloud-sdk-python; extra == "tools"
-Requires-Dist: netifaces; extra == "tools"
-Requires-Dist: lark-oapi==1.5.3; extra == "tools"
-Requires-Dist: flask; extra == "tools"
+Requires-Dist: chattool[dns,images,lark,screenshot]; extra == "tools"
 Provides-Extra: tests
 Requires-Dist: coverage; extra == "tests"
 Requires-Dist: pytest>=3; extra == "tests"
@@ -197,14 +207,32 @@ chattool dns ddns -d example.com -r nas --ip-type local --local-ip-cidr 192.168.
 chattool dns cert-update -d example.com -e admin@example.com --cert-dir ./certs
 ```
 
-### 5. 其他工具
+### 5. AI 绘图 (`chattool image`)
+
+支持 Tongyi、Hugging Face、LiblibAI、Pollinations.ai、SiliconFlow 等平台。
+
+```bash
+# 安装图像依赖
+pip install "chattool[images]"
+
+# Pollinations（需配置 POLLINATIONS_API_KEY）
+chattool image pollinations list-models
+chattool image pollinations generate "a cat in space" -o cat.png
+
+# SiliconFlow（需配置 SILICONFLOW_API_KEY）
+chattool image siliconflow list-models
+chattool image siliconflow generate "a cute dog" -o dog.png
+```
+
+### 6. 其他工具
 
 | 工具 | 命令 | 说明 |
 |------|------|------|
 | 网络扫描 | `chattool network scan` | 扫描局域网活跃主机和 SSH 端口 |
-| MCP 服务 | `chattool mcp inspect` | MCP Server 能力检查 |
+| MCP 服务 | `chattool mcp info` / `chattool mcp inspect` | MCP Server 能力检查（支持 JSON 输出） |
 | 截图服务 | `chattool serve capture` | 本地网页截图服务 |
 | 证书分发 | `chattool serve cert` / `chattool client cert` | SSL 证书集中管理与客户端拉取 |
+| Skills 管理 | `chattool skill install` / `chatskill install` | 安装 ChatTool skills 到 Codex / Claude Code |
 
 ## 开源协议
 

{chattool-5.3.0 → chattool-5.4.0}/README.md

@@ -133,14 +133,32 @@ chattool dns ddns -d example.com -r nas --ip-type local --local-ip-cidr 192.168.
 chattool dns cert-update -d example.com -e admin@example.com --cert-dir ./certs
 ```
 
-### 5. 其他工具
+### 5. AI 绘图 (`chattool image`)
+
+支持 Tongyi、Hugging Face、LiblibAI、Pollinations.ai、SiliconFlow 等平台。
+
+```bash
+# 安装图像依赖
+pip install "chattool[images]"
+
+# Pollinations（需配置 POLLINATIONS_API_KEY）
+chattool image pollinations list-models
+chattool image pollinations generate "a cat in space" -o cat.png
+
+# SiliconFlow（需配置 SILICONFLOW_API_KEY）
+chattool image siliconflow list-models
+chattool image siliconflow generate "a cute dog" -o dog.png
+```
+
+### 6. 其他工具
 
 | 工具 | 命令 | 说明 |
 |------|------|------|
 | 网络扫描 | `chattool network scan` | 扫描局域网活跃主机和 SSH 端口 |
-| MCP 服务 | `chattool mcp inspect` | MCP Server 能力检查 |
+| MCP 服务 | `chattool mcp info` / `chattool mcp inspect` | MCP Server 能力检查（支持 JSON 输出） |
 | 截图服务 | `chattool serve capture` | 本地网页截图服务 |
 | 证书分发 | `chattool serve cert` / `chattool client cert` | SSL 证书集中管理与客户端拉取 |
+| Skills 管理 | `chattool skill install` / `chatskill install` | 安装 ChatTool skills 到 Codex / Claude Code |
 
 ## 开源协议
 
@@ -151,4 +169,4 @@ MIT License
 - `5.3.0` — 飞书机器人（消息收发、事件路由、AI 对话）、CLI 工具链（`chattool lark`、`chattool serve lark`）
 - `5.0.0` — DNS 管理（阿里云/腾讯云）、DDNS、SSL 证书自动续期、环境变量集中管理
 - `4.1.0` — 统一 `Chat` API（同步/异步/流式），默认环境变量配置
-- 更早版本请参考仓库提交记录
+- 更早版本请参考仓库提交记录

{chattool-5.3.0 → chattool-5.4.0}/pyproject.toml

@@ -25,6 +25,7 @@ keywords = ["chattool"]
 license = {text = "MIT license"}
 dependencies = [
     "Click>=7.0",
+    "questionary>=2.1.0",
     "requests>=2.20",
     "aiohttp>=3.8",
     "tqdm>=4.60",
@@ -45,14 +46,27 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-tools = [
+dns = [
+    "netifaces",
     "alibabacloud_alidns20150109>=3.5.10",
     "alibabacloud_tea_openapi>=0.3.0",
     "tencentcloud-sdk-python",
-    "netifaces",
+]
+lark = [
     "lark-oapi==1.5.3",
     "flask",
 ]
+images = [
+    "dashscope"
+]
+screenshot = [
+    "selenium",
+    "pillow",
+    "imageio"
+]
+tools = [
+    "chattool[dns, lark, images, screenshot]",
+]
 tests = [
     "coverage",
     "pytest>=3",
@@ -74,7 +88,6 @@ dev = [
     "twine",
     "chattool[docs,tests,tools]",
 ]
-
 [project.urls]
 Homepage = "https://github.com/cubenlp/chattool"
 Repository = "https://github.com/cubenlp/chattool"
@@ -83,6 +96,7 @@ Repository = "https://github.com/cubenlp/chattool"
 chattool = "chattool.cli:main_cli"
 chatenv = "chattool.cli.chatenv:cli"
 mcp-server-chattool = "chattool.mcp:main"
+chatskill = "chattool.cli.skill:main"
 
 [tool.setuptools.dynamic]
 version = {attr = "chattool.__version__"}
@@ -107,4 +121,3 @@ filterwarnings = [
     "ignore:websockets.legacy is deprecated:DeprecationWarning",
     "ignore:websockets.server.WebSocketServerProtocol is deprecated:DeprecationWarning"
 ]
-

{chattool-5.3.0 → chattool-5.4.0}/src/chattool/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Rex Wang"""
 __email__ = '1073853456@qq.com'
-__version__ = '5.3.0'
+__version__ = '5.4.0'
 
 from dotenv import load_dotenv
 
@@ -40,4 +40,4 @@ __all__ = [
     "TencentDNSClient",
     "DynamicIPUpdater",
     "SSLCertUpdater",
-]
+]

chattool-5.4.0/src/chattool/cli/__init__.py

@@ -0,0 +1,11 @@
+import warnings
+# Filter specific DeprecationWarning from third-party libraries
+warnings.filterwarnings("ignore", category=DeprecationWarning, message=".*")
+
+def main_cli():
+    from .main import cli
+    cli()
+
+__all__ = [
+    "main_cli",
+]

{chattool-5.3.0 → chattool-5.4.0}/src/chattool/cli/chatenv.py

@@ -1,11 +1,20 @@
 import click
 import shutil
 import os
+import sys
+import warnings
+warnings.filterwarnings("ignore", message=".*pkg_resources is deprecated.*")
+# Filter DeprecationWarning from lark_oapi (asyncio.get_event_loop)
+warnings.filterwarnings("ignore", category=DeprecationWarning, module="lark_oapi.*")
 
 from chattool.config import BaseEnvConfig
 from chattool.const import CHATTOOL_ENV_FILE, CHATTOOL_ENV_DIR
 from chattool import __version__
 from chattool.utils import mask_secret
+from chattool.utils.tui import (
+    ask_select, ask_text, ask_confirm, get_separator, 
+    create_choice, is_interactive_available, BACK_VALUE
+)
 
 from .test_cmd import test_cmd
 
@@ -31,13 +40,141 @@ def _resolve_config_types(config_types):
     if not config_types:
         return None
     normalized = [t.lower() for t in config_types]
-    matched = [
-        cls for cls in BaseEnvConfig._registry
-        if cls._title.lower() in normalized
-        or any(a.lower() in normalized for a in getattr(cls, '_aliases', []))
-    ]
+    
+    matched = []
+    
+    for cls in BaseEnvConfig._registry:
+        is_match = False
+        
+        for t in normalized:
+            # Check title (case-insensitive prefix)
+            if cls._title.lower().startswith(t):
+                is_match = True
+            
+            # Check aliases (case-insensitive prefix)
+            if not is_match:
+                aliases = getattr(cls, '_aliases', [])
+                for alias in aliases:
+                    if alias.lower().startswith(t):
+                        is_match = True
+                        break
+            
+            if is_match:
+                break
+        
+        if is_match:
+            matched.append(cls)
+            
     return matched
 
+def _group_configs(configs):
+    groups = {
+        "Model": [],
+        "DNS": [],
+        "Image": [],
+        "Other": [],
+    }
+    for cfg in configs:
+        name = cfg.__name__
+        if name in ("OpenAIConfig", "AzureConfig", "SiliconFlowConfig"):
+            groups["Model"].append(cfg)
+        elif name in ("AliyunConfig", "TencentConfig"):
+            groups["DNS"].append(cfg)
+        elif name in ("TongyiConfig", "HuggingFaceConfig", "PollinationsConfig", "LiblibConfig"):
+            groups["Image"].append(cfg)
+        else:
+            groups["Other"].append(cfg)
+    return groups
+
+
+def _configure_provider(config_cls):
+    """Interactively configure a single provider."""
+    click.echo(f"\nConfiguring {config_cls._title}...")
+    for name, field in config_cls.get_fields().items():
+        prompt_text = f"{name}"
+        if field.desc:
+            prompt_text += f" ({field.desc})"
+        
+        default_val = field.value if field.value is not None else field.default
+
+        if field.is_sensitive:
+            hint = mask_secret(default_val) if default_val else ""
+            message = f"{prompt_text}"
+            if hint:
+                message += f" [current: {hint}]"
+            message += " (leave blank to keep current)"
+            
+            new_val = ask_text(message, password=True)
+            if new_val == BACK_VALUE:
+                return
+            if new_val:
+                field.value = new_val
+        else:
+            new_val = ask_text(
+                prompt_text,
+                default=str(default_val) if default_val is not None else ""
+            )
+            if new_val == BACK_VALUE:
+                return
+            if new_val:
+                field.value = new_val
+
+
+def _interactive_config_loop(grouped_configs):
+    """Main loop for interactive configuration using questionary."""
+    while True:
+        # Main Menu
+        main_choices = []
+        for section, configs in grouped_configs.items():
+            if configs:
+                main_choices.append(section)
+        
+        main_choices.append(get_separator())
+        main_choices.append("Save & Exit")
+        main_choices.append("Exit without Saving")
+        
+        selected_section = ask_select(
+            "Select a category to configure (Arrow keys to move, Enter to select):",
+            choices=main_choices
+        )
+        
+        if selected_section == "Save & Exit":
+            BaseEnvConfig.save_env_file(str(CHATTOOL_ENV_FILE), __version__)
+            click.echo(f"Configuration saved to {CHATTOOL_ENV_FILE}")
+            break
+        elif selected_section == "Exit without Saving":
+            if ask_confirm("Are you sure you want to exit without saving changes?", default=False):
+                break
+            continue
+        elif selected_section == BACK_VALUE:
+            continue
+
+        # Sub Menu
+        while True:
+            configs = grouped_configs[selected_section]
+            sub_choices = []
+            for cfg in configs:
+                aliases = getattr(cfg, '_aliases', [])
+                alias_text = f" ({', '.join(aliases)})" if aliases else ""
+                sub_choices.append(create_choice(
+                    title=f"{cfg._title}{alias_text}",
+                    value=cfg
+                ))
+            
+            sub_choices.append(get_separator())
+            sub_choices.append(create_choice(title="Back", value="Back"))
+            
+            selected_config = ask_select(
+                f"[{selected_section}] Select a provider to configure (Esc to back):",
+                choices=sub_choices
+            )
+            
+            if selected_config == "Back" or selected_config == BACK_VALUE:
+                break
+            
+            # Configure Provider
+            _configure_provider(selected_config)
+
 
 @cli.command(name='cat')
 @click.argument('name', required=False)
@@ -179,6 +316,11 @@ def init(interactive, config_types):
     - Tencent: tencent, tx, tencent-dns
     - Zulip: zulip
     - Feishu: feishu, lark
+    - Tongyi: tongyi, dashscope
+    - HuggingFace: hf, huggingface
+    - Pollinations: pollinations, poll
+    - Liblib: liblib
+    - SiliconFlow: siliconflow (Model & Image)
     """
     
     target_configs = BaseEnvConfig._registry
@@ -197,8 +339,55 @@ def init(interactive, config_types):
     if CHATTOOL_ENV_FILE.exists():
         BaseEnvConfig.load_all(CHATTOOL_ENV_FILE)
 
+    if not interactive:
+        interactive = True
+
     if interactive:
         click.echo("Starting interactive configuration...")
+        use_questionary = is_interactive_available()
+        
+        if use_questionary:
+            if not config_types:
+                grouped = _group_configs(target_configs)
+                _interactive_config_loop(grouped)
+                return
+            else:
+                # Linear config for specific types
+                for config_cls in target_configs:
+                    _configure_provider(config_cls)
+                
+                BaseEnvConfig.save_env_file(str(CHATTOOL_ENV_FILE), __version__)
+                click.echo(f"Configuration saved to {CHATTOOL_ENV_FILE}")
+                return
+
+        # Fallback for non-questionary environment (pure click)
+        if not config_types:
+            grouped = _group_configs(target_configs)
+            selected_sections = []
+            click.echo("\nSelect sections to configure:")
+            for section, configs in grouped.items():
+                if not configs:
+                    continue
+                if click.confirm(section, default=section == "Model"):
+                    selected_sections.append(section)
+
+            if not selected_sections:
+                click.echo("No section selected. Nothing to update.")
+                return
+
+            selected_configs = []
+            for section in selected_sections:
+                click.echo(f"\n[{section}]")
+                for config_cls in grouped[section]:
+                    aliases = getattr(config_cls, '_aliases', [])
+                    alias_text = f" ({', '.join(aliases)})" if aliases else ""
+                    if click.confirm(f"Configure {config_cls._title}{alias_text}", default=False):
+                        selected_configs.append(config_cls)
+
+            if not selected_configs:
+                click.echo("No provider selected. Nothing to update.")
+                return
+            target_configs = selected_configs
         
         for config_cls in target_configs:
             click.echo(f"\n[{config_cls._title}]")

{chattool-5.3.0 → chattool-5.4.0}/src/chattool/cli/client/__init__.py

@@ -4,6 +4,10 @@ from .dns_updater import cli as dns_updater_cli
 from .mcp import cli as mcp_cli
 from .network import network as network_cli
 from .lark import cli as lark_cli
+from .image import cli as image_cli
+from .tplogin import cli as tplogin_cli
+from .github import cli as github_cli
+from .zulip import cli as zulip_cli
 
 __all__ = [
     "cert_client",
@@ -12,4 +16,8 @@ __all__ = [
     "mcp_cli",
     "network_cli",
     "lark_cli",
+    "image_cli",
+    "tplogin_cli",
+    "github_cli",
+    "zulip_cli",
 ]

{chattool-5.3.0 → chattool-5.4.0}/src/chattool/cli/client/cert_client.py

@@ -1,7 +1,5 @@
 import click
-import requests
 import os
-import git
 from rich.console import Console
 from rich.table import Table
 
@@ -9,6 +7,7 @@ console = Console()
 
 def get_git_email():
     """Get email from git config"""
+    import git
     try:
         email = git.Git().config("--get", "user.email")
         if email:
@@ -44,6 +43,7 @@ def cert_client():
 @common_options
 def apply(server, token, domains, email, provider, secret_id, secret_key):
     """申请 SSL 证书"""
+    import requests
     server, token = get_config(server, token)
     headers = {"X-ChatTool-Token": token} if token else {}
     
@@ -77,6 +77,7 @@ def apply(server, token, domains, email, provider, secret_id, secret_key):
 @common_options
 def list_certs(server, token):
     """列出已申请的证书"""
+    import requests
     server, token = get_config(server, token)
     headers = {"X-ChatTool-Token": token} if token else {}
     
@@ -117,6 +118,7 @@ def list_certs(server, token):
 @common_options
 def download(server, token, domain, output_dir):
     """下载证书文件 (cert.pem, privkey.pem)"""
+    import requests
     server, token = get_config(server, token)
     headers = {"X-ChatTool-Token": token} if token else {}