Merge branch 'dev' into ntindle/secrt-973-implement-ssrf-prevention-g…

…uidelines-in-developer
Significant-Gravitas · Nov 20, 2024 · cb9f85d · cb9f85d
2 parents 46c14a6 + 92bfbfa
commit cb9f85d
Show file tree

Hide file tree

Showing 24 changed files with 561 additions and 274 deletions.
diff --git a/.github/workflows/platform-frontend-ci.yml b/.github/workflows/platform-frontend-ci.yml
@@ -69,6 +69,10 @@ jobs:
         run: |
           cp ../supabase/docker/.env.example ../.env
 
+      - name: Copy backend .env
+        run: |
+          cp ../backend/.env.example ../backend/.env
+
       - name: Run docker compose
         run: |
           docker compose -f ../docker-compose.yml up -d

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -105,31 +105,31 @@ repos:
       - id: isort
         name: Lint (isort) - AutoGPT Platform - Backend
         alias: isort-platform-backend
-        entry: poetry -C autogpt_platform/backend run isort
+        entry: poetry -C autogpt_platform/backend run isort -p backend
         files: ^autogpt_platform/backend/
         types: [file, python]
         language: system
 
       - id: isort
         name: Lint (isort) - Classic - AutoGPT
         alias: isort-classic-autogpt
-        entry: poetry -C classic/original_autogpt run isort
+        entry: poetry -C classic/original_autogpt run isort -p autogpt
         files: ^classic/original_autogpt/
         types: [file, python]
         language: system
 
       - id: isort
         name: Lint (isort) - Classic - Forge
         alias: isort-classic-forge
-        entry: poetry -C classic/forge run isort
+        entry: poetry -C classic/forge run isort -p forge
         files: ^classic/forge/
         types: [file, python]
         language: system
 
       - id: isort
         name: Lint (isort) - Classic - Benchmark
         alias: isort-classic-benchmark
-        entry: poetry -C classic/benchmark run isort
+        entry: poetry -C classic/benchmark run isort -p agbenchmark
         files: ^classic/benchmark/
         types: [file, python]
         language: system

diff --git a/autogpt_platform/backend/backend/blocks/ai_music_generator.py b/autogpt_platform/backend/backend/blocks/ai_music_generator.py
@@ -63,7 +63,7 @@ class Input(BlockSchema):
             placeholder="e.g., 'An upbeat electronic dance track with heavy bass'",
             title="Prompt",
         )
-        model_version: MusicGenModelVersion = SchemaField(
+        music_gen_model_version: MusicGenModelVersion = SchemaField(
             description="Model to use for generation",
             default=MusicGenModelVersion.STEREO_LARGE,
             title="Model Version",
@@ -118,7 +118,7 @@ def __init__(self):
             test_input={
                 "credentials": TEST_CREDENTIALS_INPUT,
                 "prompt": "An upbeat electronic dance track with heavy bass",
-                "model_version": MusicGenModelVersion.STEREO_LARGE,
+                "music_gen_model_version": MusicGenModelVersion.STEREO_LARGE,
                 "duration": 8,
                 "temperature": 1.0,
                 "top_k": 250,
@@ -134,7 +134,7 @@ def __init__(self):
                 ),
             ],
             test_mock={
-                "run_model": lambda api_key, model_version, prompt, duration, temperature, top_k, top_p, classifier_free_guidance, output_format, normalization_strategy: "https://replicate.com/output/generated-audio-url.wav",
+                "run_model": lambda api_key, music_gen_model_version, prompt, duration, temperature, top_k, top_p, classifier_free_guidance, output_format, normalization_strategy: "https://replicate.com/output/generated-audio-url.wav",
             },
             test_credentials=TEST_CREDENTIALS,
         )
