lint

- Updated GraphModel to validate field dependencies and required fields in input data.

.deepsource.toml

@@ -1,18 +0,0 @@
-version = 1
-
-test_patterns = ["**/*.spec.ts","**/*_test.py","**/*_tests.py","**/test_*.py"]
-
-exclude_patterns = ["classic/**"]
-
-[[analyzers]]
-name = "javascript"
-
-[analyzers.meta]
-plugins = ["react"]
-environment = ["nodejs"]
-
-[[analyzers]]
-name = "python"
-
-[analyzers.meta]
-runtime_version = "3.x.x"

.dockerignore

@@ -1,61 +1,40 @@
 # Ignore everything by default, selectively add things to context
-*
+classic/run
 
-# Platform - Libs
-!autogpt_platform/autogpt_libs/autogpt_libs/
-!autogpt_platform/autogpt_libs/pyproject.toml
-!autogpt_platform/autogpt_libs/poetry.lock
-!autogpt_platform/autogpt_libs/README.md
-
-# Platform - Backend
-!autogpt_platform/backend/backend/
-!autogpt_platform/backend/migrations/
-!autogpt_platform/backend/schema.prisma
-!autogpt_platform/backend/pyproject.toml
-!autogpt_platform/backend/poetry.lock
-!autogpt_platform/backend/README.md
-
-# Platform - Market
-!autogpt_platform/market/market/
-!autogpt_platform/market/scripts.py
-!autogpt_platform/market/schema.prisma
-!autogpt_platform/market/pyproject.toml
-!autogpt_platform/market/poetry.lock
-!autogpt_platform/market/README.md
-
-# Platform - Frontend
-!autogpt_platform/frontend/src/
-!autogpt_platform/frontend/public/
-!autogpt_platform/frontend/package.json
-!autogpt_platform/frontend/yarn.lock
-!autogpt_platform/frontend/tsconfig.json
-!autogpt_platform/frontend/README.md
-## config
-!autogpt_platform/frontend/*.config.*
-!autogpt_platform/frontend/.env.*
-
-# Classic - AutoGPT
+# AutoGPT
 !classic/original_autogpt/autogpt/
 !classic/original_autogpt/pyproject.toml
 !classic/original_autogpt/poetry.lock
 !classic/original_autogpt/README.md
 !classic/original_autogpt/tests/
 
-# Classic - Benchmark
+# Benchmark
 !classic/benchmark/agbenchmark/
 !classic/benchmark/pyproject.toml
 !classic/benchmark/poetry.lock
 !classic/benchmark/README.md
 
-# Classic - Forge
+# Forge
 !classic/forge/
 !classic/forge/pyproject.toml
 !classic/forge/poetry.lock
 !classic/forge/README.md
 
-# Classic - Frontend
+# Frontend
 !classic/frontend/build/web/
 
+# Platform
+!autogpt_platform/
+
 # Explicitly re-ignore some folders
 .*
 **/__pycache__
+
+autogpt_platform/frontend/.next/
+autogpt_platform/frontend/node_modules
+autogpt_platform/frontend/.env.example
+autogpt_platform/frontend/.env.local
+autogpt_platform/backend/.env
+autogpt_platform/backend/.venv/
+
+autogpt_platform/market/.env

.github/dependabot.yml

@@ -7,9 +7,6 @@ updates:
       interval: "weekly"
     open-pull-requests-limit: 10
     target-branch: "dev"
-    commit-message:
-      prefix: "chore(libs/deps)"
-      prefix-development: "chore(libs/deps-dev)"
     groups:
       production-dependencies:
         dependency-type: "production"
@@ -29,9 +26,6 @@ updates:
       interval: "weekly"
     open-pull-requests-limit: 10
     target-branch: "dev"
-    commit-message:
-      prefix: "chore(backend/deps)"
-      prefix-development: "chore(backend/deps-dev)"
     groups:
       production-dependencies:
         dependency-type: "production"
@@ -44,6 +38,7 @@ updates:
         - "minor"
         - "patch"
 
+
   # frontend (Next.js project)
   - package-ecosystem: "npm"
     directory: "autogpt_platform/frontend"
@@ -51,9 +46,6 @@ updates:
       interval: "weekly"
     open-pull-requests-limit: 10
     target-branch: "dev"
-    commit-message:
-      prefix: "chore(frontend/deps)"
-      prefix-development: "chore(frontend/deps-dev)"
     groups:
       production-dependencies:
         dependency-type: "production"
@@ -66,6 +58,7 @@ updates:
         - "minor"
         - "patch"
 
+
   # infra (Terraform)
   - package-ecosystem: "terraform"
     directory: "autogpt_platform/infra"
@@ -73,10 +66,26 @@ updates:
       interval: "weekly"
     open-pull-requests-limit: 5
     target-branch: "dev"
-    commit-message:
-      prefix: "chore(infra/deps)"
-      prefix-development: "chore(infra/deps-dev)"
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+        update-types:
+        - "minor"
+        - "patch"
+      development-dependencies:
+        dependency-type: "development"
+        update-types:
+        - "minor"
+        - "patch"
 
+
+  # market (Poetry project)
+  - package-ecosystem: "pip"
+    directory: "autogpt_platform/market"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    target-branch: "dev"
     groups:
       production-dependencies:
         dependency-type: "production"
@@ -129,15 +138,34 @@ updates:
         - "minor"
         - "patch"
 
-  # Docs
-  - package-ecosystem: 'pip'
-    directory: "docs/"
+
+  # Submodules
+  - package-ecosystem: "gitsubmodule"
+    directory: "autogpt_platform/supabase"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 1
+    target-branch: "dev"
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+        update-types:
+        - "minor"
+        - "patch"
+      development-dependencies:
+        dependency-type: "development"
+        update-types:
+        - "minor"
+        - "patch"
+
+
+  # Docs
+  - package-ecosystem: 'pip'
+    directory: "docs/"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 1
     target-branch: "dev"
-    commit-message:
-      prefix: "chore(docs/deps)"
     groups:
       production-dependencies:
         dependency-type: "production"

.github/workflows/classic-autogpt-ci.yml

@@ -115,7 +115,6 @@ jobs:
           poetry run pytest -vv \
             --cov=autogpt --cov-branch --cov-report term-missing --cov-report xml \
             --numprocesses=logical --durations=10 \
-            --junitxml=junit.xml -o junit_family=legacy \
             tests/unit tests/integration
         env:
           CI: true
@@ -125,14 +124,8 @@ jobs:
           AWS_ACCESS_KEY_ID: minioadmin
           AWS_SECRET_ACCESS_KEY: minioadmin
 
-      - name: Upload test results to Codecov
-        if: ${{ !cancelled() }}  # Run even if tests fail
-        uses: codecov/test-results-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: autogpt-agent,${{ runner.os }}

.github/workflows/classic-benchmark-ci.yml

@@ -87,20 +87,13 @@ jobs:
           poetry run pytest -vv \
             --cov=agbenchmark --cov-branch --cov-report term-missing --cov-report xml \
             --durations=10 \
-            --junitxml=junit.xml -o junit_family=legacy \
             tests
         env:
           CI: true
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
 
-      - name: Upload test results to Codecov
-        if: ${{ !cancelled() }}  # Run even if tests fail
-        uses: codecov/test-results-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: agbenchmark,${{ runner.os }}

.github/workflows/classic-forge-ci.yml

@@ -139,7 +139,6 @@ jobs:
           poetry run pytest -vv \
             --cov=forge --cov-branch --cov-report term-missing --cov-report xml \
             --durations=10 \
-            --junitxml=junit.xml -o junit_family=legacy \
             forge
         env:
           CI: true
@@ -149,14 +148,8 @@ jobs:
           AWS_ACCESS_KEY_ID: minioadmin
           AWS_SECRET_ACCESS_KEY: minioadmin
 
-      - name: Upload test results to Codecov
-        if: ${{ !cancelled() }}  # Run even if tests fail
-        uses: codecov/test-results-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: forge,${{ runner.os }}

.github/workflows/platform-autgpt-deploy-prod.yml

@@ -35,6 +35,12 @@ jobs:
         env:
           DATABASE_URL: ${{ secrets.BACKEND_DATABASE_URL }}
 
+      - name: Run Market Migrations
+        working-directory: ./autogpt_platform/market
+        run: |
+          python -m prisma migrate deploy
+        env:
+          DATABASE_URL: ${{ secrets.MARKET_DATABASE_URL }}
           
   trigger:
     needs: migrate

.github/workflows/platform-autogpt-deploy-dev.yaml

@@ -37,6 +37,13 @@ jobs:
         env:
           DATABASE_URL: ${{ secrets.BACKEND_DATABASE_URL }}
 
+      - name: Run Market Migrations
+        working-directory: ./autogpt_platform/market
+        run: |
+          python -m prisma migrate deploy
+        env:
+          DATABASE_URL: ${{ secrets.MARKET_DATABASE_URL }}
+
   trigger:
     needs: migrate
     runs-on: ubuntu-latest

.github/workflows/platform-backend-ci.yml

@@ -6,13 +6,11 @@ on:
     paths:
       - ".github/workflows/platform-backend-ci.yml"
       - "autogpt_platform/backend/**"
-      - "autogpt_platform/autogpt_libs/**"
   pull_request:
     branches: [master, dev, release-*]
     paths:
       - ".github/workflows/platform-backend-ci.yml"
       - "autogpt_platform/backend/**"
-      - "autogpt_platform/autogpt_libs/**"
   merge_group:
 
 concurrency:
@@ -42,14 +40,6 @@ jobs:
           REDIS_PASSWORD: testpassword
         ports:
           - 6379:6379
-      rabbitmq:
-        image: rabbitmq:3.12-management
-        ports:
-          - 5672:5672
-          - 15672:15672
-        env:
-          RABBITMQ_DEFAULT_USER: ${{ env.RABBITMQ_DEFAULT_USER }}
-          RABBITMQ_DEFAULT_PASS: ${{ env.RABBITMQ_DEFAULT_PASS }}
 
     steps:
       - name: Checkout repository
@@ -66,7 +56,7 @@ jobs:
       - name: Setup Supabase
         uses: supabase/setup-cli@v1
         with:
-          version: 1.178.1
+          version: latest
 
       - id: get_date
         name: Get date
@@ -87,17 +77,6 @@ jobs:
             echo "$HOME/.local/bin" >> $GITHUB_PATH
           fi
 
-      - name: Check poetry.lock
-        run: |
-          poetry lock
-
-          if ! git diff --quiet poetry.lock; then
-            echo "Error: poetry.lock not up to date."
-            echo
-            git diff poetry.lock
-            exit 1
-          fi
-
       - name: Install Python dependencies
         run: poetry install
 
@@ -147,13 +126,6 @@ jobs:
       RUN_ENV: local
       PORT: 8080
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-      # We know these are here, don't report this as a security vulnerability
-      # This is used as the default credential for the entire system's RabbitMQ instance
-      # If you want to replace this, you can do so by making our entire system generate
-      # new credentials for each local user and update the environment variables in
-      # the backend service, docker composes, and examples
-      RABBITMQ_DEFAULT_USER: 'rabbitmq_user_default'
-      RABBITMQ_DEFAULT_PASS: 'k0VMxyIJF9S35f3x2uaw5IWAl6Y536O7'
 
       # - name: Upload coverage reports to Codecov
       #   uses: codecov/codecov-action@v4

.github/workflows/platform-frontend-ci.yml

@@ -23,7 +23,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
@@ -37,33 +36,26 @@ jobs:
         run: |
           yarn lint
 
-  type-check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "21"
-
-      - name: Install dependencies
-        run: |
-          yarn install --frozen-lockfile
-
-      - name: Run tsc check
-        run: |
-          yarn type-check
-
   test:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        browser: [chromium, webkit]
 
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: false
+          dotnet: false
+          haskell: false
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -74,15 +66,9 @@ jobs:
         with:
           node-version: "21"
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          large-packages: false # slow
-          docker-images: false # limited benefit
-
       - name: Copy default supabase .env
         run: |
-          cp ../.env.example ../.env
+          cp ../supabase/docker/.env.example ../.env
 
       - name: Copy backend .env
         run: |
@@ -100,22 +86,16 @@ jobs:
         run: |
           cp .env.example .env
 
-      - name: Install Browser '${{ matrix.browser }}'
-        run: yarn playwright install --with-deps ${{ matrix.browser }}
+      - name: Install Playwright Browsers
+        run: yarn playwright install --with-deps
 
       - name: Run tests
-        timeout-minutes: 20
         run: |
-          yarn test --project=${{ matrix.browser }}
-
-      - name: Print Final Docker Compose logs
-        if: always()
-        run: |
-          docker compose -f ../docker-compose.yml logs
+          yarn test
 
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
-          name: playwright-report-${{ matrix.browser }}
+          name: playwright-report
           path: playwright-report/
           retention-days: 30

.github/workflows/platform-market-ci.yml

@@ -0,0 +1,126 @@
+name: AutoGPT Platform - Backend CI
+
+on:
+  push:
+    branches: [master, dev, ci-test*]
+    paths:
+      - ".github/workflows/platform-market-ci.yml"
+      - "autogpt_platform/market/**"
+  pull_request:
+    branches: [master, dev, release-*]
+    paths:
+      - ".github/workflows/platform-market-ci.yml"
+      - "autogpt_platform/market/**"
+  merge_group:
+
+concurrency:
+  group: ${{ format('backend-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull_request') }}
+
+defaults:
+  run:
+    shell: bash
+    working-directory: autogpt_platform/market
+
+jobs:
+  test:
+    permissions:
+      contents: read
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10"]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Supabase
+        uses: supabase/setup-cli@v1
+        with:
+          version: latest
+
+      - id: get_date
+        name: Get date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+      - name: Set up Python dependency cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pypoetry
+          key: poetry-${{ runner.os }}-${{ hashFiles('autogpt_platform/market/poetry.lock') }}
+
+      - name: Install Poetry (Unix)
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+
+          if [ "${{ runner.os }}" = "macOS" ]; then
+            PATH="$HOME/.local/bin:$PATH"
+            echo "$HOME/.local/bin" >> $GITHUB_PATH
+          fi
+
+      - name: Install Python dependencies
+        run: poetry install
+
+      - name: Generate Prisma Client
+        run: poetry run prisma generate
+
+      - id: supabase
+        name: Start Supabase
+        working-directory: .
+        run: |
+          supabase init
+          supabase start --exclude postgres-meta,realtime,storage-api,imgproxy,inbucket,studio,edge-runtime,logflare,vector,supavisor
+          supabase status -o env | sed 's/="/=/; s/"$//' >> $GITHUB_OUTPUT
+        # outputs:
+        # DB_URL, API_URL, GRAPHQL_URL, ANON_KEY, SERVICE_ROLE_KEY, JWT_SECRET
+
+      - name: Run Database Migrations
+        run: poetry run prisma migrate dev --name updates
+        env:
+          DATABASE_URL: ${{ steps.supabase.outputs.DB_URL }}
+
+      - id: lint
+        name: Run Linter
+        run: poetry run lint
+
+      # Tests comment out because they do not work with prisma mock, nor have they been updated since they were created
+      # - name: Run pytest with coverage
+      #   run: |
+      #     if [[ "${{ runner.debug }}" == "1" ]]; then
+      #       poetry run pytest -s -vv -o log_cli=true -o log_cli_level=DEBUG test
+      #     else
+      #       poetry run pytest -s -vv test
+      #     fi
+      #   if: success() || (failure() && steps.lint.outcome == 'failure')
+      #   env:
+      #     LOG_LEVEL: ${{ runner.debug && 'DEBUG' || 'INFO' }}
+      #     DATABASE_URL: ${{ steps.supabase.outputs.DB_URL }}
+      #     SUPABASE_URL: ${{ steps.supabase.outputs.API_URL }}
+      #     SUPABASE_SERVICE_ROLE_KEY: ${{ steps.supabase.outputs.SERVICE_ROLE_KEY }}
+      #     SUPABASE_JWT_SECRET: ${{ steps.supabase.outputs.JWT_SECRET }}
+      #     REDIS_HOST: 'localhost'
+      #     REDIS_PORT: '6379'
+          # REDIS_PASSWORD: 'testpassword'
+
+    env:
+      CI: true
+      PLAIN_OUTPUT: True
+      RUN_ENV: local
+      PORT: 8080
+
+      # - name: Upload coverage reports to Codecov
+      #   uses: codecov/codecov-action@v4
+      #   with:
+      #     token: ${{ secrets.CODECOV_TOKEN }}
+      #     flags: backend,${{ runner.os }}

.github/workflows/repo-close-stale-issues.yml

@@ -25,7 +25,7 @@ jobs:
           close-issue-message: >
             This issue was closed automatically because it has been stale for 10 days
             with no activity.
-          days-before-stale: 100
+          days-before-stale: 50
           days-before-close: 10
           # Do not touch meta issues:
           exempt-issue-labels: meta,fridge,project management

.gitignore

@@ -173,6 +173,3 @@ LICENSE.rtf
 autogpt_platform/backend/settings.py
 /.auth
 /autogpt_platform/frontend/.auth
-
-*.ign.*
-.test-contents

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "classic/forge/tests/vcr_cassettes"]
 	path = classic/forge/tests/vcr_cassettes
 	url = https://github.com/Significant-Gravitas/Auto-GPT-test-cassettes
+[submodule "autogpt_platform/supabase"]
+	path = autogpt_platform/supabase
+	url = https://github.com/supabase/supabase.git

.pre-commit-config.yaml

@@ -98,11 +98,6 @@ repos:
         files: ^autogpt_platform/autogpt_libs/
         args: [--fix]
 
-      - id: ruff-format
-        name: Format (Ruff) - AutoGPT Platform - Libs
-        alias: ruff-lint-platform-libs
-        files: ^autogpt_platform/autogpt_libs/
-
   - repo: local
     # isort needs the context of which packages are installed to function, so we
     # can't use a vendored isort pre-commit hook (which runs in its own isolated venv).
@@ -110,7 +105,7 @@ repos:
       - id: isort
         name: Lint (isort) - AutoGPT Platform - Backend
         alias: isort-platform-backend
-        entry: poetry -P autogpt_platform/backend run isort -p backend
+        entry: poetry -C autogpt_platform/backend run isort -p backend
         files: ^autogpt_platform/backend/
         types: [file, python]
         language: system
@@ -118,7 +113,7 @@ repos:
       - id: isort
         name: Lint (isort) - Classic - AutoGPT
         alias: isort-classic-autogpt
-        entry: poetry -P classic/original_autogpt run isort -p autogpt
+        entry: poetry -C classic/original_autogpt run isort -p autogpt
         files: ^classic/original_autogpt/
         types: [file, python]
         language: system
@@ -126,7 +121,7 @@ repos:
       - id: isort
         name: Lint (isort) - Classic - Forge
         alias: isort-classic-forge
-        entry: poetry -P classic/forge run isort -p forge
+        entry: poetry -C classic/forge run isort -p forge
         files: ^classic/forge/
         types: [file, python]
         language: system
@@ -134,7 +129,7 @@ repos:
       - id: isort
         name: Lint (isort) - Classic - Benchmark
         alias: isort-classic-benchmark
-        entry: poetry -P classic/benchmark run isort -p agbenchmark
+        entry: poetry -C classic/benchmark run isort -p agbenchmark
         files: ^classic/benchmark/
         types: [file, python]
         language: system
@@ -145,7 +140,7 @@ repos:
     # everything in .gitignore, so it works fine without any config or arguments.
     hooks:
       - id: black
-        name: Format (Black)
+        name: Lint (Black)
 
   - repo: https://github.com/PyCQA/flake8
     rev: 7.0.0
@@ -170,16 +165,6 @@ repos:
         files: ^classic/benchmark/(agbenchmark|tests)/((?!reports).)*[/.]
         args: [--config=classic/benchmark/.flake8]
 
-  - repo: local
-    hooks:
-      - id: prettier
-        name: Format (Prettier) - AutoGPT Platform - Frontend
-        alias: format-platform-frontend
-        entry: bash -c 'cd autogpt_platform/frontend && npx prettier --write $(echo "$@" | sed "s|autogpt_platform/frontend/||g")' --
-        files: ^autogpt_platform/frontend/
-        types: [file]
-        language: system
-
   - repo: local
     # To have watertight type checking, we check *all* the files in an affected
     # project. To trigger on poetry.lock we also reset the file `types` filter.
@@ -188,6 +173,7 @@ repos:
         name: Typecheck - AutoGPT Platform - Backend
         alias: pyright-platform-backend
         entry: poetry -C autogpt_platform/backend run pyright
+        args: [-p, autogpt_platform/backend, autogpt_platform/backend]
         # include forge source (since it's a path dependency) but exclude *_test.py files:
         files: ^autogpt_platform/(backend/((backend|test)/|(\w+\.py|poetry\.lock)$)|autogpt_libs/(autogpt_libs/.*(?<!_test)\.py|poetry\.lock)$)
         types: [file]
@@ -198,6 +184,7 @@ repos:
         name: Typecheck - AutoGPT Platform - Libs
         alias: pyright-platform-libs
         entry: poetry -C autogpt_platform/autogpt_libs run pyright
+        args: [-p, autogpt_platform/autogpt_libs, autogpt_platform/autogpt_libs]
         files: ^autogpt_platform/autogpt_libs/(autogpt_libs/|poetry\.lock$)
         types: [file]
         language: system
@@ -207,6 +194,7 @@ repos:
         name: Typecheck - Classic - AutoGPT
         alias: pyright-classic-autogpt
         entry: poetry -C classic/original_autogpt run pyright
+        args: [-p, classic/original_autogpt, classic/original_autogpt]
         # include forge source (since it's a path dependency) but exclude *_test.py files:
         files: ^(classic/original_autogpt/((autogpt|scripts|tests)/|poetry\.lock$)|classic/forge/(forge/.*(?<!_test)\.py|poetry\.lock)$)
         types: [file]
@@ -217,6 +205,7 @@ repos:
         name: Typecheck - Classic - Forge
         alias: pyright-classic-forge
         entry: poetry -C classic/forge run pyright
+        args: [-p, classic/forge, classic/forge]
         files: ^classic/forge/(forge/|poetry\.lock$)
         types: [file]
         language: system
@@ -226,21 +215,12 @@ repos:
         name: Typecheck - Classic - Benchmark
         alias: pyright-classic-benchmark
         entry: poetry -C classic/benchmark run pyright
+        args: [-p, classic/benchmark, classic/benchmark]
         files: ^classic/benchmark/(agbenchmark/|tests/|poetry\.lock$)
         types: [file]
         language: system
         pass_filenames: false
 
-  - repo: local
-    hooks:
-      - id: tsc
-        name: Typecheck - AutoGPT Platform - Frontend
-        entry: bash -c 'cd autogpt_platform/frontend && npm run type-check'
-        files: ^autogpt_platform/frontend/
-        types: [file]
-        language: system
-        pass_filenames: false
-
   - repo: local
     hooks:
       - id: pytest

SECURITY.md

