From 2f79caa6b901d006a78c1ac9e69db4465c0f971a Mon Sep 17 00:00:00 2001 From: sanjeevsaara <124862756+sanjeevsaara@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:53:57 +1100 Subject: [PATCH 01/22] searchagent entering the arena (#5758) --- arena/searchagent.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/searchagent.json diff --git a/arena/searchagent.json b/arena/searchagent.json new file mode 100644 index 00000000..8136c134 --- /dev/null +++ b/arena/searchagent.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/sanjeevsaara/AutoGPT", + "timestamp": "2023-10-16T00:01:53.051453", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From 9ea973e9e9e99f9a2cef27b784e3fd216590ae2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=81=E4=B8=89?= <84710711+g1331@users.noreply.github.com> Date: Tue, 17 Oct 2023 01:51:20 +0800 Subject: [PATCH 02/22] UmaruAgent entering the arena (#5769) Co-authored-by: Silen Naihin --- arena/UmaruAgent.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/UmaruAgent.json diff --git a/arena/UmaruAgent.json b/arena/UmaruAgent.json new file mode 100644 index 00000000..f3168d47 --- /dev/null +++ b/arena/UmaruAgent.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/g1331/Auto-GPT", + "timestamp": "2023-10-16T13:51:10.464650", + "commit_hash_to_benchmark": "2f79caa6b901d006a78c1ac9e69db4465c0f971a", + "branch_to_benchmark": "master" +} \ No newline at end of file From 454e761f98b277ef292042e22ebd825eb03e5f3a Mon Sep 17 00:00:00 2001 From: Janek Dijkstra Date: Mon, 16 Oct 2023 19:51:54 +0200 Subject: [PATCH 03/22] ExampleAgent entering the arena (#5768) Co-authored-by: Silen Naihin --- arena/ExampleAgent.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/ExampleAgent.json diff --git a/arena/ExampleAgent.json b/arena/ExampleAgent.json new file mode 100644 index 00000000..2fb8c44a --- /dev/null +++ b/arena/ExampleAgent.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/janekdijkstra/AutoGPT", + "timestamp": "2023-10-16T12:12:54.998033", + "commit_hash_to_benchmark": "2f79caa6b901d006a78c1ac9e69db4465c0f971a", + "branch_to_benchmark": "master" +} \ No newline at end of file From 837b071525a5629288d6afb4b1a2af0e963a5c45 Mon Sep 17 00:00:00 2001 From: Jimcau <61394507+Jimcau@users.noreply.github.com> Date: Mon, 16 Oct 2023 19:52:31 +0200 Subject: [PATCH 04/22] Raslebot entering the arena (#5767) Co-authored-by: Silen Naihin --- arena/Raslebot.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/Raslebot.json diff --git a/arena/Raslebot.json b/arena/Raslebot.json new file mode 100644 index 00000000..11169825 --- /dev/null +++ b/arena/Raslebot.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/Jimcau/AutoGPT.git", + "timestamp": "2023-10-16T10:50:47.524483", + "commit_hash_to_benchmark": "2f79caa6b901d006a78c1ac9e69db4465c0f971a", + "branch_to_benchmark": "master" +} \ No newline at end of file From 76e15ee1ba676f1ae6f73f15fd9cd3ab4bb093fe Mon Sep 17 00:00:00 2001 From: Nikhil Mishra <83641511+Nikhil8652@users.noreply.github.com> Date: Mon, 16 Oct 2023 23:22:57 +0530 Subject: [PATCH 05/22] Auto entering the arena (#5766) --- arena/Auto.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/Auto.json diff --git a/arena/Auto.json b/arena/Auto.json new file mode 100644 index 00000000..9bad9db5 --- /dev/null +++ b/arena/Auto.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/Nikhil8652/AutoGPT", + "timestamp": "2023-10-16T09:12:17.452121", + "commit_hash_to_benchmark": "2f79caa6b901d006a78c1ac9e69db4465c0f971a", + "branch_to_benchmark": "master" +} \ No newline at end of file From 6aaf1b92f5626ecdc316859e207c7252d8a458dc Mon Sep 17 00:00:00 2001 From: Zeen Zeng <2573137833@qq.com> Date: Tue, 17 Oct 2023 01:54:08 +0800 Subject: [PATCH 06/22] zze entering the arena (#5765) Co-authored-by: zengzeen.zengze Co-authored-by: Silen Naihin --- arena/zze.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/zze.json diff --git a/arena/zze.json b/arena/zze.json new file mode 100644 index 00000000..7b69f187 --- /dev/null +++ b/arena/zze.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/quasimodo7614/AutoGPT", + "timestamp": "2023-10-16T07:49:29.399457", + "commit_hash_to_benchmark": "2f79caa6b901d006a78c1ac9e69db4465c0f971a", + "branch_to_benchmark": "master" +} \ No newline at end of file From a81de65912032d4d927d143e52ba7ebbfdffe565 Mon Sep 17 00:00:00 2001 From: miaowacao <122991483+miaowacao@users.noreply.github.com> Date: Tue, 17 Oct 2023 01:55:00 +0800 Subject: [PATCH 07/22] teacher entering the arena (#5764) Co-authored-by: Silen Naihin --- arena/teacher.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/teacher.json diff --git a/arena/teacher.json b/arena/teacher.json new file mode 100644 index 00000000..0e0291c0 --- /dev/null +++ b/arena/teacher.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/miaowacao/AutoGPT1", + "timestamp": "2023-10-16T07:21:48.209351", + "commit_hash_to_benchmark": "c77ade5b2f62c5373fc7573e5c45581f003c77a3", + "branch_to_benchmark": "master" +} \ No newline at end of file From c0fda8d37da22b0ca86ebc7fb9e25f3d633f9f34 Mon Sep 17 00:00:00 2001 From: Vivek Mohan Date: Mon, 16 Oct 2023 23:25:38 +0530 Subject: [PATCH 08/22] TraceLLMAgent entering the arena (#5757) Co-authored-by: vm.ashling Co-authored-by: Silen Naihin --- arena/TraceLLMAgent.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/TraceLLMAgent.json diff --git a/arena/TraceLLMAgent.json b/arena/TraceLLMAgent.json new file mode 100644 index 00000000..d25ff491 --- /dev/null +++ b/arena/TraceLLMAgent.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/vmwsree/AutoGPT", + "timestamp": "2023-10-15T21:48:38.027553", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From 9c358e4a1405104141fba629b247ee8cf861818c Mon Sep 17 00:00:00 2001 From: Agustin Herrera <67199617+aiherrera1@users.noreply.github.com> Date: Mon, 16 Oct 2023 14:56:11 -0300 Subject: [PATCH 09/22] dda entering the arena (#5755) Co-authored-by: Agustin Herrera Co-authored-by: Silen Naihin --- arena/dda.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/dda.json diff --git a/arena/dda.json b/arena/dda.json new file mode 100644 index 00000000..3f628dd8 --- /dev/null +++ b/arena/dda.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/aiherrera1/AutoGPT", + "timestamp": "2023-10-15T18:03:04.765167", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From d656e3d9e984f057fabdb9985899613f3681c63d Mon Sep 17 00:00:00 2001 From: Pedro Lima <54076063+pedrovvitor@users.noreply.github.com> Date: Mon, 16 Oct 2023 14:56:41 -0300 Subject: [PATCH 10/22] dev_agent entering the arena (#5754) Co-authored-by: Silen Naihin --- arena/dev_agent.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/dev_agent.json diff --git a/arena/dev_agent.json b/arena/dev_agent.json new file mode 100644 index 00000000..25aec8ac --- /dev/null +++ b/arena/dev_agent.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/pedrovvitor/AutoGPT", + "timestamp": "2023-10-15T14:25:07.534330", + "commit_hash_to_benchmark": "93e3ec36ed6cd9e5e60585f016ad3bef4e1c52cb", + "branch_to_benchmark": "master" +} \ No newline at end of file From 839fde4d7f78858e5113c4767d90b0212b976584 Mon Sep 17 00:00:00 2001 From: Pavel Sukhachev Date: Mon, 16 Oct 2023 13:58:48 -0400 Subject: [PATCH 11/22] robot entering the arena (#5752) Co-authored-by: Silen Naihin --- arena/robot.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/robot.json diff --git a/arena/robot.json b/arena/robot.json new file mode 100644 index 00000000..3f1eded5 --- /dev/null +++ b/arena/robot.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/brisklad/AutoGPT", + "timestamp": "2023-10-15T13:49:47.384228", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From ed65f75b683d0e740e31214f099e141e650a6a3a Mon Sep 17 00:00:00 2001 From: paul726 <997762552@qq.com> Date: Tue, 17 Oct 2023 02:00:07 +0800 Subject: [PATCH 12/22] web_developer entering the arena (#5750) Co-authored-by: Silen Naihin --- arena/web_developer.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/web_developer.json diff --git a/arena/web_developer.json b/arena/web_developer.json new file mode 100644 index 00000000..7f1f9c4a --- /dev/null +++ b/arena/web_developer.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/paul726/AutoGPT", + "timestamp": "2023-10-15T13:36:03.387061", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From 540178d079c87bbff69dbfe35c3abebcef7a7c22 Mon Sep 17 00:00:00 2001 From: PZON2 <52866381+PZON2@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:01:05 +0200 Subject: [PATCH 13/22] testGPT entering the arena (#5749) Co-authored-by: Silen Naihin --- arena/testGPT.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/testGPT.json diff --git a/arena/testGPT.json b/arena/testGPT.json new file mode 100644 index 00000000..f1078ed6 --- /dev/null +++ b/arena/testGPT.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/PZON2/testGPT", + "timestamp": "2023-10-15T12:06:56.373935", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From f2446e4a66669389d7d8bc9a709875fd61ef5191 Mon Sep 17 00:00:00 2001 From: Cagdas Bas Date: Mon, 16 Oct 2023 21:01:39 +0300 Subject: [PATCH 14/22] AutoTestGenerator entering the arena (#5747) Co-authored-by: Silen Naihin --- arena/AutoTestGenerator.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/AutoTestGenerator.json diff --git a/arena/AutoTestGenerator.json b/arena/AutoTestGenerator.json new file mode 100644 index 00000000..c28d6da8 --- /dev/null +++ b/arena/AutoTestGenerator.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/cagdasbas/AutoGPT", + "timestamp": "2023-10-15T08:43:40.193080", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From 5a3851fd66c4b1735274308d093c3d2066b51b9a Mon Sep 17 00:00:00 2001 From: jcartes Date: Mon, 16 Oct 2023 15:02:28 -0300 Subject: [PATCH 15/22] xt0m-GPT entering the arena (#5746) Co-authored-by: Silen Naihin --- arena/xt0m-GPT.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/xt0m-GPT.json diff --git a/arena/xt0m-GPT.json b/arena/xt0m-GPT.json new file mode 100644 index 00000000..130bbae2 --- /dev/null +++ b/arena/xt0m-GPT.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/jcartes/xt0m-GPT", + "timestamp": "2023-10-15T01:31:05.785913", + "commit_hash_to_benchmark": "57bcbdf45c6c1493a4e5f6a4e72594ea13c10f93", + "branch_to_benchmark": "master" +} \ No newline at end of file From 3d312fd40534345bfc7d8f52faabb4daeda4729a Mon Sep 17 00:00:00 2001 From: Khelil Date: Mon, 16 Oct 2023 20:02:57 +0200 Subject: [PATCH 16/22] billy entering the arena (#5744) Co-authored-by: Silen Naihin --- arena/billy.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/billy.json diff --git a/arena/billy.json b/arena/billy.json new file mode 100644 index 00000000..44253ede --- /dev/null +++ b/arena/billy.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/khelil/AutoGPT", + "timestamp": "2023-10-14T17:51:54.044334", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From 546e08a5cf2413fcfb857e2c41d21c80c3364218 Mon Sep 17 00:00:00 2001 From: smaxaddington <36896044+smaxaddington@users.noreply.github.com> Date: Mon, 16 Oct 2023 14:04:29 -0400 Subject: [PATCH 17/22] MyFirstAgent entering the arena (#5743) Co-authored-by: Silen Naihin --- arena/MyFirstAgent.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arena/MyFirstAgent.json diff --git a/arena/MyFirstAgent.json b/arena/MyFirstAgent.json new file mode 100644 index 00000000..783c90f5 --- /dev/null +++ b/arena/MyFirstAgent.json @@ -0,0 +1,6 @@ +{ + "github_repo_url": "https://github.com/smaxaddington/AutoGPT", + "timestamp": "2023-10-14T15:27:15.090035", + "commit_hash_to_benchmark": "74ee69daf1c0a2603f19bdb1edcfdf1f4e06bcff", + "branch_to_benchmark": "master" +} \ No newline at end of file From e75073b4958fab0fc8643eca586df52101a6691e Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Mon, 16 Oct 2023 15:49:19 -0700 Subject: [PATCH 18/22] AutoGPT: Improve output format of web commands --- autogpts/autogpt/autogpt/commands/web_search.py | 5 +++++ autogpts/autogpt/autogpt/commands/web_selenium.py | 3 ++- autogpts/autogpt/autogpt/processing/html.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/autogpts/autogpt/autogpt/commands/web_search.py b/autogpts/autogpt/autogpt/commands/web_search.py index 82b88240..de77d5d1 100644 --- a/autogpts/autogpt/autogpt/commands/web_search.py +++ b/autogpts/autogpt/autogpt/commands/web_search.py @@ -57,6 +57,11 @@ def web_search(query: str, agent: Agent, num_results: int = 8) -> str: time.sleep(1) attempts += 1 + search_results = [ + {"title": r["title"], "url": r["href"], "description": r["body"]} + for r in search_results + ] + results = json.dumps(search_results, ensure_ascii=False, indent=4) return safe_google_results(results) diff --git a/autogpts/autogpt/autogpt/commands/web_selenium.py b/autogpts/autogpt/autogpt/commands/web_selenium.py index 2175694c..a60dd911 100644 --- a/autogpts/autogpt/autogpt/commands/web_selenium.py +++ b/autogpts/autogpt/autogpt/commands/web_selenium.py @@ -111,11 +111,12 @@ async def read_webpage(url: str, agent: Agent, question: str = "") -> str: links = links[:LINKS_TO_RETURN] text_fmt = f"'''{text}'''" if "\n" in text else f"'{text}'" + links_fmt = "\n".join(f"- {link}" for link in links) return ( f"Page content{' (summary)' if summarized else ''}:" if return_literal_content else "Answer gathered from webpage:" - ) + f" {text_fmt}\n\nLinks: {links}" + ) + f" {text_fmt}\n\nLinks:\n{links_fmt}" except WebDriverException as e: # These errors are often quite long and include lots of context. diff --git a/autogpts/autogpt/autogpt/processing/html.py b/autogpts/autogpt/autogpt/processing/html.py index 81387b12..73c65b9c 100644 --- a/autogpts/autogpt/autogpt/processing/html.py +++ b/autogpts/autogpt/autogpt/processing/html.py @@ -30,4 +30,4 @@ def format_hyperlinks(hyperlinks: list[tuple[str, str]]) -> list[str]: Returns: List[str]: The formatted hyperlinks """ - return [f"{link_text} ({link_url})" for link_text, link_url in hyperlinks] + return [f"{link_text.strip()} ({link_url})" for link_text, link_url in hyperlinks] From f01588f927d926519345711213417759d38fce43 Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Mon, 16 Oct 2023 15:49:50 -0700 Subject: [PATCH 19/22] Mark poetry.lock as generated --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 24c5762d..d3adc9db 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ frontend/build/* linguist-generated -frontend/build/* linguist-vendored \ No newline at end of file + +**/poetry.lock linguist-generated From 0278873fb5a20ecceb5d375a8f62fa3a2913d12a Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Mon, 16 Oct 2023 15:50:44 -0700 Subject: [PATCH 20/22] Remove double milliseconds field from AutoGPT log format --- autogpts/autogpt/autogpt/logs/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogpts/autogpt/autogpt/logs/config.py b/autogpts/autogpt/autogpt/logs/config.py index dc3a2578..21afc107 100644 --- a/autogpts/autogpt/autogpt/logs/config.py +++ b/autogpts/autogpt/autogpt/logs/config.py @@ -24,7 +24,7 @@ ERROR_LOG_FILE = "error.log" SIMPLE_LOG_FORMAT = "%(asctime)s %(levelname)s %(title)s%(message)s" DEBUG_LOG_FORMAT = ( - "%(asctime)s.%(msecs)03d %(levelname)s %(filename)s:%(lineno)d" + "%(asctime)s %(levelname)s %(filename)s:%(lineno)d" " %(title)s%(message)s" ) From a558c9fd0462d57863f62890e3cf8f362d98cde6 Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Mon, 16 Oct 2023 15:58:06 -0700 Subject: [PATCH 21/22] AutoGPT: Clean up CLI prompts --- autogpts/autogpt/autogpt/app/main.py | 4 ++-- autogpts/autogpt/autogpt/app/setup.py | 10 +++++----- autogpts/autogpt/autogpt/app/utils.py | 2 +- autogpts/autogpt/autogpt/commands/user_interaction.py | 5 ++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/autogpts/autogpt/autogpt/app/main.py b/autogpts/autogpt/autogpt/app/main.py index 59e4d305..b184c29b 100644 --- a/autogpts/autogpt/autogpt/app/main.py +++ b/autogpts/autogpt/autogpt/app/main.py @@ -476,7 +476,7 @@ async def get_user_feedback( console_input = await clean_input(config, "Waiting for your response...") else: console_input = await clean_input( - config, Fore.MAGENTA + "Input: " + Style.RESET_ALL + config, Fore.MAGENTA + "Input:" + Style.RESET_ALL ) # Parse user input @@ -551,7 +551,7 @@ Name: {ai_config.ai_name} Role: {ai_config.ai_role} Goals: {ai_config.ai_goals} API Budget: {"infinite" if ai_config.api_budget <= 0 else f"${ai_config.api_budget}"} -Continue ({config.authorise_key}/{config.exit_key}): """, +Continue ({config.authorise_key}/{config.exit_key}):""", ) if should_continue.lower() == config.exit_key: ai_config = AIConfig() diff --git a/autogpts/autogpt/autogpt/app/setup.py b/autogpts/autogpt/autogpt/app/setup.py index b07c8cce..06cead2e 100644 --- a/autogpts/autogpt/autogpt/app/setup.py +++ b/autogpts/autogpt/autogpt/app/setup.py @@ -60,7 +60,7 @@ async def interactive_ai_config_setup( ) user_desire = await utils.clean_input( - config, f"{Fore.LIGHTBLUE_EX}I want AutoGPT to{Style.RESET_ALL}: " + config, f"{Fore.LIGHTBLUE_EX}I want AutoGPT to{Style.RESET_ALL}:" ) if user_desire.strip() == "": @@ -125,7 +125,7 @@ async def generate_aiconfig_manual( message="For example, 'Entrepreneur-GPT'", title_color=Fore.GREEN, ) - ai_name = await utils.clean_input(config, "AI Name: ") + ai_name = await utils.clean_input(config, "AI Name:") if ai_name == "": ai_name = "Entrepreneur-GPT" @@ -145,7 +145,7 @@ async def generate_aiconfig_manual( " the sole goal of increasing your net worth.'", title_color=Fore.GREEN, ) - ai_role = await utils.clean_input(config, f"{ai_name} is: ") + ai_role = await utils.clean_input(config, f"{ai_name} is:") if ai_role == "": ai_role = "an AI designed to autonomously develop and run businesses with the" " sole goal of increasing your net worth." @@ -164,7 +164,7 @@ async def generate_aiconfig_manual( ai_goals = [] for i in range(5): ai_goal = await utils.clean_input( - config, f"{Fore.LIGHTBLUE_EX}Goal{Style.RESET_ALL} {i+1}: " + config, f"{Fore.LIGHTBLUE_EX}Goal{Style.RESET_ALL} {i+1}:" ) if ai_goal == "": break @@ -184,7 +184,7 @@ async def generate_aiconfig_manual( ) logger.info("Enter nothing to let the AI run without monetary limit") api_budget_input = await utils.clean_input( - config, f"{Fore.LIGHTBLUE_EX}Budget{Style.RESET_ALL}: $" + config, f"{Fore.LIGHTBLUE_EX}Budget ($){Style.RESET_ALL}:" ) if api_budget_input == "": api_budget = 0.0 diff --git a/autogpts/autogpt/autogpt/app/utils.py b/autogpts/autogpt/autogpt/app/utils.py index 3575490e..cfa00ff8 100644 --- a/autogpts/autogpt/autogpt/app/utils.py +++ b/autogpts/autogpt/autogpt/app/utils.py @@ -50,7 +50,7 @@ async def clean_input(config: Config, prompt: str = ""): # handle_sigint must be set to False, so the signal handler in the # autogpt/main.py could be employed properly. This referes to # https://github.com/Significant-Gravitas/AutoGPT/pull/4799/files/3966cdfd694c2a80c0333823c3bc3da090f85ed3#r1264278776 - answer = await session.prompt_async(ANSI(prompt), handle_sigint=False) + answer = await session.prompt_async(ANSI(prompt + " "), handle_sigint=False) return answer except KeyboardInterrupt: logger.info("You interrupted AutoGPT") diff --git a/autogpts/autogpt/autogpt/commands/user_interaction.py b/autogpts/autogpt/autogpt/commands/user_interaction.py index 2618f0c6..bb5055fd 100644 --- a/autogpts/autogpt/autogpt/commands/user_interaction.py +++ b/autogpts/autogpt/autogpt/commands/user_interaction.py @@ -27,7 +27,6 @@ from autogpt.core.utils.json_schema import JSONSchema enabled=lambda config: not config.noninteractive_mode, ) async def ask_user(question: str, agent: Agent) -> str: - resp = await clean_input( - agent.legacy_config, f"{agent.ai_config.ai_name} asks: '{question}': " - ) + print(f"\nQ: {question}") + resp = await clean_input(agent.legacy_config, "A:") return f"The user's answer: '{resp}'" From 265255120b1a64d1dd0a3a92ae3a7e697a103ecb Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Mon, 16 Oct 2023 15:59:11 -0700 Subject: [PATCH 22/22] AutoGPT: lint --- autogpts/autogpt/autogpt/logs/config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/autogpts/autogpt/autogpt/logs/config.py b/autogpts/autogpt/autogpt/logs/config.py index 21afc107..b342a33d 100644 --- a/autogpts/autogpt/autogpt/logs/config.py +++ b/autogpts/autogpt/autogpt/logs/config.py @@ -24,8 +24,7 @@ ERROR_LOG_FILE = "error.log" SIMPLE_LOG_FORMAT = "%(asctime)s %(levelname)s %(title)s%(message)s" DEBUG_LOG_FORMAT = ( - "%(asctime)s %(levelname)s %(filename)s:%(lineno)d" - " %(title)s%(message)s" + "%(asctime)s %(levelname)s %(filename)s:%(lineno)d" " %(title)s%(message)s" ) SPEECH_OUTPUT_LOGGER = "VOICE"