fr-cli 2.2.1__tar.gz → 2.2.3__tar.gz

{fr_cli-2.2.1/fr_cli.egg-info → fr_cli-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.1
+Version: 2.2.3
 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.1; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.3; 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.1; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.3; 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.1 → fr_cli-2.2.3}/fr_cli/__init__.py

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

{fr_cli-2.2.1 → fr_cli-2.2.3}/fr_cli/conf/config.py

@@ -123,7 +123,10 @@ def init_config():
     pcfg = providers_cfg.get(provider, {})
 
     # 检查当前提供商是否已配置 key
-    has_key = bool(pcfg.get("key", c.get("key", "")))
+    # 各道统独立管理 key；zhipu 向后兼容：未单独配置时回退顶层 key
+    has_key = bool(pcfg.get("key"))
+    if not has_key and provider == "zhipu":
+        has_key = bool(c.get("key", ""))
 
     if not has_key:
         print(f"\n{YELLOW}⚠️ API Key Required{RESET}")

{fr_cli-2.2.1 → fr_cli-2.2.3}/fr_cli/repl/commands.py

@@ -106,7 +106,10 @@ def _cmd_model(state, parts):
             # 检查新道统是否已配置 API Key，若未配置则引导输入
             providers_cfg = state.cfg.get("providers", {})
             pcfg = providers_cfg.get(state.provider, {})
-            has_key = bool(pcfg.get("key", state.cfg.get("key", "")))
+            # 只检查该道统自己专属的 key；zhipu 向后兼容：未单独配置时回退顶层 key
+            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()
@@ -118,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 <道统>:<模型名>    — 同时切换道统和模型")
@@ -133,12 +142,37 @@ 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
 
 

{fr_cli-2.2.1 → fr_cli-2.2.3/fr_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fr-cli
-Version: 2.2.1
+Version: 2.2.3
 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.1; extra == "rag"
+Requires-Dist: sentence-transformers>=2.2.3; 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.1; extra == "all"
+Requires-Dist: sentence-transformers>=2.2.3; 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.1 → fr_cli-2.2.3}/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.1
+sentence-transformers>=2.2.3
 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.1
+sentence-transformers>=2.2.3
 
 [remote]
 paramiko>=3.0.0

{fr_cli-2.2.1 → fr_cli-2.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fr-cli"
-version = "2.2.1"
+version = "2.2.3"
 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.1"]
+rag = ["chromadb>=0.4.0", "sentence-transformers>=2.2.3"]
 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.1",
+    "chromadb>=0.4.0", "sentence-transformers>=2.2.3",
     "paramiko>=3.0.0",
     "selenium>=4.10.0",
     "bypy", "aligo", "msal",