@@ -8,7 +8,7 @@ We take the security of our project seriously. If you believe you have found a s
 
 Instead, please report them via:
 - [GitHub Security Advisory](https://github.com/Significant-Gravitas/AutoGPT/security/advisories/new)
-<!--- [Huntr.dev](https://huntr.com/repos/significant-gravitas/autogpt) - where you may be eligible for a bounty-->
+- [Huntr.dev](https://huntr.com/repos/significant-gravitas/autogpt) - where you may be eligible for a bounty
 
 ### Reporting Process
 1. **Submit Report**: Use one of the above channels to submit your report
@@ -20,7 +20,6 @@ Instead, please report them via:
 - Please provide detailed reports with reproducible steps
 - Include the version/commit hash where you discovered the vulnerability
 - Allow us a 90-day security fix window before any public disclosure
-- After patch is released, allow 30 days for users to update before public disclosure (for a total of 120 days max between update time and fix time)
 - Share any potential mitigations or workarounds if known
 
 ## Supported Versions

autogpt_platform/.env.example

@@ -1,123 +0,0 @@
-############
-# Secrets
-# YOU MUST CHANGE THESE BEFORE GOING INTO PRODUCTION
-############
-
-POSTGRES_PASSWORD=your-super-secret-and-long-postgres-password
-JWT_SECRET=your-super-secret-jwt-token-with-at-least-32-characters-long
-ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE
-SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q
-DASHBOARD_USERNAME=supabase
-DASHBOARD_PASSWORD=this_password_is_insecure_and_should_be_updated
-SECRET_KEY_BASE=UpNVntn3cDxHJpq99YMc1T1AQgQpc8kfYTuRgBiYa15BLrx8etQoXz3gZv1/u2oq
-VAULT_ENC_KEY=your-encryption-key-32-chars-min
-
-
-############
-# Database - You can change these to any PostgreSQL database that has logical replication enabled.
-############
-
-POSTGRES_HOST=db
-POSTGRES_DB=postgres
-POSTGRES_PORT=5432
-# default user is postgres
-
-
-############
-# Supavisor -- Database pooler
-############
-POOLER_PROXY_PORT_TRANSACTION=6543
-POOLER_DEFAULT_POOL_SIZE=20
-POOLER_MAX_CLIENT_CONN=100
-POOLER_TENANT_ID=your-tenant-id
-
-
-############
-# API Proxy - Configuration for the Kong Reverse proxy.
-############
-
-KONG_HTTP_PORT=8000
-KONG_HTTPS_PORT=8443
-
-
-############
-# API - Configuration for PostgREST.
-############
-
-PGRST_DB_SCHEMAS=public,storage,graphql_public
-
-
-############
-# Auth - Configuration for the GoTrue authentication server.
-############
-
-## General
-SITE_URL=http://localhost:3000
-ADDITIONAL_REDIRECT_URLS=
-JWT_EXPIRY=3600
-DISABLE_SIGNUP=false
-API_EXTERNAL_URL=http://localhost:8000
-
-## Mailer Config
-MAILER_URLPATHS_CONFIRMATION="/auth/v1/verify"
-MAILER_URLPATHS_INVITE="/auth/v1/verify"
-MAILER_URLPATHS_RECOVERY="/auth/v1/verify"
-MAILER_URLPATHS_EMAIL_CHANGE="/auth/v1/verify"
-
-## Email auth
-ENABLE_EMAIL_SIGNUP=true
-ENABLE_EMAIL_AUTOCONFIRM=false
-SMTP_ADMIN_EMAIL=admin@example.com
-SMTP_HOST=supabase-mail
-SMTP_PORT=2500
-SMTP_USER=fake_mail_user
-SMTP_PASS=fake_mail_password
-SMTP_SENDER_NAME=fake_sender
-ENABLE_ANONYMOUS_USERS=false
-
-## Phone auth
-ENABLE_PHONE_SIGNUP=true
-ENABLE_PHONE_AUTOCONFIRM=true
-
-
-############
-# Studio - Configuration for the Dashboard
-############
-
-STUDIO_DEFAULT_ORGANIZATION=Default Organization
-STUDIO_DEFAULT_PROJECT=Default Project
-
-STUDIO_PORT=3000
-# replace if you intend to use Studio outside of localhost
-SUPABASE_PUBLIC_URL=http://localhost:8000
-
-# Enable webp support
-IMGPROXY_ENABLE_WEBP_DETECTION=true
-
-# Add your OpenAI API key to enable SQL Editor Assistant
-OPENAI_API_KEY=
-
-
-############
-# Functions - Configuration for Functions
-############
-# NOTE: VERIFY_JWT applies to all functions. Per-function VERIFY_JWT is not supported yet.
-FUNCTIONS_VERIFY_JWT=false
-
-
-############
-# Logs - Configuration for Logflare
-# Please refer to https://supabase.com/docs/reference/self-hosting-analytics/introduction
-############
-
-LOGFLARE_LOGGER_BACKEND_API_KEY=your-super-secret-and-long-logflare-key
-
-# Change vector.toml sinks to reflect this change
-LOGFLARE_API_KEY=your-super-secret-and-long-logflare-key
-
-# Docker socket location - this value will differ depending on your OS
-DOCKER_SOCKET_LOCATION=/var/run/docker.sock
-
-# Google Cloud Project details
-GOOGLE_PROJECT_ID=GOOGLE_PROJECT_ID
-GOOGLE_PROJECT_NUMBER=GOOGLE_PROJECT_NUMBER

autogpt_platform/README.md

@@ -22,29 +22,35 @@ To run the AutoGPT Platform, follow these steps:
 
 2. Run the following command:
    ```
-   cp .env.example .env
+   git submodule update --init --recursive
    ```
-   This command will copy the `.env.example` file to `.env`. You can modify the `.env` file to add your own environment variables.
+   This command will initialize and update the submodules in the repository. The `supabase` folder will be cloned to the root directory.
 
 3. Run the following command:
+   ```
+   cp supabase/docker/.env.example .env
+   ```
+   This command will copy the `.env.example` file to `.env` in the `supabase/docker` directory. You can modify the `.env` file to add your own environment variables.
+
+4. Run the following command:
    ```
    docker compose up -d
    ```
    This command will start all the necessary backend services defined in the `docker-compose.yml` file in detached mode.
 
-4. Navigate to `frontend` within the `autogpt_platform` directory:
+5. Navigate to `frontend` within the `autogpt_platform` directory:
    ```
    cd frontend
    ```
    You will need to run your frontend application separately on your local machine.
 
-5. Run the following command: 
+6. Run the following command: 
    ```
    cp .env.example .env.local
    ```
    This command will copy the `.env.example` file to `.env.local` in the `frontend` directory. You can modify the `.env.local` within this folder to add your own environment variables for the frontend application.
 
-6. Run the following command:
+7. Run the following command:
    ```
    npm install
    npm run dev
@@ -55,7 +61,7 @@ To run the AutoGPT Platform, follow these steps:
    yarn install && yarn dev
    ```
 
-7. Open your browser and navigate to `http://localhost:3000` to access the AutoGPT Platform frontend.
+8. Open your browser and navigate to `http://localhost:3000` to access the AutoGPT Platform frontend.
 
 ### Docker Compose Commands
 

autogpt_platform/autogpt_libs/autogpt_libs/auth/__init__.py

@@ -1,7 +1,7 @@
 from .config import Settings
 from .depends import requires_admin_user, requires_user
 from .jwt_utils import parse_jwt_token
-from .middleware import APIKeyValidator, auth_middleware
+from .middleware import auth_middleware
 from .models import User
 
 __all__ = [
@@ -9,7 +9,6 @@ __all__ = [
     "parse_jwt_token",
     "requires_user",
     "requires_admin_user",
-    "APIKeyValidator",
     "auth_middleware",
     "User",
 ]

autogpt_platform/autogpt_libs/autogpt_libs/auth/depends.py

@@ -35,12 +35,3 @@ def verify_user(payload: dict | None, admin_only: bool) -> User:
         raise fastapi.HTTPException(status_code=403, detail="Admin access required")
 
     return User.from_payload(payload)
-
-
-def get_user_id(payload: dict = fastapi.Depends(auth_middleware)) -> str:
-    user_id = payload.get("sub")
-    if not user_id:
-        raise fastapi.HTTPException(
-            status_code=401, detail="User ID not found in token"
-        )
-    return user_id

autogpt_platform/autogpt_libs/autogpt_libs/auth/middleware.py

@@ -1,10 +1,7 @@
-import inspect
 import logging
-from typing import Any, Callable, Optional
 
-from fastapi import HTTPException, Request, Security
-from fastapi.security import APIKeyHeader, HTTPBearer
-from starlette.status import HTTP_401_UNAUTHORIZED
+from fastapi import HTTPException, Request
+from fastapi.security import HTTPBearer
 
 from .config import settings
 from .jwt_utils import parse_jwt_token
@@ -32,104 +29,3 @@ async def auth_middleware(request: Request):
     except ValueError as e:
         raise HTTPException(status_code=401, detail=str(e))
     return payload
-
-
-class APIKeyValidator:
-    """
-    Configurable API key validator that supports custom validation functions
-    for FastAPI applications.
-
-    This class provides a flexible way to implement API key authentication with optional
-    custom validation logic. It can be used for simple token matching
-    or more complex validation scenarios like database lookups.
-
-    Examples:
-        Simple token validation:
-        ```python
-        validator = APIKeyValidator(
-            header_name="X-API-Key",
-            expected_token="your-secret-token"
-        )
-
-        @app.get("/protected", dependencies=[Depends(validator.get_dependency())])
-        def protected_endpoint():
-            return {"message": "Access granted"}
-        ```
-
-        Custom validation with database lookup:
-        ```python
-        async def validate_with_db(api_key: str):
-            api_key_obj = await db.get_api_key(api_key)
-            return api_key_obj if api_key_obj and api_key_obj.is_active else None
-
-        validator = APIKeyValidator(
-            header_name="X-API-Key",
-            validate_fn=validate_with_db
-        )
-        ```
-
-    Args:
-        header_name (str): The name of the header containing the API key
-        expected_token (Optional[str]): The expected API key value for simple token matching
-        validate_fn (Optional[Callable]): Custom validation function that takes an API key
-            string and returns a boolean or object. Can be async.
-        error_status (int): HTTP status code to use for validation errors
-        error_message (str): Error message to return when validation fails
-    """
-
-    def __init__(
-        self,
-        header_name: str,
-        expected_token: Optional[str] = None,
-        validate_fn: Optional[Callable[[str], bool]] = None,
-        error_status: int = HTTP_401_UNAUTHORIZED,
-        error_message: str = "Invalid API key",
-    ):
-        # Create the APIKeyHeader as a class property
-        self.security_scheme = APIKeyHeader(name=header_name)
-        self.expected_token = expected_token
-        self.custom_validate_fn = validate_fn
-        self.error_status = error_status
-        self.error_message = error_message
-
-    async def default_validator(self, api_key: str) -> bool:
-        return api_key == self.expected_token
-
-    async def __call__(
-        self, request: Request, api_key: str = Security(APIKeyHeader)
-    ) -> Any:
-        if api_key is None:
-            raise HTTPException(status_code=self.error_status, detail="Missing API key")
-
-        # Use custom validation if provided, otherwise use default equality check
-        validator = self.custom_validate_fn or self.default_validator
-        result = (
-            await validator(api_key)
-            if inspect.iscoroutinefunction(validator)
-            else validator(api_key)
-        )
-
-        if not result:
-            raise HTTPException(
-                status_code=self.error_status, detail=self.error_message
-            )
-
-        # Store validation result in request state if it's not just a boolean
-        if result is not True:
-            request.state.api_key = result
-
-        return result
-
-    def get_dependency(self):
-        """
-        Returns a callable dependency that FastAPI will recognize as a security scheme
-        """
-
-        async def validate_api_key(
-            request: Request, api_key: str = Security(self.security_scheme)
-        ) -> Any:
-            return await self(request, api_key)
-
-        # This helps FastAPI recognize it as a security dependency
-        validate_api_key.__name__ = f"validate_{self.security_scheme.model.name}"
-        return validate_api_key

autogpt_platform/autogpt_libs/autogpt_libs/feature_flag/client.py

@@ -13,6 +13,7 @@ from typing_extensions import ParamSpec
 from .config import SETTINGS
 
 logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
 
 P = ParamSpec("P")
 T = TypeVar("T")
@@ -71,7 +72,7 @@ def feature_flag(
     """
 
     def decorator(
-        func: Callable[P, Union[T, Awaitable[T]]],
+        func: Callable[P, Union[T, Awaitable[T]]]
     ) -> Callable[P, Union[T, Awaitable[T]]]:
         @wraps(func)
         async def async_wrapper(*args: P.args, **kwargs: P.kwargs) -> T:

autogpt_platform/autogpt_libs/autogpt_libs/feature_flag/client_test.py

@@ -1,7 +1,6 @@
 import pytest
-from ldclient import LDClient
-
 from autogpt_libs.feature_flag.client import feature_flag, mock_flag_variation
+from ldclient import LDClient
 
 
 @pytest.fixture

autogpt_platform/autogpt_libs/autogpt_libs/feature_flag/config.py

@@ -6,7 +6,7 @@ class Settings(BaseSettings):
     launch_darkly_sdk_key: str = Field(
         default="",
         description="The Launch Darkly SDK key",
-        validation_alias="LAUNCH_DARKLY_SDK_KEY",
+        validation_alias="LAUNCH_DARKLY_SDK_KEY"
     )
 
     model_config = SettingsConfigDict(case_sensitive=True, extra="ignore")

autogpt_platform/autogpt_libs/autogpt_libs/logging/config.py

@@ -18,11 +18,12 @@ ERROR_LOG_FILE = "error.log"
 SIMPLE_LOG_FORMAT = "%(asctime)s %(levelname)s  %(title)s%(message)s"
 
 DEBUG_LOG_FORMAT = (
-    "%(asctime)s %(levelname)s %(filename)s:%(lineno)d  %(title)s%(message)s"
+    "%(asctime)s %(levelname)s %(filename)s:%(lineno)d" "  %(title)s%(message)s"
 )
 
 
 class LoggingConfig(BaseSettings):
+
     level: str = Field(
         default="INFO",
         description="Logging level",

autogpt_platform/autogpt_libs/autogpt_libs/logging/test_utils.py

@@ -24,10 +24,10 @@ from .utils import remove_color_codes
         ),
         ("", ""),
         ("hello", "hello"),
-        ("hello\x1b[31m world", "hello world"),
-        ("\x1b[36mHello,\x1b[32m World!", "Hello, World!"),
+        ("hello\x1B[31m world", "hello world"),
+        ("\x1B[36mHello,\x1B[32m World!", "Hello, World!"),
         (
-            "\x1b[1m\x1b[31mError:\x1b[0m\x1b[31m file not found",
+            "\x1B[1m\x1B[31mError:\x1B[0m\x1B[31m file not found",
             "Error: file not found",
         ),
     ],

autogpt_platform/autogpt_libs/autogpt_libs/rate_limit/config.py

@@ -1,31 +0,0 @@
-from pydantic import Field
-from pydantic_settings import BaseSettings, SettingsConfigDict
-
-
-class RateLimitSettings(BaseSettings):
-    redis_host: str = Field(
-        default="redis://localhost:6379",
-        description="Redis host",
-        validation_alias="REDIS_HOST",
-    )
-
-    redis_port: str = Field(
-        default="6379", description="Redis port", validation_alias="REDIS_PORT"
-    )
-
-    redis_password: str = Field(
-        default="password",
-        description="Redis password",
-        validation_alias="REDIS_PASSWORD",
-    )
-
-    requests_per_minute: int = Field(
-        default=60,
-        description="Maximum number of requests allowed per minute per API key",
-        validation_alias="RATE_LIMIT_REQUESTS_PER_MINUTE",
-    )
-
-    model_config = SettingsConfigDict(case_sensitive=True, extra="ignore")
-
-
-RATE_LIMIT_SETTINGS = RateLimitSettings()

autogpt_platform/autogpt_libs/autogpt_libs/rate_limit/limiter.py

@@ -1,51 +0,0 @@
-import time
-from typing import Tuple
-
-from redis import Redis
-
-from .config import RATE_LIMIT_SETTINGS
-
-
-class RateLimiter:
-    def __init__(
-        self,
-        redis_host: str = RATE_LIMIT_SETTINGS.redis_host,
-        redis_port: str = RATE_LIMIT_SETTINGS.redis_port,
-        redis_password: str = RATE_LIMIT_SETTINGS.redis_password,
-        requests_per_minute: int = RATE_LIMIT_SETTINGS.requests_per_minute,
-    ):
-        self.redis = Redis(
-            host=redis_host,
-            port=int(redis_port),
-            password=redis_password,
-            decode_responses=True,
-        )
-        self.window = 60
-        self.max_requests = requests_per_minute
-
-    async def check_rate_limit(self, api_key_id: str) -> Tuple[bool, int, int]:
-        """
-        Check if request is within rate limits.
-
-        Args:
-            api_key_id: The API key identifier to check
-
-        Returns:
-            Tuple of (is_allowed, remaining_requests, reset_time)
-        """
-        now = time.time()
-        window_start = now - self.window
-        key = f"ratelimit:{api_key_id}:1min"
-
-        pipe = self.redis.pipeline()
-        pipe.zremrangebyscore(key, 0, window_start)
-        pipe.zadd(key, {str(now): now})
-        pipe.zcount(key, window_start, now)
-        pipe.expire(key, self.window)
-
-        _, _, request_count, _ = pipe.execute()
-
-        remaining = max(0, self.max_requests - request_count)
-        reset_time = int(now + self.window)
-
-        return request_count <= self.max_requests, remaining, reset_time

autogpt_platform/autogpt_libs/autogpt_libs/rate_limit/middleware.py

@@ -1,32 +0,0 @@
-from fastapi import HTTPException, Request
-from starlette.middleware.base import RequestResponseEndpoint
-
-from .limiter import RateLimiter
-
-
-async def rate_limit_middleware(request: Request, call_next: RequestResponseEndpoint):
-    """FastAPI middleware for rate limiting API requests."""
-    limiter = RateLimiter()
-
-    if not request.url.path.startswith("/api"):
-        return await call_next(request)
-
-    api_key = request.headers.get("Authorization")
-    if not api_key:
-        return await call_next(request)
-
-    api_key = api_key.replace("Bearer ", "")
-
-    is_allowed, remaining, reset_time = await limiter.check_rate_limit(api_key)
-
-    if not is_allowed:
-        raise HTTPException(
-            status_code=429, detail="Rate limit exceeded. Please try again later."
-        )
-
-    response = await call_next(request)
-    response.headers["X-RateLimit-Limit"] = str(limiter.max_requests)
-    response.headers["X-RateLimit-Remaining"] = str(remaining)
-    response.headers["X-RateLimit-Reset"] = str(reset_time)
-
-    return response

autogpt_platform/autogpt_libs/autogpt_libs/supabase_integration_credentials_store/types.py

@@ -1,76 +0,0 @@
-from typing import Annotated, Any, Literal, Optional, TypedDict
-from uuid import uuid4
-
-from pydantic import BaseModel, Field, SecretStr, field_serializer
-
-
-class _BaseCredentials(BaseModel):
-    id: str = Field(default_factory=lambda: str(uuid4()))
-    provider: str
-    title: Optional[str]
-
-    @field_serializer("*")
-    def dump_secret_strings(value: Any, _info):
-        if isinstance(value, SecretStr):
-            return value.get_secret_value()
-        return value
-
-
-class OAuth2Credentials(_BaseCredentials):
-    type: Literal["oauth2"] = "oauth2"
-    username: Optional[str]
-    """Username of the third-party service user that these credentials belong to"""
-    access_token: SecretStr
-    access_token_expires_at: Optional[int]
-    """Unix timestamp (seconds) indicating when the access token expires (if at all)"""
-    refresh_token: Optional[SecretStr]
-    refresh_token_expires_at: Optional[int]
-    """Unix timestamp (seconds) indicating when the refresh token expires (if at all)"""
-    scopes: list[str]
-    metadata: dict[str, Any] = Field(default_factory=dict)
-
-    def bearer(self) -> str:
-        return f"Bearer {self.access_token.get_secret_value()}"
-
-
-class APIKeyCredentials(_BaseCredentials):
-    type: Literal["api_key"] = "api_key"
-    api_key: SecretStr
-    expires_at: Optional[int]
-    """Unix timestamp (seconds) indicating when the API key expires (if at all)"""
-
-    def bearer(self) -> str:
-        return f"Bearer {self.api_key.get_secret_value()}"
-
-
-Credentials = Annotated[
-    OAuth2Credentials | APIKeyCredentials,
-    Field(discriminator="type"),
-]
-
-
-CredentialsType = Literal["api_key", "oauth2"]
-
-
-class OAuthState(BaseModel):
-    token: str
-    provider: str
-    expires_at: int
-    code_verifier: Optional[str] = None
-    scopes: list[str]
-    """Unix timestamp (seconds) indicating when this OAuth state expires"""
-
-
-class UserMetadata(BaseModel):
-    integration_credentials: list[Credentials] = Field(default_factory=list)
-    integration_oauth_states: list[OAuthState] = Field(default_factory=list)
-
-
-class UserMetadataRaw(TypedDict, total=False):
-    integration_credentials: list[dict]
-    integration_oauth_states: list[dict]
-
-
-class UserIntegrations(BaseModel):
-    credentials: list[Credentials] = Field(default_factory=list)
-    oauth_states: list[OAuthState] = Field(default_factory=list)

autogpt_platform/autogpt_libs/autogpt_libs/utils/synchronize.py

@@ -31,8 +31,7 @@ class RedisKeyedMutex:
         try:
             yield
         finally:
-            if lock.locked():
-                lock.release()
+            lock.release()
 
     def acquire(self, key: Any) -> "RedisLock":
         """Acquires and returns a lock with the given key"""
@@ -46,7 +45,7 @@ class RedisKeyedMutex:
         return lock
 
     def release(self, key: Any):
-        if (lock := self.locks.get(key)) and lock.locked() and lock.owned():
+        if lock := self.locks.get(key):
             lock.release()
 
     def release_all_locks(self):

autogpt_platform/autogpt_libs/pyproject.toml

@@ -9,19 +9,19 @@ packages = [{ include = "autogpt_libs" }]
 [tool.poetry.dependencies]
 colorama = "^0.4.6"
 expiringdict = "^1.2.2"
-google-cloud-logging = "^3.11.4"
-pydantic = "^2.10.6"
-pydantic-settings = "^2.7.1"
-pyjwt = "^2.10.1"
-pytest-asyncio = "^0.25.3"
+google-cloud-logging = "^3.11.3"
+pydantic = "^2.10.2"
+pydantic-settings = "^2.6.1"
+pyjwt = "^2.10.0"
+pytest-asyncio = "^0.24.0"
 pytest-mock = "^3.14.0"
 python = ">=3.10,<4.0"
 python-dotenv = "^1.0.1"
-supabase = "^2.13.0"
+supabase = "^2.10.0"
 
 [tool.poetry.group.dev.dependencies]
-redis = "^5.2.1"
-ruff = "^0.9.10"
+redis = "^5.2.0"
+ruff = "^0.8.0"
 
 [build-system]
 requires = ["poetry-core"]

autogpt_platform/backend/.env.example

@@ -2,32 +2,19 @@ DB_USER=postgres
 DB_PASS=your-super-secret-and-long-postgres-password
 DB_NAME=postgres
 DB_PORT=5432
-DB_HOST=localhost
-DB_CONNECTION_LIMIT=12
-DB_CONNECT_TIMEOUT=60
-DB_POOL_TIMEOUT=300
-DB_SCHEMA=platform
-DATABASE_URL="postgresql://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}?schema=${DB_SCHEMA}&connect_timeout=${DB_CONNECT_TIMEOUT}"
+DATABASE_URL="postgresql://${DB_USER}:${DB_PASS}@localhost:${DB_PORT}/${DB_NAME}?connect_timeout=60&schema=platform"
 PRISMA_SCHEMA="postgres/schema.prisma"
 
-# EXECUTOR
-NUM_GRAPH_WORKERS=10
-NUM_NODE_WORKERS=3
-
 BACKEND_CORS_ALLOW_ORIGINS=["http://localhost:3000"]
 
 # generate using `from cryptography.fernet import Fernet;Fernet.generate_key().decode()`
 ENCRYPTION_KEY='dvziYgz0KSK8FENhju0ZYi8-fRTfAdlz6YLhdB_jhNw='
-UNSUBSCRIBE_SECRET_KEY = 'HlP8ivStJjmbf6NKi78m_3FnOogut0t5ckzjsIqeaio='
 
 REDIS_HOST=localhost
 REDIS_PORT=6379
 REDIS_PASSWORD=password
 
 ENABLE_CREDIT=false
-STRIPE_API_KEY=
-STRIPE_WEBHOOK_SECRET=
-
 # What environment things should be logged under: local dev or prod
 APP_ENV=local
 # What environment to behave as: "local" or "cloud"
@@ -35,26 +22,12 @@ BEHAVE_AS=local
 PYRO_HOST=localhost
 SENTRY_DSN=
 
-# Email For Postmark so we can send emails
-POSTMARK_SERVER_API_TOKEN=
-POSTMARK_SENDER_EMAIL=invalid@invalid.com
-POSTMARK_WEBHOOK_TOKEN=
-
 ## User auth with Supabase is required for any of the 3rd party integrations with auth to work.
 ENABLE_AUTH=true
 SUPABASE_URL=http://localhost:8000
 SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q
 SUPABASE_JWT_SECRET=your-super-secret-jwt-token-with-at-least-32-characters-long
 
-# RabbitMQ credentials -- Used for communication between services
-RABBITMQ_HOST=localhost
-RABBITMQ_PORT=5672
-RABBITMQ_DEFAULT_USER=rabbitmq_user_default
-RABBITMQ_DEFAULT_PASS=k0VMxyIJF9S35f3x2uaw5IWAl6Y536O7
-
-## GCS bucket is required for marketplace and library functionality
-MEDIA_GCS_BUCKET_NAME=
-
 ## For local development, you may need to set FRONTEND_BASE_URL for the OAuth flow
 ## for integrations to work. Defaults to the value of PLATFORM_BASE_URL if not set.
 # FRONTEND_BASE_URL=http://localhost:3000
@@ -63,7 +36,7 @@ MEDIA_GCS_BUCKET_NAME=
 ## to use the platform's webhook-related functionality.
 ## If you are developing locally, you can use something like ngrok to get a publc URL
 ## and tunnel it to your locally running backend.
-PLATFORM_BASE_URL=http://localhost:3000
+PLATFORM_BASE_URL=https://your-public-url-here
 
 ## == INTEGRATION CREDENTIALS == ##
 # Each set of server side credentials is required for the corresponding 3rd party
@@ -85,35 +58,6 @@ GITHUB_CLIENT_SECRET=
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
 
-# Twitter (X) OAuth 2.0 with PKCE Configuration
-# 1. Create a Twitter Developer Account:
-#    - Visit https://developer.x.com/en and sign up
-# 2. Set up your application:
-#    - Navigate to Developer Portal > Projects > Create Project
-#    - Add a new app to your project
-# 3. Configure app settings:
-#    - App Permissions: Read + Write + Direct Messages
-#    - App Type: Web App, Automated App or Bot
-#    - OAuth 2.0 Callback URL: http://localhost:3000/auth/integrations/oauth_callback
-#    - Save your Client ID and Client Secret below
-TWITTER_CLIENT_ID=
-TWITTER_CLIENT_SECRET=
-
-# Linear App
-# Make a new workspace for your OAuth APP -- trust me
-# https://linear.app/settings/api/applications/new
-# Callback URL: http://localhost:3000/auth/integrations/oauth_callback
-LINEAR_CLIENT_ID=
-LINEAR_CLIENT_SECRET=
-
-# To obtain Todoist API credentials:
-# 1. Create a Todoist account at todoist.com
-# 2. Visit the Developer Console: https://developer.todoist.com/appconsole.html
-# 3. Click "Create new app"
-# 4. Once created, copy your Client ID and Client Secret below
-TODOIST_CLIENT_ID=
-TODOIST_CLIENT_SECRET=
-
 ## ===== OPTIONAL API KEYS ===== ##
 
 # LLM
@@ -123,12 +67,10 @@ GROQ_API_KEY=
 OPEN_ROUTER_API_KEY=
 
 # Reddit
-# Go to https://www.reddit.com/prefs/apps and create a new app
-# Choose "script" for the type
-# Fill in the redirect uri as <your_frontend_url>/auth/integrations/oauth_callback, e.g. http://localhost:3000/auth/integrations/oauth_callback
 REDDIT_CLIENT_ID=
 REDDIT_CLIENT_SECRET=
-REDDIT_USER_AGENT="AutoGPT:1.0 (by /u/autogpt)"
+REDDIT_USERNAME=
+REDDIT_PASSWORD=
 
 # Discord
 DISCORD_BOT_TOKEN=
@@ -164,33 +106,6 @@ REPLICATE_API_KEY=
 # Ideogram
 IDEOGRAM_API_KEY=
 
-# Fal
-FAL_API_KEY=
-
-# Exa
-EXA_API_KEY=
-
-# E2B
-E2B_API_KEY=
-
-# Example API Key
-EXAMPLE_API_KEY=
-
-# Mem0
-MEM0_API_KEY=
-
-# Nvidia
-NVIDIA_API_KEY=
-
-# Apollo
-APOLLO_API_KEY=
-
-# SmartLead
-SMARTLEAD_API_KEY=
-
-# ZeroBounce
-ZEROBOUNCE_API_KEY=
-
 # Logging Configuration
 LOG_LEVEL=INFO
 ENABLE_CLOUD_LOGGING=false

autogpt_platform/backend/Dockerfile

@@ -6,21 +6,17 @@ ENV PYTHONUNBUFFERED 1
 
 WORKDIR /app
 
-RUN echo 'Acquire::http::Pipeline-Depth 0;\nAcquire::http::No-Cache true;\nAcquire::BrokenProxy true;\n' > /etc/apt/apt.conf.d/99fixbadproxy
-
-RUN apt-get update --allow-releaseinfo-change --fix-missing
-
 # Install build dependencies
-RUN apt-get install -y build-essential 
-RUN apt-get install -y libpq5
-RUN apt-get install -y libz-dev
-RUN apt-get install -y libssl-dev
-RUN apt-get install -y postgresql-client
+RUN apt-get update \
+    && apt-get install -y build-essential curl ffmpeg wget libcurl4-gnutls-dev libexpat1-dev libpq5 gettext libz-dev libssl-dev postgresql-client git \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-ENV POETRY_HOME=/opt/poetry
-ENV POETRY_NO_INTERACTION=1
-ENV POETRY_VIRTUALENVS_CREATE=false
-ENV PATH=/opt/poetry/bin:$PATH
+ENV POETRY_VERSION=1.8.3 \
+    POETRY_HOME="/opt/poetry" \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_CREATE=false \
+    PATH="$POETRY_HOME/bin:$PATH"
 
 # Upgrade pip and setuptools to fix security vulnerabilities
 RUN pip3 install --upgrade pip setuptools
@@ -31,20 +27,24 @@ RUN pip3 install poetry
 COPY autogpt_platform/autogpt_libs /app/autogpt_platform/autogpt_libs
 COPY autogpt_platform/backend/poetry.lock autogpt_platform/backend/pyproject.toml /app/autogpt_platform/backend/
 WORKDIR /app/autogpt_platform/backend
-RUN poetry install --no-ansi --no-root
+RUN poetry config virtualenvs.create false \
+    && poetry install --no-interaction --no-ansi
 
 # Generate Prisma client
 COPY autogpt_platform/backend/schema.prisma ./
-RUN poetry run prisma generate
+RUN poetry config virtualenvs.create false \
+    && poetry run prisma generate
 
 FROM python:3.11.10-slim-bookworm AS server_dependencies
 
 WORKDIR /app
 
-ENV POETRY_HOME=/opt/poetry \
+ENV POETRY_VERSION=1.8.3 \
+    POETRY_HOME="/opt/poetry" \
     POETRY_NO_INTERACTION=1 \
-    POETRY_VIRTUALENVS_CREATE=false
-ENV PATH=/opt/poetry/bin:$PATH
+    POETRY_VIRTUALENVS_CREATE=false \
+    PATH="$POETRY_HOME/bin:$PATH"
+
 
 # Upgrade pip and setuptools to fix security vulnerabilities
 RUN pip3 install --upgrade pip setuptools
@@ -71,7 +71,6 @@ WORKDIR /app/autogpt_platform/backend
 FROM server_dependencies AS server
 
 COPY autogpt_platform/backend /app/autogpt_platform/backend
-RUN poetry install --no-ansi --only-root
 
 ENV DATABASE_URL=""
 ENV PORT=8000

autogpt_platform/backend/README.advanced.md

@@ -1 +1,75 @@
-[Advanced Setup (Dev Branch)](https://dev-docs.agpt.co/platform/advanced_setup/#autogpt_agent_server_advanced_set_up)
+# AutoGPT Agent Server Advanced set up
+
+This guide walks you through a dockerized set up, with an external DB (postgres)
+
+## Setup
+
+We use the Poetry to manage the dependencies. To set up the project, follow these steps inside this directory:
+
+0. Install Poetry
+    ```sh
+    pip install poetry
+    ```
+    
+1. Configure Poetry to use .venv in your project directory
+    ```sh
+    poetry config virtualenvs.in-project true
+    ```
+
+2. Enter the poetry shell
+
+   ```sh
+   poetry shell
+   ```
+   
+3. Install dependencies
+
+   ```sh
+   poetry install
+   ```
+   
+4. Copy .env.example to .env
+
+   ```sh
+   cp .env.example .env
+   ```
+
+5. Generate the Prisma client
+
+   ```sh
+   poetry run prisma generate
+   ```
+   
+
+   > In case Prisma generates the client for the global Python installation instead of the virtual environment, the current mitigation is to just uninstall the global Prisma package:
+   >
+   > ```sh
+   > pip uninstall prisma
+   > ```
+   >
+   > Then run the generation again. The path *should* look something like this:  
+   > `<some path>/pypoetry/virtualenvs/backend-TQIRSwR6-py3.12/bin/prisma`
+
+6. Run the postgres database from the /rnd folder
+
+   ```sh
+   cd autogpt_platform/
+   docker compose up -d
+   ```
+
+7. Run the migrations (from the backend folder)
+
+   ```sh
+   cd ../backend
+   prisma migrate deploy
+   ```
+
+## Running The Server
+
+### Starting the server directly
+
+Run the following command:
+
+```sh
+poetry run app
+```

autogpt_platform/backend/README.md

@@ -1 +1,203 @@
-[Getting Started (Released)](https://docs.agpt.co/platform/getting-started/#autogpt_agent_server)
+# AutoGPT Agent Server 
+
+This is an initial project for creating the next generation of agent execution, which is an AutoGPT agent server.
+The agent server will enable the creation of composite multi-agent systems that utilize AutoGPT agents and other non-agent components as its primitives.
+
+## Docs
+
+You can access the docs for the [AutoGPT Agent Server here](https://docs.agpt.co/server/setup).
+
+## Setup
+
+We use the Poetry to manage the dependencies. To set up the project, follow these steps inside this directory:
+
+0. Install Poetry
+    ```sh
+    pip install poetry
+    ```
+    
+1. Configure Poetry to use .venv in your project directory
+    ```sh
+    poetry config virtualenvs.in-project true
+    ```
+
+2. Enter the poetry shell
+
+   ```sh
+   poetry shell
+   ```
+   
+3. Install dependencies
+
+   ```sh
+   poetry install
+   ```
+
+4. Copy .env.example to .env
+
+   ```sh
+   cp .env.example .env
+   ```
+   
+5. Generate the Prisma client
+
+   ```sh
+   poetry run prisma generate
+   ```
+   
+
+   > In case Prisma generates the client for the global Python installation instead of the virtual environment, the current mitigation is to just uninstall the global Prisma package:
+   >
+   > ```sh
+   > pip uninstall prisma
+   > ```
+   >
+   > Then run the generation again. The path *should* look something like this:  
+   > `<some path>/pypoetry/virtualenvs/backend-TQIRSwR6-py3.12/bin/prisma`
+
+6. Migrate the database. Be careful because this deletes current data in the database.
+
+   ```sh
+   docker compose up db -d
+   poetry run prisma migrate deploy
+   ```
+
+## Running The Server
+
+### Starting the server without Docker
+
+Run the following command to run database in docker but the application locally:
+
+```sh
+docker compose --profile local up deps --build --detach
+poetry run app
+```
+
+### Starting the server with Docker
+
+Run the following command to build the dockerfiles:
+
+```sh
+docker compose build
+```
+
+Run the following command to run the app:
+
+```sh
+docker compose up
+```
+
+Run the following to automatically rebuild when code changes, in another terminal:
+
+```sh
+docker compose watch
+```
+
+Run the following command to shut down:
+
+```sh
+docker compose down
+```
+
+If you run into issues with dangling orphans, try:
+
+```sh
+docker compose down --volumes --remove-orphans && docker-compose up --force-recreate --renew-anon-volumes --remove-orphans  
+```
+
+## Testing
+
+To run the tests:
+
+```sh
+poetry run test
+```
+
+## Development
+
+### Formatting & Linting
+Auto formatter and linter are set up in the project. To run them:
+
+Install:
+```sh
+poetry install --with dev
+```
+
+Format the code:
+```sh
+poetry run format
+```
+
+Lint the code:
+```sh
+poetry run lint
+```
+
+## Project Outline
+
+The current project has the following main modules:
+
+### **blocks**
+
+This module stores all the Agent Blocks, which are reusable components to build a graph that represents the agent's behavior.
+
+### **data**
+
+This module stores the logical model that is persisted in the database.
+It abstracts the database operations into functions that can be called by the service layer.
+Any code that interacts with Prisma objects or the database should reside in this module.
+The main models are:
+* `block`: anything related to the block used in the graph
+* `execution`: anything related to the execution graph execution
+* `graph`: anything related to the graph, node, and its relations
+
+### **execution**
+
+This module stores the business logic of executing the graph.
+It currently has the following main modules:
+* `manager`: A service that consumes the queue of the graph execution and executes the graph. It contains both pieces of logic.
+* `scheduler`: A service that triggers scheduled graph execution based on a cron expression. It pushes an execution request to the manager.
+
+### **server**
+
+This module stores the logic for the server API.
+It contains all the logic used for the API that allows the client to create, execute, and monitor the graph and its execution.
+This API service interacts with other services like those defined in `manager` and `scheduler`.
+
+### **utils**
+
+This module stores utility functions that are used across the project.
+Currently, it has two main modules:
+* `process`: A module that contains the logic to spawn a new process.
+* `service`: A module that serves as a parent class for all the services in the project.
+
+## Service Communication
+
+Currently, there are only 3 active services:
+
+- AgentServer (the API, defined in `server.py`)
+- ExecutionManager (the executor, defined in `manager.py`)
+- ExecutionScheduler (the scheduler, defined in `scheduler.py`)
+
+The services run in independent Python processes and communicate through an IPC.
+A communication layer (`service.py`) is created to decouple the communication library from the implementation.
+
+Currently, the IPC is done using Pyro5 and abstracted in a way that allows a function decorated with `@expose` to be called from a different process.
+
+
+By default the daemons run on the following ports: 
+
+Execution Manager Daemon: 8002
+Execution Scheduler Daemon: 8003
+Rest Server Daemon: 8004
+
+## Adding a New Agent Block
+
+To add a new agent block, you need to create a new class that inherits from `Block` and provides the following information:
+* All the block code should live in the `blocks` (`backend.blocks`) module.
+* `input_schema`: the schema of the input data, represented by a Pydantic object.
+* `output_schema`: the schema of the output data, represented by a Pydantic object.
+* `run` method: the main logic of the block.
+* `test_input` & `test_output`: the sample input and output data for the block, which will be used to auto-test the block.
+* You can mock the functions declared in the block using the `test_mock` field for your unit tests.
+* Once you finish creating the block, you can test it by running `pytest -s test/block/test_block.py`.

autogpt_platform/backend/backend/app.py

@@ -1,30 +1,22 @@
-import logging
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from backend.util.process import AppProcess
 
-logger = logging.getLogger(__name__)
-
 
 def run_processes(*processes: "AppProcess", **kwargs):
     """
     Execute all processes in the app. The last process is run in the foreground.
-    Includes enhanced error handling and process lifecycle management.
     """
     try:
-        # Run all processes except the last one in the background.
         for process in processes[:-1]:
             process.start(background=True, **kwargs)
 
-        # Run the last process in the foreground.
+        # Run the last process in the foreground
         processes[-1].start(background=False, **kwargs)
     finally:
         for process in processes:
-            try:
-                process.stop()
-            except Exception as e:
-                logger.exception(f"[{process.service_name}] unable to stop: {e}")
+            process.stop()
 
 
 def main(**kwargs):
@@ -32,16 +24,14 @@ def main(**kwargs):
     Run all the processes required for the AutoGPT-server (REST and WebSocket APIs).
     """
 
-    from backend.executor import DatabaseManager, ExecutionManager, Scheduler
-    from backend.notifications import NotificationManager
+    from backend.executor import DatabaseManager, ExecutionManager, ExecutionScheduler
     from backend.server.rest_api import AgentServer
     from backend.server.ws_api import WebsocketServer
 
     run_processes(
         DatabaseManager(),
         ExecutionManager(),
-        Scheduler(),
-        NotificationManager(),
+        ExecutionScheduler(),
         WebsocketServer(),
         AgentServer(),
         **kwargs,

autogpt_platform/backend/backend/blocks/__init__.py

@@ -15,10 +15,10 @@ modules = [
     if f.is_file() and f.name != "__init__.py"
 ]
 for module in modules:
-    if not re.match("^[a-z0-9_.]+$", module):
+    if not re.match("^[a-z_.]+$", module):
         raise ValueError(
             f"Block module {module} error: module name must be lowercase, "
-            "and contain only alphanumeric characters and underscores."
+            "separated by underscores, and contain only alphabet characters"
         )
 
     importlib.import_module(f".{module}", package=__name__)

autogpt_platform/backend/backend/blocks/agent.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Any
 
 from autogpt_libs.utils.cache import thread_cached
 
@@ -14,7 +13,6 @@ from backend.data.block import (
 )
 from backend.data.execution import ExecutionStatus
 from backend.data.model import SchemaField
-from backend.util import json
 
 logger = logging.getLogger(__name__)
 
@@ -44,23 +42,6 @@ class AgentExecutorBlock(Block):
         input_schema: dict = SchemaField(description="Input schema for the graph")
         output_schema: dict = SchemaField(description="Output schema for the graph")
 
-        @classmethod
-        def get_input_schema(cls, data: BlockInput) -> dict[str, Any]:
-            return data.get("input_schema", {})
-
-        @classmethod
-        def get_input_defaults(cls, data: BlockInput) -> BlockInput:
-            return data.get("data", {})
-
-        @classmethod
-        def get_missing_input(cls, data: BlockInput) -> set[str]:
-            required_fields = cls.get_input_schema(data).get("required", [])
-            return set(required_fields) - set(data)
-
-        @classmethod
-        def get_mismatch_error(cls, data: BlockInput) -> str | None:
-            return json.validate_with_jsonschema(cls.get_input_schema(data), data)
-
     class Output(BlockSchema):
         pass
 
@@ -95,11 +76,7 @@ class AgentExecutorBlock(Block):
             )
 
             if not event.node_id:
-                if event.status in [
-                    ExecutionStatus.COMPLETED,
-                    ExecutionStatus.TERMINATED,
-                    ExecutionStatus.FAILED,
-                ]:
+                if event.status in [ExecutionStatus.COMPLETED, ExecutionStatus.FAILED]:
                     logger.info(f"Execution {log_id} ended with status {event.status}")
                     break
                 else:

autogpt_platform/backend/backend/blocks/ai_image_generator_block.py

@@ -12,7 +12,6 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 
 
 class ImageSize(str, Enum):
@@ -102,10 +101,12 @@ class ImageGenModel(str, Enum):
 
 class AIImageGeneratorBlock(Block):
     class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.REPLICATE], Literal["api_key"]
-        ] = CredentialsField(
-            description="Enter your Replicate API key to access the image generation API. You can obtain an API key from https://replicate.com/account/api-tokens.",
+        credentials: CredentialsMetaInput[Literal["replicate"], Literal["api_key"]] = (
+            CredentialsField(
+                provider="replicate",
+                supported_credential_types={"api_key"},
+                description="Enter your Replicate API key to access the image generation API. You can obtain an API key from https://replicate.com/account/api-tokens.",
+            )
         )
         prompt: str = SchemaField(
             description="Text prompt for image generation",

autogpt_platform/backend/backend/blocks/ai_music_generator.py

@@ -13,7 +13,6 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 
 logger = logging.getLogger(__name__)
 
@@ -55,11 +54,13 @@ class NormalizationStrategy(str, Enum):
 
 class AIMusicGeneratorBlock(Block):
     class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.REPLICATE], Literal["api_key"]
-        ] = CredentialsField(
-            description="The Replicate integration can be used with "
-            "any API key with sufficient permissions for the blocks it is used on.",
+        credentials: CredentialsMetaInput[Literal["replicate"], Literal["api_key"]] = (
+            CredentialsField(
+                provider="replicate",
+                supported_credential_types={"api_key"},
+                description="The Replicate integration can be used with "
+                "any API key with sufficient permissions for the blocks it is used on.",
+            )
         )
         prompt: str = SchemaField(
             description="A description of the music you want to generate",

autogpt_platform/backend/backend/blocks/ai_shortform_video_block.py

@@ -12,7 +12,6 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 from backend.util.request import requests
 
 TEST_CREDENTIALS = APIKeyCredentials(
@@ -141,11 +140,13 @@ logger = logging.getLogger(__name__)
 
 class AIShortformVideoCreatorBlock(Block):
     class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.REVID], Literal["api_key"]
-        ] = CredentialsField(
-            description="The revid.ai integration can be used with "
-            "any API key with sufficient permissions for the blocks it is used on.",
+        credentials: CredentialsMetaInput[Literal["revid"], Literal["api_key"]] = (
+            CredentialsField(
+                provider="revid",
+                supported_credential_types={"api_key"},
+                description="The revid.ai integration can be used with "
+                "any API key with sufficient permissions for the blocks it is used on.",
+            )
         )
         script: str = SchemaField(
             description="""1. Use short and punctuated sentences\n\n2. Use linebreaks to create a new clip\n\n3. Text outside of brackets is spoken by the AI, and [text between brackets] will be used to guide the visual generation. For example, [close-up of a cat] will show a close-up of a cat.""",

autogpt_platform/backend/backend/blocks/apollo/_api.py

@@ -1,108 +0,0 @@
-import logging
-from typing import List
-
-from backend.blocks.apollo._auth import ApolloCredentials
-from backend.blocks.apollo.models import (
-    Contact,
-    Organization,
-    SearchOrganizationsRequest,
-    SearchOrganizationsResponse,
-    SearchPeopleRequest,
-    SearchPeopleResponse,
-)
-from backend.util.request import Requests
-
-logger = logging.getLogger(name=__name__)
-
-
-class ApolloClient:
-    """Client for the Apollo API"""
-
-    API_URL = "https://api.apollo.io/api/v1"
-
-    def __init__(self, credentials: ApolloCredentials):
-        self.credentials = credentials
-        self.requests = Requests()
-
-    def _get_headers(self) -> dict[str, str]:
-        return {"x-api-key": self.credentials.api_key.get_secret_value()}
-
-    def search_people(self, query: SearchPeopleRequest) -> List[Contact]:
-        """Search for people in Apollo"""
-        response = self.requests.get(
-            f"{self.API_URL}/mixed_people/search",
-            headers=self._get_headers(),
-            params=query.model_dump(exclude={"credentials", "max_results"}),
-        )
-        parsed_response = SearchPeopleResponse(**response.json())
-        if parsed_response.pagination.total_entries == 0:
-            return []
-
-        people = parsed_response.people
-
-        # handle pagination
-        if (
-            query.max_results is not None
-            and query.max_results < parsed_response.pagination.total_entries
-            and len(people) < query.max_results
-        ):
-            while (
-                len(people) < query.max_results
-                and query.page < parsed_response.pagination.total_pages
-                and len(parsed_response.people) > 0
-            ):
-                query.page += 1
-                response = self.requests.get(
-                    f"{self.API_URL}/mixed_people/search",
-                    headers=self._get_headers(),
-                    params=query.model_dump(exclude={"credentials", "max_results"}),
-                )
-                parsed_response = SearchPeopleResponse(**response.json())
-                people.extend(parsed_response.people[: query.max_results - len(people)])
-
-        logger.info(f"Found {len(people)} people")
-        return people[: query.max_results] if query.max_results else people
-
-    def search_organizations(
-        self, query: SearchOrganizationsRequest
-    ) -> List[Organization]:
-        """Search for organizations in Apollo"""
-        response = self.requests.get(
-            f"{self.API_URL}/mixed_companies/search",
-            headers=self._get_headers(),
-            params=query.model_dump(exclude={"credentials", "max_results"}),
-        )
-        parsed_response = SearchOrganizationsResponse(**response.json())
-        if parsed_response.pagination.total_entries == 0:
-            return []
-
-        organizations = parsed_response.organizations
-
-        # handle pagination
-        if (
-            query.max_results is not None
-            and query.max_results < parsed_response.pagination.total_entries
-            and len(organizations) < query.max_results
-        ):
-            while (
-                len(organizations) < query.max_results
-                and query.page < parsed_response.pagination.total_pages
-                and len(parsed_response.organizations) > 0
-            ):
-                query.page += 1
-                response = self.requests.get(
-                    f"{self.API_URL}/mixed_companies/search",
-                    headers=self._get_headers(),
-                    params=query.model_dump(exclude={"credentials", "max_results"}),
-                )
-                parsed_response = SearchOrganizationsResponse(**response.json())
-                organizations.extend(
-                    parsed_response.organizations[
-                        : query.max_results - len(organizations)
-                    ]
-                )
-
-        logger.info(f"Found {len(organizations)} organizations")
-        return (
-            organizations[: query.max_results] if query.max_results else organizations
-        )

autogpt_platform/backend/backend/blocks/apollo/_auth.py

@@ -1,35 +0,0 @@
-from typing import Literal
-
-from pydantic import SecretStr
-
-from backend.data.model import APIKeyCredentials, CredentialsField, CredentialsMetaInput
-from backend.integrations.providers import ProviderName
-
-ApolloCredentials = APIKeyCredentials
-ApolloCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.APOLLO],
-    Literal["api_key"],
-]
-
-TEST_CREDENTIALS = APIKeyCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="apollo",
-    api_key=SecretStr("mock-apollo-api-key"),
-    title="Mock Apollo API key",
-    expires_at=None,
-)
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.title,
-}
-
-
-def ApolloCredentialsField() -> ApolloCredentialsInput:
-    """
-    Creates a Apollo credentials input on a block.
-    """
-    return CredentialsField(
-        description="The Apollo integration can be used with an API Key.",
-    )

autogpt_platform/backend/backend/blocks/apollo/models.py

@@ -1,543 +0,0 @@
-from enum import Enum
-from typing import Any, Optional
-
-from pydantic import BaseModel
-
-from backend.data.model import SchemaField
-
-
-class PrimaryPhone(BaseModel):
-    """A primary phone in Apollo"""
-
-    number: str
-    source: str
-    sanitized_number: str
-
-
-class SenorityLevels(str, Enum):
-    """Seniority levels in Apollo"""
-
-    OWNER = "owner"
-    FOUNDER = "founder"
-    C_SUITE = "c_suite"
-    PARTNER = "partner"
-    VP = "vp"
-    HEAD = "head"
-    DIRECTOR = "director"
-    MANAGER = "manager"
-    SENIOR = "senior"
-    ENTRY = "entry"
-    INTERN = "intern"
-
-
-class ContactEmailStatuses(str, Enum):
-    """Contact email statuses in Apollo"""
-
-    VERIFIED = "verified"
-    UNVERIFIED = "unverified"
-    LIKELY_TO_ENGAGE = "likely_to_engage"
-    UNAVAILABLE = "unavailable"
-
-
-class RuleConfigStatus(BaseModel):
-    """A rule config status in Apollo"""
-
-    _id: str
-    created_at: str
-    rule_action_config_id: str
-    rule_config_id: str
-    status_cd: str
-    updated_at: str
-    id: str
-    key: str
-
-
-class ContactCampaignStatus(BaseModel):
-    """A contact campaign status in Apollo"""
-
-    id: str
-    emailer_campaign_id: str
-    send_email_from_user_id: str
-    inactive_reason: str
-    status: str
-    added_at: str
-    added_by_user_id: str
-    finished_at: str
-    paused_at: str
-    auto_unpause_at: str
-    send_email_from_email_address: str
-    send_email_from_email_account_id: str
-    manually_set_unpause: str
-    failure_reason: str
-    current_step_id: str
-    in_response_to_emailer_message_id: str
-    cc_emails: str
-    bcc_emails: str
-    to_emails: str
-
-
-class Account(BaseModel):
-    """An account in Apollo"""
-
-    id: str
-    name: str
-    website_url: str
-    blog_url: str
-    angellist_url: str
-    linkedin_url: str
-    twitter_url: str
-    facebook_url: str
-    primary_phone: PrimaryPhone
-    languages: list[str]
-    alexa_ranking: int
-    phone: str
-    linkedin_uid: str
-    founded_year: int
-    publicly_traded_symbol: str
-    publicly_traded_exchange: str
-    logo_url: str
-    chrunchbase_url: str
-    primary_domain: str
-    domain: str
-    team_id: str
-    organization_id: str
-    account_stage_id: str
-    source: str
-    original_source: str
-    creator_id: str
-    owner_id: str
-    created_at: str
-    phone_status: str
-    hubspot_id: str
-    salesforce_id: str
-    crm_owner_id: str
-    parent_account_id: str
-    sanitized_phone: str
-    # no listed type on the API docs
-    account_playbook_statues: list[Any]
-    account_rule_config_statuses: list[RuleConfigStatus]
-    existence_level: str
-    label_ids: list[str]
-    typed_custom_fields: Any
-    custom_field_errors: Any
-    modality: str
-    source_display_name: str
-    salesforce_record_id: str
-    crm_record_url: str
-
-
-class ContactEmail(BaseModel):
-    """A contact email in Apollo"""
-
-    email: str = ""
-    email_md5: str = ""
-    email_sha256: str = ""
-    email_status: str = ""
-    email_source: str = ""
-    extrapolated_email_confidence: str = ""
-    position: int = 0
-    email_from_customer: str = ""
-    free_domain: bool = True
-
-
-class EmploymentHistory(BaseModel):
-    """An employment history in Apollo"""
-
-    class Config:
-        extra = "allow"
-        arbitrary_types_allowed = True
-        from_attributes = True
-        populate_by_name = True
-
-    _id: Optional[str] = None
-    created_at: Optional[str] = None
-    current: Optional[bool] = None
-    degree: Optional[str] = None
-    description: Optional[str] = None
-    emails: Optional[str] = None
-    end_date: Optional[str] = None
-    grade_level: Optional[str] = None
-    kind: Optional[str] = None
-    major: Optional[str] = None
-    organization_id: Optional[str] = None
-    organization_name: Optional[str] = None
-    raw_address: Optional[str] = None
-    start_date: Optional[str] = None
-    title: Optional[str] = None
-    updated_at: Optional[str] = None
-    id: Optional[str] = None
-    key: Optional[str] = None
-
-
-class Breadcrumb(BaseModel):
-    """A breadcrumb in Apollo"""
-
-    label: Optional[str] = "N/A"
-    signal_field_name: Optional[str] = "N/A"
-    value: str | list | None = "N/A"
-    display_name: Optional[str] = "N/A"
-
-
-class TypedCustomField(BaseModel):
-    """A typed custom field in Apollo"""
-
-    id: Optional[str] = "N/A"
-    value: Optional[str] = "N/A"
-
-
-class Pagination(BaseModel):
-    """Pagination in Apollo"""
-
-    class Config:
-        extra = "allow"  # Allow extra fields
-        arbitrary_types_allowed = True  # Allow any type
-        from_attributes = True  # Allow from_orm
-        populate_by_name = True  # Allow field aliases to work both ways
-
-    page: int = 0
-    per_page: int = 0
-    total_entries: int = 0
-    total_pages: int = 0
-
-
-class DialerFlags(BaseModel):
-    """A dialer flags in Apollo"""
-
-    country_name: str
-    country_enabled: bool
-    high_risk_calling_enabled: bool
-    potential_high_risk_number: bool
-
-
-class PhoneNumber(BaseModel):
-    """A phone number in Apollo"""
-
-    raw_number: str = ""
-    sanitized_number: str = ""
-    type: str = ""
-    position: int = 0
-    status: str = ""
-    dnc_status: str = ""
-    dnc_other_info: str = ""
-    dailer_flags: DialerFlags = DialerFlags(
-        country_name="",
-        country_enabled=True,
-        high_risk_calling_enabled=True,
-        potential_high_risk_number=True,
-    )
-
-
-class Organization(BaseModel):
-    """An organization in Apollo"""
-
-    class Config:
-        extra = "allow"
-        arbitrary_types_allowed = True
-        from_attributes = True
-        populate_by_name = True
-
-    id: Optional[str] = "N/A"
-    name: Optional[str] = "N/A"
-    website_url: Optional[str] = "N/A"
-    blog_url: Optional[str] = "N/A"
-    angellist_url: Optional[str] = "N/A"
-    linkedin_url: Optional[str] = "N/A"
-    twitter_url: Optional[str] = "N/A"
-    facebook_url: Optional[str] = "N/A"
-    primary_phone: Optional[PrimaryPhone] = PrimaryPhone(
-        number="N/A", source="N/A", sanitized_number="N/A"
-    )
-    languages: list[str] = []
-    alexa_ranking: Optional[int] = 0
-    phone: Optional[str] = "N/A"
-    linkedin_uid: Optional[str] = "N/A"
-    founded_year: Optional[int] = 0
-    publicly_traded_symbol: Optional[str] = "N/A"
-    publicly_traded_exchange: Optional[str] = "N/A"
-    logo_url: Optional[str] = "N/A"
-    chrunchbase_url: Optional[str] = "N/A"
-    primary_domain: Optional[str] = "N/A"
-    sanitized_phone: Optional[str] = "N/A"
-    owned_by_organization_id: Optional[str] = "N/A"
-    intent_strength: Optional[str] = "N/A"
-    show_intent: bool = True
-    has_intent_signal_account: Optional[bool] = True
-    intent_signal_account: Optional[str] = "N/A"
-
-
-class Contact(BaseModel):
-    """A contact in Apollo"""
-
-    class Config:
-        extra = "allow"
-        arbitrary_types_allowed = True
-        from_attributes = True
-        populate_by_name = True
-
-    contact_roles: list[Any] = []
-    id: Optional[str] = None
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    name: Optional[str] = None
-    linkedin_url: Optional[str] = None
-    title: Optional[str] = None
-    contact_stage_id: Optional[str] = None
-    owner_id: Optional[str] = None
-    creator_id: Optional[str] = None
-    person_id: Optional[str] = None
-    email_needs_tickling: bool = True
-    organization_name: Optional[str] = None
-    source: Optional[str] = None
-    original_source: Optional[str] = None
-    organization_id: Optional[str] = None
-    headline: Optional[str] = None
-    photo_url: Optional[str] = None
-    present_raw_address: Optional[str] = None
-    linkededin_uid: Optional[str] = None
-    extrapolated_email_confidence: Optional[float] = None
-    salesforce_id: Optional[str] = None
-    salesforce_lead_id: Optional[str] = None
-    salesforce_contact_id: Optional[str] = None
-    saleforce_account_id: Optional[str] = None
-    crm_owner_id: Optional[str] = None
-    created_at: Optional[str] = None
-    emailer_campaign_ids: list[str] = []
-    direct_dial_status: Optional[str] = None
-    direct_dial_enrichment_failed_at: Optional[str] = None
-    email_status: Optional[str] = None
-    email_source: Optional[str] = None
-    account_id: Optional[str] = None
-    last_activity_date: Optional[str] = None
-    hubspot_vid: Optional[str] = None
-    hubspot_company_id: Optional[str] = None
-    crm_id: Optional[str] = None
-    sanitized_phone: Optional[str] = None
-    merged_crm_ids: Optional[str] = None
-    updated_at: Optional[str] = None
-    queued_for_crm_push: bool = True
-    suggested_from_rule_engine_config_id: Optional[str] = None
-    email_unsubscribed: Optional[str] = None
-    label_ids: list[Any] = []
-    has_pending_email_arcgate_request: bool = True
-    has_email_arcgate_request: bool = True
-    existence_level: Optional[str] = None
-    email: Optional[str] = None
-    email_from_customer: Optional[str] = None
-    typed_custom_fields: list[TypedCustomField] = []
-    custom_field_errors: Any = None
-    salesforce_record_id: Optional[str] = None
-    crm_record_url: Optional[str] = None
-    email_status_unavailable_reason: Optional[str] = None
-    email_true_status: Optional[str] = None
-    updated_email_true_status: bool = True
-    contact_rule_config_statuses: list[RuleConfigStatus] = []
-    source_display_name: Optional[str] = None
-    twitter_url: Optional[str] = None
-    contact_campaign_statuses: list[ContactCampaignStatus] = []
-    state: Optional[str] = None
-    city: Optional[str] = None
-    country: Optional[str] = None
-    account: Optional[Account] = None
-    contact_emails: list[ContactEmail] = []
-    organization: Optional[Organization] = None
-    employment_history: list[EmploymentHistory] = []
-    time_zone: Optional[str] = None
-    intent_strength: Optional[str] = None
-    show_intent: bool = True
-    phone_numbers: list[PhoneNumber] = []
-    account_phone_note: Optional[str] = None
-    free_domain: bool = True
-    is_likely_to_engage: bool = True
-    email_domain_catchall: bool = True
-    contact_job_change_event: Optional[str] = None
-
-
-class SearchOrganizationsRequest(BaseModel):
-    """Request for Apollo's search organizations API"""
-
-    organization_num_empoloyees_range: list[int] = SchemaField(
-        description="""The number range of employees working for the company. This enables you to find companies based on headcount. You can add multiple ranges to expand your search results.
-
-Each range you add needs to be a string, with the upper and lower numbers of the range separated only by a comma.""",
-        default=[0, 1000000],
-    )
-
-    organization_locations: list[str] = SchemaField(
-        description="""The location of the company headquarters. You can search across cities, US states, and countries.
-
-If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, any Boston-based companies will not appearch in your search results, even if they match other parameters.
-
-To exclude companies based on location, use the organization_not_locations parameter.
-""",
-        default=[],
-    )
-    organizations_not_locations: list[str] = SchemaField(
-        description="""Exclude companies from search results based on the location of the company headquarters. You can use cities, US states, and countries as locations to exclude.
-
-This parameter is useful for ensuring you do not prospect in an undesirable territory. For example, if you use ireland as a value, no Ireland-based companies will appear in your search results.
-""",
-        default=[],
-    )
-    q_organization_keyword_tags: list[str] = SchemaField(
-        description="""Filter search results based on keywords associated with companies. For example, you can enter mining as a value to return only companies that have an association with the mining industry."""
-    )
-    q_organization_name: str = SchemaField(
-        description="""Filter search results to include a specific company name.
-
-If the value you enter for this parameter does not match with a company's name, the company will not appear in search results, even if it matches other parameters. Partial matches are accepted. For example, if you filter by the value marketing, a company called NY Marketing Unlimited would still be eligible as a search result, but NY Market Analysis would not be eligible."""
-    )
-    organization_ids: list[str] = SchemaField(
-        description="""The Apollo IDs for the companies you want to include in your search results. Each company in the Apollo database is assigned a unique ID.
-
-To find IDs, identify the values for organization_id when you call this endpoint.""",
-        default=[],
-    )
-    max_results: int = SchemaField(
-        description="""The maximum number of results to return. If you don't specify this parameter, the default is 100.""",
-        default=100,
-        ge=1,
-        le=50000,
-        advanced=True,
-    )
-
-    page: int = SchemaField(
-        description="""The page number of the Apollo data that you want to retrieve.
-
-Use this parameter in combination with the per_page parameter to make search results for navigable and improve the performance of the endpoint.""",
-        default=1,
-    )
-    per_page: int = SchemaField(
-        description="""The number of search results that should be returned for each page. Limited the number of results per page improves the endpoint's performance.
-
-Use the page parameter to search the different pages of data.""",
-        default=100,
-    )
-
-
-class SearchOrganizationsResponse(BaseModel):
-    """Response from Apollo's search organizations API"""
-
-    breadcrumbs: list[Breadcrumb] = []
-    partial_results_only: bool = True
-    has_join: bool = True
-    disable_eu_prospecting: bool = True
-    partial_results_limit: int = 0
-    pagination: Pagination = Pagination(
-        page=0, per_page=0, total_entries=0, total_pages=0
-    )
-    # no listed type on the API docs
-    accounts: list[Any] = []
-    organizations: list[Organization] = []
-    models_ids: list[str] = []
-    num_fetch_result: Optional[str] = "N/A"
-    derived_params: Optional[str] = "N/A"
-
-
-class SearchPeopleRequest(BaseModel):
-    """Request for Apollo's search people API"""
-
-    person_titles: list[str] = SchemaField(
-        description="""Job titles held by the people you want to find. For a person to be included in search results, they only need to match 1 of the job titles you add. Adding more job titles expands your search results.
-
-Results also include job titles with the same terms, even if they are not exact matches. For example, searching for marketing manager might return people with the job title content marketing manager.
-
-Use this parameter in combination with the person_seniorities[] parameter to find people based on specific job functions and seniority levels.
-""",
-        default=[],
-        placeholder="marketing manager",
-    )
-    person_locations: list[str] = SchemaField(
-        description="""The location where people live. You can search across cities, US states, and countries.
-
-To find people based on the headquarters locations of their current employer, use the organization_locations parameter.""",
-        default=[],
-    )
-    person_seniorities: list[SenorityLevels] = SchemaField(
-        description="""The job seniority that people hold within their current employer. This enables you to find people that currently hold positions at certain reporting levels, such as Director level or senior IC level.
-
-For a person to be included in search results, they only need to match 1 of the seniorities you add. Adding more seniorities expands your search results.
-
-Searches only return results based on their current job title, so searching for Director-level employees only returns people that currently hold a Director-level title. If someone was previously a Director, but is currently a VP, they would not be included in your search results.
-
-Use this parameter in combination with the person_titles[] parameter to find people based on specific job functions and seniority levels.""",
-        default=[],
-    )
-    organization_locations: list[str] = SchemaField(
-        description="""The location of the company headquarters for a person's current employer. You can search across cities, US states, and countries.
-
-If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, people that work for the Boston-based company will not appear in your results, even if they match other parameters.
-
-To find people based on their personal location, use the person_locations parameter.""",
-        default=[],
-    )
-    q_organization_domains: list[str] = SchemaField(
-        description="""The domain name for the person's employer. This can be the current employer or a previous employer. Do not include www., the @ symbol, or similar.
-
-You can add multiple domains to search across companies.
-
-  Examples: apollo.io and microsoft.com""",
-        default=[],
-    )
-    contact_email_statuses: list[ContactEmailStatuses] = SchemaField(
-        description="""The email statuses for the people you want to find. You can add multiple statuses to expand your search.""",
-        default=[],
-    )
-    organization_ids: list[str] = SchemaField(
-        description="""The Apollo IDs for the companies (employers) you want to include in your search results. Each company in the Apollo database is assigned a unique ID.
-
-To find IDs, call the Organization Search endpoint and identify the values for organization_id.""",
-        default=[],
-    )
-    organization_num_empoloyees_range: list[int] = SchemaField(
-        description="""The number range of employees working for the company. This enables you to find companies based on headcount. You can add multiple ranges to expand your search results.
-
-Each range you add needs to be a string, with the upper and lower numbers of the range separated only by a comma.""",
-        default=[],
-    )
-    q_keywords: str = SchemaField(
-        description="""A string of words over which we want to filter the results""",
-        default="",
-    )
-    page: int = SchemaField(
-        description="""The page number of the Apollo data that you want to retrieve.
-
-Use this parameter in combination with the per_page parameter to make search results for navigable and improve the performance of the endpoint.""",
-        default=1,
-    )
-    per_page: int = SchemaField(
-        description="""The number of search results that should be returned for each page. Limited the number of results per page improves the endpoint's performance.
-
-Use the page parameter to search the different pages of data.""",
-        default=100,
-    )
-    max_results: int = SchemaField(
-        description="""The maximum number of results to return. If you don't specify this parameter, the default is 100.""",
-        default=100,
-        ge=1,
-        le=50000,
-        advanced=True,
-    )
-
-
-class SearchPeopleResponse(BaseModel):
-    """Response from Apollo's search people API"""
-
-    class Config:
-        extra = "allow"  # Allow extra fields
-        arbitrary_types_allowed = True  # Allow any type
-        from_attributes = True  # Allow from_orm
-        populate_by_name = True  # Allow field aliases to work both ways
-
-    breadcrumbs: list[Breadcrumb] = []
-    partial_results_only: bool = True
-    has_join: bool = True
-    disable_eu_prospecting: bool = True
-    partial_results_limit: int = 0
-    pagination: Pagination = Pagination(
-        page=0, per_page=0, total_entries=0, total_pages=0
-    )
-    contacts: list[Contact] = []
-    people: list[Contact] = []
-    model_ids: list[str] = []
-    num_fetch_result: Optional[str] = "N/A"
-    derived_params: Optional[str] = "N/A"

autogpt_platform/backend/backend/blocks/apollo/organization.py

@@ -1,219 +0,0 @@
-from backend.blocks.apollo._api import ApolloClient
-from backend.blocks.apollo._auth import (
-    TEST_CREDENTIALS,
-    TEST_CREDENTIALS_INPUT,
-    ApolloCredentials,
-    ApolloCredentialsInput,
-)
-from backend.blocks.apollo.models import (
-    Organization,
-    PrimaryPhone,
-    SearchOrganizationsRequest,
-)
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-
-class SearchOrganizationsBlock(Block):
-    """Search for organizations in Apollo"""
-
-    class Input(BlockSchema):
-        organization_num_empoloyees_range: list[int] = SchemaField(
-            description="""The number range of employees working for the company. This enables you to find companies based on headcount. You can add multiple ranges to expand your search results.
-
-Each range you add needs to be a string, with the upper and lower numbers of the range separated only by a comma.""",
-            default=[0, 1000000],
-        )
-
-        organization_locations: list[str] = SchemaField(
-            description="""The location of the company headquarters. You can search across cities, US states, and countries.
-
-If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, any Boston-based companies will not appearch in your search results, even if they match other parameters.
-
-To exclude companies based on location, use the organization_not_locations parameter.
-""",
-            default=[],
-        )
-        organizations_not_locations: list[str] = SchemaField(
-            description="""Exclude companies from search results based on the location of the company headquarters. You can use cities, US states, and countries as locations to exclude.
-
-This parameter is useful for ensuring you do not prospect in an undesirable territory. For example, if you use ireland as a value, no Ireland-based companies will appear in your search results.
-""",
-            default=[],
-        )
-        q_organization_keyword_tags: list[str] = SchemaField(
-            description="""Filter search results based on keywords associated with companies. For example, you can enter mining as a value to return only companies that have an association with the mining industry.""",
-            default=[],
-        )
-        q_organization_name: str = SchemaField(
-            description="""Filter search results to include a specific company name.
-
-If the value you enter for this parameter does not match with a company's name, the company will not appear in search results, even if it matches other parameters. Partial matches are accepted. For example, if you filter by the value marketing, a company called NY Marketing Unlimited would still be eligible as a search result, but NY Market Analysis would not be eligible.""",
-            default="",
-            advanced=False,
-        )
-        organization_ids: list[str] = SchemaField(
-            description="""The Apollo IDs for the companies you want to include in your search results. Each company in the Apollo database is assigned a unique ID.
-
-To find IDs, identify the values for organization_id when you call this endpoint.""",
-            default=[],
-        )
-        max_results: int = SchemaField(
-            description="""The maximum number of results to return. If you don't specify this parameter, the default is 100.""",
-            default=100,
-            ge=1,
-            le=50000,
-            advanced=True,
-        )
-        credentials: ApolloCredentialsInput = SchemaField(
-            description="Apollo credentials",
-        )
-
-    class Output(BlockSchema):
-        organizations: list[Organization] = SchemaField(
-            description="List of organizations found",
-            default=[],
-        )
-        organization: Organization = SchemaField(
-            description="Each found organization, one at a time",
-        )
-        error: str = SchemaField(
-            description="Error message if the search failed",
-            default="",
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="3d71270d-599e-4148-9b95-71b35d2f44f0",
-            description="Search for organizations in Apollo",
-            categories={BlockCategory.SEARCH},
-            input_schema=SearchOrganizationsBlock.Input,
-            output_schema=SearchOrganizationsBlock.Output,
-            test_credentials=TEST_CREDENTIALS,
-            test_input={"query": "Google", "credentials": TEST_CREDENTIALS_INPUT},
-            test_output=[
-                (
-                    "organization",
-                    Organization(
-                        id="1",
-                        name="Google",
-                        website_url="https://google.com",
-                        blog_url="https://google.com/blog",
-                        angellist_url="https://angel.co/google",
-                        linkedin_url="https://linkedin.com/company/google",
-                        twitter_url="https://twitter.com/google",
-                        facebook_url="https://facebook.com/google",
-                        primary_phone=PrimaryPhone(
-                            source="google",
-                            number="1234567890",
-                            sanitized_number="1234567890",
-                        ),
-                        languages=["en"],
-                        alexa_ranking=1000,
-                        phone="1234567890",
-                        linkedin_uid="1234567890",
-                        founded_year=2000,
-                        publicly_traded_symbol="GOOGL",
-                        publicly_traded_exchange="NASDAQ",
-                        logo_url="https://google.com/logo.png",
-                        chrunchbase_url="https://chrunchbase.com/google",
-                        primary_domain="google.com",
-                        sanitized_phone="1234567890",
-                        owned_by_organization_id="1",
-                        intent_strength="strong",
-                        show_intent=True,
-                        has_intent_signal_account=True,
-                        intent_signal_account="1",
-                    ),
-                ),
-                (
-                    "organizations",
-                    [
-                        Organization(
-                            id="1",
-                            name="Google",
-                            website_url="https://google.com",
-                            blog_url="https://google.com/blog",
-                            angellist_url="https://angel.co/google",
-                            linkedin_url="https://linkedin.com/company/google",
-                            twitter_url="https://twitter.com/google",
-                            facebook_url="https://facebook.com/google",
-                            primary_phone=PrimaryPhone(
-                                source="google",
-                                number="1234567890",
-                                sanitized_number="1234567890",
-                            ),
-                            languages=["en"],
-                            alexa_ranking=1000,
-                            phone="1234567890",
-                            linkedin_uid="1234567890",
-                            founded_year=2000,
-                            publicly_traded_symbol="GOOGL",
-                            publicly_traded_exchange="NASDAQ",
-                            logo_url="https://google.com/logo.png",
-                            chrunchbase_url="https://chrunchbase.com/google",
-                            primary_domain="google.com",
-                            sanitized_phone="1234567890",
-                            owned_by_organization_id="1",
-                            intent_strength="strong",
-                            show_intent=True,
-                            has_intent_signal_account=True,
-                            intent_signal_account="1",
-                        ),
-                    ],
-                ),
-            ],
-            test_mock={
-                "search_organizations": lambda *args, **kwargs: [
-                    Organization(
-                        id="1",
-                        name="Google",
-                        website_url="https://google.com",
-                        blog_url="https://google.com/blog",
-                        angellist_url="https://angel.co/google",
-                        linkedin_url="https://linkedin.com/company/google",
-                        twitter_url="https://twitter.com/google",
-                        facebook_url="https://facebook.com/google",
-                        primary_phone=PrimaryPhone(
-                            source="google",
-                            number="1234567890",
-                            sanitized_number="1234567890",
-                        ),
-                        languages=["en"],
-                        alexa_ranking=1000,
-                        phone="1234567890",
-                        linkedin_uid="1234567890",
-                        founded_year=2000,
-                        publicly_traded_symbol="GOOGL",
-                        publicly_traded_exchange="NASDAQ",
-                        logo_url="https://google.com/logo.png",
-                        chrunchbase_url="https://chrunchbase.com/google",
-                        primary_domain="google.com",
-                        sanitized_phone="1234567890",
-                        owned_by_organization_id="1",
-                        intent_strength="strong",
-                        show_intent=True,
-                        has_intent_signal_account=True,
-                        intent_signal_account="1",
-                    )
-                ]
-            },
-        )
-
-    @staticmethod
-    def search_organizations(
-        query: SearchOrganizationsRequest, credentials: ApolloCredentials
-    ) -> list[Organization]:
-        client = ApolloClient(credentials)
-        return client.search_organizations(query)
-
-    def run(
-        self, input_data: Input, *, credentials: ApolloCredentials, **kwargs
-    ) -> BlockOutput:
-        query = SearchOrganizationsRequest(
-            **input_data.model_dump(exclude={"credentials"})
-        )
-        organizations = self.search_organizations(query, credentials)
-        for organization in organizations:
-            yield "organization", organization
-        yield "organizations", organizations

autogpt_platform/backend/backend/blocks/apollo/people.py

@@ -1,394 +0,0 @@
-from backend.blocks.apollo._api import ApolloClient
-from backend.blocks.apollo._auth import (
-    TEST_CREDENTIALS,
-    TEST_CREDENTIALS_INPUT,
-    ApolloCredentials,
-    ApolloCredentialsInput,
-)
-from backend.blocks.apollo.models import (
-    Contact,
-    ContactEmailStatuses,
-    SearchPeopleRequest,
-    SenorityLevels,
-)
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-
-class SearchPeopleBlock(Block):
-    """Search for people in Apollo"""
-
-    class Input(BlockSchema):
-        person_titles: list[str] = SchemaField(
-            description="""Job titles held by the people you want to find. For a person to be included in search results, they only need to match 1 of the job titles you add. Adding more job titles expands your search results.
-
-        Results also include job titles with the same terms, even if they are not exact matches. For example, searching for marketing manager might return people with the job title content marketing manager.
-
-        Use this parameter in combination with the person_seniorities[] parameter to find people based on specific job functions and seniority levels.
-        """,
-            default=[],
-            advanced=False,
-        )
-        person_locations: list[str] = SchemaField(
-            description="""The location where people live. You can search across cities, US states, and countries.
-
-        To find people based on the headquarters locations of their current employer, use the organization_locations parameter.""",
-            default=[],
-            advanced=False,
-        )
-        person_seniorities: list[SenorityLevels] = SchemaField(
-            description="""The job seniority that people hold within their current employer. This enables you to find people that currently hold positions at certain reporting levels, such as Director level or senior IC level.
-
-        For a person to be included in search results, they only need to match 1 of the seniorities you add. Adding more seniorities expands your search results.
-
-        Searches only return results based on their current job title, so searching for Director-level employees only returns people that currently hold a Director-level title. If someone was previously a Director, but is currently a VP, they would not be included in your search results.
-
-        Use this parameter in combination with the person_titles[] parameter to find people based on specific job functions and seniority levels.""",
-            default=[],
-            advanced=False,
-        )
-        organization_locations: list[str] = SchemaField(
-            description="""The location of the company headquarters for a person's current employer. You can search across cities, US states, and countries.
-
-        If a company has several office locations, results are still based on the headquarters location. For example, if you search chicago but a company's HQ location is in boston, people that work for the Boston-based company will not appear in your results, even if they match other parameters.
-
-        To find people based on their personal location, use the person_locations parameter.""",
-            default=[],
-            advanced=False,
-        )
-        q_organization_domains: list[str] = SchemaField(
-            description="""The domain name for the person's employer. This can be the current employer or a previous employer. Do not include www., the @ symbol, or similar.
-
-        You can add multiple domains to search across companies.
-
-          Examples: apollo.io and microsoft.com""",
-            default=[],
-            advanced=False,
-        )
-        contact_email_statuses: list[ContactEmailStatuses] = SchemaField(
-            description="""The email statuses for the people you want to find. You can add multiple statuses to expand your search.""",
-            default=[],
-            advanced=False,
-        )
-        organization_ids: list[str] = SchemaField(
-            description="""The Apollo IDs for the companies (employers) you want to include in your search results. Each company in the Apollo database is assigned a unique ID.
-
-        To find IDs, call the Organization Search endpoint and identify the values for organization_id.""",
-            default=[],
-            advanced=False,
-        )
-        organization_num_empoloyees_range: list[int] = SchemaField(
-            description="""The number range of employees working for the company. This enables you to find companies based on headcount. You can add multiple ranges to expand your search results.
-
-        Each range you add needs to be a string, with the upper and lower numbers of the range separated only by a comma.""",
-            default=[],
-            advanced=False,
-        )
-        q_keywords: str = SchemaField(
-            description="""A string of words over which we want to filter the results""",
-            default="",
-            advanced=False,
-        )
-        max_results: int = SchemaField(
-            description="""The maximum number of results to return. If you don't specify this parameter, the default is 100.""",
-            default=100,
-            ge=1,
-            le=50000,
-            advanced=True,
-        )
-
-        credentials: ApolloCredentialsInput = SchemaField(
-            description="Apollo credentials",
-        )
-
-    class Output(BlockSchema):
-        people: list[Contact] = SchemaField(
-            description="List of people found",
-            default=[],
-        )
-        person: Contact = SchemaField(
-            description="Each found person, one at a time",
-        )
-        error: str = SchemaField(
-            description="Error message if the search failed",
-            default="",
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="c2adb3aa-5aae-488d-8a6e-4eb8c23e2ed6",
-            description="Search for people in Apollo",
-            categories={BlockCategory.SEARCH},
-            input_schema=SearchPeopleBlock.Input,
-            output_schema=SearchPeopleBlock.Output,
-            test_credentials=TEST_CREDENTIALS,
-            test_input={"credentials": TEST_CREDENTIALS_INPUT},
-            test_output=[
-                (
-                    "person",
-                    Contact(
-                        contact_roles=[],
-                        id="1",
-                        name="John Doe",
-                        first_name="John",
-                        last_name="Doe",
-                        linkedin_url="https://www.linkedin.com/in/johndoe",
-                        title="Software Engineer",
-                        organization_name="Google",
-                        organization_id="123456",
-                        contact_stage_id="1",
-                        owner_id="1",
-                        creator_id="1",
-                        person_id="1",
-                        email_needs_tickling=True,
-                        source="apollo",
-                        original_source="apollo",
-                        headline="Software Engineer",
-                        photo_url="https://www.linkedin.com/in/johndoe",
-                        present_raw_address="123 Main St, Anytown, USA",
-                        linkededin_uid="123456",
-                        extrapolated_email_confidence=0.8,
-                        salesforce_id="123456",
-                        salesforce_lead_id="123456",
-                        salesforce_contact_id="123456",
-                        saleforce_account_id="123456",
-                        crm_owner_id="123456",
-                        created_at="2021-01-01",
-                        emailer_campaign_ids=[],
-                        direct_dial_status="active",
-                        direct_dial_enrichment_failed_at="2021-01-01",
-                        email_status="active",
-                        email_source="apollo",
-                        account_id="123456",
-                        last_activity_date="2021-01-01",
-                        hubspot_vid="123456",
-                        hubspot_company_id="123456",
-                        crm_id="123456",
-                        sanitized_phone="123456",
-                        merged_crm_ids="123456",
-                        updated_at="2021-01-01",
-                        queued_for_crm_push=True,
-                        suggested_from_rule_engine_config_id="123456",
-                        email_unsubscribed=None,
-                        label_ids=[],
-                        has_pending_email_arcgate_request=True,
-                        has_email_arcgate_request=True,
-                        existence_level=None,
-                        email=None,
-                        email_from_customer=None,
-                        typed_custom_fields=[],
-                        custom_field_errors=None,
-                        salesforce_record_id=None,
-                        crm_record_url=None,
-                        email_status_unavailable_reason=None,
-                        email_true_status=None,
-                        updated_email_true_status=True,
-                        contact_rule_config_statuses=[],
-                        source_display_name=None,
-                        twitter_url=None,
-                        contact_campaign_statuses=[],
-                        state=None,
-                        city=None,
-                        country=None,
-                        account=None,
-                        contact_emails=[],
-                        organization=None,
-                        employment_history=[],
-                        time_zone=None,
-                        intent_strength=None,
-                        show_intent=True,
-                        phone_numbers=[],
-                        account_phone_note=None,
-                        free_domain=True,
-                        is_likely_to_engage=True,
-                        email_domain_catchall=True,
-                        contact_job_change_event=None,
-                    ),
-                ),
-                (
-                    "people",
-                    [
-                        Contact(
-                            contact_roles=[],
-                            id="1",
-                            name="John Doe",
-                            first_name="John",
-                            last_name="Doe",
-                            linkedin_url="https://www.linkedin.com/in/johndoe",
-                            title="Software Engineer",
-                            organization_name="Google",
-                            organization_id="123456",
-                            contact_stage_id="1",
-                            owner_id="1",
-                            creator_id="1",
-                            person_id="1",
-                            email_needs_tickling=True,
-                            source="apollo",
-                            original_source="apollo",
-                            headline="Software Engineer",
-                            photo_url="https://www.linkedin.com/in/johndoe",
-                            present_raw_address="123 Main St, Anytown, USA",
-                            linkededin_uid="123456",
-                            extrapolated_email_confidence=0.8,
-                            salesforce_id="123456",
-                            salesforce_lead_id="123456",
-                            salesforce_contact_id="123456",
-                            saleforce_account_id="123456",
-                            crm_owner_id="123456",
-                            created_at="2021-01-01",
-                            emailer_campaign_ids=[],
-                            direct_dial_status="active",
-                            direct_dial_enrichment_failed_at="2021-01-01",
-                            email_status="active",
-                            email_source="apollo",
-                            account_id="123456",
-                            last_activity_date="2021-01-01",
-                            hubspot_vid="123456",
-                            hubspot_company_id="123456",
-                            crm_id="123456",
-                            sanitized_phone="123456",
-                            merged_crm_ids="123456",
-                            updated_at="2021-01-01",
-                            queued_for_crm_push=True,
-                            suggested_from_rule_engine_config_id="123456",
-                            email_unsubscribed=None,
-                            label_ids=[],
-                            has_pending_email_arcgate_request=True,
-                            has_email_arcgate_request=True,
-                            existence_level=None,
-                            email=None,
-                            email_from_customer=None,
-                            typed_custom_fields=[],
-                            custom_field_errors=None,
-                            salesforce_record_id=None,
-                            crm_record_url=None,
-                            email_status_unavailable_reason=None,
-                            email_true_status=None,
-                            updated_email_true_status=True,
-                            contact_rule_config_statuses=[],
-                            source_display_name=None,
-                            twitter_url=None,
-                            contact_campaign_statuses=[],
-                            state=None,
-                            city=None,
-                            country=None,
-                            account=None,
-                            contact_emails=[],
-                            organization=None,
-                            employment_history=[],
-                            time_zone=None,
-                            intent_strength=None,
-                            show_intent=True,
-                            phone_numbers=[],
-                            account_phone_note=None,
-                            free_domain=True,
-                            is_likely_to_engage=True,
-                            email_domain_catchall=True,
-                            contact_job_change_event=None,
-                        ),
-                    ],
-                ),
-            ],
-            test_mock={
-                "search_people": lambda query, credentials: [
-                    Contact(
-                        id="1",
-                        name="John Doe",
-                        first_name="John",
-                        last_name="Doe",
-                        linkedin_url="https://www.linkedin.com/in/johndoe",
-                        title="Software Engineer",
-                        organization_name="Google",
-                        organization_id="123456",
-                        contact_stage_id="1",
-                        owner_id="1",
-                        creator_id="1",
-                        person_id="1",
-                        email_needs_tickling=True,
-                        source="apollo",
-                        original_source="apollo",
-                        headline="Software Engineer",
-                        photo_url="https://www.linkedin.com/in/johndoe",
-                        present_raw_address="123 Main St, Anytown, USA",
-                        linkededin_uid="123456",
-                        extrapolated_email_confidence=0.8,
-                        salesforce_id="123456",
-                        salesforce_lead_id="123456",
-                        salesforce_contact_id="123456",
-                        saleforce_account_id="123456",
-                        crm_owner_id="123456",
-                        created_at="2021-01-01",
-                        emailer_campaign_ids=[],
-                        direct_dial_status="active",
-                        direct_dial_enrichment_failed_at="2021-01-01",
-                        email_status="active",
-                        email_source="apollo",
-                        account_id="123456",
-                        last_activity_date="2021-01-01",
-                        hubspot_vid="123456",
-                        hubspot_company_id="123456",
-                        crm_id="123456",
-                        sanitized_phone="123456",
-                        merged_crm_ids="123456",
-                        updated_at="2021-01-01",
-                        queued_for_crm_push=True,
-                        suggested_from_rule_engine_config_id="123456",
-                        email_unsubscribed=None,
-                        label_ids=[],
-                        has_pending_email_arcgate_request=True,
-                        has_email_arcgate_request=True,
-                        existence_level=None,
-                        email=None,
-                        email_from_customer=None,
-                        typed_custom_fields=[],
-                        custom_field_errors=None,
-                        salesforce_record_id=None,
-                        crm_record_url=None,
-                        email_status_unavailable_reason=None,
-                        email_true_status=None,
-                        updated_email_true_status=True,
-                        contact_rule_config_statuses=[],
-                        source_display_name=None,
-                        twitter_url=None,
-                        contact_campaign_statuses=[],
-                        state=None,
-                        city=None,
-                        country=None,
-                        account=None,
-                        contact_emails=[],
-                        organization=None,
-                        employment_history=[],
-                        time_zone=None,
-                        intent_strength=None,
-                        show_intent=True,
-                        phone_numbers=[],
-                        account_phone_note=None,
-                        free_domain=True,
-                        is_likely_to_engage=True,
-                        email_domain_catchall=True,
-                        contact_job_change_event=None,
-                    ),
-                ]
-            },
-        )
-
-    @staticmethod
-    def search_people(
-        query: SearchPeopleRequest, credentials: ApolloCredentials
-    ) -> list[Contact]:
-        client = ApolloClient(credentials)
-        return client.search_people(query)
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: ApolloCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-
-        query = SearchPeopleRequest(**input_data.model_dump(exclude={"credentials"}))
-        people = self.search_people(query, credentials)
-        for person in people:
-            yield "person", person
-        yield "people", people

autogpt_platform/backend/backend/blocks/basic.py

@@ -1,51 +1,13 @@
-import enum
+import re
 from typing import Any, List
 
+from jinja2 import BaseLoader, Environment
+
 from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema, BlockType
 from backend.data.model import SchemaField
-from backend.util import json
-from backend.util.file import MediaFile, store_media_file
 from backend.util.mock import MockObject
-from backend.util.text import TextFormatter
-from backend.util.type import convert
 
-formatter = TextFormatter()
-
-
-class FileStoreBlock(Block):
-    class Input(BlockSchema):
-        file_in: MediaFile = SchemaField(
-            description="The file to store in the temporary directory, it can be a URL, data URI, or local path."
-        )
-
-    class Output(BlockSchema):
-        file_out: MediaFile = SchemaField(
-            description="The relative path to the stored file in the temporary directory."
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="cbb50872-625b-42f0-8203-a2ae78242d8a",
-            description="Stores the input file in the temporary directory.",
-            categories={BlockCategory.BASIC, BlockCategory.MULTIMEDIA},
-            input_schema=FileStoreBlock.Input,
-            output_schema=FileStoreBlock.Output,
-            static_output=True,
-        )
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        graph_exec_id: str,
-        **kwargs,
-    ) -> BlockOutput:
-        file_path = store_media_file(
-            graph_exec_id=graph_exec_id,
-            file=input_data.file_in,
-            return_content=False,
-        )
-        yield "file_out", file_path
+jinja = Environment(loader=BaseLoader())
 
 
 class StoreValueBlock(Block):
@@ -154,9 +116,6 @@ class FindInDictionaryBlock(Block):
         obj = input_data.input
         key = input_data.key
 
-        if isinstance(obj, str):
-            obj = json.loads(obj)
-
         if isinstance(obj, dict) and key in obj:
             yield "output", obj[key]
         elif isinstance(obj, list) and isinstance(key, int) and 0 <= key < len(obj):
@@ -284,7 +243,7 @@ class AgentOutputBlock(Block):
             advanced=True,
         )
         format: str = SchemaField(
-            description="The format string to be used to format the recorded_value. Use Jinja2 syntax.",
+            description="The format string to be used to format the recorded_value.",
             default="",
             advanced=True,
         )
