feat(cli): --log-level + kb/agent status & check + cross-cutting refactor
Operability surface and the bulk of the jopts→fopts migration: * --log-level error|warn|info|debug + WEKNORA_LOG_LEVEL env, wired to the SDK via client.SetDebugLevel. Invalid --log-level returns FlagError (exit 2). * kb status <kb-id> / kb check <kb-id> verb split (1 HTTP vs 1+N for failed_count aggregation). * agent status <agent-id> / agent check <agent-id> verb split (probes kb_scope_all_reachable via 1+N HTTP). * kb create <name> positional (matches agent create). * Positional id help strings namespaced (<kb-id> / <agent-id>). * All auth / context / link / doctor / kb / agent CRUD commands migrated to the FormatOptions API. * root.go Execute(ctx) takes a context so signal-cancellation propagates via cmd.Context() into long-running commands. * Pagination termination uses len(accum) >= total (not page*pageSize) so server-capped page sizes do not truncate aggregations.
This commit is contained in:
@@ -19,7 +19,7 @@ import (
|
||||
"github.com/Tencent/WeKnora/cli/internal/projectlink"
|
||||
)
|
||||
|
||||
// linkFields enumerates the fields surfaced for `--json` discovery on
|
||||
// linkFields enumerates the fields surfaced for `--format json` discovery on
|
||||
// `link`. Tracks the small linkResult struct.
|
||||
var linkFields = []string{"context", "kb_id", "kb_name", "project_link_path"}
|
||||
|
||||
@@ -57,19 +57,20 @@ user explicitly asked to bind this directory; don't run it as a side effect.`,
|
||||
weknora link # interactive (TTY)`,
|
||||
Args: cobra.NoArgs,
|
||||
RunE: func(c *cobra.Command, _ []string) error {
|
||||
jopts, err := cmdutil.CheckJSONFlags(c)
|
||||
fopts, err := cmdutil.CheckFormatFlag(c)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return runLink(c.Context(), opts, jopts, f)
|
||||
fopts.ResolveDefault(iostreams.IO.IsStdoutTTY())
|
||||
return runLink(c.Context(), opts, fopts, f)
|
||||
},
|
||||
}
|
||||
cmd.Flags().StringVar(&opts.KB, "kb", "", "Knowledge base UUID or name; omit on a TTY for interactive prompt")
|
||||
cmdutil.AddJSONFlags(cmd, linkFields)
|
||||
cmdutil.AddFormatFlag(cmd, linkFields...)
|
||||
return cmd
|
||||
}
|
||||
|
||||
func runLink(ctx context.Context, opts *Options, jopts *cmdutil.JSONOptions, f *cmdutil.Factory) error {
|
||||
func runLink(ctx context.Context, opts *Options, fopts *cmdutil.FormatOptions, f *cmdutil.Factory) error {
|
||||
cwd, err := os.Getwd()
|
||||
if err != nil {
|
||||
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "get cwd")
|
||||
@@ -101,8 +102,8 @@ func runLink(ctx context.Context, opts *Options, jopts *cmdutil.JSONOptions, f *
|
||||
KBName: kbName,
|
||||
ProjectLinkPath: linkPath,
|
||||
}
|
||||
if jopts.Enabled() {
|
||||
return jopts.Emit(iostreams.IO.Out, r)
|
||||
if fopts.WantsJSON() {
|
||||
return fopts.Emit(iostreams.IO.Out, r)
|
||||
}
|
||||
if kbName != "" {
|
||||
fmt.Fprintf(iostreams.IO.Out, "✓ Linked %s to %s (kb=%s, id=%s)\n", linkPath, ctxName, kbName, kbID)
|
||||
|
||||
@@ -65,7 +65,7 @@ func TestLink_ByID(t *testing.T) {
|
||||
|
||||
f := newFactory("default", nil)
|
||||
opts := &Options{KB: "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa"}
|
||||
require.NoError(t, runLink(context.Background(), opts, nil, f))
|
||||
require.NoError(t, runLink(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatText}, f))
|
||||
|
||||
linkPath := filepath.Join(dir, ".weknora", "project.yaml")
|
||||
p, err := projectlink.Load(linkPath)
|
||||
@@ -87,7 +87,7 @@ func TestLink_ByName(t *testing.T) {
|
||||
cli := sdk.NewClient(srv.URL)
|
||||
f := newFactory("default", cli)
|
||||
opts := &Options{KB: "foo"}
|
||||
require.NoError(t, runLink(context.Background(), opts, nil, f))
|
||||
require.NoError(t, runLink(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatText}, f))
|
||||
|
||||
p, err := projectlink.Load(filepath.Join(dir, ".weknora", "project.yaml"))
|
||||
require.NoError(t, err)
|
||||
@@ -103,7 +103,7 @@ func TestLink_KBNotFound(t *testing.T) {
|
||||
cli := sdk.NewClient(srv.URL)
|
||||
f := newFactory("default", cli)
|
||||
opts := &Options{KB: "missing"}
|
||||
err := runLink(context.Background(), opts, nil, f)
|
||||
err := runLink(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatText}, f)
|
||||
require.Error(t, err)
|
||||
var typed *cmdutil.Error
|
||||
require.ErrorAs(t, err, &typed)
|
||||
@@ -123,7 +123,7 @@ func TestLink_OverwritesExisting(t *testing.T) {
|
||||
|
||||
f := newFactory("default", nil)
|
||||
opts := &Options{KB: "22222222-2222-4222-8222-222222222222"}
|
||||
require.NoError(t, runLink(context.Background(), opts, nil, f))
|
||||
require.NoError(t, runLink(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatText}, f))
|
||||
|
||||
p, err := projectlink.Load(linkPath)
|
||||
require.NoError(t, err)
|
||||
@@ -140,7 +140,7 @@ func TestLink_NonInteractive_NoKB(t *testing.T) {
|
||||
|
||||
f := newFactory("default", nil)
|
||||
opts := &Options{} // no KB
|
||||
err := runLink(context.Background(), opts, nil, f)
|
||||
err := runLink(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatText}, f)
|
||||
require.Error(t, err)
|
||||
var typed *cmdutil.Error
|
||||
require.ErrorAs(t, err, &typed)
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
"github.com/Tencent/WeKnora/cli/internal/projectlink"
|
||||
)
|
||||
|
||||
// unlinkFields enumerates the fields surfaced for `--json` discovery on
|
||||
// unlinkFields enumerates the fields surfaced for `--format json` discovery on
|
||||
// `unlink`. Tracks the small unlinkResult struct.
|
||||
var unlinkFields = []string{"project_link_path"}
|
||||
|
||||
@@ -37,21 +37,22 @@ discovery that ` + "`--kb`" + ` resolution uses; you do not need to cd to the
|
||||
project root to unlink. Errors with input.invalid_argument when no link
|
||||
is present anywhere in the parent chain.`,
|
||||
Example: ` weknora unlink # remove the binding for this project
|
||||
weknora unlink --json # bare JSON (CI / agents)`,
|
||||
weknora unlink --format json # bare JSON (CI / agents)`,
|
||||
Args: cobra.NoArgs,
|
||||
RunE: func(c *cobra.Command, _ []string) error {
|
||||
jopts, err := cmdutil.CheckJSONFlags(c)
|
||||
fopts, err := cmdutil.CheckFormatFlag(c)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return runUnlink(opts, jopts)
|
||||
fopts.ResolveDefault(iostreams.IO.IsStdoutTTY())
|
||||
return runUnlink(opts, fopts)
|
||||
},
|
||||
}
|
||||
cmdutil.AddJSONFlags(cmd, unlinkFields)
|
||||
cmdutil.AddFormatFlag(cmd, unlinkFields...)
|
||||
return cmd
|
||||
}
|
||||
|
||||
func runUnlink(opts *UnlinkOptions, jopts *cmdutil.JSONOptions) error {
|
||||
func runUnlink(opts *UnlinkOptions, fopts *cmdutil.FormatOptions) error {
|
||||
cwd, err := os.Getwd()
|
||||
if err != nil {
|
||||
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "get cwd")
|
||||
@@ -70,8 +71,8 @@ func runUnlink(opts *UnlinkOptions, jopts *cmdutil.JSONOptions) error {
|
||||
if err := projectlink.Remove(linkPath); err != nil {
|
||||
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "remove %s", linkPath)
|
||||
}
|
||||
if jopts.Enabled() {
|
||||
return jopts.Emit(iostreams.IO.Out, unlinkResult{ProjectLinkPath: linkPath})
|
||||
if fopts.WantsJSON() {
|
||||
return fopts.Emit(iostreams.IO.Out, unlinkResult{ProjectLinkPath: linkPath})
|
||||
}
|
||||
fmt.Fprintf(iostreams.IO.Out, "✓ Unlinked %s\n", linkPath)
|
||||
return nil
|
||||
|
||||
@@ -32,7 +32,7 @@ func TestUnlink_RemovesLinkInCwd(t *testing.T) {
|
||||
linkPath := mkLinkFile(t, tmp)
|
||||
t.Chdir(tmp)
|
||||
|
||||
if err := runUnlink(&UnlinkOptions{}, nil); err != nil {
|
||||
if err := runUnlink(&UnlinkOptions{}, &cmdutil.FormatOptions{Mode: cmdutil.FormatText}); err != nil {
|
||||
t.Fatalf("runUnlink: %v", err)
|
||||
}
|
||||
if _, err := os.Stat(linkPath); !os.IsNotExist(err) {
|
||||
@@ -50,7 +50,7 @@ func TestUnlink_WalksUpFromSubdir(t *testing.T) {
|
||||
}
|
||||
t.Chdir(sub)
|
||||
|
||||
if err := runUnlink(&UnlinkOptions{}, nil); err != nil {
|
||||
if err := runUnlink(&UnlinkOptions{}, &cmdutil.FormatOptions{Mode: cmdutil.FormatText}); err != nil {
|
||||
t.Fatalf("runUnlink: %v", err)
|
||||
}
|
||||
if _, err := os.Stat(linkPath); !os.IsNotExist(err) {
|
||||
@@ -63,7 +63,7 @@ func TestUnlink_NoLink_Errors(t *testing.T) {
|
||||
tmp := t.TempDir()
|
||||
t.Chdir(tmp)
|
||||
|
||||
err := runUnlink(&UnlinkOptions{}, nil)
|
||||
err := runUnlink(&UnlinkOptions{}, &cmdutil.FormatOptions{Mode: cmdutil.FormatText})
|
||||
if err == nil {
|
||||
t.Fatal("expected error when no link present")
|
||||
}
|
||||
@@ -85,7 +85,7 @@ func TestUnlink_JSON_BareObject(t *testing.T) {
|
||||
mkLinkFile(t, tmp)
|
||||
t.Chdir(tmp)
|
||||
|
||||
if err := runUnlink(&UnlinkOptions{}, &cmdutil.JSONOptions{}); err != nil {
|
||||
if err := runUnlink(&UnlinkOptions{}, &cmdutil.FormatOptions{Mode: cmdutil.FormatJSON}); err != nil {
|
||||
t.Fatalf("runUnlink: %v", err)
|
||||
}
|
||||
got := out.String()
|
||||
|
||||
Reference in New Issue
Block a user