removed celery to save memory

App/Editor/editorRoutes.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, HTTPException, status
+from fastapi import APIRouter, HTTPException, status, BackgroundTasks
 from .Schema import EditorRequest, TaskInfo
 from App.Worker import celery_task
 from celery.result import AsyncResult
@@ -7,9 +7,10 @@ videditor_router = APIRouter(tags=["vidEditor"])
 
 
 @videditor_router.post("/create-video")
-async def create_video(videoRequest: EditorRequest):
-    result = celery_task.delay(videoRequest)
-    return {"task_id": result.task_id}
+async def create_video(videoRequest: EditorRequest, background_task: BackgroundTasks):
+    background_task.add_task(celery_task, videoRequest)
+    # result = celery_task.delay(videoRequest)
+    return {"task_id": "started"}
 
 
 @videditor_router.get("/progress/{task_id}", response_model=TaskInfo)

App/Worker.py

@@ -10,15 +10,15 @@ from asgiref.sync import async_to_sync
 import json
 import os
 
-celery = Celery()
-celery.config_from_object(celery_config)
-celery.conf.update(
-    # Other Celery configuration settings
-    CELERYD_LOG_LEVEL="DEBUG",  # Set log level to DEBUG for the worker
-)
+# celery = Celery()
+# celery.config_from_object(celery_config)
+# celery.conf.update(
+#     # Other Celery configuration settings
+#     CELERYD_LOG_LEVEL="DEBUG",  # Set log level to DEBUG for the worker
+# )
 
 
-@celery.task(name="CreateFile")
+# @celery.task(name="CreateFile")
 def create_json_file(assets: List[Assets], asset_dir: str):
     for asset in assets:
         filename = f"{asset.type.capitalize()}Sequences.json"
@@ -48,7 +48,7 @@ def download_with_wget(link, download_dir, filename):
     subprocess.run(["aria2c", link, "-d", download_dir, "-o", filename])
 
 
-@celery.task(name="CopyRemotion")
+# @celery.task(name="CopyRemotion")
 def copy_remotion_app(src: str, dest: str):
     shutil.copytree(src, dest)
 
@@ -57,7 +57,7 @@ def copy_remotion_app(src: str, dest: str):
     # create_symlink(source_dir, target_dir=dest, symlink_name="node_module")
 
 
-@celery.task(name="Unsilence")
+# @celery.task(name="Unsilence")
 def unsilence(directory: str):
     output_dir = os.path.join(directory, "out/video.mp4")
     shortered_dir = os.path.join(directory, "out/temp.mp4")
@@ -66,13 +66,13 @@ def unsilence(directory: str):
     os.rename(shortered_dir, output_dir)
 
 
-@celery.task(name="InstallDependency")
+# @celery.task(name="InstallDependency")
 def install_dependencies(directory: str):
     os.chdir(directory)
     os.system("npm install")
 
 
-@celery.task(name="DownloadAssets")
+# @celery.task(name="DownloadAssets")
 def download_assets(links: List[LinkInfo], temp_dir: str):
     public_dir = f"{temp_dir}/public"
     for link in links:
@@ -81,7 +81,7 @@ def download_assets(links: List[LinkInfo], temp_dir: str):
         download_with_wget(file_link, public_dir, file_name)
 
 
-@celery.task(name="RenderFile")
+# @celery.task(name="RenderFile")
 def render_video(directory: str, output_directory: str):
     os.chdir(directory)
     os.system(f"npm run build --output {output_directory}")
@@ -90,7 +90,7 @@ def render_video(directory: str, output_directory: str):
     print("complete")
 
 
-@celery.task(name="send")
+# @celery.task(name="send")
 def cleanup_temp_directory(
     temp_dir: str, output_dir: str, chat_id: int = -1002069945904
 ):
@@ -105,7 +105,7 @@ def cleanup_temp_directory(
         shutil.rmtree(temp_dir, ignore_errors=True)
 
 
-@celery.task(name="All")
+# @celery.task(name="All")
 def celery_task(video_task: EditorRequest):
     remotion_app_dir = os.path.join("/srv", "Remotion-app")
     project_id = str(uuid.uuid4())
@@ -114,17 +114,25 @@ def celery_task(video_task: EditorRequest):
 
     assets_dir = os.path.join(temp_dir, "src/HelloWorld/Assets")
 
-    chain(
-        copy_remotion_app.si(remotion_app_dir, temp_dir),
-        install_dependencies.si(temp_dir),
-        create_json_file.si(video_task.assets, assets_dir),
-        download_assets.si(video_task.links, temp_dir) if video_task.links else None,
-        render_video.si(temp_dir, output_dir),
-        # unsilence.si(temp_dir),
-        cleanup_temp_directory.si(temp_dir, output_dir),
-    ).apply_async(
-        # link_error=handle_error
-    )  # Link the tasks and handle errors
+    copy_remotion_app(remotion_app_dir, temp_dir),
+    install_dependencies(temp_dir),
+    create_json_file(video_task.assets, assets_dir),
+    download_assets(video_task.links, temp_dir) if video_task.links else None,
+    render_video(temp_dir, output_dir),
+    # unsilence.si(temp_dir),
+    cleanup_temp_directory.si(temp_dir, output_dir),
+
+    # chain(
+    #     copy_remotion_app.si(remotion_app_dir, temp_dir),
+    #     install_dependencies.si(temp_dir),
+    #     create_json_file.si(video_task.assets, assets_dir),
+    #     download_assets.si(video_task.links, temp_dir) if video_task.links else None,
+    #     render_video.si(temp_dir, output_dir),
+    #     # unsilence.si(temp_dir),
+    #     cleanup_temp_directory.si(temp_dir, output_dir),
+    # ).apply_async(
+    #     # link_error=handle_error
+    # )  # Link the tasks and handle errors
 
 
 def handle_error(task_id, err, *args, **kwargs):

Dockerfile

@@ -69,6 +69,9 @@ RUN pipx install unsilence
 
 
 # Command to run the application
-CMD python -m uvicorn App.app:app --host 0.0.0.0 --port 7860 &  python -m celery -A App.Worker.celery worker -c 4  --max-tasks-per-child=1 
+# CMD python -m uvicorn App.app:app --host 0.0.0.0 --port 7860 &  python -m celery -A App.Worker.celery worker -c 4  --max-tasks-per-child=1 
+
+CMD python -m uvicorn App.app:app --host 0.0.0.0  --port 7860  --workers 4
+
 
 EXPOSE 7860