78f3994112
Roadmap items 3-9 (download) and 3-10 (recursive upload).
SDK addition (additive, non-breaking):
- OpenKnowledgeFile(ctx, id) (filename, body io.ReadCloser, err) —
the new primitive that returns the body as a stream plus the
server-suggested Content-Disposition filename. The existing path-
form DownloadKnowledgeFile is now a thin wrapper (also gained
partial-file-on-error cleanup, a pre-existing bug exposed by the
reshape).
doc download <id>:
Borrows shape from `gh release download` (positional id, output flag,
`-` sentinel for stdout). Flag names match gh canon verified against
the gh manual: `-O, --output <file>` for destination; `--clobber` for
overwrite control.
- Default: writes to cwd under the server-suggested filename. If the
server didn't send one, errors with input.missing_flag.
- --output FILE / -O FILE: writes to FILE. Refuses overwrite without
--clobber.
- --output -: stream to stdout (binary-safe).
- Partial writes on error are cleaned up.
doc upload --recursive <dir> --glob '*.pdf':
NOTE on upstream parity: `gh release upload` does NOT support
--recursive (verified — it takes individual file args only). `aws s3
cp --recursive` does, but uses `--include`/`--exclude` glob pattern
pairs rather than a single `--glob`. weknora's single positive `--glob`
is a deliberate simplification, not a direct mirror of either tool.
- Walks the tree, filters by base-name glob, uploads each match
sequentially. Per-file line output: OK / FAIL with the underlying
error. Exit 0 only on full success; on partial failure returns the
first failure's typed code so callers can branch. Rejects --name
with --recursive.
- --dry-run lists matches without uploading.
- --json emits {kb_id, uploaded[], failed[]} envelope at completion.
Bugs caught in the post-commit reviewer round:
- SECURITY: server-supplied filename was used in os.Rename without
sanitization. A malicious / buggy server returning
"../../etc/shadow" could escape cwd. Now filepath.Base'd; "." / "/"
/ "" rejected. Regression test added.
- Wasted-bytes path eliminated via the SDK reshape: the CLI now
inspects filename and applies refuseIfExists BEFORE streaming.
Two-phase temp+rename gone.
- refuseIfExists(path, clobber) helper extracted.
- --json honored in --recursive (uploadOutcome was JSON-tagged but
the envelope was never emitted).
7 + 7 unit tests for download (+ path-traversal regression) and
recursive upload (+ JSON envelope regression).
Roadmap: 3-9, 3-10.
171 lines
5.4 KiB
Go
171 lines
5.4 KiB
Go
package doc
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io/fs"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/format"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
)
|
|
|
|
// uploadOutcome is one entry in the recursive upload's per-file report.
|
|
type uploadOutcome struct {
|
|
Path string `json:"path"`
|
|
ID string `json:"id,omitempty"`
|
|
Error string `json:"error,omitempty"`
|
|
}
|
|
|
|
// runUploadRecursive walks dir, filters by Glob, and uploads each match
|
|
// sequentially. Per-file errors do NOT abort the walk — they accumulate
|
|
// and the final return aggregates them so the user sees the full picture
|
|
// in one run. Exit semantics: nil error on full success, a typed *cmdutil.Error
|
|
// when ≥1 file failed (the typed code mirrors the first failure's
|
|
// classification so callers can still branch).
|
|
func runUploadRecursive(ctx context.Context, opts *UploadOptions, svc UploadService, kbID, dir string) error {
|
|
if opts.Name != "" {
|
|
return &cmdutil.Error{
|
|
Code: cmdutil.CodeInputInvalidArgument,
|
|
Message: "--name cannot be combined with --recursive (one name can't apply to N files)",
|
|
Hint: "drop --name or upload files one at a time",
|
|
}
|
|
}
|
|
info, err := os.Stat(dir)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return cmdutil.Wrapf(cmdutil.CodeUploadFileNotFound, err, "directory not found: %s", dir)
|
|
}
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "stat %s", dir)
|
|
}
|
|
if !info.IsDir() {
|
|
return &cmdutil.Error{
|
|
Code: cmdutil.CodeInputInvalidArgument,
|
|
Message: fmt.Sprintf("not a directory: %s (drop --recursive to upload a single file)", dir),
|
|
}
|
|
}
|
|
|
|
// Sanity-check the pattern up front so a typo doesn't show up as "no
|
|
// files matched" per-file. Cobra populates --glob; tests pass it
|
|
// explicitly — no in-function default needed.
|
|
if _, err := filepath.Match(opts.Glob, ""); err != nil {
|
|
return &cmdutil.Error{
|
|
Code: cmdutil.CodeInputInvalidArgument,
|
|
Message: fmt.Sprintf("invalid --glob %q: %v", opts.Glob, err),
|
|
}
|
|
}
|
|
|
|
matches, err := walkMatches(dir, opts.Glob)
|
|
if err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "walk %s", dir)
|
|
}
|
|
if len(matches) == 0 {
|
|
if opts.JSONOut {
|
|
return format.WriteEnvelope(iostreams.IO.Out, format.Success(
|
|
recursiveResult{KBID: kbID}, &format.Meta{KBID: kbID}))
|
|
}
|
|
fmt.Fprintf(iostreams.IO.Out, "(no files matched %q under %s)\n", opts.Glob, dir)
|
|
return nil
|
|
}
|
|
|
|
if opts.DryRun {
|
|
previews := make([]uploadOutcome, 0, len(matches))
|
|
for _, m := range matches {
|
|
previews = append(previews, uploadOutcome{Path: m})
|
|
}
|
|
return cmdutil.EmitDryRun(opts.JSONOut,
|
|
recursiveResult{KBID: kbID, Uploaded: previews},
|
|
&format.Meta{KBID: kbID},
|
|
&format.Risk{Level: format.RiskWrite, Action: fmt.Sprintf("upload %d file(s) to kb %s", len(matches), kbID)})
|
|
}
|
|
|
|
var uploaded, failed []uploadOutcome
|
|
var firstFailCode cmdutil.ErrorCode
|
|
for _, p := range matches {
|
|
k, err := svc.CreateKnowledgeFromFile(ctx, kbID, p, nil, nil, "", uploadChannel)
|
|
if err != nil {
|
|
code := cmdutil.ClassifyHTTPError(err)
|
|
if firstFailCode == "" {
|
|
firstFailCode = code
|
|
}
|
|
failed = append(failed, uploadOutcome{Path: p, Error: err.Error()})
|
|
fmt.Fprintf(iostreams.IO.Out, "FAIL %s: %v\n", filepath.Base(p), err)
|
|
continue
|
|
}
|
|
id := ""
|
|
if k != nil {
|
|
id = k.ID
|
|
}
|
|
uploaded = append(uploaded, uploadOutcome{Path: p, ID: id})
|
|
fmt.Fprintf(iostreams.IO.Out, "OK %s (id: %s)\n", filepath.Base(p), id)
|
|
}
|
|
|
|
if opts.JSONOut {
|
|
result := recursiveResult{KBID: kbID, Uploaded: uploaded, Failed: failed}
|
|
risk := &format.Risk{Level: format.RiskWrite, Action: fmt.Sprintf("upload %d file(s) to kb %s", len(matches), kbID)}
|
|
if err := format.WriteEnvelope(iostreams.IO.Out,
|
|
format.SuccessWithRisk(result, &format.Meta{KBID: kbID}, risk)); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
fmt.Fprintf(iostreams.IO.Out, "Uploaded %d, Failed %d\n", len(uploaded), len(failed))
|
|
}
|
|
|
|
if len(failed) > 0 {
|
|
return &cmdutil.Error{
|
|
Code: firstFailCode,
|
|
Message: fmt.Sprintf("%d of %d uploads failed", len(failed), len(matches)),
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// recursiveResult is the JSON shape emitted under data when --recursive is
|
|
// combined with --json. Mirrors the human-mode per-file output: a list of
|
|
// successes (Uploaded) and a list of failures (Failed), each with the
|
|
// originating path so agents can re-try only the failed entries.
|
|
type recursiveResult struct {
|
|
KBID string `json:"kb_id"`
|
|
Uploaded []uploadOutcome `json:"uploaded,omitempty"`
|
|
Failed []uploadOutcome `json:"failed,omitempty"`
|
|
}
|
|
|
|
// walkMatches returns every regular file under root whose base name matches
|
|
// pattern. Order is filepath.WalkDir's lexical order (stdlib guarantee on
|
|
// every supported FS), which is deterministic for test assertions.
|
|
func walkMatches(root, pattern string) ([]string, error) {
|
|
var out []string
|
|
err := filepath.WalkDir(root, func(p string, d fs.DirEntry, err error) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if d.IsDir() {
|
|
return nil
|
|
}
|
|
// Skip non-regular files (sockets, devices); the SDK can't upload
|
|
// them and they'd show as opaque server errors.
|
|
info, ierr := d.Info()
|
|
if ierr != nil {
|
|
return ierr
|
|
}
|
|
if !info.Mode().IsRegular() {
|
|
return nil
|
|
}
|
|
ok, merr := filepath.Match(pattern, d.Name())
|
|
if merr != nil {
|
|
return merr
|
|
}
|
|
if ok {
|
|
out = append(out, p)
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return out, nil
|
|
}
|
|
|