@@ -301,7 +260,6 @@ class AgentOutputBlock(Block):
 
     class Output(BlockSchema):
         output: Any = SchemaField(description="The value recorded as output.")
-        name: Any = SchemaField(description="The name of the value recorded as output.")
 
     def __init__(self):
         super().__init__(
@@ -346,14 +304,13 @@ class AgentOutputBlock(Block):
         """
         if input_data.format:
             try:
-                yield "output", formatter.format_string(
-                    input_data.format, {input_data.name: input_data.value}
-                )
+                fmt = re.sub(r"(?<!{){[ a-zA-Z0-9_]+}", r"{\g<0>}", input_data.format)
+                template = jinja.from_string(fmt)
+                yield "output", template.render({input_data.name: input_data.value})
             except Exception as e:
                 yield "output", f"Error: {e}, {input_data.value}"
         else:
             yield "output", input_data.value
-            yield "name", input_data.name
 
 
 class AddToDictionaryBlock(Block):
@@ -514,48 +471,6 @@ class AddToListBlock(Block):
         yield "updated_list", updated_list
 
 
-class FindInListBlock(Block):
-    class Input(BlockSchema):
-        list: List[Any] = SchemaField(description="The list to search in.")
-        value: Any = SchemaField(description="The value to search for.")
-
-    class Output(BlockSchema):
-        index: int = SchemaField(description="The index of the value in the list.")
-        found: bool = SchemaField(
-            description="Whether the value was found in the list."
-        )
-        not_found_value: Any = SchemaField(
-            description="The value that was not found in the list."
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="5e2c6d0a-1e37-489f-b1d0-8e1812b23333",
-            description="Finds the index of the value in the list.",
-            categories={BlockCategory.BASIC},
-            input_schema=FindInListBlock.Input,
-            output_schema=FindInListBlock.Output,
-            test_input=[
-                {"list": [1, 2, 3, 4, 5], "value": 3},
-                {"list": [1, 2, 3, 4, 5], "value": 6},
-            ],
-            test_output=[
-                ("index", 2),
-                ("found", True),
-                ("found", False),
-                ("not_found_value", 6),
-            ],
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        try:
-            yield "index", input_data.list.index(input_data.value)
-            yield "found", True
-        except ValueError:
-            yield "found", False
-            yield "not_found_value", input_data.value
-
-
 class NoteBlock(Block):
     class Input(BlockSchema):
         text: str = SchemaField(description="The text to display in the sticky note.")
@@ -579,145 +494,3 @@ class NoteBlock(Block):
 
     def run(self, input_data: Input, **kwargs) -> BlockOutput:
         yield "output", input_data.text
-
-
-class CreateDictionaryBlock(Block):
-    class Input(BlockSchema):
-        values: dict[str, Any] = SchemaField(
-            description="Key-value pairs to create the dictionary with",
-            placeholder="e.g., {'name': 'Alice', 'age': 25}",
-        )
-
-    class Output(BlockSchema):
-        dictionary: dict[str, Any] = SchemaField(
-            description="The created dictionary containing the specified key-value pairs"
-        )
-        error: str = SchemaField(
-            description="Error message if dictionary creation failed"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="b924ddf4-de4f-4b56-9a85-358930dcbc91",
-            description="Creates a dictionary with the specified key-value pairs. Use this when you know all the values you want to add upfront.",
-            categories={BlockCategory.DATA},
-            input_schema=CreateDictionaryBlock.Input,
-            output_schema=CreateDictionaryBlock.Output,
-            test_input=[
-                {
-                    "values": {"name": "Alice", "age": 25, "city": "New York"},
-                },
-                {
-                    "values": {"numbers": [1, 2, 3], "active": True, "score": 95.5},
-                },
-            ],
-            test_output=[
-                (
-                    "dictionary",
-                    {"name": "Alice", "age": 25, "city": "New York"},
-                ),
-                (
-                    "dictionary",
-                    {"numbers": [1, 2, 3], "active": True, "score": 95.5},
-                ),
-            ],
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        try:
-            # The values are already validated by Pydantic schema
-            yield "dictionary", input_data.values
-        except Exception as e:
-            yield "error", f"Failed to create dictionary: {str(e)}"
-
-
-class CreateListBlock(Block):
-    class Input(BlockSchema):
-        values: List[Any] = SchemaField(
-            description="A list of values to be combined into a new list.",
-            placeholder="e.g., ['Alice', 25, True]",
-        )
-
-    class Output(BlockSchema):
-        list: List[Any] = SchemaField(
-            description="The created list containing the specified values."
-        )
-        error: str = SchemaField(description="Error message if list creation failed.")
-
-    def __init__(self):
-        super().__init__(
-            id="a912d5c7-6e00-4542-b2a9-8034136930e4",
-            description="Creates a list with the specified values. Use this when you know all the values you want to add upfront.",
-            categories={BlockCategory.DATA},
-            input_schema=CreateListBlock.Input,
-            output_schema=CreateListBlock.Output,
-            test_input=[
-                {
-                    "values": ["Alice", 25, True],
-                },
-                {
-                    "values": [1, 2, 3, "four", {"key": "value"}],
-                },
-            ],
-            test_output=[
-                (
-                    "list",
-                    ["Alice", 25, True],
-                ),
-                (
-                    "list",
-                    [1, 2, 3, "four", {"key": "value"}],
-                ),
-            ],
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        try:
-            # The values are already validated by Pydantic schema
-            yield "list", input_data.values
-        except Exception as e:
-            yield "error", f"Failed to create list: {str(e)}"
-
-
-class TypeOptions(enum.Enum):
-    STRING = "string"
-    NUMBER = "number"
-    BOOLEAN = "boolean"
-    LIST = "list"
-    DICTIONARY = "dictionary"
-
-
-class UniversalTypeConverterBlock(Block):
-    class Input(BlockSchema):
-        value: Any = SchemaField(
-            description="The value to convert to a universal type."
-        )
-        type: TypeOptions = SchemaField(description="The type to convert the value to.")
-
-    class Output(BlockSchema):
-        value: Any = SchemaField(description="The converted value.")
-
-    def __init__(self):
-        super().__init__(
-            id="95d1b990-ce13-4d88-9737-ba5c2070c97b",
-            description="This block is used to convert a value to a universal type.",
-            categories={BlockCategory.BASIC},
-            input_schema=UniversalTypeConverterBlock.Input,
-            output_schema=UniversalTypeConverterBlock.Output,
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        try:
-            converted_value = convert(
-                input_data.value,
-                {
-                    TypeOptions.STRING: str,
-                    TypeOptions.NUMBER: float,
-                    TypeOptions.BOOLEAN: bool,
-                    TypeOptions.LIST: list,
-                    TypeOptions.DICTIONARY: dict,
-                }[input_data.type],
-            )
-            yield "value", converted_value
-        except Exception as e:
-            yield "error", f"Failed to convert value: {str(e)}"

autogpt_platform/backend/backend/blocks/branching.py

@@ -107,83 +107,3 @@ class ConditionBlock(Block):
             yield "yes_output", yes_value
         else:
             yield "no_output", no_value
-
-
-class IfInputMatchesBlock(Block):
-    class Input(BlockSchema):
-        input: Any = SchemaField(
-            description="The input to match against",
-            placeholder="For example: 10 or 'hello' or True",
-        )
-        value: Any = SchemaField(
-            description="The value to output if the input matches",
-            placeholder="For example: 'Greater' or 20 or False",
-        )
-        yes_value: Any = SchemaField(
-            description="The value to output if the input matches",
-            placeholder="For example: 'Greater' or 20 or False",
-            default=None,
-        )
-        no_value: Any = SchemaField(
-            description="The value to output if the input does not match",
-            placeholder="For example: 'Greater' or 20 or False",
-            default=None,
-        )
-
-    class Output(BlockSchema):
-        result: bool = SchemaField(
-            description="The result of the condition evaluation (True or False)"
-        )
-        yes_output: Any = SchemaField(
-            description="The output value if the condition is true"
-        )
-        no_output: Any = SchemaField(
-            description="The output value if the condition is false"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="6dbbc4b3-ca6c-42b6-b508-da52d23e13f2",
-            input_schema=IfInputMatchesBlock.Input,
-            output_schema=IfInputMatchesBlock.Output,
-            description="Handles conditional logic based on comparison operators",
-            categories={BlockCategory.LOGIC},
-            test_input=[
-                {
-                    "input": 10,
-                    "value": 10,
-                    "yes_value": "Greater",
-                    "no_value": "Not greater",
-                },
-                {
-                    "input": 10,
-                    "value": 20,
-                    "yes_value": "Greater",
-                    "no_value": "Not greater",
-                },
-                {
-                    "input": 10,
-                    "value": None,
-                    "yes_value": "Yes",
-                    "no_value": "No",
-                },
-            ],
-            test_output=[
-                ("result", True),
-                ("yes_output", "Greater"),
-                ("result", False),
-                ("no_output", "Not greater"),
-                ("result", False),
-                ("no_output", "No"),
-                # ("result", True),
-                # ("yes_output", "Yes"),
-            ],
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        if input_data.input == input_data.value or input_data.input is input_data.value:
-            yield "result", True
-            yield "yes_output", input_data.yes_value
-        else:
-            yield "result", False
-            yield "no_output", input_data.no_value

autogpt_platform/backend/backend/blocks/code_executor.py

@@ -1,457 +0,0 @@
-from enum import Enum
-from typing import Literal
-
-from e2b_code_interpreter import Sandbox
-from pydantic import SecretStr
-
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import (
-    APIKeyCredentials,
-    CredentialsField,
-    CredentialsMetaInput,
-    SchemaField,
-)
-from backend.integrations.providers import ProviderName
-
-TEST_CREDENTIALS = APIKeyCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="e2b",
-    api_key=SecretStr("mock-e2b-api-key"),
-    title="Mock E2B API key",
-    expires_at=None,
-)
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.type,
-}
-
-
-class ProgrammingLanguage(Enum):
-    PYTHON = "python"
-    JAVASCRIPT = "js"
-    BASH = "bash"
-    R = "r"
-    JAVA = "java"
-
-
-class CodeExecutionBlock(Block):
-    # TODO : Add support to upload and download files
-    # Currently, You can customized the CPU and Memory, only by creating a pre customized sandbox template
-    class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.E2B], Literal["api_key"]
-        ] = CredentialsField(
-            description="Enter your api key for the E2B Sandbox. You can get it in here - https://e2b.dev/docs",
-        )
-
-        # Todo : Option to run commond in background
-        setup_commands: list[str] = SchemaField(
-            description=(
-                "Shell commands to set up the sandbox before running the code. "
-                "You can use `curl` or `git` to install your desired Debian based "
-                "package manager. `pip` and `npm` are pre-installed.\n\n"
-                "These commands are executed with `sh`, in the foreground."
-            ),
-            placeholder="pip install cowsay",
-            default=[],
-            advanced=False,
-        )
-
-        code: str = SchemaField(
-            description="Code to execute in the sandbox",
-            placeholder="print('Hello, World!')",
-            default="",
-            advanced=False,
-        )
-
-        language: ProgrammingLanguage = SchemaField(
-            description="Programming language to execute",
-            default=ProgrammingLanguage.PYTHON,
-            advanced=False,
-        )
-
-        timeout: int = SchemaField(
-            description="Execution timeout in seconds", default=300
-        )
-
-        template_id: str = SchemaField(
-            description=(
-                "You can use an E2B sandbox template by entering its ID here. "
-                "Check out the E2B docs for more details: "
-                "[E2B - Sandbox template](https://e2b.dev/docs/sandbox-template)"
-            ),
-            default="",
-            advanced=True,
-        )
-
-    class Output(BlockSchema):
-        response: str = SchemaField(description="Response from code execution")
-        stdout_logs: str = SchemaField(
-            description="Standard output logs from execution"
-        )
-        stderr_logs: str = SchemaField(description="Standard error logs from execution")
-        error: str = SchemaField(description="Error message if execution failed")
-
-    def __init__(self):
-        super().__init__(
-            id="0b02b072-abe7-11ef-8372-fb5d162dd712",
-            description="Executes code in an isolated sandbox environment with internet access.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=CodeExecutionBlock.Input,
-            output_schema=CodeExecutionBlock.Output,
-            test_credentials=TEST_CREDENTIALS,
-            test_input={
-                "credentials": TEST_CREDENTIALS_INPUT,
-                "code": "print('Hello World')",
-                "language": ProgrammingLanguage.PYTHON.value,
-                "setup_commands": [],
-                "timeout": 300,
-                "template_id": "",
-            },
-            test_output=[
-                ("response", "Hello World"),
-                ("stdout_logs", "Hello World\n"),
-            ],
-            test_mock={
-                "execute_code": lambda code, language, setup_commands, timeout, api_key, template_id: (
-                    "Hello World",
-                    "Hello World\n",
-                    "",
-                ),
-            },
-        )
-
-    def execute_code(
-        self,
-        code: str,
-        language: ProgrammingLanguage,
-        setup_commands: list[str],
-        timeout: int,
-        api_key: str,
-        template_id: str,
-    ):
-        try:
-            sandbox = None
-            if template_id:
-                sandbox = Sandbox(
-                    template=template_id, api_key=api_key, timeout=timeout
-                )
-            else:
-                sandbox = Sandbox(api_key=api_key, timeout=timeout)
-
-            if not sandbox:
-                raise Exception("Sandbox not created")
-
-            # Running setup commands
-            for cmd in setup_commands:
-                sandbox.commands.run(cmd)
-
-            # Executing the code
-            execution = sandbox.run_code(
-                code,
-                language=language.value,
-                on_error=lambda e: sandbox.kill(),  # Kill the sandbox if there is an error
-            )
-
-            if execution.error:
-                raise Exception(execution.error)
-
-            response = execution.text
-            stdout_logs = "".join(execution.logs.stdout)
-            stderr_logs = "".join(execution.logs.stderr)
-
-            return response, stdout_logs, stderr_logs
-
-        except Exception as e:
-            raise e
-
-    def run(
-        self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs
-    ) -> BlockOutput:
-        try:
-            response, stdout_logs, stderr_logs = self.execute_code(
-                input_data.code,
-                input_data.language,
-                input_data.setup_commands,
-                input_data.timeout,
-                credentials.api_key.get_secret_value(),
-                input_data.template_id,
-            )
-
-            if response:
-                yield "response", response
-            if stdout_logs:
-                yield "stdout_logs", stdout_logs
-            if stderr_logs:
-                yield "stderr_logs", stderr_logs
-        except Exception as e:
-            yield "error", str(e)
-
-
-class InstantiationBlock(Block):
-    class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.E2B], Literal["api_key"]
-        ] = CredentialsField(
-            description="Enter your api key for the E2B Sandbox. You can get it in here - https://e2b.dev/docs",
-        )
-
-        # Todo : Option to run commond in background
-        setup_commands: list[str] = SchemaField(
-            description=(
-                "Shell commands to set up the sandbox before running the code. "
-                "You can use `curl` or `git` to install your desired Debian based "
-                "package manager. `pip` and `npm` are pre-installed.\n\n"
-                "These commands are executed with `sh`, in the foreground."
-            ),
-            placeholder="pip install cowsay",
-            default=[],
-            advanced=False,
-        )
-
-        setup_code: str = SchemaField(
-            description="Code to execute in the sandbox",
-            placeholder="print('Hello, World!')",
-            default="",
-            advanced=False,
-        )
-
-        language: ProgrammingLanguage = SchemaField(
-            description="Programming language to execute",
-            default=ProgrammingLanguage.PYTHON,
-            advanced=False,
-        )
-
-        timeout: int = SchemaField(
-            description="Execution timeout in seconds", default=300
-        )
-
-        template_id: str = SchemaField(
-            description=(
-                "You can use an E2B sandbox template by entering its ID here. "
-                "Check out the E2B docs for more details: "
-                "[E2B - Sandbox template](https://e2b.dev/docs/sandbox-template)"
-            ),
-            default="",
-            advanced=True,
-        )
-
-    class Output(BlockSchema):
-        sandbox_id: str = SchemaField(description="ID of the sandbox instance")
-        response: str = SchemaField(description="Response from code execution")
-        stdout_logs: str = SchemaField(
-            description="Standard output logs from execution"
-        )
-        stderr_logs: str = SchemaField(description="Standard error logs from execution")
-        error: str = SchemaField(description="Error message if execution failed")
-
-    def __init__(self):
-        super().__init__(
-            id="ff0861c9-1726-4aec-9e5b-bf53f3622112",
-            description="Instantiate an isolated sandbox environment with internet access where to execute code in.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=InstantiationBlock.Input,
-            output_schema=InstantiationBlock.Output,
-            test_credentials=TEST_CREDENTIALS,
-            test_input={
-                "credentials": TEST_CREDENTIALS_INPUT,
-                "setup_code": "print('Hello World')",
-                "language": ProgrammingLanguage.PYTHON.value,
-                "setup_commands": [],
-                "timeout": 300,
-                "template_id": "",
-            },
-            test_output=[
-                ("sandbox_id", str),
-                ("response", "Hello World"),
-                ("stdout_logs", "Hello World\n"),
-            ],
-            test_mock={
-                "execute_code": lambda setup_code, language, setup_commands, timeout, api_key, template_id: (
-                    "sandbox_id",
-                    "Hello World",
-                    "Hello World\n",
-                    "",
-                ),
-            },
-        )
-
-    def run(
-        self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs
-    ) -> BlockOutput:
-        try:
-            sandbox_id, response, stdout_logs, stderr_logs = self.execute_code(
-                input_data.setup_code,
-                input_data.language,
-                input_data.setup_commands,
-                input_data.timeout,
-                credentials.api_key.get_secret_value(),
-                input_data.template_id,
-            )
-            if sandbox_id:
-                yield "sandbox_id", sandbox_id
-            else:
-                yield "error", "Sandbox ID not found"
-            if response:
-                yield "response", response
-            if stdout_logs:
-                yield "stdout_logs", stdout_logs
-            if stderr_logs:
-                yield "stderr_logs", stderr_logs
-        except Exception as e:
-            yield "error", str(e)
-
-    def execute_code(
-        self,
-        code: str,
-        language: ProgrammingLanguage,
-        setup_commands: list[str],
-        timeout: int,
-        api_key: str,
-        template_id: str,
-    ):
-        try:
-            sandbox = None
-            if template_id:
-                sandbox = Sandbox(
-                    template=template_id, api_key=api_key, timeout=timeout
-                )
-            else:
-                sandbox = Sandbox(api_key=api_key, timeout=timeout)
-
-            if not sandbox:
-                raise Exception("Sandbox not created")
-
-            # Running setup commands
-            for cmd in setup_commands:
-                sandbox.commands.run(cmd)
-
-            # Executing the code
-            execution = sandbox.run_code(
-                code,
-                language=language.value,
-                on_error=lambda e: sandbox.kill(),  # Kill the sandbox if there is an error
-            )
-
-            if execution.error:
-                raise Exception(execution.error)
-
-            response = execution.text
-            stdout_logs = "".join(execution.logs.stdout)
-            stderr_logs = "".join(execution.logs.stderr)
-
-            return sandbox.sandbox_id, response, stdout_logs, stderr_logs
-
-        except Exception as e:
-            raise e
-
-
-class StepExecutionBlock(Block):
-    class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.E2B], Literal["api_key"]
-        ] = CredentialsField(
-            description="Enter your api key for the E2B Sandbox. You can get it in here - https://e2b.dev/docs",
-        )
-
-        sandbox_id: str = SchemaField(
-            description="ID of the sandbox instance to execute the code in",
-            advanced=False,
-        )
-
-        step_code: str = SchemaField(
-            description="Code to execute in the sandbox",
-            placeholder="print('Hello, World!')",
-            default="",
-            advanced=False,
-        )
-
-        language: ProgrammingLanguage = SchemaField(
-            description="Programming language to execute",
-            default=ProgrammingLanguage.PYTHON,
-            advanced=False,
-        )
-
-    class Output(BlockSchema):
-        response: str = SchemaField(description="Response from code execution")
-        stdout_logs: str = SchemaField(
-            description="Standard output logs from execution"
-        )
-        stderr_logs: str = SchemaField(description="Standard error logs from execution")
-        error: str = SchemaField(description="Error message if execution failed")
-
-    def __init__(self):
-        super().__init__(
-            id="82b59b8e-ea10-4d57-9161-8b169b0adba6",
-            description="Execute code in a previously instantiated sandbox environment.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=StepExecutionBlock.Input,
-            output_schema=StepExecutionBlock.Output,
-            test_credentials=TEST_CREDENTIALS,
-            test_input={
-                "credentials": TEST_CREDENTIALS_INPUT,
-                "sandbox_id": "sandbox_id",
-                "step_code": "print('Hello World')",
-                "language": ProgrammingLanguage.PYTHON.value,
-            },
-            test_output=[
-                ("response", "Hello World"),
-                ("stdout_logs", "Hello World\n"),
-            ],
-            test_mock={
-                "execute_step_code": lambda sandbox_id, step_code, language, api_key: (
-                    "Hello World",
-                    "Hello World\n",
-                    "",
-                ),
-            },
-        )
-
-    def execute_step_code(
-        self,
-        sandbox_id: str,
-        code: str,
-        language: ProgrammingLanguage,
-        api_key: str,
-    ):
-        try:
-            sandbox = Sandbox.connect(sandbox_id=sandbox_id, api_key=api_key)
-            if not sandbox:
-                raise Exception("Sandbox not found")
-
-            # Executing the code
-            execution = sandbox.run_code(code, language=language.value)
-
-            if execution.error:
-                raise Exception(execution.error)
-
-            response = execution.text
-            stdout_logs = "".join(execution.logs.stdout)
-            stderr_logs = "".join(execution.logs.stderr)
-
-            return response, stdout_logs, stderr_logs
-
-        except Exception as e:
-            raise e
-
-    def run(
-        self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs
-    ) -> BlockOutput:
-        try:
-            response, stdout_logs, stderr_logs = self.execute_step_code(
-                input_data.sandbox_id,
-                input_data.step_code,
-                input_data.language,
-                credentials.api_key.get_secret_value(),
-            )
-
-            if response:
-                yield "response", response
-            if stdout_logs:
-                yield "stdout_logs", stdout_logs
-            if stderr_logs:
-                yield "stderr_logs", stderr_logs
-        except Exception as e:
-            yield "error", str(e)

autogpt_platform/backend/backend/blocks/code_extraction_block.py

@@ -1,110 +0,0 @@
-import re
-
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-
-class CodeExtractionBlock(Block):
-    class Input(BlockSchema):
-        text: str = SchemaField(
-            description="Text containing code blocks to extract (e.g., AI response)",
-            placeholder="Enter text containing code blocks",
-        )
-
-    class Output(BlockSchema):
-        html: str = SchemaField(description="Extracted HTML code")
-        css: str = SchemaField(description="Extracted CSS code")
-        javascript: str = SchemaField(description="Extracted JavaScript code")
-        python: str = SchemaField(description="Extracted Python code")
-        sql: str = SchemaField(description="Extracted SQL code")
-        java: str = SchemaField(description="Extracted Java code")
-        cpp: str = SchemaField(description="Extracted C++ code")
-        csharp: str = SchemaField(description="Extracted C# code")
-        json_code: str = SchemaField(description="Extracted JSON code")
-        bash: str = SchemaField(description="Extracted Bash code")
-        php: str = SchemaField(description="Extracted PHP code")
-        ruby: str = SchemaField(description="Extracted Ruby code")
-        yaml: str = SchemaField(description="Extracted YAML code")
-        markdown: str = SchemaField(description="Extracted Markdown code")
-        typescript: str = SchemaField(description="Extracted TypeScript code")
-        xml: str = SchemaField(description="Extracted XML code")
-        remaining_text: str = SchemaField(
-            description="Remaining text after code extraction"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="d3a7d896-3b78-4f44-8b4b-48fbf4f0bcd8",
-            description="Extracts code blocks from text and identifies their programming languages",
-            categories={BlockCategory.TEXT},
-            input_schema=CodeExtractionBlock.Input,
-            output_schema=CodeExtractionBlock.Output,
-            test_input={
-                "text": "Here's a Python example:\n```python\nprint('Hello World')\n```\nAnd some HTML:\n```html\n<h1>Title</h1>\n```"
-            },
-            test_output=[
-                ("html", "<h1>Title</h1>"),
-                ("python", "print('Hello World')"),
-                ("remaining_text", "Here's a Python example:\nAnd some HTML:"),
-            ],
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        # List of supported programming languages with mapped aliases
-        language_aliases = {
-            "html": ["html", "htm"],
-            "css": ["css"],
-            "javascript": ["javascript", "js"],
-            "python": ["python", "py"],
-            "sql": ["sql"],
-            "java": ["java"],
-            "cpp": ["cpp", "c++"],
-            "csharp": ["csharp", "c#", "cs"],
-            "json_code": ["json"],
-            "bash": ["bash", "shell", "sh"],
-            "php": ["php"],
-            "ruby": ["ruby", "rb"],
-            "yaml": ["yaml", "yml"],
-            "markdown": ["markdown", "md"],
-            "typescript": ["typescript", "ts"],
-            "xml": ["xml"],
-        }
-
-        # Extract code for each language
-        for canonical_name, aliases in language_aliases.items():
-            code = ""
-            # Try each alias for the language
-            for alias in aliases:
-                code_for_alias = self.extract_code(input_data.text, alias)
-                if code_for_alias:
-                    code = code + "\n\n" + code_for_alias if code else code_for_alias
-
-            if code:  # Only yield if there's actual code content
-                yield canonical_name, code
-
-        # Remove all code blocks from the text to get remaining text
-        pattern = (
-            r"```(?:"
-            + "|".join(
-                re.escape(alias)
-                for aliases in language_aliases.values()
-                for alias in aliases
-            )
-            + r")\s+[\s\S]*?```"
-        )
-
-        remaining_text = re.sub(pattern, "", input_data.text).strip()
-        remaining_text = re.sub(r"\n\s*\n", "\n", remaining_text)
-
-        if remaining_text:  # Only yield if there's remaining text
-            yield "remaining_text", remaining_text
-
-    def extract_code(self, text: str, language: str) -> str:
-        # Escape special regex characters in the language string
-        language = re.escape(language)
-        # Extract all code blocks enclosed in ```language``` blocks
-        pattern = re.compile(rf"```{language}\s+(.*?)```", re.DOTALL | re.IGNORECASE)
-        matches = pattern.finditer(text)
-        # Combine all code blocks for this language with newlines between them
-        code_blocks = [match.group(1).strip() for match in matches]
-        return "\n\n".join(code_blocks) if code_blocks else ""

autogpt_platform/backend/backend/blocks/compass/triggers.py

@@ -1,59 +0,0 @@
-from pydantic import BaseModel
-
-from backend.data.block import (
-    Block,
-    BlockCategory,
-    BlockManualWebhookConfig,
-    BlockOutput,
-    BlockSchema,
-)
-from backend.data.model import SchemaField
-from backend.integrations.webhooks.compass import CompassWebhookType
-
-
-class Transcription(BaseModel):
-    text: str
-    speaker: str
-    end: float
-    start: float
-    duration: float
-
-
-class TranscriptionDataModel(BaseModel):
-    date: str
-    transcription: str
-    transcriptions: list[Transcription]
-
-
-class CompassAITriggerBlock(Block):
-    class Input(BlockSchema):
-        payload: TranscriptionDataModel = SchemaField(hidden=True)
-
-    class Output(BlockSchema):
-        transcription: str = SchemaField(
-            description="The contents of the compass transcription."
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="9464a020-ed1d-49e1-990f-7f2ac924a2b7",
-            description="This block will output the contents of the compass transcription.",
-            categories={BlockCategory.HARDWARE},
-            input_schema=CompassAITriggerBlock.Input,
-            output_schema=CompassAITriggerBlock.Output,
-            webhook_config=BlockManualWebhookConfig(
-                provider="compass",
-                webhook_type=CompassWebhookType.TRANSCRIPTION,
-            ),
-            test_input=[
-                {"input": "Hello, World!"},
-                {"input": "Hello, World!", "data": "Existing Data"},
-            ],
-            # test_output=[
-            #     ("output", "Hello, World!"),  # No data provided, so trigger is returned
-            #     ("output", "Existing Data"),  # Data is provided, so data is returned.
-            # ],
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        yield "transcription", input_data.payload.transcription

autogpt_platform/backend/backend/blocks/discord.py

@@ -12,15 +12,16 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 
-DiscordCredentials = CredentialsMetaInput[
-    Literal[ProviderName.DISCORD], Literal["api_key"]
-]
+DiscordCredentials = CredentialsMetaInput[Literal["discord"], Literal["api_key"]]
 
 
 def DiscordCredentialsField() -> DiscordCredentials:
-    return CredentialsField(description="Discord bot token")
+    return CredentialsField(
+        description="Discord bot token",
+        provider="discord",
+        supported_credential_types={"api_key"},
+    )
 
 
 TEST_CREDENTIALS = APIKeyCredentials(

autogpt_platform/backend/backend/blocks/email_block.py

@@ -1,53 +1,22 @@
 import smtplib
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from typing import Literal
 
-from pydantic import BaseModel, ConfigDict, SecretStr
+from pydantic import BaseModel, ConfigDict
 
 from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import (
-    CredentialsField,
-    CredentialsMetaInput,
-    SchemaField,
-    UserPasswordCredentials,
-)
-from backend.integrations.providers import ProviderName
-
-TEST_CREDENTIALS = UserPasswordCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="smtp",
-    username=SecretStr("mock-smtp-username"),
-    password=SecretStr("mock-smtp-password"),
-    title="Mock SMTP credentials",
-)
-
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.title,
-}
-SMTPCredentials = UserPasswordCredentials
-SMTPCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.SMTP],
-    Literal["user_password"],
-]
+from backend.data.model import BlockSecret, SchemaField, SecretField
 
 
-def SMTPCredentialsField() -> SMTPCredentialsInput:
-    return CredentialsField(
-        description="The SMTP integration requires a username and password.",
-    )
-
-
-class SMTPConfig(BaseModel):
+class EmailCredentials(BaseModel):
     smtp_server: str = SchemaField(
-        default="smtp.example.com", description="SMTP server address"
+        default="smtp.gmail.com", description="SMTP server address"
     )
     smtp_port: int = SchemaField(default=25, description="SMTP port number")
+    smtp_username: BlockSecret = SecretField(key="smtp_username")
+    smtp_password: BlockSecret = SecretField(key="smtp_password")
 
-    model_config = ConfigDict(title="SMTP Config")
+    model_config = ConfigDict(title="Email Credentials")
 
 
 class SendEmailBlock(Block):
@@ -61,11 +30,10 @@ class SendEmailBlock(Block):
         body: str = SchemaField(
             description="Body of the email", placeholder="Enter the email body"
         )
-        config: SMTPConfig = SchemaField(
-            description="SMTP Config",
-            default=SMTPConfig(),
+        creds: EmailCredentials = SchemaField(
+            description="SMTP credentials",
+            default=EmailCredentials(),
         )
-        credentials: SMTPCredentialsInput = SMTPCredentialsField()
 
     class Output(BlockSchema):
         status: str = SchemaField(description="Status of the email sending operation")
@@ -75,6 +43,7 @@ class SendEmailBlock(Block):
 
     def __init__(self):
         super().__init__(
+            disabled=True,
             id="4335878a-394e-4e67-adf2-919877ff49ae",
             description="This block sends an email using the provided SMTP credentials.",
             categories={BlockCategory.OUTPUT},
@@ -84,29 +53,25 @@ class SendEmailBlock(Block):
                 "to_email": "recipient@example.com",
                 "subject": "Test Email",
                 "body": "This is a test email.",
-                "config": {
+                "creds": {
                     "smtp_server": "smtp.gmail.com",
                     "smtp_port": 25,
+                    "smtp_username": "your-email@gmail.com",
+                    "smtp_password": "your-gmail-password",
                 },
-                "credentials": TEST_CREDENTIALS_INPUT,
             },
-            test_credentials=TEST_CREDENTIALS,
             test_output=[("status", "Email sent successfully")],
             test_mock={"send_email": lambda *args, **kwargs: "Email sent successfully"},
         )
 
     @staticmethod
     def send_email(
-        config: SMTPConfig,
-        to_email: str,
-        subject: str,
-        body: str,
-        credentials: SMTPCredentials,
+        creds: EmailCredentials, to_email: str, subject: str, body: str
     ) -> str:
-        smtp_server = config.smtp_server
-        smtp_port = config.smtp_port
-        smtp_username = credentials.username.get_secret_value()
-        smtp_password = credentials.password.get_secret_value()
+        smtp_server = creds.smtp_server
+        smtp_port = creds.smtp_port
+        smtp_username = creds.smtp_username.get_secret_value()
+        smtp_password = creds.smtp_password.get_secret_value()
 
         msg = MIMEMultipart()
         msg["From"] = smtp_username
@@ -121,13 +86,10 @@ class SendEmailBlock(Block):
 
         return "Email sent successfully"
 
-    def run(
-        self, input_data: Input, *, credentials: SMTPCredentials, **kwargs
-    ) -> BlockOutput:
+    def run(self, input_data: Input, **kwargs) -> BlockOutput:
         yield "status", self.send_email(
-            config=input_data.config,
-            to_email=input_data.to_email,
-            subject=input_data.subject,
-            body=input_data.body,
-            credentials=credentials,
+            input_data.creds,
+            input_data.to_email,
+            input_data.subject,
+            input_data.body,
         )

autogpt_platform/backend/backend/blocks/exa/_auth.py

@@ -1,32 +0,0 @@
-from typing import Literal
-
-from pydantic import SecretStr
-
-from backend.data.model import APIKeyCredentials, CredentialsField, CredentialsMetaInput
-from backend.integrations.providers import ProviderName
-
-ExaCredentials = APIKeyCredentials
-ExaCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.EXA],
-    Literal["api_key"],
-]
-
-TEST_CREDENTIALS = APIKeyCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="exa",
-    api_key=SecretStr("mock-exa-api-key"),
-    title="Mock Exa API key",
-    expires_at=None,
-)
-
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.title,
-}
-
-
-def ExaCredentialsField() -> ExaCredentialsInput:
-    """Creates an Exa credentials input on a block."""
-    return CredentialsField(description="The Exa integration requires an API Key.")

autogpt_platform/backend/backend/blocks/exa/contents.py

@@ -1,88 +0,0 @@
-from typing import List
-
-from pydantic import BaseModel
-
-from backend.blocks.exa._auth import (
-    ExaCredentials,
-    ExaCredentialsField,
-    ExaCredentialsInput,
-)
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-from backend.util.request import requests
-
-
-class ContentRetrievalSettings(BaseModel):
-    text: dict = SchemaField(
-        description="Text content settings",
-        default={"maxCharacters": 1000, "includeHtmlTags": False},
-        advanced=True,
-    )
-    highlights: dict = SchemaField(
-        description="Highlight settings",
-        default={
-            "numSentences": 3,
-            "highlightsPerUrl": 3,
-            "query": "",
-        },
-        advanced=True,
-    )
-    summary: dict = SchemaField(
-        description="Summary settings",
-        default={"query": ""},
-        advanced=True,
-    )
-
-
-class ExaContentsBlock(Block):
-    class Input(BlockSchema):
-        credentials: ExaCredentialsInput = ExaCredentialsField()
-        ids: List[str] = SchemaField(
-            description="Array of document IDs obtained from searches",
-        )
-        contents: ContentRetrievalSettings = SchemaField(
-            description="Content retrieval settings",
-            default=ContentRetrievalSettings(),
-            advanced=True,
-        )
-
-    class Output(BlockSchema):
-        results: list = SchemaField(
-            description="List of document contents",
-            default=[],
-        )
-        error: str = SchemaField(description="Error message if the request failed")
-
-    def __init__(self):
-        super().__init__(
-            id="c52be83f-f8cd-4180-b243-af35f986b461",
-            description="Retrieves document contents using Exa's contents API",
-            categories={BlockCategory.SEARCH},
-            input_schema=ExaContentsBlock.Input,
-            output_schema=ExaContentsBlock.Output,
-        )
-
-    def run(
-        self, input_data: Input, *, credentials: ExaCredentials, **kwargs
-    ) -> BlockOutput:
-        url = "https://api.exa.ai/contents"
-        headers = {
-            "Content-Type": "application/json",
-            "x-api-key": credentials.api_key.get_secret_value(),
-        }
-
-        payload = {
-            "ids": input_data.ids,
-            "text": input_data.contents.text,
-            "highlights": input_data.contents.highlights,
-            "summary": input_data.contents.summary,
-        }
-
-        try:
-            response = requests.post(url, headers=headers, json=payload)
-            response.raise_for_status()
-            data = response.json()
-            yield "results", data.get("results", [])
-        except Exception as e:
-            yield "error", str(e)
-            yield "results", []

autogpt_platform/backend/backend/blocks/exa/helpers.py

@@ -1,54 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel
-
-from backend.data.model import SchemaField
-
-
-class TextSettings(BaseModel):
-    max_characters: int = SchemaField(
-        default=1000,
-        description="Maximum number of characters to return",
-        placeholder="1000",
-    )
-    include_html_tags: bool = SchemaField(
-        default=False,
-        description="Whether to include HTML tags in the text",
-        placeholder="False",
-    )
-
-
-class HighlightSettings(BaseModel):
-    num_sentences: int = SchemaField(
-        default=3,
-        description="Number of sentences per highlight",
-        placeholder="3",
-    )
-    highlights_per_url: int = SchemaField(
-        default=3,
-        description="Number of highlights per URL",
-        placeholder="3",
-    )
-
-
-class SummarySettings(BaseModel):
-    query: Optional[str] = SchemaField(
-        default="",
-        description="Query string for summarization",
-        placeholder="Enter query",
-    )
-
-
-class ContentSettings(BaseModel):
-    text: TextSettings = SchemaField(
-        default=TextSettings(),
-        description="Text content settings",
-    )
-    highlights: HighlightSettings = SchemaField(
-        default=HighlightSettings(),
-        description="Highlight settings",
-    )
-    summary: SummarySettings = SchemaField(
-        default=SummarySettings(),
-        description="Summary settings",
-    )

autogpt_platform/backend/backend/blocks/exa/search.py

@@ -1,143 +0,0 @@
-from datetime import datetime
-from typing import List
-
-from backend.blocks.exa._auth import (
-    ExaCredentials,
-    ExaCredentialsField,
-    ExaCredentialsInput,
-)
-from backend.blocks.exa.helpers import ContentSettings
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-from backend.util.request import requests
-
-
-class ExaSearchBlock(Block):
-    class Input(BlockSchema):
-        credentials: ExaCredentialsInput = ExaCredentialsField()
-        query: str = SchemaField(description="The search query")
-        use_auto_prompt: bool = SchemaField(
-            description="Whether to use autoprompt",
-            default=True,
-            advanced=True,
-        )
-        type: str = SchemaField(
-            description="Type of search",
-            default="",
-            advanced=True,
-        )
-        category: str = SchemaField(
-            description="Category to search within",
-            default="",
-            advanced=True,
-        )
-        number_of_results: int = SchemaField(
-            description="Number of results to return",
-            default=10,
-            advanced=True,
-        )
-        include_domains: List[str] = SchemaField(
-            description="Domains to include in search",
-            default=[],
-        )
-        exclude_domains: List[str] = SchemaField(
-            description="Domains to exclude from search",
-            default=[],
-            advanced=True,
-        )
-        start_crawl_date: datetime = SchemaField(
-            description="Start date for crawled content",
-        )
-        end_crawl_date: datetime = SchemaField(
-            description="End date for crawled content",
-        )
-        start_published_date: datetime = SchemaField(
-            description="Start date for published content",
-        )
-        end_published_date: datetime = SchemaField(
-            description="End date for published content",
-        )
-        include_text: List[str] = SchemaField(
-            description="Text patterns to include",
-            default=[],
-            advanced=True,
-        )
-        exclude_text: List[str] = SchemaField(
-            description="Text patterns to exclude",
-            default=[],
-            advanced=True,
-        )
-        contents: ContentSettings = SchemaField(
-            description="Content retrieval settings",
-            default=ContentSettings(),
-            advanced=True,
-        )
-
-    class Output(BlockSchema):
-        results: list = SchemaField(
-            description="List of search results",
-            default=[],
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="996cec64-ac40-4dde-982f-b0dc60a5824d",
-            description="Searches the web using Exa's advanced search API",
-            categories={BlockCategory.SEARCH},
-            input_schema=ExaSearchBlock.Input,
-            output_schema=ExaSearchBlock.Output,
-        )
-
-    def run(
-        self, input_data: Input, *, credentials: ExaCredentials, **kwargs
-    ) -> BlockOutput:
-        url = "https://api.exa.ai/search"
-        headers = {
-            "Content-Type": "application/json",
-            "x-api-key": credentials.api_key.get_secret_value(),
-        }
-
-        payload = {
-            "query": input_data.query,
-            "useAutoprompt": input_data.use_auto_prompt,
-            "numResults": input_data.number_of_results,
-            "contents": input_data.contents.dict(),
-        }
-
-        date_field_mapping = {
-            "start_crawl_date": "startCrawlDate",
-            "end_crawl_date": "endCrawlDate",
-            "start_published_date": "startPublishedDate",
-            "end_published_date": "endPublishedDate",
-        }
-
-        # Add dates if they exist
-        for input_field, api_field in date_field_mapping.items():
-            value = getattr(input_data, input_field, None)
-            if value:
-                payload[api_field] = value.strftime("%Y-%m-%dT%H:%M:%S.000Z")
-
-        optional_field_mapping = {
-            "type": "type",
-            "category": "category",
-            "include_domains": "includeDomains",
-            "exclude_domains": "excludeDomains",
-            "include_text": "includeText",
-            "exclude_text": "excludeText",
-        }
-
-        # Add other fields
-        for input_field, api_field in optional_field_mapping.items():
-            value = getattr(input_data, input_field)
-            if value:  # Only add non-empty values
-                payload[api_field] = value
-
-        try:
-            response = requests.post(url, headers=headers, json=payload)
-            response.raise_for_status()
-            data = response.json()
-            # Extract just the results array from the response
-            yield "results", data.get("results", [])
-        except Exception as e:
-            yield "error", str(e)
-            yield "results", []

autogpt_platform/backend/backend/blocks/exa/similar.py

@@ -1,128 +0,0 @@
-from datetime import datetime
-from typing import Any, List
-
-from backend.blocks.exa._auth import (
-    ExaCredentials,
-    ExaCredentialsField,
-    ExaCredentialsInput,
-)
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-from backend.util.request import requests
-
-from .helpers import ContentSettings
-
-
-class ExaFindSimilarBlock(Block):
-    class Input(BlockSchema):
-        credentials: ExaCredentialsInput = ExaCredentialsField()
-        url: str = SchemaField(
-            description="The url for which you would like to find similar links"
-        )
-        number_of_results: int = SchemaField(
-            description="Number of results to return",
-            default=10,
-            advanced=True,
-        )
-        include_domains: List[str] = SchemaField(
-            description="Domains to include in search",
-            default=[],
-            advanced=True,
-        )
-        exclude_domains: List[str] = SchemaField(
-            description="Domains to exclude from search",
-            default=[],
-            advanced=True,
-        )
-        start_crawl_date: datetime = SchemaField(
-            description="Start date for crawled content",
-        )
-        end_crawl_date: datetime = SchemaField(
-            description="End date for crawled content",
-        )
-        start_published_date: datetime = SchemaField(
-            description="Start date for published content",
-        )
-        end_published_date: datetime = SchemaField(
-            description="End date for published content",
-        )
-        include_text: List[str] = SchemaField(
-            description="Text patterns to include (max 1 string, up to 5 words)",
-            default=[],
-            advanced=True,
-        )
-        exclude_text: List[str] = SchemaField(
-            description="Text patterns to exclude (max 1 string, up to 5 words)",
-            default=[],
-            advanced=True,
-        )
-        contents: ContentSettings = SchemaField(
-            description="Content retrieval settings",
-            default=ContentSettings(),
-            advanced=True,
-        )
-
-    class Output(BlockSchema):
-        results: List[Any] = SchemaField(
-            description="List of similar documents with title, URL, published date, author, and score",
-            default=[],
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="5e7315d1-af61-4a0c-9350-7c868fa7438a",
-            description="Finds similar links using Exa's findSimilar API",
-            categories={BlockCategory.SEARCH},
-            input_schema=ExaFindSimilarBlock.Input,
-            output_schema=ExaFindSimilarBlock.Output,
-        )
-
-    def run(
-        self, input_data: Input, *, credentials: ExaCredentials, **kwargs
-    ) -> BlockOutput:
-        url = "https://api.exa.ai/findSimilar"
-        headers = {
-            "Content-Type": "application/json",
-            "x-api-key": credentials.api_key.get_secret_value(),
-        }
-
-        payload = {
-            "url": input_data.url,
-            "numResults": input_data.number_of_results,
-            "contents": input_data.contents.dict(),
-        }
-
-        optional_field_mapping = {
-            "include_domains": "includeDomains",
-            "exclude_domains": "excludeDomains",
-            "include_text": "includeText",
-            "exclude_text": "excludeText",
-        }
-
-        # Add optional fields if they have values
-        for input_field, api_field in optional_field_mapping.items():
-            value = getattr(input_data, input_field)
-            if value:  # Only add non-empty values
-                payload[api_field] = value
-
-        date_field_mapping = {
-            "start_crawl_date": "startCrawlDate",
-            "end_crawl_date": "endCrawlDate",
-            "start_published_date": "startPublishedDate",
-            "end_published_date": "endPublishedDate",
-        }
-
-        # Add dates if they exist
-        for input_field, api_field in date_field_mapping.items():
-            value = getattr(input_data, input_field, None)
-            if value:
-                payload[api_field] = value.strftime("%Y-%m-%dT%H:%M:%S.000Z")
-
-        try:
-            response = requests.post(url, headers=headers, json=payload)
-            response.raise_for_status()
-            data = response.json()
-            yield "results", data.get("results", [])
-        except Exception as e:
-            yield "error", str(e)
-            yield "results", []

autogpt_platform/backend/backend/blocks/example/_api.py

@@ -1,137 +0,0 @@
-"""
-API module for Example API integration.
-
-This module provides a example of how to create a client for an API.
-"""
-
-# We also have a Json Wrapper library available in backend.util.json
-from json import JSONDecodeError
-from typing import Any, Optional
-
-from pydantic import BaseModel
-
-from backend.data.model import APIKeyCredentials
-
-# This is a wrapper around the requests library that is used to make API requests.
-from backend.util.request import Requests
-
-
-class ExampleAPIException(Exception):
-    def __init__(self, message: str, status_code: int):
-        super().__init__(message)
-        self.status_code = status_code
-
-
-class CreateResourceResponse(BaseModel):
-    message: str
-    is_funny: bool
-
-
-class GetResourceResponse(BaseModel):
-    message: str
-    is_funny: bool
-
-
-class ExampleClient:
-    """Client for the Example API"""
-
-    API_BASE_URL = "https://api.example.com/v1"
-
-    def __init__(
-        self,
-        credentials: Optional[APIKeyCredentials] = None,
-        custom_requests: Optional[Requests] = None,
-    ):
-        if custom_requests:
-            self._requests = custom_requests
-        else:
-            headers: dict[str, str] = {
-                "Content-Type": "application/json",
-            }
-            if credentials:
-                headers["Authorization"] = credentials.auth_header()
-
-            self._requests = Requests(
-                extra_headers=headers,
-                raise_for_status=False,
-            )
-
-    @staticmethod
-    def _handle_response(response) -> Any:
-        """
-        Handles API response and checks for errors.
-
-        Args:
-            response: The response object from the request.
-
-        Returns:
-            The parsed JSON response data.
-
-        Raises:
-            ExampleAPIException: If the API request fails.
-        """
-        if not response.ok:
-            try:
-                error_data = response.json()
-                error_message = error_data.get("error", {}).get("message", "")
-            except JSONDecodeError:
-                error_message = response.text
-
-            raise ExampleAPIException(
-                f"Example API request failed ({response.status_code}): {error_message}",
-                response.status_code,
-            )
-
-        response_data = response.json()
-        if "errors" in response_data:
-            # This is an example error and needs to be
-            # replaced with how the real API returns errors
-            error_messages = [
-                error.get("message", "") for error in response_data["errors"]
-            ]
-            raise ExampleAPIException(
-                f"Example API returned errors: {', '.join(error_messages)}",
-                response.status_code,
-            )
-
-        return response_data
-
-    def get_resource(self, resource_id: str) -> GetResourceResponse:
-        """
-        Fetches a resource from the Example API.
-
-        Args:
-            resource_id: The ID of the resource to fetch.
-
-        Returns:
-            The resource data as a GetResourceResponse object.
-
-        Raises:
-            ExampleAPIException: If the API request fails.
-        """
-        try:
-            response = self._requests.get(
-                f"{self.API_BASE_URL}/resources/{resource_id}"
-            )
-            return GetResourceResponse(**self._handle_response(response))
-        except Exception as e:
-            raise ExampleAPIException(f"Failed to get resource: {str(e)}", 500)
-
-    def create_resource(self, data: dict) -> CreateResourceResponse:
-        """
-        Creates a new resource via the Example API.
-
-        Args:
-            data: The resource data to create.
-
-        Returns:
-            The created resource data as a CreateResourceResponse object.
-
-        Raises:
-            ExampleAPIException: If the API request fails.
-        """
-        try:
-            response = self._requests.post(f"{self.API_BASE_URL}/resources", json=data)
-            return CreateResourceResponse(**self._handle_response(response))
-        except Exception as e:
-            raise ExampleAPIException(f"Failed to create resource: {str(e)}", 500)

autogpt_platform/backend/backend/blocks/example/_auth.py

@@ -1,37 +0,0 @@
-"""
-Authentication module for Example API integration.
-
-This module provides credential types and test credentials for the Example API integration.
-It defines the structure for API key credentials used to authenticate with the Example API
-and provides mock credentials for testing purposes.
-"""
-
-from typing import Literal
-
-from pydantic import SecretStr
-
-from backend.data.model import APIKeyCredentials, CredentialsMetaInput
-from backend.integrations.providers import ProviderName
-
-# Define the type of credentials input expected for Example API
-ExampleCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.EXAMPLE_PROVIDER], Literal["api_key"]
-]
-
-
-# Mock credentials for testing Example API integration
-TEST_CREDENTIALS = APIKeyCredentials(
-    id="9191c4f0-498f-4235-a79c-59c0e37454d4",
-    provider="example-provider",
-    api_key=SecretStr("mock-example-api-key"),
-    title="Mock Example API key",
-    expires_at=None,
-)
-
-# Dictionary representation of test credentials for input fields
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.title,
-}

autogpt_platform/backend/backend/blocks/example/example.py

@@ -1,154 +0,0 @@
-import logging
-
-from pydantic import BaseModel
-
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import APIKeyCredentials, CredentialsField, SchemaField
-
-from ._api import ExampleClient
-from ._auth import TEST_CREDENTIALS, TEST_CREDENTIALS_INPUT, ExampleCredentialsInput
-
-logger = logging.getLogger(__name__)
-
-
-class GreetingMessage(BaseModel):
-    message: str
-    is_funny: bool
-
-
-class ExampleBlock(Block):
-
-    class Input(BlockSchema):
-        name: str = SchemaField(
-            description="The name of the example block", placeholder="Enter a name"
-        )
-        greetings: list[str] = SchemaField(
-            description="The greetings to display", default=["Hello", "Hi", "Hey"]
-        )
-        is_funny: bool = SchemaField(
-            description="Whether the block is funny",
-            placeholder="True",
-            default=True,
-            # Advanced fields are moved to the "Advanced" dropdown in the UI
-            advanced=True,
-        )
-        greeting_context: str = SchemaField(
-            description="The context of the greeting",
-            placeholder="Enter a context",
-            default="The user is looking for an inspirational greeting",
-            # Hidden fields are not shown in the UI at all
-            hidden=True,
-        )
-        # Only if the block needs credentials
-        credentials: ExampleCredentialsInput = CredentialsField(
-            description="The credentials for the example block"
-        )
-
-    class Output(BlockSchema):
-        response: GreetingMessage = SchemaField(
-            description="The response object generated by the example block."
-        )
-        all_responses: list[GreetingMessage] = SchemaField(
-            description="All the responses from the example block."
-        )
-        greeting_count: int = SchemaField(
-            description="The number of greetings in the input."
-        )
-        error: str = SchemaField(description="The error from the example block")
-
-    def __init__(self):
-        super().__init__(
-            # The unique identifier for the block, this value will be persisted in the DB.
-            # It should be unique and constant across the application run.
-            # Use the UUID format for the ID.
-            id="380694d5-3b2e-4130-bced-b43752b70de9",
-            # The description of the block, explaining what the block does.
-            description="The example block",
-            # The set of categories that the block belongs to.
-            # Each category is an instance of BlockCategory Enum.
-            categories={BlockCategory.BASIC},
-            # The schema, defined as a Pydantic model, for the input data.
-            input_schema=ExampleBlock.Input,
-            # The schema, defined as a Pydantic model, for the output data.
-            output_schema=ExampleBlock.Output,
-            # The list or single sample input data for the block, for testing.
-            # This is an instance of the Input schema with sample values.
-            test_input={
-                "name": "Craig",
-                "greetings": ["Hello", "Hi", "Hey"],
-                "is_funny": True,
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            # The list or single expected output if the test_input is run.
-            # Each output is a tuple of (output_name, output_data).
-            test_output=[
-                ("response", GreetingMessage(message="Hello, world!", is_funny=True)),
-                (
-                    "response",
-                    GreetingMessage(message="Hello, world!", is_funny=True),
-                ),  # We mock the function
-                (
-                    "response",
-                    GreetingMessage(message="Hello, world!", is_funny=True),
-                ),  # We mock the function
-                (
-                    "all_responses",
-                    [
-                        GreetingMessage(message="Hello, world!", is_funny=True),
-                        GreetingMessage(message="Hello, world!", is_funny=True),
-                        GreetingMessage(message="Hello, world!", is_funny=True),
-                    ],
-                ),
-                ("greeting_count", 3),
-            ],
-            # Function names on the block implementation to mock on test run.
-            # Each mock is a dictionary with function names as keys and mock implementations as values.
-            test_mock={
-                "my_function_that_can_be_mocked": lambda *args, **kwargs: GreetingMessage(
-                    message="Hello, world!", is_funny=True
-                )
-            },
-            # The credentials required for testing the block.
-            # This is an instance of APIKeyCredentials with sample values.
-            test_credentials=TEST_CREDENTIALS,
-        )
-
-    def my_function_that_can_be_mocked(
-        self, name: str, credentials: APIKeyCredentials
-    ) -> GreetingMessage:
-        logger.info("my_function_that_can_be_mocked called with input: %s", name)
-
-        # Use the ExampleClient from _api.py to make an API call
-        client = ExampleClient(credentials=credentials)
-
-        # Create a sample resource using the client
-        resource_data = {"name": name, "type": "greeting"}
-        # If your API response object matches the return type of the function,
-        # there is no need to convert the object. In this case we have a different
-        # object type for the response and the return type of the function.
-        return GreetingMessage(**client.create_resource(resource_data).model_dump())
-
-    def run(
-        self, input_data: Input, *, credentials: APIKeyCredentials, **kwargs
-    ) -> BlockOutput:
-        """
-        The run function implements the block's core logic. It processes the input_data
-        and yields the block's output.
-
-        In addition to credentials, the following parameters can be specified:
-            graph_id: The ID of the graph containing this block.
-            node_id: The ID of this block's node in the graph.
-            graph_exec_id: The ID of the current graph execution.
-            node_exec_id: The ID of the current node execution.
-            user_id: The ID of the user executing the block.
-        """
-        rtn_all_responses: list[GreetingMessage] = []
-        # Here we deomonstrate best practice for blocks that need to yield multiple items.
-        # We yield each item from the list to allow for operations on each element.
-        # We also yield the complete list for situations when the full list is needed.
-        for greeting in input_data.greetings:
-            message = self.my_function_that_can_be_mocked(greeting, credentials)
-            rtn_all_responses.append(message)
-            yield "response", message
-        yield "all_responses", rtn_all_responses
-        yield "greeting_count", len(input_data.greetings)

autogpt_platform/backend/backend/blocks/example/triggers.py

@@ -1,65 +0,0 @@
-import logging
-
-from backend.data.block import (
-    Block,
-    BlockCategory,
-    BlockManualWebhookConfig,
-    BlockOutput,
-    BlockSchema,
-)
-from backend.data.model import SchemaField
-from backend.integrations.webhooks.example import ExampleWebhookEventType
-
-logger = logging.getLogger(__name__)
-
-
-class ExampleTriggerBlock(Block):
-    """
-    A trigger block that is activated by an external webhook event.
-
-    Unlike standard blocks that are manually executed, trigger blocks are automatically
-    activated when a webhook event is received from the specified provider.
-    """
-
-    class Input(BlockSchema):
-        # The payload field is hidden because it's automatically populated by the webhook
-        # system rather than being manually entered by the user
-        payload: dict = SchemaField(hidden=True)
-
-    class Output(BlockSchema):
-        event_data: dict = SchemaField(
-            description="The contents of the example webhook event."
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="7c5933ce-d60c-42dd-9c4e-db82496474a3",
-            description="This block will output the contents of an example webhook event.",
-            categories={BlockCategory.BASIC},
-            input_schema=ExampleTriggerBlock.Input,
-            output_schema=ExampleTriggerBlock.Output,
-            # The webhook_config is a key difference from standard blocks
-            # It defines which external service can trigger this block and what type of events it responds to
-            webhook_config=BlockManualWebhookConfig(
-                provider="example_provider",  # The external service that will send webhook events
-                webhook_type=ExampleWebhookEventType.EXAMPLE_EVENT,  # The specific event type this block responds to
-            ),
-            # Test input for trigger blocks should mimic the payload structure that would be received from the webhook
-            test_input=[
-                {
-                    "payload": {
-                        "event_type": "example",
-                        "data": "Sample webhook data",
-                    }
-                }
-            ],
-            test_output=[
-                ("event_data", {"event_type": "example", "data": "Sample webhook data"})
-            ],
-        )
-
-    def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        # For trigger blocks, the run method is called automatically when a webhook event is received
-        # The payload from the webhook is passed in as input_data.payload
-        logger.info("Example trigger block run with payload: %s", input_data.payload)
-        yield "event_data", input_data.payload

autogpt_platform/backend/backend/blocks/fal/_auth.py

@@ -3,11 +3,10 @@ from typing import Literal
 from pydantic import SecretStr
 
 from backend.data.model import APIKeyCredentials, CredentialsField, CredentialsMetaInput
-from backend.integrations.providers import ProviderName
 
 FalCredentials = APIKeyCredentials
 FalCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.FAL],
+    Literal["fal"],
     Literal["api_key"],
 ]
 
@@ -31,5 +30,7 @@ def FalCredentialsField() -> FalCredentialsInput:
     Creates a FAL credentials input on a block.
     """
     return CredentialsField(
+        provider="fal",
+        supported_credential_types={"api_key"},
         description="The FAL integration can be used with an API Key.",
     )

autogpt_platform/backend/backend/blocks/fal/ai_video_generator.py

@@ -1,7 +1,7 @@
 import logging
 import time
 from enum import Enum
-from typing import Any
+from typing import Any, Dict
 
 import httpx
 
@@ -64,7 +64,7 @@ class AIVideoGeneratorBlock(Block):
             },
         )
 
