-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
feat: Galleries UI #2104
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.
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
Merged
feat: Galleries UI #2104
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| package elements | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/chasefleming/elem-go" | ||
| "github.com/chasefleming/elem-go/attrs" | ||
| "github.com/go-skynet/LocalAI/pkg/gallery" | ||
| ) | ||
|
|
||
| func DoneProgress(uid string) string { | ||
| return elem.Div( | ||
| attrs.Props{}, | ||
| elem.H3( | ||
| attrs.Props{ | ||
| "role": "status", | ||
| "id": "pblabel", | ||
| "tabindex": "-1", | ||
| "autofocus": "", | ||
| }, | ||
| elem.Text("Installation completed"), | ||
| ), | ||
| ).Render() | ||
| } | ||
|
|
||
| func ErrorProgress(err string) string { | ||
| return elem.Div( | ||
| attrs.Props{}, | ||
| elem.H3( | ||
| attrs.Props{ | ||
| "role": "status", | ||
| "id": "pblabel", | ||
| "tabindex": "-1", | ||
| "autofocus": "", | ||
| }, | ||
| elem.Text("Error"+err), | ||
| ), | ||
| ).Render() | ||
| } | ||
|
|
||
| func ProgressBar(progress string) string { | ||
| return elem.Div(attrs.Props{ | ||
| "class": "progress", | ||
| "role": "progressbar", | ||
| "aria-valuemin": "0", | ||
| "aria-valuemax": "100", | ||
| "aria-valuenow": "0", | ||
| "aria-labelledby": "pblabel", | ||
| }, | ||
| elem.Div(attrs.Props{ | ||
| "id": "pb", | ||
| "class": "progress-bar", | ||
| "style": "width:" + progress + "%", | ||
| }), | ||
| ).Render() | ||
| } | ||
|
|
||
| func StartProgressBar(uid, progress string) string { | ||
| if progress == "" { | ||
| progress = "0" | ||
| } | ||
| return elem.Div(attrs.Props{ | ||
| "hx-trigger": "done", | ||
| "hx-get": "/browse/job/" + uid, | ||
| "hx-swap": "outerHTML", | ||
| "hx-target": "this", | ||
| }, | ||
| elem.H3( | ||
| attrs.Props{ | ||
| "role": "status", | ||
| "id": "pblabel", | ||
| "tabindex": "-1", | ||
| "autofocus": "", | ||
| }, | ||
| elem.Text("Installing"), | ||
| // This is a simple example of how to use the HTMLX library to create a progress bar that updates every 600ms. | ||
| elem.Div(attrs.Props{ | ||
| "hx-get": "/browse/job/progress/" + uid, | ||
| "hx-trigger": "every 600ms", | ||
| "hx-target": "this", | ||
| "hx-swap": "innerHTML", | ||
| }, | ||
| elem.Raw(ProgressBar(progress)), | ||
| ), | ||
| ), | ||
| ).Render() | ||
| } | ||
|
|
||
| func ListModels(models []*gallery.GalleryModel) string { | ||
| modelsElements := []elem.Node{} | ||
| span := func(s string) elem.Node { | ||
| return elem.Span( | ||
| attrs.Props{ | ||
| "class": "float-right inline-block bg-green-500 text-white py-1 px-3 rounded-full text-xs", | ||
| }, | ||
| elem.Text(s), | ||
| ) | ||
| } | ||
| installButton := func(m *gallery.GalleryModel) elem.Node { | ||
| return elem.Button( | ||
| attrs.Props{ | ||
| "class": "float-right inline-block rounded bg-primary px-6 pb-2 pt-2.5 text-xs font-medium uppercase leading-normal text-white shadow-primary-3 transition duration-150 ease-in-out hover:bg-primary-accent-300 hover:shadow-primary-2 focus:bg-primary-accent-300 focus:shadow-primary-2 focus:outline-none focus:ring-0 active:bg-primary-600 active:shadow-primary-2 dark:shadow-black/30 dark:hover:shadow-dark-strong dark:focus:shadow-dark-strong dark:active:shadow-dark-strong", | ||
| // post the Model ID as param | ||
| "hx-post": "/browse/install/model/" + fmt.Sprintf("%s@%s", m.Gallery.Name, m.Name), | ||
| }, | ||
| elem.Text("Install"), | ||
| ) | ||
| } | ||
|
|
||
| descriptionDiv := func(m *gallery.GalleryModel) elem.Node { | ||
|
|
||
| return elem.Div( | ||
| attrs.Props{ | ||
| "class": "p-6", | ||
| }, | ||
| elem.H5( | ||
| attrs.Props{ | ||
| "class": "mb-2 text-xl font-medium leading-tight", | ||
| }, | ||
| elem.Text(m.Name), | ||
| ), | ||
| elem.P( | ||
| attrs.Props{ | ||
| "class": "mb-4 text-base", | ||
| }, | ||
| elem.Text(m.Description), | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| actionDiv := func(m *gallery.GalleryModel) elem.Node { | ||
| return elem.Div( | ||
| attrs.Props{ | ||
| "class": "px-6 pt-4 pb-2", | ||
| }, | ||
| elem.Span( | ||
| attrs.Props{ | ||
| "class": "inline-block bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2", | ||
| }, | ||
| elem.Text("Repository: "+m.Gallery.Name), | ||
| ), | ||
| elem.If(m.Installed, span("Installed"), installButton(m)), | ||
| ) | ||
| } | ||
|
|
||
| for _, m := range models { | ||
| modelsElements = append(modelsElements, | ||
| elem.Div( | ||
| attrs.Props{ | ||
| "class": "me-4 mb-2 block rounded-lg bg-white shadow-secondary-1 dark:bg-gray-800 dark:bg-surface-dark dark:text-white text-surface p-2", | ||
| }, | ||
| elem.Div( | ||
| attrs.Props{ | ||
| "class": "p-6", | ||
| }, | ||
| descriptionDiv(m), | ||
| actionDiv(m), | ||
| // elem.If(m.Installed, span("Installed"), installButton(m)), | ||
|
|
||
| // elem.If(m.Installed, span("Installed"), span("Not Installed")), | ||
| ), | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| wrapper := elem.Div(attrs.Props{ | ||
| "class": "dark grid grid-cols-1 grid-rows-1 md:grid-cols-2 ", | ||
| }, modelsElements...) | ||
|
|
||
| return wrapper.Render() | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package routes | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "html/template" | ||
| "strings" | ||
|
|
||
| "github.com/go-skynet/LocalAI/core/config" | ||
| "github.com/go-skynet/LocalAI/core/http/elements" | ||
| "github.com/go-skynet/LocalAI/core/services" | ||
| "github.com/go-skynet/LocalAI/pkg/gallery" | ||
| "github.com/go-skynet/LocalAI/pkg/model" | ||
| "github.com/gofiber/fiber/v2" | ||
| "github.com/google/uuid" | ||
| ) | ||
|
|
||
| func RegisterUIRoutes(app *fiber.App, | ||
| cl *config.BackendConfigLoader, | ||
| ml *model.ModelLoader, | ||
| appConfig *config.ApplicationConfig, | ||
| galleryService *services.GalleryService, | ||
| auth func(*fiber.Ctx) error) { | ||
|
|
||
| // Show the Models page | ||
| app.Get("/browse", auth, func(c *fiber.Ctx) error { | ||
| models, _ := gallery.AvailableGalleryModels(appConfig.Galleries, appConfig.ModelPath) | ||
|
|
||
| summary := fiber.Map{ | ||
| "Title": "LocalAI API - Models", | ||
| "Models": template.HTML(elements.ListModels(models)), | ||
| // "ApplicationConfig": appConfig, | ||
| } | ||
|
|
||
| // Render index | ||
| return c.Render("views/models", summary) | ||
| }) | ||
|
|
||
| // HTMX: return the model details | ||
| // https://htmx.org/examples/active-search/ | ||
| app.Post("/browse/search/models", auth, func(c *fiber.Ctx) error { | ||
| form := struct { | ||
| Search string `form:"search"` | ||
| }{} | ||
| if err := c.BodyParser(&form); err != nil { | ||
| return c.Status(fiber.StatusBadRequest).SendString(err.Error()) | ||
| } | ||
|
|
||
| models, _ := gallery.AvailableGalleryModels(appConfig.Galleries, appConfig.ModelPath) | ||
|
|
||
| filteredModels := []*gallery.GalleryModel{} | ||
| for _, m := range models { | ||
| if strings.Contains(m.Name, form.Search) { | ||
| filteredModels = append(filteredModels, m) | ||
| } | ||
| } | ||
|
|
||
| return c.SendString(elements.ListModels(filteredModels)) | ||
| }) | ||
|
|
||
| // https://htmx.org/examples/progress-bar/ | ||
| app.Post("/browse/install/model/:id", auth, func(c *fiber.Ctx) error { | ||
| galleryID := strings.Clone(c.Params("id")) // strings.Clone is required! | ||
|
|
||
| id, err := uuid.NewUUID() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| uid := id.String() | ||
|
|
||
| op := gallery.GalleryOp{ | ||
| Id: uid, | ||
| GalleryName: galleryID, | ||
| Galleries: appConfig.Galleries, | ||
| } | ||
| go func() { | ||
| galleryService.C <- op | ||
| }() | ||
|
|
||
| return c.SendString(elements.StartProgressBar(uid, "0")) | ||
| }) | ||
|
|
||
| // https://htmx.org/examples/progress-bar/ | ||
| app.Get("/browse/job/progress/:uid", auth, func(c *fiber.Ctx) error { | ||
| jobUID := c.Params("uid") | ||
|
|
||
| status := galleryService.GetStatus(jobUID) | ||
| if status == nil { | ||
| //fmt.Errorf("could not find any status for ID") | ||
| return c.SendString(elements.ProgressBar("0")) | ||
| } | ||
|
|
||
| if status.Progress == 100 { | ||
| c.Set("HX-Trigger", "done") | ||
| return c.SendString(elements.ProgressBar("100")) | ||
| } | ||
| if status.Error != nil { | ||
| return c.SendString(elements.ErrorProgress(status.Error.Error())) | ||
| } | ||
|
|
||
| return c.SendString(elements.ProgressBar(fmt.Sprint(status.Progress))) | ||
| }) | ||
|
|
||
| app.Get("/browse/job/:uid", auth, func(c *fiber.Ctx) error { | ||
| return c.SendString(elements.DoneProgress(c.Params("uid"))) | ||
| }) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check failure
Code scanning / gosec
The used method does not auto-escape HTML. This can potentially lead to 'Cross-site Scripting' vulnerabilities, in case the attacker controls the input.