-
Notifications
You must be signed in to change notification settings - Fork 44.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into swiftyos/open-1601-paginated-listing-of-st…
…ore-agents
- Loading branch information
Showing
90 changed files
with
2,798 additions
and
407 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,9 @@ jobs: | |
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: TFLint | ||
| uses: pauloconnor/[email protected] | ||
| env: | ||
|
|
@@ -31,3 +34,23 @@ jobs: | |
| tflint_path: terraform/ | ||
| tflint_recurse: true | ||
| tflint_changed_only: false | ||
|
|
||
| - name: Set up Helm | ||
| uses: azure/[email protected] | ||
| with: | ||
| version: v3.14.4 | ||
|
|
||
| - name: Set up chart-testing | ||
| uses: helm/[email protected] | ||
|
|
||
| - name: Run chart-testing (list-changed) | ||
| id: list-changed | ||
| run: | | ||
| changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) | ||
| if [[ -n "$changed" ]]; then | ||
| echo "changed=true" >> "$GITHUB_OUTPUT" | ||
| fi | ||
| - name: Run chart-testing (lint) | ||
| if: steps.list-changed.outputs.changed == 'true' | ||
| run: ct lint --target-branch ${{ github.event.repository.default_branch }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Running Ollama with AutoGPT | ||
|
|
||
| Follow these steps to set up and run Ollama and your AutoGPT project: | ||
|
|
||
| 1. **Run Ollama** | ||
| - Open a terminal | ||
| - Execute the following command: | ||
| ``` | ||
| ollama run llama3 | ||
| ``` | ||
| - Leave this terminal running | ||
| 2. **Run the Backend** | ||
| - Open a new terminal | ||
| - Navigate to the backend directory in the AutoGPT project: | ||
| ``` | ||
| cd rnd/autogpt_server/ | ||
| ``` | ||
| - Start the backend using Poetry: | ||
| ``` | ||
| poetry run app | ||
| ``` | ||
| 3. **Run the Frontend** | ||
| - Open another terminal | ||
| - Navigate to the frontend directory in the AutoGPT project: | ||
| ``` | ||
| cd rnd/autogpt_builder/ | ||
| ``` | ||
| - Start the frontend development server: | ||
| ``` | ||
| npm run dev | ||
| ``` | ||
| 4. **Choose the Ollama Model** | ||
| - Add LLMBlock in the UI | ||
| - Choose the last option in the model selection dropdown |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,14 @@ | ||
| AGPT_SERVER_URL=http://localhost:8000/api | ||
| AGPT_MARKETPLACE_URL=http://127.0.0.1:8001/market | ||
| NEXT_PUBLIC_AGPT_MARKETPLACE_URL=http://127.0.0.1:8001/market | ||
| NEXT_PUBLIC_AGPT_MARKETPLACE_URL=http://127.0.0.1:8001/market | ||
|
|
||
| ## Supabase credentials | ||
| ## YOU ONLY NEED THEM IF YOU WANT TO USE SUPABASE USER AUTHENTICATION | ||
| ## If you're using self-hosted version then you most likely don't need to set this | ||
| # NEXT_PUBLIC_SUPABASE_URL=your-project-url | ||
| # NEXT_PUBLIC_SUPABASE_ANON_KEY=your-anon-key | ||
|
|
||
| ## OAuth Callback URL | ||
| ## This should be {domain}/auth/callback | ||
| ## Only used if you're using Supabase and OAuth | ||
| AUTH_CALLBACK_URL=http://localhost:3000/auth/callback |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| "use client"; | ||
|
|
||
| import { useEffect, useState } from 'react'; | ||
|
|
||
| export default function AuthErrorPage() { | ||
| const [errorType, setErrorType] = useState<string | null>(null); | ||
| const [errorCode, setErrorCode] = useState<string | null>(null); | ||
| const [errorDescription, setErrorDescription] = useState<string | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| // This code only runs on the client side | ||
| if (typeof window !== 'undefined') { | ||
| const hash = window.location.hash.substring(1); // Remove the leading '#' | ||
| const params = new URLSearchParams(hash); | ||
|
|
||
| setErrorType(params.get('error')); | ||
| setErrorCode(params.get('error_code')); | ||
| setErrorDescription(params.get('error_description')?.replace(/\+/g, ' ') ?? null); // Replace '+' with space | ||
| } | ||
| }, []); | ||
|
|
||
| if (!errorType && !errorCode && !errorDescription) { | ||
| return <div>Loading...</div>; | ||
| } | ||
|
|
||
| return ( | ||
| <div> | ||
| <h1>Authentication Error</h1> | ||
| {errorType && <p>Error Type: {errorType}</p>} | ||
| {errorCode && <p>Error Code: {errorCode}</p>} | ||
| {errorDescription && <p>Error Description: {errorDescription}</p>} | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { NextResponse } from 'next/server' | ||
| import { createServerClient } from '@/lib/supabase/server' | ||
|
|
||
| // Handle the callback to complete the user session login | ||
| export async function GET(request: Request) { | ||
| const { searchParams, origin } = new URL(request.url) | ||
| const code = searchParams.get('code') | ||
| // if "next" is in param, use it as the redirect URL | ||
| const next = searchParams.get('next') ?? '/profile' | ||
|
|
||
| if (code) { | ||
| const supabase = createServerClient() | ||
|
|
||
| if (!supabase) { | ||
| return NextResponse.redirect(`${origin}/error`) | ||
| } | ||
|
|
||
| const { data, error } = await supabase.auth.exchangeCodeForSession(code) | ||
| // data.session?.refresh_token is available if you need to store it for later use | ||
| if (!error) { | ||
| const forwardedHost = request.headers.get('x-forwarded-host') // original origin before load balancer | ||
| const isLocalEnv = process.env.NODE_ENV === 'development' | ||
| if (isLocalEnv) { | ||
| // we can be sure that there is no load balancer in between, so no need to watch for X-Forwarded-Host | ||
| return NextResponse.redirect(`${origin}${next}`) | ||
| } else if (forwardedHost) { | ||
| return NextResponse.redirect(`https://${forwardedHost}${next}`) | ||
| } else { | ||
| return NextResponse.redirect(`${origin}${next}`) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // return the user to an error page with instructions | ||
| return NextResponse.redirect(`${origin}/auth/auth-code-error`) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import { type EmailOtpType } from '@supabase/supabase-js' | ||
| import { type NextRequest } from 'next/server' | ||
|
|
||
| import { redirect } from 'next/navigation' | ||
| import { createServerClient } from '@/lib/supabase/server' | ||
|
|
||
| // Email confirmation route | ||
| export async function GET(request: NextRequest) { | ||
| const { searchParams } = new URL(request.url) | ||
| const token_hash = searchParams.get('token_hash') | ||
| const type = searchParams.get('type') as EmailOtpType | null | ||
| const next = searchParams.get('next') ?? '/' | ||
|
|
||
| if (token_hash && type) { | ||
| const supabase = createServerClient() | ||
|
|
||
| if (!supabase) { | ||
| redirect('/error') | ||
| } | ||
|
|
||
| const { error } = await supabase.auth.verifyOtp({ | ||
| type, | ||
| token_hash, | ||
| }) | ||
| if (!error) { | ||
| // redirect user to specified redirect URL or root of app | ||
| redirect(next) | ||
| } | ||
| } | ||
|
|
||
| // redirect the user to an error page with some instructions | ||
| redirect('/error') | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| export default function ErrorPage() { | ||
| return <p>Sorry, something went wrong</p> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.