-    def _get_headers(self, api_key: str) -> dict[str, str]:
+    def _get_headers(self, api_key: str) -> Dict[str, str]:
         """Get headers for FAL API requests."""
         return {
             "Authorization": f"Key {api_key}",
@@ -72,8 +72,8 @@ class AIVideoGeneratorBlock(Block):
         }
 
     def _submit_request(
-        self, url: str, headers: dict[str, str], data: dict[str, Any]
-    ) -> dict[str, Any]:
+        self, url: str, headers: Dict[str, str], data: Dict[str, Any]
+    ) -> Dict[str, Any]:
         """Submit a request to the FAL API."""
         try:
             response = httpx.post(url, headers=headers, json=data)
@@ -83,7 +83,7 @@ class AIVideoGeneratorBlock(Block):
             logger.error(f"FAL API request failed: {str(e)}")
             raise RuntimeError(f"Failed to submit request: {str(e)}")
 
-    def _poll_status(self, status_url: str, headers: dict[str, str]) -> dict[str, Any]:
+    def _poll_status(self, status_url: str, headers: Dict[str, str]) -> Dict[str, Any]:
         """Poll the status endpoint until completion or failure."""
         try:
             response = httpx.get(status_url, headers=headers)

autogpt_platform/backend/backend/blocks/github/_api.py

