-
{messages.map((message, index) => (
-
+
))}
{children}
{messages.length === 0 && (
<>
- {!!clientEnv.NEXT_PUBLIC_STRIPE_DONATION_ENABLED && (
-
-
- )}
+
+ )}
)}
@@ -114,9 +127,14 @@ const ChatWindow = ({
);
};
-const MacWindowHeader = () => {
- const { t } = useTranslation(["chat", "common"]);
+interface HeaderProps {
+ title?: string | ReactNode;
+ messages: Message[];
+ onSave?: (format: string) => void;
+ showWeChatPay: () => void;
+}
+const MacWindowHeader = (props: HeaderProps) => {
const saveElementAsImage = (elementId: string) => {
const element = document.getElementById(elementId);
if (!element) {
@@ -152,7 +170,7 @@ const MacWindowHeader = () => {
};
return (
-
diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index a3026e76..50044b5f 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -1,15 +1,20 @@
// @ts-check
import { z } from "zod";
-const requiredForProduction = () => process.env.NODE_ENV === "production"
+const requiredForProduction = () =>
+ process.env.NODE_ENV === "production"
? z.string().min(1).trim()
- : z.string().min(1).trim().optional()
+ : z.string().min(1).trim().optional();
+
+const requiredAuthEnabledForProduction = () => {
+ return process.env.NODE_ENV === "production" &&
+ process.env.NEXT_PUBLIC_FF_AUTH_ENABLED === "true"
+ ? z.string().min(1).trim()
+ : z.string().min(1).trim().optional();
+};
function stringToBoolean() {
- return z.preprocess(
- (str) => str === "true",
- z.boolean(),
- );
+ return z.preprocess((str) => str === "true", z.boolean());
}
/**
@@ -25,16 +30,16 @@ export const serverSchema = z.object({
// Since NextAuth.js automatically uses the VERCEL_URL if present.
(str) => process.env.VERCEL_URL ?? str,
// VERCEL_URL doesn't include `https` so it cant be validated as a URL
- process.env.VERCEL ? z.string() : z.string().url(),
+ process.env.VERCEL ? z.string() : z.string().url()
),
OPENAI_API_KEY: z.string(),
- GOOGLE_CLIENT_ID: requiredForProduction(),
- GOOGLE_CLIENT_SECRET: requiredForProduction(),
- GITHUB_CLIENT_ID: requiredForProduction(),
- GITHUB_CLIENT_SECRET: requiredForProduction(),
- DISCORD_CLIENT_ID: requiredForProduction(),
- DISCORD_CLIENT_SECRET: requiredForProduction(),
+ GOOGLE_CLIENT_ID: requiredAuthEnabledForProduction(),
+ GOOGLE_CLIENT_SECRET: requiredAuthEnabledForProduction(),
+ GITHUB_CLIENT_ID: requiredAuthEnabledForProduction(),
+ GITHUB_CLIENT_SECRET: requiredAuthEnabledForProduction(),
+ DISCORD_CLIENT_ID: requiredAuthEnabledForProduction(),
+ DISCORD_CLIENT_SECRET: requiredAuthEnabledForProduction(),
STRIPE_SECRET_KEY: z.string().optional(),
STRIPE_WEBHOOK_SECRET: z.string().optional(),
@@ -56,7 +61,7 @@ export const serverEnv = {
GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET,
- DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID,
+ DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID,
DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET,
STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
@@ -70,14 +75,17 @@ export const serverEnv = {
* To expose them to the client, prefix them with `NEXT_PUBLIC_`.
*/
export const clientSchema = z.object({
- // NEXT_PUBLIC_CLIENTVAR: z.string(),
+ // NEXT_PUBLIC_CLIENTVAR: z.string(),
NEXT_PUBLIC_VERCEL_ENV: z.enum(["production", "preview", "development"]),
- NEXT_PUBLIC_STRIPE_DONATION_ENABLED: z.string().transform(str => str ==='true').optional(),
+ NEXT_PUBLIC_STRIPE_DONATION_ENABLED: z
+ .string()
+ .transform((str) => str === "true")
+ .optional(),
NEXT_PUBLIC_FF_AUTH_ENABLED: stringToBoolean(),
NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().optional(),
NEXT_PUBLIC_FF_SUB_ENABLED: stringToBoolean(),
NEXT_PUBLIC_FF_MOCK_MODE_ENABLED: stringToBoolean(),
- NEXT_PUBLIC_VERCEL_URL: z.string().optional()
+ NEXT_PUBLIC_VERCEL_URL: z.string().optional(),
});
/**
@@ -88,10 +96,14 @@ export const clientSchema = z.object({
*/
export const clientEnv = {
NEXT_PUBLIC_VERCEL_ENV: process.env.NEXT_PUBLIC_VERCEL_ENV ?? "development",
- NEXT_PUBLIC_STRIPE_DONATION_ENABLED: process.env.NEXT_PUBLIC_STRIPE_DONATION_ENABLED,
+ NEXT_PUBLIC_STRIPE_DONATION_ENABLED:
+ process.env.NEXT_PUBLIC_STRIPE_DONATION_ENABLED,
NEXT_PUBLIC_FF_AUTH_ENABLED: process.env.NEXT_PUBLIC_FF_AUTH_ENABLED,
- NEXT_PUBLIC_VERCEL_URL: process.env.NEXT_PUBLIC_VERCEL_URL ?? "http://localhost:3000",
- NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY,
+ NEXT_PUBLIC_VERCEL_URL:
+ process.env.NEXT_PUBLIC_VERCEL_URL ?? "http://localhost:3000",
+ NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY:
+ process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY,
NEXT_PUBLIC_FF_SUB_ENABLED: process.env.NEXT_PUBLIC_FF_SUB_ENABLED,
- NEXT_PUBLIC_FF_MOCK_MODE_ENABLED: process.env.NEXT_PUBLIC_FF_MOCK_MODE_ENABLED,
+ NEXT_PUBLIC_FF_MOCK_MODE_ENABLED:
+ process.env.NEXT_PUBLIC_FF_MOCK_MODE_ENABLED,
};
From 8aa740b13e977c35c4a742fd7057df15f55171e2 Mon Sep 17 00:00:00 2001
From: Dogtiti <499960698@qq.com>
Date: Wed, 19 Apr 2023 22:43:56 +0800
Subject: [PATCH 4/6] fix: image size
---
src/components/KnowlegePlanetDialog.tsx | 5 ++---
src/components/QQDialog.tsx | 5 ++---
src/components/WeChatDialog.tsx | 5 ++---
src/components/WeChatPayDialog.tsx | 5 ++---
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/components/KnowlegePlanetDialog.tsx b/src/components/KnowlegePlanetDialog.tsx
index 0dbbf83f..37f2489f 100644
--- a/src/components/KnowlegePlanetDialog.tsx
+++ b/src/components/KnowlegePlanetDialog.tsx
@@ -21,13 +21,12 @@ export default function KnowlegePlanetDialog({
return (
+
@@ -162,26 +180,31 @@ const MacWindowHeader = () => {
-
-
-
+ props.onSave?.("db")}
+ icon={ saveElementAsImage(messageListId)}
+ icon={
-
+ copyElementText(messageListId)}
+ icon={
);
};
@@ -259,9 +282,8 @@ const ChatMessage = ({ message }: { message: Message }) => {
const DonationMessage = ({ showWeChatPay }: { showWeChatPay: () => void }) => {
const { t } = useTranslation(["chat", "common"]);
-
return (
- {
left={
<>
saveElementAsImage(messageListId)}
- >
-
- {t("common:save")}
-
+ {props.title}
+
+ {props.onSave && (
+ copyElementText(messageListId)}
- >
-
- {t("common:copy")}
-
+
💝️ Help support the advancement of AutoGPT Next Web. 💝
Please @@ -308,11 +330,5 @@ const getMessagePrefix = (message: Message) => { } }; -export interface Message { - type: "goal" | "thinking" | "task" | "action" | "system"; - info?: string; - value: string; -} - export default ChatWindow; export { ChatMessage }; diff --git a/src/components/Dialog.tsx b/src/components/Dialog.tsx index 2a0ec227..aab9a371 100644 --- a/src/components/Dialog.tsx +++ b/src/components/Dialog.tsx @@ -16,49 +16,46 @@ export default function Dialog({ footerButton?: React.ReactNode; }) { const { t } = useTranslation(); + if (!isShown) { + return <>{null}; + } return ( - <> - {isShown ? ( - <> -
@@ -179,8 +244,9 @@ interface DrawerItemProps
icon: React.ReactNode;
text: string;
border?: boolean;
- onClick?: () => void;
+ onClick?: () => any;
className?: string;
+ small?: boolean;
}
const DrawerItem = (props: DrawerItemProps) => {
@@ -232,4 +298,40 @@ const AuthItem: React.FC<{
return 
+ );
+ }
+
+ return (
+ {
+ if (!session?.user) {
+ void (await signIn());
+ }
+
+ if (session?.user.subscriptionId) {
+ void manage();
+ } else {
+ void sub();
+ }
+ }}
+ />
+ );
+};
+
export default Drawer;
diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index aa1b5990..105d4050 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -2,39 +2,53 @@ import React from "react";
import Label from "./Label";
import clsx from "clsx";
import Combobox from "./Combobox";
-import isArrayOfType from "../utils/helpers";
+import { isArrayOfType } from "../utils/helpers";
+import type { toolTipProperties } from "./types";
interface InputProps {
left?: React.ReactNode;
- value: string;
+ value: string | number;
onChange: (e: React.ChangeEvent) => void;
placeholder?: string;
disabled?: boolean;
setValue?: (value: string) => void;
type?: string;
attributes?: { [key: string]: string | number | string[] }; // attributes specific to input type
+ toolTipProperties?: toolTipProperties;
+ inputRef?: React.RefObject;
+ onKeyDown?: (e: React.KeyboardEvent) => void;
}
-const Input = ({
- placeholder,
- left,
- value,
- type,
- onChange,
- setValue,
- disabled,
- attributes,
-}: InputProps) => {
+const Input = (props: InputProps) => {
+ const {
+ placeholder,
+ left,
+ value,
+ type,
+ onChange,
+ setValue,
+ disabled,
+ attributes,
+ inputRef,
+ toolTipProperties,
+ onKeyDown,
+ } = props;
const isTypeCombobox = () => {
return type === "combobox";
};
+ const isTypeRange = () => {
+ return type === "range";
+ };
+
let inputElement;
const options = attributes?.options;
+
if (
isTypeCombobox() &&
isArrayOfType(options, "string") &&
- setValue !== undefined
+ setValue !== undefined &&
+ typeof value === "string"
) {
inputElement = (
(customApiKey);
+ const {
+ customApiKey,
+ setCustomApiKey,
+ customModelName,
+ setCustomModelName,
+ customTemperature,
+ setCustomTemperature,
+ customMaxLoops,
+ setCustomMaxLoops,
+ } = reactModelStates;
const { t } = useTranslation(["settings", "common"]);
+
+ const [key, setKey] = React.useState(customApiKey);
+
const handleClose = () => {
setKey(customApiKey);
close();
};
+ function is_valid_key(key: string) {
+ const pattern = /^sk-[a-zA-Z0-9]{48}$/;
+ return pattern.test(key);
+ }
+
const handleSave = () => {
- setCustomApiKey(key);
- close();
+ if (is_valid_key(key)) {
+ setCustomApiKey(key);
+ close();
+ } else {
+ alert(
+ "key is invalid, please ensure that you have set up billing in your OpenAI account"
+ );
+ }
};
+ React.useEffect(() => {
+ setCustomMaxLoops(
+ !key ? DEFAULT_MAX_LOOPS_FREE : DEFAULT_MAX_LOOPS_CUSTOM_API_KEY
+ );
+
+ return () => {
+ setCustomMaxLoops(DEFAULT_MAX_LOOPS_FREE);
+ };
+ }, [key, setCustomMaxLoops]);
+
+ const advancedSettings = (
+ <>
+
+
+ +
-
+
{
+ setHasSaved(true);
+ agentUtils.saveAgent({
+ goal: goalInput,
+ name: name,
+ tasks: messages,
+ });
+ }
+ : undefined
+ }
+ scrollToBottom
showWeChatPay={() => setShowWeChatPayDialog(true)}
/>
+ {tasks.length > 0 &&
- ;
+ executeTaskAgent: (
+ modelSettings: ModelSettings,
+ goal: string,
+ task: string
+ ) => Promise;
+ createTasksAgent: (
+ modelSettings: ModelSettings,
+ goal: string,
+ tasks: string[],
+ lastTask: string,
+ result: string,
+ completedTasks: string[] | undefined
+ ) => Promise;
}
+
+const OpenAIAgentService: AgentService = {
+ startGoalAgent: startGoalAgent,
+ executeTaskAgent: executeTaskAgent,
+ createTasksAgent: createTasksAgent,
+};
+
+const MockAgentService: AgentService = {
+ startGoalAgent: async (modelSettings, goal) => {
+ return await new Promise((resolve) => resolve(["Task 1"]));
+ },
+
+ createTasksAgent: async (
+ modelSettings: ModelSettings,
+ goal: string,
+ tasks: string[],
+ lastTask: string,
+ result: string,
+ completedTasks: string[] | undefined
+ ) => {
+ return await new Promise((resolve) => resolve(["Task 4"]));
+ },
+
+ executeTaskAgent: async (
+ modelSettings: ModelSettings,
+ goal: string,
+ task: string
+ ) => {
+ return await new Promise((resolve) => resolve("Result: " + task));
+ },
+};
+
+export default env.NEXT_PUBLIC_FF_MOCK_MODE_ENABLED
+ ? MockAgentService
+ : OpenAIAgentService;
diff --git a/src/styles/globals.css b/src/styles/globals.css
index a29a0715..f303a0cf 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -31,6 +31,10 @@ pre {
@apply overflow-auto rounded-lg;
}
+.window-heights {
+ @apply h-[14em] overflow-y-auto overflow-x-hidden sm-h:h-[17em] md-h:h-[22em] lg-h:h-[30em];
+}
+
table {
@apply w-full rounded-lg text-white;
background-color: #0d1117;
diff --git a/src/types/agentTypes.ts b/src/types/agentTypes.ts
new file mode 100644
index 00000000..5ba6864e
--- /dev/null
+++ b/src/types/agentTypes.ts
@@ -0,0 +1,9 @@
+import { z } from "zod";
+
+export const messageParser = z.object({
+ type: z.enum(["goal", "thinking", "task", "action", "system"]),
+ info: z.string().optional(),
+ value: z.string(),
+});
+
+export type Message = z.infer;
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 9169fbda..b83f79f3 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -1,3 +1,7 @@
export const GPT_35_TURBO = "gpt-3.5-turbo";
+export const GPT_4 = "gpt-4";
+export const GPT_MODEL_NAMES = [GPT_35_TURBO, GPT_4];
-export const GPT_MODEL_NAMES = [GPT_35_TURBO, "gpt-4", "text-davinci-003"];
+export const DEFAULT_MAX_LOOPS_FREE = 3;
+export const DEFAULT_MAX_LOOPS_PAID = 16;
+export const DEFAULT_MAX_LOOPS_CUSTOM_API_KEY = 50;
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index 40859b57..4ff9b75e 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -1,7 +1,7 @@
type Constructor = new (...args: unknown[]) => T;
/* Check whether array is of the specified type */
-const isArrayOfType = (
+export const isArrayOfType = (
arr: unknown[] | unknown,
type: Constructor | string
): arr is T[] => {
@@ -17,4 +17,44 @@ const isArrayOfType = (
);
};
-export default isArrayOfType;
+export const extractTasks = (
+ text: string,
+ completedTasks: string[]
+): string[] => {
+ return extractArray(text)
+ .filter(realTasksFilter)
+ .filter((task) => !(completedTasks || []).includes(task));
+};
+
+export const extractArray = (inputStr: string): string[] => {
+ // Match an outer array of strings (including nested arrays)
+ const regex = /(\[(?:\s*"(?:[^"\\]|\\.)*"\s*,?)+\s*\])/;
+ const match = inputStr.match(regex);
+
+ if (match && match[0]) {
+ try {
+ // Parse the matched string to get the array
+ return JSON.parse(match[0]) as string[];
+ } catch (error) {
+ console.error("Error parsing the matched array:", error);
+ }
+ }
+
+ console.warn("Error, could not extract array from inputString:", inputStr);
+ return [];
+};
+
+// Model will return tasks such as "No tasks added". We should filter these
+export const realTasksFilter = (input: string): boolean => {
+ const noTaskRegex =
+ /^No( (new|further|additional|extra|other))? tasks? (is )?(required|needed|added|created|inputted).*$/i;
+ const taskCompleteRegex =
+ /^Task (complete|completed|finished|done|over|success).*/i;
+ const doNothingRegex = /^(\s*|Do nothing(\s.*)?)$/i;
+
+ return (
+ !noTaskRegex.test(input) &&
+ !taskCompleteRegex.test(input) &&
+ !doNothingRegex.test(input)
+ );
+};
diff --git a/src/utils/prompts.ts b/src/utils/prompts.ts
new file mode 100644
index 00000000..4633e140
--- /dev/null
+++ b/src/utils/prompts.ts
@@ -0,0 +1,34 @@
+import { OpenAI } from "langchain/llms/openai";
+import { PromptTemplate } from "langchain/prompts";
+import type { ModelSettings } from "./types";
+import { GPT_35_TURBO } from "./constants";
+
+export const createModel = (settings: ModelSettings) =>
+ new OpenAI({
+ openAIApiKey:
+ settings.customApiKey === ""
+ ? process.env.OPENAI_API_KEY
+ : settings.customApiKey,
+ temperature: settings.customTemperature || 0.9,
+ modelName:
+ settings.customModelName === "" ? GPT_35_TURBO : settings.customModelName,
+ maxTokens: 400,
+ });
+
+export const startGoalPrompt = new PromptTemplate({
+ template:
+ "You are an autonomous task creation AI called AgentGPT. You have the following objective `{goal}`. Create a list of zero to three tasks to be completed by your AI system such that your goal is more closely reached or completely reached. Return the response as an array of strings that can be used in JSON.parse()",
+ inputVariables: ["goal"],
+});
+
+export const executeTaskPrompt = new PromptTemplate({
+ template:
+ "You are an autonomous task execution AI called AgentGPT. You have the following objective `{goal}`. You have the following tasks `{task}`. Execute the task and return the response as a string.",
+ inputVariables: ["goal", "task"],
+});
+
+export const createTasksPrompt = new PromptTemplate({
+ template:
+ "You are an AI task creation agent. You have the following objective `{goal}`. You have the following incomplete tasks `{tasks}` and have just executed the following task `{lastTask}` and received the following result `{result}`. Based on this, create a new task to be completed by your AI system ONLY IF NEEDED such that your goal is more closely reached or completely reached. Return the response as an array of strings that can be used in JSON.parse() and NOTHING ELSE",
+ inputVariables: ["goal", "tasks", "lastTask", "result"],
+});
diff --git a/src/utils/stripe-utils.ts b/src/utils/stripe-utils.ts
new file mode 100644
index 00000000..061ec504
--- /dev/null
+++ b/src/utils/stripe-utils.ts
@@ -0,0 +1,30 @@
+import type Stripe from "stripe";
+
+export const getCustomerId = (
+ customer: string | Stripe.Customer | Stripe.DeletedCustomer | null
+) => {
+ if (!customer) throw new Error("No customer found");
+
+ switch (typeof customer) {
+ case "string":
+ return customer;
+ case "object":
+ return customer.id;
+ default:
+ throw new Error("Unexpected customer type");
+ }
+};
+
+export const getCustomerEmail = async (
+ stripe: Stripe,
+ customer: string | Stripe.Customer | Stripe.DeletedCustomer | null
+) => {
+ if (!customer) throw new Error("No customer found");
+
+ let c = customer;
+ if (typeof customer === "string") {
+ c = await stripe.customers.retrieve(customer);
+ }
+
+ return (c as Stripe.Customer).email ?? "";
+};
diff --git a/src/utils/types.ts b/src/utils/types.ts
index e8be2ae6..c15c5296 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -1,4 +1,6 @@
export type ModelSettings = {
customApiKey: string;
customModelName: string;
+ customTemperature: number;
+ customMaxLoops: number;
};
From 22ee409865faef24ce943597e86d6a2275a826ff Mon Sep 17 00:00:00 2001
From: Dogtiti <499960698@qq.com>
Date: Wed, 19 Apr 2023 22:12:27 +0800
Subject: [PATCH 2/6] docs: update i18n
---
package-lock.json | 180 ++++++++++++++++++++++++++++++
public/locales/en/chat.json | 14 ++-
public/locales/en/common.json | 8 +-
public/locales/en/settings.json | 10 +-
public/locales/zh/chat.json | 8 +-
public/locales/zh/common.json | 7 +-
public/locales/zh/settings.json | 10 +-
src/components/AutonomousAgent.ts | 9 +-
src/components/ChatWindow.tsx | 10 +-
src/components/Drawer.tsx | 42 +------
src/components/SettingsDialog.tsx | 74 ++++++------
src/pages/index.tsx | 8 +-
12 files changed, 272 insertions(+), 108 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 56cafe46..1fdfca87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1971,6 +1971,186 @@
"glob": "7.1.7"
}
},
+ "node_modules/@next/swc-android-arm-eabi": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.6.tgz",
+ "integrity": "sha512-F3/6Z8LH/pGlPzR1AcjPFxx35mPqjE5xZcf+IL+KgbW9tMkp7CYi1y7qKrEWU7W4AumxX/8OINnDQWLiwLasLQ==",
+ "cpu": [
+ "arm"
+ ],
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-android-arm64": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-android-arm64/-/swc-android-arm64-13.1.6.tgz",
+ "integrity": "sha512-cMwQjnB8vrYkWyK/H0Rf2c2pKIH4RGjpKUDvbjVAit6SbwPDpmaijLio0LWFV3/tOnY6kvzbL62lndVA0mkYpw==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-darwin-arm64": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.6.tgz",
+ "integrity": "sha512-KKRQH4DDE4kONXCvFMNBZGDb499Hs+xcFAwvj+rfSUssIDrZOlyfJNy55rH5t2Qxed1e4K80KEJgsxKQN1/fyw==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-darwin-x64": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.6.tgz",
+ "integrity": "sha512-/uOky5PaZDoaU99ohjtNcDTJ6ks/gZ5ykTQDvNZDjIoCxFe3+t06bxsTPY6tAO6uEAw5f6vVFX5H5KLwhrkZCA==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-freebsd-x64": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.6.tgz",
+ "integrity": "sha512-qaEALZeV7to6weSXk3Br80wtFQ7cFTpos/q+m9XVRFggu+8Ib895XhMWdJBzew6aaOcMvYR6KQ6JmHA2/eMzWw==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-linux-arm-gnueabihf": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.6.tgz",
+ "integrity": "sha512-OybkbC58A1wJ+JrJSOjGDvZzrVEQA4sprJejGqMwiZyLqhr9Eo8FXF0y6HL+m1CPCpPhXEHz/2xKoYsl16kNqw==",
+ "cpu": [
+ "arm"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-linux-arm64-gnu": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.6.tgz",
+ "integrity": "sha512-yCH+yDr7/4FDuWv6+GiYrPI9kcTAO3y48UmaIbrKy8ZJpi7RehJe3vIBRUmLrLaNDH3rY1rwoHi471NvR5J5NQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-linux-arm64-musl": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.6.tgz",
+ "integrity": "sha512-ECagB8LGX25P9Mrmlc7Q/TQBb9rGScxHbv/kLqqIWs2fIXy6Y/EiBBiM72NTwuXUFCNrWR4sjUPSooVBJJ3ESQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-linux-x64-gnu": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.6.tgz",
+ "integrity": "sha512-GT5w2mruk90V/I5g6ScuueE7fqj/d8Bui2qxdw6lFxmuTgMeol5rnzAv4uAoVQgClOUO/MULilzlODg9Ib3Y4Q==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-linux-x64-musl": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.6.tgz",
+ "integrity": "sha512-keFD6KvwOPzmat4TCnlnuxJCQepPN+8j3Nw876FtULxo8005Y9Ghcl7ACcR8GoiKoddAq8gxNBrpjoxjQRHeAQ==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-win32-arm64-msvc": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.6.tgz",
+ "integrity": "sha512-OwertslIiGQluFvHyRDzBCIB07qJjqabAmINlXUYt7/sY7Q7QPE8xVi5beBxX/rxTGPIbtyIe3faBE6Z2KywhQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@next/swc-win32-ia32-msvc": {
+ "version": "13.1.6",
+ "resolved": "https://registry.npmmirror.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.6.tgz",
+ "integrity": "sha512-g8zowiuP8FxUR9zslPmlju7qYbs2XBtTLVSxVikPtUDQedhcls39uKYLvOOd1JZg0ehyhopobRoH1q+MHlIN/w==",
+ "cpu": [
+ "ia32"
+ ],
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
"node_modules/@next/swc-win32-x64-msvc": {
"version": "13.1.6",
"resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.6.tgz",
diff --git a/public/locales/en/chat.json b/public/locales/en/chat.json
index 63571870..27d6b516 100644
--- a/public/locales/en/chat.json
+++ b/public/locales/en/chat.json
@@ -5,16 +5,18 @@
"donate-now": "Donate Now",
"restart": "Restart if this takes more than 30 seconds",
"errors": {
- "run-with-filled-customApiKey": "ERROR retrieving initial tasks array. Make sure your API key is not the free tier, make your goal more clear, or revise your goal such that it is within our model's policies to run. Shutting Down.",
- "run-with-empty-customApiKey": "ERROR retrieving initial tasks array. Retry, make your goal more clear, or revise your goal such that it is within our model's policies to run. Shutting Down.",
"adding-additional-task": "ERROR adding additional task(s). It might have been against our model's policies to run them. Continuing.",
"loop-with-filled-customApiKey": "This agent has been running for too long (50 Loops). To save your wallet this agent is shutting down. In the future, the number of iterations will be configurable.",
- "loop-with-empty-customApiKey": "We're sorry, because this is a demo, we cannot have our agents running for too long. Note, if you desire longer runs, please provide your own API key in Settings. Shutting down."
+ "loop-with-empty-customApiKey": "We're sorry, because this is a demo, we cannot have our agents running for too long. Note, if you desire longer runs, please provide your own API key in Settings. Shutting down.",
+ "accessing-apis": "ERROR accessing OpenAI APIs. Please check your API key or try again later",
+ "accessing-using-apis": "ERROR using your OpenAI API key. You've exceeded your current quota, please check your plan and billing details.",
+ "accessing-gtp4": "ERROR your API key does not have GPT-4 access. You must first join OpenAI's wait-list. (This is different from ChatGPT Plus)",
+ "initial-tasks": "ERROR retrieving initial tasks array. Retry, make your goal more clear, or revise your goal such that it is within our model's policies to run. Shutting Down."
},
"all-tasks-completed": "All tasks completed. Shutting down.",
"manually-shutdown": "The agent has been manually shutdown.",
"task-marked-as-complete": "Task marked as complete!",
- "new-goal":"Embarking on a new goal:",
- "added-task":"Added task:",
- "thinking":"Thinking..."
+ "new-goal": "Embarking on a new goal:",
+ "added-task": "Added task:",
+ "thinking": "Thinking..."
}
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index fc3fa48f..34acde9a 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -3,7 +3,9 @@
"help": "Help",
"settings": "Settings",
"new-agent": "New Agent",
- "restart-agent": "Click the above button to restart. In the future, this will be a list of your deployed agents!",
+ "sign-in": "Sign in to be able to save agents and manage your account!",
+ "create-agent": "You need to create and save your first agent before anything shows up here!",
+ "my-agents": " My Agent(s)",
"close": "Close",
"weChat": "WeChat",
"weChatPay": "WeChatPay",
@@ -20,5 +22,7 @@
"stop-agent": "Stop agent",
"current-tasks": "Current tasks",
"coming-soon": " Coming Soon!",
- "back": "Back"
+ "back": "Back",
+ "image":"Image"
+
}
diff --git a/public/locales/en/settings.json b/public/locales/en/settings.json
index 45b8828b..93856aa1 100644
--- a/public/locales/en/settings.json
+++ b/public/locales/en/settings.json
@@ -1,8 +1,14 @@
{
"settings": "Settings",
"usage": "Here you can add your OpenAI API key. This will require you to pay for your own OpenAI usage but give you greater access to AgentGPT! You can additionally select any model OpenAI offers.",
- "notice-access": "To use GPT-4, your API Key needs to have the correct access.",
"model": "Model:",
"key": "Key:",
- "note-with-link": "<0>NOTE: To get a key, sign up for an OpenAI account and visit the following <1>link. This key is only used in the current browser session."
+ "gpt4-notice": "<0> To use the GPT-4 model, you need to also provide the API key for GPT-4. You can request for it <1>here。(ChatGPT Plus subscription will not work)",
+ "invalid-key": "key is invalid, please ensure that you have set up billing in your OpenAI account",
+ "advanceds-ettings": "Advanced Settings",
+ "temp": "Temp:",
+ "temp-tips": "Higher values will make the output more random, while lower values make the output more focused and deterministic.",
+ "loop": "Loop #:",
+ "loop-tips": "Controls the maximum number of loops that the agent will run (higher value will make more API calls).",
+ "api-key-notice": "<0>NOTE: To get a key, sign up for an OpenAI account and visit the following <1>link.,This key is only used in the current browser session"
}
diff --git a/public/locales/zh/chat.json b/public/locales/zh/chat.json
index 331b0e92..259af2b5 100644
--- a/public/locales/zh/chat.json
+++ b/public/locales/zh/chat.json
@@ -5,11 +5,13 @@
"donate-now": "现在捐助",
"restart": "如果这需要超过 30 秒，请重新开始。",
"errors": {
- "run-with-filled-customApiKey": "获取初始任务数组时出现错误。请确认你的 API 密钥不是免费版，让你的目标更加明确，或者修正你的目标使其符合我们模型的政策要求。正在关闭...",
- "run-with-empty-customApiKey": "无法获取初始任务数组。请重试，让你的目标更加明确，或者修正你的目标使其符合我们模型的政策要求。正在关闭...",
"adding-additional-task": "添加额外的任务时发生了错误。可能是因为这些任务违反了我们模型的策略。不过，我们还是继续处理其他任务。",
"loop-with-filled-customApiKey": "该代理程序运行时间过长 (50个回合)。为了节省您的费用，该代理程序将关闭。在未来，迭代次数将是可配置的。",
- "loop-with-empty-customApiKey": "非常抱歉，由于这只是一个演示，我们的代理程序不能运行太长时间。请注意，如果您需要更长的运行时间，请在设置中提供自己的API密钥。正在关闭..."
+ "loop-with-empty-customApiKey": "非常抱歉，由于这只是一个演示，我们的代理程序不能运行太长时间。请注意，如果您需要更长的运行时间，请在设置中提供自己的API密钥。正在关闭...",
+ "accessing-apis": "访问OpenAI API出错。请检查您的API密钥或稍后重试。",
+ "accessing-using-apis": "使用OpenAI API密钥出错。您已超出当前限额，请检查您的计划和账单详情。",
+ "accessing-gtp4": "您的API密钥没有GPT-4访问权限。您必须先加入OpenAI的候补名单。（这与ChatGPT Plus不同）",
+ "initial-tasks": "无法检索初始任务数组。请重试，更清晰地表达您的目标，或修订您的目标，使其符合我们模型运行的政策。正在关闭。"
},
"all-tasks-completed": "所有任务已完成。正在关闭...",
"manually-shutdown": "代理已被手动关闭。",
diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json
index 4212b41b..d49b2aa7 100644
--- a/public/locales/zh/common.json
+++ b/public/locales/zh/common.json
@@ -3,7 +3,9 @@
"help": "帮助",
"settings": "设置",
"new-agent": "新的代理",
- "restart-agent": "点击上方按钮以重新启动。在未来，这将是您已部署代理程序的列表！",
+ "sign-in": "请登录以保存代理并管理您的帐户！",
+ "create-agent": "在此处显示任何内容之前，您需要创建并保存您的第一个代理！",
+ "my-agents": " 我的代理",
"close": "关闭",
"weChat": "微信",
"weChatPay": "微信支付",
@@ -20,5 +22,6 @@
"stop-agent": "停止代理程序",
"current-tasks": "当前任务",
"coming-soon": "即将到来！",
- "back": "返回"
+ "back": "返回",
+ "image":"图片"
}
diff --git a/public/locales/zh/settings.json b/public/locales/zh/settings.json
index 24184dd7..d288b138 100644
--- a/public/locales/zh/settings.json
+++ b/public/locales/zh/settings.json
@@ -1,8 +1,14 @@
{
"settings": "设置",
"usage": "在这里您可以添加您的 OpenAI API Key。这将要求您为自己的 OpenAI 使用付费，但是将为您提供更多的 AgentGPT 访问权限！您还可以选择任何 OpenAI 提供的模型。",
- "notice-access": "要使用 GPT-4 ，您的 API Key 需要具有正确的访问权限。",
"model": "模型：",
"key": "秘钥：",
- "note-with-link": "<0>注意：若要获取密钥，请注册 OpenAI 账户并访问以下<1>链接。此密钥仅在当前浏览器会话中使用。"
+ "gpt4-notice": "<0>为了使用GPT-4模型，您还需要提供GPT-4的API密钥。您可以在这里申请<1>API密钥。（ChatGPT Plus的订阅无法使用)",
+ "invalid-key": "无效的key，请确保您已经在OpenAI账户中付费了。",
+ "advanceds-ettings": "高级设置",
+ "temp": "随机性：",
+ "temp-tips": "较高的值会使输出变得更随机，而较低的值会使输出更加聚焦和确定性。",
+ "loop": "循环 #：",
+ "loop-tips": "控制代理程序将运行的最大循环次数（较高的值将产生更多的 API 调用）。",
+ "api-key-notice": "<0>注意：要获取密钥，请注册OpenAI账户并访问以下<1>链接。此密钥仅在当前浏览器会话中使用。"
}
diff --git a/src/components/AutonomousAgent.ts b/src/components/AutonomousAgent.ts
index f2e0b65b..614c9321 100644
--- a/src/components/AutonomousAgent.ts
+++ b/src/components/AutonomousAgent.ts
@@ -296,18 +296,17 @@ const testConnection = async (modelSettings: ModelSettings) => {
};
const getMessageFromError = (e: unknown) => {
- let message =
- "ERROR accessing OpenAI APIs. Please check your API key or try again later";
+ let message = "errors.accessing-apis";
if (axios.isAxiosError(e)) {
const axiosError = e;
if (axiosError.response?.status === 429) {
- message = `ERROR using your OpenAI API key. You've exceeded your current quota, please check your plan and billing details.`;
+ message = "errors.accessing-using-apis";
}
if (axiosError.response?.status === 404) {
- message = `ERROR your API key does not have GPT-4 access. You must first join OpenAI's wait-list. (This is different from ChatGPT Plus)`;
+ message = "errors.accessing-gtp4";
}
} else {
- message = `ERROR retrieving initial tasks array. Retry, make your goal more clear, or revise your goal such that it is within our model's policies to run. Shutting Down.`;
+ message = "errors.initial-tasks";
}
return message;
};
diff --git a/src/components/ChatWindow.tsx b/src/components/ChatWindow.tsx
index f4eda0fe..f1037faa 100644
--- a/src/components/ChatWindow.tsx
+++ b/src/components/ChatWindow.tsx
@@ -33,6 +33,7 @@ interface ChatWindowProps extends HeaderProps {
showDonation: boolean;
fullscreen?: boolean;
scrollToBottom?: boolean;
+ showWeChatPay: () => void;
}
const messageListId = "chat-window-message-list";
@@ -131,10 +132,11 @@ interface HeaderProps {
title?: string | ReactNode;
messages: Message[];
onSave?: (format: string) => void;
- showWeChatPay: () => void;
}
const MacWindowHeader = (props: HeaderProps) => {
+ const { t } = useTranslation(["chat", "common"]);
+
const saveElementAsImage = (elementId: string) => {
const element = document.getElementById(elementId);
if (!element) {
@@ -188,21 +190,21 @@ const MacWindowHeader = (props: HeaderProps) => {
delay={0.8}
onClick={() => props.onSave?.("db")}
icon={ saveElementAsImage(messageListId)}
icon={ copyElementText(messageListId)}
icon={
diff --git a/src/components/Drawer.tsx b/src/components/Drawer.tsx
index 2ef63f13..4ecbc1b3 100644
--- a/src/components/Drawer.tsx
+++ b/src/components/Drawer.tsx
@@ -103,7 +103,7 @@ const Drawer = ({
>
-
diff --git a/src/components/SettingsDialog.tsx b/src/components/SettingsDialog.tsx
index f96caa32..a703ebf1 100644
--- a/src/components/SettingsDialog.tsx
+++ b/src/components/SettingsDialog.tsx
@@ -57,9 +57,7 @@ export default function SettingsDialog({
setCustomApiKey(key);
close();
} else {
- alert(
- "key is invalid, please ensure that you have set up billing in your OpenAI account"
- );
+ alert(t("invalid-key"));
}
};
@@ -79,15 +77,14 @@ export default function SettingsDialog({
left={
<>
Please @@ -308,11 +330,5 @@ const getMessagePrefix = (message: Message) => { } }; -export interface Message { - type: "goal" | "thinking" | "task" | "action" | "system"; - info?: string; - value: string; -} - export default ChatWindow; export { ChatMessage }; diff --git a/src/components/Dialog.tsx b/src/components/Dialog.tsx index 2a0ec227..aab9a371 100644 --- a/src/components/Dialog.tsx +++ b/src/components/Dialog.tsx @@ -16,49 +16,46 @@ export default function Dialog({ footerButton?: React.ReactNode; }) { const { t } = useTranslation(); + if (!isShown) { + return <>{null}; + } return ( - <> - {isShown ? ( - <> -
-
@@ -165,6 +189,47 @@ const Drawer = ({
text="language"
onClick={onToggleLanguageClick}
/>
+ {env.NEXT_PUBLIC_FF_SUB_ENABLED ||
+ (router.query.pro && (
+
+
- {/*content*/}
-
+ e.stopPropagation()} // Avoid closing the modal
- >
- {/*header*/}
-
-
-
- {/*body*/}
- {header}
- -
- {children}
-
- {/*footer*/}
-
-
- {footerButton}
-
-
+
);
}
diff --git a/src/components/DottedGridBackground.tsx b/src/components/DottedGridBackground.tsx
index c0ca6b70..659d8d1b 100644
--- a/src/components/DottedGridBackground.tsx
+++ b/src/components/DottedGridBackground.tsx
@@ -1,4 +1,5 @@
import React from "react";
+import clsx from "clsx";
interface DottedGridBackgroundProps {
children: React.ReactNode;
@@ -9,12 +10,7 @@ const DottedGridBackground = ({
children,
className,
}: DottedGridBackgroundProps) => {
- return (
-
+ {/*content*/}
+
+ e.stopPropagation()} // Avoid closing the modal
+ >
+ {/*header*/}
+
+
+
-
- ) : null}
-
+ {/*body*/}
+ {header}
+
+ {children}
+
+ {/*footer*/}
+
+
+ {footerButton}
+
+
-
- {children}
-
- );
+ return {children}
;
};
export default DottedGridBackground;
diff --git a/src/components/Drawer.tsx b/src/components/Drawer.tsx
index f30013dc..2ef63f13 100644
--- a/src/components/Drawer.tsx
+++ b/src/components/Drawer.tsx
@@ -6,6 +6,7 @@ import {
FaGithub,
FaQuestionCircle,
FaRobot,
+ FaRocket,
FaSignInAlt,
FaSignOutAlt,
FaTwitter,
@@ -22,6 +23,8 @@ import type { Session } from "next-auth";
import { env } from "../env/client.mjs";
import { useTranslation } from "next-i18next";
import { useRouter } from "next/router";
+import { api } from "../utils/api";
+import { signIn } from "next-auth/react";
const Drawer = ({
showHelp,
@@ -49,7 +52,24 @@ const Drawer = ({
// });
// const router = useRouter();
//
- const userAgents = [];
+
+ const sub = api.account.subscribe.useMutation({
+ onSuccess: async (url) => {
+ if (!url) return;
+ await router.push(url);
+ },
+ });
+
+ const query = api.agent.getAll.useQuery(undefined, {
+ enabled: !!session?.user,
+ });
+
+ const manage = api.account.manage.useMutation({
+ onSuccess: async (url) => {
+ if (!url) return;
+ await router.push(url);
+ },
+ });
const toggleDrawer = () => {
setShowDrawer((prevState) => !prevState);
@@ -61,6 +81,7 @@ const Drawer = ({
locale: locale === "en" ? "zh" : "en",
});
};
+ const userAgents = query.data ?? [];
return (
<>
@@ -82,13 +103,7 @@ const Drawer = ({
>
-
- {/*{TODO: enable for crud}*/}
- -
- {/* {userAgents.map((agent, index) => (*/}
- {/*
{t("restart-agent")}
}
+ -
+ {userAgents.map((agent, index) => (
+
+ Sign in to be able to save agents and manage your account!
+
+ )}
+ {status === "authenticated" && userAgents.length === 0 && (
+
+ You need to create and save your first agent before anything
+ shows up here!
+
+ )}
+
+
- {left && }
+
+ {left}
+
+ }
+ style={{
+ container: `md:w-1/4`,
+ }}
+ sideOffset={0}
+ toolTipProperties={toolTipProperties}
+ >
);
};
diff --git a/src/components/SettingsDialog.tsx b/src/components/SettingsDialog.tsx
index 9b9c031f..f96caa32 100644
--- a/src/components/SettingsDialog.tsx
+++ b/src/components/SettingsDialog.tsx
@@ -1,48 +1,161 @@
import React from "react";
import Button from "./Button";
-import { FaKey, FaMicrochip } from "react-icons/fa";
+import {
+ FaKey,
+ FaMicrochip,
+ FaThermometerFull,
+ FaExclamationCircle,
+ FaSyncAlt,
+} from "react-icons/fa";
import Dialog from "./Dialog";
import Input from "./Input";
-import { GPT_MODEL_NAMES } from "../utils/constants";
+import {
+ GPT_MODEL_NAMES,
+ GPT_4,
+ DEFAULT_MAX_LOOPS_CUSTOM_API_KEY,
+ DEFAULT_MAX_LOOPS_FREE,
+} from "../utils/constants";
+import Accordion from "./Accordion";
+import type { reactModelStates } from "./types";
import { useTranslation, Trans } from "next-i18next";
export default function SettingsDialog({
show,
close,
- customApiKey,
- setCustomApiKey,
- customModelName,
- setCustomModelName,
+ reactModelStates,
}: {
show: boolean;
close: () => void;
- customApiKey: string;
- setCustomApiKey: (key: string) => void;
- customModelName: string;
- setCustomModelName: (key: string) => void;
+ reactModelStates: reactModelStates;
}) {
- const [key, setKey] = React.useState
+ {left && (
+
+ )}
{inputElement}
+ {isTypeRange() && (
+
);
};
diff --git a/src/components/Label.tsx b/src/components/Label.tsx
index 406e2c76..c7b6360c 100644
--- a/src/components/Label.tsx
+++ b/src/components/Label.tsx
@@ -1,14 +1,31 @@
import React from "react";
+import Tooltip from "./Tooltip";
+import type { toolTipProperties } from "./types";
interface LabelProps {
left?: React.ReactNode;
+ type?: string;
+ toolTipProperties?: toolTipProperties;
}
-const Label = ({ left }: LabelProps) => {
+const Label = ({ type, left, toolTipProperties }: LabelProps) => {
return (
- + {value} +
+ )}
- {left}
-
+ + +
-
-
-
-
- {tasks.map((task, index) => (
-
+
+
);
diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
new file mode 100644
index 00000000..3fbba3d8
--- /dev/null
+++ b/src/components/Tooltip.tsx
@@ -0,0 +1,41 @@
+import React from "react";
+import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+import type { toolTipProperties } from "./types";
+
+interface TooltipProps {
+ child: React.ReactNode;
+ toolTipProperties?: toolTipProperties;
+ style?: { [key: string]: string };
+ sideOffset: number;
+}
+
+const Tooltip = ({
+ child,
+ toolTipProperties = { message: "", disabled: true },
+ style = { container: "" },
+ sideOffset,
+}: TooltipProps) => {
+ const { message, disabled } = toolTipProperties;
+ return (
+
+
+ );
+};
+
+export default WindowButton;
diff --git a/src/components/motions/FadeIn.tsx b/src/components/motions/FadeIn.tsx
index a410c06d..ae61fe55 100644
--- a/src/components/motions/FadeIn.tsx
+++ b/src/components/motions/FadeIn.tsx
@@ -8,9 +8,9 @@ interface MotionProps extends PropsWithChildren {
const FadeIn = (props: MotionProps) => (
{props.children}
diff --git a/src/components/pdf/MyDocument.tsx b/src/components/pdf/MyDocument.tsx
new file mode 100644
index 00000000..4059f984
--- /dev/null
+++ b/src/components/pdf/MyDocument.tsx
@@ -0,0 +1,35 @@
+import React from "react";
+import { Document, Page, Text, StyleSheet, Font } from "@react-pdf/renderer";
+
+Font.register({
+ family: "Roboto",
+ src: "https://fonts.gstatic.com/s/roboto/v27/KFOmCnqEu92Fr1Mu4mxP.ttf",
+});
+
+const styles = StyleSheet.create({
+ page: {
+ flexDirection: "column",
+ backgroundColor: "#FFFFFF",
+ padding: 40,
+ },
+ section: {
+ fontSize: 12,
+ fontFamily: "Roboto",
+ marginBottom: 20,
+ lineHeight: 1.5,
+ },
+});
+
+interface MyDocumentProps {
+ content: string;
+}
+
+const MyDocument: React.FC = ({ content }) => (
+
+
+ {content}
+
+
+);
+
+export default MyDocument;
diff --git a/src/components/pdf/PDFButton.tsx b/src/components/pdf/PDFButton.tsx
new file mode 100644
index 00000000..4d944fbd
--- /dev/null
+++ b/src/components/pdf/PDFButton.tsx
@@ -0,0 +1,50 @@
+import WindowButton from "../WindowButton";
+import { FaFilePdf, FaRegFilePdf, FaSave } from "react-icons/fa";
+import { pdf } from "@react-pdf/renderer";
+import React from "react";
+import MyDocument from "./MyDocument";
+import type { Message } from "../../types/agentTypes";
+
+const PDFButton = ({ messages }: { messages: Message[] }) => {
+ const content = getContent(messages);
+
+ const downloadPDF = async () => {
+ const blob = await pdf( {
+ downloadPDF().catch(console.error);
+ }}
+ icon={>];
onAction?: () => void;
title: string;
description?: string;
+ className?: string;
};
const Toast = (props: Props) => {
const [open, setOpen] = props.model;
- const { t } = useTranslation();
return (
@@ -22,7 +21,6 @@ const Toast = (props: Props) => {
onOpenChange={setOpen}
className={clsx(
"fixed inset-x-4 bottom-4 z-50 w-auto rounded-2xl shadow-lg md:left-auto md:right-4 md:w-full md:max-w-sm",
- "bg-slate-900",
"radix-state-open:animate-toast-slide-in-bottom md:radix-state-open:animate-toast-slide-in-right",
"radix-state-closed:animate-toast-hide",
"radix-swipe-direction-right:radix-swipe-end:animate-toast-swipe-out-x",
@@ -30,13 +28,14 @@ const Toast = (props: Props) => {
"radix-swipe-direction-down:radix-swipe-end:animate-toast-swipe-out-y",
"radix-swipe-direction-down:translate-y-radix-toast-swipe-move-y",
"radix-swipe-cancel:translate-x-0 radix-swipe-cancel:duration-200 radix-swipe-cancel:ease-[ease]",
- "focus:outline-none focus-visible:ring focus-visible:ring-purple-500 focus-visible:ring-opacity-75"
+ "focus:outline-none focus-visible:ring focus-visible:ring-purple-500 focus-visible:ring-opacity-75",
+ props.className
)}
>
diff --git a/src/components/types/index.ts b/src/components/types/index.ts
new file mode 100644
index 00000000..0da11ae0
--- /dev/null
+++ b/src/components/types/index.ts
@@ -0,0 +1 @@
+export * from "./propTypes";
diff --git a/src/components/types/propTypes.ts b/src/components/types/propTypes.ts
new file mode 100644
index 00000000..ada874d4
--- /dev/null
+++ b/src/components/types/propTypes.ts
@@ -0,0 +1,15 @@
+export type toolTipProperties = {
+ message?: string;
+ disabled?: boolean;
+};
+
+export type reactModelStates = {
+ customApiKey: string;
+ setCustomApiKey: (key: string) => void;
+ customModelName: string;
+ setCustomModelName: (key: string) => void;
+ customTemperature: number;
+ setCustomTemperature: (temperature: number) => void;
+ customMaxLoops: number;
+ setCustomMaxLoops: (numberOfLoops: number) => void;
+};
diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index f35db1a9..a3026e76 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -5,6 +5,13 @@ const requiredForProduction = () => process.env.NODE_ENV === "production"
? z.string().min(1).trim()
: z.string().min(1).trim().optional()
+function stringToBoolean() {
+ return z.preprocess(
+ (str) => str === "true",
+ z.boolean(),
+ );
+}
+
/**
* Specify your server-side environment variables schema here.
* This way you can ensure the app isn't built with invalid env vars.
@@ -22,12 +29,16 @@ export const serverSchema = z.object({
),
OPENAI_API_KEY: z.string(),
-// GOOGLE_CLIENT_ID: requiredForProduction(),
-// GOOGLE_CLIENT_SECRET: requiredForProduction(),
-// GITHUB_CLIENT_ID: requiredForProduction(),
-// GITHUB_CLIENT_SECRET: requiredForProduction(),
-// DISCORD_CLIENT_ID: requiredForProduction(),
-// DISCORD_CLIENT_SECRET: requiredForProduction(),
+ GOOGLE_CLIENT_ID: requiredForProduction(),
+ GOOGLE_CLIENT_SECRET: requiredForProduction(),
+ GITHUB_CLIENT_ID: requiredForProduction(),
+ GITHUB_CLIENT_SECRET: requiredForProduction(),
+ DISCORD_CLIENT_ID: requiredForProduction(),
+ DISCORD_CLIENT_SECRET: requiredForProduction(),
+
+ STRIPE_SECRET_KEY: z.string().optional(),
+ STRIPE_WEBHOOK_SECRET: z.string().optional(),
+ STRIPE_SUBSCRIPTION_PRICE_ID: z.string().optional(),
});
/**
@@ -41,12 +52,16 @@ export const serverEnv = {
NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET,
NEXTAUTH_URL: process.env.NEXTAUTH_URL,
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
-// GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
-// GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
-// GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
-// GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET,
-// DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID,
-// DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET
+ GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
+ GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
+ GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
+ GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET,
+ DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID,
+ DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET,
+
+ STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
+ STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
+ STRIPE_SUBSCRIPTION_PRICE_ID: process.env.STRIPE_SUBSCRIPTION_PRICE_ID,
};
/**
@@ -56,9 +71,13 @@ export const serverEnv = {
*/
export const clientSchema = z.object({
// NEXT_PUBLIC_CLIENTVAR: z.string(),
- NEXT_PUBLIC_VERCEL_ENV: z.enum(["production", "preview", "development"]),
- NEXT_PUBLIC_STRIPE_DONATION_ENABLED: z.string().transform(str => str ==='true').optional(),
- NEXT_PUBLIC_FF_AUTH_ENABLED: z.string().transform(str => str ==='true').optional()
+ NEXT_PUBLIC_VERCEL_ENV: z.enum(["production", "preview", "development"]),
+ NEXT_PUBLIC_STRIPE_DONATION_ENABLED: z.string().transform(str => str ==='true').optional(),
+ NEXT_PUBLIC_FF_AUTH_ENABLED: stringToBoolean(),
+ NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: z.string().optional(),
+ NEXT_PUBLIC_FF_SUB_ENABLED: stringToBoolean(),
+ NEXT_PUBLIC_FF_MOCK_MODE_ENABLED: stringToBoolean(),
+ NEXT_PUBLIC_VERCEL_URL: z.string().optional()
});
/**
@@ -70,5 +89,9 @@ export const clientSchema = z.object({
export const clientEnv = {
NEXT_PUBLIC_VERCEL_ENV: process.env.NEXT_PUBLIC_VERCEL_ENV ?? "development",
NEXT_PUBLIC_STRIPE_DONATION_ENABLED: process.env.NEXT_PUBLIC_STRIPE_DONATION_ENABLED,
- NEXT_PUBLIC_FF_AUTH_ENABLED: process.env.NEXT_PUBLIC_FF_AUTH_ENABLED
+ NEXT_PUBLIC_FF_AUTH_ENABLED: process.env.NEXT_PUBLIC_FF_AUTH_ENABLED,
+ NEXT_PUBLIC_VERCEL_URL: process.env.NEXT_PUBLIC_VERCEL_URL ?? "http://localhost:3000",
+ NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY,
+ NEXT_PUBLIC_FF_SUB_ENABLED: process.env.NEXT_PUBLIC_FF_SUB_ENABLED,
+ NEXT_PUBLIC_FF_MOCK_MODE_ENABLED: process.env.NEXT_PUBLIC_FF_MOCK_MODE_ENABLED,
};
diff --git a/src/hooks/useAgent.ts b/src/hooks/useAgent.ts
new file mode 100644
index 00000000..3654d2e3
--- /dev/null
+++ b/src/hooks/useAgent.ts
@@ -0,0 +1,32 @@
+import { api } from "../utils/api";
+import type { Message } from "../types/agentTypes";
+import { useAuth } from "./useAuth";
+
+export interface SaveProps {
+ name: string;
+ goal: string;
+ tasks: Message[];
+}
+
+export function useAgent() {
+ const { status } = useAuth();
+ const utils = api.useContext();
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
+ const voidFunc = () => {};
+ const saveMutation = api.agent.create.useMutation({
+ onSuccess: (data) => {
+ utils.agent.getAll.setData(voidFunc(), (oldData) => [
+ data,
+ ...(oldData ?? []),
+ ]);
+ },
+ });
+
+ const saveAgent = (data: SaveProps) => {
+ if (status === "authenticated") saveMutation.mutate(data);
+ };
+
+ return {
+ saveAgent,
+ };
+}
diff --git a/src/layout/default.tsx b/src/layout/default.tsx
index e5d5e5e5..621588a1 100644
--- a/src/layout/default.tsx
+++ b/src/layout/default.tsx
@@ -2,11 +2,11 @@ import { type ReactNode } from "react";
import Head from "next/head";
import DottedGridBackground from "../components/DottedGridBackground";
import clsx from "clsx";
-import Script from "next/script";
interface LayoutProps {
children: ReactNode;
className?: string;
+ centered?: boolean;
}
const DefaultLayout = (props: LayoutProps) => {
@@ -34,13 +34,10 @@ const DefaultLayout = (props: LayoutProps) => {
content="sG4QDkC8g2oxKSopgJdIe2hQ_SaJDaEaBjwCXZNkNWA"
/>
-
-
+
{props.children}
diff --git a/src/pages/agent/index.tsx b/src/pages/agent/index.tsx
new file mode 100644
index 00000000..91a39bf0
--- /dev/null
+++ b/src/pages/agent/index.tsx
@@ -0,0 +1,82 @@
+import { type NextPage } from "next";
+import DefaultLayout from "../../layout/default";
+import Button from "../../components/Button";
+
+import React, { useState } from "react";
+import { useRouter } from "next/router";
+import { api } from "../../utils/api";
+import ChatWindow from "../../components/ChatWindow";
+import type { Message } from "../../types/agentTypes";
+import Toast from "../../components/toast";
+import { FaTrash, FaShare, FaBackspace } from "react-icons/fa";
+import { env } from "../../env/client.mjs";
+
+const AgentPage: NextPage = () => {
+ const [showCopied, setShowCopied] = useState(false);
+ const router = useRouter();
+
+ const agentId = typeof router.query.id === "string" ? router.query.id : "";
+
+ const getAgent = api.agent.findById.useQuery(agentId, {
+ enabled: router.isReady,
+ });
+
+ const deleteAgent = api.agent.deleteById.useMutation({
+ onSuccess: () => {
+ void router.push("/");
+ },
+ });
+
+ const messages = getAgent.data ? (getAgent.data.tasks as Message[]) : [];
+
+ const shareLink = () => {
+ return encodeURI(`${env.NEXT_PUBLIC_VERCEL_URL as string}${router.asPath}`);
+ };
+
+ return (
+
+
+ );
+};
+
+export default AgentPage;
diff --git a/src/pages/api/create.ts b/src/pages/api/create.ts
index ebd8b2bc..7496393a 100644
--- a/src/pages/api/create.ts
+++ b/src/pages/api/create.ts
@@ -1,7 +1,7 @@
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import type { RequestBody } from "../../utils/interfaces";
-import { createAgent } from "../../services/agent-service";
+import AgentService from "../../services/agent-service";
export const config = {
runtime: "edge",
@@ -16,7 +16,7 @@ const handler = async (request: NextRequest) => {
return;
}
- const newTasks = await createAgent(
+ const newTasks = await AgentService.createTasksAgent(
modelSettings,
goal,
tasks,
diff --git a/src/pages/api/execute.ts b/src/pages/api/execute.ts
index cafe49da..16906f85 100644
--- a/src/pages/api/execute.ts
+++ b/src/pages/api/execute.ts
@@ -1,8 +1,7 @@
-import { createModel, executeTaskAgent } from "../../utils/chain";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import type { RequestBody } from "../../utils/interfaces";
-import { executeAgent } from "../../services/agent-service";
+import AgentService from "../../services/agent-service";
export const config = {
runtime: "edge",
@@ -15,7 +14,11 @@ const handler = async (request: NextRequest) => {
return;
}
- const response = await executeAgent(modelSettings, goal, task);
+ const response = await AgentService.executeTaskAgent(
+ modelSettings,
+ goal,
+ task
+ );
return NextResponse.json({
response: response,
});
diff --git a/src/pages/api/start.ts b/src/pages/api/start.ts
new file mode 100644
index 00000000..102ae452
--- /dev/null
+++ b/src/pages/api/start.ts
@@ -0,0 +1,20 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+import type { RequestBody } from "../../utils/interfaces";
+import AgentService from "../../services/agent-service";
+
+export const config = {
+ runtime: "edge",
+};
+
+const handler = async (request: NextRequest) => {
+ try {
+ const { modelSettings, goal } = (await request.json()) as RequestBody;
+ const newTasks = await AgentService.startGoalAgent(modelSettings, goal);
+ return NextResponse.json({ newTasks });
+ } catch (e) {}
+
+ return NextResponse.error();
+};
+
+export default handler;
diff --git a/src/pages/api/webhooks/stripe.ts b/src/pages/api/webhooks/stripe.ts
new file mode 100644
index 00000000..0afe7a38
--- /dev/null
+++ b/src/pages/api/webhooks/stripe.ts
@@ -0,0 +1,101 @@
+import { buffer } from "micro";
+import Cors from "micro-cors";
+import type { NextApiRequest, NextApiResponse } from "next";
+
+import Stripe from "stripe";
+import { env } from "../../../env/server.mjs";
+import { prisma } from "../../../server/db";
+import { getCustomerEmail } from "../../../utils/stripe-utils";
+
+const stripe = new Stripe(env.STRIPE_SECRET_KEY ?? "", {
+ apiVersion: "2022-11-15",
+});
+
+const webhookSecret = env.STRIPE_WEBHOOK_SECRET ?? "";
+
+// Stripe requires the raw body to construct the event.
+export const config = {
+ api: {
+ bodyParser: false,
+ },
+};
+
+const cors = Cors({
+ allowMethods: ["POST", "HEAD"],
+});
+
+function success(res: NextApiResponse) {
+ res.status(200).json({ received: true });
+}
+
+const webhookHandler = async (req: NextApiRequest, res: NextApiResponse) => {
+ if (req.method !== "POST") {
+ res.setHeader("Allow", "POST");
+ res.status(405).end("Method Not Allowed");
+ return;
+ }
+
+ const buf = await buffer(req);
+ const sig = req.headers["stripe-signature"]!;
+
+ let event: Stripe.Event;
+
+ try {
+ event = stripe.webhooks.constructEvent(buf.toString(), sig, webhookSecret);
+ } catch (err) {
+ const errorMessage = err instanceof Error ? err.message : "Unknown error";
+ if (err instanceof Error) console.log(err);
+ console.log(`❌ Error message: ${errorMessage}`);
+ res.status(400).send(`Webhook Error: ${errorMessage}`);
+ return;
+ }
+
+ if (!event.type.startsWith("customer.subscription")) {
+ success(res);
+ return;
+ }
+
+ const subscription = event.data.object as Stripe.Subscription;
+ const email = await getCustomerEmail(stripe, subscription.customer);
+ const user = await prisma.user.findUniqueOrThrow({
+ where: {
+ email: email,
+ },
+ });
+
+ // Handle the event
+ switch (event.type) {
+ case "customer.subscription.deleted":
+ case "customer.subscription.paused":
+ case "customer.subscription.updated":
+ case "customer.subscription.resumed":
+ await updateUserSubscription(user.id, subscription);
+ break;
+ default:
+ console.log(`Unhandled event type ${event.type}.`);
+ }
+
+ success(res);
+};
+
+const updateUserSubscription = async (
+ userId: string,
+ subscription: Stripe.Subscription
+) => {
+ const subscriptionId =
+ subscription.status === "active" || subscription.status === "trialing"
+ ? subscription.id
+ : undefined;
+
+ await prisma.user.update({
+ where: {
+ id: userId,
+ },
+ data: {
+ subscriptionId,
+ },
+ });
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+export default cors(webhookHandler as any);
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index c6276df1..6bd6708f 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,24 +1,21 @@
-import { type NextPage, type GetStaticProps } from "next";
-import Badge from "../components/Badge";
+import React, { useEffect, useRef } from "react";
+import { type NextPage } from "next";
import DefaultLayout from "../layout/default";
-import React, { useEffect } from "react";
-import type { Message } from "../components/ChatWindow";
import ChatWindow from "../components/ChatWindow";
import Drawer from "../components/Drawer";
import Input from "../components/Input";
import Button from "../components/Button";
import { FaRobot, FaStar } from "react-icons/fa";
-import PopIn from "../components/motions/popin";
import { VscLoading } from "react-icons/vsc";
import AutonomousAgent from "../components/AutonomousAgent";
import Expand from "../components/motions/expand";
import HelpDialog from "../components/HelpDialog";
import SettingsDialog from "../components/SettingsDialog";
-import { GPT_35_TURBO } from "../utils/constants";
-import { useSession } from "next-auth/react";
-import { api } from "../utils/api";
-import { env } from "../env/client.mjs";
+import { GPT_35_TURBO, DEFAULT_MAX_LOOPS_FREE } from "../utils/constants";
import { TaskWindow } from "../components/TaskWindow";
+import { useAuth } from "../hooks/useAuth";
+import type { Message } from "../types/agentTypes";
+import { useAgent } from "../hooks/useAgent";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import WeChatDialog from "../components/WeChatDialog";
import WeChatPayDialog from "../components/WeChatPayDialog";
@@ -27,20 +24,24 @@ import KnowlegePlanetDialog from "../components/KnowlegePlanetDialog";
import { useTranslation } from "next-i18next";
const Home: NextPage = () => {
- const { data: session } = useSession();
+ const { session, status } = useAuth();
const [name, setName] = React.useState("");
const [goalInput, setGoalInput] = React.useState("");
const [agent, setAgent] = React.useState(null);
const [customApiKey, setCustomApiKey] = React.useState("");
const [customModelName, setCustomModelName] =
React.useState(GPT_35_TURBO);
+ const [customTemperature, setCustomTemperature] = React.useState(0.9);
+ const [customMaxLoops, setCustomMaxLoops] = React.useState(
+ DEFAULT_MAX_LOOPS_FREE
+ );
const [shouldAgentStop, setShouldAgentStop] = React.useState(false);
- const [tasks, setTasks] = React.useState([]);
const [messages, setMessages] = React.useState([]);
const [showHelpDialog, setShowHelpDialog] = React.useState(false);
const [showSettingsDialog, setShowSettingsDialog] = React.useState(false);
+ const [hasSaved, setHasSaved] = React.useState(false);
const [showWeChatDialog, setShowWeChatDialog] = React.useState(false);
const [showWeChatPayDialog, setShowWeChatPayDialog] = React.useState(false);
const [showQQDialog, setShowQQDialog] = React.useState(false);
@@ -48,21 +49,10 @@ const Home: NextPage = () => {
React.useState(false);
const { t } = useTranslation();
- // TODO: enable for crud
- // const utils = api.useContext();
- // eslint-disable-next-line @typescript-eslint/no-empty-function
- // const voidFunc = () => {};
- // const createAgent = api.agent.create.useMutation({
- // onSuccess: (data) => {
- // utils.agent.getAll.setData(voidFunc(), (oldData) => [
- // ...(oldData ?? []),
- // data,
- // ]);
- // },
- // });
+ const agentUtils = useAgent();
useEffect(() => {
- const key = "autogpt-modal-opened-new";
+ const key = "agentgpt-modal-opened-new";
const savedModalData = localStorage.getItem(key);
// Momentarily always run
@@ -75,6 +65,11 @@ const Home: NextPage = () => {
localStorage.setItem(key, JSON.stringify(true));
}, []);
+ const nameInputRef = useRef(null);
+ useEffect(() => {
+ nameInputRef?.current?.focus();
+ }, []);
+
useEffect(() => {
if (agent == null) {
setShouldAgentStop(false);
@@ -82,37 +77,51 @@ const Home: NextPage = () => {
}, [agent]);
const handleAddMessage = (message: Message) => {
- if (message.type == "task") {
- setTasks((tasks) => [...tasks, message.value]);
- }
setMessages((prev) => [...prev, message]);
};
+ const tasks = messages.filter((message) => message.type === "task");
+
+ const disableDeployAgent = agent != null || name === "" || goalInput === "";
+
const handleNewGoal = () => {
- setTasks([]);
- // TODO: enable for crud
- // if (env.NEXT_PUBLIC_VERCEL_ENV != "production" && session?.user) {
- // createAgent.mutate({
- // name,
- // goal: goalInput,
- // });
- // }
const agent = new AutonomousAgent(
name,
goalInput,
handleAddMessage,
() => setAgent(null),
- { customApiKey, customModelName }
+ { customApiKey, customModelName, customTemperature, customMaxLoops },
+ session ?? undefined
);
setAgent(agent);
+ setHasSaved(false);
+ setMessages([]);
agent.run().then(console.log).catch(console.error);
};
+ const handleKeyPress = (e: React.KeyboardEvent) => {
+ if (e.key === "Enter" && !disableDeployAgent) {
+ handleNewGoal();
+ }
+ };
+
const handleStopAgent = () => {
setShouldAgentStop(true);
agent?.stopAgent();
};
+ const proTitle = (
+ <>
+ AgentGPTPro
+
+ );
+
+ const shouldShowSave =
+ status === "authenticated" &&
+ !agent?.isRunning &&
+ messages.length &&
+ !hasSaved;
+
return (
{
close={() => setShowHelpDialog(false)}
/>
setShowSettingsDialog(false)}
/>
@@ -140,7 +155,6 @@ const Home: NextPage = () => {
show={showKnowlegePlanetDialog}
close={() => setShowKnowlegePlanetDialog(false)}
/>
-
setShowHelpDialog(true)}
@@ -166,10 +180,10 @@ const Home: NextPage = () => {
Auto
- GPT
+ GPT.
- .NextWeb
+ NextWeb
+
+
+
@@ -26,11 +24,11 @@ export const TaskWindow = ({ tasks }: TaskWindowProps) => {
);
};
-const Task = ({ task }: { task: string }) => {
+const Task = ({ task }: { task: Message }) => {
return (
-
+ {tasks.map((task, i) => (
+
- {task}
+ {task.value}
+
+
+ {child}
+ {disabled ? null : (
+
+
+ {message}
+
+
+ )}
+
+
+
+ );
+};
+
+export default Tooltip;
diff --git a/src/components/WindowButton.tsx b/src/components/WindowButton.tsx
new file mode 100644
index 00000000..62539514
--- /dev/null
+++ b/src/components/WindowButton.tsx
@@ -0,0 +1,25 @@
+import PopIn from "./motions/popin";
+import React from "react";
+
+type WindowButtonProps = {
+ delay: number;
+ onClick?: () => void;
+ icon: React.ReactNode;
+ text: string;
+};
+
+const WindowButton = ({ delay, onClick, icon, text }: WindowButtonProps) => {
+ return (
+
+ {icon}
+
+ {text}
+
-
+
{props.title}
{props.description && (
@@ -60,11 +59,11 @@ const Toast = (props: Props) => {
setOpen(false);
}}
>
- {t('copy')}
+ Copy
)}
- {t('close')}
+ Close
+ }
+ onClick={() => {
+ void window.navigator.clipboard
+ .writeText(shareLink())
+ .then(() => setShowCopied(true));
+ }}
+ enabledClassName={"bg-green-600 hover:bg-green-400"}
+ >
+ Share
+
+ }
+ onClick={() => {
+ deleteAgent.mutate(agentId);
+ }}
+ enabledClassName={"bg-red-600 hover:bg-red-400"}
+ >
+ Delete
+
+ } onClick={() => void router.push("/")}>
+ Back
+
+
+
@@ -177,26 +191,46 @@ const Home: NextPage = () => {
+
@@ -211,6 +245,7 @@ const Home: NextPage = () => {
disabled={agent != null}
value={goalInput}
onChange={(e) => setGoalInput(e.target.value)}
+ onKeyDown={(e) => handleKeyPress(e)}
placeholder="Make the world a better place."
/>
@@ -218,7 +253,7 @@ const Home: NextPage = () => {
- {tasks.length > 0 &&
diff --git a/src/server/api/root.ts b/src/server/api/root.ts
index 800de12d..4032d92d 100644
--- a/src/server/api/root.ts
+++ b/src/server/api/root.ts
@@ -1,7 +1,7 @@
import { createTRPCRouter } from "./trpc";
import { exampleRouter } from "./routers/example";
-import { chainRouter } from "./routers/chain";
import { agentRouter } from "./routers/agentRouter";
+import { accountRouter } from "./routers/account";
/**
* This is the primary router for your server.
@@ -10,8 +10,8 @@ import { agentRouter } from "./routers/agentRouter";
*/
export const appRouter = createTRPCRouter({
example: exampleRouter,
- chain: chainRouter,
agent: agentRouter,
+ account: accountRouter,
});
// export type definition of API
diff --git a/src/server/api/routers/account.ts b/src/server/api/routers/account.ts
new file mode 100644
index 00000000..9e530456
--- /dev/null
+++ b/src/server/api/routers/account.ts
@@ -0,0 +1,60 @@
+import { z } from "zod";
+
+import { createTRPCRouter, protectedProcedure } from "../trpc";
+import Stripe from "stripe";
+import { env } from "../../../env/server.mjs";
+import { prisma } from "../../db";
+import { getCustomerId } from "../../../utils/stripe-utils";
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+const stripe = new Stripe(env.STRIPE_SECRET_KEY ?? "", {
+ apiVersion: "2022-11-15",
+});
+
+export const accountRouter = createTRPCRouter({
+ subscribe: protectedProcedure.mutation(async ({ ctx }) => {
+ const user = await prisma.user.findUniqueOrThrow({
+ where: {
+ id: ctx.session?.user?.id,
+ },
+ });
+
+ const checkoutSession = await stripe.checkout.sessions.create({
+ success_url: env.NEXTAUTH_URL,
+ cancel_url: env.NEXTAUTH_URL,
+ mode: "subscription",
+ line_items: [
+ {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+ price: env.STRIPE_SUBSCRIPTION_PRICE_ID ?? "",
+ quantity: 1,
+ },
+ ],
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+ customer: user.customerId ?? undefined,
+ customer_email: user.email ?? undefined,
+ client_reference_id: ctx.session?.user?.id,
+ metadata: {
+ userId: ctx.session?.user?.id,
+ },
+ });
+
+ return checkoutSession.url;
+ }),
+ manage: protectedProcedure.mutation(async ({ ctx }) => {
+ if (!ctx.session?.user?.subscriptionId) {
+ return null;
+ }
+
+ const sub = await stripe.subscriptions.retrieve(
+ ctx.session?.user?.subscriptionId
+ );
+
+ const session = await stripe.billingPortal.sessions.create({
+ customer: getCustomerId(sub.customer),
+ return_url: env.NEXTAUTH_URL,
+ });
+
+ return session.url;
+ }),
+});
diff --git a/src/server/api/routers/agentRouter.ts b/src/server/api/routers/agentRouter.ts
index cecbdb37..6bd7e047 100644
--- a/src/server/api/routers/agentRouter.ts
+++ b/src/server/api/routers/agentRouter.ts
@@ -1,11 +1,18 @@
import { z } from "zod";
-import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
import { prisma } from "../../db";
+import { messageParser } from "../../../types/agentTypes";
+
+const saveAgentParser = z.object({
+ name: z.string(),
+ goal: z.string(),
+ tasks: z.array(messageParser),
+});
export const agentRouter = createTRPCRouter({
create: protectedProcedure
- .input(z.object({ name: z.string(), goal: z.string() }))
+ .input(saveAgentParser)
.mutation(async ({ input, ctx }) => {
const agent = await prisma.agent.create({
data: {
@@ -15,11 +22,55 @@ export const agentRouter = createTRPCRouter({
},
});
+ const all = input.tasks.map((e, i) => {
+ return prisma.agentTask.create({
+ data: {
+ agentId: agent.id,
+ type: e.type,
+ info: e.info,
+ value: e.value,
+ sort: i,
+ },
+ });
+ });
+
+ await Promise.all(all);
return agent;
}),
getAll: protectedProcedure.query(async ({ ctx }) => {
return prisma.agent.findMany({
- where: { userId: ctx.session?.user?.id },
+ where: {
+ userId: ctx.session?.user?.id,
+ deleteDate: null,
+ },
+ orderBy: { createDate: "desc" },
+ take: 20,
});
}),
+ findById: publicProcedure.input(z.string()).query(async ({ input, ctx }) => {
+ const agent = await prisma.agent.findFirstOrThrow({
+ where: { id: input, deleteDate: null },
+ include: {
+ tasks: {
+ orderBy: {
+ sort: "asc",
+ },
+ },
+ },
+ });
+
+ return {
+ ...agent,
+ };
+ }),
+ deleteById: protectedProcedure
+ .input(z.string())
+ .mutation(async ({ input, ctx }) => {
+ await prisma.agent.updateMany({
+ where: { id: input, userId: ctx.session?.user?.id },
+ data: {
+ deleteDate: new Date(),
+ },
+ });
+ }),
});
diff --git a/src/server/auth.ts b/src/server/auth.ts
index 6c048ea9..c9348576 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -21,33 +21,32 @@ declare module "next-auth" {
interface Session extends DefaultSession {
user: {
id: string;
- // ...other properties
- // role: UserRole;
- } & DefaultSession["user"];
+ } & DefaultSession["user"] &
+ User;
}
- // interface User {
- // // ...other properties
- // // role: UserRole;
- // }
+ interface User {
+ role?: string;
+ subscriptionId: string | undefined;
+ }
}
const providers = [
- // GoogleProvider({
- // clientId: serverEnv.GOOGLE_CLIENT_ID ?? "",
- // clientSecret: serverEnv.GOOGLE_CLIENT_SECRET ?? "",
- // allowDangerousEmailAccountLinking: true,
- // }),
- // GithubProvider({
- // clientId: serverEnv.GITHUB_CLIENT_ID ?? "",
- // clientSecret: serverEnv.GITHUB_CLIENT_SECRET ?? "",
- // allowDangerousEmailAccountLinking: true,
- // }),
- // DiscordProvider({
- // clientId: serverEnv.DISCORD_CLIENT_ID ?? "",
- // clientSecret: serverEnv.DISCORD_CLIENT_SECRET ?? "",
- // allowDangerousEmailAccountLinking: true,
- // }),
+ GoogleProvider({
+ clientId: serverEnv.GOOGLE_CLIENT_ID ?? "",
+ clientSecret: serverEnv.GOOGLE_CLIENT_SECRET ?? "",
+ allowDangerousEmailAccountLinking: true,
+ }),
+ GithubProvider({
+ clientId: serverEnv.GITHUB_CLIENT_ID ?? "",
+ clientSecret: serverEnv.GITHUB_CLIENT_SECRET ?? "",
+ allowDangerousEmailAccountLinking: true,
+ }),
+ DiscordProvider({
+ clientId: serverEnv.DISCORD_CLIENT_ID ?? "",
+ clientSecret: serverEnv.DISCORD_CLIENT_SECRET ?? "",
+ allowDangerousEmailAccountLinking: true,
+ }),
];
/**
@@ -60,13 +59,14 @@ export const authOptions: NextAuthOptions = {
session({ session, user }) {
if (session.user) {
session.user.id = user.id;
- // session.user.role = user.role; <-- put other properties on the session here
+ session.user.role = user.role;
+ session.user.subscriptionId = user.subscriptionId;
}
return session;
},
},
adapter: PrismaAdapter(prisma),
- providers: [],
+ providers,
theme: {
colorScheme: "dark",
logo: "https://auto-agentgpt.com/logo-white.svg",
diff --git a/src/services/agent-service.ts b/src/services/agent-service.ts
index 252efcac..689917fa 100644
--- a/src/services/agent-service.ts
+++ b/src/services/agent-service.ts
@@ -1,21 +1,42 @@
import {
createModel,
- executeCreateTaskAgent,
- executeTaskAgent,
- extractArray,
- realTasksFilter,
- startGoalAgent,
-} from "../utils/chain";
+ startGoalPrompt,
+ executeTaskPrompt,
+ createTasksPrompt,
+} from "../utils/prompts";
import type { ModelSettings } from "../utils/types";
+import { env } from "../env/client.mjs";
+import { LLMChain } from "langchain/chains";
+import { extractTasks } from "../utils/helpers";
-export async function startAgent(modelSettings: ModelSettings, goal: string) {
- const completion = await startGoalAgent(createModel(modelSettings), goal);
- console.log(typeof completion.text);
+async function startGoalAgent(modelSettings: ModelSettings, goal: string) {
+ const completion = await new LLMChain({
+ llm: createModel(modelSettings),
+ prompt: startGoalPrompt,
+ }).call({
+ goal,
+ });
console.log("Completion:" + (completion.text as string));
- return extractArray(completion.text as string).filter(realTasksFilter);
+ return extractTasks(completion.text as string, []);
}
-export async function createAgent(
+async function executeTaskAgent(
+ modelSettings: ModelSettings,
+ goal: string,
+ task: string
+) {
+ const completion = await new LLMChain({
+ llm: createModel(modelSettings),
+ prompt: executeTaskPrompt,
+ }).call({
+ goal,
+ task,
+ });
+
+ return completion.text as string;
+}
+
+async function createTasksAgent(
modelSettings: ModelSettings,
goal: string,
tasks: string[],
@@ -23,28 +44,70 @@ export async function createAgent(
result: string,
completedTasks: string[] | undefined
) {
- const completion = await executeCreateTaskAgent(
- createModel(modelSettings),
+ const completion = await new LLMChain({
+ llm: createModel(modelSettings),
+ prompt: createTasksPrompt,
+ }).call({
goal,
tasks,
lastTask,
- result
- );
+ result,
+ });
- return extractArray(completion.text as string)
- .filter(realTasksFilter)
- .filter((task) => !(completedTasks || []).includes(task));
+ return extractTasks(completion.text as string, completedTasks || []);
}
-export async function executeAgent(
- modelSettings: ModelSettings,
- goal: string,
- task: string
-) {
- const completion = await executeTaskAgent(
- createModel(modelSettings),
- goal,
- task
- );
- return completion.text as string;
+interface AgentService {
+ startGoalAgent: (
+ modelSettings: ModelSettings,
+ goal: string
+ ) => Promise
- My Agent(s)
+ {t("my-agents")}
))}
- {status === "unauthenticated" && (
-
@@ -200,36 +193,7 @@ const Drawer = ({
{env.NEXT_PUBLIC_FF_AUTH_ENABLED && (
- Sign in to be able to save agents and manage your account!
-
- )}
+ {status === "unauthenticated" && {t("sign-in")}
}
{status === "authenticated" && userAgents.length === 0 && (
-
- You need to create and save your first agent before anything
- shows up here!
-
+ {t("create-agent")}
)}
-
-