Misc updates

- Update PYTHON-5564
- Update project template

  - Add project specific settings via project_name.py

- Update gitignore
- Update settings
- Remove `dm repo checkout`, combine with `branch`
- Rename `dm project admin` -> manage
- Always add remotes
- Cap log at 10
- Rename `dm repo sync` -> pull
- Add `dm repo push` command
- Add missing contrib apps

Update settings

Update settings

Update settings

Author: aclark4life

.gitignore

@@ -1,3 +1,6 @@
 django_mongodb_cli.egg-info/
 django_mongodb_cli/__pycache__/
 /src/
+.idea
+server.log
+mongocryptd.pid

django_mongodb_cli/frontend.py

@@ -5,7 +5,7 @@
 import importlib.resources as resources
 import os
 
-frontend = typer.Typer(help="Manage Django apps.")
+frontend = typer.Typer(help="Manage Django frontends.")
 
 
 @frontend.command("create")

django_mongodb_cli/project.py

@@ -84,6 +84,9 @@ def _create_pyproject_toml(project_path: Path, project_name: str):
     "pytest-django",
     "ruff",
 ]
+encryption = [
+    "pymongocrypt",
+]
 
 [tool.pytest.ini_options]
 DJANGO_SETTINGS_MODULE = "{project_name}.settings.base"
@@ -114,7 +117,7 @@ def remove_project(name: str, directory: Path = Path(".")):
         typer.echo(f"❌ Project {name} does not exist.", err=True)
 
 