@@ -1,9 +1,6 @@
 from urllib.parse import urlparse
 
-from backend.blocks.github._auth import (
-    GithubCredentials,
-    GithubFineGrainedAPICredentials,
-)
+from backend.blocks.github._auth import GithubCredentials
 from backend.util.request import Requests
 
 
@@ -33,68 +30,12 @@ def _convert_to_api_url(url: str) -> str:
 
 def _get_headers(credentials: GithubCredentials) -> dict[str, str]:
     return {
-        "Authorization": credentials.auth_header(),
+        "Authorization": credentials.bearer(),
         "Accept": "application/vnd.github.v3+json",
     }
 
 
-def convert_comment_url_to_api_endpoint(comment_url: str) -> str:
-    """
-    Converts a GitHub comment URL (web interface) to the appropriate API endpoint URL.
-
-    Handles:
-    1. Issue/PR comments: #issuecomment-{id}
-    2. PR review comments: #discussion_r{id}
-
-    Returns the appropriate API endpoint path for the comment.
-    """
-    # First, check if this is already an API URL
-    parsed_url = urlparse(comment_url)
-    if parsed_url.hostname == "api.github.com":
-        return comment_url
-
-    # Replace pull with issues for comment endpoints
-    if "/pull/" in comment_url:
-        comment_url = comment_url.replace("/pull/", "/issues/")
-
-    # Handle issue/PR comments (#issuecomment-xxx)
-    if "#issuecomment-" in comment_url:
-        base_url, comment_part = comment_url.split("#issuecomment-")
-        comment_id = comment_part
-
-        # Extract repo information from base URL
-        parsed_url = urlparse(base_url)
-        path_parts = parsed_url.path.strip("/").split("/")
-        owner, repo = path_parts[0], path_parts[1]
-
-        # Construct API URL for issue comments
-        return (
-            f"https://api.github.com/repos/{owner}/{repo}/issues/comments/{comment_id}"
-        )
-
-    # Handle PR review comments (#discussion_r)
-    elif "#discussion_r" in comment_url:
-        base_url, comment_part = comment_url.split("#discussion_r")
-        comment_id = comment_part
-
-        # Extract repo information from base URL
-        parsed_url = urlparse(base_url)
-        path_parts = parsed_url.path.strip("/").split("/")
-        owner, repo = path_parts[0], path_parts[1]
-
-        # Construct API URL for PR review comments
-        return (
-            f"https://api.github.com/repos/{owner}/{repo}/pulls/comments/{comment_id}"
-        )
-
-    # If no specific comment identifiers are found, use the general URL conversion
-    return _convert_to_api_url(comment_url)
-
-
-def get_api(
-    credentials: GithubCredentials | GithubFineGrainedAPICredentials,
-    convert_urls: bool = True,
-) -> Requests:
+def get_api(credentials: GithubCredentials, convert_urls: bool = True) -> Requests:
     return Requests(
         trusted_origins=["https://api.github.com", "https://github.com"],
         extra_url_validator=_convert_to_api_url if convert_urls else None,

autogpt_platform/backend/backend/blocks/github/_auth.py

@@ -8,7 +8,6 @@ from backend.data.model import (
     CredentialsMetaInput,
     OAuth2Credentials,
 )
-from backend.integrations.providers import ProviderName
 from backend.util.settings import Secrets
 
 secrets = Secrets()
@@ -18,15 +17,10 @@ GITHUB_OAUTH_IS_CONFIGURED = bool(
 
 GithubCredentials = APIKeyCredentials | OAuth2Credentials
 GithubCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.GITHUB],
+    Literal["github"],
     Literal["api_key", "oauth2"] if GITHUB_OAUTH_IS_CONFIGURED else Literal["api_key"],
 ]
 
-GithubFineGrainedAPICredentials = APIKeyCredentials
-GithubFineGrainedAPICredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.GITHUB], Literal["api_key"]
-]
-
 
 def GithubCredentialsField(scope: str) -> GithubCredentialsInput:
     """
@@ -36,16 +30,10 @@ def GithubCredentialsField(scope: str) -> GithubCredentialsInput:
         scope: The authorization scope needed for the block to work. ([list of available scopes](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps#available-scopes))
     """  # noqa
     return CredentialsField(
-        required_scopes={scope},
-        description="The GitHub integration can be used with OAuth, "
-        "or any API key with sufficient permissions for the blocks it is used on.",
-    )
-
-
-def GithubFineGrainedAPICredentialsField(
-    scope: str,
-) -> GithubFineGrainedAPICredentialsInput:
-    return CredentialsField(
+        provider="github",
+        supported_credential_types=(
+            {"api_key", "oauth2"} if GITHUB_OAUTH_IS_CONFIGURED else {"api_key"}
+        ),
         required_scopes={scope},
         description="The GitHub integration can be used with OAuth, "
         "or any API key with sufficient permissions for the blocks it is used on.",
@@ -65,18 +53,3 @@ TEST_CREDENTIALS_INPUT = {
     "type": TEST_CREDENTIALS.type,
     "title": TEST_CREDENTIALS.type,
 }
-
-TEST_FINE_GRAINED_CREDENTIALS = APIKeyCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="github",
-    api_key=SecretStr("mock-github-api-key"),
-    title="Mock GitHub API key",
-    expires_at=None,
-)
-
-TEST_FINE_GRAINED_CREDENTIALS_INPUT = {
-    "provider": TEST_FINE_GRAINED_CREDENTIALS.provider,
-    "id": TEST_FINE_GRAINED_CREDENTIALS.id,
-    "type": TEST_FINE_GRAINED_CREDENTIALS.type,
-    "title": TEST_FINE_GRAINED_CREDENTIALS.type,
-}

autogpt_platform/backend/backend/blocks/github/checks.py

