mirror of
https://gitee.com/fit2cloud-feizhiyun/1Panel.git
synced 2026-11-19 19:34:49 +08:00
feat(ai): open source model marketplace and migrate historical data (#14277)
* feat(ai): open source model marketplace and migrate historical data * fix(ai): wait for canceled model downloads before retrying
This commit is contained in:
@@ -17,10 +17,11 @@ var (
|
||||
appInstallService = service.NewIAppInstalledService()
|
||||
appIgnoreUpgradeService = service.NewIAppIgnoreUpgradeService()
|
||||
|
||||
aiToolService = service.NewIAIToolService()
|
||||
mcpServerService = service.NewIMcpServerService()
|
||||
tensorrtLLMService = service.NewITensorRTLLMService()
|
||||
agentService = service.NewIAgentService()
|
||||
modelDownloaderService = service.NewIModelDownloaderService()
|
||||
aiToolService = service.NewIAIToolService()
|
||||
mcpServerService = service.NewIMcpServerService()
|
||||
tensorrtLLMService = service.NewITensorRTLLMService()
|
||||
agentService = service.NewIAgentService()
|
||||
|
||||
containerService = service.NewIContainerService()
|
||||
composeTemplateService = service.NewIComposeTemplateService()
|
||||
|
||||
@@ -0,0 +1,390 @@
|
||||
package v2
|
||||
|
||||
import (
|
||||
"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
|
||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||
"github.com/1Panel-dev/1Panel/agent/app/service"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func handleModelDownloaderError(c *gin.Context, err error) {
|
||||
if service.IsModelDownloaderInputError(err) {
|
||||
helper.BadRequest(c, err)
|
||||
return
|
||||
}
|
||||
helper.InternalServer(c, err)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Search Hugging Face models
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelSearch true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.PageResult{items=[]dto.ModelItem}
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/hf/search [post]
|
||||
func (b *BaseApi) SearchHFModels(c *gin.Context) {
|
||||
var req dto.ModelSearch
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
total, items, err := modelDownloaderService.SearchHFModels(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, dto.PageResult{Total: total, Items: items})
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Get Hugging Face model details
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelInfoReq true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.ModelInfo
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/hf/info [post]
|
||||
func (b *BaseApi) GetHFModelInfo(c *gin.Context) {
|
||||
var req dto.ModelInfoReq
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
item, err := modelDownloaderService.GetHFModelInfo(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, item)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Download Hugging Face model
|
||||
// @Description Creates an asynchronous download task. Query /ai/model/downloader/tasks/search for progress.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownload true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.ModelDownloadTaskItem
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/hf/download [post]
|
||||
// @x-panel-log {"bodyKeys":["repoID","revision"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载 Hugging Face 模型 [repoID]","formatEN":"download Hugging Face model [repoID]"}
|
||||
func (b *BaseApi) StartHFModelDownload(c *gin.Context) {
|
||||
var req dto.ModelDownload
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
task, err := modelDownloaderService.StartDownload(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, task)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Search ModelScope models
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelSearch true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.PageResult{items=[]dto.ModelItem}
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/modelscope/search [post]
|
||||
func (b *BaseApi) SearchModelScopeModels(c *gin.Context) {
|
||||
var req dto.ModelSearch
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
total, items, err := modelDownloaderService.SearchModelScopeModels(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, dto.PageResult{Total: total, Items: items})
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Get ModelScope model details
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelInfoReq true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.ModelInfo
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/modelscope/info [post]
|
||||
func (b *BaseApi) GetModelScopeModelInfo(c *gin.Context) {
|
||||
var req dto.ModelInfoReq
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
item, err := modelDownloaderService.GetModelScopeModelInfo(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, item)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Download ModelScope model
|
||||
// @Description Creates an asynchronous download task. Query /ai/model/downloader/tasks/search for progress.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownload true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.ModelDownloadTaskItem
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/modelscope/download [post]
|
||||
// @x-panel-log {"bodyKeys":["repoID","revision"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"下载 ModelScope 模型 [repoID]","formatEN":"download ModelScope model [repoID]"}
|
||||
func (b *BaseApi) StartModelScopeModelDownload(c *gin.Context) {
|
||||
var req dto.ModelDownload
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
task, err := modelDownloaderService.StartModelScopeDownload(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, task)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Get model downloader settings
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.ModelDownloaderSetting
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/settings [get]
|
||||
func (b *BaseApi) GetModelDownloaderSettings(c *gin.Context) {
|
||||
settings, err := modelDownloaderService.GetSettings()
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, settings)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Update model downloader settings
|
||||
// @Description Updates the download directory, source endpoints and tokens. The featuredModelsSync field is ignored; use /ai/model/downloader/featured/sync/status to update automatic synchronization.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownloaderSetting true "request"
|
||||
// @Produce json
|
||||
// @Success 200
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/settings [post]
|
||||
// @x-panel-log {"bodyKeys":["modelDir"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新模型下载设置 [modelDir]","formatEN":"update model downloader settings [modelDir]"}
|
||||
func (b *BaseApi) UpdateModelDownloaderSettings(c *gin.Context) {
|
||||
var req dto.ModelDownloaderSetting
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
if err := modelDownloaderService.UpdateSettings(req); err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.Success(c)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Page model download tasks
|
||||
// @Description Set includeLocal to true to include locally downloaded models.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownloadTaskSearch true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.PageResult{items=[]dto.ModelDownloadTaskItem}
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/tasks/search [post]
|
||||
func (b *BaseApi) PageModelDownloadTasks(c *gin.Context) {
|
||||
var req dto.ModelDownloadTaskSearch
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
total, items, err := modelDownloaderService.PageTasks(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, dto.PageResult{Items: items, Total: total})
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Cancel model download task
|
||||
// @Description Only waiting or downloading tasks can be canceled. The withFile field is ignored.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownloadTaskOperate true "request"
|
||||
// @Produce json
|
||||
// @Success 200
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/tasks/cancel [post]
|
||||
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"model_download_tasks","output_column":"repo_id","output_value":"repoID"}],"formatZH":"取消模型下载任务 [repoID]","formatEN":"cancel model download task [repoID]"}
|
||||
func (b *BaseApi) CancelModelDownloadTask(c *gin.Context) {
|
||||
var req dto.ModelDownloadTaskOperate
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
if err := modelDownloaderService.CancelTask(req); err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.Success(c)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Retry model download task
|
||||
// @Description Only failed or canceled tasks can be retried. Returns the task while the download runs asynchronously.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownloadTaskRetry true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.ModelDownloadTaskItem
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/tasks/retry [post]
|
||||
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"model_download_tasks","output_column":"repo_id","output_value":"repoID"}],"formatZH":"重试模型下载任务 [repoID]","formatEN":"retry model download task [repoID]"}
|
||||
func (b *BaseApi) RetryModelDownloadTask(c *gin.Context) {
|
||||
var req dto.ModelDownloadTaskRetry
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
task, err := modelDownloaderService.RetryTask(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, task)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Remove model download task
|
||||
// @Description Waiting or downloading tasks cannot be removed. Set withFile to true to also delete downloaded files.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownloadTaskOperate true "request"
|
||||
// @Produce json
|
||||
// @Success 200
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/tasks/remove [post]
|
||||
// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"model_download_tasks","output_column":"repo_id","output_value":"repoID"}],"formatZH":"移除模型下载任务 [repoID]","formatEN":"remove model download task [repoID]"}
|
||||
func (b *BaseApi) RemoveModelDownloadTask(c *gin.Context) {
|
||||
var req dto.ModelDownloadTaskOperate
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
if err := modelDownloaderService.RemoveTask(req); err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.Success(c)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Page locally downloaded models
|
||||
// @Accept json
|
||||
// @Param request body dto.LocalModelSearch true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.PageResult{items=[]dto.LocalModelItem}
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/local/search [post]
|
||||
func (b *BaseApi) PageLocalDownloadedModels(c *gin.Context) {
|
||||
var req dto.LocalModelSearch
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
total, items, err := modelDownloaderService.ListLocalModels(req)
|
||||
if err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, dto.PageResult{Items: items, Total: total})
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Delete locally downloaded model
|
||||
// @Accept json
|
||||
// @Param request body dto.LocalModelDelete true "request"
|
||||
// @Produce json
|
||||
// @Success 200
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/local/delete [post]
|
||||
// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除本地模型 [name]","formatEN":"delete local model [name]"}
|
||||
func (b *BaseApi) DeleteLocalDownloadedModel(c *gin.Context) {
|
||||
var req dto.LocalModelDelete
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
if err := modelDownloaderService.DeleteLocalModel(req); err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.Success(c)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Synchronize featured models
|
||||
// @Description Synchronizes the featured model catalog immediately, independently of the automatic synchronization setting. Does nothing in offline mode.
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Success 200
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/featured/sync [post]
|
||||
func (b *BaseApi) SyncFeaturedModels(c *gin.Context) {
|
||||
if err := modelDownloaderService.SyncFeaturedModels(); err != nil {
|
||||
helper.InternalServer(c, err)
|
||||
return
|
||||
}
|
||||
helper.Success(c)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Page featured models
|
||||
// @Accept json
|
||||
// @Param request body dto.FeaturedModelSearch true "request"
|
||||
// @Produce json
|
||||
// @Success 200 {object} dto.FeaturedModelPage{items=[]dto.FeaturedModel}
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/featured/search [post]
|
||||
func (b *BaseApi) PageFeaturedModels(c *gin.Context) {
|
||||
var req dto.FeaturedModelSearch
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
result, err := modelDownloaderService.PageFeaturedModels(req)
|
||||
if err != nil {
|
||||
helper.InternalServer(c, err)
|
||||
return
|
||||
}
|
||||
helper.SuccessWithData(c, result)
|
||||
}
|
||||
|
||||
// @Tags AI
|
||||
// @Summary Update featured model automatic synchronization
|
||||
// @Description Set value to Enable or Disable. This updates the automatic synchronization setting without triggering an immediate synchronization.
|
||||
// @Accept json
|
||||
// @Param request body dto.ModelDownloaderSyncSetting true "request"
|
||||
// @Produce json
|
||||
// @Success 200
|
||||
// @Security ApiKeyAuth
|
||||
// @Security Timestamp
|
||||
// @Router /ai/model/downloader/featured/sync/status [post]
|
||||
// @x-panel-log {"bodyKeys":["value"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新推荐模型自动同步 [value]","formatEN":"update featured model automatic synchronization [value]"}
|
||||
func (b *BaseApi) UpdateFeaturedModelsSync(c *gin.Context) {
|
||||
var req dto.ModelDownloaderSyncSetting
|
||||
if err := helper.CheckBindAndValidate(&req, c); err != nil {
|
||||
return
|
||||
}
|
||||
if err := modelDownloaderService.UpdateFeaturedModelsSync(req); err != nil {
|
||||
handleModelDownloaderError(c, err)
|
||||
return
|
||||
}
|
||||
helper.Success(c)
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
package dto
|
||||
|
||||
type ModelSearch struct {
|
||||
Query string `json:"query"`
|
||||
Sort string `json:"sort" validate:"omitempty,oneof=trending downloads updated created likes most_params least_params"`
|
||||
Page int `json:"page" validate:"omitempty,min=1"`
|
||||
PageSize int `json:"pageSize" validate:"omitempty,min=1,max=100"`
|
||||
Limit int `json:"limit" validate:"omitempty,min=1,max=100"`
|
||||
}
|
||||
|
||||
type ModelInfoReq struct {
|
||||
RepoID string `json:"repoID" validate:"required"`
|
||||
Revision string `json:"revision"`
|
||||
}
|
||||
|
||||
type ModelDownload struct {
|
||||
DownloadType string `json:"downloadType" validate:"omitempty,oneof=all tokenizer"`
|
||||
RepoID string `json:"repoID" validate:"required"`
|
||||
Revision string `json:"revision"`
|
||||
}
|
||||
|
||||
type ModelDownloaderSyncSetting struct {
|
||||
Value string `json:"value" validate:"required,oneof=Enable Disable"`
|
||||
}
|
||||
|
||||
type ModelDownloaderSetting struct {
|
||||
FeaturedModelsSync string `json:"featuredModelsSync"`
|
||||
ModelDir string `json:"modelDir" validate:"required"`
|
||||
HFEndpoint string `json:"hfEndpoint"`
|
||||
HFToken string `json:"hfToken"`
|
||||
ModelScopeEndpoint string `json:"modelScopeEndpoint"`
|
||||
ModelScopeToken string `json:"modelScopeToken"`
|
||||
}
|
||||
|
||||
type ModelItem struct {
|
||||
RepoID string `json:"repoID"`
|
||||
Name string `json:"name"`
|
||||
Downloads int64 `json:"downloads"`
|
||||
Likes int64 `json:"likes"`
|
||||
Size int64 `json:"size"`
|
||||
SizeFormatted string `json:"sizeFormatted"`
|
||||
}
|
||||
|
||||
type ModelFile struct {
|
||||
Name string `json:"name"`
|
||||
Size int64 `json:"size"`
|
||||
SizeFormatted string `json:"sizeFormatted"`
|
||||
}
|
||||
|
||||
type ModelInfo struct {
|
||||
ModelItem
|
||||
ModelCard string `json:"modelCard"`
|
||||
Files []ModelFile `json:"files"`
|
||||
}
|
||||
|
||||
type ModelDownloadTaskSearch struct {
|
||||
IncludeLocal bool `json:"includeLocal"`
|
||||
DownloadType string `json:"downloadType" validate:"omitempty,oneof=all tokenizer"`
|
||||
PageInfo
|
||||
Info string `json:"info"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
|
||||
type ModelDownloadTaskOperate struct {
|
||||
WithFile bool `json:"withFile"`
|
||||
ID uint `json:"id" validate:"required"`
|
||||
}
|
||||
|
||||
type ModelDownloadTaskRetry struct {
|
||||
ID uint `json:"id" validate:"required"`
|
||||
}
|
||||
|
||||
type ModelDownloadTaskItem struct {
|
||||
LocalModel *LocalModelItem `json:"localModel,omitempty"`
|
||||
DownloadType string `json:"downloadType"`
|
||||
ID uint `json:"id"`
|
||||
Source string `json:"source"`
|
||||
RepoID string `json:"repoID"`
|
||||
Revision string `json:"revision"`
|
||||
ModelName string `json:"modelName"`
|
||||
TargetDir string `json:"targetDir"`
|
||||
Status string `json:"status"`
|
||||
Progress float64 `json:"progress"`
|
||||
TotalSize int64 `json:"totalSize"`
|
||||
DownloadedSize int64 `json:"downloadedSize"`
|
||||
ErrorMessage string `json:"errorMessage"`
|
||||
CreatedAt string `json:"createdAt"`
|
||||
StartedAt string `json:"startedAt"`
|
||||
CompletedAt string `json:"completedAt"`
|
||||
CanCancel bool `json:"canCancel"`
|
||||
CanRetry bool `json:"canRetry"`
|
||||
CanRemoveRecord bool `json:"canRemoveRecord"`
|
||||
}
|
||||
|
||||
type LocalModelSearch struct {
|
||||
DownloadType string `json:"downloadType" validate:"omitempty,oneof=all tokenizer"`
|
||||
PageInfo
|
||||
Info string `json:"info"`
|
||||
}
|
||||
|
||||
type LocalModelItem struct {
|
||||
DownloadType string `json:"downloadType"`
|
||||
RepoID string `json:"repoID"`
|
||||
Source string `json:"source"`
|
||||
Revision string `json:"revision"`
|
||||
Name string `json:"name"`
|
||||
Path string `json:"path"`
|
||||
Size int64 `json:"size"`
|
||||
SizeFormatted string `json:"sizeFormatted"`
|
||||
CreatedAt string `json:"createdAt"`
|
||||
}
|
||||
|
||||
type LocalModelDelete struct {
|
||||
WithFile bool `json:"withFile"`
|
||||
DownloadType string `json:"downloadType" validate:"omitempty,oneof=all tokenizer"`
|
||||
Name string `json:"name" validate:"required"`
|
||||
}
|
||||
|
||||
type FeaturedModel struct {
|
||||
Key string `json:"key" yaml:"key"`
|
||||
Sort int `json:"sort" yaml:"sort"`
|
||||
Family string `json:"family" yaml:"category"`
|
||||
RepoID string `json:"repoID" yaml:"name"`
|
||||
Sources []string `json:"sources" yaml:"sources"`
|
||||
SourceModelIDs map[string]string `json:"sourceModelIds" yaml:"sourceModelIds"`
|
||||
Architecture string `json:"architecture" yaml:"modelType"`
|
||||
BackboneParams string `json:"backboneParams" yaml:"moeBackboneParameters"`
|
||||
ActiveParams string `json:"activeParams" yaml:"activeParameters"`
|
||||
Engram string `json:"engram" yaml:"engramParameters"`
|
||||
WeightGB float64 `json:"weightGB" yaml:"approximateWeightSizeGB"`
|
||||
Description map[string]string `json:"description" yaml:"description"`
|
||||
}
|
||||
|
||||
type FeaturedModelSearch struct {
|
||||
PageInfo
|
||||
Family string `json:"family"`
|
||||
Info string `json:"info"`
|
||||
}
|
||||
|
||||
type FeaturedModelPage struct {
|
||||
PageResult
|
||||
Families []string `json:"families"`
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package model
|
||||
|
||||
type FeaturedModel struct {
|
||||
BaseModel
|
||||
Key string `json:"key"`
|
||||
Sort int `json:"sort"`
|
||||
Family string `json:"family"`
|
||||
RepoID string `json:"repoID"`
|
||||
Sources []string `json:"sources" gorm:"serializer:json"`
|
||||
SourceModelIDs map[string]string `json:"sourceModelIds" gorm:"serializer:json"`
|
||||
Architecture string `json:"architecture"`
|
||||
BackboneParams string `json:"backboneParams"`
|
||||
ActiveParams string `json:"activeParams"`
|
||||
Engram string `json:"engram"`
|
||||
WeightGB float64 `json:"weightGB"`
|
||||
Description string `json:"description"`
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package model
|
||||
|
||||
import "time"
|
||||
|
||||
type ModelDownloadTask struct {
|
||||
DownloadType string `json:"downloadType"`
|
||||
BaseModel
|
||||
Source string `json:"source" gorm:"type:varchar(32);not null;index"`
|
||||
RepoID string `json:"repoID" gorm:"type:varchar(255);not null;index"`
|
||||
Revision string `json:"revision" gorm:"type:varchar(128)"`
|
||||
ModelName string `json:"modelName" gorm:"type:varchar(255);not null;index"`
|
||||
TargetDir string `json:"targetDir" gorm:"type:text"`
|
||||
Status string `json:"status" gorm:"type:varchar(32);not null;index"`
|
||||
Progress float64 `json:"progress"`
|
||||
TotalSize int64 `json:"totalSize"`
|
||||
DownloadedSize int64 `json:"downloadedSize"`
|
||||
ErrorMessage string `json:"errorMessage" gorm:"type:text"`
|
||||
StartedAt *time.Time `json:"startedAt"`
|
||||
CompletedAt *time.Time `json:"completedAt"`
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package repo
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||
"github.com/1Panel-dev/1Panel/agent/global"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type FeaturedModelRepo struct{}
|
||||
|
||||
type IFeaturedModelRepo interface {
|
||||
Page(page, size int, family, info string) (int64, []model.FeaturedModel, error)
|
||||
Families() ([]string, error)
|
||||
SyncAll(models []model.FeaturedModel, version string) error
|
||||
}
|
||||
|
||||
func NewIFeaturedModelRepo() IFeaturedModelRepo {
|
||||
return &FeaturedModelRepo{}
|
||||
}
|
||||
|
||||
func (r *FeaturedModelRepo) Page(page, size int, family, info string) (int64, []model.FeaturedModel, error) {
|
||||
var total int64
|
||||
var items []model.FeaturedModel
|
||||
db := global.DB.Model(&model.FeaturedModel{})
|
||||
if family != "" {
|
||||
db = db.Where("family = ?", family)
|
||||
}
|
||||
if info != "" {
|
||||
db = db.Where("LOWER(repo_id) LIKE ?", "%"+strings.ToLower(info)+"%")
|
||||
}
|
||||
if err := db.Count(&total).Error; err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
if err := db.Order("sort asc").Order("id asc").Limit(size).Offset(size * (page - 1)).Find(&items).Error; err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
return total, items, nil
|
||||
}
|
||||
|
||||
func (r *FeaturedModelRepo) Families() ([]string, error) {
|
||||
families := make([]string, 0)
|
||||
err := global.DB.Model(&model.FeaturedModel{}).Distinct("family").Order("family asc").Pluck("family", &families).Error
|
||||
return families, err
|
||||
}
|
||||
|
||||
func (r *FeaturedModelRepo) SyncAll(models []model.FeaturedModel, version string) error {
|
||||
return global.DB.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Where("1 = 1").Delete(&model.FeaturedModel{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Create(&models).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Where("key = ?", "FeaturedModelsVersion").
|
||||
Assign(model.Setting{Value: version}).
|
||||
FirstOrCreate(&model.Setting{Key: "FeaturedModelsVersion"}).Error
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
package repo
|
||||
|
||||
import (
|
||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||
"github.com/1Panel-dev/1Panel/agent/global"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type ModelDownloadTaskRepo struct{}
|
||||
|
||||
type IModelDownloadTaskRepo interface {
|
||||
Page(page, size int, info, status string, opts ...DBOption) (int64, []model.ModelDownloadTask, error)
|
||||
GetFirst(opts ...DBOption) (model.ModelDownloadTask, error)
|
||||
List(opts ...DBOption) ([]model.ModelDownloadTask, error)
|
||||
Create(task *model.ModelDownloadTask) error
|
||||
Update(id uint, values map[string]interface{}) error
|
||||
UpdateBy(values map[string]interface{}, opts ...DBOption) error
|
||||
DeleteBy(opts ...DBOption) error
|
||||
WithByDownloadType(downloadType string) DBOption
|
||||
WithBySource(source string) DBOption
|
||||
WithByRepoID(repoID string) DBOption
|
||||
WithByTargetDir(targetDir string) DBOption
|
||||
WithByStatusIn(status []string) DBOption
|
||||
}
|
||||
|
||||
func NewIModelDownloadTaskRepo() IModelDownloadTaskRepo {
|
||||
return &ModelDownloadTaskRepo{}
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) WithBySource(source string) DBOption {
|
||||
return func(g *gorm.DB) *gorm.DB {
|
||||
return g.Where("source = ?", source)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) WithByRepoID(repoID string) DBOption {
|
||||
return func(g *gorm.DB) *gorm.DB {
|
||||
return g.Where("repo_id = ?", repoID)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) WithByTargetDir(targetDir string) DBOption {
|
||||
return func(g *gorm.DB) *gorm.DB {
|
||||
return g.Where("target_dir = ?", targetDir)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) WithByStatusIn(status []string) DBOption {
|
||||
return func(g *gorm.DB) *gorm.DB {
|
||||
return g.Where("status in ?", status)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) Page(page, size int, info, status string, opts ...DBOption) (int64, []model.ModelDownloadTask, error) {
|
||||
var (
|
||||
total int64
|
||||
list []model.ModelDownloadTask
|
||||
)
|
||||
db := global.DB.Model(&model.ModelDownloadTask{})
|
||||
for _, opt := range opts {
|
||||
db = opt(db)
|
||||
}
|
||||
if info != "" {
|
||||
db = db.Where("repo_id LIKE ? OR model_name LIKE ?", "%"+info+"%", "%"+info+"%")
|
||||
}
|
||||
if status != "" {
|
||||
db = db.Where("status = ?", status)
|
||||
}
|
||||
if err := db.Count(&total).Error; err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
if err := db.Order("created_at desc").Limit(size).Offset(size * (page - 1)).Find(&list).Error; err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
return total, list, nil
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) GetFirst(opts ...DBOption) (model.ModelDownloadTask, error) {
|
||||
var item model.ModelDownloadTask
|
||||
db := global.DB.Model(&model.ModelDownloadTask{})
|
||||
for _, opt := range opts {
|
||||
db = opt(db)
|
||||
}
|
||||
err := db.First(&item).Error
|
||||
return item, err
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) Create(task *model.ModelDownloadTask) error {
|
||||
return global.DB.Create(task).Error
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) List(opts ...DBOption) ([]model.ModelDownloadTask, error) {
|
||||
var items []model.ModelDownloadTask
|
||||
db := global.DB.Model(&model.ModelDownloadTask{})
|
||||
for _, opt := range opts {
|
||||
db = opt(db)
|
||||
}
|
||||
err := db.Find(&items).Error
|
||||
return items, err
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) Update(id uint, values map[string]interface{}) error {
|
||||
return global.DB.Model(&model.ModelDownloadTask{}).Where("id = ?", id).Updates(values).Error
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) UpdateBy(values map[string]interface{}, opts ...DBOption) error {
|
||||
db := global.DB.Model(&model.ModelDownloadTask{})
|
||||
for _, opt := range opts {
|
||||
db = opt(db)
|
||||
}
|
||||
return db.Updates(values).Error
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) DeleteBy(opts ...DBOption) error {
|
||||
db := global.DB.Model(&model.ModelDownloadTask{})
|
||||
for _, opt := range opts {
|
||||
db = opt(db)
|
||||
}
|
||||
return db.Delete(&model.ModelDownloadTask{}).Error
|
||||
}
|
||||
|
||||
func (m *ModelDownloadTaskRepo) WithByDownloadType(downloadType string) DBOption {
|
||||
return func(g *gorm.DB) *gorm.DB {
|
||||
return g.Where("download_type = ?", downloadType)
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,8 @@ package service
|
||||
import "github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||
|
||||
var (
|
||||
modelDownloadTaskRepo = repo.NewIModelDownloadTaskRepo()
|
||||
featuredModelRepo = repo.NewIFeaturedModelRepo()
|
||||
appRepo = repo.NewIAppRepo()
|
||||
appTagRepo = repo.NewIAppTagRepo()
|
||||
appDetailRepo = repo.NewIAppDetailRepo()
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||
"github.com/1Panel-dev/1Panel/agent/global"
|
||||
"github.com/1Panel-dev/1Panel/agent/utils/req_helper"
|
||||
"gopkg.in/yaml.v3"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
var featuredModelsSyncMu sync.Mutex
|
||||
|
||||
func (m *ModelDownloaderService) PageFeaturedModels(req dto.FeaturedModelSearch) (*dto.FeaturedModelPage, error) {
|
||||
total, models, err := featuredModelRepo.Page(req.Page, req.PageSize, strings.TrimSpace(req.Family), strings.TrimSpace(req.Info))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items := make([]dto.FeaturedModel, 0, len(models))
|
||||
for _, item := range models {
|
||||
var description map[string]string
|
||||
if err := json.Unmarshal([]byte(item.Description), &description); err != nil {
|
||||
return nil, fmt.Errorf("parse featured model %s description failed: %w", item.Key, err)
|
||||
}
|
||||
items = append(items, dto.FeaturedModel{
|
||||
Key: item.Key, Sort: item.Sort, Family: item.Family, RepoID: item.RepoID, Sources: item.Sources,
|
||||
SourceModelIDs: item.SourceModelIDs,
|
||||
Architecture: item.Architecture, BackboneParams: item.BackboneParams,
|
||||
ActiveParams: item.ActiveParams, Engram: item.Engram, WeightGB: item.WeightGB,
|
||||
Description: description,
|
||||
})
|
||||
}
|
||||
families, err := featuredModelRepo.Families()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &dto.FeaturedModelPage{PageResult: dto.PageResult{Total: total, Items: items}, Families: families}, nil
|
||||
}
|
||||
|
||||
func (m *ModelDownloaderService) SyncFeaturedModels() error {
|
||||
if global.CONF.Base.IsOffline {
|
||||
return nil
|
||||
}
|
||||
featuredModelsSyncMu.Lock()
|
||||
defer featuredModelsSyncMu.Unlock()
|
||||
localVersion, err := settingRepo.GetValueByKey("FeaturedModelsVersion")
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return err
|
||||
}
|
||||
data, version, err := req_helper.LoadAIResource("featured-models", localVersion)
|
||||
if err != nil || data == nil {
|
||||
return err
|
||||
}
|
||||
var remote struct {
|
||||
Models []dto.FeaturedModel `yaml:"models"`
|
||||
}
|
||||
if err := yaml.Unmarshal(data, &remote); err != nil {
|
||||
return fmt.Errorf("parse featured models failed: %w", err)
|
||||
}
|
||||
if len(remote.Models) == 0 {
|
||||
return errors.New("featured models data is empty")
|
||||
}
|
||||
keys := make(map[string]bool, len(remote.Models))
|
||||
models := make([]model.FeaturedModel, 0, len(remote.Models))
|
||||
for i := range remote.Models {
|
||||
item := &remote.Models[i]
|
||||
item.Key = strings.TrimSpace(item.Key)
|
||||
item.Family = strings.TrimSpace(item.Family)
|
||||
item.RepoID = strings.TrimSpace(item.RepoID)
|
||||
if item.Key == "" || item.Family == "" || item.RepoID == "" || (item.Architecture != "MoE" && item.Architecture != "Dense") || item.WeightGB < 0 {
|
||||
return fmt.Errorf("invalid featured model: %s", item.Key)
|
||||
}
|
||||
if keys[item.Key] {
|
||||
return fmt.Errorf("duplicate featured model key: %s", item.Key)
|
||||
}
|
||||
keys[item.Key] = true
|
||||
if len(item.Sources) == 0 {
|
||||
item.Sources = []string{"modelscope"}
|
||||
}
|
||||
for _, source := range item.Sources {
|
||||
if source != "modelscope" && source != "huggingface" {
|
||||
return fmt.Errorf("invalid featured model %s source: %s", item.Key, source)
|
||||
}
|
||||
}
|
||||
description, err := json.Marshal(item.Description)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
models = append(models, model.FeaturedModel{
|
||||
Key: item.Key, Sort: item.Sort, Family: item.Family, RepoID: item.RepoID, Sources: item.Sources,
|
||||
SourceModelIDs: item.SourceModelIDs,
|
||||
Architecture: item.Architecture, BackboneParams: item.BackboneParams,
|
||||
ActiveParams: item.ActiveParams, Engram: item.Engram, WeightGB: item.WeightGB,
|
||||
Description: string(description),
|
||||
})
|
||||
}
|
||||
return featuredModelRepo.SyncAll(models, version)
|
||||
}
|
||||
|
||||
func SyncFeaturedModels() {
|
||||
if global.CONF.Base.IsOffline {
|
||||
return
|
||||
}
|
||||
status, err := settingRepo.GetValueByKey("FeaturedModelsSync")
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
global.LOG.Errorf("load featured model sync setting failed: %v", err)
|
||||
return
|
||||
}
|
||||
if err == nil && status != constant.StatusEnable {
|
||||
return
|
||||
}
|
||||
if err := NewIModelDownloaderService().SyncFeaturedModels(); err != nil {
|
||||
global.LOG.Errorf("sync featured models failed: %v", err)
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,149 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/app/dto"
|
||||
"github.com/1Panel-dev/1Panel/agent/global"
|
||||
"github.com/1Panel-dev/1Panel/agent/utils/files"
|
||||
)
|
||||
|
||||
const tokenizerDownloadMaxSize = 256 << 20
|
||||
|
||||
type tokenizerDownloadMetadata struct {
|
||||
Source string `json:"source"`
|
||||
RepoID string `json:"repoID"`
|
||||
Revision string `json:"revision"`
|
||||
}
|
||||
|
||||
func filterTokenizerDownloadFiles(items []dto.ModelFile) []dto.ModelFile {
|
||||
result := make([]dto.ModelFile, 0)
|
||||
for _, item := range items {
|
||||
name := item.Name
|
||||
if !filepath.IsLocal(name) || strings.ContainsAny(name, "\\\x00\r\n") || filepath.ToSlash(filepath.Clean(name)) != name {
|
||||
continue
|
||||
}
|
||||
if strings.Contains(name, "/") {
|
||||
if strings.HasPrefix(name, "chat_templates/") && strings.HasSuffix(name, ".jinja") {
|
||||
result = append(result, item)
|
||||
}
|
||||
continue
|
||||
}
|
||||
switch name {
|
||||
case "config.json", "tokenizer_config.json", "tokenizer.json", "special_tokens_map.json", "added_tokens.json", "vocab.json", "vocab.txt", "merges.txt", "tekken.json":
|
||||
result = append(result, item)
|
||||
default:
|
||||
if strings.HasSuffix(name, ".model") || strings.HasPrefix(name, "tokenizer.model") || strings.HasSuffix(name, ".tiktoken") || strings.HasSuffix(name, ".py") || strings.HasSuffix(name, ".jinja") {
|
||||
result = append(result, item)
|
||||
}
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func validateTokenizerDownloadFiles(items []dto.ModelFile) error {
|
||||
if len(items) == 0 || len(items) > 512 {
|
||||
return newModelDownloaderInputError("tokenizer must contain between 1 and 512 files")
|
||||
}
|
||||
names := make(map[string]bool, len(items))
|
||||
var size int64
|
||||
vocabulary := false
|
||||
for _, item := range items {
|
||||
if names[item.Name] || item.Size < 0 || item.Size > tokenizerDownloadMaxSize-size {
|
||||
return newModelDownloaderInputError("invalid tokenizer files or total size exceeds 256 MiB")
|
||||
}
|
||||
size += item.Size
|
||||
names[item.Name] = true
|
||||
if item.Name == "tokenizer.json" || item.Name == "tekken.json" || item.Name == "vocab.txt" || strings.HasSuffix(item.Name, ".model") || strings.HasPrefix(item.Name, "tokenizer.model") || strings.HasSuffix(item.Name, ".tiktoken") {
|
||||
vocabulary = true
|
||||
}
|
||||
}
|
||||
if !vocabulary && !(names["vocab.json"] && names["merges.txt"]) {
|
||||
return newModelDownloaderInputError("repository has no supported tokenizer vocabulary in its root directory")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func validateDownloadedTokenizer(root string) error {
|
||||
var items []dto.ModelFile
|
||||
err := filepath.WalkDir(root, func(path string, entry fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if entry.IsDir() {
|
||||
return nil
|
||||
}
|
||||
stat, err := entry.Info()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !stat.Mode().IsRegular() || stat.Size() > tokenizerDownloadMaxSize {
|
||||
return newModelDownloaderInputError("invalid tokenizer file")
|
||||
}
|
||||
name, err := filepath.Rel(root, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
items = append(items, dto.ModelFile{Name: filepath.ToSlash(name), Size: stat.Size()})
|
||||
if strings.HasSuffix(name, ".json") {
|
||||
content, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !json.Valid(content) {
|
||||
return newModelDownloaderInputError("invalid tokenizer JSON: %s", name)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return validateTokenizerDownloadFiles(items)
|
||||
}
|
||||
|
||||
func listDownloadedTokenizers(info string) ([]dto.LocalModelItem, error) {
|
||||
items := make([]dto.LocalModelItem, 0)
|
||||
root := filepath.Join(global.CONF.Base.InstallDir, "1panel/ai/tokenizer")
|
||||
directories, err := listModelDownloadDirectories(root)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, item := range directories {
|
||||
if _, err := normalizeModelDownloaderRepoID(item.Name); err != nil {
|
||||
continue
|
||||
}
|
||||
path, err := filepath.EvalSymlinks(item.Path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
content, err := os.ReadFile(filepath.Join(path, ".1panel-tokenizer"))
|
||||
if os.IsNotExist(err) {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var metadata tokenizerDownloadMetadata
|
||||
if err := json.Unmarshal(content, &metadata); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if info != "" && !strings.Contains(strings.ToLower(metadata.RepoID), strings.ToLower(info)) {
|
||||
continue
|
||||
}
|
||||
stat, err := os.Stat(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
size, err := files.NewFileOp().GetDirSize(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, dto.LocalModelItem{Name: item.Name, Path: path, RepoID: metadata.RepoID, Source: metadata.Source, Revision: metadata.Revision, DownloadType: "tokenizer", Size: size, SizeFormatted: formatBytes(size), CreatedAt: stat.ModTime().Format("2006-01-02 15:04:05")})
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
@@ -8,6 +8,107 @@
|
||||
"formatZH": "更新 Ollama 绑定域名 [domain]",
|
||||
"formatEN": "update Ollama bind domain [domain]"
|
||||
},
|
||||
"/ai/model/downloader/featured/sync/status": {
|
||||
"bodyKeys": [
|
||||
"value"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新推荐模型自动同步 [value]",
|
||||
"formatEN": "update featured model automatic synchronization [value]"
|
||||
},
|
||||
"/ai/model/downloader/hf/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 Hugging Face 模型 [repoID]",
|
||||
"formatEN": "download Hugging Face model [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/local/delete": {
|
||||
"bodyKeys": [
|
||||
"name"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "删除本地模型 [name]",
|
||||
"formatEN": "delete local model [name]"
|
||||
},
|
||||
"/ai/model/downloader/modelscope/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 ModelScope 模型 [repoID]",
|
||||
"formatEN": "download ModelScope model [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/settings": {
|
||||
"bodyKeys": [
|
||||
"modelDir"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新模型下载设置 [modelDir]",
|
||||
"formatEN": "update model downloader settings [modelDir]"
|
||||
},
|
||||
"/ai/model/downloader/tasks/cancel": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "取消模型下载任务 [repoID]",
|
||||
"formatEN": "cancel model download task [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/tasks/remove": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "移除模型下载任务 [repoID]",
|
||||
"formatEN": "remove model download task [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/tasks/retry": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "重试模型下载任务 [repoID]",
|
||||
"formatEN": "retry model download task [repoID]"
|
||||
},
|
||||
"/ai/ollama/close": {
|
||||
"bodyKeys": [
|
||||
"name"
|
||||
@@ -103,27 +204,27 @@
|
||||
"/alert/config/del": {
|
||||
"bodyKeys": [],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "删除告警配置 [name]",
|
||||
"formatEN": "delete alert config [name]",
|
||||
"beforeFunctions": []
|
||||
"formatEN": "delete alert config [name]"
|
||||
},
|
||||
"/alert/config/status": {
|
||||
"bodyKeys": [
|
||||
"status"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新告警配置状态 [name][status]",
|
||||
"formatEN": "update alert config status [name][status]",
|
||||
"beforeFunctions": []
|
||||
"formatEN": "update alert config status [name][status]"
|
||||
},
|
||||
"/alert/config/update": {
|
||||
"bodyKeys": [
|
||||
"displayName"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新告警配置 [displayName]",
|
||||
"formatEN": "update alert config [displayName]",
|
||||
"beforeFunctions": []
|
||||
"formatEN": "update alert config [displayName]"
|
||||
},
|
||||
"/alert/del": {
|
||||
"bodyKeys": [
|
||||
@@ -4971,98 +5072,6 @@
|
||||
"formatZH": "更新离线告警日志 [id]",
|
||||
"formatEN": "update offline alert log [id]"
|
||||
},
|
||||
"/xpack/model/downloader/hf/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 Hugging Face 模型 [repoID]",
|
||||
"formatEN": "download Hugging Face model [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/local/delete": {
|
||||
"bodyKeys": [
|
||||
"name"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "删除本地模型 [name]",
|
||||
"formatEN": "delete local model [name]"
|
||||
},
|
||||
"/xpack/model/downloader/modelscope/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 ModelScope 模型 [repoID]",
|
||||
"formatEN": "download ModelScope model [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/settings": {
|
||||
"bodyKeys": [
|
||||
"modelDir"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新模型下载设置 [modelDir]",
|
||||
"formatEN": "update model downloader settings [modelDir]"
|
||||
},
|
||||
"/xpack/model/downloader/tasks/cancel": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "取消模型下载任务 [repoID]",
|
||||
"formatEN": "cancel model download task [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/tasks/remove": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "移除模型下载任务 [repoID]",
|
||||
"formatEN": "remove model download task [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/tasks/retry": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "重试模型下载任务 [repoID]",
|
||||
"formatEN": "retry model download task [repoID]"
|
||||
},
|
||||
"/xpack/monitor/config/global": {
|
||||
"bodyKeys": [],
|
||||
"paramKeys": [],
|
||||
|
||||
@@ -26,6 +26,12 @@ func Run() {
|
||||
interval model.Setting
|
||||
status model.Setting
|
||||
)
|
||||
if !global.CONF.Base.IsOffline {
|
||||
if _, err := global.Cron.AddFunc("@every 24h", service.SyncFeaturedModels); err != nil {
|
||||
global.LOG.Errorf("add featured model sync job failed: %v", err)
|
||||
}
|
||||
go service.SyncFeaturedModels()
|
||||
}
|
||||
go syncBeforeStart()
|
||||
if err := global.DB.Where("key = ?", "MonitorStatus").Find(&status).Error; err != nil {
|
||||
global.LOG.Errorf("load monitor status from db failed, err: %v", err)
|
||||
|
||||
@@ -10,6 +10,12 @@ import (
|
||||
)
|
||||
|
||||
func Init() {
|
||||
global.LOG.Info("recover interrupted model download tasks start")
|
||||
if err := service.NewIModelDownloaderService().RecoverInterruptedTasks(); err != nil {
|
||||
global.LOG.Warnf("recover interrupted model download tasks failed, err: %v", err)
|
||||
}
|
||||
global.LOG.Info("recover interrupted model download tasks done")
|
||||
|
||||
go syncApp()
|
||||
go syncInstalledApp()
|
||||
go syncRuntime()
|
||||
|
||||
@@ -121,6 +121,7 @@ func agentDBMigrations() []*gormigrate.Migration {
|
||||
migrations.AddOllamaModelAccountSync,
|
||||
migrations.AddContainerImageCheckUpdates,
|
||||
migrations.AddModelQuickJump,
|
||||
migrations.MigrateModelDownloader,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
package migrations
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/app/model"
|
||||
"github.com/1Panel-dev/1Panel/agent/global"
|
||||
"github.com/glebarez/sqlite"
|
||||
"github.com/go-gormigrate/gormigrate/v2"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
)
|
||||
|
||||
var MigrateModelDownloader = &gormigrate.Migration{
|
||||
ID: "20261102-migrate-model-downloader",
|
||||
Migrate: func(db *gorm.DB) error {
|
||||
return migrateModelDownloader(db, filepath.Join(global.Dir.DbDir, "xpack.db"))
|
||||
},
|
||||
}
|
||||
|
||||
func migrateModelDownloader(db *gorm.DB, legacyPath string) error {
|
||||
var legacy *gorm.DB
|
||||
if _, err := os.Stat(legacyPath); err == nil {
|
||||
source := url.URL{Scheme: "file", Path: legacyPath, RawQuery: "mode=ro"}
|
||||
legacy, err = gorm.Open(sqlite.Open(source.String()), &gorm.Config{DisableForeignKeyConstraintWhenMigrating: true})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
sqlDB, err := legacy.DB()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer sqlDB.Close()
|
||||
} else if !errors.Is(err, os.ErrNotExist) {
|
||||
return err
|
||||
}
|
||||
return db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.AutoMigrate(&model.ModelDownloadTask{}, &model.FeaturedModel{}); err != nil {
|
||||
return err
|
||||
}
|
||||
resetVersion := false
|
||||
if legacy != nil {
|
||||
if legacy.Migrator().HasTable(&model.ModelDownloadTask{}) {
|
||||
var tasks []model.ModelDownloadTask
|
||||
if err := legacy.FindInBatches(&tasks, 100, func(_ *gorm.DB, _ int) error {
|
||||
for i := range tasks {
|
||||
if tasks[i].DownloadType == "" {
|
||||
tasks[i].DownloadType = "all"
|
||||
}
|
||||
}
|
||||
return tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&tasks).Error
|
||||
}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if legacy.Migrator().HasTable(&model.FeaturedModel{}) {
|
||||
resetVersion = !legacy.Migrator().HasColumn(&model.FeaturedModel{}, "Sources") || !legacy.Migrator().HasColumn(&model.FeaturedModel{}, "SourceModelIDs")
|
||||
var models []model.FeaturedModel
|
||||
if err := legacy.FindInBatches(&models, 100, func(_ *gorm.DB, _ int) error {
|
||||
for i := range models {
|
||||
if len(models[i].Sources) == 0 {
|
||||
models[i].Sources = []string{"modelscope"}
|
||||
}
|
||||
}
|
||||
return tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&models).Error
|
||||
}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
resetVersion = true
|
||||
}
|
||||
if legacy.Migrator().HasTable("agent_settings") {
|
||||
var settings []model.Setting
|
||||
keys := []string{"ModelDownloaderDir", "ModelDownloaderHFEndpoint", "ModelDownloaderHFToken", "ModelDownloaderModelScopeEndpoint", "ModelDownloaderModelScopeToken", "FeaturedModelsSync", "FeaturedModelsVersion"}
|
||||
if err := legacy.Table("agent_settings").Where("key IN ?", keys).Find(&settings).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, setting := range settings {
|
||||
if setting.Key == "FeaturedModelsVersion" && resetVersion {
|
||||
setting.Value = ""
|
||||
}
|
||||
if err := tx.Where("key = ?", setting.Key).FirstOrCreate(&model.Setting{Key: setting.Key, Value: setting.Value, About: setting.About}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
var count int64
|
||||
if err := tx.Model(&model.FeaturedModel{}).Count(&count).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if count > 0 {
|
||||
return nil
|
||||
}
|
||||
if err := tx.Model(&model.Setting{}).Where("key = ?", "FeaturedModelsVersion").Update("value", "").Error; err != nil {
|
||||
return err
|
||||
}
|
||||
models := []model.FeaturedModel{
|
||||
{Family: "Qwen", RepoID: "Qwen/Qwen3.6-35B-A3B", Architecture: "MoE", BackboneParams: "35B", ActiveParams: "3B", Engram: "N/A", WeightGB: 67},
|
||||
{Family: "Qwen", RepoID: "Qwen/Qwen3.6-35B-A3B-FP8", Architecture: "MoE", BackboneParams: "35B", ActiveParams: "3B", Engram: "N/A", WeightGB: 35},
|
||||
{Family: "Qwen", RepoID: "nvidia/Qwen3.6-35B-A3B-NVFP4", Architecture: "MoE", BackboneParams: "35B", ActiveParams: "3B", Engram: "N/A", WeightGB: 22},
|
||||
{Family: "Qwen", RepoID: "Qwen/Qwen3.8-27B", Architecture: "Dense", BackboneParams: "N/A", ActiveParams: "N/A", Engram: "N/A", WeightGB: 55},
|
||||
{Family: "Qwen", RepoID: "Qwen/Qwen3.8-27B-FP8", Architecture: "Dense", BackboneParams: "N/A", ActiveParams: "N/A", Engram: "N/A", WeightGB: 28},
|
||||
{Family: "Qwen", RepoID: "nvidia/Qwen3.8-27B-NVFP4", Architecture: "Dense", BackboneParams: "N/A", ActiveParams: "N/A", Engram: "N/A", WeightGB: 22},
|
||||
{Family: "Qwen", RepoID: "Qwen/Qwen3.8-Flash-Next", Architecture: "MoE", BackboneParams: "125B", ActiveParams: "6B", Engram: "51B", WeightGB: 335},
|
||||
{Family: "Qwen", RepoID: "Qwen/Qwen3.8-Flash-Next-FP8", Architecture: "MoE", BackboneParams: "125B", ActiveParams: "6B", Engram: "51B", WeightGB: 172},
|
||||
{Family: "Qwen", RepoID: "nvidia/Qwen3.8-Flash-Next-FP4-Local", Architecture: "MoE", BackboneParams: "125B", ActiveParams: "6B", Engram: "51B", WeightGB: 130},
|
||||
{Family: "DeepSeek", RepoID: "deepseek-ai/DeepSeek-V4-Flash-0731", Architecture: "MoE", BackboneParams: "284B", ActiveParams: "13B", Engram: "N/A", WeightGB: 167},
|
||||
{Family: "DeepSeek", RepoID: "deepseek-ai/DeepSeek-V4-Flash-Vision-Exp", Architecture: "MoE", BackboneParams: "305B", ActiveParams: "undisclosed", Engram: "N/A", WeightGB: 167},
|
||||
{Family: "DeepSeek", RepoID: "deepseek-ai/DeepSeek-V4.1-Flash-1017", Architecture: "MoE", BackboneParams: "552B", ActiveParams: "8B/16B", Engram: "196B", WeightGB: 510},
|
||||
{Family: "GLM", RepoID: "zai-org/GLM-5.3-Flash", Architecture: "MoE", BackboneParams: "320B", ActiveParams: "18B", Engram: "N/A", WeightGB: 306},
|
||||
{Family: "GLM", RepoID: "nvidia/GLM-5.3-Flash-FP4-Local", Architecture: "MoE", BackboneParams: "320B", ActiveParams: "18B", Engram: "N/A", WeightGB: 185},
|
||||
}
|
||||
for i := range models {
|
||||
models[i].Key = models[i].RepoID
|
||||
models[i].Sort = i + 1
|
||||
models[i].Description = "{}"
|
||||
models[i].Sources = []string{"modelscope"}
|
||||
}
|
||||
return tx.Create(&models).Error
|
||||
})
|
||||
}
|
||||
@@ -60,6 +60,9 @@ func OperationResolveMeta() gin.HandlerFunc {
|
||||
return
|
||||
}
|
||||
reqPath := strings.TrimPrefix(c.Request.URL.Path, "/api/v2")
|
||||
if strings.HasPrefix(reqPath, "/xpack/model/downloader/") {
|
||||
reqPath = strings.Replace(reqPath, "/xpack/model/downloader/", "/ai/model/downloader/", 1)
|
||||
}
|
||||
meta, ok := metaMap[reqPath]
|
||||
if !ok || len(meta.BeforeFunctions) == 0 {
|
||||
c.Next()
|
||||
|
||||
@@ -23,6 +23,7 @@ func commonGroups() []CommonRouter {
|
||||
&ProcessRouter{},
|
||||
&WebsiteCARouter{},
|
||||
&AIToolsRouter{},
|
||||
&ModelDownloaderRouter{},
|
||||
&GroupRouter{},
|
||||
&AlertRouter{},
|
||||
&RuntimeDiagnosticsRouter{},
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package router
|
||||
|
||||
import (
|
||||
v2 "github.com/1Panel-dev/1Panel/agent/app/api/v2"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
type ModelDownloaderRouter struct{}
|
||||
|
||||
func (m *ModelDownloaderRouter) InitRouter(Router *gin.RouterGroup) {
|
||||
baseApi := v2.ApiGroupApp.BaseApi
|
||||
for _, prefix := range []string{"ai/model/downloader", "xpack/model/downloader"} {
|
||||
router := Router.Group(prefix)
|
||||
router.POST("/featured/search", baseApi.PageFeaturedModels)
|
||||
router.POST("/featured/sync", baseApi.SyncFeaturedModels)
|
||||
router.POST("/featured/sync/status", baseApi.UpdateFeaturedModelsSync)
|
||||
router.POST("/hf/search", baseApi.SearchHFModels)
|
||||
router.POST("/hf/info", baseApi.GetHFModelInfo)
|
||||
router.POST("/hf/download", baseApi.StartHFModelDownload)
|
||||
router.POST("/modelscope/search", baseApi.SearchModelScopeModels)
|
||||
router.POST("/modelscope/info", baseApi.GetModelScopeModelInfo)
|
||||
router.POST("/modelscope/download", baseApi.StartModelScopeModelDownload)
|
||||
router.GET("/settings", baseApi.GetModelDownloaderSettings)
|
||||
router.POST("/settings", baseApi.UpdateModelDownloaderSettings)
|
||||
router.POST("/tasks/search", baseApi.PageModelDownloadTasks)
|
||||
router.POST("/tasks/cancel", baseApi.CancelModelDownloadTask)
|
||||
router.POST("/tasks/retry", baseApi.RetryModelDownloadTask)
|
||||
router.POST("/tasks/remove", baseApi.RemoveModelDownloadTask)
|
||||
router.POST("/local/search", baseApi.PageLocalDownloadedModels)
|
||||
router.POST("/local/delete", baseApi.DeleteLocalDownloadedModel)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package req_helper
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/constant"
|
||||
"github.com/1Panel-dev/1Panel/agent/global"
|
||||
)
|
||||
|
||||
func LoadAIResource(directory, localVersion string) ([]byte, string, error) {
|
||||
baseURL := fmt.Sprintf("%s/%s", global.ResourceURL(), directory)
|
||||
versionURL := fmt.Sprintf("%s/version.txt?t=%d", baseURL, time.Now().UnixNano())
|
||||
_, versionData, err := HandleRequest(versionURL, http.MethodGet, constant.TimeOut20s)
|
||||
if err != nil {
|
||||
return nil, "", fmt.Errorf("load %s version failed: %w", directory, err)
|
||||
}
|
||||
version := strings.TrimSpace(string(versionData))
|
||||
if version == "" {
|
||||
return nil, "", errors.New("remote resource version is empty")
|
||||
}
|
||||
if version == strings.TrimSpace(localVersion) {
|
||||
return nil, version, nil
|
||||
}
|
||||
_, data, err := HandleRequest(baseURL+"/data.yaml?version="+url.QueryEscape(version), http.MethodGet, constant.TimeOut20s)
|
||||
if err != nil {
|
||||
return nil, "", fmt.Errorf("load %s data.yaml failed: %w", directory, err)
|
||||
}
|
||||
return data, version, nil
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+107
-98
@@ -8,6 +8,107 @@
|
||||
"formatZH": "更新 Ollama 绑定域名 [domain]",
|
||||
"formatEN": "update Ollama bind domain [domain]"
|
||||
},
|
||||
"/ai/model/downloader/featured/sync/status": {
|
||||
"bodyKeys": [
|
||||
"value"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新推荐模型自动同步 [value]",
|
||||
"formatEN": "update featured model automatic synchronization [value]"
|
||||
},
|
||||
"/ai/model/downloader/hf/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 Hugging Face 模型 [repoID]",
|
||||
"formatEN": "download Hugging Face model [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/local/delete": {
|
||||
"bodyKeys": [
|
||||
"name"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "删除本地模型 [name]",
|
||||
"formatEN": "delete local model [name]"
|
||||
},
|
||||
"/ai/model/downloader/modelscope/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 ModelScope 模型 [repoID]",
|
||||
"formatEN": "download ModelScope model [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/settings": {
|
||||
"bodyKeys": [
|
||||
"modelDir"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新模型下载设置 [modelDir]",
|
||||
"formatEN": "update model downloader settings [modelDir]"
|
||||
},
|
||||
"/ai/model/downloader/tasks/cancel": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "取消模型下载任务 [repoID]",
|
||||
"formatEN": "cancel model download task [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/tasks/remove": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "移除模型下载任务 [repoID]",
|
||||
"formatEN": "remove model download task [repoID]"
|
||||
},
|
||||
"/ai/model/downloader/tasks/retry": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "重试模型下载任务 [repoID]",
|
||||
"formatEN": "retry model download task [repoID]"
|
||||
},
|
||||
"/ai/ollama/close": {
|
||||
"bodyKeys": [
|
||||
"name"
|
||||
@@ -103,27 +204,27 @@
|
||||
"/alert/config/del": {
|
||||
"bodyKeys": [],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "删除告警配置 [name]",
|
||||
"formatEN": "delete alert config [name]",
|
||||
"beforeFunctions": []
|
||||
"formatEN": "delete alert config [name]"
|
||||
},
|
||||
"/alert/config/status": {
|
||||
"bodyKeys": [
|
||||
"status"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新告警配置状态 [name][status]",
|
||||
"formatEN": "update alert config status [name][status]",
|
||||
"beforeFunctions": []
|
||||
"formatEN": "update alert config status [name][status]"
|
||||
},
|
||||
"/alert/config/update": {
|
||||
"bodyKeys": [
|
||||
"displayName"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新告警配置 [displayName]",
|
||||
"formatEN": "update alert config [displayName]",
|
||||
"beforeFunctions": []
|
||||
"formatEN": "update alert config [displayName]"
|
||||
},
|
||||
"/alert/del": {
|
||||
"bodyKeys": [
|
||||
@@ -4971,98 +5072,6 @@
|
||||
"formatZH": "更新离线告警日志 [id]",
|
||||
"formatEN": "update offline alert log [id]"
|
||||
},
|
||||
"/xpack/model/downloader/hf/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 Hugging Face 模型 [repoID]",
|
||||
"formatEN": "download Hugging Face model [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/local/delete": {
|
||||
"bodyKeys": [
|
||||
"name"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "删除本地模型 [name]",
|
||||
"formatEN": "delete local model [name]"
|
||||
},
|
||||
"/xpack/model/downloader/modelscope/download": {
|
||||
"bodyKeys": [
|
||||
"repoID",
|
||||
"revision"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "下载 ModelScope 模型 [repoID]",
|
||||
"formatEN": "download ModelScope model [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/settings": {
|
||||
"bodyKeys": [
|
||||
"modelDir"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [],
|
||||
"formatZH": "更新模型下载设置 [modelDir]",
|
||||
"formatEN": "update model downloader settings [modelDir]"
|
||||
},
|
||||
"/xpack/model/downloader/tasks/cancel": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "取消模型下载任务 [repoID]",
|
||||
"formatEN": "cancel model download task [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/tasks/remove": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "移除模型下载任务 [repoID]",
|
||||
"formatEN": "remove model download task [repoID]"
|
||||
},
|
||||
"/xpack/model/downloader/tasks/retry": {
|
||||
"bodyKeys": [
|
||||
"id"
|
||||
],
|
||||
"paramKeys": [],
|
||||
"beforeFunctions": [
|
||||
{
|
||||
"input_column": "id",
|
||||
"input_value": "id",
|
||||
"isList": false,
|
||||
"db": "model_download_tasks",
|
||||
"output_column": "repo_id",
|
||||
"output_value": "repoID"
|
||||
}
|
||||
],
|
||||
"formatZH": "重试模型下载任务 [repoID]",
|
||||
"formatEN": "retry model download task [repoID]"
|
||||
},
|
||||
"/xpack/monitor/config/global": {
|
||||
"bodyKeys": [],
|
||||
"paramKeys": [],
|
||||
|
||||
@@ -331,6 +331,9 @@ func loadLogInfo(path string) string {
|
||||
func normalizeOperationPath(reqPath string) string {
|
||||
pathItem := strings.TrimPrefix(reqPath, "/api/v2")
|
||||
pathItem = strings.TrimPrefix(pathItem, "/api/v2/core")
|
||||
if strings.HasPrefix(pathItem, "/xpack/model/downloader/") {
|
||||
pathItem = strings.Replace(pathItem, "/xpack/model/downloader/", "/ai/model/downloader/", 1)
|
||||
}
|
||||
return pathItem
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
import { ReqPage, ResPage } from '@/api/interface';
|
||||
|
||||
export namespace ModelDownloader {
|
||||
export interface FeaturedModelSearch extends ReqPage {
|
||||
family: string;
|
||||
info: string;
|
||||
}
|
||||
|
||||
export interface FeaturedModelPage extends ResPage<FeaturedModel> {
|
||||
families: string[];
|
||||
}
|
||||
|
||||
export interface FeaturedModel {
|
||||
description: Record<string, string> | null;
|
||||
family: string;
|
||||
repoID: string;
|
||||
sources: Source[];
|
||||
sourceModelIds?: Partial<Record<Source, string>> | null;
|
||||
architecture: 'MoE' | 'Dense';
|
||||
backboneParams: string;
|
||||
activeParams: string;
|
||||
engram: string;
|
||||
weightGB: number;
|
||||
}
|
||||
|
||||
export type Source = 'huggingface' | 'modelscope';
|
||||
export type DownloadType = 'all' | 'tokenizer';
|
||||
|
||||
export interface ModelSearch extends Partial<ReqPage> {
|
||||
query: string;
|
||||
sort: 'trending' | 'downloads' | 'updated' | 'created' | 'likes' | 'most_params' | 'least_params';
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
export interface ModelInfoReq {
|
||||
repoID: string;
|
||||
revision?: string;
|
||||
}
|
||||
|
||||
export interface ModelDownload {
|
||||
downloadType?: DownloadType;
|
||||
repoID: string;
|
||||
revision?: string;
|
||||
}
|
||||
|
||||
export interface Setting {
|
||||
featuredModelsSync?: 'Enable' | 'Disable';
|
||||
modelDir: string;
|
||||
hfEndpoint: string;
|
||||
hfToken: string;
|
||||
modelScopeEndpoint: string;
|
||||
modelScopeToken: string;
|
||||
}
|
||||
|
||||
export interface ModelItem {
|
||||
repoID: string;
|
||||
name: string;
|
||||
downloads: number;
|
||||
likes: number;
|
||||
size: number;
|
||||
sizeFormatted: string;
|
||||
}
|
||||
|
||||
export interface ModelFile {
|
||||
name: string;
|
||||
size: number;
|
||||
sizeFormatted: string;
|
||||
}
|
||||
|
||||
export interface ModelInfo extends ModelItem {
|
||||
modelCard: string;
|
||||
files: ModelFile[];
|
||||
}
|
||||
|
||||
export interface TaskSearch extends ReqPage {
|
||||
includeLocal?: boolean;
|
||||
downloadType?: DownloadType | '';
|
||||
info: string;
|
||||
status: string;
|
||||
}
|
||||
|
||||
export interface TaskOperate {
|
||||
withFile?: boolean;
|
||||
id: number;
|
||||
}
|
||||
|
||||
export interface TaskRetry {
|
||||
id: number;
|
||||
}
|
||||
|
||||
export interface TaskItem {
|
||||
localModel?: LocalModelItem;
|
||||
downloadType: DownloadType;
|
||||
id: number;
|
||||
source: string;
|
||||
repoID: string;
|
||||
revision: string;
|
||||
modelName: string;
|
||||
targetDir: string;
|
||||
status: string;
|
||||
progress: number;
|
||||
totalSize: number;
|
||||
downloadedSize: number;
|
||||
errorMessage: string;
|
||||
createdAt: string;
|
||||
startedAt: string;
|
||||
completedAt: string;
|
||||
canCancel: boolean;
|
||||
canRetry: boolean;
|
||||
canRemoveRecord: boolean;
|
||||
}
|
||||
|
||||
export interface LocalModelSearch extends ReqPage {
|
||||
downloadType?: DownloadType | '';
|
||||
info: string;
|
||||
}
|
||||
|
||||
export interface LocalModelItem {
|
||||
downloadType: DownloadType;
|
||||
repoID: string;
|
||||
source: Source;
|
||||
revision: string;
|
||||
name: string;
|
||||
path: string;
|
||||
size: number;
|
||||
sizeFormatted: string;
|
||||
createdAt: string;
|
||||
}
|
||||
|
||||
export interface LocalModelDelete {
|
||||
withFile?: boolean;
|
||||
downloadType?: DownloadType;
|
||||
name: string;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
import http from '@/api';
|
||||
import { ResPage } from '@/api/interface';
|
||||
import { ModelDownloader } from '@/api/interface/model-downloader';
|
||||
import { TimeoutEnum } from '@/enums/http-enum';
|
||||
|
||||
export const searchHFModels = (req: ModelDownloader.ModelSearch) => {
|
||||
return http.post<ResPage<ModelDownloader.ModelItem>>('/ai/model/downloader/hf/search', req, TimeoutEnum.T_40S);
|
||||
};
|
||||
|
||||
export const getHFModelInfo = (req: ModelDownloader.ModelInfoReq) => {
|
||||
return http.post<ModelDownloader.ModelInfo>('/ai/model/downloader/hf/info', req, TimeoutEnum.T_40S);
|
||||
};
|
||||
|
||||
export const startHFModelDownload = (req: ModelDownloader.ModelDownload) => {
|
||||
return http.post<ModelDownloader.TaskItem>('/ai/model/downloader/hf/download', req, TimeoutEnum.T_40S);
|
||||
};
|
||||
|
||||
export const searchModelScopeModels = (req: ModelDownloader.ModelSearch) => {
|
||||
return http.post<ResPage<ModelDownloader.ModelItem>>(
|
||||
'/ai/model/downloader/modelscope/search',
|
||||
req,
|
||||
TimeoutEnum.T_40S,
|
||||
);
|
||||
};
|
||||
|
||||
export const getModelScopeModelInfo = (req: ModelDownloader.ModelInfoReq) => {
|
||||
return http.post<ModelDownloader.ModelInfo>('/ai/model/downloader/modelscope/info', req, TimeoutEnum.T_40S);
|
||||
};
|
||||
|
||||
export const startModelScopeModelDownload = (req: ModelDownloader.ModelDownload) => {
|
||||
return http.post<ModelDownloader.TaskItem>('/ai/model/downloader/modelscope/download', req, TimeoutEnum.T_40S);
|
||||
};
|
||||
|
||||
export const getModelDownloaderSettings = () => {
|
||||
return http.get<ModelDownloader.Setting>('/ai/model/downloader/settings');
|
||||
};
|
||||
|
||||
export const updateModelDownloaderSettings = (req: ModelDownloader.Setting) => {
|
||||
return http.post('/ai/model/downloader/settings', req);
|
||||
};
|
||||
|
||||
export const pageModelDownloadTasks = (req: ModelDownloader.TaskSearch) => {
|
||||
return http.post<ResPage<ModelDownloader.TaskItem>>('/ai/model/downloader/tasks/search', req);
|
||||
};
|
||||
|
||||
export const cancelModelDownloadTask = (req: ModelDownloader.TaskOperate) => {
|
||||
return http.post('/ai/model/downloader/tasks/cancel', req);
|
||||
};
|
||||
|
||||
export const retryModelDownloadTask = (req: ModelDownloader.TaskRetry) => {
|
||||
return http.post<ModelDownloader.TaskItem>('/ai/model/downloader/tasks/retry', req);
|
||||
};
|
||||
|
||||
export const removeModelDownloadTask = (req: ModelDownloader.TaskOperate) => {
|
||||
return http.post('/ai/model/downloader/tasks/remove', req);
|
||||
};
|
||||
|
||||
export const pageLocalDownloadedModels = (req: ModelDownloader.LocalModelSearch) => {
|
||||
return http.post<ResPage<ModelDownloader.LocalModelItem>>('/ai/model/downloader/local/search', req);
|
||||
};
|
||||
|
||||
export const deleteLocalDownloadedModel = (req: ModelDownloader.LocalModelDelete) => {
|
||||
return http.post('/ai/model/downloader/local/delete', req);
|
||||
};
|
||||
|
||||
export const syncFeaturedModels = () => {
|
||||
return http.post('/ai/model/downloader/featured/sync', {}, TimeoutEnum.T_60S);
|
||||
};
|
||||
|
||||
export const pageFeaturedModels = (req: ModelDownloader.FeaturedModelSearch) => {
|
||||
return http.post<ModelDownloader.FeaturedModelPage>('/ai/model/downloader/featured/search', req);
|
||||
};
|
||||
|
||||
export const updateFeaturedModelsSync = (value: string) => {
|
||||
return http.post('/ai/model/downloader/featured/sync/status', { value });
|
||||
};
|
||||
@@ -31,15 +31,8 @@ const clearLoginStatus = () => {
|
||||
};
|
||||
|
||||
router.beforeEach(async (to, from) => {
|
||||
const {
|
||||
entrance,
|
||||
isEnterprise,
|
||||
isEnterpriseLicenseLoaded,
|
||||
isEnterpriseLicensed,
|
||||
isProductPro,
|
||||
isLogin,
|
||||
isOnRestart,
|
||||
} = useGlobalStore();
|
||||
const { entrance, isEnterprise, isEnterpriseLicenseLoaded, isEnterpriseLicensed, isLogin, isOnRestart } =
|
||||
useGlobalStore();
|
||||
NProgress.start();
|
||||
axiosCanceler.removeAllPending();
|
||||
|
||||
@@ -121,6 +114,7 @@ router.beforeEach(async (to, from) => {
|
||||
const cachedRoute = readPanelCache<string>('tabs', activeMenuKey);
|
||||
if (
|
||||
to.meta.activeMenu &&
|
||||
to.name !== 'ModelFiles' &&
|
||||
to.meta.activeMenu != from.meta.activeMenu &&
|
||||
typeof cachedRoute === 'string' &&
|
||||
cachedRoute &&
|
||||
@@ -140,23 +134,6 @@ router.beforeEach(async (to, from) => {
|
||||
removePanelCache('tabs', activeMenuKey);
|
||||
}
|
||||
|
||||
if (to.name === 'ModelFiles') {
|
||||
if (!isEnterprise.value) {
|
||||
try {
|
||||
await loadProductProFromDB();
|
||||
} catch (error) {
|
||||
console.warn('Failed to refresh model marketplace license status', error);
|
||||
}
|
||||
}
|
||||
if (!isProductPro.value) {
|
||||
if (cachedRoute === to.path) {
|
||||
removePanelCache('tabs', activeMenuKey);
|
||||
}
|
||||
NProgress.done();
|
||||
return { path: '/ai/model/account', query: to.query, replace: true };
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasRouteAccess(to)) {
|
||||
MsgError(i18n.global.t('commons.res.forbidden'));
|
||||
NProgress.done();
|
||||
|
||||
@@ -1,14 +1,7 @@
|
||||
<template>
|
||||
<div class="model-page">
|
||||
<RouterButton :buttons="tabs" />
|
||||
<component
|
||||
:is="downloaderView"
|
||||
v-if="isFiles && downloaderView"
|
||||
@deploy="(modelDir) => createRef.open('vllm', modelDir)"
|
||||
/>
|
||||
<LayoutContent v-else-if="isFiles">
|
||||
<template #main><el-empty :description="$t('license.levelUpPro')" /></template>
|
||||
</LayoutContent>
|
||||
<component :is="downloaderView" v-if="isFiles" @deploy="(modelDir) => createRef.open('vllm', modelDir)" />
|
||||
<template v-else>
|
||||
<LayoutContent v-loading="loading">
|
||||
<template #leftToolBar>
|
||||
@@ -384,7 +377,6 @@ import type { FuTableColumnConfig } from '@/components/table/shared';
|
||||
import { deleteAgentAccount, getAgentProviders, pageAgentAccounts, operateTensorRTLLM } from '@/api/modules/ai';
|
||||
import { useGlobalStore } from '@/composables/useGlobalStore';
|
||||
import { getAgentProviderDisplayName, isAgentAccountVerificationSkipped } from '@/utils/agent';
|
||||
import { loadOptionalComponent } from '@/extensions/optional';
|
||||
import i18n from '@/lang';
|
||||
import { appInstalledDeleteCheck, installedOp, searchAppInstalled } from '@/api/modules/app';
|
||||
import { hasPermission } from '@/utils/rbac';
|
||||
@@ -425,10 +417,7 @@ const tabs = computed(() => [
|
||||
{ label: i18n.global.t('aiTools.model.services'), path: '/ai/model/account' },
|
||||
{ label: i18n.global.t('aiTools.model.engines'), path: '/ai/model/local' },
|
||||
]);
|
||||
const downloaderModules = import.meta.glob('/src/xpack/views/model-downloader/index.vue');
|
||||
const downloaderView = Object.keys(downloaderModules).length
|
||||
? defineAsyncComponent(() => loadOptionalComponent('/src/xpack/views/model-downloader/index.vue'))
|
||||
: null;
|
||||
const downloaderView = defineAsyncComponent(() => import('@/views/model-downloader/index.vue'));
|
||||
const createRef = ref();
|
||||
const manageRef = ref();
|
||||
const upgradeRef = ref();
|
||||
|
||||
@@ -93,6 +93,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { getModelDownloaderSettings } from '@/api/modules/model-downloader';
|
||||
import { expandInvalidFormSection } from '@/views/ai/model/components/form-section';
|
||||
const props = defineProps({ inline: Boolean });
|
||||
import NodeConfig from '@/views/website/runtime//components/node-config.vue';
|
||||
@@ -108,7 +109,7 @@ import { ElForm, FormInstance } from 'element-plus';
|
||||
import { createTensorRTLLM, updateTensorRTLLM } from '@/api/modules/ai';
|
||||
import { newUUID } from '@/utils/id';
|
||||
import { useGlobalStore } from '@/composables/useGlobalStore';
|
||||
const { isFxplay, isMobile, isProductPro } = useGlobalStore();
|
||||
const { isFxplay, isMobile } = useGlobalStore();
|
||||
|
||||
const loading = ref(false);
|
||||
const gpuRef = ref<InstanceType<typeof GPUConfig>>();
|
||||
@@ -194,20 +195,13 @@ const handleClose = () => {
|
||||
emit('close');
|
||||
};
|
||||
|
||||
const downloaderModules = import.meta.glob<{
|
||||
getModelDownloaderSettings: () => Promise<{ data: { modelDir: string } }>;
|
||||
}>('/src/xpack/api/modules/model-downloader.ts');
|
||||
const selectModelDir = async () => {
|
||||
let path = tensorRTLLM.value.modelDir;
|
||||
const loadDownloader = Object.values(downloaderModules)[0];
|
||||
if (isProductPro.value && loadDownloader) {
|
||||
try {
|
||||
const { getModelDownloaderSettings } = await loadDownloader();
|
||||
const { data } = await getModelDownloaderSettings();
|
||||
path = data.modelDir;
|
||||
} catch {
|
||||
path = '/';
|
||||
}
|
||||
try {
|
||||
const { data } = await getModelDownloaderSettings();
|
||||
path = data.modelDir;
|
||||
} catch {
|
||||
path = '/';
|
||||
}
|
||||
modelDirRef.value.acceptParams({ dir: true, path });
|
||||
};
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
<template>
|
||||
<DialogPro
|
||||
v-model="open"
|
||||
:title="$t('commons.button.delete') + ' - ' + name"
|
||||
size="small"
|
||||
:show-close="!loading"
|
||||
:close-on-press-escape="!loading"
|
||||
>
|
||||
<el-form v-loading="loading" @submit.prevent="submit">
|
||||
<el-form-item>
|
||||
<el-checkbox
|
||||
v-model="withFile"
|
||||
:label="$t('modelDownloadExtra.deleteFiles', [contentLabel])"
|
||||
:disabled="loading || fileOnly"
|
||||
/>
|
||||
<span class="input-help break-all">
|
||||
{{
|
||||
$t('modelDownloadExtra.deleteFilesPath', [
|
||||
contentLabel,
|
||||
item && ('id' in item ? item.targetDir : item.path),
|
||||
])
|
||||
}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<div class="text-xs break-all">
|
||||
<span>{{ $t('commons.msg.operateConfirm') }}</span>
|
||||
<span class="text-red-500 font-medium">{{ name }}</span>
|
||||
</div>
|
||||
<el-input v-model="deleteInfo" :placeholder="name" :disabled="loading" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button :disabled="loading" @click="open = false">{{ $t('commons.button.cancel') }}</el-button>
|
||||
<el-button type="primary" :loading="loading" :disabled="deleteInfo !== name || loading" @click="submit">
|
||||
{{ $t('commons.button.confirm') }}
|
||||
</el-button>
|
||||
</template>
|
||||
</DialogPro>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue';
|
||||
import type { ModelDownloader } from '@/api/interface/model-downloader';
|
||||
import { deleteLocalDownloadedModel, removeModelDownloadTask } from '@/api/modules/model-downloader';
|
||||
import { MsgSuccess } from '@/utils/message';
|
||||
import i18n from '@/lang';
|
||||
|
||||
const emit = defineEmits<{ search: [] }>();
|
||||
const open = ref(false);
|
||||
const loading = ref(false);
|
||||
const withFile = ref(false);
|
||||
const deleteInfo = ref('');
|
||||
const item = ref<ModelDownloader.TaskItem | ModelDownloader.LocalModelItem>();
|
||||
const name = computed(() => item.value?.repoID || (item.value && 'name' in item.value ? item.value.name : ''));
|
||||
const contentLabel = computed(() =>
|
||||
i18n.global.t(item.value?.downloadType === 'tokenizer' ? 'aiTools.benchmark.tokenizer' : 'aiTools.model.model'),
|
||||
);
|
||||
const fileOnly = computed(() => item.value?.downloadType === 'all' && !('id' in item.value));
|
||||
|
||||
const acceptParams = (row: ModelDownloader.TaskItem | ModelDownloader.LocalModelItem) => {
|
||||
item.value = row;
|
||||
withFile.value = fileOnly.value;
|
||||
deleteInfo.value = '';
|
||||
open.value = true;
|
||||
};
|
||||
|
||||
const submit = async () => {
|
||||
if (!item.value || deleteInfo.value !== name.value || loading.value) return;
|
||||
loading.value = true;
|
||||
try {
|
||||
if ('id' in item.value) {
|
||||
await removeModelDownloadTask({ id: item.value.id, withFile: withFile.value });
|
||||
} else {
|
||||
await deleteLocalDownloadedModel({
|
||||
name: item.value.name,
|
||||
downloadType: item.value.downloadType,
|
||||
withFile: withFile.value,
|
||||
});
|
||||
}
|
||||
open.value = false;
|
||||
MsgSuccess(i18n.global.t('commons.msg.deleteSuccess'));
|
||||
emit('search');
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
defineExpose({ acceptParams });
|
||||
</script>
|
||||
@@ -0,0 +1,107 @@
|
||||
<template>
|
||||
<DialogPro
|
||||
v-model="open"
|
||||
:title="
|
||||
$t(
|
||||
form.downloadType === 'tokenizer'
|
||||
? 'modelDownloadExtra.downloadTokenizer'
|
||||
: 'modelDownloadExtra.downloadModel',
|
||||
)
|
||||
"
|
||||
size="small"
|
||||
:show-close="!loading"
|
||||
:close-on-press-escape="!loading"
|
||||
>
|
||||
<el-form label-position="top" @submit.prevent="submit">
|
||||
<el-form-item :label="$t('aiTools.model.modelName')">
|
||||
<div class="download-repo">{{ downloadRepoID }}</div>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('aiTools.model.modelSource')">
|
||||
<SourceSelect v-model="form.source" :sources="sources" :disabled="loading" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button :disabled="loading" @click="open = false">{{ $t('commons.button.cancel') }}</el-button>
|
||||
<el-button type="primary" :loading="loading" :disabled="loading" @click="submit">
|
||||
{{ $t('commons.button.confirm') }}
|
||||
</el-button>
|
||||
</template>
|
||||
</DialogPro>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch } from 'vue';
|
||||
import type { ModelDownloader } from '@/api/interface/model-downloader';
|
||||
import { startHFModelDownload, startModelScopeModelDownload } from '@/api/modules/model-downloader';
|
||||
import { useGlobalStore } from '@/composables/useGlobalStore';
|
||||
import { MsgSuccess } from '@/utils/message';
|
||||
import i18n from '@/lang';
|
||||
import SourceSelect from '../source-select.vue';
|
||||
|
||||
const emit = defineEmits<{ search: [] }>();
|
||||
const { currentNode } = useGlobalStore();
|
||||
const open = ref(false);
|
||||
const loading = ref(false);
|
||||
const sources = ref<ModelDownloader.Source[]>([]);
|
||||
const sourceModelIds = ref<ModelDownloader.FeaturedModel['sourceModelIds']>();
|
||||
const form = reactive({
|
||||
repoID: '',
|
||||
downloadType: 'all' as ModelDownloader.DownloadType,
|
||||
source: 'modelscope' as ModelDownloader.Source,
|
||||
});
|
||||
const downloadRepoID = computed(() => sourceModelIds.value?.[form.source]?.trim() || form.repoID);
|
||||
|
||||
const acceptParams = (
|
||||
repoID: string,
|
||||
downloadType: ModelDownloader.DownloadType,
|
||||
availableSources: ModelDownloader.Source[],
|
||||
modelIds?: ModelDownloader.FeaturedModel['sourceModelIds'],
|
||||
) => {
|
||||
if (!repoID.trim() || !availableSources.length || loading.value) return;
|
||||
sources.value = availableSources;
|
||||
sourceModelIds.value = modelIds;
|
||||
Object.assign(form, {
|
||||
repoID: repoID.trim(),
|
||||
downloadType,
|
||||
source: availableSources[0],
|
||||
});
|
||||
open.value = true;
|
||||
};
|
||||
|
||||
const submit = async () => {
|
||||
if (!open.value || loading.value) return;
|
||||
const node = currentNode.value;
|
||||
loading.value = true;
|
||||
try {
|
||||
const req = {
|
||||
repoID: downloadRepoID.value,
|
||||
downloadType: form.downloadType,
|
||||
};
|
||||
if (form.source === 'modelscope') await startModelScopeModelDownload(req);
|
||||
else await startHFModelDownload(req);
|
||||
if (node !== currentNode.value) return;
|
||||
open.value = false;
|
||||
MsgSuccess(i18n.global.t('aiTools.model.downloadQueued'));
|
||||
emit('search');
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
watch(currentNode, () => (open.value = false), { flush: 'sync' });
|
||||
|
||||
defineExpose({ acceptParams });
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.download-repo {
|
||||
width: 100%;
|
||||
padding: 12px;
|
||||
border-radius: var(--el-border-radius-base);
|
||||
background: var(--el-fill-color-light);
|
||||
color: var(--el-text-color-primary);
|
||||
font-weight: 500;
|
||||
line-height: 1.6;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,71 @@
|
||||
<template>
|
||||
<div class="source-options" role="group" :aria-label="$t('aiTools.model.modelSource')">
|
||||
<el-button
|
||||
v-for="source in sources"
|
||||
:key="source"
|
||||
class="source-option"
|
||||
:class="{ 'is-selected': modelValue === source }"
|
||||
:aria-pressed="modelValue === source"
|
||||
:disabled="disabled"
|
||||
@click="modelValue = source"
|
||||
>
|
||||
<svg-icon :iconName="source === 'modelscope' ? 'p-modelscope' : 'p-huggingface1'" class="source-icon" />
|
||||
<span class="source-name">{{ source === 'modelscope' ? 'ModelScope' : 'HuggingFace' }}</span>
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { ModelDownloader } from '@/api/interface/model-downloader';
|
||||
|
||||
defineProps<{ sources: ModelDownloader.Source[]; disabled?: boolean }>();
|
||||
const modelValue = defineModel<ModelDownloader.Source>({ required: true });
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.source-options {
|
||||
display: grid;
|
||||
grid-auto-flow: column;
|
||||
grid-auto-columns: minmax(0, 1fr);
|
||||
gap: 6px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.source-option {
|
||||
min-width: 0;
|
||||
height: auto;
|
||||
margin: 0;
|
||||
padding: 10px 8px;
|
||||
border-radius: 6px;
|
||||
text-align: left;
|
||||
white-space: normal;
|
||||
|
||||
:deep(> span) {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&.is-selected {
|
||||
border-color: var(--el-color-primary);
|
||||
background: var(--el-color-primary-light-9);
|
||||
}
|
||||
}
|
||||
|
||||
.source-icon {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
padding: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.source-name {
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user