增加可灵视频算力配置

This commit is contained in:
RockYang 2025-02-26 18:48:33 +08:00
parent 8a4596b36a
commit 6c84d2557c
7 changed files with 65 additions and 171 deletions

View File

@ -8,6 +8,7 @@
- 功能优化:优化聊天页面代码块样式,优化公式的解析。
- 功能优化:在绘图,视频相关 API 增加提示词长度的检查,防止提示词超出导致写入数据库失败。
- Bug 修复:优化 Redis 连接池配置,增加连接池超时时间,单核服务器报错 `redis: connection pool timeout`
- 功能优化:优化邮件验证码发送逻辑,更新邮件发送成功提示。
## v4.2.0

View File

@ -150,7 +150,7 @@ type SystemConfig struct {
DallPower int `json:"dall_power,omitempty"` // DALL-E-3 绘图消耗算力
SunoPower int `json:"suno_power,omitempty"` // Suno 生成歌曲消耗算力
LumaPower int `json:"luma_power,omitempty"` // Luma 生成视频消耗算力
KeLingPower int `json:"luma_power,omitempty"` // Luma 生成视频消耗算力
KeLingPower int `json:"keling_power,omitempty"` // 可灵生成视频消耗算力
AdvanceVoicePower int `json:"advance_voice_power,omitempty"` // 高级语音对话消耗算力
PromptPower int `json:"prompt_power,omitempty"` // 生成提示词消耗算力
@ -170,5 +170,6 @@ type SystemConfig struct {
EnabledVerify bool `json:"enabled_verify"` // 是否启用验证码
EmailWhiteList []string `json:"email_white_list"` // 邮箱白名单列表
TranslateModelId int `json:"translate_model_id"` // 用来做提示词翻译的大模型 id
MaxFileSize int `json:"max_file_size"` // 最大文件大小,单位MB
}

View File

@ -28,11 +28,21 @@ func NewUploadHandler(app *core.AppServer, db *gorm.DB, manager *oss.UploaderMan
}
func (h *UploadHandler) Upload(c *gin.Context) {
file, err := h.uploaderManager.GetUploadHandler().PutFile(c, "file")
// 判断文件大小
file, err := c.FormFile("file")
if err != nil {
resp.ERROR(c, err.Error())
return
}
if h.App.SysConfig.MaxFileSize > 0 && file.Size > int64(h.App.SysConfig.MaxFileSize)*1024*1024 {
resp.ERROR(c, "文件大小超过限制")
return
}
file, err := h.uploaderManager.GetUploadHandler().PutFile(c, "file")
if err != nil {
resp.ERROR(c, err.Error())
userId := 0
res := h.DB.Create(&model.File{
UserId: userId,

View File

@ -9,7 +9,6 @@ package video
import (
"bytes"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
@ -147,7 +146,6 @@ func (s *Service) Run() {
"err_msg": err.Error(),
"progress": service.FailTaskProgress,
"cover_url": "/images/failed.jpg",
"prompt": task.Prompt,
}).Error
if err != nil {
logger.Errorf("update task with error: %v", err)
@ -439,22 +437,10 @@ func (s *Service) LumaCreate(task types.VideoTask) (LumaRespVo, error) {
"user_prompt": task.Prompt,
"expand_prompt": params.PromptOptimize,
"loop": params.Loop,
"image_url": params.StartImgURL, // 图生视频
"image_end_url": params.EndImgURL, // 图生视频
}
// 图生视频
if params.StartImgURL != "" {
// 下载图片,并转成 base64
imageData, err := utils.DownloadImage(params.StartImgURL, "")
if err == nil {
reqBody["image_url"] = base64.StdEncoding.EncodeToString(imageData)
}
}
if params.EndImgURL != "" {
// 下载图片,并转成 base64
imageData, err := utils.DownloadImage(params.EndImgURL, "")
if err == nil {
reqBody["image_end_url"] = base64.StdEncoding.EncodeToString(imageData)
}
}
var res LumaRespVo
apiURL := fmt.Sprintf("%s/luma/generations", apiKey.ApiURL)
logger.Debugf("API URL: %s, request body: %+v", apiURL, reqBody)
@ -584,15 +570,8 @@ func (s *Service) KeLingCreate(task types.VideoTask) (KeLingRespVo, error) {
// 处理图生视频
if params.TaskType == "image2video" {
// 下载图片,并转成 base64
imageData, err := utils.DownloadImage(params.Image, "")
if err == nil {
payload["image"] = base64.StdEncoding.EncodeToString(imageData)
}
imageData, err = utils.DownloadImage(params.ImageTail, "")
if err == nil {
payload["image_tail"] = base64.StdEncoding.EncodeToString(imageData)
}
payload["image"] = params.Image
payload["image_tail"] = params.ImageTail
}
jsonPayload, err := json.Marshal(payload)

View File

@ -22,18 +22,10 @@
<el-col :span="8" v-for="item in rates" :key="item.value">
<div
class="flex-col items-center"
:class="
item.value === params.aspect_ratio
? 'grid-content active'
: 'grid-content'
"
:class="item.value === params.aspect_ratio ? 'grid-content active' : 'grid-content'"
@click="changeRate(item)"
>
<el-image
class="icon proportion"
:src="item.img"
fit="cover"
></el-image>
<el-image class="icon proportion" :src="item.img" fit="cover"></el-image>
<div class="texts">{{ item.text }}</div>
</div>
</el-col>
@ -73,12 +65,7 @@
<!-- 创意程度 -->
<div class="param-line">
<el-form-item label="创意程度">
<el-slider
v-model="params.cfg_scale"
:min="0"
:max="1"
:step="0.1"
/>
<el-slider v-model="params.cfg_scale" :min="0" :max="1" :step="0.1" />
</el-form-item>
</div>
@ -92,7 +79,7 @@
</el-icon>
</el-tooltip>
</div>
<!-- 添加运镜类型选择 -->
<el-form-item label="运镜类型">
<el-select v-model="params.camera_control.type" placeholder="请选择运镜类型">
@ -108,46 +95,22 @@
<!-- 仅在simple模式下显示详细配置 -->
<div class="camera-control" v-if="params.camera_control.type === 'simple'">
<el-form-item label="水平移动">
<el-slider
v-model="params.camera_control.config.horizontal"
:min="-10"
:max="10"
/>
<el-slider v-model="params.camera_control.config.horizontal" :min="-10" :max="10" />
</el-form-item>
<el-form-item label="垂直移动">
<el-slider
v-model="params.camera_control.config.vertical"
:min="-10"
:max="10"
/>
<el-slider v-model="params.camera_control.config.vertical" :min="-10" :max="10" />
</el-form-item>
<el-form-item label="左右旋转">
<el-slider
v-model="params.camera_control.config.pan"
:min="-10"
:max="10"
/>
<el-slider v-model="params.camera_control.config.pan" :min="-10" :max="10" />
</el-form-item>
<el-form-item label="上下旋转">
<el-slider
v-model="params.camera_control.config.tilt"
:min="-10"
:max="10"
/>
<el-slider v-model="params.camera_control.config.tilt" :min="-10" :max="10" />
</el-form-item>
<el-form-item label="横向翻转">
<el-slider
v-model="params.camera_control.config.roll"
:min="-10"
:max="10"
/>
<el-slider v-model="params.camera_control.config.roll" :min="-10" :max="10" />
</el-form-item>
<el-form-item label="镜头缩放">
<el-slider
v-model="params.camera_control.config.zoom"
:min="-10"
:max="10"
/>
<el-slider v-model="params.camera_control.config.zoom" :min="-10" :max="10" />
</el-form-item>
</div>
</div>
@ -159,19 +122,12 @@
<div class="main-content task-list-inner">
<!-- 任务类型选择 -->
<div class="param-line">
<el-tabs
v-model="params.task_type"
@tab-change="tabChange"
class="title-tabs"
>
<el-tabs v-model="params.task_type" @tab-change="tabChange" class="title-tabs">
<el-tab-pane label="文生视频" name="text2video">
<div class="text">使用文字描述想要生成视频的内容</div>
</el-tab-pane>
<el-tab-pane label="图生视频" name="image2video">
<div class="text">
以某张图片为底稿参考来创作视频生成类似风格或类型视频支持 PNG
/JPG/JPEG
</div>
<div class="text">以某张图片为底稿参考来创作视频生成类似风格或类型视频支持 PNG /JPG/JPEG 格式图片</div>
</el-tab-pane>
</el-tabs>
</div>
@ -186,13 +142,7 @@
placeholder="请在此输入视频提示词,您也可以点击下面的提示词助手生成视频提示词"
/>
<el-row class="text-info">
<el-button
class="generate-btn"
@click="generatePrompt"
:loading="isGenerating"
size="small"
color="#5865f2"
>
<el-button class="generate-btn" @click="generatePrompt" :loading="isGenerating" size="small" color="#5865f2">
<i class="iconfont icon-chuangzuo"></i>
生成专业视频提示词
</el-button>
@ -203,35 +153,15 @@
<div class="image-upload img-inline">
<div class="upload-box img-uploader">
<h4>起始帧</h4>
<el-upload
class="uploader img-uploader"
:auto-upload="true"
:show-file-list="false"
:http-request="uploadStartImage"
accept=".jpg,.png,.jpeg"
>
<img
v-if="params.image"
:src="params.image"
class="preview"
/>
<el-upload class="uploader img-uploader" :auto-upload="true" :show-file-list="false" :http-request="uploadStartImage" accept=".jpg,.png,.jpeg">
<img v-if="params.image" :src="params.image" class="preview" />
<el-icon v-else class="upload-icon"><Plus /></el-icon>
</el-upload>
</div>
<div class="upload-box img-uploader">
<h4>结束帧</h4>
<el-upload
class="uploader"
:auto-upload="true"
:show-file-list="false"
:http-request="uploadEndImage"
accept=".jpg,.png,.jpeg"
>
<img
v-if="params.image_tail"
:src="params.image_tail"
class="preview"
/>
<el-upload class="uploader" :auto-upload="true" :show-file-list="false" :http-request="uploadEndImage" accept=".jpg,.png,.jpeg">
<img v-if="params.image_tail" :src="params.image_tail" class="preview" />
<el-icon v-else class="upload-icon"><Plus /></el-icon>
</el-upload>
</div>
@ -240,10 +170,7 @@
<div class="flex-row justify-between items-center">
<div class="flex-row justify-start items-center">
<span>提示词</span>
<el-tooltip
content="输入你想要的内容,用逗号分割"
placement="right"
>
<el-tooltip content="输入你想要的内容,用逗号分割" placement="right">
<el-icon>
<InfoFilled />
</el-icon>
@ -252,12 +179,7 @@
</div>
</div>
<div class="param-line pt">
<el-input
v-model="params.prompt"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
placeholder="描述视频画面细节"
/>
<el-input v-model="params.prompt" type="textarea" :autosize="{ minRows: 4, maxRows: 6 }" placeholder="描述视频画面细节" />
</div>
</div>
@ -266,10 +188,7 @@
<div class="flex-row justify-between items-center">
<div class="flex-row justify-start items-center">
<span>不希望出现的内容可选</span>
<el-tooltip
content="不想出现在图片上的元素(例如:树,建筑)"
placement="right"
>
<el-tooltip content="不想出现在图片上的元素(例如:树,建筑)" placement="right">
<el-icon>
<InfoFilled />
</el-icon>
@ -289,21 +208,16 @@
<!-- 算力显示 -->
<el-row class="text-info">
<el-text type="primary"
>每次生成视频消耗
<el-text type="warning">{{ powerCost }}算力;</el-text> </el-text
>每次生成视频消耗 <el-text type="warning">{{ powerCost }}算力;</el-text> </el-text
>&nbsp;&nbsp;
<el-text type="primary"
>当前可用算力<el-text type="warning">{{
availablePower
}}</el-text></el-text
>当前可用算力<el-text type="warning">{{ availablePower }}</el-text></el-text
>
</el-row>
<!-- 生成按钮 -->
<div class="submit-btn">
<el-button type="primary" :dark="false" @click="generate" round
>立即生成</el-button
>
<el-button type="primary" :dark="false" @click="generate" round>立即生成</el-button>
</div>
</div>
@ -323,11 +237,7 @@
<div class="running-tasks" v-if="runningTasks.length > 0">
<h3>运行中</h3>
<div class="task-grid">
<div
v-for="task in runningTasks"
:key="task.id"
class="task-card"
>
<div v-for="task in runningTasks" :key="task.id" class="task-card">
<div class="status">处理中...</div>
<div class="prompt">{{ task.prompt }}</div>
</div>
@ -338,17 +248,8 @@
<div class="finished-tasks">
<h3>已完成</h3>
<div class="task-grid">
<div
v-for="task in finishedTasks"
:key="task.id"
class="task-card"
>
<video
class="preview"
:src="task.video_url"
@click="previewVideo(task)"
controls
></video>
<div v-for="task in finishedTasks" :key="task.id" class="task-card">
<video class="preview" :src="task.video_url" @click="previewVideo(task)" controls></video>
<div class="tools">
<el-button @click="downloadVideo(task)">下载</el-button>
<el-button @click="deleteTask(task)">删除</el-button>
@ -372,12 +273,7 @@
<!-- 视频预览对话框 -->
<el-dialog v-model="previewVisible" title="视频预览" width="80%">
<video
v-if="currentVideo"
:src="currentVideo"
controls
style="width: 100%"
></video>
<video v-if="currentVideo" :src="currentVideo" controls style="width: 100%"></video>
</el-dialog>
</div>
</template>
@ -409,11 +305,11 @@ const params = reactive({
pan: 0,
tilt: 0,
roll: 0,
zoom: 0
}
zoom: 0,
},
},
image: "",
image_tail: ""
image_tail: "",
});
const rates = [
{ css: "square", value: "1:1", text: "1:1", img: "/images/mj/rate_1_1.png" },
@ -422,14 +318,14 @@ const rates = [
css: "size16-9",
value: "16:9",
text: "16:9",
img: "/images/mj/rate_16_9.png"
img: "/images/mj/rate_16_9.png",
},
{
css: "size9-16",
value: "9:16",
text: "9:16",
img: "/images/mj/rate_9_16.png"
}
img: "/images/mj/rate_9_16.png",
},
];
//
@ -502,6 +398,9 @@ const generate = async () => {
}
generating.value = true;
//
params.image = replaceImg(params.image);
params.image_tail = replaceImg(params.image_tail);
try {
await httpPost("/api/video/keling/create", params);
showMessageOK("任务创建成功");
@ -519,12 +418,10 @@ const fetchTasks = async () => {
page: currentPage.value,
page_size: pageSize.value,
type: "keling",
task_type: taskFilter.value === "all" ? "" : taskFilter.value
task_type: taskFilter.value === "all" ? "" : taskFilter.value,
});
runningTasks.value = res.data.items.filter((task) => task.progress < 100);
finishedTasks.value = res.data.items.filter(
(task) => task.progress === 100
);
finishedTasks.value = res.data.items.filter((task) => task.progress === 100);
total.value = res.data.total;
} catch (e) {
showMessageError("获取任务列表失败: " + e.message);

View File

@ -280,9 +280,9 @@ const fetchData = (_page) => {
const create = () => {
const len = images.value.length;
if (len) {
formData.first_frame_img = images.value[0];
formData.first_frame_img = replaceImg(images.value[0]);
if (len === 2) {
formData.end_frame_img = images.value[1];
formData.end_frame_img = replaceImg(images.value[1]);
}
}

View File

@ -179,6 +179,9 @@
<el-option v-for="item in mjModels" :value="item.value" :label="item.name" :key="item.value">{{ item.name }} </el-option>
</el-select>
</el-form-item>
<el-form-item label="上传文件限制" prop="max_file_size">
<el-input v-model.number="system['max_file_size']" placeholder="最大上传文件大小单位MB" />
</el-form-item>
</el-tab-pane>
<el-tab-pane label="算力配置">
@ -240,6 +243,9 @@
<el-form-item label="Luma 算力" prop="luma_power">
<el-input v-model.number="system['luma_power']" placeholder="使用 Luma 生成一段视频消耗算力" />
</el-form-item>
<el-form-item label="可灵算力" prop="keling_power">
<el-input v-model.number="system['keling_power']" placeholder="使用快手可灵生成一段视频消耗算力" />
</el-form-item>
<el-form-item>
<template #label>
<div class="label-title">