@@ -1,360 +0,0 @@
-from enum import Enum
-from typing import Optional
-
-from pydantic import BaseModel
-
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-from ._api import get_api
-from ._auth import (
-    TEST_CREDENTIALS,
-    TEST_CREDENTIALS_INPUT,
-    GithubCredentials,
-    GithubCredentialsField,
-    GithubCredentialsInput,
-)
-
-
-# queued, in_progress, completed, waiting, requested, pending
-class ChecksStatus(Enum):
-    QUEUED = "queued"
-    IN_PROGRESS = "in_progress"
-    COMPLETED = "completed"
-    WAITING = "waiting"
-    REQUESTED = "requested"
-    PENDING = "pending"
-
-
-class ChecksConclusion(Enum):
-    SUCCESS = "success"
-    FAILURE = "failure"
-    NEUTRAL = "neutral"
-    CANCELLED = "cancelled"
-    TIMED_OUT = "timed_out"
-    ACTION_REQUIRED = "action_required"
-    SKIPPED = "skipped"
-
-
-class GithubCreateCheckRunBlock(Block):
-    """Block for creating a new check run on a GitHub repository."""
-
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo:status")
-        repo_url: str = SchemaField(
-            description="URL of the GitHub repository",
-            placeholder="https://github.com/owner/repo",
-        )
-        name: str = SchemaField(
-            description="The name of the check run (e.g., 'code-coverage')",
-        )
-        head_sha: str = SchemaField(
-            description="The SHA of the commit to check",
-        )
-        status: ChecksStatus = SchemaField(
-            description="Current status of the check run",
-            default=ChecksStatus.QUEUED,
-        )
-        conclusion: Optional[ChecksConclusion] = SchemaField(
-            description="The final conclusion of the check (required if status is completed)",
-            default=None,
-        )
-        details_url: str = SchemaField(
-            description="The URL for the full details of the check",
-            default="",
-        )
-        output_title: str = SchemaField(
-            description="Title of the check run output",
-            default="",
-        )
-        output_summary: str = SchemaField(
-            description="Summary of the check run output",
-            default="",
-        )
-        output_text: str = SchemaField(
-            description="Detailed text of the check run output",
-            default="",
-        )
-
-    class Output(BlockSchema):
-        class CheckRunResult(BaseModel):
-            id: int
-            html_url: str
-            status: str
-
-        check_run: CheckRunResult = SchemaField(
-            description="Details of the created check run"
-        )
-        error: str = SchemaField(
-            description="Error message if check run creation failed"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="2f45e89a-3b7d-4f22-b89e-6c4f5c7e1234",
-            description="Creates a new check run for a specific commit in a GitHub repository",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubCreateCheckRunBlock.Input,
-            output_schema=GithubCreateCheckRunBlock.Output,
-            test_input={
-                "repo_url": "https://github.com/owner/repo",
-                "name": "test-check",
-                "head_sha": "ce587453ced02b1526dfb4cb910479d431683101",
-                "status": ChecksStatus.COMPLETED.value,
-                "conclusion": ChecksConclusion.SUCCESS.value,
-                "output_title": "Test Results",
-                "output_summary": "All tests passed",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            # requires a github app not available to oauth in our current system
-            disabled=True,
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                (
-                    "check_run",
-                    {
-                        "id": 4,
-                        "html_url": "https://github.com/owner/repo/runs/4",
-                        "status": "completed",
-                    },
-                ),
-            ],
-            test_mock={
-                "create_check_run": lambda *args, **kwargs: {
-                    "id": 4,
-                    "html_url": "https://github.com/owner/repo/runs/4",
-                    "status": "completed",
-                }
-            },
-        )
-
-    @staticmethod
-    def create_check_run(
-        credentials: GithubCredentials,
-        repo_url: str,
-        name: str,
-        head_sha: str,
-        status: ChecksStatus,
-        conclusion: Optional[ChecksConclusion] = None,
-        details_url: Optional[str] = None,
-        output_title: Optional[str] = None,
-        output_summary: Optional[str] = None,
-        output_text: Optional[str] = None,
-    ) -> dict:
-        api = get_api(credentials)
-
-        class CheckRunData(BaseModel):
-            name: str
-            head_sha: str
-            status: str
-            conclusion: Optional[str] = None
-            details_url: Optional[str] = None
-            output: Optional[dict[str, str]] = None
-
-        data = CheckRunData(
-            name=name,
-            head_sha=head_sha,
-            status=status.value,
-        )
-
-        if conclusion:
-            data.conclusion = conclusion.value
-
-        if details_url:
-            data.details_url = details_url
-
-        if output_title or output_summary or output_text:
-            output_data = {
-                "title": output_title or "",
-                "summary": output_summary or "",
-                "text": output_text or "",
-            }
-            data.output = output_data
-
-        check_runs_url = f"{repo_url}/check-runs"
-        response = api.post(
-            check_runs_url, data=data.model_dump_json(exclude_none=True)
-        )
-        result = response.json()
-
-        return {
-            "id": result["id"],
-            "html_url": result["html_url"],
-            "status": result["status"],
-        }
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            result = self.create_check_run(
-                credentials=credentials,
-                repo_url=input_data.repo_url,
-                name=input_data.name,
-                head_sha=input_data.head_sha,
-                status=input_data.status,
-                conclusion=input_data.conclusion,
-                details_url=input_data.details_url,
-                output_title=input_data.output_title,
-                output_summary=input_data.output_summary,
-                output_text=input_data.output_text,
-            )
-            yield "check_run", result
-        except Exception as e:
-            yield "error", str(e)
-
-
-class GithubUpdateCheckRunBlock(Block):
-    """Block for updating an existing check run on a GitHub repository."""
-
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo:status")
-        repo_url: str = SchemaField(
-            description="URL of the GitHub repository",
-            placeholder="https://github.com/owner/repo",
-        )
-        check_run_id: int = SchemaField(
-            description="The ID of the check run to update",
-        )
-        status: ChecksStatus = SchemaField(
-            description="New status of the check run",
-        )
-        conclusion: ChecksConclusion = SchemaField(
-            description="The final conclusion of the check (required if status is completed)",
-        )
-        output_title: Optional[str] = SchemaField(
-            description="New title of the check run output",
-            default=None,
-        )
-        output_summary: Optional[str] = SchemaField(
-            description="New summary of the check run output",
-            default=None,
-        )
-        output_text: Optional[str] = SchemaField(
-            description="New detailed text of the check run output",
-            default=None,
-        )
-
-    class Output(BlockSchema):
-        class CheckRunResult(BaseModel):
-            id: int
-            html_url: str
-            status: str
-            conclusion: Optional[str]
-
-        check_run: CheckRunResult = SchemaField(
-            description="Details of the updated check run"
-        )
-        error: str = SchemaField(description="Error message if check run update failed")
-
-    def __init__(self):
-        super().__init__(
-            id="8a23c567-9d01-4e56-b789-0c12d3e45678",  # Generated UUID
-            description="Updates an existing check run in a GitHub repository",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubUpdateCheckRunBlock.Input,
-            output_schema=GithubUpdateCheckRunBlock.Output,
-            # requires a github app not available to oauth in our current system
-            disabled=True,
-            test_input={
-                "repo_url": "https://github.com/owner/repo",
-                "check_run_id": 4,
-                "status": ChecksStatus.COMPLETED.value,
-                "conclusion": ChecksConclusion.SUCCESS.value,
-                "output_title": "Updated Results",
-                "output_summary": "All tests passed after retry",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                (
-                    "check_run",
-                    {
-                        "id": 4,
-                        "html_url": "https://github.com/owner/repo/runs/4",
-                        "status": "completed",
-                        "conclusion": "success",
-                    },
-                ),
-            ],
-            test_mock={
-                "update_check_run": lambda *args, **kwargs: {
-                    "id": 4,
-                    "html_url": "https://github.com/owner/repo/runs/4",
-                    "status": "completed",
-                    "conclusion": "success",
-                }
-            },
-        )
-
-    @staticmethod
-    def update_check_run(
-        credentials: GithubCredentials,
-        repo_url: str,
-        check_run_id: int,
-        status: ChecksStatus,
-        conclusion: Optional[ChecksConclusion] = None,
-        output_title: Optional[str] = None,
-        output_summary: Optional[str] = None,
-        output_text: Optional[str] = None,
-    ) -> dict:
-        api = get_api(credentials)
-
-        class UpdateCheckRunData(BaseModel):
-            status: str
-            conclusion: Optional[str] = None
-            output: Optional[dict[str, str]] = None
-
-        data = UpdateCheckRunData(
-            status=status.value,
-        )
-
-        if conclusion:
-            data.conclusion = conclusion.value
-
-        if output_title or output_summary or output_text:
-            output_data = {
-                "title": output_title or "",
-                "summary": output_summary or "",
-                "text": output_text or "",
-            }
-            data.output = output_data
-
-        check_run_url = f"{repo_url}/check-runs/{check_run_id}"
-        response = api.patch(
-            check_run_url, data=data.model_dump_json(exclude_none=True)
-        )
-        result = response.json()
-
-        return {
-            "id": result["id"],
-            "html_url": result["html_url"],
-            "status": result["status"],
-            "conclusion": result.get("conclusion"),
-        }
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            result = self.update_check_run(
-                credentials=credentials,
-                repo_url=input_data.repo_url,
-                check_run_id=input_data.check_run_id,
-                status=input_data.status,
-                conclusion=input_data.conclusion,
-                output_title=input_data.output_title,
-                output_summary=input_data.output_summary,
-                output_text=input_data.output_text,
-            )
-            yield "check_run", result
-        except Exception as e:
-            yield "error", str(e)

autogpt_platform/backend/backend/blocks/github/issues.py

@@ -1,4 +1,3 @@
-import logging
 from urllib.parse import urlparse
 
 from typing_extensions import TypedDict
@@ -6,7 +5,7 @@ from typing_extensions import TypedDict
 from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
 from backend.data.model import SchemaField
 
-from ._api import convert_comment_url_to_api_endpoint, get_api
+from ._api import get_api
 from ._auth import (
     TEST_CREDENTIALS,
     TEST_CREDENTIALS_INPUT,
@@ -15,8 +14,6 @@ from ._auth import (
     GithubCredentialsInput,
 )
 
-logger = logging.getLogger(__name__)
-
 
 def is_github_url(url: str) -> bool:
     return urlparse(url).netloc == "github.com"
@@ -111,228 +108,6 @@ class GithubCommentBlock(Block):
 # --8<-- [end:GithubCommentBlockExample]
 
 
-class GithubUpdateCommentBlock(Block):
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo")
-        comment_url: str = SchemaField(
-            description="URL of the GitHub comment",
-            placeholder="https://github.com/owner/repo/issues/1#issuecomment-123456789",
-            default="",
-            advanced=False,
-        )
-        issue_url: str = SchemaField(
-            description="URL of the GitHub issue or pull request",
-            placeholder="https://github.com/owner/repo/issues/1",
-            default="",
-        )
-        comment_id: str = SchemaField(
-            description="ID of the GitHub comment",
-            placeholder="123456789",
-            default="",
-        )
-        comment: str = SchemaField(
-            description="Comment to update",
-            placeholder="Enter your comment",
-        )
-
-    class Output(BlockSchema):
-        id: int = SchemaField(description="ID of the updated comment")
-        url: str = SchemaField(description="URL to the comment on GitHub")
-        error: str = SchemaField(
-            description="Error message if the comment update failed"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="b3f4d747-10e3-4e69-8c51-f2be1d99c9a7",
-            description="This block updates a comment on a specified GitHub issue or pull request.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubUpdateCommentBlock.Input,
-            output_schema=GithubUpdateCommentBlock.Output,
-            test_input={
-                "comment_url": "https://github.com/owner/repo/issues/1#issuecomment-123456789",
-                "comment": "This is an updated comment.",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                ("id", 123456789),
-                (
-                    "url",
-                    "https://github.com/owner/repo/issues/1#issuecomment-123456789",
-                ),
-            ],
-            test_mock={
-                "update_comment": lambda *args, **kwargs: (
-                    123456789,
-                    "https://github.com/owner/repo/issues/1#issuecomment-123456789",
-                )
-            },
-        )
-
-    @staticmethod
-    def update_comment(
-        credentials: GithubCredentials, comment_url: str, body_text: str
-    ) -> tuple[int, str]:
-        api = get_api(credentials, convert_urls=False)
-        data = {"body": body_text}
-        url = convert_comment_url_to_api_endpoint(comment_url)
-
-        logger.info(url)
-        response = api.patch(url, json=data)
-        comment = response.json()
-        return comment["id"], comment["html_url"]
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        if (
-            not input_data.comment_url
-            and input_data.comment_id
-            and input_data.issue_url
-        ):
-            parsed_url = urlparse(input_data.issue_url)
-            path_parts = parsed_url.path.strip("/").split("/")
-            owner, repo = path_parts[0], path_parts[1]
-
-            input_data.comment_url = f"https://api.github.com/repos/{owner}/{repo}/issues/comments/{input_data.comment_id}"
-
-        elif (
-            not input_data.comment_url
-            and not input_data.comment_id
-            and input_data.issue_url
-        ):
-            raise ValueError(
-                "Must provide either comment_url or comment_id and issue_url"
-            )
-        id, url = self.update_comment(
-            credentials,
-            input_data.comment_url,
-            input_data.comment,
-        )
-        yield "id", id
-        yield "url", url
-
-
-class GithubListCommentsBlock(Block):
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo")
-        issue_url: str = SchemaField(
-            description="URL of the GitHub issue or pull request",
-            placeholder="https://github.com/owner/repo/issues/1",
-        )
-
-    class Output(BlockSchema):
-        class CommentItem(TypedDict):
-            id: int
-            body: str
-            user: str
-            url: str
-
-        comment: CommentItem = SchemaField(
-            title="Comment", description="Comments with their ID, body, user, and URL"
-        )
-        comments: list[CommentItem] = SchemaField(
-            description="List of comments with their ID, body, user, and URL"
-        )
-        error: str = SchemaField(description="Error message if listing comments failed")
-
-    def __init__(self):
-        super().__init__(
-            id="c4b5fb63-0005-4a11-b35a-0c2467bd6b59",
-            description="This block lists all comments for a specified GitHub issue or pull request.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubListCommentsBlock.Input,
-            output_schema=GithubListCommentsBlock.Output,
-            test_input={
-                "issue_url": "https://github.com/owner/repo/issues/1",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                (
-                    "comment",
-                    {
-                        "id": 123456789,
-                        "body": "This is a test comment.",
-                        "user": "test_user",
-                        "url": "https://github.com/owner/repo/issues/1#issuecomment-123456789",
-                    },
-                ),
-                (
-                    "comments",
-                    [
-                        {
-                            "id": 123456789,
-                            "body": "This is a test comment.",
-                            "user": "test_user",
-                            "url": "https://github.com/owner/repo/issues/1#issuecomment-123456789",
-                        }
-                    ],
-                ),
-            ],
-            test_mock={
-                "list_comments": lambda *args, **kwargs: [
-                    {
-                        "id": 123456789,
-                        "body": "This is a test comment.",
-                        "user": "test_user",
-                        "url": "https://github.com/owner/repo/issues/1#issuecomment-123456789",
-                    }
-                ]
-            },
-        )
-
-    @staticmethod
-    def list_comments(
-        credentials: GithubCredentials, issue_url: str
-    ) -> list[Output.CommentItem]:
-        parsed_url = urlparse(issue_url)
-        path_parts = parsed_url.path.strip("/").split("/")
-
-        owner = path_parts[0]
-        repo = path_parts[1]
-
-        # GitHub API uses 'issues' for both issues and pull requests when it comes to comments
-        issue_number = path_parts[3]  # Whether 'issues/123' or 'pull/123'
-
-        # Construct the proper API URL directly
-        api_url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_number}/comments"
-
-        # Set convert_urls=False since we're already providing an API URL
-        api = get_api(credentials, convert_urls=False)
-        response = api.get(api_url)
-        comments = response.json()
-        parsed_comments: list[GithubListCommentsBlock.Output.CommentItem] = [
-            {
-                "id": comment["id"],
-                "body": comment["body"],
-                "user": comment["user"]["login"],
-                "url": comment["html_url"],
-            }
-            for comment in comments
-        ]
-        return parsed_comments
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        comments = self.list_comments(
-            credentials,
-            input_data.issue_url,
-        )
-        yield from (("comment", comment) for comment in comments)
-        yield "comments", comments
-
-
 class GithubMakeIssueBlock(Block):
     class Input(BlockSchema):
         credentials: GithubCredentialsInput = GithubCredentialsField("repo")

autogpt_platform/backend/backend/blocks/github/pull_requests.py

@@ -1,5 +1,3 @@
-import re
-
 from typing_extensions import TypedDict
 
 from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
@@ -200,7 +198,6 @@ class GithubReadPullRequestBlock(Block):
         include_pr_changes: bool = SchemaField(
             description="Whether to include the changes made in the pull request",
             default=False,
-            advanced=False,
         )
 
     class Output(BlockSchema):
@@ -256,7 +253,7 @@ class GithubReadPullRequestBlock(Block):
     @staticmethod
     def read_pr_changes(credentials: GithubCredentials, pr_url: str) -> str:
         api = get_api(credentials)
-        files_url = prepare_pr_api_url(pr_url=pr_url, path="files")
+        files_url = pr_url + "/files"
         response = api.get(files_url)
         files = response.json()
         changes = []
@@ -334,7 +331,7 @@ class GithubAssignPRReviewerBlock(Block):
         credentials: GithubCredentials, pr_url: str, reviewer: str
     ) -> str:
         api = get_api(credentials)
-        reviewers_url = prepare_pr_api_url(pr_url=pr_url, path="requested_reviewers")
+        reviewers_url = pr_url + "/requested_reviewers"
         data = {"reviewers": [reviewer]}
         api.post(reviewers_url, json=data)
         return "Reviewer assigned successfully"
@@ -401,7 +398,7 @@ class GithubUnassignPRReviewerBlock(Block):
         credentials: GithubCredentials, pr_url: str, reviewer: str
     ) -> str:
         api = get_api(credentials)
-        reviewers_url = prepare_pr_api_url(pr_url=pr_url, path="requested_reviewers")
+        reviewers_url = pr_url + "/requested_reviewers"
         data = {"reviewers": [reviewer]}
         api.delete(reviewers_url, json=data)
         return "Reviewer unassigned successfully"
@@ -481,7 +478,7 @@ class GithubListPRReviewersBlock(Block):
         credentials: GithubCredentials, pr_url: str
     ) -> list[Output.ReviewerItem]:
         api = get_api(credentials)
-        reviewers_url = prepare_pr_api_url(pr_url=pr_url, path="requested_reviewers")
+        reviewers_url = pr_url + "/requested_reviewers"
         response = api.get(reviewers_url)
         data = response.json()
         reviewers: list[GithubListPRReviewersBlock.Output.ReviewerItem] = [
@@ -502,14 +499,3 @@ class GithubListPRReviewersBlock(Block):
             input_data.pr_url,
         )
         yield from (("reviewer", reviewer) for reviewer in reviewers)
-
-
-def prepare_pr_api_url(pr_url: str, path: str) -> str:
-    # Pattern to capture the base repository URL and the pull request number
-    pattern = r"^(?:https?://)?([^/]+/[^/]+/[^/]+)/pull/(\d+)"
-    match = re.match(pattern, pr_url)
-    if not match:
-        return pr_url
-
-    base_url, pr_number = match.groups()
-    return f"{base_url}/pulls/{pr_number}/{path}"

autogpt_platform/backend/backend/blocks/github/repo.py

@@ -699,420 +699,3 @@ class GithubDeleteBranchBlock(Block):
             input_data.branch,
         )
         yield "status", status
-
-
-class GithubCreateFileBlock(Block):
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo")
-        repo_url: str = SchemaField(
-            description="URL of the GitHub repository",
-            placeholder="https://github.com/owner/repo",
-        )
-        file_path: str = SchemaField(
-            description="Path where the file should be created",
-            placeholder="path/to/file.txt",
-        )
-        content: str = SchemaField(
-            description="Content to write to the file",
-            placeholder="File content here",
-        )
-        branch: str = SchemaField(
-            description="Branch where the file should be created",
-            default="main",
-        )
-        commit_message: str = SchemaField(
-            description="Message for the commit",
-            default="Create new file",
-        )
-
-    class Output(BlockSchema):
-        url: str = SchemaField(description="URL of the created file")
-        sha: str = SchemaField(description="SHA of the commit")
-        error: str = SchemaField(
-            description="Error message if the file creation failed"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="8fd132ac-b917-428a-8159-d62893e8a3fe",
-            description="This block creates a new file in a GitHub repository.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubCreateFileBlock.Input,
-            output_schema=GithubCreateFileBlock.Output,
-            test_input={
-                "repo_url": "https://github.com/owner/repo",
-                "file_path": "test/file.txt",
-                "content": "Test content",
-                "branch": "main",
-                "commit_message": "Create test file",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                ("url", "https://github.com/owner/repo/blob/main/test/file.txt"),
-                ("sha", "abc123"),
-            ],
-            test_mock={
-                "create_file": lambda *args, **kwargs: (
-                    "https://github.com/owner/repo/blob/main/test/file.txt",
-                    "abc123",
-                )
-            },
-        )
-
-    @staticmethod
-    def create_file(
-        credentials: GithubCredentials,
-        repo_url: str,
-        file_path: str,
-        content: str,
-        branch: str,
-        commit_message: str,
-    ) -> tuple[str, str]:
-        api = get_api(credentials)
-        # Convert content to base64
-        content_bytes = content.encode("utf-8")
-        content_base64 = base64.b64encode(content_bytes).decode("utf-8")
-
-        # Create the file using the GitHub API
-        contents_url = f"{repo_url}/contents/{file_path}"
-        data = {
-            "message": commit_message,
-            "content": content_base64,
-            "branch": branch,
-        }
-        response = api.put(contents_url, json=data)
-        result = response.json()
-
-        return result["content"]["html_url"], result["commit"]["sha"]
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            url, sha = self.create_file(
-                credentials,
-                input_data.repo_url,
-                input_data.file_path,
-                input_data.content,
-                input_data.branch,
-                input_data.commit_message,
-            )
-            yield "url", url
-            yield "sha", sha
-        except Exception as e:
-            yield "error", str(e)
-
-
-class GithubUpdateFileBlock(Block):
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo")
-        repo_url: str = SchemaField(
-            description="URL of the GitHub repository",
-            placeholder="https://github.com/owner/repo",
-        )
-        file_path: str = SchemaField(
-            description="Path to the file to update",
-            placeholder="path/to/file.txt",
-        )
-        content: str = SchemaField(
-            description="New content for the file",
-            placeholder="Updated content here",
-        )
-        branch: str = SchemaField(
-            description="Branch containing the file",
-            default="main",
-        )
-        commit_message: str = SchemaField(
-            description="Message for the commit",
-            default="Update file",
-        )
-
-    class Output(BlockSchema):
-        url: str = SchemaField(description="URL of the updated file")
-        sha: str = SchemaField(description="SHA of the commit")
-        error: str = SchemaField(description="Error message if the file update failed")
-
-    def __init__(self):
-        super().__init__(
-            id="30be12a4-57cb-4aa4-baf5-fcc68d136076",
-            description="This block updates an existing file in a GitHub repository.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubUpdateFileBlock.Input,
-            output_schema=GithubUpdateFileBlock.Output,
-            test_input={
-                "repo_url": "https://github.com/owner/repo",
-                "file_path": "test/file.txt",
-                "content": "Updated content",
-                "branch": "main",
-                "commit_message": "Update test file",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                ("url", "https://github.com/owner/repo/blob/main/test/file.txt"),
-                ("sha", "def456"),
-            ],
-            test_mock={
-                "update_file": lambda *args, **kwargs: (
-                    "https://github.com/owner/repo/blob/main/test/file.txt",
-                    "def456",
-                )
-            },
-        )
-
-    @staticmethod
-    def update_file(
-        credentials: GithubCredentials,
-        repo_url: str,
-        file_path: str,
-        content: str,
-        branch: str,
-        commit_message: str,
-    ) -> tuple[str, str]:
-        api = get_api(credentials)
-
-        # First get the current file to get its SHA
-        contents_url = f"{repo_url}/contents/{file_path}"
-        params = {"ref": branch}
-        response = api.get(contents_url, params=params)
-        current_file = response.json()
-
-        # Convert new content to base64
-        content_bytes = content.encode("utf-8")
-        content_base64 = base64.b64encode(content_bytes).decode("utf-8")
-
-        # Update the file
-        data = {
-            "message": commit_message,
-            "content": content_base64,
-            "sha": current_file["sha"],
-            "branch": branch,
-        }
-        response = api.put(contents_url, json=data)
-        result = response.json()
-
-        return result["content"]["html_url"], result["commit"]["sha"]
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            url, sha = self.update_file(
-                credentials,
-                input_data.repo_url,
-                input_data.file_path,
-                input_data.content,
-                input_data.branch,
-                input_data.commit_message,
-            )
-            yield "url", url
-            yield "sha", sha
-        except Exception as e:
-            yield "error", str(e)
-
-
-class GithubCreateRepositoryBlock(Block):
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo")
-        name: str = SchemaField(
-            description="Name of the repository to create",
-            placeholder="my-new-repo",
-        )
-        description: str = SchemaField(
-            description="Description of the repository",
-            placeholder="A description of the repository",
-            default="",
-        )
-        private: bool = SchemaField(
-            description="Whether the repository should be private",
-            default=False,
-        )
-        auto_init: bool = SchemaField(
-            description="Whether to initialize the repository with a README",
-            default=True,
-        )
-        gitignore_template: str = SchemaField(
-            description="Git ignore template to use (e.g., Python, Node, Java)",
-            default="",
-        )
-
-    class Output(BlockSchema):
-        url: str = SchemaField(description="URL of the created repository")
-        clone_url: str = SchemaField(description="Git clone URL of the repository")
-        error: str = SchemaField(
-            description="Error message if the repository creation failed"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="029ec3b8-1cfd-46d3-b6aa-28e4a706efd1",
-            description="This block creates a new GitHub repository.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubCreateRepositoryBlock.Input,
-            output_schema=GithubCreateRepositoryBlock.Output,
-            test_input={
-                "name": "test-repo",
-                "description": "A test repository",
-                "private": False,
-                "auto_init": True,
-                "gitignore_template": "Python",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                ("url", "https://github.com/owner/test-repo"),
-                ("clone_url", "https://github.com/owner/test-repo.git"),
-            ],
-            test_mock={
-                "create_repository": lambda *args, **kwargs: (
-                    "https://github.com/owner/test-repo",
-                    "https://github.com/owner/test-repo.git",
-                )
-            },
-        )
-
-    @staticmethod
-    def create_repository(
-        credentials: GithubCredentials,
-        name: str,
-        description: str,
-        private: bool,
-        auto_init: bool,
-        gitignore_template: str,
-    ) -> tuple[str, str]:
-        api = get_api(credentials, convert_urls=False)  # Disable URL conversion
-        data = {
-            "name": name,
-            "description": description,
-            "private": private,
-            "auto_init": auto_init,
-        }
-
-        if gitignore_template:
-            data["gitignore_template"] = gitignore_template
-
-        # Create repository using the user endpoint
-        response = api.post("https://api.github.com/user/repos", json=data)
-        result = response.json()
-
-        return result["html_url"], result["clone_url"]
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            url, clone_url = self.create_repository(
-                credentials,
-                input_data.name,
-                input_data.description,
-                input_data.private,
-                input_data.auto_init,
-                input_data.gitignore_template,
-            )
-            yield "url", url
-            yield "clone_url", clone_url
-        except Exception as e:
-            yield "error", str(e)
-
-
-class GithubListStargazersBlock(Block):
-    class Input(BlockSchema):
-        credentials: GithubCredentialsInput = GithubCredentialsField("repo")
-        repo_url: str = SchemaField(
-            description="URL of the GitHub repository",
-            placeholder="https://github.com/owner/repo",
-        )
-
-    class Output(BlockSchema):
-        class StargazerItem(TypedDict):
-            username: str
-            url: str
-
-        stargazer: StargazerItem = SchemaField(
-            title="Stargazer",
-            description="Stargazers with their username and profile URL",
-        )
-        error: str = SchemaField(
-            description="Error message if listing stargazers failed"
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="a4b9c2d1-e5f6-4g7h-8i9j-0k1l2m3n4o5p",  # Generated unique UUID
-            description="This block lists all users who have starred a specified GitHub repository.",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubListStargazersBlock.Input,
-            output_schema=GithubListStargazersBlock.Output,
-            test_input={
-                "repo_url": "https://github.com/owner/repo",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                (
-                    "stargazer",
-                    {
-                        "username": "octocat",
-                        "url": "https://github.com/octocat",
-                    },
-                )
-            ],
-            test_mock={
-                "list_stargazers": lambda *args, **kwargs: [
-                    {
-                        "username": "octocat",
-                        "url": "https://github.com/octocat",
-                    }
-                ]
-            },
-        )
-
-    @staticmethod
-    def list_stargazers(
-        credentials: GithubCredentials, repo_url: str
-    ) -> list[Output.StargazerItem]:
-        api = get_api(credentials)
-        # Add /stargazers to the repo URL to get stargazers endpoint
-        stargazers_url = f"{repo_url}/stargazers"
-        # Set accept header to get starred_at timestamp
-        headers = {"Accept": "application/vnd.github.star+json"}
-        response = api.get(stargazers_url, headers=headers)
-        data = response.json()
-
-        stargazers: list[GithubListStargazersBlock.Output.StargazerItem] = [
-            {
-                "username": stargazer["login"],
-                "url": stargazer["html_url"],
-            }
-            for stargazer in data
-        ]
-        return stargazers
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubCredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            stargazers = self.list_stargazers(
-                credentials,
-                input_data.repo_url,
-            )
-            yield from (("stargazer", stargazer) for stargazer in stargazers)
-        except Exception as e:
-            yield "error", str(e)

autogpt_platform/backend/backend/blocks/github/statuses.py

@@ -1,180 +0,0 @@
-from enum import Enum
-from typing import Optional
-
-from pydantic import BaseModel
-
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-from ._api import get_api
-from ._auth import (
-    TEST_CREDENTIALS,
-    TEST_CREDENTIALS_INPUT,
-    GithubFineGrainedAPICredentials,
-    GithubFineGrainedAPICredentialsField,
-    GithubFineGrainedAPICredentialsInput,
-)
-
-
-class StatusState(Enum):
-    ERROR = "error"
-    FAILURE = "failure"
-    PENDING = "pending"
-    SUCCESS = "success"
-
-
-class GithubCreateStatusBlock(Block):
-    """Block for creating a commit status on a GitHub repository."""
-
-    class Input(BlockSchema):
-        credentials: GithubFineGrainedAPICredentialsInput = (
-            GithubFineGrainedAPICredentialsField("repo:status")
-        )
-        repo_url: str = SchemaField(
-            description="URL of the GitHub repository",
-            placeholder="https://github.com/owner/repo",
-        )
-        sha: str = SchemaField(
-            description="The SHA of the commit to set status for",
-        )
-        state: StatusState = SchemaField(
-            description="The state of the status (error, failure, pending, success)",
-        )
-        target_url: Optional[str] = SchemaField(
-            description="URL with additional details about this status",
-            default=None,
-        )
-        description: Optional[str] = SchemaField(
-            description="Short description of the status",
-            default=None,
-        )
-        check_name: Optional[str] = SchemaField(
-            description="Label to differentiate this status from others",
-            default="AutoGPT Platform Checks",
-            advanced=False,
-        )
-
-    class Output(BlockSchema):
-        class StatusResult(BaseModel):
-            id: int
-            url: str
-            state: str
-            context: str
-            description: Optional[str]
-            target_url: Optional[str]
-            created_at: str
-            updated_at: str
-
-        status: StatusResult = SchemaField(description="Details of the created status")
-        error: str = SchemaField(description="Error message if status creation failed")
-
-    def __init__(self):
-        super().__init__(
-            id="3d67f123-a4b5-4c89-9d01-2e34f5c67890",  # Generated UUID
-            description="Creates a new commit status in a GitHub repository",
-            categories={BlockCategory.DEVELOPER_TOOLS},
-            input_schema=GithubCreateStatusBlock.Input,
-            output_schema=GithubCreateStatusBlock.Output,
-            test_input={
-                "repo_url": "https://github.com/owner/repo",
-                "sha": "ce587453ced02b1526dfb4cb910479d431683101",
-                "state": StatusState.SUCCESS.value,
-                "target_url": "https://example.com/build/status",
-                "description": "The build succeeded!",
-                "check_name": "continuous-integration/jenkins",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_credentials=TEST_CREDENTIALS,
-            test_output=[
-                (
-                    "status",
-                    {
-                        "id": 1234567890,
-                        "url": "https://api.github.com/repos/owner/repo/statuses/ce587453ced02b1526dfb4cb910479d431683101",
-                        "state": "success",
-                        "context": "continuous-integration/jenkins",
-                        "description": "The build succeeded!",
-                        "target_url": "https://example.com/build/status",
-                        "created_at": "2024-01-21T10:00:00Z",
-                        "updated_at": "2024-01-21T10:00:00Z",
-                    },
-                ),
-            ],
-            test_mock={
-                "create_status": lambda *args, **kwargs: {
-                    "id": 1234567890,
-                    "url": "https://api.github.com/repos/owner/repo/statuses/ce587453ced02b1526dfb4cb910479d431683101",
-                    "state": "success",
-                    "context": "continuous-integration/jenkins",
-                    "description": "The build succeeded!",
-                    "target_url": "https://example.com/build/status",
-                    "created_at": "2024-01-21T10:00:00Z",
-                    "updated_at": "2024-01-21T10:00:00Z",
-                }
-            },
-        )
-
-    @staticmethod
-    def create_status(
-        credentials: GithubFineGrainedAPICredentials,
-        repo_url: str,
-        sha: str,
-        state: StatusState,
-        target_url: Optional[str] = None,
-        description: Optional[str] = None,
-        context: str = "default",
-    ) -> dict:
-        api = get_api(credentials)
-
-        class StatusData(BaseModel):
-            state: str
-            target_url: Optional[str] = None
-            description: Optional[str] = None
-            context: str
-
-        data = StatusData(
-            state=state.value,
-            context=context,
-        )
-
-        if target_url:
-            data.target_url = target_url
-
-        if description:
-            data.description = description
-
-        status_url = f"{repo_url}/statuses/{sha}"
-        response = api.post(status_url, data=data.model_dump_json(exclude_none=True))
-        result = response.json()
-
-        return {
-            "id": result["id"],
-            "url": result["url"],
-            "state": result["state"],
-            "context": result["context"],
-            "description": result.get("description"),
-            "target_url": result.get("target_url"),
-            "created_at": result["created_at"],
-            "updated_at": result["updated_at"],
-        }
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: GithubFineGrainedAPICredentials,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            result = self.create_status(
-                credentials=credentials,
-                repo_url=input_data.repo_url,
-                sha=input_data.sha,
-                state=input_data.state,
-                target_url=input_data.target_url,
-                description=input_data.description,
-                context=input_data.check_name or "AutoGPT Platform Checks",
-            )
-            yield "status", result
-        except Exception as e:
-            yield "error", str(e)

autogpt_platform/backend/backend/blocks/github/triggers.py

@@ -111,9 +111,7 @@ class GithubPullRequestTriggerBlock(GitHubTriggerBase, Block):
     def __init__(self):
         from backend.integrations.webhooks.github import GithubWebhookType
 
-        example_payload = json.loads(
-            self.EXAMPLE_PAYLOAD_FILE.read_text(encoding="utf-8")
-        )
+        example_payload = json.loads(self.EXAMPLE_PAYLOAD_FILE.read_text())
 
         super().__init__(
             id="6c60ec01-8128-419e-988f-96a063ee2fea",

autogpt_platform/backend/backend/blocks/google/_auth.py

@@ -3,7 +3,6 @@ from typing import Literal
 from pydantic import SecretStr
 
 from backend.data.model import CredentialsField, CredentialsMetaInput, OAuth2Credentials
-from backend.integrations.providers import ProviderName
 from backend.util.settings import Secrets
 
 # --8<-- [start:GoogleOAuthIsConfigured]
@@ -13,9 +12,7 @@ GOOGLE_OAUTH_IS_CONFIGURED = bool(
 )
 # --8<-- [end:GoogleOAuthIsConfigured]
 GoogleCredentials = OAuth2Credentials
-GoogleCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.GOOGLE], Literal["oauth2"]
-]
+GoogleCredentialsInput = CredentialsMetaInput[Literal["google"], Literal["oauth2"]]
 
 
 def GoogleCredentialsField(scopes: list[str]) -> GoogleCredentialsInput:
