增加模型别名
This commit is contained in:
@@ -74,6 +74,11 @@ func (h *AdminReadHandler) Logs(c *gin.Context) {
|
|||||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
modelByID, err := h.admin.ModelNameMap(c.Request.Context())
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||||
|
return
|
||||||
|
}
|
||||||
out := make([]gin.H, 0, len(items))
|
out := make([]gin.H, 0, len(items))
|
||||||
for _, item := range items {
|
for _, item := range items {
|
||||||
var userName any
|
var userName any
|
||||||
@@ -97,7 +102,7 @@ func (h *AdminReadHandler) Logs(c *gin.Context) {
|
|||||||
"ts": item.TS.Unix(),
|
"ts": item.TS.Unix(),
|
||||||
"kind": item.Kind,
|
"kind": item.Kind,
|
||||||
"status": item.Status,
|
"status": item.Status,
|
||||||
"model": item.Model,
|
"model": displayModelName(modelByID, item.Model),
|
||||||
"provider": item.Provider,
|
"provider": item.Provider,
|
||||||
"prompt": item.Prompt,
|
"prompt": item.Prompt,
|
||||||
"ratio": item.Ratio,
|
"ratio": item.Ratio,
|
||||||
|
|||||||
@@ -190,6 +190,10 @@ func (h *AdminWriteHandler) CreateModel(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
item, err := h.admin.CreateModel(c.Request.Context(), body)
|
item, err := h.admin.CreateModel(c.Request.Context(), body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if errors.Is(err, service.ErrModelAliasCollision) {
|
||||||
|
c.JSON(http.StatusConflict, gin.H{"detail": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"detail": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"detail": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -204,6 +208,10 @@ func (h *AdminWriteHandler) UpdateModel(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
item, err := h.admin.UpdateModel(c.Request.Context(), c.Param("model_id"), body)
|
item, err := h.admin.UpdateModel(c.Request.Context(), c.Param("model_id"), body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if errors.Is(err, service.ErrModelAliasCollision) {
|
||||||
|
c.JSON(http.StatusConflict, gin.H{"detail": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"detail": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"detail": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
func displayModelName(modelNames map[string]string, raw string) string {
|
||||||
|
raw = strings.TrimSpace(raw)
|
||||||
|
if raw == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if modelNames != nil {
|
||||||
|
if name, ok := modelNames[raw]; ok && strings.TrimSpace(name) != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return raw
|
||||||
|
}
|
||||||
@@ -225,6 +225,11 @@ func (h *UserGenerationHandler) Logs(c *gin.Context) {
|
|||||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
modelByID, err := h.admin.ModelNameMap(c.Request.Context())
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
out := make([]gin.H, 0, len(items))
|
out := make([]gin.H, 0, len(items))
|
||||||
for _, item := range items {
|
for _, item := range items {
|
||||||
@@ -249,7 +254,7 @@ func (h *UserGenerationHandler) Logs(c *gin.Context) {
|
|||||||
"ts": item.TS.Unix(),
|
"ts": item.TS.Unix(),
|
||||||
"kind": item.Kind,
|
"kind": item.Kind,
|
||||||
"status": item.Status,
|
"status": item.Status,
|
||||||
"model": item.Model,
|
"model": displayModelName(modelByID, item.Model),
|
||||||
"provider": item.Provider,
|
"provider": item.Provider,
|
||||||
"prompt": item.Prompt,
|
"prompt": item.Prompt,
|
||||||
"ratio": item.Ratio,
|
"ratio": item.Ratio,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package model
|
package model
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gorm.io/datatypes"
|
"gorm.io/datatypes"
|
||||||
@@ -92,6 +93,7 @@ type ModelConfig struct {
|
|||||||
ID string `gorm:"primaryKey;size:255"`
|
ID string `gorm:"primaryKey;size:255"`
|
||||||
Type string `gorm:"size:32;index;not null"`
|
Type string `gorm:"size:32;index;not null"`
|
||||||
Name string `gorm:"size:255;not null"`
|
Name string `gorm:"size:255;not null"`
|
||||||
|
Alias string `gorm:"column:alias;size:255;not null;default:''"`
|
||||||
Provider string `gorm:"size:100;index;not null"`
|
Provider string `gorm:"size:100;index;not null"`
|
||||||
Enabled bool `gorm:"not null;default:true"`
|
Enabled bool `gorm:"not null;default:true"`
|
||||||
Ratios datatypes.JSON `gorm:"type:jsonb"`
|
Ratios datatypes.JSON `gorm:"type:jsonb"`
|
||||||
@@ -123,6 +125,13 @@ type ModelConfig struct {
|
|||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m ModelConfig) EffectiveName() string {
|
||||||
|
if strings.TrimSpace(m.Alias) != "" {
|
||||||
|
return strings.TrimSpace(m.Alias)
|
||||||
|
}
|
||||||
|
return m.ID
|
||||||
|
}
|
||||||
|
|
||||||
type CDKCode struct {
|
type CDKCode struct {
|
||||||
Code string `gorm:"primaryKey;size:32"`
|
Code string `gorm:"primaryKey;size:32"`
|
||||||
Amount int `gorm:"not null"`
|
Amount int `gorm:"not null"`
|
||||||
|
|||||||
@@ -38,12 +38,24 @@ func (r *ModelRepository) List(ctx context.Context) ([]model.ModelConfig, error)
|
|||||||
|
|
||||||
func (r *ModelRepository) Get(ctx context.Context, modelID string) (*model.ModelConfig, error) {
|
func (r *ModelRepository) Get(ctx context.Context, modelID string) (*model.ModelConfig, error) {
|
||||||
var item model.ModelConfig
|
var item model.ModelConfig
|
||||||
if err := r.db.WithContext(ctx).First(&item, "id = ?", modelID).Error; err != nil {
|
if err := r.db.WithContext(ctx).First(&item, "(alias <> '' AND alias = ?) OR (alias = '' AND id = ?)", modelID, modelID).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return &item, nil
|
return &item, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *ModelRepository) NameMap(ctx context.Context) (map[string]string, error) {
|
||||||
|
items, err := r.List(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out := make(map[string]string, len(items))
|
||||||
|
for _, item := range items {
|
||||||
|
out[item.ID] = item.EffectiveName()
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
func JSONStrings(v datatypes.JSON) []string {
|
func JSONStrings(v datatypes.JSON) []string {
|
||||||
if len(v) == 0 {
|
if len(v) == 0 {
|
||||||
return []string{}
|
return []string{}
|
||||||
|
|||||||
@@ -54,6 +54,10 @@ func (s *AdminReadService) Models(ctx context.Context) ([]model.ModelConfig, err
|
|||||||
return s.models.List(ctx)
|
return s.models.List(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *AdminReadService) ModelNameMap(ctx context.Context) (map[string]string, error) {
|
||||||
|
return s.models.NameMap(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *AdminReadService) ModelsView(ctx context.Context) ([]map[string]any, error) {
|
func (s *AdminReadService) ModelsView(ctx context.Context) ([]map[string]any, error) {
|
||||||
items, err := s.models.List(ctx)
|
items, err := s.models.List(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -63,6 +67,7 @@ func (s *AdminReadService) ModelsView(ctx context.Context) ([]map[string]any, er
|
|||||||
for _, item := range items {
|
for _, item := range items {
|
||||||
out = append(out, map[string]any{
|
out = append(out, map[string]any{
|
||||||
"id": item.ID,
|
"id": item.ID,
|
||||||
|
"alias": item.Alias,
|
||||||
"type": item.Type,
|
"type": item.Type,
|
||||||
"name": item.Name,
|
"name": item.Name,
|
||||||
"provider": item.Provider,
|
"provider": item.Provider,
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import (
|
|||||||
// row does not exist, so handlers can translate it into a 404 (GORM's Delete
|
// row does not exist, so handlers can translate it into a 404 (GORM's Delete
|
||||||
// does not error on a zero-row delete).
|
// does not error on a zero-row delete).
|
||||||
var ErrNotFound = errors.New("not found")
|
var ErrNotFound = errors.New("not found")
|
||||||
|
var ErrModelAliasCollision = errors.New("model alias collision")
|
||||||
|
|
||||||
type AdminWriteService struct {
|
type AdminWriteService struct {
|
||||||
users *repo.UserRepository
|
users *repo.UserRepository
|
||||||
@@ -347,6 +348,7 @@ func (s *AdminWriteService) CreateModel(ctx context.Context, body map[string]any
|
|||||||
modelID := strings.TrimSpace(stringValue(body["id"]))
|
modelID := strings.TrimSpace(stringValue(body["id"]))
|
||||||
modelType := normalizedModelType(stringValue(body["type"]))
|
modelType := normalizedModelType(stringValue(body["type"]))
|
||||||
provider := strings.TrimSpace(stringValue(body["provider"]))
|
provider := strings.TrimSpace(stringValue(body["provider"]))
|
||||||
|
alias := strings.TrimSpace(stringValue(body["alias"]))
|
||||||
if modelID == "" {
|
if modelID == "" {
|
||||||
return nil, errors.New("id required")
|
return nil, errors.New("id required")
|
||||||
}
|
}
|
||||||
@@ -356,6 +358,9 @@ func (s *AdminWriteService) CreateModel(ctx context.Context, body map[string]any
|
|||||||
if provider == "" {
|
if provider == "" {
|
||||||
return nil, errors.New("provider required")
|
return nil, errors.New("provider required")
|
||||||
}
|
}
|
||||||
|
if err := s.validateModelNameSpace(ctx, "", modelID, alias); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
prices := jsonMap(body["prices"])
|
prices := jsonMap(body["prices"])
|
||||||
// image: tiers derive from the price keys (form omits resolutions);
|
// image: tiers derive from the price keys (form omits resolutions);
|
||||||
@@ -369,6 +374,7 @@ func (s *AdminWriteService) CreateModel(ctx context.Context, body map[string]any
|
|||||||
ID: modelID,
|
ID: modelID,
|
||||||
Type: modelType,
|
Type: modelType,
|
||||||
Name: defaultString(strings.TrimSpace(stringValue(body["name"])), modelID),
|
Name: defaultString(strings.TrimSpace(stringValue(body["name"])), modelID),
|
||||||
|
Alias: alias,
|
||||||
Provider: provider,
|
Provider: provider,
|
||||||
Enabled: boolValueWithDefault(body["enabled"], true),
|
Enabled: boolValueWithDefault(body["enabled"], true),
|
||||||
Ratios: jsonArray(body["ratios"]),
|
Ratios: jsonArray(body["ratios"]),
|
||||||
@@ -393,6 +399,7 @@ func (s *AdminWriteService) CreateModel(ctx context.Context, body map[string]any
|
|||||||
|
|
||||||
func (s *AdminWriteService) UpdateModel(ctx context.Context, modelID string, body map[string]any) (*model.ModelConfig, error) {
|
func (s *AdminWriteService) UpdateModel(ctx context.Context, modelID string, body map[string]any) (*model.ModelConfig, error) {
|
||||||
patch := map[string]any{}
|
patch := map[string]any{}
|
||||||
|
alias := ""
|
||||||
if _, ok := body["type"]; ok {
|
if _, ok := body["type"]; ok {
|
||||||
modelType := normalizedModelType(stringValue(body["type"]))
|
modelType := normalizedModelType(stringValue(body["type"]))
|
||||||
if modelType == "" {
|
if modelType == "" {
|
||||||
@@ -403,6 +410,13 @@ func (s *AdminWriteService) UpdateModel(ctx context.Context, modelID string, bod
|
|||||||
if _, ok := body["name"]; ok {
|
if _, ok := body["name"]; ok {
|
||||||
patch["name"] = strings.TrimSpace(stringValue(body["name"]))
|
patch["name"] = strings.TrimSpace(stringValue(body["name"]))
|
||||||
}
|
}
|
||||||
|
if _, ok := body["alias"]; ok {
|
||||||
|
alias = strings.TrimSpace(stringValue(body["alias"]))
|
||||||
|
if err := s.validateModelNameSpace(ctx, modelID, modelID, alias); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
patch["alias"] = alias
|
||||||
|
}
|
||||||
if _, ok := body["provider"]; ok {
|
if _, ok := body["provider"]; ok {
|
||||||
provider := strings.TrimSpace(stringValue(body["provider"]))
|
provider := strings.TrimSpace(stringValue(body["provider"]))
|
||||||
if provider == "" {
|
if provider == "" {
|
||||||
@@ -457,6 +471,36 @@ func (s *AdminWriteService) UpdateModel(ctx context.Context, modelID string, bod
|
|||||||
return s.models.Update(ctx, modelID, patch)
|
return s.models.Update(ctx, modelID, patch)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *AdminWriteService) validateModelNameSpace(ctx context.Context, selfID, candidateID, candidateAlias string) error {
|
||||||
|
candidateID = strings.TrimSpace(candidateID)
|
||||||
|
candidateAlias = strings.TrimSpace(candidateAlias)
|
||||||
|
if candidateID == "" && candidateAlias == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
items, err := s.models.List(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, item := range items {
|
||||||
|
if item.ID == selfID {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
existingAlias := strings.TrimSpace(item.Alias)
|
||||||
|
if candidateID != "" && existingAlias == candidateID {
|
||||||
|
return fmt.Errorf("%w: model id %q collides with existing alias %q", ErrModelAliasCollision, candidateID, existingAlias)
|
||||||
|
}
|
||||||
|
if candidateAlias != "" {
|
||||||
|
if item.ID == candidateAlias {
|
||||||
|
return fmt.Errorf("%w: alias %q collides with existing model id %q", ErrModelAliasCollision, candidateAlias, item.ID)
|
||||||
|
}
|
||||||
|
if existingAlias != "" && existingAlias == candidateAlias {
|
||||||
|
return fmt.Errorf("%w: alias %q collides with existing alias %q", ErrModelAliasCollision, candidateAlias, existingAlias)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (s *AdminWriteService) DeleteModel(ctx context.Context, modelID string) error {
|
func (s *AdminWriteService) DeleteModel(ctx context.Context, modelID string) error {
|
||||||
rows, err := s.models.Delete(ctx, modelID)
|
rows, err := s.models.Delete(ctx, modelID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -124,6 +124,10 @@ func (s *UserGenerationService) MyJobs(ctx context.Context, user *model.User, so
|
|||||||
if source != "admin" {
|
if source != "admin" {
|
||||||
source = "user"
|
source = "user"
|
||||||
}
|
}
|
||||||
|
modelNames, err := s.ModelNameMap(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
pending, err := s.events.PendingByUser(ctx, user.ID, source)
|
pending, err := s.events.PendingByUser(ctx, user.ID, source)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -133,12 +137,16 @@ func (s *UserGenerationService) MyJobs(ctx context.Context, user *model.User, so
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return map[string]any{
|
return map[string]any{
|
||||||
"pending": shapeJobEvent(pending),
|
"pending": shapeJobEvent(pending, modelNames),
|
||||||
"latest": shapeJobEvent(latest),
|
"latest": shapeJobEvent(latest, modelNames),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func shapeJobEvent(item *model.EventLog) map[string]any {
|
func (s *UserGenerationService) ModelNameMap(ctx context.Context) (map[string]string, error) {
|
||||||
|
return s.models.NameMap(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func shapeJobEvent(item *model.EventLog, modelNames map[string]string) map[string]any {
|
||||||
if item == nil {
|
if item == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -150,7 +158,7 @@ func shapeJobEvent(item *model.EventLog) map[string]any {
|
|||||||
return map[string]any{
|
return map[string]any{
|
||||||
"id": item.ID,
|
"id": item.ID,
|
||||||
"kind": item.Kind,
|
"kind": item.Kind,
|
||||||
"model": item.Model,
|
"model": displayModelName(modelNames, item.Model),
|
||||||
"prompt": item.Prompt,
|
"prompt": item.Prompt,
|
||||||
"ratio": item.Ratio,
|
"ratio": item.Ratio,
|
||||||
"resolution": item.Resolution,
|
"resolution": item.Resolution,
|
||||||
@@ -167,6 +175,19 @@ func shapeJobEvent(item *model.EventLog) map[string]any {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func displayModelName(modelNames map[string]string, raw string) string {
|
||||||
|
raw = strings.TrimSpace(raw)
|
||||||
|
if raw == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if modelNames != nil {
|
||||||
|
if name, ok := modelNames[raw]; ok && strings.TrimSpace(name) != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return raw
|
||||||
|
}
|
||||||
|
|
||||||
// referenceURLs turns the stored relative reference paths into /images URLs so
|
// referenceURLs turns the stored relative reference paths into /images URLs so
|
||||||
// the playground can re-display the uploaded reference image(s) after a reload.
|
// the playground can re-display the uploaded reference image(s) after a reload.
|
||||||
func referenceURLs(raw []byte) []string {
|
func referenceURLs(raw []byte) []string {
|
||||||
|
|||||||
@@ -299,7 +299,7 @@ func (s *V1Service) ListModels(ctx context.Context) ([]map[string]any, error) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
out = append(out, map[string]any{
|
out = append(out, map[string]any{
|
||||||
"id": item.ID,
|
"id": item.EffectiveName(),
|
||||||
"object": "model",
|
"object": "model",
|
||||||
"created": now,
|
"created": now,
|
||||||
"owned_by": item.Provider,
|
"owned_by": item.Provider,
|
||||||
@@ -537,7 +537,7 @@ func (s *V1Service) prepareImageExecution(ctx context.Context, principal *APIPri
|
|||||||
return map[string]any{
|
return map[string]any{
|
||||||
"created": time.Now().Unix(),
|
"created": time.Now().Unix(),
|
||||||
"data": []map[string]any{{"b64_json": b64}},
|
"data": []map[string]any{{"b64_json": b64}},
|
||||||
"model": modelItem.ID,
|
"model": modelItem.EffectiveName(),
|
||||||
"provider": modelItem.Provider,
|
"provider": modelItem.Provider,
|
||||||
"kind": "image",
|
"kind": "image",
|
||||||
"b64_json": b64,
|
"b64_json": b64,
|
||||||
@@ -549,7 +549,7 @@ func (s *V1Service) prepareImageExecution(ctx context.Context, principal *APIPri
|
|||||||
return map[string]any{
|
return map[string]any{
|
||||||
"created": time.Now().Unix(),
|
"created": time.Now().Unix(),
|
||||||
"data": []map[string]any{{"url": fileURL, "b64_json": nil}},
|
"data": []map[string]any{{"url": fileURL, "b64_json": nil}},
|
||||||
"model": modelItem.ID,
|
"model": modelItem.EffectiveName(),
|
||||||
"provider": modelItem.Provider,
|
"provider": modelItem.Provider,
|
||||||
"kind": "image",
|
"kind": "image",
|
||||||
"url": fileURL,
|
"url": fileURL,
|
||||||
@@ -681,7 +681,7 @@ func (s *V1Service) prepareVideoExecution(ctx context.Context, principal *APIPri
|
|||||||
return map[string]any{
|
return map[string]any{
|
||||||
"created": time.Now().Unix(),
|
"created": time.Now().Unix(),
|
||||||
"data": []map[string]any{{"b64_json": b64}},
|
"data": []map[string]any{{"b64_json": b64}},
|
||||||
"model": modelItem.ID,
|
"model": modelItem.EffectiveName(),
|
||||||
"provider": modelItem.Provider,
|
"provider": modelItem.Provider,
|
||||||
"kind": "video",
|
"kind": "video",
|
||||||
"b64_json": b64,
|
"b64_json": b64,
|
||||||
@@ -693,7 +693,7 @@ func (s *V1Service) prepareVideoExecution(ctx context.Context, principal *APIPri
|
|||||||
return map[string]any{
|
return map[string]any{
|
||||||
"created": time.Now().Unix(),
|
"created": time.Now().Unix(),
|
||||||
"data": []map[string]any{{"url": fileURL}},
|
"data": []map[string]any{{"url": fileURL}},
|
||||||
"model": modelItem.ID,
|
"model": modelItem.EffectiveName(),
|
||||||
"provider": modelItem.Provider,
|
"provider": modelItem.Provider,
|
||||||
"kind": "video",
|
"kind": "video",
|
||||||
"url": fileURL,
|
"url": fileURL,
|
||||||
@@ -725,7 +725,7 @@ func (s *V1Service) StartVideoJob(ctx context.Context, principal *APIPrincipal,
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
go s.runVideoJob(ctx, principal, in, modelItem, eventID, aspectRatio, resolution, duration, price, refFiles)
|
go s.runVideoJob(ctx, principal, in, modelItem, eventID, aspectRatio, resolution, duration, price, refFiles)
|
||||||
return videoJobObject(eventID, modelItem.ID, "queued", 0, duration, sizeFromRatioRes(aspectRatio, resolution), time.Now().Unix(), 0, ""), nil
|
return videoJobObject(eventID, modelItem.EffectiveName(), "queued", 0, duration, sizeFromRatioRes(aspectRatio, resolution), time.Now().Unix(), 0, ""), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// runVideoJob renders the clip in the background, capturing the upstream URL
|
// runVideoJob renders the clip in the background, capturing the upstream URL
|
||||||
@@ -792,7 +792,13 @@ func (s *V1Service) VideoJob(ctx context.Context, principal *APIPrincipal, id st
|
|||||||
if ev.Status == "failed" {
|
if ev.Status == "failed" {
|
||||||
errMsg = ev.Error
|
errMsg = ev.Error
|
||||||
}
|
}
|
||||||
return videoJobObject(ev.ID, ev.Model, status, progress, ev.Duration, sizeFromRatioRes(ev.Ratio, ev.Resolution), ev.TS.Unix(), completedAt, errMsg), nil
|
modelName := ev.Model
|
||||||
|
if nameByID, nerr := s.models.NameMap(ctx); nerr == nil {
|
||||||
|
if name, ok := nameByID[ev.Model]; ok && strings.TrimSpace(name) != "" {
|
||||||
|
modelName = name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return videoJobObject(ev.ID, modelName, status, progress, ev.Duration, sizeFromRatioRes(ev.Ratio, ev.Resolution), ev.TS.Unix(), completedAt, errMsg), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// OpenVideoContent streams a completed job's video by proxying the stored
|
// OpenVideoContent streams a completed job's video by proxying the stored
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const ALL_RES = ['1K', '2K', '4K', '720p', '1080p']
|
|||||||
const DUR_OPTS = ['5s', '6s', '8s', '10s', '15s']
|
const DUR_OPTS = ['5s', '6s', '8s', '10s', '15s']
|
||||||
|
|
||||||
const id = ref('')
|
const id = ref('')
|
||||||
|
const alias = ref('')
|
||||||
const type = ref('image')
|
const type = ref('image')
|
||||||
const ratios = ref(['1:1', '16:9', '9:16'])
|
const ratios = ref(['1:1', '16:9', '9:16'])
|
||||||
const maxRefs = ref(0)
|
const maxRefs = ref(0)
|
||||||
@@ -89,6 +90,7 @@ async function save() {
|
|||||||
const body = {
|
const body = {
|
||||||
id: mid,
|
id: mid,
|
||||||
name: mid,
|
name: mid,
|
||||||
|
alias: alias.value.trim(),
|
||||||
type: type.value,
|
type: type.value,
|
||||||
provider: 'custom',
|
provider: 'custom',
|
||||||
prices: r.prices,
|
prices: r.prices,
|
||||||
@@ -127,7 +129,7 @@ async function save() {
|
|||||||
</div>
|
</div>
|
||||||
<div class="p-5 space-y-4">
|
<div class="p-5 space-y-4">
|
||||||
<p class="text-xs text-slate-500 leading-relaxed">
|
<p class="text-xs text-slate-500 leading-relaxed">
|
||||||
id 要与上游模型名<strong class="text-slate-700">一致</strong> —— 生成时按 id 自动路由到「支持该 id 的上游账号」。价格按本地价计费。
|
id 要与上游模型名<strong class="text-slate-700">一致</strong> —— 生成时按 id 自动路由到「支持该 id 的上游账号」。价格按本地价计费。设了别名后,对外只用别名调用(原 id 调不到),但内部仍按 id 路由到上游,不影响。
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="flex gap-3">
|
<div class="flex gap-3">
|
||||||
@@ -135,6 +137,10 @@ async function save() {
|
|||||||
<label class="text-xs text-slate-500 block mb-1">模型 id <span class="text-rose-500">*</span></label>
|
<label class="text-xs text-slate-500 block mb-1">模型 id <span class="text-rose-500">*</span></label>
|
||||||
<input v-model="id" class="field font-mono text-xs h-10" placeholder="gpt-image-2" />
|
<input v-model="id" class="field font-mono text-xs h-10" placeholder="gpt-image-2" />
|
||||||
</div>
|
</div>
|
||||||
|
<div class="w-40">
|
||||||
|
<label class="text-xs text-slate-500 block mb-1">别名(选填)</label>
|
||||||
|
<input v-model="alias" class="field font-mono text-xs h-10" placeholder="对外调用名" />
|
||||||
|
</div>
|
||||||
<div class="w-28">
|
<div class="w-28">
|
||||||
<label class="text-xs text-slate-500 block mb-1">类型</label>
|
<label class="text-xs text-slate-500 block mb-1">类型</label>
|
||||||
<SelectMenu v-model="type" :options="[{value:'image',label:'图像'},{value:'video',label:'视频'}]" />
|
<SelectMenu v-model="type" :options="[{value:'image',label:'图像'},{value:'video',label:'视频'}]" />
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ const REF_MODE_LABEL = { none: '无', frame: '首帧/首尾帧', asset: '参考
|
|||||||
const catalog = ref([])
|
const catalog = ref([])
|
||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
const selectedId = ref(props.model?.id || '')
|
const selectedId = ref(props.model?.id || '')
|
||||||
|
const alias = ref(props.model?.alias || '')
|
||||||
const imagePrices = ref({}) // 普通价 { '1K': '', '2K': '', ... } keyed by resolutions
|
const imagePrices = ref({}) // 普通价 { '1K': '', '2K': '', ... } keyed by resolutions
|
||||||
const videoPrices = ref({}) // 普通价 { '5s': '', '10s': '', ... } keyed by durations
|
const videoPrices = ref({}) // 普通价 { '5s': '', '10s': '', ... } keyed by durations
|
||||||
const imagePricesAgent = ref({}) // 代理价(留空 = 跟随普通价)
|
const imagePricesAgent = ref({}) // 代理价(留空 = 跟随普通价)
|
||||||
@@ -138,6 +139,7 @@ async function save() {
|
|||||||
duration_prices,
|
duration_prices,
|
||||||
prices_agent,
|
prices_agent,
|
||||||
duration_prices_agent,
|
duration_prices_agent,
|
||||||
|
alias: alias.value.trim(),
|
||||||
max_reference_images: e.max_reference_images || 0,
|
max_reference_images: e.max_reference_images || 0,
|
||||||
reference_mode: e.reference_mode || 'none',
|
reference_mode: e.reference_mode || 'none',
|
||||||
weight: Number(weight.value) || 0,
|
weight: Number(weight.value) || 0,
|
||||||
@@ -153,6 +155,7 @@ async function save() {
|
|||||||
prices,
|
prices,
|
||||||
prices_agent,
|
prices_agent,
|
||||||
image_to_image: !!e.image_to_image,
|
image_to_image: !!e.image_to_image,
|
||||||
|
alias: alias.value.trim(),
|
||||||
// 多参考图:把目录定义的张数(gpt=3/seedream=6/flux=4 …)写进模型,
|
// 多参考图:把目录定义的张数(gpt=3/seedream=6/flux=4 …)写进模型,
|
||||||
// 否则后端仍按旧值(默认 1)限制。
|
// 否则后端仍按旧值(默认 1)限制。
|
||||||
max_reference_images: e.max_reference_images || 0,
|
max_reference_images: e.max_reference_images || 0,
|
||||||
@@ -197,6 +200,12 @@ async function save() {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label class="lbl">别名</label>
|
||||||
|
<input v-model="alias" class="field font-mono" placeholder="可选,对外名" />
|
||||||
|
<p class="text-[11px] text-white/40 mt-1.5">设置后原模型名将不可调用,画图台 / API / 文档都改用别名</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- read-only param summary, straight from the loaded catalog -->
|
<!-- read-only param summary, straight from the loaded catalog -->
|
||||||
<div v-if="entry" class="rounded-xl bg-white/[0.03] ring-1 ring-white/[0.06] p-3.5 space-y-2.5">
|
<div v-if="entry" class="rounded-xl bg-white/[0.03] ring-1 ring-white/[0.06] p-3.5 space-y-2.5">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ const props = defineProps({
|
|||||||
model: { type: Object, required: true },
|
model: { type: Object, required: true },
|
||||||
})
|
})
|
||||||
const emit = defineEmits(['close'])
|
const emit = defineEmits(['close'])
|
||||||
|
const publishName = computed(() => props.model.alias || props.model.id)
|
||||||
|
|
||||||
const isVideo = props.model.type === 'video'
|
const isVideo = props.model.type === 'video'
|
||||||
|
|
||||||
@@ -124,7 +125,7 @@ async function run() {
|
|||||||
resultUrl.value = ''
|
resultUrl.value = ''
|
||||||
resultKind.value = ''
|
resultKind.value = ''
|
||||||
const payload = {
|
const payload = {
|
||||||
model: props.model.id,
|
model: publishName.value,
|
||||||
prompt: prompt.value,
|
prompt: prompt.value,
|
||||||
ratio: ratio.value,
|
ratio: ratio.value,
|
||||||
resolution: resolution.value,
|
resolution: resolution.value,
|
||||||
@@ -198,7 +199,7 @@ async function recover() {
|
|||||||
<div class="px-5 py-4 border-b border-white/[0.06] flex items-center justify-between">
|
<div class="px-5 py-4 border-b border-white/[0.06] flex items-center justify-between">
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
<h2 class="text-sm font-semibold">测试模型</h2>
|
<h2 class="text-sm font-semibold">测试模型</h2>
|
||||||
<div class="text-xs text-white/45 font-mono truncate">{{ model.id }}</div>
|
<div class="text-xs text-white/45 font-mono truncate">{{ publishName }}</div>
|
||||||
</div>
|
</div>
|
||||||
<button @click="emit('close')" class="text-white/40 hover:text-white transition-colors">
|
<button @click="emit('close')" class="text-white/40 hover:text-white transition-colors">
|
||||||
<Icon name="close" class="w-5 h-5" />
|
<Icon name="close" class="w-5 h-5" />
|
||||||
|
|||||||
@@ -19,8 +19,11 @@ onMounted(async () => {
|
|||||||
|
|
||||||
const imageModels = computed(() => models.value.filter((m) => m.type === 'image'))
|
const imageModels = computed(() => models.value.filter((m) => m.type === 'image'))
|
||||||
const videoModels = computed(() => models.value.filter((m) => m.type === 'video'))
|
const videoModels = computed(() => models.value.filter((m) => m.type === 'video'))
|
||||||
const sampleImage = computed(() => imageModels.value[0]?.id || 'firefly-image-4')
|
function pubName(m) {
|
||||||
const sampleVideo = computed(() => videoModels.value[0]?.id || 'firefly-kling3')
|
return m?.alias || m?.id || ''
|
||||||
|
}
|
||||||
|
const sampleImage = computed(() => pubName(imageModels.value[0]) || 'firefly-image-4')
|
||||||
|
const sampleVideo = computed(() => pubName(videoModels.value[0]) || 'firefly-kling3')
|
||||||
const sampleSeconds = computed(() => String(videoModels.value[0]?.durations?.[0] || '8s').replace(/s$/, ''))
|
const sampleSeconds = computed(() => String(videoModels.value[0]?.durations?.[0] || '8s').replace(/s$/, ''))
|
||||||
|
|
||||||
function priceOf(m) {
|
function priceOf(m) {
|
||||||
@@ -41,18 +44,18 @@ function priceOf(m) {
|
|||||||
|
|
||||||
// ---- request parameter tables ----
|
// ---- request parameter tables ----
|
||||||
const imageParams = [
|
const imageParams = [
|
||||||
['model', 'string', '必填', '模型 id,见上表(图像)'],
|
['model', 'string', '必填', '模型名(别名优先),见上表(图像)'],
|
||||||
['prompt', 'string', '必填', '文字描述'],
|
['prompt', 'string', '必填', '文字描述'],
|
||||||
['size', 'string', '可选', '宽x高,如 "1024x1024"。同时决定「比例」+「分辨率档」(按长边)。具体怎么填见下方对照表;留空 = 1:1 · 2K'],
|
['size', 'string', '可选', '宽x高,如 "1024x1024"。同时决定「比例」+「分辨率档」(按长边)。具体怎么填见下方对照表;留空 = 1:1 · 2K'],
|
||||||
]
|
]
|
||||||
const editParams = [
|
const editParams = [
|
||||||
['image', 'file', '必填', '输入图;多张参考图重复 image[] 字段(multipart 文件上传)'],
|
['image', 'file', '必填', '输入图;多张参考图重复 image[] 字段(multipart 文件上传)'],
|
||||||
['prompt', 'string', '必填', '编辑/参考描述'],
|
['prompt', 'string', '必填', '编辑/参考描述'],
|
||||||
['model', 'string', '必填', '模型 id(需支持图生图)'],
|
['model', 'string', '必填', '模型名(别名优先,需支持图生图)'],
|
||||||
['size', 'string', '可选', '同图像:决定比例 + 分辨率档(见下方对照表)'],
|
['size', 'string', '可选', '同图像:决定比例 + 分辨率档(见下方对照表)'],
|
||||||
]
|
]
|
||||||
const videoParams = [
|
const videoParams = [
|
||||||
['model', 'string', '必填', '模型 id,见上表(视频)'],
|
['model', 'string', '必填', '模型名(别名优先),见上表(视频)'],
|
||||||
['prompt', 'string', '必填', '文字描述'],
|
['prompt', 'string', '必填', '文字描述'],
|
||||||
['seconds', 'string|int', '必填', '时长秒数,如 "5" "8"(取决于模型支持)'],
|
['seconds', 'string|int', '必填', '时长秒数,如 "5" "8"(取决于模型支持)'],
|
||||||
['size', 'string', '可选', '如 "1280x720" / "720x1280" → 决定比例与分辨率'],
|
['size', 'string', '可选', '如 "1280x720" / "720x1280" → 决定比例与分辨率'],
|
||||||
@@ -273,7 +276,7 @@ async function copy(text) {
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr v-for="m in models" :key="m.id" class="border-b border-white/[0.04] last:border-0">
|
<tr v-for="m in models" :key="m.id" class="border-b border-white/[0.04] last:border-0">
|
||||||
<td class="px-4 py-3 font-mono text-white/90">{{ m.id }}</td>
|
<td class="px-4 py-3 font-mono text-white/90">{{ pubName(m) }}</td>
|
||||||
<td class="px-4 py-3 text-white/60">{{ m.type === 'video' ? '视频' : '图像' }}</td>
|
<td class="px-4 py-3 text-white/60">{{ m.type === 'video' ? '视频' : '图像' }}</td>
|
||||||
<td class="px-4 py-3 text-white/60">{{ (m.type === 'video' ? m.durations : m.resolutions || [])?.join(' · ') || '—' }}</td>
|
<td class="px-4 py-3 text-white/60">{{ (m.type === 'video' ? m.durations : m.resolutions || [])?.join(' · ') || '—' }}</td>
|
||||||
<td class="px-4 py-3 text-right tabular-nums text-white/80">{{ priceOf(m) }}</td>
|
<td class="px-4 py-3 text-right tabular-nums text-white/80">{{ priceOf(m) }}</td>
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ const filtered = computed(() => {
|
|||||||
if (kindFilter.value && m.type !== kindFilter.value) return false
|
if (kindFilter.value && m.type !== kindFilter.value) return false
|
||||||
if (statusFilter.value === 'enabled' && m.enabled === false) return false
|
if (statusFilter.value === 'enabled' && m.enabled === false) return false
|
||||||
if (statusFilter.value === 'disabled' && m.enabled !== false) return false
|
if (statusFilter.value === 'disabled' && m.enabled !== false) return false
|
||||||
if (q && !(m.id.toLowerCase().includes(q) || (m.provider || '').toLowerCase().includes(q))) return false
|
if (q && !(m.id.toLowerCase().includes(q) || (m.alias || '').toLowerCase().includes(q) || (m.provider || '').toLowerCase().includes(q))) return false
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -114,7 +114,7 @@ onMounted(loadModels)
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1 min-w-[200px]">
|
<div class="flex-1 min-w-[200px]">
|
||||||
<input v-model="search" class="field !py-1.5 text-xs" placeholder="搜索 模型 ID / Provider…" />
|
<input v-model="search" class="field !py-1.5 text-xs" placeholder="搜索 模型 ID / 别名 / Provider…" />
|
||||||
</div>
|
</div>
|
||||||
<button @click="loadModels" class="btn-soft">
|
<button @click="loadModels" class="btn-soft">
|
||||||
<Icon name="refresh" class="w-3.5 h-3.5" /> 刷新
|
<Icon name="refresh" class="w-3.5 h-3.5" /> 刷新
|
||||||
@@ -163,7 +163,10 @@ onMounted(loadModels)
|
|||||||
class="border-b border-white/[0.04] hover:bg-white/[0.03] transition-colors">
|
class="border-b border-white/[0.04] hover:bg-white/[0.03] transition-colors">
|
||||||
<!-- Model id + provider underneath -->
|
<!-- Model id + provider underneath -->
|
||||||
<td class="px-5 py-3.5 align-middle min-w-0">
|
<td class="px-5 py-3.5 align-middle min-w-0">
|
||||||
|
<div class="flex items-start gap-2 min-w-0">
|
||||||
<div class="font-mono text-xs text-white/90 truncate" :title="m.id">{{ m.id }}</div>
|
<div class="font-mono text-xs text-white/90 truncate" :title="m.id">{{ m.id }}</div>
|
||||||
|
<span v-if="m.alias" class="inline-flex items-center rounded-full px-2 py-0.5 text-[10px] bg-sky-500/10 text-sky-300 ring-1 ring-sky-400/20 shrink-0">别名: {{ m.alias }}</span>
|
||||||
|
</div>
|
||||||
<div class="mt-1 text-[10px] text-white/45 capitalize truncate">{{ m.provider || '—' }}</div>
|
<div class="mt-1 text-[10px] text-white/45 capitalize truncate">{{ m.provider || '—' }}</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ const models = computed(() =>
|
|||||||
allModels.value.filter((m) => m.enabled !== false && m.type === mode.value),
|
allModels.value.filter((m) => m.enabled !== false && m.type === mode.value),
|
||||||
)
|
)
|
||||||
const modelOptions = computed(() =>
|
const modelOptions = computed(() =>
|
||||||
models.value.map((m) => ({ value: m.id, label: m.name || m.id })),
|
models.value.map((m) => ({ value: m.id, label: m.alias || m.name || m.id })),
|
||||||
)
|
)
|
||||||
const model = computed(() => allModels.value.find((m) => m.id === modelId.value) || null)
|
const model = computed(() => allModels.value.find((m) => m.id === modelId.value) || null)
|
||||||
const familyPreset = computed(() => {
|
const familyPreset = computed(() => {
|
||||||
@@ -305,7 +305,7 @@ async function fireOne() {
|
|||||||
// user edits the form (or fires another batch) while this one runs.
|
// user edits the form (or fires another batch) while this one runs.
|
||||||
const task = {
|
const task = {
|
||||||
id: Math.random().toString(36).slice(2, 10),
|
id: Math.random().toString(36).slice(2, 10),
|
||||||
model: modelId.value,
|
model: model.value?.alias || modelId.value,
|
||||||
kind: mode.value,
|
kind: mode.value,
|
||||||
prompt: prompt.value,
|
prompt: prompt.value,
|
||||||
ratio: ratio.value,
|
ratio: ratio.value,
|
||||||
|
|||||||
Reference in New Issue
Block a user