Commit Graph

132 Commits

Author SHA1 Message Date
kyj@bowong.ai 1a134cd779 ADD Gemini接口改为可不传参考图 2025-07-21 18:35:57 +08:00
kyj@bowong.ai aaae9060df ADD MiniMax增加克隆音色和tts接口 2025-07-21 15:36:26 +08:00
kyj@bowong.ai 8f499ef092 ADD 添加音乐生成接口 2025-07-17 11:28:40 +08:00
kyj@bowong.ai 2910e30446 PERF 更新midjourney接口 2025-07-14 13:48:29 +08:00
kyj@bowong.ai 2d61b30c2f FIX 修复图像编辑推理问题
ADD 增加midjourney接口
2025-07-11 18:37:21 +08:00
kyj@bowong.ai 4c6c49b7ba ADD 增加图像编辑推理接口 2025-07-11 15:21:00 +08:00
kyj@bowong.ai 720d8e212c PERF 分离glam 2025-07-04 19:10:37 +08:00
kyj@bowong.ai e1fdae1bcf PATCH glam更新 2025-07-02 10:13:12 +08:00
kyj@bowong.ai caa09756fe PATCH glam适配多用户 2025-07-01 14:10:56 +08:00
kyj@bowong.ai b7187c88fe PATCH 引入子仓库 2025-06-30 14:53:34 +08:00
kyj@bowong.ai 5d9bb20066 PATCH glam_app适配子仓库部署
ADD tikhub_api增加视频下载api
2025-06-30 14:45:41 +08:00
kyj@bowong.ai ebd905d656 FIX 2025-06-27 19:38:14 +08:00
kyj@bowong.ai 6740c4a03f FIX 增加jm_router 2025-06-27 19:30:33 +08:00
kyj@bowong.ai ef687a0487 Merge branch 'main' into cluster-gemini
# Conflicts:
#	src/cluster/video_apps/hls_slice_inference.py
2025-06-26 20:14:06 +08:00
kyj@bowong.ai a0cbf5a678 FIX 修复json 2025-06-26 20:13:06 +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
kyj@bowong.ai d9c222e4cb Merge branch 'main' into cluster-gemini
# Conflicts:
#	src/BowongModalFunctions/utils/HTTPUtils.py
#	src/cluster/video_apps/hls_slice_inference.py
2025-06-25 19:02:48 +08:00
kyj@bowong.ai 45cbe7db3a FIX 修复返回值问题 2025-06-25 19:00:58 +08:00
kyj@bowong.ai f29430bf00 PERF 适配system instruction 2025-06-25 16:20:35 +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