@@ -26,6 +23,8 @@ def GoogleCredentialsField(scopes: list[str]) -> GoogleCredentialsInput:
         scopes: The authorization scopes needed for the block to work.
     """
     return CredentialsField(
+        provider="google",
+        supported_credential_types={"oauth2"},
         required_scopes=set(scopes),
         description="The Google integration requires OAuth2 authentication.",
     )

autogpt_platform/backend/backend/blocks/google/gmail.py

@@ -8,7 +8,6 @@ from pydantic import BaseModel
 
 from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
 from backend.data.model import SchemaField
-from backend.util.settings import Settings
 
 from ._auth import (
     GOOGLE_OAUTH_IS_CONFIGURED,
@@ -151,8 +150,8 @@ class GmailReadBlock(Block):
                 else None
             ),
             token_uri="https://oauth2.googleapis.com/token",
-            client_id=Settings().secrets.google_client_id,
-            client_secret=Settings().secrets.google_client_secret,
+            client_id=kwargs.get("client_id"),
+            client_secret=kwargs.get("client_secret"),
             scopes=credentials.scopes,
         )
         return build("gmail", "v1", credentials=creds)

autogpt_platform/backend/backend/blocks/google/sheets.py

@@ -3,7 +3,6 @@ from googleapiclient.discovery import build
 
 from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
 from backend.data.model import SchemaField
-from backend.util.settings import Settings
 
 from ._auth import (
     GOOGLE_OAUTH_IS_CONFIGURED,
@@ -87,8 +86,8 @@ class GoogleSheetsReadBlock(Block):
                 else None
             ),
             token_uri="https://oauth2.googleapis.com/token",
-            client_id=Settings().secrets.google_client_id,
-            client_secret=Settings().secrets.google_client_secret,
+            client_id=kwargs.get("client_id"),
+            client_secret=kwargs.get("client_secret"),
             scopes=credentials.scopes,
         )
         return build("sheets", "v4", credentials=creds)

autogpt_platform/backend/backend/blocks/google_maps.py

@@ -10,7 +10,6 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 
 TEST_CREDENTIALS = APIKeyCredentials(
     id="01234567-89ab-cdef-0123-456789abcdef",
@@ -39,8 +38,12 @@ class Place(BaseModel):
 class GoogleMapsSearchBlock(Block):
     class Input(BlockSchema):
         credentials: CredentialsMetaInput[
-            Literal[ProviderName.GOOGLE_MAPS], Literal["api_key"]
-        ] = CredentialsField(description="Google Maps API Key")
+            Literal["google_maps"], Literal["api_key"]
+        ] = CredentialsField(
+            provider="google_maps",
+            supported_credential_types={"api_key"},
+            description="Google Maps API Key",
+        )
         query: str = SchemaField(
             description="Search query for local businesses",
             placeholder="e.g., 'restaurants in New York'",

autogpt_platform/backend/backend/blocks/http.py

@@ -56,24 +56,15 @@ class SendWebRequestBlock(Block):
         )
 
     def run(self, input_data: Input, **kwargs) -> BlockOutput:
-        body = input_data.body
-
-        if input_data.json_format:
-            if isinstance(body, str):
-                try:
-                    # Try to parse as JSON first
-                    body = json.loads(body)
-                except json.JSONDecodeError:
-                    # If it's not valid JSON and just plain text,
-                    # we should send it as plain text instead
-                    input_data.json_format = False
+        if isinstance(input_data.body, str):
+            input_data.body = json.loads(input_data.body)
 
         response = requests.request(
             input_data.method.value,
             input_data.url,
             headers=input_data.headers,
-            json=body if input_data.json_format else None,
-            data=body if not input_data.json_format else None,
+            json=input_data.body if input_data.json_format else None,
+            data=input_data.body if not input_data.json_format else None,
         )
         result = response.json() if input_data.json_format else response.text
 

autogpt_platform/backend/backend/blocks/hubspot/_auth.py

@@ -3,11 +3,10 @@ from typing import Literal
 from pydantic import SecretStr
 
 from backend.data.model import APIKeyCredentials, CredentialsField, CredentialsMetaInput
-from backend.integrations.providers import ProviderName
 
 HubSpotCredentials = APIKeyCredentials
 HubSpotCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.HUBSPOT],
+    Literal["hubspot"],
     Literal["api_key"],
 ]
 
@@ -15,6 +14,8 @@ HubSpotCredentialsInput = CredentialsMetaInput[
 def HubSpotCredentialsField() -> HubSpotCredentialsInput:
     """Creates a HubSpot credentials input on a block."""
     return CredentialsField(
+        provider="hubspot",
+        supported_credential_types={"api_key"},
         description="The HubSpot integration requires an API Key.",
     )
 

autogpt_platform/backend/backend/blocks/ideogram.py

@@ -11,7 +11,6 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 from backend.util.request import requests
 
 TEST_CREDENTIALS = APIKeyCredentials(
@@ -84,10 +83,13 @@ class UpscaleOption(str, Enum):
 
 class IdeogramModelBlock(Block):
     class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.IDEOGRAM], Literal["api_key"]
-        ] = CredentialsField(
-            description="The Ideogram integration can be used with any API key with sufficient permissions for the blocks it is used on.",
+
+        credentials: CredentialsMetaInput[Literal["ideogram"], Literal["api_key"]] = (
+            CredentialsField(
+                provider="ideogram",
+                supported_credential_types={"api_key"},
+                description="The Ideogram integration can be used with any API key with sufficient permissions for the blocks it is used on.",
+            )
         )
         prompt: str = SchemaField(
             description="Text prompt for image generation",
@@ -142,16 +144,6 @@ class IdeogramModelBlock(Block):
             title="Color Palette Preset",
             advanced=True,
         )
-        custom_color_palette: Optional[list[str]] = SchemaField(
-            description=(
-                "Only available for model version V_2 or V_2_TURBO. Provide one or more color hex codes "
-                "(e.g., ['#000030', '#1C0C47', '#9900FF', '#4285F4', '#FFFFFF']) to define a custom color "
-                "palette. Only used if 'color_palette_name' is 'NONE'."
-            ),
-            default=None,
-            title="Custom Color Palette",
-            advanced=True,
-        )
 
     class Output(BlockSchema):
         result: str = SchemaField(description="Generated image URL")
@@ -161,7 +153,7 @@ class IdeogramModelBlock(Block):
         super().__init__(
             id="6ab085e2-20b3-4055-bc3e-08036e01eca6",
             description="This block runs Ideogram models with both simple and advanced settings.",
-            categories={BlockCategory.AI, BlockCategory.MULTIMEDIA},
+            categories={BlockCategory.AI},
             input_schema=IdeogramModelBlock.Input,
             output_schema=IdeogramModelBlock.Output,
             test_input={
@@ -174,13 +166,6 @@ class IdeogramModelBlock(Block):
                 "style_type": StyleType.AUTO,
                 "negative_prompt": None,
                 "color_palette_name": ColorPalettePreset.NONE,
-                "custom_color_palette": [
-                    "#000030",
-                    "#1C0C47",
-                    "#9900FF",
-                    "#4285F4",
-                    "#FFFFFF",
-                ],
                 "credentials": TEST_CREDENTIALS_INPUT,
             },
             test_output=[
@@ -190,7 +175,7 @@ class IdeogramModelBlock(Block):
                 ),
             ],
             test_mock={
-                "run_model": lambda api_key, model_name, prompt, seed, aspect_ratio, magic_prompt_option, style_type, negative_prompt, color_palette_name, custom_colors: "https://ideogram.ai/api/images/test-generated-image-url.png",
+                "run_model": lambda api_key, model_name, prompt, seed, aspect_ratio, magic_prompt_option, style_type, negative_prompt, color_palette_name: "https://ideogram.ai/api/images/test-generated-image-url.png",
                 "upscale_image": lambda api_key, image_url: "https://ideogram.ai/api/images/test-upscaled-image-url.png",
             },
             test_credentials=TEST_CREDENTIALS,
@@ -212,7 +197,6 @@ class IdeogramModelBlock(Block):
             style_type=input_data.style_type.value,
             negative_prompt=input_data.negative_prompt,
             color_palette_name=input_data.color_palette_name.value,
-            custom_colors=input_data.custom_color_palette,
         )
 
         # Step 2: Upscale the image if requested
@@ -235,7 +219,6 @@ class IdeogramModelBlock(Block):
         style_type: str,
         negative_prompt: Optional[str],
         color_palette_name: str,
-        custom_colors: Optional[list[str]],
     ):
         url = "https://api.ideogram.ai/generate"
         headers = {
@@ -260,11 +243,7 @@ class IdeogramModelBlock(Block):
             data["image_request"]["negative_prompt"] = negative_prompt
 
         if color_palette_name != "NONE":
-            data["color_palette"] = {"name": color_palette_name}
-        elif custom_colors:
-            data["color_palette"] = {
-                "members": [{"color_hex": color} for color in custom_colors]
-            }
+            data["image_request"]["color_palette"] = {"name": color_palette_name}
 
         try:
             response = requests.post(url, json=data, headers=headers)
@@ -290,7 +269,9 @@ class IdeogramModelBlock(Block):
             response = requests.post(
                 url,
                 headers=headers,
-                data={"image_request": "{}"},
+                data={
+                    "image_request": "{}",  # Empty JSON object
+                },
                 files=files,
             )
 

autogpt_platform/backend/backend/blocks/jina/_auth.py

@@ -3,14 +3,27 @@ from typing import Literal
 from pydantic import SecretStr
 
 from backend.data.model import APIKeyCredentials, CredentialsField, CredentialsMetaInput
-from backend.integrations.providers import ProviderName
 
 JinaCredentials = APIKeyCredentials
 JinaCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.JINA],
+    Literal["jina"],
     Literal["api_key"],
 ]
 
+TEST_CREDENTIALS = APIKeyCredentials(
+    id="01234567-89ab-cdef-0123-456789abcdef",
+    provider="jina",
+    api_key=SecretStr("mock-jina-api-key"),
+    title="Mock Jina API key",
+    expires_at=None,
+)
+TEST_CREDENTIALS_INPUT = {
+    "provider": TEST_CREDENTIALS.provider,
+    "id": TEST_CREDENTIALS.id,
+    "type": TEST_CREDENTIALS.type,
+    "title": TEST_CREDENTIALS.type,
+}
+
 
 def JinaCredentialsField() -> JinaCredentialsInput:
     """
