bowong
/
modalDeploy
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
123 Commits 7 Branches 0 Tags 54 MiB
Commit Graph

123 Commits

Author SHA1 Message Date
imeepos 7ac387be1d feat: 新增仅视频流的视频拼接功能 
- 在VideoUtils中新增ffmpeg_concat_medias_video_only函数，仅处理视频流忽略音频
- 新增concat_medias_video_only.py模块，提供Modal函数封装
- 在ffmpeg路由中新增/concat-video-only接口
- 解决音频流缺失导致的"Stream specifier ':a' matches no streams"错误
- 适用于不需要音频的视频拼接场景
 2025-09-24 15:35:46 +08:00
imeepos 4479544c18 fix: 修复HTTP协议视频下载完成后状态未更新的问题 
- 在HTTP协议处理中添加volume_cache_path设置
- 确保下载成功后状态正确更新为ready
- 添加process_span.set_status("success")标记成功状态

修复问题:
- 文件下载完成但status仍为downloading
- local_exists为true但local_available为false
- 状态更新逻辑因缺少volume_cache_path而失效
 2025-09-23 10:53:58 +08:00
imeepos 904f93a74d fix: 修复HTTP协议视频文件的CDN URL生成和S3存储路径问题 
- 修复cache_filepath中的双斜杠问题，移除路径开头的斜杠
- 修复get_cdn_url()方法，对HTTP协议使用cache_filepath确保路径一致性
- 修复cache_submit.py中重复的协议前缀问题
- 确保CDN URL与S3存储路径完全匹配，解决AccessDenied错误

现在的映射关系:
- 存储: s3://ap-northeast-2/modal-media-cache/http/videos.pexels.com/video-files/xxx.mp4
- CDN: https://cdn.roasmax.cn/http/videos.pexels.com/video-files/xxx.mp4
 2025-09-23 10:40:51 +08:00
imeepos 843e113fb5 fix: 修复字幕应用功能输出目录不存在的错误 2025-09-19 17:54:37 +08:00
imeepos aa21850643 refactor: 简化WorkerConfig配置 
移除显式的env_file配置，依赖pydantic-settings默认行为自动读取.env文件
 2025-09-19 16:00:19 +08:00
imeepos 5bac883ee2 fix: 修复WorkerConfig配置类.env文件读取问题 
- 添加缺失的cf_kv_namespace_id字段
- 明确配置env_file=".env"以确保正确读取环境变量
- 更新gitignore忽略__pycache__目录
 2025-09-19 15:47:21 +08:00
imeepos ceef34c523 fix: 为FFMPEGVideoLoopFillAudioRequest添加字段验证器 
修复video-loop-fill接口无法接受字符串格式S3 URL的问题，添加field_validator来处理video和audio字段的字符串到MediaSource对象的转换
 2025-09-19 15:27:20 +08:00
shuohigh@gmail.com 21af708598 新增加open-webui界面 2025-08-07 10:46:02 +08:00
康宇佳 40df14e2c9 合并分支 
* Merge branch 'main' into cluster-gemini
* FIX 修复json
* Merge branch 'main' into cluster-gemini
* FIX 修复返回值问题
* PERF 适配system instruction

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4882
Co-authored-by: 康宇佳
 2025-06-27 10:32:34 +08:00
康宇佳 e323073b5f 合并分支 
* Merge branch 'main' into cluster-gemini
* FIX 修复返回值问题
* PERF 适配system instruction

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4878
Co-authored-by: 康宇佳
 2025-06-25 19:06:49 +08:00
shuohigh@gmail.com 38d594b4e9 fix: 通过log记录清理任务 2025-06-25 10:38:18 +08:00
肖宇迪 8263b22346 采用定时任务每天3 AM 香港时间清理过期的直播缓存 
* 采用定时任务每天3 AM 香港时间清理过期的直播缓存

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4870?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-25 10:15:53 +08:00
肖宇迪 11e2cd3454 采用定时任务每天3 AM 香港时间清理过期的直播缓存 
* 采用定时任务每天3 AM 香港时间清理过期的直播缓存

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4868?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-24 18:54:06 +08:00
康宇佳 976f213cbb 合并分支 
* PERF 修复prompt的label选择
* Merge branch 'main' into cluster-gemini
* PERF Gemini推理增加SystemInstruct
* PERF 增加上下文商品信息参数

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4867
Co-authored-by: 康宇佳
 2025-06-24 18:34:23 +08:00
