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

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

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

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

{fr_cli-2.2.0 → fr_cli-2.2.2}/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.0 → fr_cli-2.2.2}/fr_cli/repl/commands.py

@@ -103,6 +103,21 @@ def _cmd_model(state, parts):
         ok = state.update_model(arg1)
         if ok:
             print(f"{GREEN}✅ 已切换: [{state.provider}] {state.model_name}{RESET}")
+            # 检查新道统是否已配置 API Key，若未配置则引导输入
+            providers_cfg = state.cfg.get("providers", {})
+            pcfg = providers_cfg.get(state.provider, {})
+            # 只检查该道统自己专属的 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()
+                if k:
+                    state.update_key(k)
+                    print(f"{GREEN}✅ [{state.provider}] API Key 已保存{RESET}")
+                else:
+                    print(f"{RED}❌ 未输入 Key，[{state.provider}] 可能无法正常使用{RESET}")
         else:
             print(f"{RED}❌ 无效的提供商或模型: {arg1}{RESET}")
     else:

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

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

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

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