fix: [website] poetry and main

Author: DavidCruciani

website/README.md

@@ -11,9 +11,8 @@ Use all MISP modules through a dedicated website without requiring a MISP instan
 The MISP Modules website uses [Poetry](https://python-poetry.org/) for dependency management. It is recommended to install dependencies in a virtual environment managed by Poetry.
 
 ### Prerequisites
-- Python 3.8 or higher
+- Python 3.10 or higher
 - Poetry
-- `misp-modules` installed in the parent directory (`../`)
 
 ### Steps
 1. **Clone the Repository**:
@@ -35,13 +34,10 @@ The MISP Modules website uses [Poetry](https://python-poetry.org/) for dependenc
 
 4. **Initialize the Database**:
    ```bash
-   poetry run db-init
+   poetry run mmw db init
    ```
    This creates the database (`misp-module.sqlite`), initializes modules, and sets up the admin password (generated in development if not set).
 
-5. **Install `misp-modules`**:
-   Ensure `misp-modules` is installed in the parent directory (`../misp-modules`). Follow the main repository’s instructions for setup.
-
 ## Configuration
 
 Configuration is managed via a `.env` file in `website/`. Copy the example and edit as needed:
@@ -83,7 +79,7 @@ FLASK_APP=main
 Run both `misp-modules` and the website in development mode with debug enabled:
 
 ```bash
-poetry run dev-site
+poetry run mmw dev
 ```
 
 - If `ADMIN_PASSWORD` is unset in `.env`, a random 20-character password is generated and printed.
@@ -104,10 +100,10 @@ If `ADMIN_PASSWORD` is set in `.env`, the admin user is active. Access the login
 Manage the database with the following commands:
 
 ```bash
-poetry run db-init      # Initialize database and modules
-poetry run db-migrate   # Generate a new migration
-poetry run db-upgrade   # Apply migrations
-poetry run db-downgrade # Revert the latest migration
+poetry run mmw db init     # Initialize database and modules
+poetry run mmw db migrate   # Generate a new migration
+poetry run mmw db upgrade   # Apply migrations
+poetry run mmw db downgrade # Revert the latest migration
 ```
 
 ## Systemd Services

website/main.py

@@ -5,7 +5,6 @@
 import time
 
 from dotenv import load_dotenv
-
 from app import create_app, db
 
 # Load environment variables from .env
@@ -16,91 +15,109 @@
 app = create_app()
 
 
-# CLI commands using argparse
+def run_dev():
+    """Run misp-modules + Flask dev server"""
+    # Only the parent process starts misp-modules
+    if os.getenv("WERKZEUG_RUN_MAIN") != "true":
+        print("Starting misp-modules...")
+
+        modules_env = os.environ.copy()
+        modules_env.pop("VIRTUAL_ENV", None)
+
+        misp_proc = subprocess.Popen(
+            ["poetry", "run", "misp-modules", "-l", "127.0.0.1"],
+            cwd="..",
+            env=modules_env,
+        )
+        time.sleep(2)
+
+    from app.utils import IS_DEVELOPMENT
+
+    IS_DEVELOPMENT = True
+
+    try:
+        print("Starting website in debug mode...")
+        app.run(
+            host=app.config["FLASK_URL"],
+            port=app.config["FLASK_PORT"],
+            debug=IS_DEVELOPMENT,
+        )
+    finally:
+        if os.getenv("WERKZEUG_RUN_MAIN") != "true":
+            misp_proc.terminate()
+
+
+def db_init():
+    """Initialize the database"""
+    from app.utils import gen_admin_password
+    from app.utils.init_modules import create_modules_db
+
+    modules_env = os.environ.copy()
+    modules_env.pop("VIRTUAL_ENV", None)
+
+    misp_proc = subprocess.Popen(
+        ["poetry", "run", "misp-modules", "-l", "127.0.0.1"],
+        cwd="..",
+        env=modules_env,
+    )
+    time.sleep(5)
+
+    with app.app_context():
+        db.create_all()
+        create_modules_db()
+        gen_admin_password()
+        print("Database initialized.")
+
+    misp_proc.terminate()
+
+
+def db_migrate():
+    subprocess.run(["flask", "db", "migrate"])
+
+
+def db_upgrade():
+    subprocess.run(["flask", "db", "upgrade"])
+
+
+def db_downgrade():
+    subprocess.run(["flask", "db", "downgrade"])
+
+
 def main():
     parser = argparse.ArgumentParser(description="MISP Modules Website CLI")
-    parser.add_argument(
-        "--dev",
-        action="store_true",
-        help="Run misp-modules and the website in debug mode",
-    )
-    parser.add_argument(
-        "--db-init", action="store_true", help="Initialize the database"
-    )
-    parser.add_argument(
-        "--db-migrate", action="store_true", help="Generate a new database migration"
-    )
-    parser.add_argument(
-        "--db-upgrade", action="store_true", help="Apply database migrations"
-    )
-    parser.add_argument(
-        "--db-downgrade",
-        action="store_true",
-        help="Revert the latest database migration",
-    )
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    # --- dev ---
+    subparsers.add_parser("dev", help="Run misp-modules + website in debug mode")
+
+    # --- db group ---
+    db_parser = subparsers.add_parser("db", help="Database operations")
+    db_sub = db_parser.add_subparsers(dest="action", required=True)
+
+    db_sub.add_parser("init", help="Initialize the database")
+    db_sub.add_parser("migrate", help="Generate a new migration")
+    db_sub.add_parser("upgrade", help="Apply migrations")
+    db_sub.add_parser("downgrade", help="Revert the last migration")
+
     args = parser.parse_args()
 
-    # Set FLASK_APP for flask db commands
+    # ensure flask commands know where to find the app
     os.environ["FLASK_APP"] = "app:create_app()"
 
-    if args.dev:
-        # Import utils to set development mode
-        from app.utils import utils as utils_module
+    if args.command == "dev":
+        run_dev()
 
-        # Only the FIRST process (the parent) should launch misp‑modules
-        if os.getenv("WERKZEUG_RUN_MAIN") != "true":
-            print("Starting misp-modules...")
-
-            modules_env = os.environ.copy()
-            modules_env.pop("VIRTUAL_ENV", None)
-
-            misp_proc = subprocess.Popen(
-                ["poetry", "run", "misp-modules", "-l", "127.0.0.1"],
-                cwd="..",
-                env=modules_env,
-            )
-            time.sleep(5)
-
-        # Import utils after app creation to avoid circular imports
-        from app.utils import IS_DEVELOPMENT, gen_admin_password
-        from app.utils.init_modules import create_modules_db
-
-        IS_DEVELOPMENT = True  # Set global variable in utils.py
-
-        try:
-            print("Starting website in debug mode...")
-            app.run(
-                host=app.config["FLASK_URL"],
-                port=app.config["FLASK_PORT"],
-                debug=IS_DEVELOPMENT,
-            )
-        finally:
-            # Only parent created misp_proc
-            if os.getenv("WERKZEUG_RUN_MAIN") != "true":
-                misp_proc.terminate()
-
-    elif args.db_init:
-        # Use the already-created app instance
-        from app.utils import gen_admin_password
-        from app.utils.init_modules import create_modules_db
-
-        with app.app_context():
-            db.create_all()
-            create_modules_db()
-            gen_admin_password()
-            print("Database initialized.")
-    elif args.db_migrate:
-        # Run flask db migrate without creating app
-        subprocess.run(["flask", "db", "migrate"])
-    elif args.db_upgrade:
-        # Run flask db upgrade without creating app
-        subprocess.run(["flask", "db", "upgrade"])
-    elif args.db_downgrade:
-        # Run flask db downgrade without creating app
-        subprocess.run(["flask", "db", "downgrade"])
-    else:
-        parser.print_help()
+    elif args.command == "db":
+        match args.action:
+            case "init":
+                db_init()
+            case "migrate":
+                db_migrate()
+            case "upgrade":
+                db_upgrade()
+            case "downgrade":
+                db_downgrade()
 
 
 if __name__ == "__main__":
-    main()
+    main()