djangx 1.5.6__tar.gz → 1.5.7__tar.gz

{djangx-1.5.6 → djangx-1.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: djangx
-Version: 1.5.6
+Version: 1.5.7
 Summary: Build and deploy Django apps with confidence.
 Author: Kevin Wasike Wakhisi
 Author-email: Kevin Wasike Wakhisi <kevin@christianwhocodes.space>

{djangx-1.5.6 → djangx-1.5.7}/pyproject.toml

@@ -13,7 +13,7 @@ djx = "djangx.management.cli:main"
 
 [project]
 name = "djangx"
-version = "1.5.6"
+version = "1.5.7"
 description = "Build and deploy Django apps with confidence."
 readme = "README.md"
 license = { file = "LICENSE" }

djangx-1.5.7/src/djangx/api/enums.py

@@ -0,0 +1,8 @@
+from enum import StrEnum
+
+
+class DatabaseBackend(StrEnum):
+    """Available database backends."""
+
+    SQLITE3 = "sqlite3"
+    POSTGRESQL = "postgresql"

{djangx-1.5.6 → djangx-1.5.7}/src/djangx/api/settings/databases.py

@@ -5,6 +5,7 @@
 # https://www.postgresql.org/docs/current/libpq-pgpass.html
 # ==============================================================================
 from ... import PROJECT_DIR, Conf, ConfField
+from ..enums import DatabaseBackend
 from ..types import DatabaseDict, DatabaseOptionsDict, DatabasesDict
 
 
@@ -13,10 +14,10 @@ class DatabaseConf(Conf):
 
     backend = ConfField(
         type=str,
-        choices=["sqlite3", "postgresql"],
+        choices=[DatabaseBackend.SQLITE3, DatabaseBackend.POSTGRESQL],
         env="DB_BACKEND",
         toml="db.backend",
-        default="sqlite3",
+        default=DatabaseBackend.SQLITE3,
     )
     # postgresql specific
     use_vars = ConfField(
@@ -79,14 +80,14 @@ def _get_databases_config() -> DatabasesDict:
     backend: str = _DATABASE.backend.lower()
 
     match backend:
-        case "sqlite" | "sqlite3":
+        case DatabaseBackend.SQLITE3:
             return {
                 "default": {
-                    "ENGINE": "django.db.backends.sqlite3",
-                    "NAME": PROJECT_DIR / "db.sqlite3",
+                    "ENGINE": f"django.db.backends.{DatabaseBackend.SQLITE3.value}",
+                    "NAME": PROJECT_DIR / f"db.{DatabaseBackend.SQLITE3.value}",
                 }
             }
-        case "postgresql" | "postgres" | "psql" | "pgsql" | "pg" | "psycopg":
+        case DatabaseBackend.POSTGRESQL:
             options: DatabaseOptionsDict = {
                 "pool": _DATABASE.pool,
                 "sslmode": _DATABASE.ssl_mode,
@@ -95,7 +96,7 @@ def _get_databases_config() -> DatabasesDict:
             # Add service or connection vars
             if _DATABASE.use_vars:
                 config: DatabaseDict = {
-                    "ENGINE": "django.db.backends.postgresql",
+                    "ENGINE": f"django.db.backends.{DatabaseBackend.POSTGRESQL.value}",
                     "NAME": _DATABASE.name,
                     "USER": _DATABASE.user,
                     "PASSWORD": _DATABASE.password,
@@ -106,7 +107,7 @@ def _get_databases_config() -> DatabasesDict:
             else:
                 options["service"] = _DATABASE.service
                 config: DatabaseDict = {
-                    "ENGINE": "django.db.backends.postgresql",
+                    "ENGINE": f"django.db.backends.{DatabaseBackend.POSTGRESQL.value}",
                     "NAME": _DATABASE.name,
                     "OPTIONS": options,
                 }

djangx-1.5.7/src/djangx/enums.py

@@ -0,0 +1,2 @@
+from .api.enums import *  # noqa: F403
+from .management.enums import *  # noqa: F403

{djangx-1.5.6 → djangx-1.5.7}/src/djangx/management/cli.py

@@ -17,6 +17,7 @@ def main() -> Optional[NoReturn]:
         case "startproject" | "init" | "new":
             from argparse import ArgumentParser, Namespace
 
+            from ..enums import DatabaseBackend
             from .commands.startproject import initialize
 
             parser = ArgumentParser(description=f"Initialize a new {PKG_DISPLAY_NAME} project")
@@ -25,9 +26,21 @@ def main() -> Optional[NoReturn]:
                 choices=["default", "vercel"],
                 help="Project preset to use (skips interactive prompt)",
             )
+            parser.add_argument(
+                "--database",
+                "--db",
+                choices=[DatabaseBackend.SQLITE3, DatabaseBackend.POSTGRESQL],
+                help=f"Database backend to use (skips interactive prompt). Note: Vercel preset requires {DatabaseBackend.POSTGRESQL.value}.",
+            )
+            parser.add_argument(
+                "--force",
+                "-f",
+                action="store_true",
+                help="Skip directory validation and initialize even if directory is not empty",
+            )
             args: Namespace = parser.parse_args(sys.argv[2:])
 
-            sys.exit(initialize(preset=args.preset))
+            sys.exit(initialize(preset=args.preset, database=args.database, force=args.force))
 
         case _:
             from os import environ

{djangx-1.5.6 → djangx-1.5.7}/src/djangx/management/commands/generate.py

@@ -1,11 +1,9 @@
 import builtins
 import pathlib
-from enum import StrEnum
 from typing import Any, Optional, cast
 
 from christianwhocodes.generators import (
     FileGenerator,
-    FileGeneratorOption,
     PgPassFileGenerator,
     PgServiceFileGenerator,
     SSHConfigFileGenerator,
@@ -13,6 +11,7 @@ from christianwhocodes.generators import (
 from django.core.management.base import BaseCommand, CommandParser
 
 from ... import PKG_DISPLAY_NAME, PKG_NAME, PROJECT_API_DIR, PROJECT_DIR, Conf
+from ..enums import FileOption
 
 
 class _ServerFileGenerator(FileGenerator):
@@ -222,15 +221,6 @@ class _EnvFileGenerator(FileGenerator):
                 return str(value)
 
 
-class FileOption(StrEnum):
-    PG_SERVICE = FileGeneratorOption.PG_SERVICE.value
-    PGPASS = FileGeneratorOption.PGPASS.value
-    SSH_CONFIG = FileGeneratorOption.SSH_CONFIG.value
-    ENV = "env"
-    SERVER = "server"
-    VERCEL = "vercel"
-
-
 class Command(BaseCommand):
     help: str = "Generate configuration files (e.g., .env.example, vercel.json, asgi.py, wsgi.py, .pg_service.conf, pgpass.conf / .pgpass, ssh config)."
 

{djangx-1.5.6 → djangx-1.5.7}/src/djangx/management/commands/startproject.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from enum import StrEnum
 from pathlib import Path
 from typing import Final
 
@@ -9,6 +8,7 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.prompt import Confirm, Prompt
 
 from ... import PKG_DISPLAY_NAME, PKG_NAME, PROJECT_DIR, PROJECT_INIT_NAME
+from ...enums import DatabaseBackend, PresetType
 
 __all__ = ["initialize"]
 
@@ -29,29 +29,21 @@ SAFE_DIRECTORY_ITEMS: Final[set[str]] = {
 }
 
 
-class PresetType(StrEnum):
-    """Available project presets."""
-
-    DEFAULT = "default"
-    VERCEL = "vercel"
-
-
 @dataclass(frozen=True)
 class _ProjectDependencies:
     """Manages project dependencies."""
 
-    base: tuple[str, ...] = (
-        "pillow>=12.1.0",
-        "psycopg[binary,pool]>=3.3.2",
-    )
+    base: tuple[str, ...] = ("pillow>=12.1.0",)
     dev: tuple[str, ...] = ("djlint>=1.36.4", "ruff>=0.15.0")
+    postgresql: tuple[str, ...] = ("psycopg[binary,pool]>=3.3.2",)
     vercel: tuple[str, ...] = ("vercel>=0.3.8",)
 
-    def get_for_preset(self, preset: PresetType) -> list[str]:
-        """Get dependencies for a specific preset.
+    def get_for_config(self, preset: PresetType, database: DatabaseBackend) -> list[str]:
+        """Get dependencies for a specific configuration.
 
         Args:
             preset: The preset type.
+            database: The database backend.
 
         Returns:
             List of dependency strings including base dependencies.
@@ -59,6 +51,11 @@ class _ProjectDependencies:
         deps = list(self.base)
         deps.append(f"{PKG_NAME}>={Version.get(PKG_NAME)[0]}")
 
+        # Add database-specific dependencies
+        if database == DatabaseBackend.POSTGRESQL:
+            deps.extend(self.postgresql)
+
+        # Add preset-specific dependencies
         if preset == PresetType.VERCEL:
             deps.extend(self.vercel)
 
@@ -71,7 +68,7 @@ class _TemplateManager:
     @staticmethod
     def gitignore() -> str:
         """Generate .gitignore content."""
-        return """
+        return f"""
 # Python-generated files
 __pycache__/
 *.py[oc]
@@ -95,8 +92,8 @@ wheels/
 # Environment variables files
 /.env*
 
-# SQLite database file
-/db.sqlite3
+# {DatabaseBackend.SQLITE3.value.capitalize()} database file
+/db.{DatabaseBackend.SQLITE3.value}
 """.strip()
 
     @staticmethod
@@ -110,16 +107,23 @@ A new project built with {PKG_DISPLAY_NAME}.
 ## Getting Started
 
 1. Install dependencies: `uv sync`
-2. Run development server: `djx runserver`
+2. Run development server: `uv run djx runserver`
 """.strip()
 
     @staticmethod
-    def pyproject_toml(preset: PresetType, dependencies: list[str]) -> str:
+    def pyproject_toml(
+        preset: PresetType,
+        database: DatabaseBackend,
+        dependencies: list[str],
+        use_postgres_env_vars: bool = False,
+    ) -> str:
         """Generate pyproject.toml content.
 
         Args:
             preset: The preset type.
+            database: The database backend.
             dependencies: List of project dependencies.
+            use_postgres_env_vars: Whether to use env vars for PostgreSQL config.
 
         Returns:
             Formatted pyproject.toml content.
@@ -128,15 +132,25 @@ A new project built with {PKG_DISPLAY_NAME}.
         deps_formatted = ",\n    ".join(f'"{dep}"' for dep in dependencies)
         dev_deps_formatted = ",\n    ".join(f'"{dep}"' for dep in deps.dev)
 
-        # Preset-specific tool configuration
+        # Build tool configuration based on preset and database
+        tool_config_parts: list[str] = []
+
+        # Database configuration
+        if database == DatabaseBackend.POSTGRESQL:
+            tool_config_parts.append(
+                f'db = {{ backend = "{DatabaseBackend.POSTGRESQL.value}", use-vars = {str(use_postgres_env_vars).lower()} }}'
+            )
+
+        # Storage configuration (Vercel-specific)
+        if preset == PresetType.VERCEL:
+            tool_config_parts.append(
+                'storage = { backend = "vercel", blob-token = "keep-your-vercel-blob-token-secret-in-env" }'
+            )
+
+        # Format the tool config section
         tool_config = ""
-        match preset:
-            case PresetType.VERCEL:
-                tool_config = (
-                    '\nstorage = { backend = "vercel", blob-token = "your-vercel-blob-token" }\n'
-                )
-            case _:
-                pass
+        if tool_config_parts:
+            tool_config = "\n" + "\n".join(tool_config_parts) + "\n"
 
         return f"""[project]
 name = "{PROJECT_INIT_NAME}"
@@ -213,18 +227,18 @@ class HomeView(TemplateView):
     @staticmethod
     def tailwind_css() -> str:
         """Generate Tailwind CSS content."""
-        return """@import "tailwindcss";
+        return f"""@import "tailwindcss";
 
 /* =============================================================================
    SOURCE FILES
    ============================================================================= */
-@source "../../../../.venv/**/djangx/ui/templates/ui/**/*.html";
+@source "../../../../.venv/**/{PKG_NAME}/ui/templates/ui/**/*.html";
 @source "../../../templates/home/**/*.html";
 
 /* =============================================================================
    THEME CONFIGURATION
    ============================================================================= */
-@theme {
+@theme {{
   /* ---------------------------------------------------------------------------
      TYPOGRAPHY
      --------------------------------------------------------------------------- */
@@ -263,70 +277,70 @@ class HomeView(TemplateView):
   --color-nav-dropdown-bg: #2e2e2e; /* Dropdown background */
   --color-nav-dropdown: #d9d9d9; /* Dropdown text color */
   --color-nav-dropdown-hover: #ff4d4f; /* Dropdown hover state */
-}
+}}
 
 /* =============================================================================
    LIGHT THEME OVERRIDES
    ============================================================================= */
-@theme light {
+@theme light {{
   --color-background: rgba(41, 41, 41, 0.8);
   --color-surface: #484848;
-}
+}}
 
 /* =============================================================================
    DARK THEME OVERRIDES
    ============================================================================= */
-@theme dark {
+@theme dark {{
   --color-background: #060606;
   --color-surface: #252525;
   --color-default: #ffffff;
   --color-heading: #ffffff;
-}
+}}
 
 /* =============================================================================
    UTILITY CLASSES
    ============================================================================= */
-@layer utilities {
+@layer utilities {{
   /* Full-width container */
-  .container-full {
+  .container-full {{
     @apply mx-auto w-full px-8;
-  }
+  }}
 
   /* Responsive container (Mobile→SM→MD→LG→XL→2XL: 100%→92%→83%→80%→75%→1400px max) */
-  .container {
+  .container {{
     @apply mx-auto w-full px-8 sm:w-11/12 sm:px-4 md:w-5/6 lg:w-4/5 xl:w-3/4 xl:px-0 2xl:max-w-[1400px];
-  }
-}
+  }}
+}}
 
 /* =============================================================================
    BASE STYLES - Global element styling
    ============================================================================= */
-@layer base {
-  :root {
+@layer base {{
+  :root {{
     @apply scroll-smooth;
-  }
+  }}
 
-  body {
+  body {{
     @apply bg-background text-default font-default antialiased;
-  }
+  }}
 
   h1,
   h2,
   h3,
   h4,
   h5,
-  h6 {
+  h6 {{
     @apply text-heading font-heading text-balance;
-  }
+  }}
 
-  a {
+  a {{
     @apply text-accent no-underline transition-colors duration-200 ease-in-out;
-  }
+  }}
 
-  a:hover {
+  a:hover {{
     color: color-mix(in srgb, var(--color-accent), white 15%);
-  }
-}
+  }}
+}}
 """
 
 
@@ -646,20 +660,110 @@ class _ProjectInitializer:
         )
         return PresetType(choice)
 
-    def _create_core_files(self, preset: PresetType) -> None:
+    def _get_postgres_config_choice(self, preset: PresetType) -> bool:
+        """Get whether to use environment variables for PostgreSQL.
+
+        Args:
+            preset: The preset type (Vercel always uses env vars).
+
+        Returns:
+            True if using environment variables, False for pg_service/pgpass files.
+        """
+        # Vercel requires environment variables (no filesystem access)
+        if preset == PresetType.VERCEL:
+            return True
+
+        # For default preset, let user choose
+        self.console.print("\n[bold]PostgreSQL Configuration Method:[/bold]")
+        self.console.print("  • [cyan]Environment variables[/cyan]: Store credentials in .env file")
+        self.console.print(
+            "  • [cyan]PostgreSQL service files[/cyan]: Use pg_service.conf and .pgpass"
+        )
+
+        use_env_vars = Confirm.ask(
+            "Use environment variables for PostgreSQL configuration?",
+            default=True,
+            console=self.console,
+        )
+
+        return use_env_vars
+
+    def _get_database_choice(
+        self, preset: PresetType, database: str | None = None
+    ) -> tuple[DatabaseBackend, bool]:
+        """Get the user's database choice and PostgreSQL config method.
+
+        Args:
+            preset: The preset type (Vercel requires PostgreSQL).
+            database: Optional database to use without prompting.
+
+        Returns:
+            Tuple of (database backend, use_env_vars_for_postgres).
+
+        Raises:
+            ValueError: If database is invalid or incompatible with preset.
+        """
+        # Vercel preset requires PostgreSQL (no file system access on Vercel)
+        if preset == PresetType.VERCEL:
+            if database and database != DatabaseBackend.POSTGRESQL:
+                raise ValueError(f"Vercel preset requires PostgreSQL database (got: {database})")
+            return DatabaseBackend.POSTGRESQL, True  # Always use env vars with Vercel
+
+        # If database explicitly provided, validate it
+        if database:
+            try:
+                db_backend = DatabaseBackend(database)
+            except ValueError:
+                valid_databases = [db.value for db in DatabaseBackend]
+                raise ValueError(
+                    f"Invalid database '{database}'. Must be one of: {', '.join(valid_databases)}"
+                ) from None
+
+            # Ask about PostgreSQL config method if applicable
+            use_env_vars = (
+                self._get_postgres_config_choice(preset)
+                if db_backend == DatabaseBackend.POSTGRESQL
+                else False
+            )
+            return db_backend, use_env_vars
+
+        # Interactive prompt for default preset
+        choice = Prompt.ask(
+            "Choose a database",
+            choices=[db.value for db in DatabaseBackend],
+            default=DatabaseBackend.SQLITE3.value,
+            console=self.console,
+        )
+        db_backend = DatabaseBackend(choice)
+
+        # Ask about PostgreSQL config method if applicable
+        use_env_vars = (
+            self._get_postgres_config_choice(preset)
+            if db_backend == DatabaseBackend.POSTGRESQL
+            else False
+        )
+        return db_backend, use_env_vars
+
+    def _create_core_files(
+        self, preset: PresetType, database: DatabaseBackend, use_postgres_env_vars: bool
+    ) -> None:
         """Create core project configuration files.
 
         Args:
             preset: The preset type to use.
+            database: The database backend to use.
+            use_postgres_env_vars: Whether to use env vars for PostgreSQL config.
 
         Raises:
             IOError: If files cannot be created.
         """
-        dependencies = self.dependencies.get_for_preset(preset)
+        dependencies = self.dependencies.get_for_config(preset, database)
 
         # Create files only if they don't exist
         files_to_create = {
-            "pyproject.toml": self.templates.pyproject_toml(preset, dependencies),
+            "pyproject.toml": self.templates.pyproject_toml(
+                preset, database, dependencies, use_postgres_env_vars
+            ),
             ".gitignore": self.templates.gitignore(),
             "README.md": self.templates.readme(),
         }
@@ -749,11 +853,15 @@ class _ProjectInitializer:
         home_creator = _HomeAppCreator(self.project_dir, self.writer, self.templates, self.console)
         home_creator.create()
 
-    def _show_next_steps(self, preset: PresetType) -> None:
+    def _show_next_steps(
+        self, preset: PresetType, database: DatabaseBackend, use_postgres_env_vars: bool
+    ) -> None:
         """Display next steps for the user after successful initialization.
 
         Args:
             preset: The preset that was used.
+            database: The database backend that was chosen.
+            use_postgres_env_vars: Whether using env vars for PostgreSQL.
         """
         from rich.panel import Panel
 
@@ -762,13 +870,28 @@ class _ProjectInitializer:
             "2. Copy [bold].env.example[/bold] to [bold].env[/bold] and configure",
         ]
 
+        step_num = 3
+
+        # Database-specific instructions
+        if database == DatabaseBackend.POSTGRESQL:
+            if use_postgres_env_vars:
+                next_steps.append(
+                    f"{step_num}. Configure PostgreSQL connection in [bold].env[/bold]"
+                )
+            else:
+                next_steps.append(
+                    f"{step_num}. Configure PostgreSQL connection using [bold]pg_service.conf[/bold] and [bold].pgpass[/bold] files"
+                )
+            step_num += 1
+
+        # Preset-specific instructions
         if preset == PresetType.VERCEL:
-            next_steps.append(
-                "3. Configure Vercel blob token in [bold]pyproject.toml[/bold] or [bold].env[/bold]"
-            )
-            next_steps.append("4. Run development server: [bold cyan]djx runserver[/bold cyan]")
-        else:
-            next_steps.append("3. Run development server: [bold cyan]djx runserver[/bold cyan]")
+            next_steps.append(f"{step_num}. Configure Vercel blob token in [bold].env[/bold]")
+            step_num += 1
+
+        next_steps.append(
+            f"{step_num}. Run development server: [bold cyan]uv run djx runserver[/bold cyan]"
+        )
 
         panel = Panel(
             "\n".join(next_steps),
@@ -780,11 +903,14 @@ class _ProjectInitializer:
         self.console.print("\n")
         self.console.print(panel)
 
-    def create(self, preset: str | None = None, force: bool = False) -> ExitCode:
+    def create(
+        self, preset: str | None = None, database: str | None = None, force: bool = False
+    ) -> ExitCode:
         """Execute the full project initialization workflow.
 
         Args:
             preset: Optional preset to use without prompting.
+            database: Optional database backend to use without prompting.
             force: Skip directory validation.
 
         Returns:
@@ -797,6 +923,11 @@ class _ProjectInitializer:
             # Get and validate preset choice
             chosen_preset = self._get_preset_choice(preset)
 
+            # Get and validate database choice
+            chosen_database, use_postgres_env_vars = self._get_database_choice(
+                chosen_preset, database
+            )
+
             with Progress(
                 SpinnerColumn(),
                 TextColumn("[progress.description]{task.description}"),
@@ -805,7 +936,7 @@ class _ProjectInitializer:
             ) as progress:
                 # Create core configuration files
                 task = progress.add_task("Creating project files...", total=None)
-                self._create_core_files(chosen_preset)
+                self._create_core_files(chosen_preset, chosen_database, use_postgres_env_vars)
                 progress.update(task, completed=True)
 
                 # Configure preset-specific files
@@ -818,7 +949,7 @@ class _ProjectInitializer:
                 self._create_home_app()
                 progress.update(task, completed=True)
 
-            self._show_next_steps(chosen_preset)
+            self._show_next_steps(chosen_preset, chosen_database, use_postgres_env_vars)
             return ExitCode.SUCCESS
 
         except KeyboardInterrupt:
@@ -861,14 +992,19 @@ class _ProjectInitializer:
 # ============================================================================
 
 
-def initialize(preset: str | None = None, force: bool = False) -> ExitCode:
-    """Main entry point for project initialization.
+def initialize(
+    preset: str | None = None, database: str | None = None, force: bool = False
+) -> ExitCode:
+    f"""Main entry point for project initialization.
 
-    Creates a new project with the specified preset configuration.
+    Creates a new project with the specified preset and database configuration.
 
     Args:
         preset: Optional preset to use without prompting.
             Available presets: 'default', 'vercel'.
+        database: Optional database backend to use without prompting.
+            Available databases: '{DatabaseBackend.SQLITE3.value}', '{DatabaseBackend.POSTGRESQL.value}'.
+            Note: Vercel preset requires PostgreSQL.
         force: Skip directory validation and proceed even if directory is not empty.
 
     Returns:
@@ -876,7 +1012,9 @@ def initialize(preset: str | None = None, force: bool = False) -> ExitCode:
         ExitCode.ERROR otherwise.
 
     Example:
-        >>> initialize(preset="vercel")
+        >>> initialize(preset="vercel")  # Will auto-select {DatabaseBackend.POSTGRESQL.value} due to Vercel preset requirement
+        >>> initialize(database="{DatabaseBackend.POSTGRESQL.value}")  # Default preset with {DatabaseBackend.POSTGRESQL.value}
+        >>> initialize(preset="default", database="{DatabaseBackend.SQLITE3.value}")  # Default preset with {DatabaseBackend.SQLITE3.value}
         >>> initialize(force=True)
     """
-    return _ProjectInitializer(PROJECT_DIR).create(preset=preset, force=force)
+    return _ProjectInitializer(PROJECT_DIR).create(preset=preset, database=database, force=force)

djangx-1.5.7/src/djangx/management/enums.py

@@ -0,0 +1,63 @@
+from enum import StrEnum
+
+from christianwhocodes.generators import FileGeneratorOption
+
+
+class FileOption(StrEnum):
+    PG_SERVICE = FileGeneratorOption.PG_SERVICE.value
+    PGPASS = FileGeneratorOption.PGPASS.value
+    SSH_CONFIG = FileGeneratorOption.SSH_CONFIG.value
+    ENV = "env"
+    SERVER = "server"
+    VERCEL = "vercel"
+
+
+class PresetType(StrEnum):
+    """Available project presets."""
+
+    DEFAULT = "default"
+    VERCEL = "vercel"
+
+
+class Apps(StrEnum):
+    """Django applications enumeration."""
+
+    ADMIN = "django.contrib.admin"
+    AUTH = "django.contrib.auth"
+    CONTENTTYPES = "django.contrib.contenttypes"
+    SESSIONS = "django.contrib.sessions"
+    MESSAGES = "django.contrib.messages"
+    STATICFILES = "django.contrib.staticfiles"
+    HTTP_COMPRESSION = "django_http_compression"
+    MINIFY_HTML = "django_minify_html"
+    BROWSER_RELOAD = "django_browser_reload"
+    WATCHFILES = "django_watchfiles"
+
+
+class ContextProcessors(StrEnum):
+    """Django template context processors enumeration."""
+
+    DEBUG = "django.template.context_processors.debug"
+    REQUEST = "django.template.context_processors.request"
+    AUTH = "django.contrib.auth.context_processors.auth"
+    MESSAGES = "django.contrib.messages.context_processors.messages"
+    CSP = "django.template.context_processors.csp"
+
+
+class Middlewares(StrEnum):
+    """Django middleware enumeration."""
+
+    SECURITY = "django.middleware.security.SecurityMiddleware"
+    SESSION = "django.contrib.sessions.middleware.SessionMiddleware"
+    COMMON = "django.middleware.common.CommonMiddleware"
+    CSRF = "django.middleware.csrf.CsrfViewMiddleware"
+    AUTH = "django.contrib.auth.middleware.AuthenticationMiddleware"
+    MESSAGES = "django.contrib.messages.middleware.MessageMiddleware"
+    CLICKJACKING = "django.middleware.clickjacking.XFrameOptionsMiddleware"
+    CSP = "django.middleware.csp.ContentSecurityPolicyMiddleware"
+    HTTP_COMPRESSION = "django_http_compression.middleware.HttpCompressionMiddleware"
+    MINIFY_HTML = "django_minify_html.middleware.MinifyHtmlMiddleware"
+    BROWSER_RELOAD = "django_browser_reload.middleware.BrowserReloadMiddleware"
+
+
+__all__: list[str] = ["FileOption", "PresetType", "Apps", "ContextProcessors", "Middlewares"]

{djangx-1.5.6 → djangx-1.5.7}/src/djangx/management/settings/apps.py

@@ -1,8 +1,3 @@
-"""# DjangX settings: Installed apps, middleware, templates, context processors."""
-# TODO: Refactor so that the user can specify the order of apps, middleware, and context processors more flexibly.
-
-from enum import StrEnum
-
 from ... import (
     INCLUDE_PROJECT_MAIN_APP,
     PKG_API_NAME,
@@ -13,28 +8,16 @@ from ... import (
     Conf,
     ConfField,
 )
+from ..enums import Apps, ContextProcessors, Middlewares
 from ..types import TemplatesDict
 
+# TODO: Refactor so that the user can specify the order of apps, middleware, and context processors more flexibly.
+
 # ===============================================================
 # Apps
 # ===============================================================
 
 
-class _Apps(StrEnum):
-    """Django applications enumeration."""
-
-    ADMIN = "django.contrib.admin"
-    AUTH = "django.contrib.auth"
-    CONTENTTYPES = "django.contrib.contenttypes"
-    SESSIONS = "django.contrib.sessions"
-    MESSAGES = "django.contrib.messages"
-    STATICFILES = "django.contrib.staticfiles"
-    HTTP_COMPRESSION = "django_http_compression"
-    MINIFY_HTML = "django_minify_html"
-    BROWSER_RELOAD = "django_browser_reload"
-    WATCHFILES = "django_watchfiles"
-
-
 class AppsConf(Conf):
     """Apps configuration settings."""
 
@@ -70,19 +53,19 @@ def _get_installed_apps() -> list[str]:
     ]
 
     third_party_apps: list[str] = [
-        _Apps.HTTP_COMPRESSION,
-        _Apps.MINIFY_HTML,
-        _Apps.BROWSER_RELOAD,
-        _Apps.WATCHFILES,
+        Apps.HTTP_COMPRESSION,
+        Apps.MINIFY_HTML,
+        Apps.BROWSER_RELOAD,
+        Apps.WATCHFILES,
     ]
 
     django_apps: list[str] = [
-        _Apps.ADMIN,
-        _Apps.AUTH,
-        _Apps.CONTENTTYPES,
-        _Apps.SESSIONS,
-        _Apps.MESSAGES,
-        _Apps.STATICFILES,
+        Apps.ADMIN,
+        Apps.AUTH,
+        Apps.CONTENTTYPES,
+        Apps.SESSIONS,
+        Apps.MESSAGES,
+        Apps.STATICFILES,
     ]
 
     # Collect apps that should be removed except for base apps
@@ -107,19 +90,9 @@ INSTALLED_APPS: list[str] = _get_installed_apps()
 # ===============================================================
 
 
-class _ContextProcessors(StrEnum):
-    """Django template context processors enumeration."""
-
-    DEBUG = "django.template.context_processors.debug"
-    REQUEST = "django.template.context_processors.request"
-    AUTH = "django.contrib.auth.context_processors.auth"
-    MESSAGES = "django.contrib.messages.context_processors.messages"
-    CSP = "django.template.context_processors.csp"
-
-
-_APP_CONTEXT_PROCESSOR_MAP: dict[_Apps, list[_ContextProcessors]] = {
-    _Apps.AUTH: [_ContextProcessors.AUTH],
-    _Apps.MESSAGES: [_ContextProcessors.MESSAGES],
+_APP_CONTEXT_PROCESSOR_MAP: dict[Apps, list[ContextProcessors]] = {
+    Apps.AUTH: [ContextProcessors.AUTH],
+    Apps.MESSAGES: [ContextProcessors.MESSAGES],
 }
 
 
@@ -151,11 +124,11 @@ def _get_context_processors(installed_apps: list[str]) -> list[str]:
     """
     # Django context processors in recommended order
     django_context_processors: list[str] = [
-        _ContextProcessors.DEBUG,  # Debug info (only in DEBUG mode)
-        _ContextProcessors.REQUEST,  # Adds request object to context
-        _ContextProcessors.AUTH,  # Adds user and perms to context
-        _ContextProcessors.MESSAGES,  # Adds messages to context
-        _ContextProcessors.CSP,  # Content Security Policy
+        ContextProcessors.DEBUG,  # Debug info (only in DEBUG mode)
+        ContextProcessors.REQUEST,  # Adds request object to context
+        ContextProcessors.AUTH,  # Adds user and perms to context
+        ContextProcessors.MESSAGES,  # Adds messages to context
+        ContextProcessors.CSP,  # Content Security Policy
     ]
 
     # Collect context processors that should be removed based on missing apps
@@ -193,29 +166,13 @@ TEMPLATES: TemplatesDict = [
 # ===============================================================
 
 
-class _Middlewares(StrEnum):
-    """Django middleware enumeration."""
-
-    SECURITY = "django.middleware.security.SecurityMiddleware"
-    SESSION = "django.contrib.sessions.middleware.SessionMiddleware"
-    COMMON = "django.middleware.common.CommonMiddleware"
-    CSRF = "django.middleware.csrf.CsrfViewMiddleware"
-    AUTH = "django.contrib.auth.middleware.AuthenticationMiddleware"
-    MESSAGES = "django.contrib.messages.middleware.MessageMiddleware"
-    CLICKJACKING = "django.middleware.clickjacking.XFrameOptionsMiddleware"
-    CSP = "django.middleware.csp.ContentSecurityPolicyMiddleware"
-    HTTP_COMPRESSION = "django_http_compression.middleware.HttpCompressionMiddleware"
-    MINIFY_HTML = "django_minify_html.middleware.MinifyHtmlMiddleware"
-    BROWSER_RELOAD = "django_browser_reload.middleware.BrowserReloadMiddleware"
-
-
-_APP_MIDDLEWARE_MAP: dict[_Apps, list[_Middlewares]] = {
-    _Apps.SESSIONS: [_Middlewares.SESSION],
-    _Apps.AUTH: [_Middlewares.AUTH],
-    _Apps.MESSAGES: [_Middlewares.MESSAGES],
-    _Apps.HTTP_COMPRESSION: [_Middlewares.HTTP_COMPRESSION],
-    _Apps.MINIFY_HTML: [_Middlewares.MINIFY_HTML],
-    _Apps.BROWSER_RELOAD: [_Middlewares.BROWSER_RELOAD],
+_APP_MIDDLEWARE_MAP: dict[Apps, list[Middlewares]] = {
+    Apps.SESSIONS: [Middlewares.SESSION],
+    Apps.AUTH: [Middlewares.AUTH],
+    Apps.MESSAGES: [Middlewares.MESSAGES],
+    Apps.HTTP_COMPRESSION: [Middlewares.HTTP_COMPRESSION],
+    Apps.MINIFY_HTML: [Middlewares.MINIFY_HTML],
+    Apps.BROWSER_RELOAD: [Middlewares.BROWSER_RELOAD],
 }
 
 
@@ -260,17 +217,17 @@ def _get_middleware(installed_apps: list[str]) -> list[str]:
     - ABOVE any middleware that modifies HTML (like BrowserReloadMiddleware)
     """
     django_middleware: list[str] = [
-        _Middlewares.SECURITY,  # FIRST - security headers, HTTPS redirect
-        _Middlewares.SESSION,  # Early - needed by auth & messages
-        _Middlewares.COMMON,  # Early - URL normalization
-        _Middlewares.CSRF,  # After session - needs session data
-        _Middlewares.AUTH,  # After session - stores user in session
-        _Middlewares.MESSAGES,  # After session & auth
-        _Middlewares.CLICKJACKING,  # Security headers (X-Frame-Options)
-        _Middlewares.CSP,  # Security headers (Content-Security-Policy)
-        _Middlewares.HTTP_COMPRESSION,  # Before minify - encodes responses (Zstandard, Brotli, Gzip)
-        _Middlewares.MINIFY_HTML,  # After compression, before HTML modifiers
-        _Middlewares.BROWSER_RELOAD,  # LAST - dev only, injects reload script into HTML
+        Middlewares.SECURITY,  # FIRST - security headers, HTTPS redirect
+        Middlewares.SESSION,  # Early - needed by auth & messages
+        Middlewares.COMMON,  # Early - URL normalization
+        Middlewares.CSRF,  # After session - needs session data
+        Middlewares.AUTH,  # After session - stores user in session
+        Middlewares.MESSAGES,  # After session & auth
+        Middlewares.CLICKJACKING,  # Security headers (X-Frame-Options)
+        Middlewares.CSP,  # Security headers (Content-Security-Policy)
+        Middlewares.HTTP_COMPRESSION,  # Before minify - encodes responses (Zstandard, Brotli, Gzip)
+        Middlewares.MINIFY_HTML,  # After compression, before HTML modifiers
+        Middlewares.BROWSER_RELOAD,  # LAST - dev only, injects reload script into HTML
     ]
 
     # Collect middleware that should be removed based on missing apps