fr-cli 2.1.0__tar.gz → 2.2.0__tar.gz

{fr_cli-2.1.0/fr_cli.egg-info → fr_cli-2.2.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.1.0
-Summary: 凡人打字机 - 基于智谱AI的终极全能终端工具
+Version: 2.2.0
+Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/yourname/fr-cli
 Project-URL: Issues, https://github.com/yourname/fr-cli/issues
-Keywords: zhipuai,glm,cli,ai,terminal,chatbot
+Keywords: zhipuai,deepseek,kimi,qwen,cli,ai,terminal,chatbot
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -24,6 +24,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: zhipuai>=2.0.0
+Requires-Dist: openai>=1.0.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: mcp>=1.6.0
 Provides-Extra: data

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli/__init__.py

@@ -1,4 +1,4 @@
 """
 凡人打字机 - 基于智谱AI的终极全能终端工具
 """
-__version__ = "2.1.0"
+__version__ = "2.2.0"

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli/conf/config.py

@@ -6,7 +6,7 @@ import json
 import os
 import shutil
 from pathlib import Path
-from fr_cli.ui.ui import YELLOW, RED, GREEN, RESET
+from fr_cli.ui.ui import YELLOW, RED, GREEN, RESET, DIM
 
 CONFIG_FILE = Path.home() / ".zhipu_cli_config.json"
 CONFIG_BACKUP = Path.home() / ".zhipu_cli_config.json.bak"
@@ -17,6 +17,7 @@ DEFAULT_LIMIT = 20000
 def _default_config():
     """返回默认配置字典"""
     return {
+        "provider": "zhipu",
         "key": "",
         "model": "glm-4-flash",
         "limit": DEFAULT_LIMIT,
@@ -28,6 +29,7 @@ def _default_config():
         "disk": {},
         "thinking_mode": "direct",
         "mcp": {"servers": []},
+        "providers": {},
     }
 
 
@@ -111,11 +113,29 @@ def init_config():
         save_config(c)
         print(f"{GREEN}✅ 默认洞府已开辟: {DEFAULT_WORKSPACE}{RESET}")
 
-    if not c.get("key"):
+    # 向后兼容：无 provider 字段的旧配置自动补全
+    if "provider" not in c:
+        c["provider"] = "zhipu"
+        save_config(c)
+
+    provider = c.get("provider", "zhipu")
+    providers_cfg = c.get("providers", {})
+    pcfg = providers_cfg.get(provider, {})
+
+    # 检查当前提供商是否已配置 key
+    has_key = bool(pcfg.get("key", c.get("key", "")))
+
+    if not has_key:
         print(f"\n{YELLOW}⚠️ API Key Required{RESET}")
-        k = input(f"👉 Enter Zhipu API Key: ").strip()
+        from fr_cli.core.llm import list_providers
+        providers = list_providers()
+        print(f"{DIM}当前道统: {provider}{RESET}")
+        print(f"{DIM}支持道统: {', '.join([p['id'] for p in providers])}{RESET}")
+        k = input(f"👉 Enter API Key for [{provider}]: ").strip()
         if k:
             c["key"] = k
+            providers_cfg.setdefault(provider, {})["key"] = k
+            c["providers"] = providers_cfg
             ok = save_config(c)
             if ok:
                 print(f"{GREEN}✅ API Key 已保存至: {CONFIG_FILE}{RESET}")

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli/core/core.py

@@ -2,7 +2,6 @@
 全局状态管理容器 (AppState)
 统一管理配置、子系统实例、运行时状态，实现依赖注入。
 """
-from zhipuai import ZhipuAI
 from fr_cli.weapon.fs import VFS
 from fr_cli.weapon.mail import MailClient
 from fr_cli.weapon.web import WebRaider
@@ -12,6 +11,7 @@ from fr_cli.command.security import SecurityManager
 from fr_cli.command.executor import CommandExecutor
 from fr_cli.weapon.loader import load_weapon_md
 from fr_cli.weapon.mcp import MCPManager
+from fr_cli.core.llm import create_llm_client, list_providers, get_provider_info, resolve_provider_model
 
 
 class AppState:
@@ -20,15 +20,16 @@ class AppState:
     def __init__(self, cfg):
         self.cfg = cfg
         self.lang = cfg.get("lang", "zh")
-        self.model_name = cfg.get("model", "glm-4-flash")
         self.limit = cfg.get("limit", 4096)
-        self.api_key = cfg.get("key", "")
         self.sn = cfg.get("session_name", "")
         self.aliases = cfg.get("aliases", {})
         self.thinking_mode = cfg.get("thinking_mode", "direct")
 
+        # LLM 客户端统一初始化（万法归一）
+        self.client, self.provider, self.model_name = create_llm_client(cfg)
+        self.api_key = self.client.api_key
+
         # 核心子系统实例化
-        self.client = ZhipuAI(api_key=self.api_key)
         self.vfs = VFS(cfg.get("allowed_dirs", []))
         self.plugins = init_plugins()
         self.mail_c = MailClient(cfg.get("mail", {}))
@@ -63,25 +64,61 @@ class AppState:
         self.gatekeeper = GatekeeperManager()
 
     def reinit_client(self):
-        """API Key 或模型变更后重铸客户端"""
-        self.api_key = self.cfg.get("key", "")
-        self.client = ZhipuAI(api_key=self.api_key)
+        """API Key、提供商或模型变更后重铸客户端"""
+        self.client, self.provider, self.model_name = create_llm_client(self.cfg)
+        self.api_key = self.client.api_key
 
     def save_cfg(self):
         """持久化当前配置"""
         from fr_cli.conf.config import save_config
         save_config(self.cfg)
 
-    def update_model(self, name):
-        """切换法器模型"""
-        self.cfg["model"] = name
-        self.model_name = name
+    def update_provider(self, provider_id):
+        """切换 LLM 提供商（召唤新的道统）"""
+        info = get_provider_info(provider_id)
+        if not info:
+            return False
+        self.cfg["provider"] = provider_id
+        # 如果新提供商没有设置过模型，使用其默认模型
+        providers_cfg = self.cfg.setdefault("providers", {})
+        if provider_id not in providers_cfg or not providers_cfg[provider_id].get("model"):
+            self.cfg["model"] = info["default_model"]
+            self.model_name = info["default_model"]
+        else:
+            self.model_name = providers_cfg[provider_id].get("model", info["default_model"])
+            self.cfg["model"] = self.model_name
+        self.save_cfg()
+        self.reinit_client()
+        return True
+
+    def update_model(self, arg):
+        """
+        切换法器模型
+        支持格式：
+          - "deepseek-chat"              仅切换模型（保持当前提供商）
+          - "deepseek:deepseek-chat"     同时切换提供商和模型
+        """
+        new_provider, new_model = resolve_provider_model(arg)
+        if new_provider and new_provider != self.provider:
+            # 切换提供商 + 模型
+            if not self.update_provider(new_provider):
+                return False
+        self.cfg["model"] = new_model
+        self.model_name = new_model
+        # 同步到 providers 配置中当前提供商的 model
+        providers_cfg = self.cfg.setdefault("providers", {})
+        pcfg = providers_cfg.setdefault(self.provider, {})
+        pcfg["model"] = new_model
         self.save_cfg()
         self.reinit_client()
+        return True
 
     def update_key(self, key):
-        """重铸 API 密钥"""
+        """重铸 API 密钥（针对当前提供商）"""
         self.cfg["key"] = key
+        providers_cfg = self.cfg.setdefault("providers", {})
+        pcfg = providers_cfg.setdefault(self.provider, {})
+        pcfg["key"] = key
         self.save_cfg()
         self.reinit_client()
 

fr_cli-2.2.0/fr_cli/core/llm.py

@@ -0,0 +1,181 @@
+"""
+LLM 统一召唤接口 —— 万法归一
+
+为各大模型提供商提供统一的流式对话接口，
+使主程序无需关心底层 SDK 差异。
+"""
+from abc import ABC, abstractmethod
+from typing import Iterator, Optional, Dict, Any
+
+
+class BaseLLMClient(ABC):
+    """大模型客户端抽象基类"""
+
+    def __init__(self, api_key: str, **kwargs):
+        self.api_key = api_key
+
+    @abstractmethod
+    def stream_chat(self, model: str, messages: list, max_tokens: int = 4096) -> Iterator[dict]:
+        """
+        流式对话，yield 每个 token 块
+        格式: {"content": str, "usage": dict or None}
+        """
+        pass
+
+
+class ZhipuLLMClient(BaseLLMClient):
+    """智谱 AI 客户端 (zhipuai SDK)"""
+
+    def __init__(self, api_key: str, **kwargs):
+        super().__init__(api_key, **kwargs)
+        from zhipuai import ZhipuAI
+        self._client = ZhipuAI(api_key=api_key)
+
+    def stream_chat(self, model: str, messages: list, max_tokens: int = 4096) -> Iterator[dict]:
+        response = self._client.chat.completions.create(
+            model=model,
+            messages=messages,
+            stream=True,
+            max_tokens=max_tokens,
+        )
+        for chunk in response:
+            content = ""
+            usage = None
+            if chunk.choices and chunk.choices[0].delta:
+                content = chunk.choices[0].delta.content or ""
+            if hasattr(chunk, 'usage') and chunk.usage:
+                usage = chunk.usage.model_dump() if hasattr(chunk.usage, 'model_dump') else vars(chunk.usage)
+            yield {"content": content, "usage": usage}
+
+
+class OpenAICompatibleClient(BaseLLMClient):
+    """
+    OpenAI 兼容格式客户端
+    覆盖：DeepSeek / Kimi(Moonshot) / 通义千问(Qwen) / StepFun / MiniMax / 讯飞星火(Spark)
+    """
+
+    def __init__(self, api_key: str, base_url: Optional[str] = None, **kwargs):
+        super().__init__(api_key, **kwargs)
+        from openai import OpenAI
+        self._client = OpenAI(api_key=api_key, base_url=base_url)
+
+    def stream_chat(self, model: str, messages: list, max_tokens: int = 4096) -> Iterator[dict]:
+        response = self._client.chat.completions.create(
+            model=model,
+            messages=messages,
+            stream=True,
+            max_tokens=max_tokens,
+        )
+        for chunk in response:
+            content = ""
+            usage = None
+            if chunk.choices and chunk.choices[0].delta:
+                content = chunk.choices[0].delta.content or ""
+            if hasattr(chunk, 'usage') and chunk.usage:
+                usage = chunk.usage.model_dump() if hasattr(chunk.usage, 'model_dump') else vars(chunk.usage)
+            yield {"content": content, "usage": usage}
+
+
+# 提供商配置表
+_PROVIDERS: Dict[str, Dict[str, Any]] = {
+    "zhipu": {
+        "name": "智谱AI (Zhipu)",
+        "default_model": "glm-4-flash",
+        "client_class": ZhipuLLMClient,
+        "base_url": None,
+    },
+    "deepseek": {
+        "name": "DeepSeek",
+        "default_model": "deepseek-chat",
+        "client_class": OpenAICompatibleClient,
+        "base_url": "https://api.deepseek.com",
+    },
+    "kimi": {
+        "name": "Kimi (Moonshot)",
+        "default_model": "moonshot-v1-8k",
+        "client_class": OpenAICompatibleClient,
+        "base_url": "https://api.moonshot.cn/v1",
+    },
+    "qwen": {
+        "name": "通义千问 (Qwen)",
+        "default_model": "qwen-turbo",
+        "client_class": OpenAICompatibleClient,
+        "base_url": "https://dashscope.aliyuncs.com/compatible-mode/v1",
+    },
+    "stepfun": {
+        "name": "阶跃星辰 (StepFun)",
+        "default_model": "step-1-8k",
+        "client_class": OpenAICompatibleClient,
+        "base_url": "https://api.stepfun.com/v1",
+    },
+    "minimax": {
+        "name": "MiniMax",
+        "default_model": "abab6.5-chat",
+        "client_class": OpenAICompatibleClient,
+        "base_url": "https://api.minimax.chat/v1",
+    },
+    "spark": {
+        "name": "讯飞星火 (Spark)",
+        "default_model": "generalv3.5",
+        "client_class": OpenAICompatibleClient,
+        "base_url": "https://spark-api-open.xf-yun.com/v1",
+    },
+}
+
+
+def create_llm_client(cfg: dict):
+    """
+    根据配置创建对应的 LLM 客户端
+
+    cfg 格式支持：
+      新版: {"provider": "deepseek", "providers": {"deepseek": {"key": "xxx", "model": "..."}}}
+      旧版: {"key": "xxx", "model": "glm-4-flash"}  (自动识别为 zhipu)
+
+    返回: (client_instance, provider_id, model_name)
+    """
+    provider = cfg.get("provider", "zhipu")
+    providers_cfg = cfg.get("providers", {})
+
+    # 获取当前提供商配置
+    pcfg = providers_cfg.get(provider, {})
+
+    # 向后兼容：如果 providers 中没有当前 provider，从顶层读取 key/model
+    api_key = pcfg.get("key", cfg.get("key", ""))
+    default_model = _PROVIDERS.get(provider, _PROVIDERS["zhipu"])["default_model"]
+    model = pcfg.get("model", cfg.get("model", default_model))
+
+    info = _PROVIDERS.get(provider, _PROVIDERS["zhipu"])
+    client_class = info["client_class"]
+    base_url = info.get("base_url")
+
+    kwargs = {"api_key": api_key}
+    if base_url:
+        kwargs["base_url"] = base_url
+
+    return client_class(**kwargs), provider, model
+
+
+def list_providers():
+    """返回所有支持的提供商列表"""
+    return [
+        {"id": k, "name": v["name"], "default_model": v["default_model"]}
+        for k, v in _PROVIDERS.items()
+    ]
+
+
+def get_provider_info(provider_id: str):
+    """获取指定提供商信息"""
+    return _PROVIDERS.get(provider_id)
+
+
+def resolve_provider_model(arg: str) -> tuple:
+    """
+    解析用户输入的模型参数
+    支持格式：
+      - "deepseek:deepseek-chat" → ("deepseek", "deepseek-chat")
+      - "deepseek-chat"          → (None, "deepseek-chat")  (仅模型名，保持当前提供商)
+    """
+    if ":" in arg:
+        parts = arg.split(":", 1)
+        return parts[0].strip(), parts[1].strip()
+    return None, arg.strip()

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli/core/stream.py

@@ -6,78 +6,78 @@ import time
 from fr_cli.ui.ui import RESET, DIM, CYAN, RED, CODE_BG, CODE_FG
 from fr_cli.lang.i18n import T
 
+
 def stream_cnt(client, model, messages, lang, custom_prefix=None, max_tokens=None, silent=False):
     """
-    流式调用智谱API并实时打印，带有简易代码块高亮状态机
+    流式调用 LLM 并实时打印，带有简易代码块高亮状态机
+    :param client: LLM 客户端实例 (BaseLLMClient 子类)
     :param silent: 如果为True，则不输出到终端，仅返回文本
     :return: tuple (完整回复文本 str, 使用情况 dict, 响应时间 float)
     """
     if not silent:
         p = custom_prefix or f"{CYAN}{T('prompt_ai', lang)}{RESET} "
         sys.stdout.write(p); sys.stdout.flush()
-    
+
     start_time = time.time()
     full_text = ""
     in_code = False
     usage = {}
-    
+
     try:
         # 验证API密钥
         if not client.api_key or len(client.api_key) < 10:
             print(f"{RED}[错误] API密钥未配置或格式不正确{RESET}")
             return "[错误] 请先配置有效的API密钥", {}, 0.0
-        
-        response = client.chat.completions.create(
+
+        response = client.stream_chat(
             model=model,
             messages=messages,
-            stream=True,
             max_tokens=max_tokens if max_tokens else 4096
         )
-        
+
         for chunk in response:
-            if chunk.choices and chunk.choices[0].delta:
-                txt = chunk.choices[0].delta.content
-                if txt:
-                    full_text += txt
-                    # 简易状态机：检测 ``` 切换代码背景
-                    if "```" in txt:
-                        parts = txt.split("```")
-                        for i, part in enumerate(parts):
-                            if i > 0:  # 遇到了一个 ```
-                                in_code = not in_code
-                                if not silent:
-                                    if in_code:
-                                        sys.stdout.write(f"{CODE_BG}{CODE_FG}")
-                                    else:
-                                        sys.stdout.write(f"{RESET}")
+            txt = chunk.get("content", "")
+            if txt:
+                full_text += txt
+                # 简易状态机：检测 ``` 切换代码背景
+                if "```" in txt:
+                    parts = txt.split("```")
+                    for i, part in enumerate(parts):
+                        if i > 0:  # 遇到了一个 ```
+                            in_code = not in_code
                             if not silent:
-                                sys.stdout.write(part)
-                            sys.stdout.flush()
-                    else:
+                                if in_code:
+                                    sys.stdout.write(f"{CODE_BG}{CODE_FG}")
+                                else:
+                                    sys.stdout.write(f"{RESET}")
                         if not silent:
-                            if in_code:
-                                sys.stdout.write(f"{CODE_BG}{CODE_FG}{txt}{CODE_FG}")
-                            else:
-                                sys.stdout.write(txt)
+                            sys.stdout.write(part)
                         sys.stdout.flush()
-                    
-            if hasattr(chunk, 'usage') and chunk.usage:
-                usage = chunk.usage.model_dump()
-                
+                else:
+                    if not silent:
+                        if in_code:
+                            sys.stdout.write(f"{CODE_BG}{CODE_FG}{txt}{CODE_FG}")
+                        else:
+                            sys.stdout.write(txt)
+                    sys.stdout.flush()
+
+            if chunk.get("usage"):
+                usage = chunk["usage"]
+
     except Exception as e:
         sys.stdout.write(f"\n{DIM}{str(e)[:50]}{RESET}")
         sys.stdout.flush()
-        
+
     if not silent:
         sys.stdout.write(RESET)
         sys.stdout.write("\n")
         sys.stdout.flush()
-    
+
     end_time = time.time()
     response_time = end_time - start_time
-    
+
     # 如果没有收到任何内容，返回提示信息
     if not full_text:
         return "[错误] 无法获取AI回复，请检查API密钥配置", usage, response_time
-    
-    return full_text, usage, response_time
+
+    return full_text, usage, response_time

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli/main.py

@@ -181,7 +181,7 @@ def main():
     state.context_summary = load_context(state.sn)
 
     # 启动动画
-    print_banner(state.model_name, state.limit, cfg.get("allowed_dirs", [""]), state.sn, state.lang)
+    print_banner(state.model_name, state.limit, cfg.get("allowed_dirs", [""]), state.sn, state.lang, state.provider)
 
     # ================= 主循环 =================
     while True:

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli/repl/commands.py

@@ -100,8 +100,23 @@ def _cmd_help(state, parts):
 def _cmd_model(state, parts):
     arg1 = parts[1] if len(parts) > 1 else ""
     if arg1:
-        state.update_model(arg1)
-        print(f"{GREEN}{T('ok_model', state.lang, arg1)}{RESET}")
+        ok = state.update_model(arg1)
+        if ok:
+            print(f"{GREEN}✅ 已切换: [{state.provider}] {state.model_name}{RESET}")
+        else:
+            print(f"{RED}❌ 无效的提供商或模型: {arg1}{RESET}")
+    else:
+        # 显示当前道统与可用模型
+        from fr_cli.core.llm import list_providers, get_provider_info
+        print(f"{CYAN}🧠 当前道统: [{state.provider}] {state.model_name}{RESET}")
+        print(f"\n{DIM}可用道统与默认模型:{RESET}")
+        for p in list_providers():
+            marker = " 👈 当前" if p["id"] == state.provider else ""
+            print(f"  {CYAN}{p['id']}{RESET} — {p['name']}{DIM} (默认: {p['default_model']}){RESET}{marker}")
+        print(f"\n{DIM}用法:{RESET}")
+        print(f"  /model <模型名>           — 切换当前道统下的模型")
+        print(f"  /model <道统>:<模型名>    — 同时切换道统和模型")
+        print(f"  示例: /model deepseek:deepseek-chat")
     return False
 
 
@@ -109,7 +124,9 @@ def _cmd_key(state, parts):
     arg1 = parts[1] if len(parts) > 1 else ""
     if arg1:
         state.update_key(arg1)
-        print(f"{GREEN}{T('ok_key', state.lang)}{RESET}")
+        print(f"{GREEN}✅ [{state.provider}] API Key 已更新{RESET}")
+    else:
+        print(f"{YELLOW}⚠️ 用法: /key <API密钥>  (为当前道统 [{state.provider}] 设置密钥){RESET}")
     return False
 
 

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli/ui/ui.py

@@ -48,7 +48,7 @@ def get_display_width(text):
             width += 1
     return width
 
-def print_banner(mn, tl, ad, sn, l):
+def print_banner(mn, tl, ad, sn, l, provider="zhipu"):
     """打印启动时的小乌龟从左向右爬行动画"""
 
     # 乌龟身体（6行）
@@ -106,10 +106,11 @@ def print_banner(mn, tl, ad, sn, l):
     uf = (l == "zh")
     ds = f"{GREEN}{ad}{RESET}" if ad else f"{RED}{('未开放洞府' if uf else 'No dir')}{RESET}"
     ss = f"{MAGENTA}{sn}{RESET}" if sn else f"{DIM}{'全新轮回' if uf else 'New'}{RESET}"
+    pv = f"  {'🏛️ 道统' if uf else 'Provider'}: {CYAN}{provider}{RESET}"
     i1 = f"  {'🔮 模型' if uf else 'Model'}: {GREEN}{BOLD}{mn}{RESET}  |  {'🛡️ 上限' if uf else 'Limit'}: {YELLOW}{tl}{RESET}"
     i2 = f"  {'📂 洞府' if uf else 'Dir'}: {ds}  |  {'⏳ 轮回' if uf else 'Sess'}: {ss}"
-    bl = max(get_display_width(i1), get_display_width(i2)) + 4
-    print(f"{MAGENTA}┌{'─'*bl}┐{RESET}\n{MAGENTA}│{RESET}{i1}{' '*(bl-get_display_width(i1)-2)}{MAGENTA}│{RESET}\n{MAGENTA}│{RESET}{i2}{' '*(bl-get_display_width(i2)-2)}{MAGENTA}│{RESET}\n{MAGENTA}└{'─'*bl}┘{RESET}\n")
+    bl = max(get_display_width(pv), get_display_width(i1), get_display_width(i2)) + 4
+    print(f"{MAGENTA}┌{'─'*bl}┐{RESET}\n{MAGENTA}│{RESET}{pv}{' '*(bl-get_display_width(pv)-2)}{MAGENTA}│{RESET}\n{MAGENTA}│{RESET}{i1}{' '*(bl-get_display_width(i1)-2)}{MAGENTA}│{RESET}\n{MAGENTA}│{RESET}{i2}{' '*(bl-get_display_width(i2)-2)}{MAGENTA}│{RESET}\n{MAGENTA}└{'─'*bl}┘{RESET}\n")
 
 def print_bye():
     """打印退出动画"""

{fr_cli-2.1.0 → fr_cli-2.2.0/fr_cli.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.1.0
-Summary: 凡人打字机 - 基于智谱AI的终极全能终端工具
+Version: 2.2.0
+Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/yourname/fr-cli
 Project-URL: Issues, https://github.com/yourname/fr-cli/issues
-Keywords: zhipuai,glm,cli,ai,terminal,chatbot
+Keywords: zhipuai,deepseek,kimi,qwen,cli,ai,terminal,chatbot
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -24,6 +24,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: zhipuai>=2.0.0
+Requires-Dist: openai>=1.0.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: mcp>=1.6.0
 Provides-Extra: data

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ fr_cli/conf/wizard.py
 fr_cli/core/chat.py
 fr_cli/core/core.py
 fr_cli/core/intent.py
+fr_cli/core/llm.py
 fr_cli/core/recommender.py
 fr_cli/core/stream.py
 fr_cli/core/sysmon.py

{fr_cli-2.1.0 → fr_cli-2.2.0}/fr_cli.egg-info/requires.txt

@@ -1,4 +1,5 @@
 zhipuai>=2.0.0
+openai>=1.0.0
 requests>=2.28.0
 mcp>=1.6.0
 

{fr_cli-2.1.0 → fr_cli-2.2.0}/pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fr-cli"
-version = "2.1.0"
-description = "凡人打字机 - 基于智谱AI的终极全能终端工具"
+version = "2.2.0"
+description = "凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具"
 readme = "README.md"
 requires-python = ">=3.8"
 license = "MIT"
 authors = [
     {name = "FANREN CLI Author"},
 ]
-keywords = ["zhipuai", "glm", "cli", "ai", "terminal", "chatbot"]
+keywords = ["zhipuai", "deepseek", "kimi", "qwen", "cli", "ai", "terminal", "chatbot"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",
@@ -30,6 +30,7 @@ classifiers = [
 ]
 dependencies = [
     "zhipuai>=2.0.0",
+    "openai>=1.0.0",
     "requests>=2.28.0",
     "mcp>=1.6.0",
 ]