fix(zhiyi-cli): resolveAPIKey 支持多行 key 文件(原实现把整份文件当密钥 → 必然 401)

卡 t_4fab32c1 的 CLI 改动(去硬编码默认 key,env→文件→报错)+ 小怡修正多行解析。
实测:/tmp/zhiyi-cli-verify stats 走 key 文件成功返回(记忆 10607 / episodes 57347 / 队列 3)。
This commit is contained in:
xiaoyi
2026-09-21 22:08:02 +08:00
parent 36cbb51019
commit 4f947cecef
+65 -28
View File
@@ -14,12 +14,41 @@ import (
"unicode/utf8"
)
// t_4fab32c1 AC2: 删除硬编码 "zhiyi-dev-key-2026" 默认值。
// 密钥来源优先级:ZHIYI_API_KEY env → /var/lib/memoryweave/.api-key → 报错退出。
const (
apiKeyDefault = "zhiyi-dev-key-2026"
apiURLDefault = "http://localhost:7821"
apiKeyDefault = "" // 不再提供硬编码默认 key
apiURLDefault = "http://localhost:7821"
namespaceDefault = "hermes-main"
)
// resolveAPIKey 解析 API Key:
// 1. -key flag 显式传入(非空)
// 2. ZHIYI_API_KEY 环境变量
// 3. /var/lib/memoryweave/.api-key 文件(**多行格式**:注释与 `legacy:` 行跳过,
// 取第 1 个非注释非 legacy 行 = 主密钥)
// 4. 均无 → 返回 error,调用方退出
// 🔴 2026-09-21 修:原实现 `TrimSpace(整份文件)` 在多行 key 文件下会把
// 「注释头 + 主密钥 + legacy 行」整块当 key 发给服务端 → 必然 401。
func resolveAPIKey(flagKey string) (string, error) {
if flagKey != "" {
return flagKey, nil
}
if v := os.Getenv("ZHIYI_API_KEY"); v != "" {
return v, nil
}
if data, err := os.ReadFile("/var/lib/memoryweave/.api-key"); err == nil {
for _, line := range strings.Split(string(data), "\n") {
line = strings.TrimSpace(line)
if line == "" || strings.HasPrefix(line, "#") || strings.HasPrefix(line, "legacy:") {
continue
}
return line, nil
}
}
return "", fmt.Errorf("API Key 未找到:请设 ZHIYI_API_KEY 环境变量,或将 key 写入 /var/lib/memoryweave/.api-key")
}
// ─── 全局参数 ──────────────────────────────────────────────
var (
@@ -39,16 +68,24 @@ func main() {
os.Exit(1)
}
// t_4fab32c1 AC2: 启动时解析 API Key,缺失则报错退出
// 旧版使用硬编码 "zhiyi-dev-key-2026" 作为默认值
apiKeyVal, err := resolveAPIKey(*apiKey)
if err != nil {
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
os.Exit(1)
}
cmd := flag.Arg(0)
args := flag.Args()[1:]
var err error
var runErr error
switch cmd {
case "tree": err = runTree(args)
case "graph": err = runGraph(args)
case "recall": err = runRecall(args)
case "stats": err = runStats()
case "entity": err = runEntity(args)
case "tree": runErr = runTree(args, apiKeyVal)
case "graph": runErr = runGraph(args, apiKeyVal)
case "recall": runErr = runRecall(args, apiKeyVal)
case "stats": runErr = runStats(apiKeyVal)
case "entity": runErr = runEntity(args, apiKeyVal)
case "help", "--help", "-h":
flag.Usage()
os.Exit(0)
@@ -57,8 +94,8 @@ func main() {
flag.Usage()
os.Exit(1)
}
if err != nil {
fmt.Fprintln(os.Stderr, "Error:", err)
if runErr != nil {
fmt.Fprintln(os.Stderr, "Error:", runErr)
os.Exit(1)
}
}
@@ -99,12 +136,12 @@ func usage() {
// ─── API 调用 ──────────────────────────────────────────────
func apiGet(path string, v interface{}) error {
return getJSON(*apiURL+path, *apiKey, v)
func apiGet(path string, v interface{}, apiKey string) error {
return getJSON(*apiURL+path, apiKey, v)
}
func apiPost(path string, body, v interface{}) error {
return postJSON(*apiURL+path, *apiKey, body, v)
func apiPost(path string, body, v interface{}, apiKey string) error {
return postJSON(*apiURL+path, apiKey, body, v)
}
func getJSON(url, apiKey string, v interface{}) error {
@@ -147,7 +184,7 @@ func postJSON(url, apiKey string, body interface{}, v interface{}) error {
// ─── 命令实现 ──────────────────────────────────────────────
func runTree(args []string) error {
func runTree(args []string, apiKey string) error {
// 从图谱 export 获取节点(带 category),按 category 分组
var r struct {
Nodes []struct {
@@ -167,7 +204,7 @@ func runTree(args []string) error {
Edges int `json:"edges"`
} `json:"count"`
}
if err := apiGet(fmt.Sprintf("/api/v1/graph/export?namespace=%s&limit=500", *ns), &r); err != nil {
if err := apiGet(fmt.Sprintf("/api/v1/graph/export?namespace=%s&limit=500", *ns), &r, apiKey); err != nil {
return err
}
@@ -224,7 +261,7 @@ func runTree(args []string) error {
return nil
}
func runGraph(args []string) error {
func runGraph(args []string, apiKey string) error {
var entity string
if len(args) == 0 {
// 从 pagerank map 取 score 最高的非 episode 实体
@@ -232,7 +269,7 @@ func runGraph(args []string) error {
Pagerank map[string]float64 `json:"pagerank"`
Count int `json:"count"`
}
if err := apiGet("/api/v1/graph/pagerank", &pr); err != nil {
if err := apiGet("/api/v1/graph/pagerank", &pr, apiKey); err != nil {
return fmt.Errorf("获取 Top 实体失败: %w", err)
}
var topEntity string
@@ -265,7 +302,7 @@ func runGraph(args []string) error {
var resp navigateResp
if err := apiPost("/api/v1/graph/navigate", map[string]interface{}{
"entity": entity, "max_hops": 1, "namespace": *ns,
}, &resp); err != nil {
}, &resp, apiKey); err != nil {
return fmt.Errorf("获取邻居失败: %w", err)
}
@@ -336,7 +373,7 @@ func printASCIIGraph(center string, neighbors []string, rels map[string]string)
fmt.Printf(" └%s (%d 个邻居)\n", strings.Repeat("─", 20), len(neighbors))
}
func runRecall(args []string) error {
func runRecall(args []string, apiKey string) error {
if len(args) == 0 {
return fmt.Errorf("用法: zhiyi recall <query>")
}
@@ -353,7 +390,7 @@ func runRecall(args []string) error {
}
if err := apiPost("/api/v1/recall", map[string]interface{}{
"query": query, "namespace": *ns, "top_k": 10,
}, &resp); err != nil {
}, &resp, apiKey); err != nil {
return err
}
@@ -372,7 +409,7 @@ func runRecall(args []string) error {
return nil
}
func runStats() error {
func runStats(apiKey string) error {
var stats struct {
TotalMemories int `json:"total_memories"`
TotalEpisodes int `json:"total_episodes"`
@@ -392,9 +429,9 @@ func runStats() error {
BatchSize int `json:"batch_size"`
}
apiGet("/api/v1/stats", &stats)
apiGet("/api/v1/distill/quota", &quota)
apiGet("/api/v1/distill/status", &distStatus)
apiGet("/api/v1/stats", &stats, apiKey)
apiGet("/api/v1/distill/quota", &quota, apiKey)
apiGet("/api/v1/distill/status", &distStatus, apiKey)
barLen := 40
filled := 0
@@ -418,7 +455,7 @@ func runStats() error {
return nil
}
func runEntity(args []string) error {
func runEntity(args []string, apiKey string) error {
if len(args) == 0 {
return fmt.Errorf("用法: zhiyi entity <name>")
}
@@ -455,7 +492,7 @@ func runEntity(args []string) error {
MaxHops int `json:"max_hops"`
Namespace string `json:"namespace"`
}
if err := postJSON(*apiURL+"/api/v1/graph/navigate", *apiKey, navPostReq{entity, 1, *ns}, &nav); err == nil {
if err := postJSON(*apiURL+"/api/v1/graph/navigate", apiKey, navPostReq{entity, 1, *ns}, &nav); err == nil {
evCh <- nav
} else {
evCh <- navResp{}
@@ -470,7 +507,7 @@ func runEntity(args []string) error {
}
if err := apiPost("/api/v1/recall", map[string]interface{}{
"query": entity, "namespace": *ns, "top_k": 10,
}, &recallResp); err == nil {
}, &recallResp, apiKey); err == nil {
mrCh <- recallResp
} else {
mrCh <- struct {