fr-cli 2.2.2__tar.gz → 2.2.4__tar.gz

{fr_cli-2.2.2/fr_cli.egg-info → fr_cli-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.2
+Version: 2.2.4
 Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT
@@ -37,7 +37,7 @@ Requires-Dist: pyodbc>=4.0.0; extra == "db"
 Requires-Dist: oracledb>=1.3.0; extra == "db"
 Provides-Extra: rag
 Requires-Dist: chromadb>=0.4.0; extra == "rag"
-Requires-Dist: sentence-transformers>=2.2.2; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.4; extra == "rag"
 Provides-Extra: remote
 Requires-Dist: paramiko>=3.0.0; extra == "remote"
 Provides-Extra: spider
@@ -56,7 +56,7 @@ Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"
 Requires-Dist: pyodbc>=4.0.0; extra == "all"
 Requires-Dist: oracledb>=1.3.0; extra == "all"
 Requires-Dist: chromadb>=0.4.0; extra == "all"
-Requires-Dist: sentence-transformers>=2.2.2; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.4; extra == "all"
 Requires-Dist: paramiko>=3.0.0; extra == "all"
 Requires-Dist: selenium>=4.10.0; extra == "all"
 Requires-Dist: bypy; extra == "all"

{fr_cli-2.2.2 → fr_cli-2.2.4}/fr_cli/__init__.py

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

{fr_cli-2.2.2 → fr_cli-2.2.4}/fr_cli/core/llm.py

@@ -146,7 +146,8 @@ def create_llm_client(cfg: dict):
 
     info = _PROVIDERS.get(provider, _PROVIDERS["zhipu"])
     client_class = info["client_class"]
-    base_url = info.get("base_url")
+    # 优先使用用户自定义的 base_url，其次使用内置默认
+    base_url = pcfg.get("base_url") or info.get("base_url")
 
     kwargs = {"api_key": api_key}
     if base_url:

{fr_cli-2.2.2 → fr_cli-2.2.4}/fr_cli/main.py

@@ -89,6 +89,7 @@ from fr_cli.repl.commands import (
     _cmd_read_excel,
     _cmd_read_csv,
     _cmd_master,
+    _cmd_providers,
     _cmd_mcp_list,
     _cmd_mcp_add,
     _cmd_mcp_del,
@@ -147,6 +148,7 @@ _COMMAND_ROUTES = {
     "/read_excel": _cmd_read_excel,
     "/read_csv": _cmd_read_csv,
     "/master": _cmd_master,
+    "/providers": _cmd_providers,
     "/mcp_list": _cmd_mcp_list,
     "/mcp_add": _cmd_mcp_add,
     "/mcp_del": _cmd_mcp_del,

{fr_cli-2.2.2 → fr_cli-2.2.4}/fr_cli/repl/commands.py

@@ -121,13 +121,19 @@ def _cmd_model(state, parts):
         else:
             print(f"{RED}❌ 无效的提供商或模型: {arg1}{RESET}")
     else:
-        # 显示当前道统与可用模型
-        from fr_cli.core.llm import list_providers, get_provider_info
+        # 显示当前道统与可用模型及 key 配置状态
+        from fr_cli.core.llm import list_providers
         print(f"{CYAN}🧠 当前道统: [{state.provider}] {state.model_name}{RESET}")
         print(f"\n{DIM}可用道统与默认模型:{RESET}")
+        providers_cfg = state.cfg.get("providers", {})
         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}")
+            pcfg = providers_cfg.get(p["id"], {})
+            has_key = bool(pcfg.get("key"))
+            if not has_key and p["id"] == "zhipu":
+                has_key = bool(state.cfg.get("key", ""))
+            key_status = f"{GREEN}✅ 已配置{RESET}" if has_key else f"{RED}❌ 未配置{RESET}"
+            print(f"  {CYAN}{p['id']}{RESET} — {p['name']}{DIM} (默认: {p['default_model']}){RESET} {key_status}{marker}")
         print(f"\n{DIM}用法:{RESET}")
         print(f"  /model <模型名>           — 切换当前道统下的模型")
         print(f"  /model <道统>:<模型名>    — 同时切换道统和模型")
@@ -136,12 +142,142 @@ def _cmd_model(state, parts):
 
 
 def _cmd_key(state, parts):
+    """
+    设置 API Key
+    用法:
+      /key <key>              — 为当前道统设置 key
+      /key <道统> <key>       — 为指定道统设置 key
+    """
     arg1 = parts[1] if len(parts) > 1 else ""
-    if arg1:
+    arg2 = parts[2] if len(parts) > 2 else ""
+    if arg1 and arg2:
+        # /key <provider> <key>
+        target_provider = arg1
+        from fr_cli.core.llm import get_provider_info
+        if not get_provider_info(target_provider):
+            print(f"{RED}❌ 无效道统: {target_provider}{RESET}")
+            return False
+        # 临时切到目标道统设置 key，再切回来
+        original_provider = state.provider
+        state.update_provider(target_provider)
+        state.update_key(arg2)
+        # 如果原来不是目标道统，切回去
+        if original_provider != target_provider:
+            state.update_provider(original_provider)
+        print(f"{GREEN}✅ [{target_provider}] API Key 已更新{RESET}")
+    elif arg1:
+        # /key <key>
         state.update_key(arg1)
         print(f"{GREEN}✅ [{state.provider}] API Key 已更新{RESET}")
     else:
-        print(f"{YELLOW}⚠️ 用法: /key <API密钥>  (为当前道统 [{state.provider}] 设置密钥){RESET}")
+        print(f"{YELLOW}⚠️ 用法:{RESET}")
+        print(f"  /key <API密钥>              — 为当前道统 [{state.provider}] 设置密钥")
+        print(f"  /key <道统> <API密钥>       — 为指定道统设置密钥")
+    return False
+
+
+def _cmd_providers(state, parts):
+    """
+    多模型道统配置管理
+    用法:
+      /providers                  — 查看所有道统配置
+      /providers add <道统> <key> [模型] — 添加/更新道统配置
+      /providers del <道统>       — 删除道统配置
+      /providers use <道统>       — 切换到指定道统
+    """
+    sub = parts[1] if len(parts) > 1 else ""
+    arg1 = parts[2] if len(parts) > 2 else ""
+    arg2 = parts[3] if len(parts) > 3 else ""
+
+    providers_cfg = state.cfg.setdefault("providers", {})
+
+    if not sub or sub == "list":
+        from fr_cli.core.llm import list_providers, get_provider_info
+        print(f"{CYAN}📜 道统配置总览{RESET}")
+        for p in list_providers():
+            pcfg = providers_cfg.get(p["id"], {})
+            has_key = bool(pcfg.get("key"))
+            if not has_key and p["id"] == "zhipu":
+                has_key = bool(state.cfg.get("key", ""))
+            key_status = f"{GREEN}✅{RESET}" if has_key else f"{RED}❌{RESET}"
+            model = pcfg.get("model", p["default_model"])
+            info = get_provider_info(p["id"])
+            base_url = pcfg.get("base_url") or info.get("base_url", "默认")
+            active = f" {YELLOW}👈 当前使用{RESET}" if p["id"] == state.provider else ""
+            print(f"\n  {key_status} {CYAN}{p['id']}{RESET} — {p['name']}{active}")
+            print(f"      模型: {DIM}{model}{RESET}")
+            print(f"      接口: {DIM}{base_url}{RESET}")
+            if has_key:
+                raw_key = pcfg.get("key", state.cfg.get("key", ""))
+                key_display = raw_key[:8] + "****" if len(raw_key) > 8 else raw_key
+                print(f"      Key:  {DIM}{key_display}{RESET}")
+        print(f"\n{DIM}用法:{RESET}")
+        print(f"  /providers add <道统> <key> [模型] — 添加/更新道统配置")
+        print(f"  /providers del <道统>              — 删除道统配置")
+        print(f"  /providers use <道统>              — 切换到指定道统")
+        return False
+
+    if sub == "add":
+        if not arg1 or not arg2:
+            print(f"{RED}❌ 用法: /providers add <道统> <key> [模型]{RESET}")
+            return False
+        provider_id = arg1
+        from fr_cli.core.llm import get_provider_info
+        info = get_provider_info(provider_id)
+        if not info:
+            print(f"{RED}❌ 无效道统: {provider_id}{RESET}")
+            return False
+        pcfg = providers_cfg.setdefault(provider_id, {})
+        pcfg["key"] = arg2
+        model = parts[4] if len(parts) > 4 else info["default_model"]
+        pcfg["model"] = model
+        # 支持自定义 base_url: /providers add <provider> <key> [model] --base-url <url>
+        for i, token in enumerate(parts):
+            if token in ("--base-url", "--base_url") and i + 1 < len(parts):
+                pcfg["base_url"] = parts[i + 1]
+                break
+        state.cfg["providers"] = providers_cfg
+        state.save_cfg()
+        extra = f" 自定义接口={pcfg.get('base_url')}" if pcfg.get("base_url") else ""
+        print(f"{GREEN}✅ [{provider_id}] 配置已更新: 模型={model}{extra}{RESET}")
+        return False
+
+    if sub == "del":
+        if not arg1:
+            print(f"{RED}❌ 用法: /providers del <道统>{RESET}")
+            return False
+        if arg1 in providers_cfg:
+            del providers_cfg[arg1]
+            state.cfg["providers"] = providers_cfg
+            state.save_cfg()
+            print(f"{GREEN}✅ [{arg1}] 配置已删除{RESET}")
+        else:
+            print(f"{YELLOW}⚠️ [{arg1}] 无配置可删除{RESET}")
+        return False
+
+    if sub == "use":
+        if not arg1:
+            print(f"{RED}❌ 用法: /providers use <道统>{RESET}")
+            return False
+        ok = state.update_provider(arg1)
+        if ok:
+            print(f"{GREEN}✅ 已切换到: [{state.provider}] {state.model_name}{RESET}")
+            # 检查新道统是否已配置 API Key
+            pcfg = providers_cfg.get(state.provider, {})
+            has_key = bool(pcfg.get("key"))
+            if not has_key and state.provider == "zhipu":
+                has_key = bool(state.cfg.get("key", ""))
+            if not has_key:
+                print(f"{YELLOW}⚠️ [{state.provider}] 尚未配置 API Key{RESET}")
+                k = input(f"👉 请输入 [{state.provider}] 的 API Key: ").strip()
+                if k:
+                    state.update_key(k)
+                    print(f"{GREEN}✅ [{state.provider}] API Key 已保存{RESET}")
+        else:
+            print(f"{RED}❌ 无效道统: {arg1}{RESET}")
+        return False
+
+    print(f"{RED}❌ 未知子命令: {sub}{RESET}")
     return False
 
 

{fr_cli-2.2.2 → fr_cli-2.2.4/fr_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.2
+Version: 2.2.4
 Summary: 凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具
 Author: FANREN CLI Author
 License-Expression: MIT
@@ -37,7 +37,7 @@ Requires-Dist: pyodbc>=4.0.0; extra == "db"
 Requires-Dist: oracledb>=1.3.0; extra == "db"
 Provides-Extra: rag
 Requires-Dist: chromadb>=0.4.0; extra == "rag"
-Requires-Dist: sentence-transformers>=2.2.2; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.4; extra == "rag"
 Provides-Extra: remote
 Requires-Dist: paramiko>=3.0.0; extra == "remote"
 Provides-Extra: spider
@@ -56,7 +56,7 @@ Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"
 Requires-Dist: pyodbc>=4.0.0; extra == "all"
 Requires-Dist: oracledb>=1.3.0; extra == "all"
 Requires-Dist: chromadb>=0.4.0; extra == "all"
-Requires-Dist: sentence-transformers>=2.2.2; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.4; extra == "all"
 Requires-Dist: paramiko>=3.0.0; extra == "all"
 Requires-Dist: selenium>=4.10.0; extra == "all"
 Requires-Dist: bypy; extra == "all"

{fr_cli-2.2.2 → fr_cli-2.2.4}/fr_cli.egg-info/requires.txt

@@ -11,7 +11,7 @@ psycopg2-binary>=2.9.0
 pyodbc>=4.0.0
 oracledb>=1.3.0
 chromadb>=0.4.0
-sentence-transformers>=2.2.2
+sentence-transformers>=2.2.4
 paramiko>=3.0.0
 selenium>=4.10.0
 bypy
@@ -44,7 +44,7 @@ watchdog>=3.0.0
 
 [rag]
 chromadb>=0.4.0
-sentence-transformers>=2.2.2
+sentence-transformers>=2.2.4
 
 [remote]
 paramiko>=3.0.0

{fr_cli-2.2.2 → fr_cli-2.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fr-cli"
-version = "2.2.2"
+version = "2.2.4"
 description = "凡人打字机 - 支持多模型(Zhipu/DeepSeek/Kimi/Qwen/StepFun/MiniMax/Spark)的终极全能终端工具"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -38,7 +38,7 @@ dependencies = [
 [project.optional-dependencies]
 data = ["pandas>=1.5.0", "openpyxl>=3.0.0"]
 db = ["pymysql>=1.0.0", "psycopg2-binary>=2.9.0", "pyodbc>=4.0.0", "oracledb>=1.3.0"]
-rag = ["chromadb>=0.4.0", "sentence-transformers>=2.2.2"]
+rag = ["chromadb>=0.4.0", "sentence-transformers>=2.2.4"]
 remote = ["paramiko>=3.0.0"]
 spider = ["selenium>=4.10.0"]
 cloud = ["bypy", "aligo", "msal"]
@@ -46,7 +46,7 @@ monitor = ["watchdog>=3.0.0"]
 all = [
     "pandas>=1.5.0", "openpyxl>=3.0.0",
     "pymysql>=1.0.0", "psycopg2-binary>=2.9.0", "pyodbc>=4.0.0", "oracledb>=1.3.0",
-    "chromadb>=0.4.0", "sentence-transformers>=2.2.2",
+    "chromadb>=0.4.0", "sentence-transformers>=2.2.4",
     "paramiko>=3.0.0",
     "selenium>=4.10.0",
     "bypy", "aligo", "msal",