Compare commits

...

4 Commits

Author SHA1 Message Date
SwiftyOS
0571eb33e6 bump python version 2024-05-09 10:32:46 +02:00
SwiftyOS
d07dd42776 fix: linting 2024-05-09 10:24:04 +02:00
SwiftyOS
557894e6c1 fixed benchmark dependecy issue 2024-05-09 09:36:37 +02:00
SwiftyOS
94f0cfd38a removed git from cli 2024-05-09 09:36:24 +02:00
13 changed files with 3483 additions and 3634 deletions

View File

@@ -34,7 +34,7 @@ jobs:
fail-fast: false
timeout-minutes: 20
env:
min-python-version: '3.10'
min-python-version: '3.12'
steps:
- name: Checkout repository
uses: actions/checkout@v4

File diff suppressed because one or more lines are too long

View File

@@ -64,6 +64,8 @@ spacy = "^3.0.0"
tenacity = "^8.2.2"
tiktoken = "^0.5.0"
webdriver-manager = "*"
click-default-group = "^1.2.4"
# OpenAI and Generic plugins import
openapi-python-client = "^0.14.0"

File diff suppressed because it is too large Load Diff

View File

@@ -28,6 +28,7 @@ agbenchmark = { path = "../../benchmark", optional = true }
# agbenchmark = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "benchmark", optional = true}
webdriver-manager = "^4.0.1"
google-cloud-storage = "^2.13.0"
click-default-group = "^1.2.4"
[tool.poetry.extras]
benchmark = ["agbenchmark"]

View File

@@ -18,7 +18,9 @@ class TestPasswordGenerator(unittest.TestCase):
def test_password_content(self):
password = password_generator.generate_password()
self.assertTrue(any(c.isdigit() for c in password))
self.assertTrue(any(c in password_generator.string.punctuation for c in password))
self.assertTrue(
any(c in password_generator.string.punctuation for c in password)
)
if __name__ == "__main__":

View File

@@ -1,17 +1,17 @@
from sample_code import multiply_int
# from sample_code import multiply_int
def test_multiply_int(num: int, multiplier, expected_result: int) -> None:
result = multiply_int(num, multiplier)
print(result)
assert (
result == expected_result
), f"AssertionError: Expected the output to be {expected_result}"
# def test_multiply_int(num: int, multiplier, expected_result: int) -> None:
# result = multiply_int(num, multiplier)
# print(result)
# assert (
# result == expected_result
# ), f"AssertionError: Expected the output to be {expected_result}"
if __name__ == "__main__":
# create a trivial test that has 4 as the num, and 2 as the multiplier. Make sure to fill in the expected result
num =
multiplier =
expected_result =
test_multiply_int()
# if __name__ == "__main__":
# # create a trivial test that has 4 as the num, and 2 as the multiplier. Make sure to fill in the expected result
# num =
# multiplier =
# expected_result =
# test_multiply_int()

View File

@@ -1,7 +1,5 @@
from typing import List
from import
def test_two_sum(nums: List, target: int, expected_result: List[int]) -> None:
result = two_sum(nums, target)

View File

@@ -21,7 +21,6 @@ def generate_password(length: int = 8) -> str:
if __name__ == "__main__":
password_length = (
int(sys.argv[sys.argv.index("--length") + 1])
if "--length" in sys.argv else 8
int(sys.argv[sys.argv.index("--length") + 1]) if "--length" in sys.argv else 8
)
print(generate_password(password_length))

View File

@@ -18,7 +18,9 @@ class TestPasswordGenerator(unittest.TestCase):
def test_password_content(self):
password = password_generator.generate_password()
self.assertTrue(any(c.isdigit() for c in password))
self.assertTrue(any(c in password_generator.string.punctuation for c in password))
self.assertTrue(
any(c in password_generator.string.punctuation for c in password)
)
if __name__ == "__main__":

View File

@@ -1,7 +1,13 @@
from typing import Dict
from abstract_class import (AbstractBattleship, Game, GameStatus,
ShipPlacement, Turn, TurnResponse)
from abstract_class import (
AbstractBattleship,
Game,
GameStatus,
ShipPlacement,
Turn,
TurnResponse,
)
class Battleship(AbstractBattleship):

View File

