Skip to content

Automated cherry pick of #24457: feat(llm): add llm_types filters and cleanup dify cli #24459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zexi merged 1 commit into from
Mar 16, 2026
Merged

Automated cherry pick of #24457: feat(llm): add llm_types filters and cleanup dify cli #24459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions cmd/climc/shell/llm/dify_sku.go
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions pkg/apis/llm/llm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ type LLMBaseListInput struct {
type LLMListInput struct {
LLMBaseListInput

LLMSku string `json:"llm_sku"`
LLMImage string `json:"llm_image"`
LLMType string `json:"llm_type"` // filter by linked SKU's llm_type (e.g. dify)
LLMSku string `json:"llm_sku"`
LLMImage string `json:"llm_image"`
LLMTypes []string `json:"llm_types"` // filter by linked SKU's llm_types (e.g. [dify, openclaw])
LLMType string `json:"llm_type"` // filter by linked SKU's llm_type (e.g. dify)
}

type ModelInfo struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/llm/sku.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ type LLMSkuListInput struct {
apis.SharableVirtualResourceListInput
MountedModelResourceListInput

LLMType string `json:"llm_type"`
LLMType string `json:"llm_type"`
LLMTypes []string `json:"llm_types"`
}

type LLMSkuCreateInput struct {
Expand Down
5 changes: 5 additions & 0 deletions pkg/llm/models/llm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ func (man *SLLMManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery,
q = q.Join(skuQ, sqlchemy.Equals(q.Field("llm_sku_id"), skuQ.Field("id")))
q = q.Filter(sqlchemy.Equals(skuQ.Field("llm_type"), input.LLMType))
}
if len(input.LLMTypes) > 0 {
skuQ := GetLLMSkuManager().Query().SubQuery()
q = q.Join(skuQ, sqlchemy.Equals(q.Field("llm_sku_id"), skuQ.Field("id")))
q = q.Filter(sqlchemy.In(skuQ.Field("llm_type"), input.LLMTypes))
}

return q, nil
}
Expand Down
3 changes: 3 additions & 0 deletions pkg/llm/models/llm_sku.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ func (man *SLLMSkuManager) ListItemFilter(
if len(input.LLMType) > 0 {
q = q.Equals("llm_type", input.LLMType)
}
if len(input.LLMTypes) > 0 {
q = q.Filter(sqlchemy.In(q.Field("llm_type"), input.LLMTypes))
}
q, err = man.SMountedModelsResourceManager.ListItemFilter(ctx, q, userCred, input.MountedModelResourceListInput)
if err != nil {
return nil, errors.Wrap(err, "SMountedAppsResourceManager")
Expand Down
5 changes: 3 additions & 2 deletions pkg/mcclient/options/llm/llm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ type LLMBaseListOptions struct {
type LLMListOptions struct {
LLMBaseListOptions

LlmSku string `help:"filter by llm sku"`
LlmImage string `help:"filter by llm image"`
LlmSku string `help:"filter by llm sku"`
LlmImage string `help:"filter by llm image"`
LLMTypes []string `help:"filter by llm types"`
}

func (o *LLMListOptions) Params() (jsonutils.JSONObject, error) {
Expand Down
Loading