mirror of
https://github.com/Tencent/WeKnora.git
synced 2026-11-01 04:38:03 +08:00
A hardening + finalization pass over the agent-first CLI: correctness fixes,
richer machine-readable signals, flag/naming consistency, and a symmetric
config surface. Pre-1.0, so it includes breaking renames.
Correctness:
- agent update: resolve/validate --model/--rerank-model (was storing a bogus
name verbatim, corrupting config.model_id).
- doctor: honor WEKNORA_HOST / WEKNORA_API_KEY (headless path no longer reports
"no host configured").
- session ask / MCP session_ask: text answer was empty on non-TTY — the agent
stream sets Done=true on an intermediate agent_query frame before the answer,
and AgentAccumulator treated the first Done as terminal. Terminate on the
`complete` event (new sdk.AgentResponseTypeComplete), not a per-frame Done.
- batch exit codes: any per-item failure collapses to operation.failed (exit 1),
including `doc upload --recursive` partial failures — a permanent per-file
failure (e.g. a duplicate) no longer surfaces as a retryable exit 7 an agent
would loop on; per-item typed errors stay in the envelope.
Agent-first signals & discovery:
- error.exit_code in the envelope (type + exit_code disambiguate the
input.invalid_argument exit-2-vs-5 split in one JSON read).
- meta.hint on empty content search and on draft doc create; doc wait fails fast
on a never-parsing draft instead of hanging to --timeout.
- retrieval-readiness is visible in the natural flow: kb status / kb check emit
retrieval_ready, and kb create hints the fix when no embedding model is bound
— an unconfigured KB no longer looks silently healthy.
- schema contract completeness: every leaf declares output + >=1 example
(drift-guarded); output strings match the meta actually emitted; chunk list
and search docs now emit meta.total_count (both previously dropped it).
- schema tolerates a quoted multi-word command label; zero-state auth — and
`link` with no profile — point at profile setup / the headless WEKNORA_KB_ID
path instead of looping on `auth login`.
- id-addressed reads tolerate a redundant --kb (doc view/wait, chunk list/view
accept and ignore it, declared in schema) so a carried-over --kb doesn't
exit 2; streaming commands warn that --jq does not apply to an NDJSON stream.
- keep JSON-always as the default; --jq hints spell out the .data path.
Consistency & gating:
- doc create: drop the deprecated --name alias (--title only; pre-1.0 break).
- chunk list --limit aligned to 1..10000; model list --limit/-L with
has_more/total_count; api write-gates -X PUT/PATCH (exit 10); skills install
expands a leading ~.
- docs corrected: search docs / doc list --keyword help is case-insensitive
(server does LOWER LIKE); AGENTS.md risk-action list (no phantom kb.init; add
model.update / kb.config.set) and batch example (failed item carries `error`);
session resume --message id comes from `message list`, not the stream.
- auth/profile ergonomics: env credentials are now first-class — `auth token`
prints the active WEKNORA_API_KEY / WEKNORA_TOKEN, and auth login/logout/refresh
give an env-aware message instead of looping on "run auth login". `auth logout`
clears credentials but keeps the profile registered (host preserved for
re-login); deleting a profile is `profile remove`'s job (clean logout/remove
separation, matching gh / lark).
Config surface (symmetric read/write, in-place model edits):
- kb config now returns a secret-free KBModelConfigView (was {}); `kb config`
reads, new `kb config set` writes; `kb init` removed (misnomer).
- kb create --chat-model: retrieval-ready in one step.
- model update: edit a model in place (id preserved, references survive) —
rotate --api-key-stdin, change base-url / display-name / etc.
- session continue-stream renamed to session resume.
Docs: AGENTS.md is the single wire-contract source; CHANGELOG slimmed; stale
kb-init / continue-stream references removed; skill wire-vocab guard extended.
AGENTS.md / weknora-shared SKILL document retrieval_ready (a KB needs an
embedding model to be searchable), that --jq does not apply to NDJSON
streams, and the env-credential-first auth path; the KB quickstart example
now creates a retrieval-ready KB.
197 lines
8.2 KiB
Go
197 lines
8.2 KiB
Go
package search
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
"text/tabwriter"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
"github.com/Tencent/WeKnora/cli/internal/output"
|
|
"github.com/Tencent/WeKnora/cli/internal/text"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
// docsPageSize is the default --page-size on `search docs`: how many
|
|
// entries to pull per ListKnowledgeWithFilter round-trip. The server
|
|
// applies the keyword filter pre-pagination, so most KBs return in a
|
|
// single page even at conservative sizes. Server caps page_size at 1000.
|
|
const docsPageSize = 200
|
|
|
|
// docsMaxPageSize bounds the --page-size flag, matching the session/doc list cap.
|
|
const docsMaxPageSize = 1000
|
|
|
|
// docsFields enumerates the fields surfaced for `--format json` discovery on
|
|
// `search docs`. Mirrors sdk.Knowledge json tags.
|
|
var docsFields = []string{
|
|
"id", "tenant_id", "knowledge_base_id", "tag_id", "type", "title",
|
|
"description", "source", "channel", "parse_status", "summary_status",
|
|
"enable_status", "embedding_model_id", "file_name", "file_type",
|
|
"file_size", "file_hash", "file_path", "storage_size", "metadata",
|
|
"created_at", "updated_at", "processed_at", "error_message",
|
|
}
|
|
|
|
type DocsSearchOptions struct {
|
|
Query string
|
|
KB string // raw --kb (UUID or name)
|
|
KBID string // resolved id; populated before listing
|
|
Limit int
|
|
// PageSize is the server batch size per ListKnowledgeWithFilter call
|
|
// (1..1000, default 200). Tunable so a caller searching a small KB
|
|
// can fetch everything in one round-trip, or a caller on flaky
|
|
// network can shorten the batch.
|
|
PageSize int
|
|
// AllPages walks server pages internally until total exhausted or
|
|
// --limit accumulated. Default true; setting false stops after the
|
|
// first page (useful for cheap previews).
|
|
AllPages bool
|
|
}
|
|
|
|
// DocsSearchService is the narrow SDK surface this command depends on.
|
|
// The server applies the keyword filter pre-pagination via the
|
|
// ?keyword= query param, so the CLI just forwards opts.Query as
|
|
// filter.Keyword and accumulates the (already-filtered) pages.
|
|
type DocsSearchService interface {
|
|
ListKnowledgeWithFilter(ctx context.Context, kbID string, page, pageSize int, filter sdk.KnowledgeListFilter) ([]sdk.Knowledge, int64, error)
|
|
}
|
|
|
|
// NewCmdDocs builds `weknora search docs "<query>" --kb <id-or-name>`.
|
|
// Pages through the KB's documents and surfaces every entry whose title
|
|
// or file_name contains the query as a server-side case-insensitive LIKE
|
|
// match. Useful for finding a specific upload to download or delete.
|
|
func NewCmdDocs(f *cmdutil.Factory) *cobra.Command {
|
|
opts := &DocsSearchOptions{}
|
|
cmd := &cobra.Command{
|
|
Use: `docs "<query>"`,
|
|
Short: "Find documents in a knowledge base by keyword (server-side filter)",
|
|
Long: `Pages through the KB's documents, forwarding the query as the server-side
|
|
keyword filter (matched against title / file_name). Useful for finding a
|
|
specific upload to download or delete by id.
|
|
|
|
The query is a case-insensitive server-side LIKE filter (the server runs
|
|
` + "`LOWER(...) LIKE LOWER('%keyword%')`" + ` against title and file_name), so
|
|
` + "`FALCON`" + ` and ` + "`falcon`" + ` match the same documents.
|
|
|
|
By default, --all-pages=true walks every server page until --limit is
|
|
reached or the KB is exhausted. Pass --all-pages=false to stop after one page.`,
|
|
Example: ` weknora search docs "Q3 forecast" --kb finance
|
|
weknora search docs "spec" --kb engineering --limit 5
|
|
weknora search docs "spec" --kb engineering --all-pages=false`,
|
|
Args: cobra.ExactArgs(1),
|
|
RunE: func(c *cobra.Command, args []string) error {
|
|
opts.Query = strings.TrimSpace(args[0])
|
|
if opts.Query == "" {
|
|
return cmdutil.NewError(cmdutil.CodeInputInvalidArgument, "query argument cannot be empty")
|
|
}
|
|
if opts.Limit < 1 || opts.Limit > 1000 {
|
|
return cmdutil.NewError(cmdutil.CodeInputInvalidArgument, "--limit must be between 1 and 1000")
|
|
}
|
|
fopts, err := cmdutil.CheckFormatFlag(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
fopts.ResolveDefault(iostreams.IO.IsStdoutTTY())
|
|
// Resolve KB via the shared flag→env→project-link chain (same as
|
|
// `doc list` / `chat`), so a linked directory or WEKNORA_KB_ID
|
|
// works without an explicit --kb. Resolve before building the
|
|
// client so an unresolved KB short-circuits to local.kb_id_required
|
|
// without a client round-trip.
|
|
kbID, err := f.ResolveKB(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
opts.KBID = kbID
|
|
cli, err := f.Client()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return runDocsSearch(c.Context(), opts, fopts, cli)
|
|
},
|
|
}
|
|
cmd.Flags().StringVar(&opts.KB, "kb", "", "Knowledge base UUID or name (overrides env / project link)")
|
|
cmd.Flags().IntVarP(&opts.Limit, "limit", "L", 30, "Maximum results to return")
|
|
cmd.Flags().IntVar(&opts.PageSize, "page-size", docsPageSize, "Items per server batch (1..1000)")
|
|
cmd.Flags().BoolVar(&opts.AllPages, "all-pages", true, "Walk every server page until exhausted or --limit hit")
|
|
cmdutil.AddFormatFlag(cmd, docsFields...)
|
|
cmdutil.SetAgentHelp(cmd, cmdutil.AgentHelp{
|
|
UsedFor: "Find documents in a knowledge base by keyword (server-side LIKE filter on title/file_name). The KB comes from --kb (id or name), else WEKNORA_KB_ID, else the linked directory. Results come with meta.count; use --limit to cap and --all-pages=false to stop after one page.",
|
|
RequiredFlags: []string{"<query> (positional)", "--kb (or WEKNORA_KB_ID / linked directory)"},
|
|
Examples: []string{`weknora search docs "spec" --kb engineering --format json`},
|
|
Output: "envelope.data is an array of Knowledge objects with id, title, file_name, parse_status; meta.count is the returned count, meta.total_count the server's full match count, meta.has_more=true if more matched than --limit",
|
|
})
|
|
return cmd
|
|
}
|
|
|
|
func runDocsSearch(ctx context.Context, opts *DocsSearchOptions, fopts *cmdutil.FormatOptions, svc DocsSearchService) error {
|
|
if opts.PageSize < 1 || opts.PageSize > docsMaxPageSize {
|
|
return cmdutil.NewError(cmdutil.CodeInputInvalidArgument,
|
|
fmt.Sprintf("--page-size must be in 1..%d, got %d", docsMaxPageSize, opts.PageSize))
|
|
}
|
|
filter := sdk.KnowledgeListFilter{Keyword: opts.Query}
|
|
var matches []sdk.Knowledge
|
|
|
|
// Page through the KB until limit matches found or pagination exhausted.
|
|
// The server applies the keyword filter pre-pagination, so every item
|
|
// returned is already a match - no client-side filter needed.
|
|
// --all-pages=true (default) walks every server page; --all-pages=false
|
|
// stops after the first page. Termination counts records actually
|
|
// received so server-capped page_size doesn't truncate.
|
|
var serverTotal int64
|
|
for page := 1; ; page++ {
|
|
items, total, err := svc.ListKnowledgeWithFilter(ctx, opts.KBID, page, opts.PageSize, filter)
|
|
if err != nil {
|
|
return cmdutil.WrapHTTP(err, "list documents")
|
|
}
|
|
serverTotal = total
|
|
for _, k := range items {
|
|
matches = append(matches, k)
|
|
// Collect one past --limit so has_more is accurate; trimmed below.
|
|
if opts.Limit > 0 && len(matches) > opts.Limit {
|
|
goto done
|
|
}
|
|
}
|
|
if !opts.AllPages {
|
|
break
|
|
}
|
|
if int64(len(matches)) >= total || len(items) == 0 {
|
|
break
|
|
}
|
|
}
|
|
done:
|
|
sortKnowledgeByRecency(matches)
|
|
truncated := opts.Limit > 0 && len(matches) > opts.Limit
|
|
if truncated {
|
|
matches = matches[:opts.Limit]
|
|
}
|
|
|
|
if fopts.WantsJSON() {
|
|
if matches == nil {
|
|
matches = []sdk.Knowledge{}
|
|
}
|
|
meta := &output.Meta{Count: output.IntPtr(len(matches)), TotalCount: output.IntPtr(int(serverTotal)), HasMore: truncated, Hint: emptyContentSearchHint(len(matches))}
|
|
return fopts.Emit(iostreams.IO.Out, matches, meta)
|
|
}
|
|
if len(matches) == 0 {
|
|
fmt.Fprintln(iostreams.IO.Out, "(no matches)")
|
|
return nil
|
|
}
|
|
tw := tabwriter.NewWriter(iostreams.IO.Out, 0, 0, 2, ' ', 0)
|
|
fmt.Fprintln(tw, "ID\tFILE\tTYPE\tUPDATED")
|
|
for _, k := range matches {
|
|
name := text.Truncate(50, text.KnowledgeDisplayName(k.FileName, k.Title, k.ID))
|
|
fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", k.ID, name, k.FileType, k.UpdatedAt.Format("2006-01-02"))
|
|
}
|
|
return tw.Flush()
|
|
}
|
|
|
|
// sortKnowledgeByRecency sorts in place by UpdatedAt desc.
|
|
func sortKnowledgeByRecency(items []sdk.Knowledge) {
|
|
sort.Slice(items, func(i, j int) bool {
|
|
return items[i].UpdatedAt.After(items[j].UpdatedAt)
|
|
})
|
|
}
|