Combine CLI commands into one

Author: mfisher87

README.md

@@ -153,8 +153,7 @@ browser to `http://localhost:8080` and enter:
 ### Run ingest
 
 ```bash
-docker compose run cli init  # Create empty tables (deleting any pre-existing ones)
-docker compose run cli load  # Load the tables from event files
+docker compose run cli init
 ```
 
 From a fast disk, this should take under 2 minutes.

src/aross_stations_db/cli.py

@@ -3,7 +3,7 @@
 from sqlalchemy.orm import Session
 from tqdm import tqdm
 
-from aross_stations_db.config import CliLoadSettings, Settings
+from aross_stations_db.config import CliLoadSettings
 from aross_stations_db.db.setup import (
     generate_event_objects,
     load_events,
@@ -21,25 +21,26 @@ def cli() -> None:
     pass
 
 
+@click.option(
+    "--skip-load",
+    help="Skip loading data; only initialize tables.",
+    is_flag=True,
+)
 @cli.command
-def init() -> None:
-    """Create the database tables, dropping any that pre-exist."""
+def init(skip_load: bool = False) -> None:
+    """Load the database from files on disk."""
     # TODO: False-positive. Remove type-ignore.
     #       See: https://github.com/pydantic/pydantic/issues/6713
-    config = Settings()  # type:ignore[call-arg]
+    config = CliLoadSettings()  # type:ignore[call-arg]
 
     with Session(config.db_engine) as db_session:
         recreate_tables(db_session)
 
-    logger.success("Database initialized")
+    logger.info("Database tables initialized")
 
-
-@cli.command
-def load() -> None:
-    """Load the database tables from files on disk."""
-    # TODO: False-positive. Remove type-ignore.
-    #       See: https://github.com/pydantic/pydantic/issues/6713
-    config = CliLoadSettings()  # type:ignore[call-arg]
+    if skip_load:
+        logger.warning("Skipping data load.")
+        return
 
     raw_stations = get_stations(config.stations_metadata_filepath)
     raw_events = get_events(config.events_dir)