7675e2cd88
build / build (push) Successful in 1m33s
F13 动态客户端原先把 TEST_WEKNORA_HTTP_TIMEOUT(默认 60s)强制截成 10s, 与 readiness 探针上限混用,导致上传/轮询等业务请求 10s 即超时。 现在显式正超时原样传入;未配置/非正值回落到 appconfig 的 60s 默认。 readiness 探测自己的 10s 上限不变。 新增本地 httptest:60s 配置下 11s 响应成功,显式 50ms 短超时仍生效; 端点/凭据/绑定动态解析回归保持通过。make verify 17 项通过。
97 lines
2.9 KiB
Go
97 lines
2.9 KiB
Go
package weknoraaccess
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"time"
|
|
|
|
"knowledge-governance/internal/platform/weknora"
|
|
"knowledge-governance/internal/readiness"
|
|
)
|
|
|
|
var ErrNotConfigured = errors.New("WeKnora 有效端点/凭据未配置")
|
|
|
|
// defaultBusinessTimeout matches appconfig's TEST_WEKNORA_HTTP_TIMEOUT default.
|
|
// The readiness probe has its own 10s cap; it must not bound upload/poll calls.
|
|
const defaultBusinessTimeout = 60 * time.Second
|
|
|
|
// Client resolves the effective WeKnora target on every call. It deliberately
|
|
// owns no cached *weknora.Client: endpoint, key and binding are console-managed.
|
|
type Client struct {
|
|
Resolver readiness.Resolver
|
|
Timeout time.Duration
|
|
AllowDockerHTTP bool
|
|
}
|
|
|
|
func (client *Client) with(ctx context.Context, call func(*weknora.Client) error) error {
|
|
target, err := client.Resolver.Resolve(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if target.BaseURL == "" || target.APIKey == "" {
|
|
return ErrNotConfigured
|
|
}
|
|
timeout := client.Timeout
|
|
if timeout <= 0 {
|
|
timeout = defaultBusinessTimeout
|
|
}
|
|
remote, err := weknora.NewClient(weknora.ClientConfig{
|
|
BaseURL: target.BaseURL,
|
|
APIKey: target.APIKey,
|
|
Timeout: timeout,
|
|
AllowDockerHTTP: client.AllowDockerHTTP,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return call(remote)
|
|
}
|
|
|
|
func (client *Client) UploadFile(ctx context.Context, request weknora.UploadRequest) (weknora.Knowledge, error) {
|
|
var knowledge weknora.Knowledge
|
|
err := client.with(ctx, func(remote *weknora.Client) error {
|
|
value, err := remote.UploadFile(ctx, request)
|
|
knowledge = value
|
|
return err
|
|
})
|
|
return knowledge, err
|
|
}
|
|
|
|
func (client *Client) ListKnowledge(ctx context.Context, knowledgeBaseID string, page, pageSize int) ([]weknora.Knowledge, int64, error) {
|
|
var items []weknora.Knowledge
|
|
var total int64
|
|
err := client.with(ctx, func(remote *weknora.Client) error {
|
|
value, count, err := remote.ListKnowledge(ctx, knowledgeBaseID, page, pageSize)
|
|
items, total = value, count
|
|
return err
|
|
})
|
|
return items, total, err
|
|
}
|
|
|
|
func (client *Client) GetKnowledge(ctx context.Context, knowledgeID string) (weknora.Knowledge, error) {
|
|
var knowledge weknora.Knowledge
|
|
err := client.with(ctx, func(remote *weknora.Client) error {
|
|
value, err := remote.GetKnowledge(ctx, knowledgeID)
|
|
knowledge = value
|
|
return err
|
|
})
|
|
return knowledge, err
|
|
}
|
|
|
|
func (client *Client) ListChunks(ctx context.Context, knowledgeID string, page, pageSize int, chunkTypes []string) ([]weknora.Chunk, int64, error) {
|
|
var chunks []weknora.Chunk
|
|
var total int64
|
|
err := client.with(ctx, func(remote *weknora.Client) error {
|
|
value, count, err := remote.ListChunks(ctx, knowledgeID, page, pageSize, chunkTypes)
|
|
chunks, total = value, count
|
|
return err
|
|
})
|
|
return chunks, total, err
|
|
}
|
|
|
|
func (client *Client) DeleteKnowledge(ctx context.Context, knowledgeID string) error {
|
|
return client.with(ctx, func(remote *weknora.Client) error {
|
|
return remote.DeleteKnowledge(ctx, knowledgeID)
|
|
})
|
|
}
|