肖宇迪 aea45ee123 fix: 防止Nakama账号登录时注册新账号 
* fix: 防止Nakama账号登录时注册新账号

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4866?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-24 18:15:29 +08:00
肖宇迪 b0f954c55d 新增Nakama登录接口，同时支持使用Nakama JWT调用API 
* 新增Nakama登录接口，同时支持使用Nakama JWT调用API
* 将tikhub_api和api分离
* 拆分models为按功能划分,以便管理依赖

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4865?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-24 18:02:29 +08:00
shuohigh@gmail.com 2a0c3364d0 fix: 为cache文件batch操作的复制和移动行为创建文件夹 2025-06-24 15:18:23 +08:00
shuohigh@gmail.com ff437e63b3 添加cache文件的batch操作接口 2025-06-24 15:11:26 +08:00
shuohigh@gmail.com 39044f22dc fix FastAPI模型FFMPEGSubtitleOverlayRequest解析后没有返回Self以及可选参数没有给default值 2025-06-24 13:53:40 +08:00
康宇佳 d37da25a82 合并分支 
* PERF 增加上下文商品信息参数

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4863
Co-authored-by: 康宇佳
 2025-06-23 19:16:04 +08:00
康宇佳 7666102c27 合并分支 
* Merge branch 'main' into cluster-gemini
* FIX Gemini推理配置修复langfuse来源
* PERF Gemini推理配置适配langfuse来源 FIX 时间转换适配更多时间格式
* PERF prompt接入langfuse
* Merge branch 'main' into cluster-gemini
* FIX 修复pydantic导致的问题 PERF 预先使用prompt传输格式要求，如果失败fallback到调用gemini处理格式错误
* Merge branch 'main' into cluster-gemini
* FIX 修复上传问题
* PERF 规范化gemini调用方式, 使用response_schema规范化输出
* PERF 修改gemini upload调用为规范调用
* PERF 优化prompt词提高识别准确率 FIX 修复升级httpx导致部署失败的问题
* Merge branch 'main' into cluster-gemini
* PERF 优化prompt词提高识别准确率
* FIX 修复prompt时间问题
* Merge branch 'main' into cluster-gemini
* PERF 修复时间最大限制问题
* Merge branch 'main' into cluster-gemini
* FIX 修复缩放分辨率计算问题 ADD Gemini推理改为二阶段 FIX 修复时间合并计算问题
* Merge branch 'main' into cluster-gemini
* ADD gemini数据源使用cloud storage

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4861
Co-authored-by: 康宇佳
 2025-06-23 16:13:05 +08:00
肖宇迪 bffd102622 ffmpeg_subtitle_apply 新增内嵌字幕选项 
* ffmpeg_subtitle_apply 新增内嵌字幕选项

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4860?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-23 15:05:19 +08:00
康宇佳 75b5c458b3 合并分支 
* FIX 修复pydantic导致的问题 PERF 预先使用prompt传输格式要求，如果失败fallback到调用gemini处理格式错误
* Merge branch 'main' into cluster-gemini
* FIX 修复上传问题
* PERF 规范化gemini调用方式, 使用response_schema规范化输出
* PERF 修改gemini upload调用为规范调用
* PERF 优化prompt词提高识别准确率 FIX 修复升级httpx导致部署失败的问题
* Merge branch 'main' into cluster-gemini
* PERF 优化prompt词提高识别准确率
* FIX 修复prompt时间问题
* Merge branch 'main' into cluster-gemini
* PERF 修复时间最大限制问题
* Merge branch 'main' into cluster-gemini
* FIX 修复缩放分辨率计算问题 ADD Gemini推理改为二阶段 FIX 修复时间合并计算问题
* Merge branch 'main' into cluster-gemini
* ADD gemini数据源使用cloud storage

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4848
Co-authored-by: 康宇佳
 2025-06-20 18:42:00 +08:00
shuohigh@gmail.com 74e087e9db 去除无效引用 2025-06-20 11:22:16 +08:00
肖宇迪 5e02dc0bb3 引入Langfuse作为prompt词管理 
* - 引入了Langfuse作为prompt词管理 - 处理嵌套型pydantic model输出非嵌套json schema的报错

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4836?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-20 11:14:02 +08:00
肖宇迪 2389b4b77f 规范化vertex ai的调用方式 
* GoogleAuthUtils.GoogleGenaiClient.generate_content() 调用增加了timeout参数 默认为300秒
* 规范化VertexAI调用方式

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4827?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-19 16:41:28 +08:00
肖宇迪 5e3c91f194 测试ci cd触发时刻 
* 测试ci cd触发时刻

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4820?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-19 10:27:07 +08:00
康宇佳 dec1123534 合并分支 
* Merge branch 'main' into cluster-gemini
* PERF 修复时间最大限制问题
* Merge branch 'main' into cluster-gemini
* FIX 修复缩放分辨率计算问题 ADD Gemini推理改为二阶段 FIX 修复时间合并计算问题
* Merge branch 'main' into cluster-gemini
* ADD gemini数据源使用cloud storage

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4819
Co-authored-by: 康宇佳
 2025-06-18 19:20:34 +08:00
