Skip to content

Add typer and remove hydra #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 20, 2024
Merged

Add typer and remove hydra #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
19b61a0
support typer
nanjiangwill Sep 19, 2024
d8ca211
minor fix
nanjiangwill Sep 19, 2024
5269e0c
remove yaml load
nanjiangwill Sep 19, 2024
c0283cf
ad uv
nanjiangwill Sep 19, 2024
2b63ebc
add uv
nanjiangwill Sep 19, 2024
f3d2128
cleanup
wenting-zhao Sep 20, 2024
9e0095f
updated ci
wenting-zhao Sep 20, 2024
5e88e95
pre-commit
wenting-zhao Sep 20, 2024
929cc90
fixed ci
wenting-zhao Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/system.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
- name: Install the project
run: uv sync
- name: Set up commit0
run: uv run commit0 clone simpy
run: uv run commit0 setup simpy
- name: Build docker images
run: uv run commit0 build simpy
- name: Get tests
run: uv run commit0 get-tests simpy
- name: Test
run: uv run commit0 test-reference simpy tests/test_event.py::test_succeed
run: uv run commit0 test simpy tests/test_event.py::test_succeed --reference
- name: Evaluate
run: uv run commit0 evaluate-reference simpy
run: uv run commit0 evaluate simpy --reference
- name: Lint
run: uv run commit0 lint commit0/harness/lint.py
- name: Save
Expand Down
167 changes: 3 additions & 164 deletions commit0/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,171 +1,10 @@
import commit0.harness.run_pytest_ids
import commit0.harness.get_pytest_ids
import commit0.harness.build
import commit0.harness.setup
import commit0.harness.evaluate
import commit0.harness.lint
import commit0.harness.save
import copy
import sys
import os
import hydra
from hydra.core.config_store import ConfigStore
from commit0.configs.config_class import Commit0Config
from commit0.harness.constants import COMMANDS, SPLIT
from omegaconf import OmegaConf
from commit0.cli import app as commit0_app


def main() -> None:
command = sys.argv[1]
if command not in COMMANDS:
raise ValueError(
f"command must be from {', '.join(COMMANDS)}, but you provided {command}"
)
# type check config values
cs = ConfigStore.instance()
cs.store(name="user", group="Commit0Config", node=Commit0Config)
# have hydra to ignore all command-line arguments
sys_argv = copy.deepcopy(sys.argv)
cfg_arg = next((arg for arg in sys_argv if arg.startswith("--cfg=")), None)

hydra.initialize(version_base=None, config_path="configs")
config = hydra.compose(config_name="user")

if cfg_arg:
sys_argv.remove(cfg_arg)
config_name = cfg_arg.split("=")[1]
user_config = OmegaConf.load(config_name)
config = OmegaConf.merge(config, user_config)

# after hydra gets all configs, put command-line arguments back
sys.argv = sys_argv
# repo_split: split from command line has a higher priority than split in hydra
if command in [
"clone",
"build",
"evaluate",
"evaluate-reference",
"save",
]:
if len(sys.argv) >= 3:
if sys.argv[2] not in SPLIT:
raise ValueError(
f"repo split must be from {', '.join(SPLIT.keys())}, but you provided {sys.argv[2]}"
)
config.repo_split = sys.argv[2]
config.base_dir = os.path.abspath(config.base_dir)

if command == "clone":
if len(sys.argv) != 3:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 clone {repo_split}"
)
commit0.harness.setup.main(
config.dataset_name,
config.dataset_split,
config.repo_split,
config.base_dir,
)
elif command == "build":
if len(sys.argv) != 3:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 build {repo_split}"
)
commit0.harness.build.main(
config.dataset_name,
config.dataset_split,
config.repo_split,
config.num_workers,
config.backend,
)
elif command == "get-tests":
if len(sys.argv) != 3:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 get-tests {repo_name}"
)
repo = sys.argv[2]
commit0.harness.get_pytest_ids.main(repo, stdout=True)
elif command == "test" or command == "test-reference":
# this command assume execution in arbitrary working directory
repo_or_repo_path = sys.argv[2]
if command == "test-reference":
if len(sys.argv) != 4:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 test-reference {repo_dir} {test_ids}"
)
branch = "reference"
test_ids = sys.argv[3]
else:
if len(sys.argv) != 5:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 test {repo_dir} {branch} {test_ids}"
)
branch = sys.argv[3]
test_ids = sys.argv[4]
if branch.startswith("branch="):
branch = branch[len("branch=") :]
commit0.harness.run_pytest_ids.main(
config.dataset_name,
config.dataset_split,
config.base_dir,
repo_or_repo_path,
branch,
test_ids,
config.backend,
config.timeout,
config.num_cpus,
stdout=True,
)
elif command == "evaluate" or command == "evaluate-reference":
if command == "evaluate-reference":
if len(sys.argv) != 3:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 evaluate-reference {repo_split}"
)
branch = "reference"
else:
if len(sys.argv) != 4:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 evaluate {repo_split} {branch}"
)
branch = sys.argv[3]
if branch.startswith("branch="):
branch = branch[len("branch=") :]
commit0.harness.evaluate.main(
config.dataset_name,
config.dataset_split,
config.repo_split,
config.base_dir,
branch,
config.backend,
config.timeout,
config.num_cpus,
config.num_workers,
)
elif command == "lint":
files = sys.argv[1:]
commit0.harness.lint.main(config.base_dir, files)
elif command == "save":
if len(sys.argv) != 5:
raise ValueError(
"You provided an incorrect number of arguments.\nUsage: commit0 save {repo_split} {owner} {branch}"
)
owner = sys.argv[3]
branch = sys.argv[4]
if branch.startswith("branch="):
branch = branch[len("branch=") :]
commit0.harness.save.main(
config.dataset_name,
config.dataset_split,
config.repo_split,
config.base_dir,
owner,
branch,
config.github_token,
)
"""Main function to run the CLI"""
commit0_app()


if __name__ == "__main__":
main()

__all__ = []
Loading