d3c03b2f34
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.
201 lines
6.9 KiB
Go
201 lines
6.9 KiB
Go
package doc
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
)
|
|
|
|
// downloadFields enumerates the fields surfaced for `--format json` discovery on
|
|
// `doc download`. Matches the downloadResult struct.
|
|
var downloadFields = []string{"path", "bytes", "filename"}
|
|
|
|
// downloadResult is the typed payload emitted as the success envelope when
|
|
// --format json is requested and output is going to a file (not stdout).
|
|
type downloadResult struct {
|
|
Path string `json:"path"`
|
|
Bytes int64 `json:"bytes"`
|
|
Filename string `json:"filename"`
|
|
}
|
|
|
|
type DownloadOptions struct {
|
|
Output string // --output / -O: target path, "-" for stdout, "" for server-suggested filename
|
|
Clobber bool // --clobber: allow overwrite of an existing file
|
|
}
|
|
|
|
// DownloadService is the narrow SDK surface this command depends on. The
|
|
// CLI calls OpenKnowledgeFile so it can inspect the server-suggested
|
|
// filename and refuse-to-overwrite *before* streaming any bytes.
|
|
type DownloadService interface {
|
|
OpenKnowledgeFile(ctx context.Context, knowledgeID string) (string, io.ReadCloser, error)
|
|
}
|
|
|
|
// NewCmdDownload builds `weknora doc download <id>`. Positional id, output
|
|
// flag, `-` sentinel for stdout. Flags: `-O, --output <file>` for
|
|
// destination, `--clobber` for overwrite control.
|
|
func NewCmdDownload(f *cmdutil.Factory) *cobra.Command {
|
|
opts := &DownloadOptions{}
|
|
cmd := &cobra.Command{
|
|
Use: "download <doc-id>",
|
|
Short: "Download a document by ID",
|
|
Long: `Streams the document bytes to disk (or stdout with --output -).
|
|
|
|
Default behavior (no --output): writes to the cwd under the filename the
|
|
server suggests via Content-Disposition. If the server doesn't suggest
|
|
one, the command errors and asks for --output FILE explicitly.
|
|
|
|
Existing files are NOT overwritten unless --clobber is passed.
|
|
|
|
With --format json, on success emits a JSON envelope whose data has
|
|
path, bytes, and filename fields. When output is stdout (--output -),
|
|
the JSON envelope is suppressed because the raw bytes already occupy
|
|
stdout.`,
|
|
Example: ` weknora doc download doc_abc # writes ./<server-name>
|
|
weknora doc download doc_abc -O report.pdf
|
|
weknora doc download doc_abc --output - # stream to stdout (binary safe)
|
|
weknora doc download doc_abc -O report.pdf --clobber
|
|
weknora doc download doc_abc -O report.pdf --format json # JSON envelope`,
|
|
Args: cobra.ExactArgs(1),
|
|
RunE: func(c *cobra.Command, args []string) error {
|
|
fopts, err := cmdutil.CheckFormatFlag(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
fopts.ResolveDefault(iostreams.IO.IsStdoutTTY())
|
|
cli, err := f.Client()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return runDownload(c.Context(), opts, fopts, cli, args[0])
|
|
},
|
|
}
|
|
cmd.Flags().StringVarP(&opts.Output, "output", "O", "", `Output path; "-" for stdout. Defaults to the server-suggested filename.`)
|
|
cmd.Flags().BoolVar(&opts.Clobber, "clobber", false, "Overwrite the output file if it already exists")
|
|
cmdutil.AddIgnoredKBFlag(cmd)
|
|
cmdutil.AddFormatFlag(cmd, downloadFields...)
|
|
cmdutil.SetAgentHelp(cmd, cmdutil.AgentHelp{
|
|
UsedFor: "Download a document's bytes by id. Writes a file (or stdout with --output -).",
|
|
RequiredFlags: []string{"<doc-id> (positional)"},
|
|
Output: "with --format json (file output): envelope.data has path, bytes, filename; suppressed with --output - (raw bytes to stdout)",
|
|
Examples: []string{
|
|
"weknora doc download doc_abc --output ./manual.pdf",
|
|
"weknora doc download doc_abc --output - > manual.pdf",
|
|
},
|
|
})
|
|
return cmd
|
|
}
|
|
|
|
func runDownload(ctx context.Context, opts *DownloadOptions, fopts *cmdutil.FormatOptions, svc DownloadService, id string) error {
|
|
suggested, body, err := svc.OpenKnowledgeFile(ctx, id)
|
|
if err != nil {
|
|
return cmdutil.WrapHTTP(err, "download %s", id)
|
|
}
|
|
defer body.Close()
|
|
|
|
dest, err := resolveDownloadDest(opts, suggested)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if dest == "-" {
|
|
// Raw bytes go to stdout — suppress any JSON envelope regardless of
|
|
// --format json because both can't occupy stdout simultaneously.
|
|
_, err := io.Copy(iostreams.IO.Out, body)
|
|
return err
|
|
}
|
|
if err := refuseIfExists(dest, opts.Clobber); err != nil {
|
|
return err
|
|
}
|
|
return streamToFile(body, dest, fopts)
|
|
}
|
|
|
|
// resolveDownloadDest returns the final destination ("-" for stdout, an
|
|
// absolute or relative path otherwise) after applying the --output flag
|
|
// and sanitizing the server-suggested name. A server that returns a path-
|
|
// like filename (..\, /etc/foo) is rejected - only the basename is
|
|
// accepted.
|
|
func resolveDownloadDest(opts *DownloadOptions, suggested string) (string, error) {
|
|
if opts.Output == "-" {
|
|
return "-", nil
|
|
}
|
|
if opts.Output != "" {
|
|
return opts.Output, nil
|
|
}
|
|
if suggested == "" {
|
|
return "", &cmdutil.Error{
|
|
Code: cmdutil.CodeInputMissingFlag,
|
|
Message: "server did not supply a filename and --output is unset",
|
|
Hint: "pass --output FILE (or --output - for stdout)",
|
|
}
|
|
}
|
|
base := filepath.Base(suggested)
|
|
if base == "" || base == "." || base == ".." || base == string(filepath.Separator) {
|
|
return "", &cmdutil.Error{
|
|
Code: cmdutil.CodeInputInvalidArgument,
|
|
Message: fmt.Sprintf("server returned an unusable filename %q", suggested),
|
|
Hint: "pass --output FILE explicitly",
|
|
}
|
|
}
|
|
return base, nil
|
|
}
|
|
|
|
// refuseIfExists returns CodeInputInvalidArgument when path is present on
|
|
// disk and clobber is false. Missing-file is success.
|
|
func refuseIfExists(path string, clobber bool) error {
|
|
if clobber {
|
|
return nil
|
|
}
|
|
_, err := os.Stat(path)
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
return nil
|
|
}
|
|
if err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "stat %s", path)
|
|
}
|
|
return &cmdutil.Error{
|
|
Code: cmdutil.CodeInputInvalidArgument,
|
|
Message: fmt.Sprintf("%s already exists", path),
|
|
Hint: "pass --clobber to overwrite",
|
|
}
|
|
}
|
|
|
|
// streamToFile copies body into a newly-created file at path. On any
|
|
// streaming error the partial file is removed so callers don't see a
|
|
// truncated artifact at the user-visible path.
|
|
//
|
|
// On success: if fopts.WantsJSON(), emits a downloadResult envelope to
|
|
// stdout instead of the "✓ Saved" text.
|
|
func streamToFile(body io.Reader, path string, fopts *cmdutil.FormatOptions) error {
|
|
f, err := os.Create(path)
|
|
if err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "create %s", path)
|
|
}
|
|
n, copyErr := io.Copy(f, body)
|
|
if copyErr != nil {
|
|
_ = f.Close()
|
|
_ = os.Remove(path)
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, copyErr, "write %s", path)
|
|
}
|
|
if err := f.Close(); err != nil {
|
|
_ = os.Remove(path)
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "close %s", path)
|
|
}
|
|
|
|
if fopts.WantsJSON() {
|
|
return fopts.Emit(iostreams.IO.Out, downloadResult{
|
|
Path: path,
|
|
Bytes: n,
|
|
Filename: filepath.Base(path),
|
|
}, nil)
|
|
}
|
|
fmt.Fprintf(iostreams.IO.Err, "✓ Saved %s\n", path)
|
|
return nil
|
|
}
|