Small cleanup and adjustments

This commit is contained in:
Ines Montani 2020-08-26 10:26:57 +02:00
parent 31567d1e42
commit aeebc6678d
3 changed files with 6 additions and 11 deletions

View File

@ -154,6 +154,8 @@ def save_config(config: Config, output_file: Path, is_stdout: bool = False) -> N
if is_stdout: if is_stdout:
print(config.to_str()) print(config.to_str())
else: else:
if not output_file.parent.exists():
output_file.parent.mkdir(parents=True)
config.to_disk(output_file, interpolate=False) config.to_disk(output_file, interpolate=False)
msg.good("Saved config", output_file) msg.good("Saved config", output_file)
msg.text("You can now add your data and train your model:") msg.text("You can now add your data and train your model:")

View File

@ -10,15 +10,6 @@ from .._util import project_cli, Arg, PROJECT_FILE, load_project_config, get_che
from .._util import download_file, git_sparse_checkout from .._util import download_file, git_sparse_checkout
# TODO: find a solution for caches
# CACHES = [
# Path.home() / ".torch",
# Path.home() / ".caches" / "torch",
# os.environ.get("TORCH_HOME"),
# Path.home() / ".keras",
# ]
@project_cli.command("assets") @project_cli.command("assets")
def project_assets_cli( def project_assets_cli(
# fmt: off # fmt: off
@ -99,7 +90,6 @@ def fetch_asset(
RETURNS (Optional[Path]): The path to the fetched asset or None if fetching RETURNS (Optional[Path]): The path to the fetched asset or None if fetching
the asset failed. the asset failed.
""" """
# TODO: add support for caches
dest_path = (project_path / dest).resolve() dest_path = (project_path / dest).resolve()
if dest_path.exists() and checksum: if dest_path.exists() and checksum:
# If there's already a file, check for checksum # If there's already a file, check for checksum
@ -134,7 +124,7 @@ def convert_asset_url(url: str) -> str:
RETURNS (str): The converted URL. RETURNS (str): The converted URL.
""" """
# If the asset URL is a regular GitHub URL it's likely a mistake # If the asset URL is a regular GitHub URL it's likely a mistake
if re.match(r"(http(s?)):\/\/github.com", url): if re.match(r"(http(s?)):\/\/github.com", url) and "releases/download" not in url:
converted = url.replace("github.com", "raw.githubusercontent.com") converted = url.replace("github.com", "raw.githubusercontent.com")
converted = re.sub(r"/(tree|blob)/", "/", converted) converted = re.sub(r"/(tree|blob)/", "/", converted)
msg.warn( msg.warn(

View File

@ -101,6 +101,9 @@ def print_run_help(project_dir: Path, subcommand: Optional[str] = None) -> None:
print(f"For command details, run: {help_cmd}") print(f"For command details, run: {help_cmd}")
else: else:
print("") print("")
title = config.get("title")
if title:
print(f"{title}\n")
if config_commands: if config_commands:
print(f"Available commands in {PROJECT_FILE}") print(f"Available commands in {PROJECT_FILE}")
print(f"Usage: {COMMAND} project run [COMMAND] {project_loc}") print(f"Usage: {COMMAND} project run [COMMAND] {project_loc}")