@@ -18,6 +31,8 @@ def JinaCredentialsField() -> JinaCredentialsInput:
 
     """
     return CredentialsField(
+        provider="jina",
+        supported_credential_types={"api_key"},
         description="The Jina integration can be used with an API Key.",
     )
 

autogpt_platform/backend/backend/blocks/jina/fact_checker.py

@@ -1,59 +0,0 @@
-from urllib.parse import quote
-
-import requests
-
-from backend.blocks.jina._auth import (
-    JinaCredentials,
-    JinaCredentialsField,
-    JinaCredentialsInput,
-)
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-
-class FactCheckerBlock(Block):
-    class Input(BlockSchema):
-        statement: str = SchemaField(
-            description="The statement to check for factuality"
-        )
-        credentials: JinaCredentialsInput = JinaCredentialsField()
-
-    class Output(BlockSchema):
-        factuality: float = SchemaField(
-            description="The factuality score of the statement"
-        )
-        result: bool = SchemaField(description="The result of the factuality check")
-        reason: str = SchemaField(description="The reason for the factuality result")
-        error: str = SchemaField(description="Error message if the check fails")
-
-    def __init__(self):
-        super().__init__(
-            id="d38b6c5e-9968-4271-8423-6cfe60d6e7e6",
-            description="This block checks the factuality of a given statement using Jina AI's Grounding API.",
-            categories={BlockCategory.SEARCH},
-            input_schema=FactCheckerBlock.Input,
-            output_schema=FactCheckerBlock.Output,
-        )
-
-    def run(
-        self, input_data: Input, *, credentials: JinaCredentials, **kwargs
-    ) -> BlockOutput:
-        encoded_statement = quote(input_data.statement)
-        url = f"https://g.jina.ai/{encoded_statement}"
-
-        headers = {
-            "Accept": "application/json",
-            "Authorization": f"Bearer {credentials.api_key.get_secret_value()}",
-        }
-
-        response = requests.get(url, headers=headers)
-        response.raise_for_status()
-        data = response.json()
-
-        if "data" in data:
-            data = data["data"]
-            yield "factuality", data["factuality"]
-            yield "result", data["result"]
-            yield "reason", data["reason"]
-        else:
-            raise RuntimeError(f"Expected 'data' key not found in response: {data}")

autogpt_platform/backend/backend/blocks/linear/_api.py

@@ -1,272 +0,0 @@
-from __future__ import annotations
-
-import json
-from typing import Any, Dict, Optional
-
-from backend.blocks.linear._auth import LinearCredentials
-from backend.blocks.linear.models import (
-    CreateCommentResponse,
-    CreateIssueResponse,
-    Issue,
-    Project,
-)
-from backend.util.request import Requests
-
-
-class LinearAPIException(Exception):
-    def __init__(self, message: str, status_code: int):
-        super().__init__(message)
-        self.status_code = status_code
-
-
-class LinearClient:
-    """Client for the Linear API
-
-    If you're looking for the schema: https://studio.apollographql.com/public/Linear-API/variant/current/schema
-    """
-
-    API_URL = "https://api.linear.app/graphql"
-
-    def __init__(
-        self,
-        credentials: LinearCredentials | None = None,
-        custom_requests: Optional[Requests] = None,
-    ):
-        if custom_requests:
-            self._requests = custom_requests
-        else:
-
-            headers: Dict[str, str] = {
-                "Content-Type": "application/json",
-            }
-            if credentials:
-                headers["Authorization"] = credentials.auth_header()
-
-            self._requests = Requests(
-                extra_headers=headers,
-                trusted_origins=["https://api.linear.app"],
-                raise_for_status=False,
-            )
-
-    def _execute_graphql_request(
-        self, query: str, variables: dict | None = None
-    ) -> Any:
-        """
-        Executes a GraphQL request against the Linear API and returns the response data.
-
-        Args:
-            query: The GraphQL query string.
-            variables (optional): Any GraphQL query variables
-
-        Returns:
-            The parsed JSON response data, or raises a LinearAPIException on error.
-        """
-        payload: Dict[str, Any] = {"query": query}
-        if variables:
-            payload["variables"] = variables
-
-        response = self._requests.post(self.API_URL, json=payload)
-
-        if not response.ok:
-
-            try:
-                error_data = response.json()
-                error_message = error_data.get("errors", [{}])[0].get("message", "")
-            except json.JSONDecodeError:
-                error_message = response.text
-
-            raise LinearAPIException(
-                f"Linear API request failed ({response.status_code}): {error_message}",
-                response.status_code,
-            )
-
-        response_data = response.json()
-        if "errors" in response_data:
-
-            error_messages = [
-                error.get("message", "") for error in response_data["errors"]
-            ]
-            raise LinearAPIException(
-                f"Linear API returned errors: {', '.join(error_messages)}",
-                response.status_code,
-            )
-
-        return response_data["data"]
-
-    def query(self, query: str, variables: Optional[dict] = None) -> dict:
-        """Executes a GraphQL query.
-
-        Args:
-            query: The GraphQL query string.
-            variables: Query variables, if any.
-
-        Returns:
-             The response data.
-        """
-        return self._execute_graphql_request(query, variables)
-
-    def mutate(self, mutation: str, variables: Optional[dict] = None) -> dict:
-        """Executes a GraphQL mutation.
-
-        Args:
-            mutation: The GraphQL mutation string.
-            variables: Query variables, if any.
-
-        Returns:
-            The response data.
-        """
-        return self._execute_graphql_request(mutation, variables)
-
-    def try_create_comment(self, issue_id: str, comment: str) -> CreateCommentResponse:
-        try:
-            mutation = """
-                mutation CommentCreate($input: CommentCreateInput!) {
-                  commentCreate(input: $input) {
-                    success
-                    comment {
-                      id
-                      body
-                    }
-              }
-            }
-        """
-
-            variables = {
-                "input": {
-                    "body": comment,
-                    "issueId": issue_id,
-                }
-            }
-
-            added_comment = self.mutate(mutation, variables)
-            # Select the commentCreate field from the mutation response
-            return CreateCommentResponse(**added_comment["commentCreate"])
-        except LinearAPIException as e:
-            raise e
-
-    def try_get_team_by_name(self, team_name: str) -> str:
-        try:
-            query = """
-            query GetTeamId($searchTerm: String!) {
-              teams(filter: { 
-                or: [
-                  { name: { eqIgnoreCase: $searchTerm } },
-                  { key: { eqIgnoreCase: $searchTerm } }
-                ]
-              }) {
-                nodes {
-                  id
-                  name
-                  key
-                }
-              }
-            }
-            """
-
-            variables: dict[str, Any] = {
-                "searchTerm": team_name,
-            }
-
-            team_id = self.query(query, variables)
-            return team_id["teams"]["nodes"][0]["id"]
-        except LinearAPIException as e:
-            raise e
-
-    def try_create_issue(
-        self,
-        team_id: str,
-        title: str,
-        description: str | None = None,
-        priority: int | None = None,
-        project_id: str | None = None,
-    ) -> CreateIssueResponse:
-        try:
-            mutation = """
-               mutation IssueCreate($input: IssueCreateInput!) {
-                issueCreate(input: $input) {
-                  issue {
-                    title
-                    description
-                    id
-                    identifier
-                    priority
-                  }
-                }
-            }
-            """
-
-            variables: dict[str, Any] = {
-                "input": {
-                    "teamId": team_id,
-                    "title": title,
-                }
-            }
-
-            if project_id:
-                variables["input"]["projectId"] = project_id
-
-            if description:
-                variables["input"]["description"] = description
-
-            if priority:
-                variables["input"]["priority"] = priority
-
-            added_issue = self.mutate(mutation, variables)
-            return CreateIssueResponse(**added_issue["issueCreate"])
-        except LinearAPIException as e:
-            raise e
-
-    def try_search_projects(self, term: str) -> list[Project]:
-        try:
-            query = """
-                query SearchProjects($term: String!, $includeComments: Boolean!) {
-                    searchProjects(term: $term, includeComments: $includeComments) {
-                        nodes {
-                            id
-                            name
-                            description
-                            priority
-                            progress
-                            content
-                        }
-                    }
-                }
-            """
-
-            variables: dict[str, Any] = {
-                "term": term,
-                "includeComments": True,
-            }
-
-            projects = self.query(query, variables)
-            return [
-                Project(**project) for project in projects["searchProjects"]["nodes"]
-            ]
-        except LinearAPIException as e:
-            raise e
-
-    def try_search_issues(self, term: str) -> list[Issue]:
-        try:
-            query = """
-                query SearchIssues($term: String!, $includeComments: Boolean!) {
-                    searchIssues(term: $term, includeComments: $includeComments) {
-                        nodes {
-                            id
-                            identifier
-                            title
-                            description
-                            priority
-                        }
-                    }
-                }
-            """
-
-            variables: dict[str, Any] = {
-                "term": term,
-                "includeComments": True,
-            }
-
-            issues = self.query(query, variables)
-            return [Issue(**issue) for issue in issues["searchIssues"]["nodes"]]
-        except LinearAPIException as e:
-            raise e

autogpt_platform/backend/backend/blocks/linear/_auth.py

@@ -1,101 +0,0 @@
-from enum import Enum
-from typing import Literal
-
-from pydantic import SecretStr
-
-from backend.data.model import (
-    APIKeyCredentials,
-    CredentialsField,
-    CredentialsMetaInput,
-    OAuth2Credentials,
-)
-from backend.integrations.providers import ProviderName
-from backend.util.settings import Secrets
-
-secrets = Secrets()
-LINEAR_OAUTH_IS_CONFIGURED = bool(
-    secrets.linear_client_id and secrets.linear_client_secret
-)
-
-LinearCredentials = OAuth2Credentials | APIKeyCredentials
-# LinearCredentialsInput = CredentialsMetaInput[
-#     Literal[ProviderName.LINEAR],
-#     Literal["oauth2", "api_key"] if LINEAR_OAUTH_IS_CONFIGURED else Literal["oauth2"],
-# ]
-LinearCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.LINEAR], Literal["oauth2"]
-]
-
-
-# (required) Comma separated list of scopes:
-
-# read - (Default) Read access for the user's account. This scope will always be present.
-
-# write - Write access for the user's account. If your application only needs to create comments, use a more targeted scope
-
-# issues:create - Allows creating new issues and their attachments
-
-# comments:create - Allows creating new issue comments
-
-# timeSchedule:write - Allows creating and modifying time schedules
-
-
-# admin - Full access to admin level endpoints. You should never ask for this permission unless it's absolutely needed
-class LinearScope(str, Enum):
-    READ = "read"
-    WRITE = "write"
-    ISSUES_CREATE = "issues:create"
-    COMMENTS_CREATE = "comments:create"
-    TIME_SCHEDULE_WRITE = "timeSchedule:write"
-    ADMIN = "admin"
-
-
-def LinearCredentialsField(scopes: list[LinearScope]) -> LinearCredentialsInput:
-    """
-    Creates a Linear credentials input on a block.
-
-    Params:
-        scope: The authorization scope needed for the block to work. ([list of available scopes](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps#available-scopes))
-    """  # noqa
-    return CredentialsField(
-        required_scopes=set([LinearScope.READ.value]).union(
-            set([scope.value for scope in scopes])
-        ),
-        description="The Linear integration can be used with OAuth, "
-        "or any API key with sufficient permissions for the blocks it is used on.",
-    )
-
-
-TEST_CREDENTIALS_OAUTH = OAuth2Credentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="linear",
-    title="Mock Linear API key",
-    username="mock-linear-username",
-    access_token=SecretStr("mock-linear-access-token"),
-    access_token_expires_at=None,
-    refresh_token=SecretStr("mock-linear-refresh-token"),
-    refresh_token_expires_at=None,
-    scopes=["mock-linear-scopes"],
-)
-
-TEST_CREDENTIALS_API_KEY = APIKeyCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="linear",
-    title="Mock Linear API key",
-    api_key=SecretStr("mock-linear-api-key"),
-    expires_at=None,
-)
-
-TEST_CREDENTIALS_INPUT_OAUTH = {
-    "provider": TEST_CREDENTIALS_OAUTH.provider,
-    "id": TEST_CREDENTIALS_OAUTH.id,
-    "type": TEST_CREDENTIALS_OAUTH.type,
-    "title": TEST_CREDENTIALS_OAUTH.type,
-}
-
-TEST_CREDENTIALS_INPUT_API_KEY = {
-    "provider": TEST_CREDENTIALS_API_KEY.provider,
-    "id": TEST_CREDENTIALS_API_KEY.id,
-    "type": TEST_CREDENTIALS_API_KEY.type,
-    "title": TEST_CREDENTIALS_API_KEY.type,
-}

autogpt_platform/backend/backend/blocks/linear/comment.py

@@ -1,83 +0,0 @@
-from backend.blocks.linear._api import LinearAPIException, LinearClient
-from backend.blocks.linear._auth import (
-    LINEAR_OAUTH_IS_CONFIGURED,
-    TEST_CREDENTIALS_INPUT_OAUTH,
-    TEST_CREDENTIALS_OAUTH,
-    LinearCredentials,
-    LinearCredentialsField,
-    LinearCredentialsInput,
-    LinearScope,
-)
-from backend.blocks.linear.models import CreateCommentResponse
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-
-class LinearCreateCommentBlock(Block):
-    """Block for creating comments on Linear issues"""
-
-    class Input(BlockSchema):
-        credentials: LinearCredentialsInput = LinearCredentialsField(
-            scopes=[LinearScope.COMMENTS_CREATE],
-        )
-        issue_id: str = SchemaField(description="ID of the issue to comment on")
-        comment: str = SchemaField(description="Comment text to add to the issue")
-
-    class Output(BlockSchema):
-        comment_id: str = SchemaField(description="ID of the created comment")
-        comment_body: str = SchemaField(
-            description="Text content of the created comment"
-        )
-        error: str = SchemaField(description="Error message if comment creation failed")
-
-    def __init__(self):
-        super().__init__(
-            id="8f7d3a2e-9b5c-4c6a-8f1d-7c8b3e4a5d6c",
-            description="Creates a new comment on a Linear issue",
-            input_schema=self.Input,
-            output_schema=self.Output,
-            categories={BlockCategory.PRODUCTIVITY, BlockCategory.ISSUE_TRACKING},
-            test_input={
-                "issue_id": "TEST-123",
-                "comment": "Test comment",
-                "credentials": TEST_CREDENTIALS_INPUT_OAUTH,
-            },
-            disabled=not LINEAR_OAUTH_IS_CONFIGURED,
-            test_credentials=TEST_CREDENTIALS_OAUTH,
-            test_output=[("comment_id", "abc123"), ("comment_body", "Test comment")],
-            test_mock={
-                "create_comment": lambda *args, **kwargs: (
-                    "abc123",
-                    "Test comment",
-                )
-            },
-        )
-
-    @staticmethod
-    def create_comment(
-        credentials: LinearCredentials, issue_id: str, comment: str
-    ) -> tuple[str, str]:
-        client = LinearClient(credentials=credentials)
-        response: CreateCommentResponse = client.try_create_comment(
-            issue_id=issue_id, comment=comment
-        )
-        return response.comment.id, response.comment.body
-
-    def run(
-        self, input_data: Input, *, credentials: LinearCredentials, **kwargs
-    ) -> BlockOutput:
-        """Execute the comment creation"""
-        try:
-            comment_id, comment_body = self.create_comment(
-                credentials=credentials,
-                issue_id=input_data.issue_id,
-                comment=input_data.comment,
-            )
-
-            yield "comment_id", comment_id
-            yield "comment_body", comment_body
-
-        except LinearAPIException as e:
-            yield "error", str(e)
-        except Exception as e:
-            yield "error", f"Unexpected error: {str(e)}"

autogpt_platform/backend/backend/blocks/linear/issues.py

@@ -1,189 +0,0 @@
-from backend.blocks.linear._api import LinearAPIException, LinearClient
-from backend.blocks.linear._auth import (
-    LINEAR_OAUTH_IS_CONFIGURED,
-    TEST_CREDENTIALS_INPUT_OAUTH,
-    TEST_CREDENTIALS_OAUTH,
-    LinearCredentials,
-    LinearCredentialsField,
-    LinearCredentialsInput,
-    LinearScope,
-)
-from backend.blocks.linear.models import CreateIssueResponse, Issue
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-
-class LinearCreateIssueBlock(Block):
-    """Block for creating issues on Linear"""
-
-    class Input(BlockSchema):
-        credentials: LinearCredentialsInput = LinearCredentialsField(
-            scopes=[LinearScope.ISSUES_CREATE],
-        )
-        title: str = SchemaField(description="Title of the issue")
-        description: str | None = SchemaField(description="Description of the issue")
-        team_name: str = SchemaField(
-            description="Name of the team to create the issue on"
-        )
-        priority: int | None = SchemaField(
-            description="Priority of the issue",
-            default=None,
-            minimum=0,
-            maximum=4,
-        )
-        project_name: str | None = SchemaField(
-            description="Name of the project to create the issue on",
-            default=None,
-        )
-
-    class Output(BlockSchema):
-        issue_id: str = SchemaField(description="ID of the created issue")
-        issue_title: str = SchemaField(description="Title of the created issue")
-        error: str = SchemaField(description="Error message if issue creation failed")
-
-    def __init__(self):
-        super().__init__(
-            id="f9c68f55-dcca-40a8-8771-abf9601680aa",
-            description="Creates a new issue on Linear",
-            disabled=not LINEAR_OAUTH_IS_CONFIGURED,
-            input_schema=self.Input,
-            output_schema=self.Output,
-            categories={BlockCategory.PRODUCTIVITY, BlockCategory.ISSUE_TRACKING},
-            test_input={
-                "title": "Test issue",
-                "description": "Test description",
-                "team_name": "Test team",
-                "project_name": "Test project",
-                "credentials": TEST_CREDENTIALS_INPUT_OAUTH,
-            },
-            test_credentials=TEST_CREDENTIALS_OAUTH,
-            test_output=[("issue_id", "abc123"), ("issue_title", "Test issue")],
-            test_mock={
-                "create_issue": lambda *args, **kwargs: (
-                    "abc123",
-                    "Test issue",
-                )
-            },
-        )
-
-    @staticmethod
-    def create_issue(
-        credentials: LinearCredentials,
-        team_name: str,
-        title: str,
-        description: str | None = None,
-        priority: int | None = None,
-        project_name: str | None = None,
-    ) -> tuple[str, str]:
-        client = LinearClient(credentials=credentials)
-        team_id = client.try_get_team_by_name(team_name=team_name)
-        project_id: str | None = None
-        if project_name:
-            projects = client.try_search_projects(term=project_name)
-            if projects:
-                project_id = projects[0].id
-            else:
-                raise LinearAPIException("Project not found", status_code=404)
-        response: CreateIssueResponse = client.try_create_issue(
-            team_id=team_id,
-            title=title,
-            description=description,
-            priority=priority,
-            project_id=project_id,
-        )
-        return response.issue.identifier, response.issue.title
-
-    def run(
-        self, input_data: Input, *, credentials: LinearCredentials, **kwargs
-    ) -> BlockOutput:
-        """Execute the issue creation"""
-        try:
-            issue_id, issue_title = self.create_issue(
-                credentials=credentials,
-                team_name=input_data.team_name,
-                title=input_data.title,
-                description=input_data.description,
-                priority=input_data.priority,
-                project_name=input_data.project_name,
-            )
-
-            yield "issue_id", issue_id
-            yield "issue_title", issue_title
-
-        except LinearAPIException as e:
-            yield "error", str(e)
-        except Exception as e:
-            yield "error", f"Unexpected error: {str(e)}"
-
-
-class LinearSearchIssuesBlock(Block):
-    """Block for searching issues on Linear"""
-
-    class Input(BlockSchema):
-        term: str = SchemaField(description="Term to search for issues")
-        credentials: LinearCredentialsInput = LinearCredentialsField(
-            scopes=[LinearScope.READ],
-        )
-
-    class Output(BlockSchema):
-        issues: list[Issue] = SchemaField(description="List of issues")
-
-    def __init__(self):
-        super().__init__(
-            id="b5a2a0e6-26b4-4c5b-8a42-bc79e9cb65c2",
-            description="Searches for issues on Linear",
-            input_schema=self.Input,
-            output_schema=self.Output,
-            disabled=not LINEAR_OAUTH_IS_CONFIGURED,
-            test_input={
-                "term": "Test issue",
-                "credentials": TEST_CREDENTIALS_INPUT_OAUTH,
-            },
-            test_credentials=TEST_CREDENTIALS_OAUTH,
-            test_output=[
-                (
-                    "issues",
-                    [
-                        Issue(
-                            id="abc123",
-                            identifier="abc123",
-                            title="Test issue",
-                            description="Test description",
-                            priority=1,
-                        )
-                    ],
-                )
-            ],
-            test_mock={
-                "search_issues": lambda *args, **kwargs: [
-                    Issue(
-                        id="abc123",
-                        identifier="abc123",
-                        title="Test issue",
-                        description="Test description",
-                        priority=1,
-                    )
-                ]
-            },
-        )
-
-    @staticmethod
-    def search_issues(
-        credentials: LinearCredentials,
-        term: str,
-    ) -> list[Issue]:
-        client = LinearClient(credentials=credentials)
-        response: list[Issue] = client.try_search_issues(term=term)
-        return response
-
-    def run(
-        self, input_data: Input, *, credentials: LinearCredentials, **kwargs
-    ) -> BlockOutput:
-        """Execute the issue search"""
-        try:
-            issues = self.search_issues(credentials=credentials, term=input_data.term)
-            yield "issues", issues
-        except LinearAPIException as e:
-            yield "error", str(e)
-        except Exception as e:
-            yield "error", f"Unexpected error: {str(e)}"

autogpt_platform/backend/backend/blocks/linear/models.py

@@ -1,41 +0,0 @@
-from pydantic import BaseModel
-
-
-class Comment(BaseModel):
-    id: str
-    body: str
-
-
-class CreateCommentInput(BaseModel):
-    body: str
-    issueId: str
-
-
-class CreateCommentResponse(BaseModel):
-    success: bool
-    comment: Comment
-
-
-class CreateCommentResponseWrapper(BaseModel):
-    commentCreate: CreateCommentResponse
-
-
-class Issue(BaseModel):
-    id: str
-    identifier: str
-    title: str
-    description: str | None
-    priority: int
-
-
-class CreateIssueResponse(BaseModel):
-    issue: Issue
-
-
-class Project(BaseModel):
-    id: str
-    name: str
-    description: str
-    priority: int
-    progress: int
-    content: str

autogpt_platform/backend/backend/blocks/linear/projects.py

@@ -1,95 +0,0 @@
-from backend.blocks.linear._api import LinearAPIException, LinearClient
-from backend.blocks.linear._auth import (
-    LINEAR_OAUTH_IS_CONFIGURED,
-    TEST_CREDENTIALS_INPUT_OAUTH,
-    TEST_CREDENTIALS_OAUTH,
-    LinearCredentials,
-    LinearCredentialsField,
-    LinearCredentialsInput,
-    LinearScope,
-)
-from backend.blocks.linear.models import Project
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-
-
-class LinearSearchProjectsBlock(Block):
-    """Block for searching projects on Linear"""
-
-    class Input(BlockSchema):
-        credentials: LinearCredentialsInput = LinearCredentialsField(
-            scopes=[LinearScope.READ],
-        )
-        term: str = SchemaField(description="Term to search for projects")
-
-    class Output(BlockSchema):
-        projects: list[Project] = SchemaField(description="List of projects")
-        error: str = SchemaField(description="Error message if issue creation failed")
-
-    def __init__(self):
-        super().__init__(
-            id="446a1d35-9d8f-4ac5-83ea-7684ec50e6af",
-            description="Searches for projects on Linear",
-            input_schema=self.Input,
-            output_schema=self.Output,
-            categories={BlockCategory.PRODUCTIVITY, BlockCategory.ISSUE_TRACKING},
-            test_input={
-                "term": "Test project",
-                "credentials": TEST_CREDENTIALS_INPUT_OAUTH,
-            },
-            disabled=not LINEAR_OAUTH_IS_CONFIGURED,
-            test_credentials=TEST_CREDENTIALS_OAUTH,
-            test_output=[
-                (
-                    "projects",
-                    [
-                        Project(
-                            id="abc123",
-                            name="Test project",
-                            description="Test description",
-                            priority=1,
-                            progress=1,
-                            content="Test content",
-                        )
-                    ],
-                )
-            ],
-            test_mock={
-                "search_projects": lambda *args, **kwargs: [
-                    Project(
-                        id="abc123",
-                        name="Test project",
-                        description="Test description",
-                        priority=1,
-                        progress=1,
-                        content="Test content",
-                    )
-                ]
-            },
-        )
-
-    @staticmethod
-    def search_projects(
-        credentials: LinearCredentials,
-        term: str,
-    ) -> list[Project]:
-        client = LinearClient(credentials=credentials)
-        response: list[Project] = client.try_search_projects(term=term)
-        return response
-
-    def run(
-        self, input_data: Input, *, credentials: LinearCredentials, **kwargs
-    ) -> BlockOutput:
-        """Execute the project search"""
-        try:
-            projects = self.search_projects(
-                credentials=credentials,
-                term=input_data.term,
-            )
-
-            yield "projects", projects
-
-        except LinearAPIException as e:
-            yield "error", str(e)
-        except Exception as e:
-            yield "error", f"Unexpected error: {str(e)}"

autogpt_platform/backend/backend/blocks/media.py

@@ -1,245 +0,0 @@
-import os
-import tempfile
-from typing import Literal, Optional
-
-from moviepy.audio.io.AudioFileClip import AudioFileClip
-from moviepy.video.fx.Loop import Loop
-from moviepy.video.io.VideoFileClip import VideoFileClip
-
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-from backend.util.file import MediaFile, get_exec_file_path, store_media_file
-
-
-class MediaDurationBlock(Block):
-
-    class Input(BlockSchema):
-        media_in: MediaFile = SchemaField(
-            description="Media input (URL, data URI, or local path)."
-        )
-        is_video: bool = SchemaField(
-            description="Whether the media is a video (True) or audio (False).",
-            default=True,
-        )
-
-    class Output(BlockSchema):
-        duration: float = SchemaField(
-            description="Duration of the media file (in seconds)."
-        )
-        error: str = SchemaField(
-            description="Error message if something fails.", default=""
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="d8b91fd4-da26-42d4-8ecb-8b196c6d84b6",
-            description="Block to get the duration of a media file.",
-            categories={BlockCategory.MULTIMEDIA},
-            input_schema=MediaDurationBlock.Input,
-            output_schema=MediaDurationBlock.Output,
-        )
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        graph_exec_id: str,
-        **kwargs,
-    ) -> BlockOutput:
-        # 1) Store the input media locally
-        local_media_path = store_media_file(
-            graph_exec_id=graph_exec_id,
-            file=input_data.media_in,
-            return_content=False,
-        )
-        media_abspath = get_exec_file_path(graph_exec_id, local_media_path)
-
-        # 2) Load the clip
-        if input_data.is_video:
-            clip = VideoFileClip(media_abspath)
-        else:
-            clip = AudioFileClip(media_abspath)
-
-        yield "duration", clip.duration
-
-
-class LoopVideoBlock(Block):
-    """
-    Block for looping (repeating) a video clip until a given duration or number of loops.
-    """
-
-    class Input(BlockSchema):
-        video_in: MediaFile = SchemaField(
-            description="The input video (can be a URL, data URI, or local path)."
-        )
-        # Provide EITHER a `duration` or `n_loops` or both. We'll demonstrate `duration`.
-        duration: Optional[float] = SchemaField(
-            description="Target duration (in seconds) to loop the video to. If omitted, defaults to no looping.",
-            default=None,
-            ge=0.0,
-        )
-        n_loops: Optional[int] = SchemaField(
-            description="Number of times to repeat the video. If omitted, defaults to 1 (no repeat).",
-            default=None,
-            ge=1,
-        )
-        output_return_type: Literal["file_path", "data_uri"] = SchemaField(
-            description="How to return the output video. Either a relative path or base64 data URI.",
-            default="file_path",
-        )
-
-    class Output(BlockSchema):
-        video_out: str = SchemaField(
-            description="Looped video returned either as a relative path or a data URI."
-        )
-        error: str = SchemaField(
-            description="Error message if something fails.", default=""
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="8bf9eef6-5451-4213-b265-25306446e94b",
-            description="Block to loop a video to a given duration or number of repeats.",
-            categories={BlockCategory.MULTIMEDIA},
-            input_schema=LoopVideoBlock.Input,
-            output_schema=LoopVideoBlock.Output,
-        )
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        node_exec_id: str,
-        graph_exec_id: str,
-        **kwargs,
-    ) -> BlockOutput:
-        # 1) Store the input video locally
-        local_video_path = store_media_file(
-            graph_exec_id=graph_exec_id,
-            file=input_data.video_in,
-            return_content=False,
-        )
-        input_abspath = get_exec_file_path(graph_exec_id, local_video_path)
-
-        # 2) Load the clip
-        clip = VideoFileClip(input_abspath)
-
-        # 3) Apply the loop effect
-        looped_clip = clip
-        if input_data.duration:
-            # Loop until we reach the specified duration
-            looped_clip = looped_clip.with_effects([Loop(duration=input_data.duration)])
-        elif input_data.n_loops:
-            looped_clip = looped_clip.with_effects([Loop(n=input_data.n_loops)])
-        else:
-            raise ValueError("Either 'duration' or 'n_loops' must be provided.")
-
-        assert isinstance(looped_clip, VideoFileClip)
-
-        # 4) Save the looped output
-        output_filename = MediaFile(
-            f"{node_exec_id}_looped_{os.path.basename(local_video_path)}"
-        )
-        output_abspath = get_exec_file_path(graph_exec_id, output_filename)
-
-        looped_clip = looped_clip.with_audio(clip.audio)
-        looped_clip.write_videofile(output_abspath, codec="libx264", audio_codec="aac")
-
-        # Return as data URI
-        video_out = store_media_file(
-            graph_exec_id=graph_exec_id,
-            file=output_filename,
-            return_content=input_data.output_return_type == "data_uri",
-        )
-
-        yield "video_out", video_out
-
-
-class AddAudioToVideoBlock(Block):
-    """
-    Block that adds (attaches) an audio track to an existing video.
-    Optionally scale the volume of the new track.
-    """
-
-    class Input(BlockSchema):
-        video_in: MediaFile = SchemaField(
-            description="Video input (URL, data URI, or local path)."
-        )
-        audio_in: MediaFile = SchemaField(
-            description="Audio input (URL, data URI, or local path)."
-        )
-        volume: float = SchemaField(
-            description="Volume scale for the newly attached audio track (1.0 = original).",
-            default=1.0,
-        )
-        output_return_type: Literal["file_path", "data_uri"] = SchemaField(
-            description="Return the final output as a relative path or base64 data URI.",
-            default="file_path",
-        )
-
-    class Output(BlockSchema):
-        video_out: MediaFile = SchemaField(
-            description="Final video (with attached audio), as a path or data URI."
-        )
-        error: str = SchemaField(
-            description="Error message if something fails.", default=""
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="3503748d-62b6-4425-91d6-725b064af509",
-            description="Block to attach an audio file to a video file using moviepy.",
-            categories={BlockCategory.MULTIMEDIA},
-            input_schema=AddAudioToVideoBlock.Input,
-            output_schema=AddAudioToVideoBlock.Output,
-        )
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        node_exec_id: str,
-        graph_exec_id: str,
-        **kwargs,
-    ) -> BlockOutput:
-        # 1) Store the inputs locally
-        local_video_path = store_media_file(
-            graph_exec_id=graph_exec_id,
-            file=input_data.video_in,
-            return_content=False,
-        )
-        local_audio_path = store_media_file(
-            graph_exec_id=graph_exec_id,
-            file=input_data.audio_in,
-            return_content=False,
-        )
-
-        abs_temp_dir = os.path.join(tempfile.gettempdir(), "exec_file", graph_exec_id)
-        video_abspath = os.path.join(abs_temp_dir, local_video_path)
-        audio_abspath = os.path.join(abs_temp_dir, local_audio_path)
-
-        # 2) Load video + audio with moviepy
-        video_clip = VideoFileClip(video_abspath)
-        audio_clip = AudioFileClip(audio_abspath)
-        # Optionally scale volume
-        if input_data.volume != 1.0:
-            audio_clip = audio_clip.with_volume_scaled(input_data.volume)
-
-        # 3) Attach the new audio track
-        final_clip = video_clip.with_audio(audio_clip)
-
-        # 4) Write to output file
-        output_filename = MediaFile(
-            f"{node_exec_id}_audio_attached_{os.path.basename(local_video_path)}"
-        )
-        output_abspath = os.path.join(abs_temp_dir, output_filename)
-        final_clip.write_videofile(output_abspath, codec="libx264", audio_codec="aac")
-
-        # 5) Return either path or data URI
-        video_out = store_media_file(
-            graph_exec_id=graph_exec_id,
-            file=output_filename,
-            return_content=input_data.output_return_type == "data_uri",
-        )
-
-        yield "video_out", video_out

autogpt_platform/backend/backend/blocks/medium.py

@@ -12,7 +12,6 @@ from backend.data.model import (
     SchemaField,
     SecretField,
 )
-from backend.integrations.providers import ProviderName
 from backend.util.request import requests
 
 TEST_CREDENTIALS = APIKeyCredentials(
@@ -78,10 +77,12 @@ class PublishToMediumBlock(Block):
             description="Whether to notify followers that the user has published",
             placeholder="False",
         )
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.MEDIUM], Literal["api_key"]
-        ] = CredentialsField(
-            description="The Medium integration can be used with any API key with sufficient permissions for the blocks it is used on.",
+        credentials: CredentialsMetaInput[Literal["medium"], Literal["api_key"]] = (
+            CredentialsField(
+                provider="medium",
+                supported_credential_types={"api_key"},
+                description="The Medium integration can be used with any API key with sufficient permissions for the blocks it is used on.",
+            )
         )
 
     class Output(BlockSchema):

autogpt_platform/backend/backend/blocks/mem0.py

@@ -1,338 +0,0 @@
-from typing import Any, Literal, Optional, Union
-
-from mem0 import MemoryClient
-from pydantic import BaseModel, SecretStr
-
-from backend.data.block import Block, BlockOutput, BlockSchema
-from backend.data.model import (
-    APIKeyCredentials,
-    CredentialsField,
-    CredentialsMetaInput,
-    SchemaField,
-)
-from backend.integrations.providers import ProviderName
-
-TEST_CREDENTIALS = APIKeyCredentials(
-    id="ed55ac19-356e-4243-a6cb-bc599e9b716f",
-    provider="mem0",
-    api_key=SecretStr("mock-mem0-api-key"),
-    title="Mock Mem0 API key",
-    expires_at=None,
-)
-
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.title,
-}
-
-
-class Mem0Base:
-    """Base class with shared utilities for Mem0 blocks"""
-
-    @staticmethod
-    def _get_client(credentials: APIKeyCredentials) -> MemoryClient:
-        """Get initialized Mem0 client"""
-        return MemoryClient(api_key=credentials.api_key.get_secret_value())
-
-
-Filter = dict[str, list[dict[str, str | dict[str, list[str]]]]]
-
-
-class Conversation(BaseModel):
-    discriminator: Literal["conversation"]
-    messages: list[dict[str, str]]
-
-
-class Content(BaseModel):
-    discriminator: Literal["content"]
-    content: str
-
-
-class AddMemoryBlock(Block, Mem0Base):
-    """Block for adding memories to Mem0
-
-    Always limited by user_id and optional graph_id and graph_exec_id"""
-
-    class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.MEM0], Literal["api_key"]
-        ] = CredentialsField(description="Mem0 API key credentials")
-        content: Union[Content, Conversation] = SchemaField(
-            discriminator="discriminator",
-            description="Content to add - either a string or list of message objects as output from an AI block",
-            default=Content(discriminator="content", content="I'm a vegetarian"),
-        )
-        metadata: dict[str, Any] = SchemaField(
-            description="Optional metadata for the memory", default={}
-        )
-
-        limit_memory_to_run: bool = SchemaField(
-            description="Limit the memory to the run", default=False
-        )
-        limit_memory_to_agent: bool = SchemaField(
-            description="Limit the memory to the agent", default=False
-        )
-
-    class Output(BlockSchema):
-        action: str = SchemaField(description="Action of the operation")
-        memory: str = SchemaField(description="Memory created")
-        error: str = SchemaField(description="Error message if operation fails")
-
-    def __init__(self):
-        super().__init__(
-            id="dce97578-86be-45a4-ae50-f6de33fc935a",
-            description="Add new memories to Mem0 with user segmentation",
-            input_schema=AddMemoryBlock.Input,
-            output_schema=AddMemoryBlock.Output,
-            test_input=[
-                {
-                    "content": {
-                        "discriminator": "conversation",
-                        "messages": [{"role": "user", "content": "I'm a vegetarian"}],
-                    },
-                    "metadata": {"food": "vegetarian"},
-                    "credentials": TEST_CREDENTIALS_INPUT,
-                },
-                {
-                    "content": {
-                        "discriminator": "content",
-                        "content": "I am a vegetarian",
-                    },
-                    "metadata": {"food": "vegetarian"},
-                    "credentials": TEST_CREDENTIALS_INPUT,
-                },
-            ],
-            test_output=[("action", "NO_CHANGE"), ("action", "NO_CHANGE")],
-            test_credentials=TEST_CREDENTIALS,
-            test_mock={"_get_client": lambda credentials: MockMemoryClient()},
-        )
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: APIKeyCredentials,
-        user_id: str,
-        graph_id: str,
-        graph_exec_id: str,
-        **kwargs
-    ) -> BlockOutput:
-        try:
-            client = self._get_client(credentials)
-
-            if isinstance(input_data.content, Conversation):
-                messages = input_data.content.messages
-            else:
-                messages = [{"role": "user", "content": input_data.content}]
-
-            params = {
-                "user_id": user_id,
-                "output_format": "v1.1",
-                "metadata": input_data.metadata,
-            }
-
-            if input_data.limit_memory_to_run:
-                params["run_id"] = graph_exec_id
-            if input_data.limit_memory_to_agent:
-                params["agent_id"] = graph_id
-
-            # Use the client to add memory
-            result = client.add(
-                messages,
-                **params,
-            )
-
-            if len(result.get("results", [])) > 0:
-                for result in result.get("results", []):
-                    yield "action", result["event"]
-                    yield "memory", result["memory"]
-            else:
-                yield "action", "NO_CHANGE"
-
-        except Exception as e:
-            yield "error", str(object=e)
-
-
-class SearchMemoryBlock(Block, Mem0Base):
-    """Block for searching memories in Mem0"""
-
-    class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.MEM0], Literal["api_key"]
-        ] = CredentialsField(description="Mem0 API key credentials")
-        query: str = SchemaField(
-            description="Search query",
-            advanced=False,
-        )
-        trigger: bool = SchemaField(
-            description="An unused field that is used to (re-)trigger the block when you have no other inputs",
-            default=False,
-            advanced=False,
-        )
-        categories_filter: list[str] = SchemaField(
-            description="Categories to filter by",
-            default=[],
-            advanced=True,
-        )
-        limit_memory_to_run: bool = SchemaField(
-            description="Limit the memory to the run", default=False
-        )
-        limit_memory_to_agent: bool = SchemaField(
-            description="Limit the memory to the agent", default=True
-        )
-
-    class Output(BlockSchema):
-        memories: Any = SchemaField(description="List of matching memories")
-        error: str = SchemaField(description="Error message if operation fails")
-
-    def __init__(self):
-        super().__init__(
-            id="bd7c84e3-e073-4b75-810c-600886ec8a5b",
-            description="Search memories in Mem0 by user",
-            input_schema=SearchMemoryBlock.Input,
-            output_schema=SearchMemoryBlock.Output,
-            test_input={
-                "query": "vegetarian preferences",
-                "credentials": TEST_CREDENTIALS_INPUT,
-                "top_k": 10,
-                "rerank": True,
-            },
-            test_output=[
-                ("memories", [{"id": "test-memory", "content": "test content"}])
-            ],
-            test_credentials=TEST_CREDENTIALS,
-            test_mock={"_get_client": lambda credentials: MockMemoryClient()},
-        )
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: APIKeyCredentials,
-        user_id: str,
-        graph_id: str,
-        graph_exec_id: str,
-        **kwargs
-    ) -> BlockOutput:
-        try:
-            client = self._get_client(credentials)
-
-            filters: Filter = {
-                # This works with only one filter, so we can allow others to add on later
-                "AND": [
-                    {"user_id": user_id},
-                ]
-            }
-            if input_data.categories_filter:
-                filters["AND"].append(
-                    {"categories": {"contains": input_data.categories_filter}}
-                )
-            if input_data.limit_memory_to_run:
-                filters["AND"].append({"run_id": graph_exec_id})
-            if input_data.limit_memory_to_agent:
-                filters["AND"].append({"agent_id": graph_id})
-
-            result: list[dict[str, Any]] = client.search(
-                input_data.query, version="v2", filters=filters
-            )
-            yield "memories", result
-
-        except Exception as e:
-            yield "error", str(e)
-
-
-class GetAllMemoriesBlock(Block, Mem0Base):
-    """Block for retrieving all memories from Mem0"""
-
-    class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.MEM0], Literal["api_key"]
-        ] = CredentialsField(description="Mem0 API key credentials")
-        trigger: bool = SchemaField(
-            description="An unused field that is used to trigger the block when you have no other inputs",
-            default=False,
-            advanced=False,
-        )
-        categories: Optional[list[str]] = SchemaField(
-            description="Filter by categories", default=None
-        )
-        limit_memory_to_run: bool = SchemaField(
-            description="Limit the memory to the run", default=False
-        )
-        limit_memory_to_agent: bool = SchemaField(
-            description="Limit the memory to the agent", default=False
-        )
-
-    class Output(BlockSchema):
-        memories: Any = SchemaField(description="List of memories")
-        error: str = SchemaField(description="Error message if operation fails")
-
-    def __init__(self):
-        super().__init__(
-            id="45aee5bf-4767-45d1-a28b-e01c5aae9fc1",
-            description="Retrieve all memories from Mem0 with pagination",
-            input_schema=GetAllMemoriesBlock.Input,
-            output_schema=GetAllMemoriesBlock.Output,
-            test_input={
-                "user_id": "test_user",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
-            test_output=[
-                ("memories", [{"id": "test-memory", "content": "test content"}]),
-            ],
-            test_credentials=TEST_CREDENTIALS,
-            test_mock={"_get_client": lambda credentials: MockMemoryClient()},
-        )
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: APIKeyCredentials,
-        user_id: str,
-        graph_id: str,
-        graph_exec_id: str,
-        **kwargs
-    ) -> BlockOutput:
-        try:
-            client = self._get_client(credentials)
-
-            filters: Filter = {
-                "AND": [
-                    {"user_id": user_id},
-                ]
-            }
-            if input_data.limit_memory_to_run:
-                filters["AND"].append({"run_id": graph_exec_id})
-            if input_data.limit_memory_to_agent:
-                filters["AND"].append({"agent_id": graph_id})
-            if input_data.categories:
-                filters["AND"].append(
-                    {"categories": {"contains": input_data.categories}}
-                )
-
-            memories: list[dict[str, Any]] = client.get_all(
-                filters=filters,
-                version="v2",
-            )
-
-            yield "memories", memories
-
-        except Exception as e:
-            yield "error", str(e)
-
-
-# Mock client for testing
-class MockMemoryClient:
-    """Mock Mem0 client for testing"""
-
-    def add(self, *args, **kwargs):
-        return {"memory_id": "test-memory-id", "status": "success"}
-
-    def search(self, *args, **kwargs) -> list[dict[str, str]]:
-        return [{"id": "test-memory", "content": "test content"}]
-
-    def get_all(self, *args, **kwargs) -> list[dict[str, str]]:
-        return [{"id": "test-memory", "content": "test content"}]

autogpt_platform/backend/backend/blocks/nvidia/_auth.py

@@ -1,32 +0,0 @@
-from typing import Literal
-
-from pydantic import SecretStr
-
-from backend.data.model import APIKeyCredentials, CredentialsField, CredentialsMetaInput
-from backend.integrations.providers import ProviderName
-
-NvidiaCredentials = APIKeyCredentials
-NvidiaCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.NVIDIA],
-    Literal["api_key"],
-]
-
-TEST_CREDENTIALS = APIKeyCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="nvidia",
-    api_key=SecretStr("mock-nvidia-api-key"),
-    title="Mock Nvidia API key",
-    expires_at=None,
-)
-
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.title,
-}
-
-
-def NvidiaCredentialsField() -> NvidiaCredentialsInput:
-    """Creates an Nvidia credentials input on a block."""
-    return CredentialsField(description="The Nvidia integration requires an API Key.")

autogpt_platform/backend/backend/blocks/nvidia/deepfake.py

@@ -1,90 +0,0 @@
-from backend.blocks.nvidia._auth import (
-    NvidiaCredentials,
-    NvidiaCredentialsField,
-    NvidiaCredentialsInput,
-)
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import SchemaField
-from backend.util.request import requests
-
-
-class NvidiaDeepfakeDetectBlock(Block):
-    class Input(BlockSchema):
-        credentials: NvidiaCredentialsInput = NvidiaCredentialsField()
-        image_base64: str = SchemaField(
-            description="Image to analyze for deepfakes", image_upload=True
-        )
-        return_image: bool = SchemaField(
-            description="Whether to return the processed image with markings",
-            default=False,
-        )
-
-    class Output(BlockSchema):
-        status: str = SchemaField(
-            description="Detection status (SUCCESS, ERROR, CONTENT_FILTERED)",
-            default="",
-        )
-        image: str = SchemaField(
-            description="Processed image with detection markings (if return_image=True)",
-            default="",
-            image_output=True,
-        )
-        is_deepfake: float = SchemaField(
-            description="Probability that the image is a deepfake (0-1)",
-            default=0.0,
-        )
-
-    def __init__(self):
-        super().__init__(
-            id="8c7d0d67-e79c-44f6-92a1-c2600c8aac7f",
-            description="Detects potential deepfakes in images using Nvidia's AI API",
-            categories={BlockCategory.SAFETY},
-            input_schema=NvidiaDeepfakeDetectBlock.Input,
-            output_schema=NvidiaDeepfakeDetectBlock.Output,
-        )
-
-    def run(
-        self, input_data: Input, *, credentials: NvidiaCredentials, **kwargs
-    ) -> BlockOutput:
-        url = "https://ai.api.nvidia.com/v1/cv/hive/deepfake-image-detection"
-
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "Authorization": f"Bearer {credentials.api_key.get_secret_value()}",
-        }
-
-        image_data = f"data:image/jpeg;base64,{input_data.image_base64}"
-
-        payload = {
-            "input": [image_data],
-            "return_image": input_data.return_image,
-        }
-
-        try:
-            response = requests.post(url, headers=headers, json=payload)
-            response.raise_for_status()
-            data = response.json()
-
-            result = data.get("data", [{}])[0]
-
-            # Get deepfake probability from first bounding box if any
-            deepfake_prob = 0.0
-            if result.get("bounding_boxes"):
-                deepfake_prob = result["bounding_boxes"][0].get("is_deepfake", 0.0)
-
-            yield "status", result.get("status", "ERROR")
-            yield "is_deepfake", deepfake_prob
-
-            if input_data.return_image:
-                image_data = result.get("image", "")
-                output_data = f"data:image/jpeg;base64,{image_data}"
-                yield "image", output_data
-            else:
-                yield "image", ""
-
-        except Exception as e:
-            yield "error", str(e)
-            yield "status", "ERROR"
-            yield "is_deepfake", 0.0
-            yield "image", ""

autogpt_platform/backend/backend/blocks/pinecone.py

@@ -10,18 +10,22 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 
 PineconeCredentials = APIKeyCredentials
 PineconeCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.PINECONE],
+    Literal["pinecone"],
     Literal["api_key"],
 ]
 
 
 def PineconeCredentialsField() -> PineconeCredentialsInput:
-    """Creates a Pinecone credentials input on a block."""
+    """
+    Creates a Pinecone credentials input on a block.
+
+    """
     return CredentialsField(
+        provider="pinecone",
+        supported_credential_types={"api_key"},
         description="The Pinecone integration can be used with an API Key.",
     )
 
@@ -143,7 +147,7 @@ class PineconeQueryBlock(Block):
                 top_k=input_data.top_k,
                 include_values=input_data.include_values,
                 include_metadata=input_data.include_metadata,
-            ).to_dict()  # type: ignore
+            ).to_dict()
             combined_text = ""
             if results["matches"]:
                 texts = [

autogpt_platform/backend/backend/blocks/reddit.py

@@ -1,48 +1,22 @@
 from datetime import datetime, timezone
-from typing import Iterator, Literal
+from typing import Iterator
 
 import praw
-from pydantic import BaseModel, SecretStr
+from pydantic import BaseModel, ConfigDict
 
 from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import (
-    CredentialsField,
-    CredentialsMetaInput,
-    SchemaField,
-    UserPasswordCredentials,
-)
-from backend.integrations.providers import ProviderName
+from backend.data.model import BlockSecret, SchemaField, SecretField
 from backend.util.mock import MockObject
-from backend.util.settings import Settings
-
-RedditCredentials = UserPasswordCredentials
-RedditCredentialsInput = CredentialsMetaInput[
-    Literal[ProviderName.REDDIT],
-    Literal["user_password"],
-]
 
 
-def RedditCredentialsField() -> RedditCredentialsInput:
-    """Creates a Reddit credentials input on a block."""
-    return CredentialsField(
-        description="The Reddit integration requires a username and password.",
-    )
+class RedditCredentials(BaseModel):
+    client_id: BlockSecret = SecretField(key="reddit_client_id")
+    client_secret: BlockSecret = SecretField(key="reddit_client_secret")
+    username: BlockSecret = SecretField(key="reddit_username")
+    password: BlockSecret = SecretField(key="reddit_password")
+    user_agent: str = "AutoGPT:1.0 (by /u/autogpt)"
 
-
-TEST_CREDENTIALS = UserPasswordCredentials(
-    id="01234567-89ab-cdef-0123-456789abcdef",
-    provider="reddit",
-    username=SecretStr("mock-reddit-username"),
-    password=SecretStr("mock-reddit-password"),
-    title="Mock Reddit credentials",
-)
-
-TEST_CREDENTIALS_INPUT = {
-    "provider": TEST_CREDENTIALS.provider,
-    "id": TEST_CREDENTIALS.id,
-    "type": TEST_CREDENTIALS.type,
-    "title": TEST_CREDENTIALS.title,
-}
+    model_config = ConfigDict(title="Reddit Credentials")
 
 
 class RedditPost(BaseModel):
@@ -57,16 +31,13 @@ class RedditComment(BaseModel):
     comment: str
 
 
-settings = Settings()
-
-
 def get_praw(creds: RedditCredentials) -> praw.Reddit:
     client = praw.Reddit(
-        client_id=settings.secrets.reddit_client_id,
-        client_secret=settings.secrets.reddit_client_secret,
+        client_id=creds.client_id.get_secret_value(),
+        client_secret=creds.client_secret.get_secret_value(),
         username=creds.username.get_secret_value(),
         password=creds.password.get_secret_value(),
-        user_agent=settings.config.reddit_user_agent,
+        user_agent=creds.user_agent,
     )
     me = client.user.me()
     if not me:
@@ -77,11 +48,11 @@ def get_praw(creds: RedditCredentials) -> praw.Reddit:
 
 class GetRedditPostsBlock(Block):
     class Input(BlockSchema):
-        subreddit: str = SchemaField(
-            description="Subreddit name, excluding the /r/ prefix",
-            default="writingprompts",
+        subreddit: str = SchemaField(description="Subreddit name")
+        creds: RedditCredentials = SchemaField(
+            description="Reddit credentials",
+            default=RedditCredentials(),
         )
-        credentials: RedditCredentialsInput = RedditCredentialsField()
         last_minutes: int | None = SchemaField(
             description="Post time to stop minutes ago while fetching posts",
             default=None,
@@ -99,18 +70,20 @@ class GetRedditPostsBlock(Block):
 
     def __init__(self):
         super().__init__(
+            disabled=True,
             id="c6731acb-4285-4ee1-bc9b-03d0766c370f",
             description="This block fetches Reddit posts from a defined subreddit name.",
             categories={BlockCategory.SOCIAL},
-            disabled=(
-                not settings.secrets.reddit_client_id
-                or not settings.secrets.reddit_client_secret
-            ),
             input_schema=GetRedditPostsBlock.Input,
             output_schema=GetRedditPostsBlock.Output,
-            test_credentials=TEST_CREDENTIALS,
             test_input={
-                "credentials": TEST_CREDENTIALS_INPUT,
+                "creds": {
+                    "client_id": "client_id",
+                    "client_secret": "client_secret",
+                    "username": "username",
+                    "password": "password",
+                    "user_agent": "user_agent",
+                },
                 "subreddit": "subreddit",
                 "last_post": "id3",
                 "post_limit": 2,
@@ -130,7 +103,7 @@ class GetRedditPostsBlock(Block):
                 ),
             ],
             test_mock={
-                "get_posts": lambda input_data, credentials: [
+                "get_posts": lambda _: [
                     MockObject(id="id1", title="title1", selftext="body1"),
                     MockObject(id="id2", title="title2", selftext="body2"),
                     MockObject(id="id3", title="title2", selftext="body2"),
@@ -139,18 +112,14 @@ class GetRedditPostsBlock(Block):
         )
 
     @staticmethod
-    def get_posts(
-        input_data: Input, *, credentials: RedditCredentials
-    ) -> Iterator[praw.reddit.Submission]:
-        client = get_praw(credentials)
+    def get_posts(input_data: Input) -> Iterator[praw.reddit.Submission]:
+        client = get_praw(input_data.creds)
         subreddit = client.subreddit(input_data.subreddit)
         return subreddit.new(limit=input_data.post_limit or 10)
 
-    def run(
-        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
-    ) -> BlockOutput:
+    def run(self, input_data: Input, **kwargs) -> BlockOutput:
         current_time = datetime.now(tz=timezone.utc)
-        for post in self.get_posts(input_data=input_data, credentials=credentials):
+        for post in self.get_posts(input_data):
             if input_data.last_minutes:
                 post_datetime = datetime.fromtimestamp(
                     post.created_utc, tz=timezone.utc
@@ -172,7 +141,9 @@ class GetRedditPostsBlock(Block):
 
 class PostRedditCommentBlock(Block):
     class Input(BlockSchema):
-        credentials: RedditCredentialsInput = RedditCredentialsField()
+        creds: RedditCredentials = SchemaField(
+            description="Reddit credentials", default=RedditCredentials()
+        )
         data: RedditComment = SchemaField(description="Reddit comment")
 
     class Output(BlockSchema):
@@ -185,15 +156,7 @@ class PostRedditCommentBlock(Block):
             categories={BlockCategory.SOCIAL},
             input_schema=PostRedditCommentBlock.Input,
             output_schema=PostRedditCommentBlock.Output,
-            disabled=(
-                not settings.secrets.reddit_client_id
-                or not settings.secrets.reddit_client_secret
-            ),
-            test_credentials=TEST_CREDENTIALS,
-            test_input={
-                "credentials": TEST_CREDENTIALS_INPUT,
-                "data": {"post_id": "id", "comment": "comment"},
-            },
+            test_input={"data": {"post_id": "id", "comment": "comment"}},
             test_output=[("comment_id", "dummy_comment_id")],
             test_mock={"reply_post": lambda creds, comment: "dummy_comment_id"},
         )
@@ -207,7 +170,5 @@ class PostRedditCommentBlock(Block):
             raise ValueError("Failed to post comment.")
         return new_comment.id
 
-    def run(
-        self, input_data: Input, *, credentials: RedditCredentials, **kwargs
-    ) -> BlockOutput:
-        yield "comment_id", self.reply_post(credentials, input_data.data)
+    def run(self, input_data: Input, **kwargs) -> BlockOutput:
+        yield "comment_id", self.reply_post(input_data.creds, input_data.data)

autogpt_platform/backend/backend/blocks/replicate_flux_advanced.py

@@ -13,7 +13,6 @@ from backend.data.model import (
     CredentialsMetaInput,
     SchemaField,
 )
-from backend.integrations.providers import ProviderName
 
 TEST_CREDENTIALS = APIKeyCredentials(
     id="01234567-89ab-cdef-0123-456789abcdef",
@@ -55,11 +54,13 @@ class ImageType(str, Enum):
 
 class ReplicateFluxAdvancedModelBlock(Block):
     class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.REPLICATE], Literal["api_key"]
-        ] = CredentialsField(
-            description="The Replicate integration can be used with "
-            "any API key with sufficient permissions for the blocks it is used on.",
+        credentials: CredentialsMetaInput[Literal["replicate"], Literal["api_key"]] = (
+            CredentialsField(
+                provider="replicate",
+                supported_credential_types={"api_key"},
+                description="The Replicate integration can be used with "
+                "any API key with sufficient permissions for the blocks it is used on.",
+            )
         )
         prompt: str = SchemaField(
             description="Text prompt for image generation",
@@ -131,7 +132,7 @@ class ReplicateFluxAdvancedModelBlock(Block):
         super().__init__(
             id="90f8c45e-e983-4644-aa0b-b4ebe2f531bc",
             description="This block runs Flux models on Replicate with advanced settings.",
-            categories={BlockCategory.AI, BlockCategory.MULTIMEDIA},
+            categories={BlockCategory.AI},
             input_schema=ReplicateFluxAdvancedModelBlock.Input,
             output_schema=ReplicateFluxAdvancedModelBlock.Output,
             test_input={

autogpt_platform/backend/backend/blocks/screenshotone.py

@@ -1,174 +0,0 @@
-from base64 import b64encode
-from enum import Enum
-from typing import Literal
-
-from pydantic import SecretStr
-
-from backend.data.block import Block, BlockCategory, BlockOutput, BlockSchema
-from backend.data.model import (
-    APIKeyCredentials,
-    CredentialsField,
-    CredentialsMetaInput,
-    SchemaField,
-)
-from backend.integrations.providers import ProviderName
-from backend.util.file import MediaFile, store_media_file
-from backend.util.request import Requests
-
-
-class Format(str, Enum):
-    PNG = "png"
-    JPEG = "jpeg"
-    WEBP = "webp"
-
-
-class ScreenshotWebPageBlock(Block):
-    """Block for taking screenshots using ScreenshotOne API"""
-
-    class Input(BlockSchema):
-        credentials: CredentialsMetaInput[
-            Literal[ProviderName.SCREENSHOTONE], Literal["api_key"]
-        ] = CredentialsField(description="The ScreenshotOne API key")
-        url: str = SchemaField(
-            description="URL of the website to screenshot",
-            placeholder="https://example.com",
-        )
-        viewport_width: int = SchemaField(
-            description="Width of the viewport in pixels", default=1920
-        )
-        viewport_height: int = SchemaField(
-            description="Height of the viewport in pixels", default=1080
-        )
-        full_page: bool = SchemaField(
-            description="Whether to capture the full page length", default=False
-        )
-        format: Format = SchemaField(
-            description="Output format (png, jpeg, webp)", default=Format.PNG
-        )
-        block_ads: bool = SchemaField(description="Whether to block ads", default=True)
-        block_cookie_banners: bool = SchemaField(
-            description="Whether to block cookie banners", default=True
-        )
-        block_chats: bool = SchemaField(
-            description="Whether to block chat widgets", default=True
-        )
-        cache: bool = SchemaField(
-            description="Whether to enable caching", default=False
-        )
-
-    class Output(BlockSchema):
-        image: MediaFile = SchemaField(description="The screenshot image data")
-        error: str = SchemaField(description="Error message if the screenshot failed")
-
-    def __init__(self):
-        super().__init__(
-            id="3a7c4b8d-6e2f-4a5d-b9c1-f8d23c5a9b0e",  # Generated UUID
-            description="Takes a screenshot of a specified website using ScreenshotOne API",
-            categories={BlockCategory.DATA},
-            input_schema=ScreenshotWebPageBlock.Input,
-            output_schema=ScreenshotWebPageBlock.Output,
-            test_input={
-                "url": "https://example.com",
-                "viewport_width": 1920,
-                "viewport_height": 1080,
-                "full_page": False,
-                "format": "png",
-                "block_ads": True,
-                "block_cookie_banners": True,
-                "block_chats": True,
-                "cache": False,
-                "credentials": {
-                    "provider": "screenshotone",
-                    "type": "api_key",
-                    "id": "test-id",
-                    "title": "Test API Key",
-                },
-            },
-            test_credentials=APIKeyCredentials(
-                id="test-id",
-                provider="screenshotone",
-                api_key=SecretStr("test-key"),
-                title="Test API Key",
-                expires_at=None,
-            ),
-            test_output=[
-                (
-                    "image",
-                    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAB5JREFUOE9jZPjP8J+BAsA4agDDaBgwjIYBw7AIAwCV5B/xAsMbygAAAABJRU5ErkJggg==",
-                ),
-            ],
-            test_mock={
-                "take_screenshot": lambda *args, **kwargs: {
-                    "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAB5JREFUOE9jZPjP8J+BAsA4agDDaBgwjIYBw7AIAwCV5B/xAsMbygAAAABJRU5ErkJggg==",
-                }
-            },
-        )
-
-    @staticmethod
-    def take_screenshot(
-        credentials: APIKeyCredentials,
-        graph_exec_id: str,
-        url: str,
-        viewport_width: int,
-        viewport_height: int,
-        full_page: bool,
-        format: Format,
-        block_ads: bool,
-        block_cookie_banners: bool,
-        block_chats: bool,
-        cache: bool,
-    ) -> dict:
-        """
-        Takes a screenshot using the ScreenshotOne API
-        """
-        api = Requests(trusted_origins=["https://api.screenshotone.com"])
-
-        # Build API URL with parameters
-        params = {
-            "access_key": credentials.api_key.get_secret_value(),
-            "url": url,
-            "viewport_width": viewport_width,
-            "viewport_height": viewport_height,
-            "full_page": str(full_page).lower(),
-            "format": format.value,
-            "block_ads": str(block_ads).lower(),
-            "block_cookie_banners": str(block_cookie_banners).lower(),
-            "block_chats": str(block_chats).lower(),
-            "cache": str(cache).lower(),
-        }
-
-        response = api.get("https://api.screenshotone.com/take", params=params)
-
-        return {
-            "image": store_media_file(
-                graph_exec_id=graph_exec_id,
-                file=f"data:image/{format.value};base64,{b64encode(response.content).decode('utf-8')}",
-                return_content=True,
-            )
-        }
-
-    def run(
-        self,
-        input_data: Input,
-        *,
-        credentials: APIKeyCredentials,
-        graph_exec_id: str,
-        **kwargs,
-    ) -> BlockOutput:
-        try:
-            screenshot_data = self.take_screenshot(
-                credentials=credentials,
-                graph_exec_id=graph_exec_id,
-                url=input_data.url,
-                viewport_width=input_data.viewport_width,
-                viewport_height=input_data.viewport_height,
-                full_page=input_data.full_page,
-                format=input_data.format,
-                block_ads=input_data.block_ads,
-                block_cookie_banners=input_data.block_cookie_banners,
-                block_chats=input_data.block_chats,
-                cache=input_data.cache,
-            )
-            yield "image", screenshot_data["image"]
-        except Exception as e:
-            yield "error", str(e)