肖宇迪 d394d822a9 新增google cloud storage上传接口 
* 新增google cloud storage上传接口

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4818?initial=true
Co-authored-by: shuohigh@gmail.com
 2025-06-18 19:10:43 +08:00
shuohigh@gmail.com 99b303c161 Merge branch 'feature/google-upload-v2' 2025-06-18 17:28:43 +08:00
shuohigh@gmail.com 14764ff534 fix : 修复ffmpeg_media_concat使用的音频数据格式 fltp -> s16以确保aac音频编码的可用性 2025-06-18 17:27:57 +08:00
康宇佳 5932bb5090 合并分支 
* Merge branch 'main' into cluster-gemini
* FIX 修复缩放分辨率计算问题 ADD Gemini推理改为二阶段 FIX 修复时间合并计算问题
* Merge branch 'main' into cluster-gemini
* ADD gemini数据源使用cloud storage

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4817
Co-authored-by: 康宇佳
 2025-06-18 16:58:10 +08:00
shuohigh@gmail.com 1920b4bd9d fix : 修复hls直播转mp4缺少的一个参数 2025-06-18 16:57:15 +08:00
shuohigh@gmail.com 0f66ac03c2 fix : ffmpeg_slice_media 根据seek_head处理切割点时间为相对时间, 添加了实际获取片段和请求开始时间的diff差值 2025-06-18 12:35:53 +08:00
shuohigh@gmail.com 2551702443 fix : ffmpeg_slice_media 根据seek_head处理切割点时间为相对时间 2025-06-18 10:21:52 +08:00
康宇佳 40e0089308 合并分支 
* Merge branch 'main' into cluster-gemini
* ADD gemini数据源使用cloud storage

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4815
Co-authored-by: 康宇佳
 2025-06-17 19:17:01 +08:00
shuohigh@gmail.com a05cf7b069 Google Vertex AI的access token获取接口补上说明 2025-06-17 18:32:47 +08:00
shuohigh@gmail.com 79d10570e7 新增Google Vertex AI的access token获取接口 2025-06-17 17:11:00 +08:00
shuohigh@gmail.com ad41b80f4f 新增Google Vertex AI的access token获取接口 2025-06-17 16:41:48 +08:00
康宇佳 79c462d0e4 合并分支 
* Merge branch 'main' into feature/cluster-gemini
* PERF prompt存储在secrets中以便更改
* Merge remote-tracking branch 'origin/main' into feature/cluster-gemini
* FIX 修复webhook导致modal状态无法正常透传问题
* Merge branch 'main' into cluster-gemini
* PERF 尝试修复gemini推理超出思考token上限的问题

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4813
Co-authored-by: 康宇佳
 2025-06-17 15:39:32 +08:00
康宇佳 ab492d1ec4 合并分支 
* Merge remote-tracking branch 'origin/main' into feature/cluster-gemini
* FIX 修复webhook导致modal状态无法正常透传问题
* Merge branch 'main' into cluster-gemini
* PERF 尝试修复gemini推理超出思考token上限的问题

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4812
Co-authored-by: 康宇佳
 2025-06-17 14:54:31 +08:00
康宇佳 a0946960f5 合并分支 
* Merge branch 'main' into cluster-gemini
* PERF 尝试修复gemini推理超出思考token上限的问题

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4811
Co-authored-by: 康宇佳
 2025-06-17 14:10:13 +08:00
shuohigh@gmail.com 66cf37873f fix 修正slice_media输入的m3u8值 2025-06-17 11:25:15 +08:00
康宇佳 0d6cae03a4 合并分支 
* PERF 增加污染结果处理
* PERF 增加污染结果处理
* PERF 优化prompt
* PERF 优化prompt
* PERF 降低scale倍率
* PERF 提升ffmpeg_slice_media预留核心数，防止资源不足超时
* PERF 部署video_hls_slice_inference到aws容器

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4809
Co-authored-by: 康宇佳
 2025-06-16 19:33:40 +08:00
