WeKnora deployment source with the reviewed wiki identity, summary and recovery fixes
Anydoc / anydoc parser engine (push) Canceled after 0s
App / Format, vet, test, and build (push) Canceled after 0s
CLI / test (macos-latest / go 1.26) (push) Canceled after 0s
CLI / test (ubuntu-latest / go 1.26) (push) Canceled after 0s
CLI / test (windows-latest / go 1.26) (push) Canceled after 0s
Build and Push Docker Image / build-ui (push) Canceled after 0s
Build and Push Docker Image / build-docreader (push) Canceled after 0s
Build and Push Docker Image / build-sandbox (push) Canceled after 0s
Build and Push Docker Image / build-app (amd64, linux/amd64, ubuntu-latest) (push) Canceled after 0s
Build and Push Docker Image / build-app (arm64, linux/arm64, ubuntu-24.04-arm) (push) Canceled after 0s
DocReader / Python tests and Go client tests (push) Canceled after 0s
Build & Publish (dsh-weknora) / Typecheck, test, pack (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (pinned) (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (latest, advisory) (push) Canceled after 0s
Frontend / Test, type-check, and build (push) Canceled after 0s
Go Lint Cache / warm lint cache (.) (push) Canceled after 0s
Go Lint Cache / warm lint cache (cli) (push) Canceled after 0s
Go Lint Cache / warm lint cache (client) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.10) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.11) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.12) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.13) (push) Canceled after 0s
Build and Push Docker Image / merge (push) Canceled after 0s
Build & Publish (dsh-weknora) / Publish to npm (push) Canceled after 0s
Build & Publish (mcp-server) / Build sdist + wheel (push) Canceled after 0s
Build & Publish (mcp-server) / Publish to PyPI (push) Canceled after 0s
Anydoc / anydoc parser engine (push) Canceled after 0s
App / Format, vet, test, and build (push) Canceled after 0s
CLI / test (macos-latest / go 1.26) (push) Canceled after 0s
CLI / test (ubuntu-latest / go 1.26) (push) Canceled after 0s
CLI / test (windows-latest / go 1.26) (push) Canceled after 0s
Build and Push Docker Image / build-ui (push) Canceled after 0s
Build and Push Docker Image / build-docreader (push) Canceled after 0s
Build and Push Docker Image / build-sandbox (push) Canceled after 0s
Build and Push Docker Image / build-app (amd64, linux/amd64, ubuntu-latest) (push) Canceled after 0s
Build and Push Docker Image / build-app (arm64, linux/arm64, ubuntu-24.04-arm) (push) Canceled after 0s
DocReader / Python tests and Go client tests (push) Canceled after 0s
Build & Publish (dsh-weknora) / Typecheck, test, pack (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (pinned) (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (latest, advisory) (push) Canceled after 0s
Frontend / Test, type-check, and build (push) Canceled after 0s
Go Lint Cache / warm lint cache (.) (push) Canceled after 0s
Go Lint Cache / warm lint cache (cli) (push) Canceled after 0s
Go Lint Cache / warm lint cache (client) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.10) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.11) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.12) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.13) (push) Canceled after 0s
Build and Push Docker Image / merge (push) Canceled after 0s
Build & Publish (dsh-weknora) / Publish to npm (push) Canceled after 0s
Build & Publish (mcp-server) / Build sdist + wheel (push) Canceled after 0s
Build & Publish (mcp-server) / Publish to PyPI (push) Canceled after 0s
This commit is contained in:
@@ -0,0 +1,178 @@
|
||||
package cmdutil
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"gopkg.in/yaml.v3"
|
||||
|
||||
sdk "github.com/Tencent/WeKnora/client"
|
||||
)
|
||||
|
||||
// AgentConfigFlags carries hot-path flag values plus per-flag "was set"
|
||||
// bits so the merge step can distinguish "user did not pass --foo" from
|
||||
// "user passed --foo zero-value". Mirrors the canonical CLI pattern of
|
||||
// keeping presence-tracking out-of-band from the value itself, which
|
||||
// pflag's Changed() facility supplies at the cobra layer.
|
||||
type AgentConfigFlags struct {
|
||||
AgentMode string
|
||||
AgentModeSet bool
|
||||
SystemPrompt string
|
||||
SystemPromptSet bool
|
||||
ModelID string
|
||||
ModelIDSet bool
|
||||
RerankModelID string
|
||||
RerankModelIDSet bool
|
||||
Temperature float64
|
||||
TemperatureSet bool
|
||||
KBSelectionMode string
|
||||
KBSelectionModeSet bool
|
||||
KnowledgeBases []string
|
||||
KnowledgeBasesSet bool
|
||||
}
|
||||
|
||||
// LoadAgentConfig parses YAML or JSON from r into an AgentConfig. kind is
|
||||
// "yaml" or "json" (typically inferred from file extension by the caller).
|
||||
// Returned errors carry no typed code — callers should wrap with
|
||||
// CodeInputInvalidArgument as the user-facing context.
|
||||
//
|
||||
// YAML route round-trips through JSON so the SDK's existing `json:` field
|
||||
// tags (snake_case) are the single source of truth for key names. yaml.v3
|
||||
// alone would lowercase field names (KnowledgeBases → knowledgebases),
|
||||
// which doesn't match the JSON schema users see elsewhere.
|
||||
func LoadAgentConfig(r io.Reader, kind string) (*sdk.AgentConfig, error) {
|
||||
body, err := io.ReadAll(r)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read config: %w", err)
|
||||
}
|
||||
var cfg sdk.AgentConfig
|
||||
switch strings.ToLower(kind) {
|
||||
case "yaml", "yml":
|
||||
var raw map[string]any
|
||||
if err := yaml.Unmarshal(body, &raw); err != nil {
|
||||
return nil, fmt.Errorf("parse YAML config: %w", err)
|
||||
}
|
||||
jsBody, err := json.Marshal(raw)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("re-encode YAML as JSON: %w", err)
|
||||
}
|
||||
if err := json.Unmarshal(jsBody, &cfg); err != nil {
|
||||
return nil, fmt.Errorf("parse YAML config (via JSON): %w", err)
|
||||
}
|
||||
case "json":
|
||||
if err := json.Unmarshal(body, &cfg); err != nil {
|
||||
return nil, fmt.Errorf("parse JSON config: %w", err)
|
||||
}
|
||||
default:
|
||||
return nil, fmt.Errorf("unknown config format %q (want yaml or json)", kind)
|
||||
}
|
||||
return &cfg, nil
|
||||
}
|
||||
|
||||
// MergeAgentConfig returns base with hot-path flag overrides applied. Only
|
||||
// fields whose corresponding *Set bit is true are overridden; the rest of
|
||||
// base passes through unchanged. The returned pointer is a fresh copy so
|
||||
// callers can mutate it without aliasing base.
|
||||
func MergeAgentConfig(base *sdk.AgentConfig, ov AgentConfigFlags) *sdk.AgentConfig {
|
||||
out := *base // shallow copy
|
||||
if ov.AgentModeSet {
|
||||
out.AgentMode = ov.AgentMode
|
||||
}
|
||||
if ov.SystemPromptSet {
|
||||
out.SystemPrompt = ov.SystemPrompt
|
||||
}
|
||||
if ov.ModelIDSet {
|
||||
out.ModelID = ov.ModelID
|
||||
}
|
||||
if ov.RerankModelIDSet {
|
||||
out.RerankModelID = ov.RerankModelID
|
||||
}
|
||||
if ov.TemperatureSet {
|
||||
out.Temperature = ov.Temperature
|
||||
}
|
||||
if ov.KBSelectionModeSet {
|
||||
out.KBSelectionMode = ov.KBSelectionMode
|
||||
}
|
||||
if ov.KnowledgeBasesSet {
|
||||
out.KnowledgeBases = ov.KnowledgeBases
|
||||
}
|
||||
return &out
|
||||
}
|
||||
|
||||
// GenerateAgentSkeleton writes a commented YAML template with every
|
||||
// AgentConfig field at its zero value to w. Used by
|
||||
// `agent create --generate-skeleton` so users get a ready-to-edit
|
||||
// starting point without authoring the full schema from memory.
|
||||
func GenerateAgentSkeleton(w io.Writer) error {
|
||||
const skeleton = `# WeKnora AgentConfig YAML skeleton
|
||||
# Edit this file and pass it to:
|
||||
# weknora agent create "My Agent" --model <id> --config-file <this-file>
|
||||
# Hot-path flags on the create command override values set here.
|
||||
|
||||
# Operating mode: "quick-answer" or "smart-reasoning"
|
||||
agent_mode: ""
|
||||
|
||||
# System prompt for the agent (also settable via --system-prompt[-file])
|
||||
system_prompt: ""
|
||||
|
||||
# Optional template applied to retrieved context before model input
|
||||
context_template: ""
|
||||
|
||||
# REQUIRED: LLM model id (server-side managed); also settable via --model
|
||||
model_id: ""
|
||||
|
||||
# Optional rerank model id (server-side managed); also settable via --rerank-model
|
||||
rerank_model_id: ""
|
||||
|
||||
# Generation tuning
|
||||
temperature: 0.0
|
||||
max_completion_tokens: 0
|
||||
max_iterations: 0
|
||||
|
||||
# Tools / MCP integration
|
||||
allowed_tools: []
|
||||
mcp_selection_mode: "" # "all" / "selected" / "none"
|
||||
mcp_services: []
|
||||
|
||||
# Knowledge base attachment
|
||||
kb_selection_mode: "" # "all" / "selected" / "none"; also settable via --kb-selection-mode
|
||||
knowledge_bases: [] # KB ids; also settable via repeated --kb
|
||||
supported_file_types: []
|
||||
|
||||
# FAQ
|
||||
faq_priority_enabled: false
|
||||
faq_direct_answer_threshold: 0.0
|
||||
faq_score_boost: 0.0
|
||||
|
||||
# Web search
|
||||
web_search_enabled: false
|
||||
web_search_max_results: 0
|
||||
|
||||
# Multi-turn
|
||||
multi_turn_enabled: false
|
||||
history_turns: 0
|
||||
|
||||
# Retrieval thresholds
|
||||
embedding_top_k: 0
|
||||
keyword_threshold: 0.0
|
||||
vector_threshold: 0.0
|
||||
rerank_top_k: 0
|
||||
rerank_threshold: 0.0
|
||||
|
||||
# Query understanding / rewrite
|
||||
enable_query_expansion: false
|
||||
enable_rewrite: false
|
||||
rewrite_prompt_system: ""
|
||||
rewrite_prompt_user: ""
|
||||
query_understand_model_id: ""
|
||||
|
||||
# Fallback when retrieval / generation fails
|
||||
fallback_strategy: "" # "fixed" or "model"
|
||||
fallback_response: ""
|
||||
fallback_prompt: ""
|
||||
`
|
||||
_, err := io.WriteString(w, skeleton)
|
||||
return err
|
||||
}
|
||||
Reference in New Issue
Block a user