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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 diff --git a/autogpts/autogpt/autogpt/app/main.py b/autogpts/autogpt/autogpt/app/main.py index 1e60af89..66de7638 100644 --- a/autogpts/autogpt/autogpt/app/main.py +++ b/autogpts/autogpt/autogpt/app/main.py @@ -644,7 +644,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 diff --git a/autogpts/autogpt/autogpt/app/utils.py b/autogpts/autogpt/autogpt/app/utils.py index 0c0ae101..30ee7f27 100644 --- a/autogpts/autogpt/autogpt/app/utils.py +++ b/autogpts/autogpt/autogpt/app/utils.py @@ -51,7 +51,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 081c5d12..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_profile.ai_name} asks: '{question}': " - ) + print(f"\nQ: {question}") + resp = await clean_input(agent.legacy_config, "A:") return f"The user's answer: '{resp}'" 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/logs/config.py b/autogpts/autogpt/autogpt/logs/config.py index 647559d6..7b8a043b 100644 --- a/autogpts/autogpt/autogpt/logs/config.py +++ b/autogpts/autogpt/autogpt/logs/config.py @@ -25,8 +25,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" - " %(title)s%(message)s" + "%(asctime)s %(levelname)s %(filename)s:%(lineno)d" " %(title)s%(message)s" ) SPEECH_OUTPUT_LOGGER = "VOICE" 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]