comi-logic/modalDeploy
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/modal-cluster' into feature/temp-comfy-cluster

Browse Source 
# Conflicts:
#	.idea/misc.xml
#	.idea/modalDeploy.iml
#	src/BowongModalFunctions/api.py
This commit is contained in:
kyj@bowong.ai
2025-05-16 18:19:21 +08:00
parent ee62ff7cbd d7a0254010
commit 8f60f205ed
15 changed files with 49 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cluster/ffmpeg_app.py
View File

@@ -133,16 +133,15 @@ with ffmpeg_worker_image.imports():
input_videos = [f"{s3_mount}/{media_source.cache_filepath}" for media_source in media_sources.inputs]
local_output_path = await VideoUtils.ffmpeg_concat_medias(media_paths=input_videos,
output_path=output_filepath)
return local_output_path
s3_outputs = local_copy_to_s3([local_output_path])
return s3_outputs[0]
output_path = f"{output_path_prefix}/{config.modal_environment}/concat/outputs/{fn_id}/output.mp4"
local_output = await ffmpeg_process(media_sources=medias, output_filepath=output_path)
s3_outputs = local_copy_to_s3([local_output])
s3_output = await ffmpeg_process(media_sources=medias, output_filepath=output_path)
if not sentry_trace:
sentry_trace = SentryTransactionInfo(x_trace_id=sentry_sdk.get_traceparent(),
x_baggage=sentry_sdk.get_baggage())
return s3_outputs[0], sentry_trace
return s3_output, sentry_trace
@app.function(