fix: schedule

apps/server/controllers/schedule.py

@@ -1,9 +1,10 @@
 from typing import List
 
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
 from fastapi_sqlalchemy import db
 
 from exceptions import ScheduleNotFoundException
+from models.db import create_session
 from models.schedule import ScheduleModel
 from services.schedule import execute_scheduled_run
 from typings.auth import UserAccount
@@ -40,6 +41,7 @@ def run_schedule(schedule_id: str):
 @router.post("", status_code=201, response_model=ScheduleWithConfigsOutput)
 def create_schedule(
     schedule_with_configs: ScheduleConfigInput,
+    background_tasks: BackgroundTasks,
     auth: UserAccount = Depends(authenticate),
 ) -> ScheduleWithConfigsOutput:
     """
@@ -68,6 +70,9 @@ def create_schedule(
         ScheduleModel.get_schedule_by_id(db, db_schedule.id, auth.account)
     )
 
+    if not schedule_with_configs.configs.is_recurring:
+        background_tasks.add_task(execute_scheduled_run, create_session(), db_schedule)
+
     return schedule_with_configs
 
 
@@ -77,6 +82,7 @@ def create_schedule(
 def update_schedule(
     id: str,
     schedule_with_configs: ScheduleConfigInput,
+    background_tasks: BackgroundTasks,
     auth: UserAccount = Depends(authenticate),
 ) -> ScheduleWithConfigsOutput:
     """
@@ -101,8 +107,13 @@ def update_schedule(
         )
 
         db_schedule.next_run_date = schedule_with_configs.schedule.start_date
-
         db.session.commit()
+
+        if not schedule_with_configs.configs.is_recurring:
+            background_tasks.add_task(
+                execute_scheduled_run, create_session(), db_schedule
+            )
+
         return convert_model_to_response(
             ScheduleModel.get_schedule_by_id(db, db_schedule.id, auth.account)
         )

apps/server/services/schedule.py

@@ -5,9 +5,9 @@
 
 from models.chat import ChatModel
 from models.schedule import ScheduleModel
-from services.chat import create_client_message
+from services.chat import create_client_message, create_user_message
 from typings.auth import UserAccount
-from typings.chat import ChatInput, ChatMessageInput
+from typings.chat import ChatInput, ChatMessageInput, ChatUserMessageInput
 from typings.schedule import ScheduleStatus
 from utils.schedule import convert_model_to_response
 
@@ -61,10 +61,18 @@ def execute_scheduled_run(
         for task in configs.tasks:
             prompt += f"- {task}\n"
 
-        create_client_message(
-            body=ChatMessageInput(prompt=prompt, chat_id=chat.id if chat else None),
-            auth=UserAccount(user=user.to_dict(), account=account.to_dict()),
-        )
+        if chat:
+            create_client_message(
+                body=ChatMessageInput(prompt=prompt, chat_id=chat.id if chat else None),
+                auth=UserAccount(user=user.to_dict(), account=account.to_dict()),
+            )
+        else:
+            create_user_message(
+                body=ChatUserMessageInput(
+                    prompt=prompt, agent_id=configs.agent_id, team_id=configs.team_id
+                ),
+                auth=UserAccount(user=user.to_dict(), account=account.to_dict()),
+            )
 
         # Check if the schedule is recurring and the end date is not exceeded
         if schedule_with_configs.configs.is_recurring: