Make all green

rnd/autogpt_server/autogpt_server/data/execution.py

@@ -120,7 +120,7 @@ async def create_graph_execution(
     graph_id: str,
     graph_version: int,
     nodes_input: list[tuple[str, BlockInput]],
-    user_id: str,
+    user_id: str | None = None,
 ) -> tuple[str, list[ExecutionResult]]:
     """
     Create a new AgentGraphExecution record.
@@ -148,7 +148,7 @@ async def create_graph_execution(
             },
             "userId": user_id,
         },
-        include={"AgentNodeExecutions": {"include": EXECUTION_RESULT_INCLUDE}},
+        include={"AgentNodeExecutions": {"include": EXECUTION_RESULT_INCLUDE}},  # type: ignore
     )
 
     return result.id, [
@@ -284,7 +284,7 @@ async def get_graph_execution(
     """
     execution = await AgentGraphExecution.prisma().find_first(
         where={"id": graph_exec_id, "userId": user_id},
-        include={"AgentNodeExecutions": {"include": EXECUTION_RESULT_INCLUDE}},
+        include={"AgentNodeExecutions": {"include": EXECUTION_RESULT_INCLUDE}},  # type: ignore
     )
     return execution
 

rnd/autogpt_server/autogpt_server/data/graph.py

@@ -294,6 +294,7 @@ async def get_graphs_meta(
 
     Args:
         filter_by: An optional filter to either select templates or active graphs.
+        user_id: An optional user ID to filter the graphs by.
 
     Returns:
         list[GraphMeta]: A list of objects representing the retrieved graph metadata.

rnd/autogpt_server/autogpt_server/executor/manager.py

@@ -466,7 +466,7 @@ class ExecutionManager(AppService):
 
     @expose
     def add_execution(
-        self, graph_id: str, data: BlockInput, user_id: str
+        self, graph_id: str, data: BlockInput, user_id: str | None = None
     ) -> dict[str, Any]:
         graph: Graph | None = self.run_and_wait(get_graph(graph_id, user_id=user_id))
         if not graph:

rnd/autogpt_server/autogpt_server/executor/scheduler.py

@@ -37,6 +37,7 @@ class ExecutionScheduler(AppService):
     def __refresh_jobs_from_db(self, scheduler: BackgroundScheduler):
         schedules = self.run_and_wait(model.get_active_schedules(self.last_check))
         for schedule in schedules:
+            if schedule.last_updated:
                 self.last_check = max(self.last_check, schedule.last_updated)
 
             if not schedule.is_enabled:

rnd/autogpt_server/migrations/20240828204627_make_user_id_optional/migration.sql

@@ -0,0 +1,20 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_AgentGraphExecutionSchedule" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "agentGraphId" TEXT NOT NULL,
+    "agentGraphVersion" INTEGER NOT NULL DEFAULT 1,
+    "schedule" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "inputData" TEXT NOT NULL,
+    "lastUpdated" DATETIME NOT NULL,
+    "userId" TEXT,
+    CONSTRAINT "AgentGraphExecutionSchedule_agentGraphId_agentGraphVersion_fkey" FOREIGN KEY ("agentGraphId", "agentGraphVersion") REFERENCES "AgentGraph" ("id", "version") ON DELETE RESTRICT ON UPDATE CASCADE,
+    CONSTRAINT "AgentGraphExecutionSchedule_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_AgentGraphExecutionSchedule" ("agentGraphId", "agentGraphVersion", "id", "inputData", "isEnabled", "lastUpdated", "schedule", "userId") SELECT "agentGraphId", "agentGraphVersion", "id", "inputData", "isEnabled", "lastUpdated", "schedule", "userId" FROM "AgentGraphExecutionSchedule";
+DROP TABLE "AgentGraphExecutionSchedule";
+ALTER TABLE "new_AgentGraphExecutionSchedule" RENAME TO "AgentGraphExecutionSchedule";
+CREATE INDEX "AgentGraphExecutionSchedule_isEnabled_idx" ON "AgentGraphExecutionSchedule"("isEnabled");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

rnd/autogpt_server/postgres/migrations/20240828204820_make_user_id_optional/migration.sql

@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "AgentGraphExecutionSchedule" DROP CONSTRAINT "AgentGraphExecutionSchedule_userId_fkey";
+
+-- AlterTable
+ALTER TABLE "AgentGraphExecutionSchedule" ALTER COLUMN "userId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "AgentGraphExecutionSchedule" ADD CONSTRAINT "AgentGraphExecutionSchedule_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;

rnd/autogpt_server/postgres/schema.prisma

@@ -184,8 +184,8 @@ model AgentGraphExecutionSchedule {
   lastUpdated DateTime @updatedAt
 
   // Link to User model
-  userId String
-  user   User   @relation(fields: [userId], references: [id])
+  userId String?
+  user   User?   @relation(fields: [userId], references: [id])
 
   @@index([isEnabled])
 }

rnd/autogpt_server/schema.prisma

@@ -183,8 +183,8 @@ model AgentGraphExecutionSchedule {
   lastUpdated DateTime @updatedAt
 
   // Link to User model
-  userId String
-  user   User   @relation(fields: [userId], references: [id])
+  userId String?
+  user   User?   @relation(fields: [userId], references: [id])
 
   @@index([isEnabled])
 }