From 78476630cdff8875df59bfef7e7bdbf5fe18943f Mon Sep 17 00:00:00 2001 From: SwiftyOS Date: Wed, 20 Nov 2024 12:47:35 +0100 Subject: [PATCH] fix migrations --- .../migration.sql | 35 ++++++++++++++----- .../migration.sql | 0 autogpt_platform/backend/poetry.lock | 4 +++ .../backend/test/test_data_creator.py | 10 ++++-- 4 files changed, 38 insertions(+), 11 deletions(-) rename autogpt_platform/backend/migrations/{20241108115626_agent_store_v2 => 20241120113710_agent_store_v2}/migration.sql (88%) rename autogpt_platform/backend/migrations/{20241108125626_agent_store_v2_views => 20241120113813_agent_store_v2_views}/migration.sql (100%) diff --git a/autogpt_platform/backend/migrations/20241108115626_agent_store_v2/migration.sql b/autogpt_platform/backend/migrations/20241120113710_agent_store_v2/migration.sql similarity index 88% rename from autogpt_platform/backend/migrations/20241108115626_agent_store_v2/migration.sql rename to autogpt_platform/backend/migrations/20241120113710_agent_store_v2/migration.sql index 6134ed6f9a..5d7914f65d 100644 --- a/autogpt_platform/backend/migrations/20241108115626_agent_store_v2/migration.sql +++ b/autogpt_platform/backend/migrations/20241120113710_agent_store_v2/migration.sql @@ -1,15 +1,9 @@ -- CreateEnum CREATE TYPE "SubmissionStatus" AS ENUM ('DAFT', 'PENDING', 'APPROVED', 'REJECTED'); --- AlterTable -ALTER TABLE "AgentGraph" ADD COLUMN "agentGraphParentId" TEXT; - -- AlterTable ALTER TABLE "AgentGraphExecution" ADD COLUMN "agentPresetId" TEXT; --- AlterTable -ALTER TABLE "AgentGraphExecutionSchedule" ADD COLUMN "agentPresetId" TEXT; - -- AlterTable ALTER TABLE "AgentNodeExecutionInputOutput" ADD COLUMN "agentPresetId" TEXT; @@ -51,6 +45,23 @@ CREATE TABLE "UserAgent" ( CONSTRAINT "UserAgent_pkey" PRIMARY KEY ("id") ); +-- CreateTable +CREATE TABLE "AgentGraphExecutionSchedule" ( + "id" TEXT NOT NULL, + "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updatedAt" TIMESTAMP(3), + "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" TIMESTAMP(3) NOT NULL, + "userId" TEXT NOT NULL, + "agentPresetId" TEXT, + + CONSTRAINT "AgentGraphExecutionSchedule_pkey" PRIMARY KEY ("id") +); + -- CreateTable CREATE TABLE "Profile" ( "id" TEXT NOT NULL, @@ -137,6 +148,9 @@ CREATE INDEX "AgentPreset_userId_idx" ON "AgentPreset"("userId"); -- CreateIndex CREATE INDEX "UserAgent_userId_idx" ON "UserAgent"("userId"); +-- CreateIndex +CREATE INDEX "AgentGraphExecutionSchedule_isEnabled_idx" ON "AgentGraphExecutionSchedule"("isEnabled"); + -- CreateIndex CREATE UNIQUE INDEX "Profile_username_key" ON "Profile"("username"); @@ -167,9 +181,6 @@ CREATE INDEX "StoreListingSubmission_storeListingId_idx" ON "StoreListingSubmiss -- CreateIndex CREATE INDEX "StoreListingSubmission_Status_idx" ON "StoreListingSubmission"("Status"); --- AddForeignKey -ALTER TABLE "AgentGraph" ADD CONSTRAINT "AgentGraph_agentGraphParentId_version_fkey" FOREIGN KEY ("agentGraphParentId", "version") REFERENCES "AgentGraph"("id", "version") ON DELETE CASCADE ON UPDATE CASCADE; - -- AddForeignKey ALTER TABLE "AgentPreset" ADD CONSTRAINT "AgentPreset_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; @@ -191,6 +202,12 @@ ALTER TABLE "AgentGraphExecution" ADD CONSTRAINT "AgentGraphExecution_agentPrese -- AddForeignKey ALTER TABLE "AgentNodeExecutionInputOutput" ADD CONSTRAINT "AgentNodeExecutionInputOutput_agentPresetId_fkey" FOREIGN KEY ("agentPresetId") REFERENCES "AgentPreset"("id") ON DELETE SET NULL ON UPDATE CASCADE; +-- AddForeignKey +ALTER TABLE "AgentGraphExecutionSchedule" ADD CONSTRAINT "AgentGraphExecutionSchedule_agentGraphId_agentGraphVersion_fkey" FOREIGN KEY ("agentGraphId", "agentGraphVersion") REFERENCES "AgentGraph"("id", "version") ON DELETE CASCADE ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "AgentGraphExecutionSchedule" ADD CONSTRAINT "AgentGraphExecutionSchedule_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE; + -- AddForeignKey ALTER TABLE "AgentGraphExecutionSchedule" ADD CONSTRAINT "AgentGraphExecutionSchedule_agentPresetId_fkey" FOREIGN KEY ("agentPresetId") REFERENCES "AgentPreset"("id") ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/autogpt_platform/backend/migrations/20241108125626_agent_store_v2_views/migration.sql b/autogpt_platform/backend/migrations/20241120113813_agent_store_v2_views/migration.sql similarity index 100% rename from autogpt_platform/backend/migrations/20241108125626_agent_store_v2_views/migration.sql rename to autogpt_platform/backend/migrations/20241120113813_agent_store_v2_views/migration.sql diff --git a/autogpt_platform/backend/poetry.lock b/autogpt_platform/backend/poetry.lock index 55cd8ca730..b3e93e902e 100644 --- a/autogpt_platform/backend/poetry.lock +++ b/autogpt_platform/backend/poetry.lock @@ -4116,4 +4116,8 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" +<<<<<<< Updated upstream content-hash = "0b2bdc34bde2b2c8b81ad382cf8ef7a7b858153b3db76ffb0e7f5ce5e8bcf787" +======= +content-hash = "769bf89e5514b6bb56c13291bf0eb50a424ab5747cb4af22c92fc211035c27f1" +>>>>>>> Stashed changes diff --git a/autogpt_platform/backend/test/test_data_creator.py b/autogpt_platform/backend/test/test_data_creator.py index 0fd703720d..3cc82eb1cd 100644 --- a/autogpt_platform/backend/test/test_data_creator.py +++ b/autogpt_platform/backend/test/test_data_creator.py @@ -39,6 +39,12 @@ MIN_REVIEWS_PER_VERSION = 1 # Each version will have between 1-3 reviews MAX_REVIEWS_PER_VERSION = 5 # Total reviews depends on number of versions created +def get_image(): + url = faker.image_url() + while "placekitten.com" in url: + url = faker.image_url() + return url + async def main(): db = Prisma() await db.connect() @@ -334,7 +340,7 @@ async def main(): "username": faker.unique.user_name(), "description": faker.text(), "links": [faker.url() for _ in range(3)], - "avatarUrl": faker.image_url(), + "avatarUrl": get_image(), } ) profiles.append(profile) @@ -367,7 +373,7 @@ async def main(): "name": graph.name or faker.sentence(nb_words=3), "subHeading": faker.sentence(), "videoUrl": faker.url(), - "imageUrls": [faker.image_url() for _ in range(3)], + "imageUrls": [get_image() for _ in range(3)], "description": faker.text(), "categories": [faker.word() for _ in range(3)], "isFeatured": random.choice([True, False]),