-def _django_admin_cmd(
+def _django_manage_command(
     name: str,
     directory: Path,
     *args: str,
@@ -132,12 +135,11 @@ def _django_admin_cmd(
 
     parent_dir = project_path.parent.resolve()
     env = os.environ.copy()
-    env["DJANGO_SETTINGS_MODULE"] = f"{name}.{
-        repo._tool_cfg.get('project', {})
-        .get('settings', {})
-        .get('path', 'settings.base')
-    }"
+    env["DJANGO_SETTINGS_MODULE"] = (
+        f"{name}.{repo._tool_cfg.get('project', {}).get('settings', {}).get('path', 'settings.base')}"
+    )
     env["PYTHONPATH"] = str(name) + os.pathsep + env.get("PYTHONPATH", "")
+    typer.echo(f"🔧 Using DJANGO_SETTINGS_MODULE={env['DJANGO_SETTINGS_MODULE']}")
     if extra_env:
         env.update(extra_env)
 
@@ -206,7 +208,7 @@ def run_project(
     with MONGODB_URI set in the environment if provided.
     """
     typer.echo(f"🚀 Running project '{name}' on http://{host}:{port}")
-    _django_admin_cmd(
+    _django_manage_command(
         name,
         directory / name,
         "runserver",
@@ -238,7 +240,9 @@ def migrate_project(
         cmd.append(migration_name)
 
     typer.echo(f"📦 Applying migrations for project '{name}'")
-    _django_admin_cmd(name, directory, *cmd, extra_env=_build_mongodb_env(mongodb_uri))
+    _django_manage_command(
+        name, directory, *cmd, extra_env=_build_mongodb_env(mongodb_uri)
+    )
 
 
 @project.command("makemigrations")
@@ -259,11 +263,13 @@ def makemigrations_project(
         cmd.append(app_label)
 
     typer.echo(f"🛠️ Making migrations for project '{name}'")
-    _django_admin_cmd(name, directory, *cmd, extra_env=_build_mongodb_env(mongodb_uri))
+    _django_manage_command(
+        name, directory, *cmd, extra_env=_build_mongodb_env(mongodb_uri)
+    )
 
 
-@project.command("admin")
-def admin_command(
+@project.command("manage")
+def manage_command(
     name: str,
     directory: Path = Path("."),
     command: str = typer.Argument(None),
@@ -276,10 +282,10 @@ def admin_command(
     Run any django-admin command for a project.
 
     Examples:
-        dm project admin mysite shell
-        dm project admin mysite createsuperuser
-        dm project admin mysite --mongodb-uri mongodb+srv://user:pwd@cluster
-        dm project admin mysite
+        dm project manage mysite shell
+        dm project manage mysite createsuperuser
+        dm project manage mysite --mongodb-uri mongodb+srv://user:pwd@cluster
+        dm project manage mysite
     """
     if args is None:
         args = []
@@ -293,10 +299,10 @@ def admin_command(
 
     if command:
         typer.echo(f"⚙️  Running django-admin {command} {' '.join(args)} for '{name}'")
-        _django_admin_cmd(name, directory, command, *args)
+        _django_manage_command(name, directory, command, *args)
     else:
         typer.echo(f"ℹ️  Running django-admin with no arguments for '{name}'")
-        _django_admin_cmd(name, directory)
+        _django_manage_command(name, directory)
 
 
 @project.command("su")
@@ -331,7 +337,7 @@ def create_superuser(
     extra_env = _build_mongodb_env(mongodb_uri) or {}
     extra_env["DJANGO_SUPERUSER_PASSWORD"] = password
 
-    _django_admin_cmd(
+    _django_manage_command(
         name,
         directory,
         "createsuperuser",

django_mongodb_cli/repo.py

@@ -128,6 +128,9 @@ def branch(
     repo = Repo()
     repo.ctx = ctx
     repo_list = repo.map
+
+    # Repo().checkout_branch(repo_name, branch_name)
+
     if delete_branch and branch_name:
         repo.delete_branch(repo_name, branch_name)
         raise typer.Exit()
@@ -166,28 +169,6 @@ def cd(
     )
 
 
-@repo.command()
-def checkout(
-    repo_name: str = typer.Argument(None),
-    branch_name: str = typer.Argument(None, help="Branch name to checkout"),
-):
-    """
-    Checkout a branch in a repository.
-    """
-
-    def checkout_branch(name):
-        Repo().checkout_branch(repo_name, branch_name)
-
-    repo_command(
-        False,
-        repo_name,
-        all_msg=None,
-        missing_msg="Please specify a repository and branch name.",
-        single_func=checkout_branch,
-        all_func=checkout_branch,
-    )
-
-
 @repo.command()
 def clone(
     repo_name: str = typer.Argument(None),
@@ -225,10 +206,9 @@ def commit(
     all_repos: bool = typer.Option(
         False, "--all-repos", "-a", help="Commit all repositories"
     ),
-    message: str = typer.Argument(None, help="Commit message"),
 ):
     """
-    Commit changes in a repository with message provided or prompt for message.
+    Commit changes in a repository
     """
 
     if all_repos:
@@ -237,7 +217,7 @@ def commit(
         )
 
     def do_commit(name):
-        Repo().commit_repo(name, message)
+        Repo().commit_repo(name)
 
     repo_command(
         all_repos,
@@ -503,16 +483,49 @@ def status(
 
 
 @repo.command()
-def sync(
+def pull(
+    ctx: typer.Context,
+    repo_name: str = typer.Argument(None),
+    all_repos: bool = typer.Option(
+        False, "--all-repos", "-a", help="Pull all repositories"
+    ),
+):
+    """
+    Pull updates for the specified repository.
+    If --all-repos is used, pull updates for all repositories.
+    """
+    repo = Repo()
+    repo.ctx = ctx
+    if not repo.map:
+        typer.echo(
+            typer.style(
+                f"No repositories found in {os.path.join(os.getcwd(), repo.pyproject_file)}.",
+                fg=typer.colors.RED,
+            )
+        )
+        raise typer.Exit()
+
+    repo_command(
+        all_repos,
+        repo_name,
+        all_msg="Pulling all repositories...",
+        missing_msg="Please specify a repository name or use -a,--all-repos to pull all repositories.",
+        single_func=lambda repo_name: repo.pull(repo_name),
+        all_func=lambda repo_name: repo.pull(repo_name),
+    )
+
+
+@repo.command()
+def push(
     ctx: typer.Context,
     repo_name: str = typer.Argument(None),
     all_repos: bool = typer.Option(
-        False, "--all-repos", "-a", help="Sync all repositories"
+        False, "--all-repos", "-a", help="Push all repositories"
     ),
 ):
     """
-    Sync a repository with its remote counterpart.
-    If --all-repos is used, sync all repositories.
+    Push updates for the specified repository.
+    If --all-repos is used, push updates for all repositories.
     """
     repo = Repo()
     repo.ctx = ctx
@@ -528,10 +541,10 @@ def sync(
     repo_command(
         all_repos,
         repo_name,
-        all_msg="Syncing all repositories...",
-        missing_msg="Please specify a repository name or use -a,--all-repos to sync all repositories.",
-        single_func=lambda repo_name: repo.sync_repo(repo_name),
-        all_func=lambda repo_name: repo.sync_repo(repo_name),
+        all_msg="Pushing all repositories...",
+        missing_msg="Please specify a repository name or use -a,--all-repos to push all repositories.",
+        single_func=lambda repo_name: repo.push(repo_name),
+        all_func=lambda repo_name: repo.push(repo_name),
     )
 
 

django_mongodb_cli/templates/project_template/justfile

@@ -3,18 +3,34 @@
 default:
     echo 'Hello, world!'
 
-[group('python')]
-install:
-    python -m pip install --upgrade pip
-    python -m pip install -e .
-alias i := install
+[group('django')]
+django-open:
+    open http://localhost:8000
+alias o := django-open
 
 [group('django')]
-serve:
+django-serve:
     python manage.py runserver
-alias s := serve
 
 [group('django')]
-migrate:
+django-migrate:
     python manage.py migrate
-alias m := migrate
+alias m := django-migrate
+
+[group('npm')]
+npm-install:
+    cd frontend && npm install
+
+[group('npm')]
+npm-serve:
+    cd frontend && npm run watch &
+
+[group('python')]
+pip-install:
+    python -m pip install --upgrade pip
+    python -m pip install -e .
+alias i := pip-install
+
+serve: npm-install npm-serve django-serve
+
+alias s := serve

django_mongodb_cli/templates/project_template/manage.py

@@ -7,7 +7,9 @@
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings.base")
+    os.environ.setdefault(
+        "DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings.{{ project_name }}"
+    )
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

django_mongodb_cli/templates/project_template/project_name/apps.py

@@ -1,6 +1,9 @@
 from django.contrib.admin.apps import AdminConfig
 from django.contrib.auth.apps import AuthConfig
 from django.contrib.contenttypes.apps import ContentTypesConfig
+from django.contrib.flatpages.apps import FlatPagesConfig
+from django.contrib.redirects.apps import RedirectsConfig
+from django.contrib.sites.apps import SitesConfig
 
 
 class MongoDBAdminConfig(AdminConfig):
@@ -13,3 +16,15 @@ class MongoDBAuthConfig(AuthConfig):
 
 class MongoDBContentTypesConfig(ContentTypesConfig):
     default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
+
+
+class MongoDBFlatPagesConfig(FlatPagesConfig):
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
+
+
+class MongoDBRedirectsConfig(RedirectsConfig):
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
+
+
+class MongoDBSitesConfig(SitesConfig):
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"

django_mongodb_cli/templates/project_template/project_name/routers.py

@@ -0,0 +1,19 @@
+class EncryptedRouter:
+    def db_for_read(self, model, **hints):
+        if model._meta.app_label == "django_mongodb_demo":
+            return "encrypted"
+        return None
+
+    db_for_write = db_for_read
+
+    def allow_migrate(self, db, app_label, model_name=None, **hints):
+        if app_label == "django_mongodb_demo":
+            print("allow_migrate for django_mongodb_demo:", db)
+            return db == "encrypted"
+        # Don't create other app's models in the encrypted database.
+        if db == "encrypted":
+            return False
+        return None
+
+    def kms_provider(self, model, **hints):
+        return "local"