+
Log in to your Account
{/*
))}
diff --git a/autogpt_platform/frontend/src/components/edit/control/SaveControl.tsx b/autogpt_platform/frontend/src/components/edit/control/SaveControl.tsx
index 030d83c165b4..61423c352f65 100644
--- a/autogpt_platform/frontend/src/components/edit/control/SaveControl.tsx
+++ b/autogpt_platform/frontend/src/components/edit/control/SaveControl.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback, useEffect } from "react";
import {
Popover,
PopoverContent,
@@ -15,6 +15,7 @@ import {
TooltipContent,
TooltipTrigger,
} from "@/components/ui/tooltip";
+import { useToast } from "@/components/ui/use-toast";
interface SaveControlProps {
agentMeta: GraphMeta | null;
@@ -52,14 +53,35 @@ export const SaveControl = ({
// Determines if we're saving a template or an agent
let isTemplate = agentMeta?.is_template ? true : undefined;
- const handleSave = () => {
+ const handleSave = useCallback(() => {
onSave(isTemplate);
- };
+ }, [onSave, isTemplate]);
const getType = () => {
return agentMeta?.is_template ? "template" : "agent";
};
+ const { toast } = useToast();
+
+ useEffect(() => {
+ const handleKeyDown = (event: KeyboardEvent) => {
+ if ((event.ctrlKey || event.metaKey) && event.key === "s") {
+ event.preventDefault(); // Stop the browser default action
+ handleSave(); // Call your save function
+ toast({
+ duration: 2000,
+ title: "All changes saved successfully!",
+ });
+ }
+ };
+
+ window.addEventListener("keydown", handleKeyDown);
+
+ return () => {
+ window.removeEventListener("keydown", handleKeyDown);
+ };
+ }, [handleSave]);
+
return (
diff --git a/autogpt_platform/frontend/src/components/integrations/credentials-input.tsx b/autogpt_platform/frontend/src/components/integrations/credentials-input.tsx
index 0189086b40d0..252eb6fd704f 100644
--- a/autogpt_platform/frontend/src/components/integrations/credentials-input.tsx
+++ b/autogpt_platform/frontend/src/components/integrations/credentials-input.tsx
@@ -41,7 +41,8 @@ export const providerIcons: Record> = {
github: FaGithub,
google: FaGoogle,
notion: NotionLogoIcon,
- jina: FaKey, // Use a generic icon for now as there is no specific icon for Jina AI
+ jina: FaKey,
+ pinecone: FaKey,
};
// --8<-- [end:ProviderIconsEmbed]
diff --git a/autogpt_platform/frontend/src/components/integrations/credentials-provider.tsx b/autogpt_platform/frontend/src/components/integrations/credentials-provider.tsx
index c2a0ee28934a..40ad438b929b 100644
--- a/autogpt_platform/frontend/src/components/integrations/credentials-provider.tsx
+++ b/autogpt_platform/frontend/src/components/integrations/credentials-provider.tsx
@@ -17,6 +17,7 @@ const CREDENTIALS_PROVIDER_NAMES = [
"google",
"notion",
"jina",
+ "pinecone",
] as const;
export type CredentialsProviderName =
@@ -26,7 +27,8 @@ const providerDisplayNames: Record = {
github: "GitHub",
google: "Google",
notion: "Notion",
- jina: "Jina AI",
+ jina: "Jina",
+ pinecone: "Pinecone",
};
// --8<-- [end:CredentialsProviderNames]
diff --git a/autogpt_platform/frontend/src/hooks/useCopyPaste.ts b/autogpt_platform/frontend/src/hooks/useCopyPaste.ts
new file mode 100644
index 000000000000..c5c6400fa865
--- /dev/null
+++ b/autogpt_platform/frontend/src/hooks/useCopyPaste.ts
@@ -0,0 +1,122 @@
+import { useCallback } from "react";
+import { Node, Edge, useReactFlow, useViewport } from "@xyflow/react";
+
+export function useCopyPaste(getNextNodeId: () => string) {
+ const { setNodes, addEdges, getNodes, getEdges } = useReactFlow();
+ const { x, y, zoom } = useViewport();
+
+ const handleCopyPaste = useCallback(
+ (event: KeyboardEvent) => {
+ if (event.ctrlKey || event.metaKey) {
+ if (event.key === "c" || event.key === "C") {
+ const selectedNodes = getNodes().filter((node) => node.selected);
+ const selectedEdges = getEdges().filter((edge) => edge.selected);
+
+ const copiedData = {
+ nodes: selectedNodes.map((node) => ({
+ ...node,
+ data: {
+ ...node.data,
+ connections: [],
+ },
+ })),
+ edges: selectedEdges,
+ };
+
+ localStorage.setItem("copiedFlowData", JSON.stringify(copiedData));
+ }
+ if (event.key === "v" || event.key === "V") {
+ const copiedDataString = localStorage.getItem("copiedFlowData");
+ if (copiedDataString) {
+ const copiedData = JSON.parse(copiedDataString);
+ const oldToNewIdMap: Record = {};
+
+ const viewportCenter = {
+ x: (window.innerWidth / 2 - x) / zoom,
+ y: (window.innerHeight / 2 - y) / zoom,
+ };
+
+ let minX = Infinity,
+ minY = Infinity,
+ maxX = -Infinity,
+ maxY = -Infinity;
+ copiedData.nodes.forEach((node: Node) => {
+ minX = Math.min(minX, node.position.x);
+ minY = Math.min(minY, node.position.y);
+ maxX = Math.max(maxX, node.position.x);
+ maxY = Math.max(maxY, node.position.y);
+ });
+
+ const offsetX = viewportCenter.x - (minX + maxX) / 2;
+ const offsetY = viewportCenter.y - (minY + maxY) / 2;
+
+ const pastedNodes = copiedData.nodes.map((node: Node) => {
+ const newNodeId = getNextNodeId();
+ oldToNewIdMap[node.id] = newNodeId;
+ return {
+ ...node,
+ id: newNodeId,
+ position: {
+ x: node.position.x + offsetX,
+ y: node.position.y + offsetY,
+ },
+ data: {
+ ...node.data,
+ status: undefined,
+ executionResults: undefined,
+ },
+ };
+ });
+
+ const pastedEdges = copiedData.edges.map((edge: Edge) => {
+ const newSourceId = oldToNewIdMap[edge.source] ?? edge.source;
+ const newTargetId = oldToNewIdMap[edge.target] ?? edge.target;
+ return {
+ ...edge,
+ id: `${newSourceId}_${edge.sourceHandle}_${newTargetId}_${edge.targetHandle}_${Date.now()}`,
+ source: newSourceId,
+ target: newTargetId,
+ };
+ });
+
+ setNodes((existingNodes) => [
+ ...existingNodes.map((node) => ({ ...node, selected: false })),
+ ...pastedNodes,
+ ]);
+ addEdges(pastedEdges);
+
+ setNodes((nodes) => {
+ return nodes.map((node) => {
+ if (oldToNewIdMap[node.id]) {
+ const nodeConnections = pastedEdges
+ .filter(
+ (edge) =>
+ edge.source === node.id || edge.target === node.id,
+ )
+ .map((edge) => ({
+ edge_id: edge.id,
+ source: edge.source,
+ target: edge.target,
+ sourceHandle: edge.sourceHandle,
+ targetHandle: edge.targetHandle,
+ }));
+ return {
+ ...node,
+ data: {
+ ...node.data,
+ connections: nodeConnections,
+ },
+ };
+ }
+ return node;
+ });
+ });
+ }
+ }
+ }
+ },
+ [setNodes, addEdges, getNodes, getEdges, getNextNodeId, x, y, zoom],
+ );
+
+ return handleCopyPaste;
+}
diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/baseClient.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/baseClient.ts
index dc80bb0401d4..60f2a33369ab 100644
--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/baseClient.ts
+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/baseClient.ts
@@ -273,10 +273,10 @@ export default class BaseAutoGPTServerAPI {
if (
response.status === 403 &&
- response.statusText === "Not authenticated" &&
typeof window !== "undefined" // Check if in browser environment
) {
window.location.href = "/login";
+ return null;
}
let errorDetail;
diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
index 535fd8ffec45..d7ae2a0a8331 100644
--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
@@ -96,7 +96,7 @@ export type CredentialsType = "api_key" | "oauth2";
// --8<-- [start:BlockIOCredentialsSubSchema]
export type BlockIOCredentialsSubSchema = BlockIOSubSchemaMeta & {
- credentials_provider: "github" | "google" | "notion" | "jina";
+ credentials_provider: "github" | "google" | "notion" | "jina" | "pinecone";
credentials_scopes?: string[];
credentials_types: Array;
};
diff --git a/autogpt_platform/frontend/src/lib/utils.ts b/autogpt_platform/frontend/src/lib/utils.ts
index 0c7d2023f90b..76236ced6af1 100644
--- a/autogpt_platform/frontend/src/lib/utils.ts
+++ b/autogpt_platform/frontend/src/lib/utils.ts
@@ -1,6 +1,7 @@
import { type ClassValue, clsx } from "clsx";
import { twMerge } from "tailwind-merge";
import { Category } from "./autogpt-server-api/types";
+import { NodeDimension } from "@/components/Flow";
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
@@ -213,3 +214,78 @@ export function getBehaveAs(): BehaveAs {
? BehaveAs.CLOUD
: BehaveAs.LOCAL;
}
+
+function rectanglesOverlap(
+ rect1: { x: number; y: number; width: number; height?: number },
+ rect2: { x: number; y: number; width: number; height?: number },
+): boolean {
+ const x1 = rect1.x,
+ y1 = rect1.y,
+ w1 = rect1.width,
+ h1 = rect1.height ?? 100;
+ const x2 = rect2.x,
+ y2 = rect2.y,
+ w2 = rect2.width,
+ h2 = rect2.height ?? 100;
+
+ // Check if the rectangles do not overlap
+ return !(x1 + w1 <= x2 || x1 >= x2 + w2 || y1 + h1 <= y2 || y1 >= y2 + h2);
+}
+
+export function findNewlyAddedBlockCoordinates(
+ nodeDimensions: NodeDimension,
+ newWidth: number,
+ margin: number,
+ zoom: number,
+) {
+ const nodeDimensionArray = Object.values(nodeDimensions);
+
+ for (let i = nodeDimensionArray.length - 1; i >= 0; i--) {
+ const lastNode = nodeDimensionArray[i];
+ const lastNodeHeight = lastNode.height ?? 100;
+
+ // Right of the last node
+ let newX = lastNode.x + lastNode.width + margin;
+ let newY = lastNode.y;
+ let newRect = { x: newX, y: newY, width: newWidth, height: 100 / zoom };
+
+ const collisionRight = nodeDimensionArray.some((node) =>
+ rectanglesOverlap(newRect, node),
+ );
+
+ if (!collisionRight) {
+ return { x: newX, y: newY };
+ }
+
+ // Left of the last node
+ newX = lastNode.x - newWidth - margin;
+ newRect = { x: newX, y: newY, width: newWidth, height: 100 / zoom };
+
+ const collisionLeft = nodeDimensionArray.some((node) =>
+ rectanglesOverlap(newRect, node),
+ );
+
+ if (!collisionLeft) {
+ return { x: newX, y: newY };
+ }
+
+ // Below the last node
+ newX = lastNode.x;
+ newY = lastNode.y + lastNodeHeight + margin;
+ newRect = { x: newX, y: newY, width: newWidth, height: 100 / zoom };
+
+ const collisionBelow = nodeDimensionArray.some((node) =>
+ rectanglesOverlap(newRect, node),
+ );
+
+ if (!collisionBelow) {
+ return { x: newX, y: newY };
+ }
+ }
+
+ // Default position if no space is found
+ return {
+ x: 0,
+ y: 0,
+ };
+}
diff --git a/autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml
index 793ef400ec12..128ea3ee44a5 100644
--- a/autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml
+++ b/autogpt_platform/infra/helm/autogpt-builder/values.dev.yaml
@@ -1,9 +1,9 @@
# dev values, overwrite base values as needed.
image:
- repository: us-east1-docker.pkg.dev/agpt-dev/agpt-builder-dev/agpt-builder-dev
+ repository: us-east1-docker.pkg.dev/agpt-dev/agpt-frontend-dev/agpt-frontend-dev
pullPolicy: Always
- tag: "fe3d2a9"
+ tag: "latest"
serviceAccount:
annotations:
@@ -66,4 +66,5 @@ env:
SENTRY_AUTH_TOKEN: ""
NEXT_PUBLIC_AUTH_CALLBACK_URL: "https://dev-server.agpt.co/auth/callback"
NEXT_PUBLIC_AGPT_WS_SERVER_URL: "wss://dev-ws-server.agpt.co/ws"
- NEXT_PUBLIC_AGPT_MARKETPLACE_URL: "https://dev-market.agpt.co/api/v1/market"
\ No newline at end of file
+ NEXT_PUBLIC_AGPT_MARKETPLACE_URL: "https://dev-market.agpt.co/api/v1/market"
+ NEXT_PUBLIC_BEHAVE_AS: "CLOUD"
\ No newline at end of file
diff --git a/autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml b/autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml
index f1f3a90efca6..4c65a1b17c53 100644
--- a/autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml
+++ b/autogpt_platform/infra/helm/autogpt-builder/values.prod.yaml
@@ -85,4 +85,5 @@ env:
NEXT_PUBLIC_SUPABASE_URL: "https://bgwpwdsxblryihinutbx.supabase.co"
GOOGLE_CLIENT_ID: ""
GOOGLE_CLIENT_SECRET: ""
- SENTRY_AUTH_TOKEN: ""
\ No newline at end of file
+ SENTRY_AUTH_TOKEN: ""
+ NEXT_PUBLIC_BEHAVE_AS: "CLOUD"
\ No newline at end of file
diff --git a/autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml b/autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml
index 86258929e81b..41ab87d94396 100644
--- a/autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml
+++ b/autogpt_platform/infra/helm/autogpt-market/templates/sealed-secrets.yaml
@@ -5,6 +5,7 @@ metadata:
namespace: {{ .Release.Namespace }}
annotations:
sealedsecrets.bitnami.com/cluster-wide: "true"
+ force-update: "true"
spec:
encryptedData:
{{- range $key, $value := .Values.secrets }}
diff --git a/autogpt_platform/infra/helm/autogpt-market/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-market/values.dev.yaml
index 96d63b40db1a..8b30d3beac0b 100644
--- a/autogpt_platform/infra/helm/autogpt-market/values.dev.yaml
+++ b/autogpt_platform/infra/helm/autogpt-market/values.dev.yaml
@@ -95,6 +95,6 @@ env:
secrets:
SUPABASE_JWT_SECRET: "AgBL6H6byPKXVN0nYWgqyoZBHJJJqk8S3rNYSu3JvwOsNn3Sw94SrJcXuE48fxcojcbKvYcDshetFhrSNEsfUwvbSFoaIj+MItPIZ8FGHyfXnmeZJ5j/sdvcjaMmWS7CiL2jhzI+nc8rL2ATV2TgA7E6FA9MvhWqkAyZu04pCd1c9DsAlpcfQ3pxywXjOV+BU0+1+++Z+fTnaugt+hRbhHrKTddaPhi72KrIyJPOUlqfht0JcgflT1f5frvmNnDwkiP862knhJsqg7XyrSy4msCN7eH4BvV01pO3KhAEnMG4Lk/5FeE/2t05+HqgB4mvPbkqfY6g8Lvf6qmd5g+stB10wRmr+TxzokOom36r7sYd3tyXZMgemJOi3BZjYk7774zf/TI081pJx1FPvM6dDPQdrgnU1nhshq/gLyKB5tTTCkPQHW+YhUtApWgrC5mq8ezMqfuwrUuR+NvyO59K56ERJJFAw1fDKHIVl4TYmftet42lkVOchml30cje9gjBtpOrTkFf8lMv5DLQ/ygdwsAYmVrpYtXbT+GAaRI9QIv/rZVuckfz4uIhTp7IjAtRXJreMH2V8GZ22h6Of/BQG+XA42lMA2huIyLwsqmtL0qxNmIu5EGjcXBvlOt5eNquzts68jgNqEfE6fEuqS9lDepvtTSxGp7wmcmWwOBbIgbCnxl8t4IW/e1qvOPuvxMldH+YtVIvfHMf3DnvbehhCIYuLmRM+E6139/qdGKreRyCi4PA4PKTMEG962rSu/7z0X5wu+UYY+kESrs7HhksL3PhB3dpbZ0HF+b6lchziTI0atG+UNX05ysL"
- DATABASE_URL: "AgACJkybaNon1X7ZkvtyM0mJ3Gfbjh1LWSJdWGC3ny6QU/8yERomTjvDylHuFoaoGeEs5ewYtgH87G/t1q3LF35cjmipGTSJbxFKfyoRcGBZSajen2Ijs+satVD7T6bmCNsurEsUD16QDLoV5lx+THXdEjv4VrBtFwY0HO2BIP15X/vMie9Mk91Uk1eze5dj8WoQ5OywH8O8Ugh7/iOleEyiPaMzxdRAfwvYHgX5QYqDno0ktZFyKnDOpCnegIwcUei4tt+EiTAG1SxESk48DQQokNrZc+lqlPwozX6FOYkgcQiZZqIN+9qOy5hB+1wKggS8zcd7/YAlSpSd8LMeAokflxOabN5Ctyvx3k5tGgstKQabW1TErwL8RjB3WYClLvJl8bfc4qILr4jpfA4all59f8oinATiyeqJ3Hx267FdHH2aywnXnNdEmycGhKkuH0vAa74oYsUiD9BrjkxmMdxCwmEjl47ob5fwcraKOc7hNF+hPi2C61/z1T6yoIeu4ediMTk0m1ZPIOotlbj/nKkmrKDfD+WMia/YvBpUtlM/SaEyX66gmO03kxW92cmXVCjK65oGh0ueCyK84J9e/2y+qO6yFXh7991+wTQyAedBBoc2myNcebKzuAmFNwanCs+FMOktPZsMMzfFy3oHJQxgFkPEp+jKennODqTe0A3LBhJC3ddwCYgd1TAABC2+DqFGaCRiyaSZ4BZIitEPFzpJwITIFZoRyxrCibrGKKnILVjGNaiV/KdIzfj70AAdzG/7GFdA9SKzRQimnVw99YTjNouCYzt7iLBV/8KrcMvyyeHZle1A6zg0gjjj4Yp6p0ssIOvhuDLjec4NMi/E5EbgYzKQFr7jN2u9%"
+ DATABASE_URL: "AgACJkybaNon1X7ZkvtyM0mJ3Gfbjh1LWSJdWGC3ny6QU/8yERomTjvDylHuFoaoGeEs5ewYtgH87G/t1q3LF35cjmipGTSJbxFKfyoRcGBZSajen2Ijs+satVD7T6bmCNsurEsUD16QDLoV5lx+THXdEjv4VrBtFwY0HO2BIP15X/vMie9Mk91Uk1eze5dj8WoQ5OywH8O8Ugh7/iOleEyiPaMzxdRAfwvYHgX5QYqDno0ktZFyKnDOpCnegIwcUei4tt+EiTAG1SxESk48DQQokNrZc+lqlPwozX6FOYkgcQiZZqIN+9qOy5hB+1wKggS8zcd7/YAlSpSd8LMeAokflxOabN5Ctyvx3k5tGgstKQabW1TErwL8RjB3WYClLvJl8bfc4qILr4jpfA4all59f8oinATiyeqJ3Hx267FdHH2aywnXnNdEmycGhKkuH0vAa74oYsUiD9BrjkxmMdxCwmEjl47ob5fwcraKOc7hNF+hPi2C61/z1T6yoIeu4ediMTk0m1ZPIOotlbj/nKkmrKDfD+WMia/YvBpUtlM/SaEyX66gmO03kxW92cmXVCjK65oGh0ueCyK84J9e/2y+qO6yFXh7991+wTQyAedBBoc2myNcebKzuAmFNwanCs+FMOktPZsMMzfFy3oHJQxgFkPEp+jKennODqTe0A3LBhJC3ddwCYgd1TAABC2+DqFGaCRiyaSZ4BZIitEPFzpJwITIFZoRyxrCibrGKKnILVjGNaiV/KdIzfj70AAdzG/7GFdA9SKzRQimnVw99YTjNouCYzt7iLBV/8KrcMvyyeHZle1A6zg0gjjj4Yp6p0ssIOvhuDLjec4NMi/E5EbgYzKQFr7jN2u9"
SENTRY_DSN: "AgB9i02k9BgaIXF0p9Qyyeo0PRa9bd3UiPBWQ3V4Jn19Vy5XAzKfYvqP8t+vafN2ffY+wCk1FlhYzdIuFjh3oRvdKvtwGEBZk6nLFiUrw/GSum0ueR2OzEy+AwGFXA9FstD0KCMJvyehSv9xRm9kqLOC4Xb/5lOWwTNF3AKqkEMEeKrOWx4OLXG6MLdR7OicY45BCE5WvcV2PizDaN5w3J72eUxFP0HjXit/aW/gK32IJME0RxeuQZ5TnPKTNrooYPR0eWXd2PgYshFjQ2ARy/OsvOrD10y8tQ3M5qx/HNWLC/r0lEu2np+9iUIAE1ufSwjmNSyi4V8usdZWq7xnf3vuKlSgmveqKkLbwQUWj1BpLNIjUvyY+1Rk1rxup/WCgaw+xOZd6sR/qTIjILv5GuzpU0AiwEm7sgl2pmpFXq6n6QjNOfZoPBTL73f4bpXNJ3EyMYDbPxOtGDz91B+bDtOsMr1DNWQslKkk3EIilm/l0+NuLKxf/e2HwM3sB15mkQqVZBdbiVOr7B27cR9xAnr296KE/BU6E9dp/fl+IgcaonMpTsE61pCLHWxQXNBO5X078/zhmaXBQyEBNQ5SPDr9u3pHWrrLkBtXwldZvgmLMMVFMAzrVVkJB4lC9sZj0pXPhda0/BsA4xcGRELj/PizwSr+kb3lDumNMqzEap5ZjEGCBpeeIVSo19v+RoEDw0AFmyxfYx2+91HsgiEqjEUg+J6yDmjAoRpOD1wRZOnnpR8ufMiqdBteCG8B5SXkhgto1WtDyOMVlX2wbmBFVetv2nAbMIA/l4E/Yv8HXiJsTqAkeYc5Qak6/SMGnZTw7Q=="
SUPABASE_SERVICE_ROLE_KEY: "AgCrHCd2AdIv++sX7AAf0YoV+qDFhPuErd/Q9Jgj8/1wDJklqv0giI/M7TRUV6j2Gqa/yLP90Hoiy2BboE0V3FrTtHzasxtSK0hd93+bxvZ34FEfKQyAiddBR8OxzlPwaplzaJ+/Tu+yHf1EesgXrUdydk38D4AQqkrC30FRKJcCxJNTHHzsZiHGQLZNP2l0cEsmqtMXMk8TqbcqHvJZRpr8jP1dSJ7bxEdU9mH/zB4HV+EsPLDFWFAnFjbEQwv8FEGgqpy81ifch4Hz7S0wjwk0x/QsagKavBTvI579K6Sx7uJyMyilpzm5Ct8kDXTEGUWv7pFINXM5cAbcBNzuvwvtXmshMwRsl9e/5Y2/T2VgS7/wPTJA4AmyyrSK976SOjo7imb4XfMwc6Cc/2GE0BRW9jiKvzjQ1TC2ovQpNujTYYgPzIq8sFXEVss31DIcfwbRAzgKTTQZKl+H+i9AS0q6iYHtKORwTQ2bv2XwQwxogXMHTUq1oC3MkzjKfV9DcoTHU2o/+gTyOBW5i3BRatuublA1x0EwDoEVmWA1+i1h2bpkl4QYuyeNlhJnRHzuQU3RdFLWn3MkDM8Q4Y9n0/XXwwTCgqtdAExqNh3YJYumWiGiWfdBpEUqlUtOUurNMXy6rHH4odnNKeLQfMOa9406x5H5xiwNkl3mzGjNiPDMS7JMTptlsoL8DshE2TM0PqZVrQy81OsGNpdiU8MVeUdHO6/bDBe7j9v0FipqpeehX1AZEYb/4CWosTJACWpaTnLYRh+w12bk3x6Sj0kriDKMOuJLBRh1fveZXUC9C0FsEPhq2rBLQDVh78DkBIeKVGUzuxDP/6mT3OSBPe4aCye0vTmwtEOEvB+A7rcMkOl+j90bKAveE9H+f7UVU6Og40Nc3sSuMolKHbQyB9TNd4+jOfmySSN675riL6BpFFCSuWqjrqWFr0yI1h/xAg+YMg8WzWarwSeWr3ykXrbhQvu7Oj27ffLXEIvS0gU="
\ No newline at end of file
diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml
index ad9e1962f18f..c71a1a13fb28 100644
--- a/autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml
+++ b/autogpt_platform/infra/helm/autogpt-server/templates/deployment-executor.yaml
@@ -46,6 +46,9 @@ spec:
- name: http
containerPort: {{ .Values.serviceExecutor.port }}
protocol: TCP
+ - name: db-http
+ containerPort: {{ .Values.serviceDBManager.port }}
+ protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.volumeMounts }}
diff --git a/autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml b/autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml
index 36ef560b2220..6d8d13ec6066 100644
--- a/autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml
+++ b/autogpt_platform/infra/helm/autogpt-server/templates/service-executor.yaml
@@ -15,5 +15,9 @@ spec:
targetPort: http
protocol: TCP
name: http
+ - port: {{ .Values.serviceDBManager.port }}
+ targetPort: db-http
+ protocol: TCP
+ name: db-http
selector:
- app.kubernetes.io/component: executor
+ app.kubernetes.io/component: executor
\ No newline at end of file
diff --git a/autogpt_platform/infra/helm/autogpt-server/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-server/values.dev.yaml
index 19349017aef4..9150de2dfe23 100644
--- a/autogpt_platform/infra/helm/autogpt-server/values.dev.yaml
+++ b/autogpt_platform/infra/helm/autogpt-server/values.dev.yaml
@@ -1,7 +1,7 @@
# dev values, overwrite base values as needed.
image:
- repository: us-east1-docker.pkg.dev/agpt-dev/agpt-server-dev/agpt-server-dev
+ repository: us-east1-docker.pkg.dev/agpt-dev/agpt-backend-dev/agpt-backend-dev
pullPolicy: Always
tag: "latest"
@@ -25,6 +25,13 @@ serviceExecutor:
annotations:
beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}'
+serviceDBManager:
+ type: ClusterIP
+ port: 8005
+ targetPort: 8005
+ annotations:
+ beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}'
+
ingress:
enabled: true
className: "gce"
@@ -58,7 +65,7 @@ resources:
livenessProbe:
httpGet:
- path: /heath
+ path: /health
port: 8006
initialDelaySeconds: 30
periodSeconds: 10
@@ -106,6 +113,7 @@ env:
SUPABASE_URL: "https://adfjtextkuilwuhzdjpf.supabase.co"
AGENTSERVER_HOST: "autogpt-server.dev-agpt.svc.cluster.local"
EXECUTIONMANAGER_HOST: "autogpt-server-executor.dev-agpt.svc.cluster.local"
+ DATABASEMANAGER_HOST: "autogpt-server-executor.dev-agpt.svc.cluster.local"
secrets:
ANTHROPIC_API_KEY: "AgBllA6KzTdyLs6Tc+HrwIeSjdsPQxdU/4qpqT64H4K3nTehS6kpCW1qtH6eBChs1v+m857sUgsrB9u8+P0aAa3DcgZ/gNg+G1GX6vAY2NJvP/2Q+Hiwi1cAn+R3ChHejG9P2C33hTa6+V9cpUI9xUWOwWLOIQZpLvAc7ltsi0ZJ06qFO0Zhj+H9K768h7U3XaivwywX7PT7BnUTiT6AQkAwD2misBkeSQZdsllOD0th3b2245yieqal9osZHlSlslI9c6EMpH0n+szSND7goyjgsik0Tb0xJU6kGggdcw9hl4x91rYDYNPs0hFES9HUxzfiAid6Y2rDUVBXoNg7K7pMR6/foIkl+gCg/1lqOS0FRlUVyAQGJEx6XphyX/SftgLaI7obaVnzjErrpLWY1ZRiD8VVZD40exf8FddGOXwPvxYHrrrPotlTDLONZMn4Fl46tJCTsoQfHCjco+sz7/nLMMnHx+l1D0eKBuGPVsKTtbWozhLCNuWEgcWb4kxJK5sd1g/GylD43g8hFW531Vbpk1J1rpf7Hurd/aTUjwSXmdxB2qXTT4HRG+Us6PnhMIuf/yxilTs4WNShY0zHhYgnQFSM3oCTL6XXG1dqdOwY2k6+k2wCQtpK45boVN5PpBrQuDuFdWb/jM5jH6L8ns0dMMlY3lHM459u7FEn8rum/xXdP/JvpFb+yct3Rgc54SOT5HuVUNAHzzmbWhY4RG4b3i21L2SlsVUwjKvu+PlN4MN5KPilvHe3yODXZu0Gp0ClzDNZQiKQU67H0uYr6eRccMDsHtMlPELqnjyQZ+OriydzB3qXidAkguKNmzPypz0LyTMnry7YpNRGyUw="
diff --git a/autogpt_platform/infra/helm/autogpt-server/values.prod.yaml b/autogpt_platform/infra/helm/autogpt-server/values.prod.yaml
index 0e73afa33175..c6e96862cc6f 100644
--- a/autogpt_platform/infra/helm/autogpt-server/values.prod.yaml
+++ b/autogpt_platform/infra/helm/autogpt-server/values.prod.yaml
@@ -25,6 +25,13 @@ serviceExecutor:
annotations:
beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}'
+serviceDBManager:
+ type: ClusterIP
+ port: 8005
+ targetPort: 8005
+ annotations:
+ beta.cloud.google.com/backend-config: '{"default": "autogpt-server-backend-config"}'
+
ingress:
enabled: true
className: "gce"
@@ -72,7 +79,7 @@ cors:
livenessProbe:
httpGet:
- path: /heath
+ path: /health
port: 8006
initialDelaySeconds: 30
periodSeconds: 10
@@ -80,7 +87,7 @@ livenessProbe:
failureThreshold: 6
readinessProbe:
httpGet:
- path: /heath
+ path: /health
port: 8006
initialDelaySeconds: 30
periodSeconds: 10
@@ -103,6 +110,7 @@ env:
SUPABASE_URL: "https://bgwpwdsxblryihinutbx.supabase.co"
AGENTSERVER_HOST: "autogpt-server.prod-agpt.svc.cluster.local"
EXECUTIONMANAGER_HOST: "autogpt-server-executor.prod-agpt.svc.cluster.local"
+ DATABASEMANAGER_HOST: "autogpt-server-executor.prod-agpt.svc.cluster.local"
secrets:
ANTHROPIC_API_KEY: "AgCf0CUyhYluMW13zvdScIzF50c1u4P3sUkKZjwe2lJGil/WrxN1r+GQGoLzjMn8ODANV7FiJN2+Y+ilVgpf0tVA9uEWLCL/OguNshRYWfNfU0PCgciXvz+Cy8xILfJW5SIZvZgDV5zMbzXeBomJYq+qFpr+PRyiIzA6ciHK/ZuItcGBB0FMdJ6w2gvAlLTFmAK0ekyXTzYidPEkBp+DA4jJXuzjXGd4U8iC4IcrSs/o0eaqfMQSOBRc7w/6SK+YDUnWypc2awBX4qNwqKbQRYAT59lihy/B0D4BhjjiUb2bAlzNWP0STsJONrOPbnHzuvipm1xpk+1bdYFpkqJAf9rk9GOPAMfB5f/kOdmaoj9jdQN55NIomSzub+KnSGt+m4G6YlEnUf2ZBZTKTeWO1jzk0gnzrdFZclPq/9Dd0qUBsZ/30KjbBRJyL9SexwxpfMoaf6dKJHcsOdOevaCpMQZaQ/AjcFZRtntw8mLALJzTZbTq7Gb6h25blwe1Oi6DrOuTrWT+OMHeUJcDQA3q1rJERa4xV0wLjYraCTerezhZgjMvfRD1Ykm5S+1U9hzsZUZZQS6OEEIS0BaOfYugt3DiFSNLrIUwVcYbl5geLoiMW6oSukEeb4s2AukRqKkMYz8/stjCgJB2NiarVi2NIaDvgaXWLgJxNxxovgtHyS4RR8WpRPdWJdjAs6RH13ve42a35S2m65jvUNg875GSO8Eo1izYH6q2LvJgGmlTfMworP6O2ryZO9tBjNS58UYxM8EqvtXLVktA0TYlK7wlF2NzA/waIMmiOiKJrb8YnQF28ePxYnmQSqqe2ZpwSiDBsDNrzfZvvTk9Ai81qu8="
diff --git a/autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml b/autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml
index a977f9bece0c..dd26b32f4030 100644
--- a/autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml
+++ b/autogpt_platform/infra/helm/autogpt-websocket-server/values.dev.yaml
@@ -1,7 +1,7 @@
replicaCount: 1 # not scaling websocket server for now
image:
- repository: us-east1-docker.pkg.dev/agpt-dev/agpt-server-dev/agpt-server-dev
+ repository: us-east1-docker.pkg.dev/agpt-dev/agpt-backend-dev/agpt-backend-dev
tag: latest
pullPolicy: Always
diff --git a/autogpt_platform/infra/terraform/environments/dev.tfvars b/autogpt_platform/infra/terraform/environments/dev.tfvars
index 1f72c6d907a0..c193e8399a9a 100644
--- a/autogpt_platform/infra/terraform/environments/dev.tfvars
+++ b/autogpt_platform/infra/terraform/environments/dev.tfvars
@@ -28,6 +28,10 @@ service_accounts = {
"dev-agpt-market-sa" = {
display_name = "AutoGPT Dev Market Server Account"
description = "Service account for agpt dev market server"
+ },
+ "dev-github-actions-sa" = {
+ display_name = "GitHub Actions Dev Service Account"
+ description = "Service account for GitHub Actions deployments to dev"
}
}
@@ -51,6 +55,11 @@ workload_identity_bindings = {
service_account_name = "dev-agpt-market-sa"
namespace = "dev-agpt"
ksa_name = "dev-agpt-market-sa"
+ },
+ "dev-github-actions-workload-identity" = {
+ service_account_name = "dev-github-actions-sa"
+ namespace = "dev-agpt"
+ ksa_name = "dev-github-actions-sa"
}
}
@@ -59,7 +68,8 @@ role_bindings = {
"serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com",
"serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com",
"serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com",
- "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com"
+ "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com",
+ "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com"
],
"roles/cloudsql.client" = [
"serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com",
@@ -80,7 +90,8 @@ role_bindings = {
"serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com",
"serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com",
"serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com",
- "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com"
+ "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com",
+ "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com"
]
"roles/compute.networkUser" = [
"serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com",
@@ -93,6 +104,16 @@ role_bindings = {
"serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com",
"serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com",
"serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com"
+ ],
+ "roles/artifactregistry.writer" = [
+ "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com"
+ ],
+ "roles/container.viewer" = [
+ "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com"
+ ],
+ "roles/iam.serviceAccountTokenCreator" = [
+ "principalSet://iam.googleapis.com/projects/638488734936/locations/global/workloadIdentityPools/dev-pool/*",
+ "serviceAccount:dev-github-actions-sa@agpt-dev.iam.gserviceaccount.com"
]
}
@@ -101,4 +122,25 @@ services_ip_cidr_range = "10.2.0.0/20"
public_bucket_names = ["website-artifacts"]
standard_bucket_names = []
-bucket_admins = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"]
\ No newline at end of file
+bucket_admins = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"]
+
+workload_identity_pools = {
+ "dev-pool" = {
+ display_name = "Development Identity Pool"
+ providers = {
+ "github" = {
+ issuer_uri = "https://token.actions.githubusercontent.com"
+ attribute_mapping = {
+ "google.subject" = "assertion.sub"
+ "attribute.repository" = "assertion.repository"
+ "attribute.repository_owner" = "assertion.repository_owner"
+ }
+ }
+ }
+ service_accounts = {
+ "dev-github-actions-sa" = [
+ "Significant-Gravitas/AutoGPT"
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/autogpt_platform/infra/terraform/environments/prod.tfvars b/autogpt_platform/infra/terraform/environments/prod.tfvars
index e9351389285a..e75b5b3d45ce 100644
--- a/autogpt_platform/infra/terraform/environments/prod.tfvars
+++ b/autogpt_platform/infra/terraform/environments/prod.tfvars
@@ -28,6 +28,10 @@ service_accounts = {
"prod-agpt-market-sa" = {
display_name = "AutoGPT prod Market backend Account"
description = "Service account for agpt prod market backend"
+ },
+ "prod-github-actions-sa" = {
+ display_name = "GitHub Actions Prod Service Account"
+ description = "Service account for GitHub Actions deployments to prod"
}
}
@@ -59,7 +63,8 @@ role_bindings = {
"serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com",
"serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com",
"serviceAccount:prod-agpt-ws-backend-sa@agpt-prod.iam.gserviceaccount.com",
- "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com"
+ "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com",
+ "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com"
],
"roles/cloudsql.client" = [
"serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com",
@@ -80,7 +85,8 @@ role_bindings = {
"serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com",
"serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com",
"serviceAccount:prod-agpt-ws-backend-sa@agpt-prod.iam.gserviceaccount.com",
- "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com"
+ "serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com",
+ "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com"
]
"roles/compute.networkUser" = [
"serviceAccount:prod-agpt-backend-sa@agpt-prod.iam.gserviceaccount.com",
@@ -93,6 +99,16 @@ role_bindings = {
"serviceAccount:prod-agpt-frontend-sa@agpt-prod.iam.gserviceaccount.com",
"serviceAccount:prod-agpt-ws-backend-sa@agpt-prod.iam.gserviceaccount.com",
"serviceAccount:prod-agpt-market-sa@agpt-prod.iam.gserviceaccount.com"
+ ],
+ "roles/artifactregistry.writer" = [
+ "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com"
+ ],
+ "roles/container.viewer" = [
+ "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com"
+ ],
+ "roles/iam.serviceAccountTokenCreator" = [
+ "principalSet://iam.googleapis.com/projects/1021527134101/locations/global/workloadIdentityPools/prod-pool/*",
+ "serviceAccount:prod-github-actions-sa@agpt-prod.iam.gserviceaccount.com"
]
}
@@ -101,4 +117,25 @@ services_ip_cidr_range = "10.2.0.0/20"
public_bucket_names = ["website-artifacts"]
standard_bucket_names = []
-bucket_admins = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"]
\ No newline at end of file
+bucket_admins = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"]
+
+workload_identity_pools = {
+ "prod-pool" = {
+ display_name = "Production Identity Pool"
+ providers = {
+ "github" = {
+ issuer_uri = "https://token.actions.githubusercontent.com"
+ attribute_mapping = {
+ "google.subject" = "assertion.sub"
+ "attribute.repository" = "assertion.repository"
+ "attribute.repository_owner" = "assertion.repository_owner"
+ }
+ }
+ }
+ service_accounts = {
+ "prod-github-actions-sa" = [
+ "Significant-Gravitas/AutoGPT"
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/autogpt_platform/infra/terraform/main.tf b/autogpt_platform/infra/terraform/main.tf
index 31049ed40cb9..047ebd59c661 100644
--- a/autogpt_platform/infra/terraform/main.tf
+++ b/autogpt_platform/infra/terraform/main.tf
@@ -61,6 +61,7 @@ module "iam" {
service_accounts = var.service_accounts
workload_identity_bindings = var.workload_identity_bindings
role_bindings = var.role_bindings
+ workload_identity_pools = var.workload_identity_pools
}
module "storage" {
diff --git a/autogpt_platform/infra/terraform/modules/iam/main.tf b/autogpt_platform/infra/terraform/modules/iam/main.tf
index 3a07d6926456..f632f4c42b43 100644
--- a/autogpt_platform/infra/terraform/modules/iam/main.tf
+++ b/autogpt_platform/infra/terraform/modules/iam/main.tf
@@ -23,4 +23,31 @@ resource "google_project_iam_binding" "role_bindings" {
role = each.key
members = each.value
+}
+
+resource "google_iam_workload_identity_pool" "pools" {
+ for_each = var.workload_identity_pools
+ workload_identity_pool_id = each.key
+ display_name = each.value.display_name
+}
+
+resource "google_iam_workload_identity_pool_provider" "providers" {
+ for_each = merge([
+ for pool_id, pool in var.workload_identity_pools : {
+ for provider_id, provider in pool.providers :
+ "${pool_id}/${provider_id}" => merge(provider, {
+ pool_id = pool_id
+ })
+ }
+ ]...)
+
+ workload_identity_pool_id = split("/", each.key)[0]
+ workload_identity_pool_provider_id = split("/", each.key)[1]
+
+ attribute_mapping = each.value.attribute_mapping
+ oidc {
+ issuer_uri = each.value.issuer_uri
+ allowed_audiences = each.value.allowed_audiences
+ }
+ attribute_condition = "assertion.repository_owner==\"Significant-Gravitas\""
}
\ No newline at end of file
diff --git a/autogpt_platform/infra/terraform/modules/iam/outputs.tf b/autogpt_platform/infra/terraform/modules/iam/outputs.tf
index b503414873a9..19354364bebb 100644
--- a/autogpt_platform/infra/terraform/modules/iam/outputs.tf
+++ b/autogpt_platform/infra/terraform/modules/iam/outputs.tf
@@ -1,4 +1,14 @@
output "service_account_emails" {
description = "The emails of the created service accounts"
value = { for k, v in google_service_account.service_accounts : k => v.email }
-}
\ No newline at end of file
+}
+
+output "workload_identity_pools" {
+ value = google_iam_workload_identity_pool.pools
+}
+
+output "workload_identity_providers" {
+ value = {
+ for k, v in google_iam_workload_identity_pool_provider.providers : k => v.name
+ }
+}
diff --git a/autogpt_platform/infra/terraform/modules/iam/variables.tf b/autogpt_platform/infra/terraform/modules/iam/variables.tf
index 61637a718783..c9563ea0c7b8 100644
--- a/autogpt_platform/infra/terraform/modules/iam/variables.tf
+++ b/autogpt_platform/infra/terraform/modules/iam/variables.tf
@@ -26,4 +26,17 @@ variable "role_bindings" {
description = "Map of roles to list of members"
type = map(list(string))
default = {}
+}
+
+variable "workload_identity_pools" {
+ type = map(object({
+ display_name = string
+ providers = map(object({
+ issuer_uri = string
+ attribute_mapping = map(string)
+ allowed_audiences = optional(list(string))
+ }))
+ service_accounts = map(list(string)) # Map of SA to list of allowed principals
+ }))
+ default = {}
}
\ No newline at end of file
diff --git a/autogpt_platform/infra/terraform/variables.tf b/autogpt_platform/infra/terraform/variables.tf
index 1afd9509fcbc..3b4eb92dff9c 100644
--- a/autogpt_platform/infra/terraform/variables.tf
+++ b/autogpt_platform/infra/terraform/variables.tf
@@ -130,3 +130,19 @@ variable "bucket_admins" {
default = ["gcp-devops-agpt@agpt.co", "gcp-developers@agpt.co"]
}
+variable "workload_identity_pools" {
+ type = map(object({
+ display_name = string
+ providers = map(object({
+ issuer_uri = string
+ attribute_mapping = map(string)
+ allowed_audiences = optional(list(string))
+ }))
+ service_accounts = map(list(string))
+ }))
+ default = {}
+ description = "Configuration for workload identity pools and their providers"
+}
+
+
+
diff --git a/autogpt_platform/market/.env.example b/autogpt_platform/market/.env.example
index 5522998fc10c..b3b1cb8a4e86 100644
--- a/autogpt_platform/market/.env.example
+++ b/autogpt_platform/market/.env.example
@@ -9,4 +9,4 @@ ENABLE_AUTH=true
SUPABASE_JWT_SECRET=our-super-secret-jwt-token-with-at-least-32-characters-long
BACKEND_CORS_ALLOW_ORIGINS="http://localhost:3000,http://127.0.0.1:3000"
-APP_ENV=local
\ No newline at end of file
+APP_ENV=local
diff --git a/docs/content/server/new_blocks.md b/docs/content/server/new_blocks.md
index 8cc5a5253836..1c7c3684cf7f 100644
--- a/docs/content/server/new_blocks.md
+++ b/docs/content/server/new_blocks.md
@@ -196,7 +196,7 @@ class BlockWithAPIKeyAndOAuth(Block):
The credentials will be automagically injected by the executor in the back end.
-The `APIKeyCredentials` and `OAuth2Credentials` models are defined [here](https://github.com/Significant-Gravitas/AutoGPT/blob/master/rnd/autogpt_libs/autogpt_libs/supabase_integration_credentials_store/types.py).
+The `APIKeyCredentials` and `OAuth2Credentials` models are defined [here](https://github.com/Significant-Gravitas/AutoGPT/blob/master/autogpt_platform/autogpt_libs/autogpt_libs/supabase_integration_credentials_store/types.py).
To use them in e.g. an API request, you can either access the token directly:
```python