@@ -258,7 +258,8 @@ class WebArenaChallengeSpec(BaseModel):
f"{' and '.join(s.base_url for s in sites)}.\n\n"
+ "\n".join(
s.additional_info.format(url=s.base_url)
for s in sites if s.additional_info
for s in sites
if s.additional_info
)
).strip()
@@ -462,7 +463,7 @@ class WebArenaChallenge(BaseChallenge):
def load_webarena_challenges(
skip_unavailable: bool = True
skip_unavailable: bool = True,
) -> Iterator[type[WebArenaChallenge]]:
logger.info("Loading WebArena challenges...")

433
cli.py
View File

@@ -63,139 +63,6 @@ d88P 888 "Y88888 "Y888 "Y88P" "Y8888P88 888 888
)
install_error = True
try:
# Check if git user is configured
user_name = (
subprocess.check_output(["git", "config", "user.name"])
.decode("utf-8")
.strip()
)
user_email = (
subprocess.check_output(["git", "config", "user.email"])
.decode("utf-8")
.strip()
)
if user_name and user_email:
click.echo(
click.style(
f"✅ Git is configured with name '{user_name}' and email '{user_email}'",
fg="green",
)
)
else:
raise subprocess.CalledProcessError(
returncode=1, cmd="git config user.name or user.email"
)
except subprocess.CalledProcessError:
# If the GitHub account is not configured, print instructions on how to set it up
click.echo(click.style("⚠️ Git user is not configured.", fg="red"))
click.echo(
click.style(
"To configure Git with your user info, use the following commands:",
fg="red",
)
)
click.echo(
click.style(' git config --global user.name "Your (user)name"', fg="red")
)
click.echo(
click.style(' git config --global user.email "Your email"', fg="red")
)
install_error = True
print_access_token_instructions = False
# Check for the existence of the .github_access_token file
if os.path.exists(".github_access_token"):
with open(".github_access_token", "r") as file:
github_access_token = file.read().strip()
if github_access_token:
click.echo(
click.style(
"✅ GitHub access token loaded successfully.", fg="green"
)
)
# Check if the token has the required permissions
import requests
headers = {"Authorization": f"token {github_access_token}"}
response = requests.get("https://api.github.com/user", headers=headers)
if response.status_code == 200:
scopes = response.headers.get("X-OAuth-Scopes")
if "public_repo" in scopes or "repo" in scopes:
click.echo(
click.style(
"✅ GitHub access token has the required permissions.",
fg="green",
)
)
else:
install_error = True
click.echo(
click.style(
"❌ GitHub access token does not have the required permissions. Please ensure it has 'public_repo' or 'repo' scope.",
fg="red",
)
)
else:
install_error = True
click.echo(
click.style(
"❌ Failed to validate GitHub access token. Please ensure it is correct.",
fg="red",
)
)
else:
install_error = True
click.echo(
click.style(
"❌ GitHub access token file is empty. Please follow the instructions below to set up your GitHub access token.",
fg="red",
)
)
print_access_token_instructions = True
else:
# Create the .github_access_token file if it doesn't exist
with open(".github_access_token", "w") as file:
file.write("")
install_error = True
print_access_token_instructions = True
if print_access_token_instructions:
# Instructions to set up GitHub access token
click.echo(
click.style(
"💡 To configure your GitHub access token, follow these steps:", fg="red"
)
)
click.echo(
click.style("\t1. Ensure you are logged into your GitHub account", fg="red")
)
click.echo(
click.style("\t2. Navigate to https://github.com/settings/tokens", fg="red")
)
click.echo(click.style("\t3. Click on 'Generate new token'.", fg="red"))
click.echo(
click.style("\t4. Click on 'Generate new token (classic)'.", fg="red")
)
click.echo(
click.style(
"\t5. Fill out the form to generate a new token. Ensure you select the 'repo' scope.",
fg="red",
)
)
click.echo(
click.style(
"\t6. Open the '.github_access_token' file in the same directory as this script and paste the token into this file.",
fg="red",
)
)
click.echo(
click.style("\t7. Save the file and run the setup command again.", fg="red")
)
if install_error:
click.echo(
click.style(
@@ -605,306 +472,6 @@ def benchmark_tests_details(test_name):
continue
@cli.group()
def arena():
"""Commands to enter the arena"""
pass
@arena.command()
@click.argument("agent_name")
@click.option("--branch", default="master", help="Branch to use instead of master")
def enter(agent_name, branch):
import json
import os
import subprocess
from datetime import datetime
from github import Github
# Check if the agent_name directory exists in the autogpts directory
agent_dir = f"./autogpts/{agent_name}"
if not os.path.exists(agent_dir):
click.echo(
click.style(
f"❌ The directory for agent '{agent_name}' does not exist in the autogpts directory.",
fg="red",
)
)
click.echo(
click.style(
f"🚀 Run './run agent create {agent_name}' to create the agent.",
fg="yellow",
)
)
return
else:
# Check if the agent has already entered the arena
try:
subprocess.check_output(
[
"git",
"rev-parse",
"--verify",
"--quiet",
f"arena_submission_{agent_name}",
]
)
except subprocess.CalledProcessError:
pass
else:
click.echo(
click.style(
f"⚠️ The agent '{agent_name}' has already entered the arena. To update your submission, follow these steps:",
fg="yellow",
)
)
click.echo(
click.style(
f"1. Get the git hash of your submission by running 'git rev-parse HEAD' on the branch you want to submit to the arena.",
fg="yellow",
)
)
click.echo(
click.style(
f"2. Change the branch to 'arena_submission_{agent_name}' by running 'git checkout arena_submission_{agent_name}'.",
fg="yellow",
)
)
click.echo(
click.style(
f"3. Modify the 'arena/{agent_name}.json' to include the new commit hash of your submission (the hash you got from step 1) and an up-to-date timestamp by running './run arena update {agent_name} hash --branch x'.",
fg="yellow",
)
)
click.echo(
click.style(
f"Note: The '--branch' option is only needed if you want to change the branch that will be used.",
fg="yellow",
)
)
return
# Check if there are staged changes
staged_changes = [
line
for line in subprocess.check_output(["git", "status", "--porcelain"])
.decode("utf-8")
.split("\n")
if line and line[0] in ("A", "M", "D", "R", "C")
]
if staged_changes:
click.echo(
click.style(
f"❌ There are staged changes. Please commit or stash them and run the command again.",
fg="red",
)
)
return
try:
# Load GitHub access token from file
with open(".github_access_token", "r") as file:
github_access_token = file.read().strip()
# Get GitHub repository URL
github_repo_url = (
subprocess.check_output(["git", "config", "--get", "remote.origin.url"])
.decode("utf-8")
.strip()
)
if github_repo_url.startswith("git@"):
github_repo_url = (
github_repo_url.replace(":", "/")
.replace("git@", "https://")
.replace(".git", "")
)
# If --branch is passed, use it instead of master
if branch:
branch_to_use = branch
else:
branch_to_use = "master"
# Get the commit hash of HEAD of the branch_to_use
commit_hash_to_benchmark = (
subprocess.check_output(["git", "rev-parse", branch_to_use])
.decode("utf-8")
.strip()
)
arena_submission_branch = f"arena_submission_{agent_name}"
# Create a new branch called arena_submission_{agent_name}
subprocess.check_call(["git", "checkout", "-b", arena_submission_branch])
# Create a dictionary with the necessary fields
data = {
"github_repo_url": github_repo_url,
"timestamp": datetime.utcnow().isoformat(),
"commit_hash_to_benchmark": commit_hash_to_benchmark,
}
# If --branch was passed, add branch_to_benchmark to the JSON file
if branch:
data["branch_to_benchmark"] = branch
# Create agent directory if it does not exist
subprocess.check_call(["mkdir", "-p", "arena"])
# Create a JSON file with the data
with open(f"arena/{agent_name}.json", "w") as json_file:
json.dump(data, json_file, indent=4)
# Create a commit with the specified message
subprocess.check_call(["git", "add", f"arena/{agent_name}.json"])
subprocess.check_call(
["git", "commit", "-m", f"{agent_name} entering the arena"]
)
# Push the commit
subprocess.check_call(["git", "push", "origin", arena_submission_branch])
# Create a PR into the parent repository
g = Github(github_access_token)
repo_name = github_repo_url.replace("https://github.com/", "")
repo = g.get_repo(repo_name)
parent_repo = repo.parent
if parent_repo:
pr_message = f"""
### 🌟 Welcome to the AutoGPT Arena Hacks Hackathon! 🌟
Hey there amazing builders! We're thrilled to have you join this exciting journey. Before you dive deep into building, we'd love to know more about you and the awesome project you are envisioning. Fill out the template below to kickstart your hackathon journey. May the best agent win! 🏆
#### 🤖 Team Introduction
- **Agent Name:** {agent_name}
- **Team Members:** (Who are the amazing minds behind this team? Do list everyone along with their roles!)
- **Repository Link:** [{github_repo_url.replace('https://github.com/', '')}]({github_repo_url})
#### 🌟 Project Vision
- **Starting Point:** (Are you building from scratch or starting with an existing agent? Do tell!)
- **Preliminary Ideas:** (Share your initial ideas and what kind of project you are aiming to build. We are all ears!)
#### 🏆 Prize Category
- **Target Prize:** (Which prize caught your eye? Which one are you aiming for?)
- **Why this Prize:** (We'd love to know why this prize feels like the right fit for your team!)
#### 🎬 Introduction Video
- **Video Link:** (If you'd like, share a short video where you introduce your team and talk about your project. We'd love to see your enthusiastic faces!)
#### 📝 Notes and Compliance
- **Additional Notes:** (Any other things you want to share? We're here to listen!)
- **Compliance with Hackathon Rules:** (Just a gentle reminder to stick to the rules outlined for the hackathon)
#### ✅ Checklist
- [ ] We have read and are aligned with the [Hackathon Rules](https://lablab.ai/event/autogpt-arena-hacks).
- [ ] We confirm that our project will be open-source and adhere to the MIT License.
- [ ] Our lablab.ai registration email matches our OpenAI account to claim the bonus credits (if applicable).
"""
head = f"{repo.owner.login}:{arena_submission_branch}"
pr = parent_repo.create_pull(
title=f"{agent_name} entering the arena",
body=pr_message,
head=head,
base=branch_to_use,
)
click.echo(
click.style(
f"🚀 {agent_name} has entered the arena! Please edit your PR description at the following URL: {pr.html_url}",
fg="green",
)
)
else:
click.echo(
click.style(
"❌ This repository does not have a parent repository to sync with.",
fg="red",
)
)
return
# Switch back to the master branch
subprocess.check_call(["git", "checkout", branch_to_use])
except Exception as e:
click.echo(click.style(f"❌ An error occurred: {e}", fg="red"))
# Switch back to the master branch
subprocess.check_call(["git", "checkout", branch_to_use])
@arena.command()
@click.argument("agent_name")
@click.argument("hash")
@click.option("--branch", default=None, help="Branch to use instead of current branch")
def update(agent_name, hash, branch):
import json
import os
import subprocess
from datetime import datetime
# Check if the agent_name.json file exists in the arena directory
agent_json_file = f"./arena/{agent_name}.json"
# Check if they are on the correct branch
current_branch = (
subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
.decode("utf-8")
.strip()
)
correct_branch = f"arena_submission_{agent_name}"
if current_branch != correct_branch:
click.echo(
click.style(
f"❌ You are not on the correct branch. Please switch to the '{correct_branch}' branch.",
fg="red",
)
)
return
if not os.path.exists(agent_json_file):
click.echo(
click.style(
f"❌ The file for agent '{agent_name}' does not exist in the arena directory.",
fg="red",
)
)
click.echo(
click.style(
f"⚠️ You need to enter the arena first. Run './run arena enter {agent_name}'",
fg="yellow",
)
)
return
else:
# Load the existing data
with open(agent_json_file, "r") as json_file:
data = json.load(json_file)
# Update the commit hash and timestamp
data["commit_hash_to_benchmark"] = hash
data["timestamp"] = datetime.utcnow().isoformat()
# If --branch was passed, update the branch_to_benchmark in the JSON file
if branch:
data["branch_to_benchmark"] = branch
# Write the updated data back to the JSON file
with open(agent_json_file, "w") as json_file:
json.dump(data, json_file, indent=4)
click.echo(
click.style(
f"🚀 The file for agent '{agent_name}' has been updated in the arena directory.",
fg="green",
)
)
def wait_until_conn_ready(port: int = 8000, timeout: int = 30):
"""
Polls localhost:{port} until it is available for connections