@@ -153,7 +153,7 @@ def run(
                 )
                 result = self.run_model(
                     api_key=credentials.api_key,
-                    model_version=input_data.model_version,
+                    music_gen_model_version=input_data.music_gen_model_version,
                     prompt=input_data.prompt,
                     duration=input_data.duration,
                     temperature=input_data.temperature,
@@ -182,7 +182,7 @@ def run(
     def run_model(
         self,
         api_key: SecretStr,
-        model_version: MusicGenModelVersion,
+        music_gen_model_version: MusicGenModelVersion,
         prompt: str,
         duration: int,
         temperature: float,
@@ -200,7 +200,7 @@ def run_model(
             "meta/musicgen:671ac645ce5e552cc63a54a2bbff63fcf798043055d2dac5fc9e36a837eedcfb",
             input={
                 "prompt": prompt,
-                "model_version": model_version,
+                "music_gen_model_version": music_gen_model_version,
                 "duration": duration,
                 "temperature": temperature,
                 "top_k": top_k,

diff --git a/autogpt_platform/backend/backend/server/routers/v1.py b/autogpt_platform/backend/backend/server/routers/v1.py
@@ -1,12 +1,12 @@
 import asyncio
 import logging
 from collections import defaultdict
-from typing import Annotated, Any, Dict, List
+from typing import Annotated, Any, List
 
 import pydantic
 from autogpt_libs.auth.middleware import auth_middleware
 from autogpt_libs.utils.cache import thread_cached
-from fastapi import APIRouter, Body, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException
 from typing_extensions import Optional, TypedDict
 
 import backend.data.block
@@ -504,49 +504,6 @@ async def get_execution_schedules(
     )
 
 
-########################################################
-##################### Settings ########################
-########################################################
-
-
-@v1_router.post(
-    path="/settings", tags=["settings"], dependencies=[Depends(auth_middleware)]
-)
-async def update_configuration(
-    updated_settings: Annotated[
-        Dict[str, Any],
-        Body(
-            examples=[
-                {
-                    "config": {
-                        "num_graph_workers": 10,
-                        "num_node_workers": 10,
-                    }
-                }
-            ]
-        ),
-    ],
-):
-    settings = Settings()
-    try:
-        updated_fields: dict[Any, Any] = {"config": [], "secrets": []}
-        for key, value in updated_settings.get("config", {}).items():
-            if hasattr(settings.config, key):
-                setattr(settings.config, key, value)
-                updated_fields["config"].append(key)
-        for key, value in updated_settings.get("secrets", {}).items():
-            if hasattr(settings.secrets, key):
-                setattr(settings.secrets, key, value)
-                updated_fields["secrets"].append(key)
-        settings.save()
-        return {
-            "message": "Settings updated successfully",
-            "updated_fields": updated_fields,
-        }
-    except Exception as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-
 ########################################################
 #####################  API KEY ##############################
 ########################################################

diff --git a/autogpt_platform/backend/pyproject.toml b/autogpt_platform/backend/pyproject.toml
@@ -74,6 +74,9 @@ format = "linter:format"
 lint = "linter:lint"
 test = "run_tests:test"
 
+[tool.isort]
+profile = "black"
+
 [tool.pytest-watcher]
 now = false
 clear = true

diff --git a/autogpt_platform/frontend/package.json b/autogpt_platform/frontend/package.json
@@ -23,6 +23,7 @@
     "defaults"
   ],
   "dependencies": {
+    "@faker-js/faker": "^9.2.0",
     "@hookform/resolvers": "^3.9.1",
     "@next/third-parties": "^15.0.3",
     "@radix-ui/react-avatar": "^1.1.1",
@@ -31,17 +32,17 @@
     "@radix-ui/react-context-menu": "^2.2.1",
     "@radix-ui/react-dialog": "^1.1.2",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
-    "@radix-ui/react-icons": "^1.3.1",
+    "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.2",
     "@radix-ui/react-radio-group": "^1.2.1",
-    "@radix-ui/react-scroll-area": "^1.2.0",
+    "@radix-ui/react-scroll-area": "^1.2.1",
     "@radix-ui/react-select": "^2.1.2",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.1",
     "@radix-ui/react-toast": "^1.2.2",
-    "@radix-ui/react-tooltip": "^1.1.3",
+    "@radix-ui/react-tooltip": "^1.1.4",
     "@sentry/nextjs": "^8",
     "@supabase/ssr": "^0.5.2",
     "@supabase/supabase-js": "^2.46.1",
@@ -54,13 +55,13 @@
     "cookie": "1.0.1",
     "date-fns": "^4.1.0",
     "dotenv": "^16.4.5",
-    "elliptic": "6.6.0",
-    "lucide-react": "^0.456.0",
+    "elliptic": "6.6.1",
+    "lucide-react": "^0.460.0",
     "moment": "^2.30.1",
     "next": "^14.2.13",
     "next-themes": "^0.4.3",
     "react": "^18",
-    "react-day-picker": "^9.3.0",
+    "react-day-picker": "^9.3.2",
     "react-dom": "^18",
     "react-hook-form": "^7.53.2",
     "react-icons": "^5.3.0",

diff --git a/autogpt_platform/frontend/playwright.config.ts b/autogpt_platform/frontend/playwright.config.ts
@@ -4,10 +4,10 @@ import { defineConfig, devices } from "@playwright/test";
  * Read environment variables from file.
  * https://github.com/motdotla/dotenv
  */
-// import dotenv from 'dotenv';
-// import path from 'path';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
+import dotenv from "dotenv";
+import path from "path";
+dotenv.config({ path: path.resolve(__dirname, ".env") });
+dotenv.config({ path: path.resolve(__dirname, "../backend/.env") });
 /**
  * See https://playwright.dev/docs/test-configuration.
  */

diff --git a/autogpt_platform/frontend/src/components/RunnerUIWrapper.tsx b/autogpt_platform/frontend/src/components/RunnerUIWrapper.tsx
@@ -89,7 +89,6 @@ const RunnerUIWrapper = forwardRef<RunnerUIWrapperRef, RunnerUIWrapperProps>(
       const outputs = outputBlocks.map((node) => ({
         id: node.id,
         type: "output" as const,
-        outputSchema: node.data.outputSchema as BlockIORootSchema,
         hardcodedValues: {
           name: (node.data.hardcodedValues as any).name || "Output",
           description:

diff --git a/autogpt_platform/frontend/src/components/SupabaseProvider.tsx b/autogpt_platform/frontend/src/components/SupabaseProvider.tsx
@@ -37,7 +37,9 @@ export default function SupabaseProvider({
           if (event === "SIGNED_IN") {
             api.createUser();
           }
-          router.refresh();
+          if (event === "SIGNED_OUT") {
+            router.refresh();
+          }
         });
 
         return () => {

diff --git a/autogpt_platform/frontend/src/components/edit/control/BlocksControl.tsx b/autogpt_platform/frontend/src/components/edit/control/BlocksControl.tsx
@@ -10,7 +10,7 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
-import { Block, BlockUIType } from "@/lib/autogpt-server-api";
+import { Block, BlockUIType, SpecialBlockID } from "@/lib/autogpt-server-api";
 import { MagnifyingGlassIcon, PlusIcon } from "@radix-ui/react-icons";
 import { IconToyBrick } from "@/components/ui/icons";
 import { getPrimaryCategoryColor } from "@/lib/utils";
@@ -57,7 +57,7 @@ export const BlocksControl: React.FC<BlocksControlProps> = ({
     const agentList = flows.map(
       (flow) =>
         ({
-          id: "e189baac-8c20-45a1-94a7-55177ea42565", // TODO: fetch this programmatically.
+          id: SpecialBlockID.AGENT,
           name: flow.name,
           description:
             `Ver.${flow.version}` +