shuohigh@gmail.com 5701ac9e18 更新api version -> 0.1.7 2025-06-16 19:11:31 +08:00
康宇佳 253e68166f 合并分支 
* PERF 优化prompt
* PERF 优化prompt
* PERF 降低scale倍率
* PERF 提升ffmpeg_slice_media预留核心数，防止资源不足超时
* PERF 部署video_hls_slice_inference到aws容器

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4808
Co-authored-by: 康宇佳
 2025-06-16 19:09:48 +08:00
康宇佳 13e028a9d2 合并分支 
* ADD gemini推理增加视频尺寸缩放参数，弃用-fs文件大小限制
* Merge branch 'main' into feature/modal-cluster-gemini
* Merge branch 'main' into feature/modal-cluster-gemini
* FIX
* FIX 适配图像质量选项 FIX 修复fs参数
* Merge branch 'main' into feature/modal-cluster-gemini
* Merge branch 'main' into feature/modal-cluster-gemini
* ADD 增加大模型输出错误时间值的处理
* Merge branch 'main' into feature/modal-cluster-gemini
* FIX 修复推理问题
* Merge branch 'main' into feature/modal-cluster-gemini
* FIX 修复拼接网格图的异步失效问题
* FIX 修复拼接网格图的异步失效问题
* Merge branch 'main' into feature/modal-cluster-gemini
* Merge branch 'main' into feature/modal-cluster-gemini
* FIX 调高合成网格图容器配置
* Merge branch 'main' into feature/modal-cluster-gemini
* FIX 修复带图片模态推理接口
* PERF 优化Gemini Prompt词
* Merge remote-tracking branch 'origin/main' into feature/modal-cluster-gemini
* ADD 增加网格图片创建接口 ADD gemini推理打点增加商品封面模态 PERF gemini打点结果相邻时间线同商品合并
* Merge branch 'main' into feature/modal-cluster-gemini
* FIX 429重试机制
* FIX 修复Gemini推理函数入参
* Merge branch 'main' into feature/modal-cluster-gemini
* PERF gemini修改参数类型 ADD 增加批量删除Gemini文件接口
* PERF gemini修改prompt
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* PERF gemini修改prompt
* 录制HLS时 结果复制到S3挂载点增加一个fallback处理
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* PERF gemini修改prompt
* PERF gemini增加图像模态
* PERF gemini增加图像模态
* fix : TikHub的Logger换为Loguru
* fix : 修复直播切分视频接口
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* PERF tikhub接口增加随机延迟
* Merge remote-tracking branch 'origin/feature/modal-cluster' into feature/modal-cluster
* 合并分支
* fix : hls录制缓存读写问题
* FIX 修改冲突
* ADD 增加获取直播间指定商品数量接口
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* PERF 修改tikhub到aws
* fix : 增加s3分片上传接口
* PERF Gemini推理直接从参数列表获取商品列表 ADD Tikhub增加获取置顶|讲解中商品接口
* PERF Gemini推理直接从参数获取商品列表
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* fix 处理jpg图片的codec_name应为mjpg
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* PERF 优化返回值
* fix 获取媒体metadata的类型报错，modal client升级到1.0.2
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* PERF 风控后爬虫直接退出避免cookie失效 PERF 分离tikhub api, 使用更低的保持时间以更换IP FIX 修复Dict键不存在报错的bug
* fix 一些webhook相关的bug，添加了更详细的接口说明
* 更新直播录制为可跳转时间的hls流接口，用于替代掉腾讯VOD+火山云拉流转推，片段保证每片开头为关键帧，时间精度准确到毫秒级
* ADD 增加直播间商品增量缓存触发器
* Merge branch 'feature/modal-cluster' into feature/modal-cluster-gemini
* PERF 调整gemini prompt
* - KVCache类改为可拓展，基于环境变量设置KV space - test 环境配置与CF测试环境对齐
* FIX 修复Gemini推理视频切条的问题 PERF 优化视频切条函数性能
* ADD 基本完成gemini视频推理API
* ADD 添加内联的tikhub
* 对齐预发环境

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4807
Co-authored-by: 康宇佳，shuohigh@gmail.com
 2025-06-16 16:04:04 +08:00
shuohigh@gmail.com 2c042eece1 API接口格式更新 2025-06-16 16:02:21 +08:00
shuohigh@gmail.com f1ed7f0da9 FFMPEGSliceOptions 新增输出视频的宽高参数; limit_size换为使用bytes字节数以确保ffmpeg fs命令生效 2025-06-16 12:04:32 +08:00
shuohigh@gmail.com 86daaf46b0 staging 2025-06-13 19:32:18 +08:00