Skip to content

fix(service/controller): add support for paginated and non-paginated plugin list responses with backward compatibility #396

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

Open
homejim wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(service/controller): add support for paginated and non-paginated plugin list responses with backward compatibility #396

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
9 changes: 5 additions & 4 deletions internal/server/controllers/plugins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,12 @@ func FetchPluginFromIdentifier(c *gin.Context) {

func ListPlugins(c *gin.Context) {
BindRequest(c, func(request struct {
TenantID string `uri:"tenant_id" validate:"required"`
Page int `form:"page" validate:"required,min=1"`
PageSize int `form:"page_size" validate:"required,min=1,max=256"`
TenantID string `uri:"tenant_id" validate:"required"`
Page int `form:"page" validate:"required,min=1"`
PageSize int `form:"page_size" validate:"required,min=1,max=256"`
ResponseType string `form:"response_type" validate:"omitempty,oneof=paged"`
}) {
c.JSON(http.StatusOK, service.ListPlugins(request.TenantID, request.Page, request.PageSize))
c.JSON(http.StatusOK, service.ListPlugins(request.TenantID, request.Page, request.PageSize, request.ResponseType))
})
}

Expand Down
15 changes: 9 additions & 6 deletions internal/service/manage_plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/langgenius/dify-plugin-daemon/pkg/entities/plugin_entities"
)

func ListPlugins(tenant_id string, page int, page_size int) *entities.Response {
func ListPlugins(tenant_id string, page int, page_size int, response_type string) *entities.Response {
type installation struct {
ID string `json:"id"`
Name string `json:"name"`
Expand Down Expand Up @@ -96,12 +96,15 @@ func ListPlugins(tenant_id string, page int, page_size int) *entities.Response {
})
}

finalData := responseData{
List: data,
Total: totalCount,
}
if response_type == "paged" {
finalData := responseData{
List: data,
Total: totalCount,
}

return entities.NewSuccessResponse(finalData)
return entities.NewSuccessResponse(finalData)
}
return entities.NewSuccessResponse(data)
}

// Using plugin_ids to fetch plugin installations
Expand Down