switch check to see if the submission branch exists

This commit is contained in:
SwiftyOS
2023-09-16 19:37:52 +02:00
parent 5bfefd6a12
commit 4245a6c4f0

28
cli.py
View File

@@ -582,7 +582,19 @@ def enter(agent_name, branch):
return return
else: else:
# Check if the agent has already entered the arena # Check if the agent has already entered the arena
if os.path.exists(f"arena/{agent_name}.json"): try:
subprocess.check_output(
[
"git",
"rev-parse",
"--verify",
"--quiet",
f"arena_submission_{agent_name}",
]
)
except subprocess.CalledProcessError:
pass
else:
click.echo( click.echo(
click.style( click.style(
f"⚠️ The agent '{agent_name}' has already entered the arena. To update your submission, follow these steps:", f"⚠️ The agent '{agent_name}' has already entered the arena. To update your submission, follow these steps:",
@@ -644,6 +656,13 @@ def enter(agent_name, branch):
.strip() .strip()
) )
if github_repo_url.startswith("git@"):
github_repo_url = (
github_repo_url.replace("git@", "https://")
.replace(".git", "")
.replace(":", "/")
)
# If --branch is passed, use it instead of master # If --branch is passed, use it instead of master
if branch: if branch:
branch_to_use = branch branch_to_use = branch
@@ -659,7 +678,7 @@ def enter(agent_name, branch):
arena_submission_branch = f"arena_submission_{agent_name}" arena_submission_branch = f"arena_submission_{agent_name}"
# Create a new branch called arena_submission_{agent_name} # Create a new branch called arena_submission_{agent_name}
subprocess.check_call(['git', 'checkout', '-b', arena_submission_branch]) subprocess.check_call(["git", "checkout", "-b", arena_submission_branch])
# Create a dictionary with the necessary fields # Create a dictionary with the necessary fields
data = { data = {
"github_repo_url": github_repo_url, "github_repo_url": github_repo_url,
@@ -703,7 +722,7 @@ Hey there amazing builders! We're thrilled to have you join this exciting journe
- **Agent Name:** {agent_name} - **Agent Name:** {agent_name}
- **Team Members:** (Who are the amazing minds behind this team? Do list everyone along with their roles!) - **Team Members:** (Who are the amazing minds behind this team? Do list everyone along with their roles!)
- **Repository Link:** (Do share the link where all the magic is happening) - **Repository Link:** [{github_repo_url.replace('https://github.com/', '')}]({github_repo_url})
#### 🌟 Project Vision #### 🌟 Project Vision
@@ -730,7 +749,7 @@ Hey there amazing builders! We're thrilled to have you join this exciting journe
- [ ] We confirm that our project will be open-source and adhere to the MIT License. - [ ] 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). - [ ] Our lablab.ai registration email matches our OpenAI account to claim the bonus credits (if applicable).
""", """,
head=f'{repo.owner.login}:{arena_submission_branch}', head=f"{repo.owner.login}:{arena_submission_branch}",
base=branch_to_use, base=branch_to_use,
) )
click.echo( click.echo(
@@ -756,6 +775,7 @@ Hey there amazing builders! We're thrilled to have you join this exciting journe
# Switch back to the master branch # Switch back to the master branch
subprocess.check_call(["git", "checkout", branch_to_use]) subprocess.check_call(["git", "checkout", branch_to_use])
@arena.command() @arena.command()
@click.argument("agent_name") @click.argument("agent_name")
@click.argument("hash") @click.argument("hash")