diff --git a/pyproject.toml b/pyproject.toml index f9b4383db..c9ed337d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ readme = "README.md" requires-python = ">=3.12,<3.13" classifiers = ["Programming Language :: Python :: 3", "Programming Language :: Python :: 3.12"] dependencies = [ - "mettagrid==0.26.12", + "mettagrid==0.26.13", "softmax-cli==0.26.5", "packaging>=24.0.0", "pydantic>=2.11.5", @@ -75,8 +75,8 @@ testpaths = ["tests"] source = ["cogames"] [tool.uv.sources] -mettagrid = { workspace = true } -softmax-cli = { workspace = true } +mettagrid = {git = "https://github.com/Metta-AI/mettagrid.git"} +softmax-cli = {git = "https://github.com/Metta-AI/softmax-cli.git"} diplomacog = { git = "https://github.com/Metta-AI/cogame-diplomacog.git" } hungercog = { git = "https://github.com/Metta-AI/cogame-hungercog.git" } overcogged = { git = "https://github.com/Metta-AI/cogame-overcogged.git" } diff --git a/src/cogames/main.py b/src/cogames/main.py index b844a49da..4217f113b 100644 --- a/src/cogames/main.py +++ b/src/cogames/main.py @@ -47,7 +47,7 @@ def _run_metadata_only_cli() -> None: @metadata_app.command("missions") def _missions_cmd( - mission_filter: Optional[str] = typer.Argument(None, metavar="MISSION"), + mission_filter: Optional[str] = typer.Argument(None, metavar="FILTER"), game_name: str = typer.Option("cogsguard", "--game", help="Game whose missions to list."), ) -> None: list_missions(mission_filter, game_name=game_name) @@ -1018,12 +1018,11 @@ def make_mission( rich_help_panel="Tutorial", epilog="""[dim]Examples:[/dim] -[cyan]cogames tutorial make-policy -t -o my_nn_policy.py[/cyan] Trainable (neural network) +[cyan]cogames tutorial make-policy --trainable -o my_nn_policy.py[/cyan] Trainable (neural network) -[cyan]cogames tutorial make-policy -s -o my_scripted_policy.py[/cyan] Scripted (rule-based) +[cyan]cogames tutorial make-policy --scripted -o my_scripted_policy.py[/cyan] Scripted (rule-based) -[cyan]cogames tutorial make-policy --amongthem -o amongthem_policy.py[/cyan] - AmongThem scripted practice""", +[cyan]cogames tutorial make-policy --amongthem -o amongthem_policy.py[/cyan] AmongThem scripted practice""", add_help_option=False, ) def make_policy( @@ -2510,7 +2509,7 @@ def docs_cmd( doc_name: Optional[str] = typer.Argument( None, metavar="DOC", - help="Document name (readme, mission, technical_manual, scripted_agent, evals, mapgen).", + help=f"Document name ({', '.join(sorted(_DOC_DESCRIPTIONS.keys()))}).", ), _help: bool = typer.Option( False,