From c03e2fb9492550cc7c543cf4a5d6b6f352c86a0b Mon Sep 17 00:00:00 2001 From: Aarushi <50577581+aarushik93@users.noreply.github.com> Date: Thu, 10 Oct 2024 00:13:46 +0100 Subject: [PATCH] tweak(platform): Remove importing templates from local dir (#8276) * always filter on user id * add user id to doc string * fix linting * fix imports function * remove import templates from local directory --- .../backend/backend/data/graph.py | 31 ------------------- .../backend/backend/server/rest_api.py | 3 -- 2 files changed, 34 deletions(-) diff --git a/autogpt_platform/backend/backend/data/graph.py b/autogpt_platform/backend/backend/data/graph.py index 27be75ba55..991bef1f3f 100644 --- a/autogpt_platform/backend/backend/data/graph.py +++ b/autogpt_platform/backend/backend/data/graph.py @@ -2,7 +2,6 @@ import asyncio import logging import uuid from datetime import datetime, timezone -from pathlib import Path from typing import Any, Literal import prisma.types @@ -15,7 +14,6 @@ from backend.blocks.basic import AgentInputBlock, AgentOutputBlock from backend.data.block import BlockInput, get_block, get_blocks from backend.data.db import BaseDbModel, transaction from backend.data.execution import ExecutionStatus -from backend.data.user import DEFAULT_USER_ID from backend.util import json logger = logging.getLogger(__name__) @@ -611,32 +609,3 @@ async def __create_graph(tx, graph: Graph, user_id: str): for link in graph.links ] ) - - -# --------------------- Helper functions --------------------- # - - -TEMPLATES_DIR = Path(__file__).parent.parent.parent / "graph_templates" - - -async def import_packaged_templates() -> None: - templates_in_db = await get_graphs_meta( - user_id=DEFAULT_USER_ID, filter_by="template" - ) - - logging.info("Loading templates...") - for template_file in TEMPLATES_DIR.glob("*.json"): - template_data = json.loads(template_file.read_bytes()) - - template = Graph.model_validate(template_data) - if not template.is_template: - logging.warning( - f"pre-packaged graph file {template_file} is not a template" - ) - continue - if ( - exists := next((t for t in templates_in_db if t.id == template.id), None) - ) and exists.version >= template.version: - continue - await create_graph(template, DEFAULT_USER_ID) - logging.info(f"Loaded template '{template.name}' ({template.id})") diff --git a/autogpt_platform/backend/backend/server/rest_api.py b/autogpt_platform/backend/backend/server/rest_api.py index cc978521c5..f768d3927c 100644 --- a/autogpt_platform/backend/backend/server/rest_api.py +++ b/autogpt_platform/backend/backend/server/rest_api.py @@ -15,7 +15,6 @@ from typing_extensions import TypedDict from backend.data import block, db from backend.data import execution as execution_db from backend.data import graph as graph_db -from backend.data import user as user_db from backend.data.block import BlockInput, CompletedBlockOutput from backend.data.credit import get_block_costs, get_user_credit_model from backend.data.queue import RedisEventQueue @@ -45,8 +44,6 @@ class AgentServer(AppService): await db.connect() self.event_queue.connect() await block.initialize_blocks() - if await user_db.create_default_user(settings.config.enable_auth): - await graph_db.import_packaged_templates() yield self.event_queue.close() await db.disconnect()