djangx 1.5.5__tar.gz → 1.5.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: djangx
-Version: 1.5.5
+Version: 1.5.6
 Summary: Build and deploy Django apps with confidence.
 Author: Kevin Wasike Wakhisi
 Author-email: Kevin Wasike Wakhisi <kevin@christianwhocodes.space>
@@ -34,6 +34,7 @@ Requires-Dist: django-phonenumber-field[phonenumberslite]>=8.4.0
 Requires-Dist: django-watchfiles>=1.4.0
 Requires-Dist: pyperclip>=1.11.0
 Requires-Dist: python-dotenv>=1.2.1
+Requires-Dist: rich>=14.3.2
 Requires-Python: >=3.12
 Project-URL: homepage, https://github.com/christianwhocodes/djangx#readme
 Project-URL: repository, https://github.com/christianwhocodes/djangx

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

@@ -13,7 +13,7 @@ djx = "djangx.management.cli:main"
 
 [project]
 name = "djangx"
-version = "1.5.5"
+version = "1.5.6"
 description = "Build and deploy Django apps with confidence."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -31,6 +31,7 @@ dependencies = [
     "django-watchfiles>=1.4.0",
     "pyperclip>=1.11.0",
     "python-dotenv>=1.2.1",
+    "rich>=14.3.2",
 ]
 
 [dependency-groups]

{djangx-1.5.5 → djangx-1.5.6}/src/djangx/__init__.py

@@ -43,6 +43,10 @@ PROJECT_INIT_NAME: str = PROJECT_DIR.name
 
 PROJECT_MAIN_APP_NAME: str = "home"
 
+# bools
+
+INCLUDE_PROJECT_MAIN_APP: bool = PROJECT_MAIN_APP_DIR.exists() and PROJECT_MAIN_APP_DIR.is_dir()
+
 # Settings configuration classes
 
 _ValueType: TypeAlias = Optional[str | bool | list[str] | pathlib.Path | int]
@@ -206,14 +210,18 @@ class Conf:
 
         except (FileNotFoundError, KeyError, ValueError) as e:
             cls._validated = False
+            print(f"Not in a valid {PKG_DISPLAY_NAME} project directory.", Text.ERROR)
             print(
-                f"Are you currently executing in a {PKG_DISPLAY_NAME} project base directory?\n"
-                f"If not, navigate to your project's root or create a new {PKG_DISPLAY_NAME} project to run the command.\n\n"
-                "A valid project requires:\n"
-                f"  - `pyproject.toml` file with a 'tool.{PKG_NAME}' section (even if empty)\n"
-                f"Validation failed: {e}",
-                Text.WARNING,
+                f"A valid project requires: pyproject.toml with a 'tool.{PKG_NAME}' section (even if empty)",
+                Text.INFO,
+            )
+            print(
+                [
+                    ("Create a new project: ", None),
+                    (f"uvx {PKG_NAME} startproject (if uv is installed.)", Text.HIGHLIGHT),
+                ]
             )
+            print(f"Validation error: {e}")
 
         except Exception as e:
             cls._validated = False

djangx-1.5.5/src/djangx/management/commands/generators/file.py → djangx-1.5.6/src/djangx/management/commands/generate.py

@@ -1,13 +1,21 @@
 import builtins
 import pathlib
+from enum import StrEnum
 from typing import Any, Optional, cast
 
-from christianwhocodes.generators import FileGenerator
+from christianwhocodes.generators import (
+    FileGenerator,
+    FileGeneratorOption,
+    PgPassFileGenerator,
+    PgServiceFileGenerator,
+    SSHConfigFileGenerator,
+)
+from django.core.management.base import BaseCommand, CommandParser
 
-from .... import PKG_DISPLAY_NAME, PKG_NAME, PROJECT_API_DIR, PROJECT_DIR, Conf
+from ... import PKG_DISPLAY_NAME, PKG_NAME, PROJECT_API_DIR, PROJECT_DIR, Conf
 
 
-class ServerFileGenerator(FileGenerator):
+class _ServerFileGenerator(FileGenerator):
     f"""
     Generator for ASGI / WSGI configuration in api/server.py file.
     
@@ -27,7 +35,7 @@ class ServerFileGenerator(FileGenerator):
         return f"from {PKG_NAME}.api.backends.server import application\n\napp = application\n"
 
 
-class VercelFileGenerator(FileGenerator):
+class _VercelFileGenerator(FileGenerator):
     """
     Generator for Vercel configuration file (vercel.json).
 
@@ -59,7 +67,7 @@ class VercelFileGenerator(FileGenerator):
         return "\n".join(lines) + "\n"
 
 
-class EnvFileGenerator(FileGenerator):
+class _EnvFileGenerator(FileGenerator):
     """
     Generator for environment configuration file (.env.example).
 
@@ -214,4 +222,49 @@ class EnvFileGenerator(FileGenerator):
                 return str(value)
 
 
-__all__: list[str] = ["EnvFileGenerator", "ServerFileGenerator", "VercelFileGenerator"]
+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)."
+
+    def add_arguments(self, parser: CommandParser) -> None:
+        parser.add_argument(
+            "-f",
+            "--file",
+            dest="file",
+            choices=[opt.value for opt in FileOption],
+            type=FileOption,
+            required=True,
+            help=f"Specify which file to generate (options: {', '.join(o.value for o in FileOption)}).",
+        )
+        parser.add_argument(
+            "-y",
+            "--force",
+            dest="force",
+            action="store_true",
+            help="Force overwrite without confirmation.",
+        )
+
+    def handle(self, *args: Any, **options: Any) -> None:
+        file_option: FileOption = FileOption(options["file"])
+        force: bool = options["force"]
+
+        generators: dict[FileOption, type[FileGenerator]] = {
+            FileOption.VERCEL: _VercelFileGenerator,
+            FileOption.SERVER: _ServerFileGenerator,
+            FileOption.PG_SERVICE: PgServiceFileGenerator,
+            FileOption.PGPASS: PgPassFileGenerator,
+            FileOption.SSH_CONFIG: SSHConfigFileGenerator,
+            FileOption.ENV: _EnvFileGenerator,
+        }
+
+        generator_class: type[FileGenerator] = generators[file_option]
+        generator = generator_class()
+        generator.create(force=force)

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

@@ -1,8 +1,12 @@
 from dataclasses import dataclass
 from enum import StrEnum
 from pathlib import Path
+from typing import Final
 
 from christianwhocodes.core import ExitCode, Version
+from rich.console import Console
+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
 
@@ -12,6 +16,18 @@ __all__ = ["initialize"]
 # Configuration & Templates
 # ============================================================================
 
+# VCS and common items that shouldn't prevent initialization
+SAFE_DIRECTORY_ITEMS: Final[set[str]] = {
+    ".git",
+    ".gitignore",
+    ".gitattributes",
+    ".hg",
+    ".hgignore",
+    "LICENSE",
+    "LICENSE.txt",
+    "LICENSE.md",
+}
+
 
 class PresetType(StrEnum):
     """Available project presets."""
@@ -94,7 +110,7 @@ A new project built with {PKG_DISPLAY_NAME}.
 ## Getting Started
 
 1. Install dependencies: `uv sync`
-2. Run development server: `uv run djx runserver`
+2. Run development server: `djx runserver`
 """.strip()
 
     @staticmethod
@@ -168,6 +184,32 @@ class HomeView(TemplateView):
     template_name = "home/index.html"
 """
 
+    @staticmethod
+    def home_index_html() -> str:
+        """Generate home app index.html content."""
+        return """{% extends "ui/index.html" %}
+
+{% load org %}
+
+{% block title %}
+  <title>Welcome - {% org "name" %} App</title>
+{% endblock title %}
+
+{% block fonts %}
+  <link href="https://fonts.googleapis.com" rel="preconnect" />
+  <link href="https://fonts.gstatic.com" rel="preconnect" crossorigin />
+  <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Raleway:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Mulish:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
+        rel="stylesheet" />
+{% endblock fonts %}
+
+{% block main %}
+  <main>
+    <section class="container-full py-8">
+    </section>
+  </main>
+{% endblock main %}
+"""
+
     @staticmethod
     def tailwind_css() -> str:
         """Generate Tailwind CSS content."""
@@ -289,79 +331,161 @@ class HomeView(TemplateView):
 
 
 # ============================================================================
-# File Generators
+# File Management
 # ============================================================================
 
 
+class _FileTracker:
+    """Tracks files and directories created during initialization for rollback."""
+
+    def __init__(self):
+        """Initialize the file tracker."""
+        self._created_paths: list[Path] = []
+
+    def track(self, path: Path) -> None:
+        """Track a created file or directory.
+
+        Args:
+            path: The path that was created.
+        """
+        if path not in self._created_paths:
+            self._created_paths.append(path)
+
+    def cleanup_all(self) -> None:
+        """Remove all tracked files and directories in reverse order of creation."""
+        from shutil import rmtree
+
+        # Reverse order to remove files before their parent directories
+        for path in reversed(self._created_paths):
+            try:
+                if path.exists():
+                    if path.is_dir():
+                        rmtree(path)
+                    else:
+                        path.unlink()
+            except Exception:
+                # Best effort cleanup - don't raise on cleanup failures
+                pass
+
+        self._created_paths.clear()
+
+
 class _ProjectFileWriter:
     """Handles file writing operations for project initialization."""
 
-    def __init__(self, project_dir: Path):
+    def __init__(self, project_dir: Path, console: Console, tracker: _FileTracker):
         """Initialize the file writer.
 
         Args:
             project_dir: The project directory path.
+            console: Rich console for output.
+            tracker: File tracker for rollback support.
         """
         self.project_dir = project_dir
+        self.console = console
+        self.tracker = tracker
 
-    def write(self, filename: str, content: str) -> None:
-        """Write content to a file.
+    def write_if_not_exists(self, filename: str, content: str) -> bool:
+        """Write content to a file only if it doesn't exist.
 
         Args:
             filename: Name of the file to create.
             content: Content to write.
 
+        Returns:
+            True if file was created, False if it already existed.
+
         Raises:
             IOError: If file cannot be written.
             PermissionError: If lacking permission to write.
         """
         file_path = self.project_dir / filename
+
+        if file_path.exists():
+            return False
+
         file_path.write_text(content.strip(), encoding="utf-8")
+        self.tracker.track(file_path)
+        return True
 
-    def write_to_path(self, path: Path, content: str) -> None:
-        """Write content to a specific path.
+    def write_to_path_if_not_exists(self, path: Path, content: str) -> bool:
+        """Write content to a specific path only if it doesn't exist.
 
         Args:
             path: Full path to the file.
             content: Content to write.
 
+        Returns:
+            True if file was created, False if it already existed.
+
         Raises:
             IOError: If file cannot be written.
             PermissionError: If lacking permission to write.
         """
+        if path.exists():
+            return False
+
         path.write_text(content.strip(), encoding="utf-8")
+        self.tracker.track(path)
+        return True
 
-    def ensure_dir(self, path: Path) -> None:
+    def ensure_dir(self, path: Path) -> bool:
         """Ensure a directory exists.
 
         Args:
             path: Directory path to create.
+
+        Returns:
+            True if directory was created, False if it already existed.
         """
+        if path.exists():
+            return False
+
         path.mkdir(parents=True, exist_ok=True)
+        self.tracker.track(path)
+        return True
+
+
+# ============================================================================
+# Home App Creator
+# ============================================================================
 
 
 class _HomeAppCreator:
     """Creates the default 'home' Django application."""
 
-    def __init__(self, project_dir: Path, writer: _ProjectFileWriter, templates: _TemplateManager):
+    def __init__(
+        self,
+        project_dir: Path,
+        writer: _ProjectFileWriter,
+        templates: _TemplateManager,
+        console: Console,
+    ):
         """Initialize the home app creator.
 
         Args:
             project_dir: The project directory path.
             writer: File writer instance.
             templates: Template manager instance.
+            console: Rich console for output.
         """
         self.project_dir = project_dir
         self.writer = writer
         self.templates = templates
+        self.console = console
         self.home_dir = project_dir / "home"
 
     def create(self) -> None:
         """Create the home app with all necessary files and directories."""
-        from django.core.management import call_command
+        # Check if home app already exists
+        if self.home_dir.exists():
+            self.console.print(
+                "[yellow]Home app directory already exists, skipping app creation[/yellow]"
+            )
+            return
 
         # Create the Django app structure
-        call_command("startapp", "home")
+        self._create_app_structure()
 
         # Create app files
         self._create_urls()
@@ -369,15 +493,36 @@ class _HomeAppCreator:
         self._create_templates()
         self._create_static_files()
 
+    def _create_app_structure(self) -> None:
+        """Create the basic Django app structure using startapp command."""
+        from django.core.management import call_command
+
+        try:
+            call_command("startapp", "home")
+            # Track the created directory
+            self.writer.tracker.track(self.home_dir)
+        except Exception as e:
+            raise IOError(f"Failed to create home app: {e}") from e
+
     def _create_urls(self) -> None:
         """Create urls.py for the home app."""
         urls_path = self.home_dir / "urls.py"
-        self.writer.write_to_path(urls_path, self.templates.home_urls())
+        if self.writer.write_to_path_if_not_exists(urls_path, self.templates.home_urls()):
+            pass  # File was created
+        else:
+            self.console.print("[dim]urls.py already exists, skipping[/dim]")
 
     def _create_views(self) -> None:
         """Create views.py for the home app."""
         views_path = self.home_dir / "views.py"
-        self.writer.write_to_path(views_path, self.templates.home_views())
+        # Only overwrite if it's the default Django startapp content
+        if views_path.exists():
+            content = views_path.read_text(encoding="utf-8")
+            # Check if it's the default Django views.py (contains only imports or is minimal)
+            if len(content.strip()) < 100:  # Default Django file is very short
+                views_path.write_text(self.templates.home_views().strip(), encoding="utf-8")
+        else:
+            self.writer.write_to_path_if_not_exists(views_path, self.templates.home_views())
 
     def _create_templates(self) -> None:
         """Create template directory structure and files."""
@@ -385,7 +530,7 @@ class _HomeAppCreator:
         self.writer.ensure_dir(templates_dir)
 
         index_path = templates_dir / "index.html"
-        self.writer.write_to_path(index_path, "")
+        self.writer.write_to_path_if_not_exists(index_path, self.templates.home_index_html())
 
     def _create_static_files(self) -> None:
         """Create static directory structure and CSS files."""
@@ -393,7 +538,7 @@ class _HomeAppCreator:
         self.writer.ensure_dir(static_dir)
 
         css_path = static_dir / "tailwind.css"
-        self.writer.write_to_path(css_path, self.templates.tailwind_css())
+        self.writer.write_to_path_if_not_exists(css_path, self.templates.tailwind_css())
 
 
 # ============================================================================
@@ -415,6 +560,7 @@ class _ProjectInitializer:
         project_dir: Path,
         dependencies: _ProjectDependencies | None = None,
         templates: _TemplateManager | None = None,
+        console: Console | None = None,
     ):
         """Initialize the project initializer.
 
@@ -422,22 +568,54 @@ class _ProjectInitializer:
             project_dir: The directory where the project will be created.
             dependencies: Dependency manager (uses default if None).
             templates: Template manager (uses default if None).
+            console: Rich console for output (creates new if None).
         """
         self.project_dir = Path(project_dir)
         self.dependencies = dependencies or _ProjectDependencies()
         self.templates = templates or _TemplateManager()
-        self.writer = _ProjectFileWriter(self.project_dir)
+        self.console = console or Console()
+        self.tracker = _FileTracker()
+        self.writer = _ProjectFileWriter(self.project_dir, self.console, self.tracker)
 
-    def _validate_directory(self) -> None:
+    def _validate_directory(self, force: bool = False) -> None:
         """Validate that the directory is suitable for initialization.
 
+        Args:
+            force: Skip validation and proceed regardless.
+
         Raises:
-            ProjectInitializationError: If directory is not empty.
+            ProjectInitializationError: If directory contains non-VCS files and user declines.
         """
-        if any(self.project_dir.iterdir()):
-            raise ProjectInitializationError(
-                f"Directory is not empty. Please choose an empty directory to start a new {PKG_DISPLAY_NAME} project."
-            )
+        if force:
+            return
+
+        existing_items = list(self.project_dir.iterdir())
+        if not existing_items:
+            return
+
+        # Filter out safe items
+        problematic_items = [
+            item for item in existing_items if item.name not in SAFE_DIRECTORY_ITEMS
+        ]
+
+        if not problematic_items:
+            # Only safe items present - proceed without prompting
+            return
+
+        # Show what exists and ask for confirmation
+        items_list = "\n  - ".join(item.name for item in problematic_items)
+
+        self.console.print(f"[yellow]Directory is not empty. Found:[/yellow]\n  - {items_list}\n")
+
+        should_proceed = Confirm.ask(
+            f"Initialize {PKG_DISPLAY_NAME} project anyway? "
+            "This will skip existing files and create new ones",
+            default=False,
+            console=self.console,
+        )
+
+        if not should_proceed:
+            raise ProjectInitializationError("Initialization cancelled by user.")
 
     def _get_preset_choice(self, preset: str | None = None) -> PresetType:
         """Get the user's preset choice or validate the provided one.
@@ -451,8 +629,6 @@ class _ProjectInitializer:
         Raises:
             ValueError: If preset is invalid.
         """
-        from rich.prompt import Prompt
-
         if preset:
             try:
                 return PresetType(preset)
@@ -460,12 +636,13 @@ class _ProjectInitializer:
                 valid_presets = [p.value for p in PresetType]
                 raise ValueError(
                     f"Invalid preset '{preset}'. Must be one of: {', '.join(valid_presets)}"
-                )
+                ) from None
 
         choice = Prompt.ask(
             "Choose a preset",
             choices=[p.value for p in PresetType],
             default=PresetType.DEFAULT.value,
+            console=self.console,
         )
         return PresetType(choice)
 
@@ -480,79 +657,202 @@ class _ProjectInitializer:
         """
         dependencies = self.dependencies.get_for_preset(preset)
 
-        self.writer.write("pyproject.toml", self.templates.pyproject_toml(preset, dependencies))
-        self.writer.write(".gitignore", self.templates.gitignore())
-        self.writer.write("README.md", self.templates.readme())
+        # Create files only if they don't exist
+        files_to_create = {
+            "pyproject.toml": self.templates.pyproject_toml(preset, dependencies),
+            ".gitignore": self.templates.gitignore(),
+            "README.md": self.templates.readme(),
+        }
+
+        for filename, content in files_to_create.items():
+            if self.writer.write_if_not_exists(filename, content):
+                pass  # File was created
+            else:
+                self.console.print(f"[dim]{filename} already exists, skipping[/dim]")
 
-    def _configure_preset_files(self, preset: PresetType) -> None:
+    def _configure_preset_files_and_env_example(self, preset: PresetType) -> None:
         """Configure files based on the chosen preset.
 
         Args:
             preset: The preset configuration to apply.
+
+        Raises:
+            IOError: If preset-specific file generation fails.
         """
-        if preset == PresetType.VERCEL:
-            # Import here to avoid circular dependencies
-            from .generators import ServerFileGenerator, VercelFileGenerator
+        from subprocess import CalledProcessError, run
 
-            VercelFileGenerator().create()
-            ServerFileGenerator().create()
+        try:
+            match preset:
+                case PresetType.VERCEL:
+                    # Only generate vercel.json if it doesn't exist
+                    if not (self.project_dir / "vercel.json").exists():
+                        run(
+                            [PKG_NAME, "generate", "-f", "vercel", "-y"],
+                            cwd=self.project_dir,
+                            check=True,
+                            capture_output=True,
+                        )
+                        # Track the created file
+                        self.tracker.track(self.project_dir / "vercel.json")
+                    else:
+                        self.console.print("[dim]vercel.json already exists, skipping[/dim]")
+
+                    # Only generate api/server.py if it doesn't exist
+                    server_path = self.project_dir / "api" / "server.py"
+                    if not server_path.exists():
+                        run(
+                            [PKG_NAME, "generate", "-f", "server", "-y"],
+                            cwd=self.project_dir,
+                            check=True,
+                            capture_output=True,
+                        )
+                        # Track the created files
+                        self.tracker.track(self.project_dir / "api")
+                    else:
+                        self.console.print("[dim]api/server.py already exists, skipping[/dim]")
+                case _:
+                    # Future presets will be added here
+                    pass
+
+        except CalledProcessError as e:
+            error_msg = e.stderr.decode() if e.stderr else str(e)
+            raise IOError(f"Failed to generate preset-specific files: {error_msg}") from e
+        except FileNotFoundError as e:
+            raise IOError(
+                f"Command '{PKG_NAME}' not found. Ensure {PKG_DISPLAY_NAME} is properly installed."
+            ) from e
+
+        # Only generate .env.example file if it doesn't exist
+        env_example_path = self.project_dir / ".env.example"
+        if not env_example_path.exists():
+            try:
+                run(
+                    [PKG_NAME, "generate", "-f", "env", "-y"],
+                    cwd=self.project_dir,
+                    check=True,
+                    capture_output=True,
+                )
+                # Track the created file
+                self.tracker.track(env_example_path)
+            except CalledProcessError as e:
+                error_msg = e.stderr.decode() if e.stderr else str(e)
+                raise IOError(f"Failed to generate .env file: {error_msg}") from e
+            except FileNotFoundError as e:
+                raise IOError(
+                    f"Command '{PKG_NAME}' not found. Ensure {PKG_DISPLAY_NAME} is properly installed."
+                ) from e
+        else:
+            self.console.print("[dim].env.example already exists, skipping[/dim]")
 
     def _create_home_app(self) -> None:
         """Create the default home application."""
-        home_creator = _HomeAppCreator(self.project_dir, self.writer, self.templates)
+        home_creator = _HomeAppCreator(self.project_dir, self.writer, self.templates, self.console)
         home_creator.create()
 
-    def create(self, preset: str | None = None) -> ExitCode:
+    def _show_next_steps(self, preset: PresetType) -> None:
+        """Display next steps for the user after successful initialization.
+
+        Args:
+            preset: The preset that was used.
+        """
+        from rich.panel import Panel
+
+        next_steps = [
+            "1. Install dependencies: [bold cyan]uv sync[/bold cyan]",
+            "2. Copy [bold].env.example[/bold] to [bold].env[/bold] and configure",
+        ]
+
+        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]")
+
+        panel = Panel(
+            "\n".join(next_steps),
+            title=f"[bold green]✓ {PKG_DISPLAY_NAME} project initialized successfully![/bold green]",
+            border_style="green",
+            padding=(1, 2),
+        )
+
+        self.console.print("\n")
+        self.console.print(panel)
+
+    def create(self, preset: str | None = None, force: bool = False) -> ExitCode:
         """Execute the full project initialization workflow.
 
         Args:
             preset: Optional preset to use without prompting.
+            force: Skip directory validation.
 
         Returns:
             ExitCode indicating success or failure.
         """
-        from christianwhocodes.io import Text, print
-
         try:
-            # Validate directory is empty
-            self._validate_directory()
+            # Validate directory is empty or acceptable
+            self._validate_directory(force=force)
 
             # Get and validate preset choice
             chosen_preset = self._get_preset_choice(preset)
 
-            # Create core configuration files
-            self._create_core_files(chosen_preset)
-
-            # Configure preset-specific files
-            self._configure_preset_files(chosen_preset)
-
-            # Create default app
-            self._create_home_app()
-
-            print(
-                f"✓ {PKG_DISPLAY_NAME} project initialized successfully!",
-                Text.SUCCESS,
-            )
+            with Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                console=self.console,
+                transient=True,
+            ) as progress:
+                # Create core configuration files
+                task = progress.add_task("Creating project files...", total=None)
+                self._create_core_files(chosen_preset)
+                progress.update(task, completed=True)
+
+                # Configure preset-specific files
+                task = progress.add_task("Configuring preset files...", total=None)
+                self._configure_preset_files_and_env_example(chosen_preset)
+                progress.update(task, completed=True)
+
+                # Create default app
+                task = progress.add_task("Creating home app...", total=None)
+                self._create_home_app()
+                progress.update(task, completed=True)
+
+            self._show_next_steps(chosen_preset)
             return ExitCode.SUCCESS
 
         except KeyboardInterrupt:
-            print("\nProject initialization cancelled.", Text.WARNING)
+            self.tracker.cleanup_all()
+            self.console.print(
+                "\n[yellow]Project initialization cancelled. Cleaned up partial files.[/yellow]"
+            )
             return ExitCode.ERROR
 
         except ProjectInitializationError as e:
-            print(str(e), Text.WARNING)
+            # User declined to proceed - no cleanup needed since nothing was created
+            self.console.print(f"[yellow]{e}[/yellow]")
             return ExitCode.ERROR
 
         except ValueError as e:
-            print(f"Configuration error: {e}", Text.ERROR)
+            self.tracker.cleanup_all()
+            self.console.print(
+                f"[red]Configuration error:[/red] {e}\n[yellow]Cleaned up partial files.[/yellow]"
+            )
             return ExitCode.ERROR
 
         except (IOError, PermissionError) as e:
-            print(f"File system error: {e}", Text.ERROR)
+            self.tracker.cleanup_all()
+            self.console.print(
+                f"[red]File system error:[/red] {e}\n[yellow]Cleaned up partial files.[/yellow]"
+            )
             return ExitCode.ERROR
 
         except Exception as e:
-            print(f"Unexpected error during initialization: {e}", Text.ERROR)
+            self.tracker.cleanup_all()
+            self.console.print(
+                f"[red]Unexpected error during initialization:[/red] {e}\n"
+                f"[yellow]Cleaned up partial files.[/yellow]"
+            )
             return ExitCode.ERROR
 
 
@@ -561,13 +861,22 @@ class _ProjectInitializer:
 # ============================================================================
 
 
-def initialize(preset: str | None = None) -> ExitCode:
+def initialize(preset: str | None = None, force: bool = False) -> ExitCode:
     """Main entry point for project initialization.
 
+    Creates a new project with the specified preset configuration.
+
     Args:
         preset: Optional preset to use without prompting.
+            Available presets: 'default', 'vercel'.
+        force: Skip directory validation and proceed even if directory is not empty.
 
     Returns:
-        ExitCode indicating success or failure.
+        ExitCode.SUCCESS if initialization completed successfully,
+        ExitCode.ERROR otherwise.
+
+    Example:
+        >>> initialize(preset="vercel")
+        >>> initialize(force=True)
     """
-    return _ProjectInitializer(PROJECT_DIR).create(preset=preset)
+    return _ProjectInitializer(PROJECT_DIR).create(preset=preset, force=force)

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

@@ -4,6 +4,7 @@
 from enum import StrEnum
 
 from ... import (
+    INCLUDE_PROJECT_MAIN_APP,
     PKG_API_NAME,
     PKG_MANAGEMENT_NAME,
     PKG_NAME,
@@ -62,7 +63,7 @@ def _get_installed_apps() -> list[str]:
     """
 
     base_apps: list[str] = [
-        PROJECT_MAIN_APP_NAME,
+        *([PROJECT_MAIN_APP_NAME] if INCLUDE_PROJECT_MAIN_APP else []),
         PKG_NAME,
         f"{PKG_NAME}.{PKG_API_NAME}",
         f"{PKG_NAME}.{PKG_UI_NAME}",

{djangx-1.5.5 → djangx-1.5.6}/src/djangx/management/urls.py

@@ -11,5 +11,9 @@ urlpatterns: list[URLPattern | URLResolver] = [
     ),
     path("api/", include(f"{PKG_NAME}.api.urls")),
     path("ui/", include(f"{PKG_NAME}.ui.urls")),
-    path("", include(f"{PROJECT_MAIN_APP_NAME}.urls")),
+    *(
+        [path("", include(f"{PROJECT_MAIN_APP_NAME}.urls"))]
+        if PROJECT_MAIN_APP_NAME in INSTALLED_APPS
+        else []
+    ),
 ]

djangx-1.5.5/src/djangx/management/commands/generate.py

@@ -1,61 +0,0 @@
-from enum import StrEnum
-from typing import Any
-
-from christianwhocodes.generators import (
-    FileGenerator,
-    FileGeneratorOption,
-    PgPassFileGenerator,
-    PgServiceFileGenerator,
-    SSHConfigFileGenerator,
-)
-from django.core.management.base import BaseCommand, CommandParser
-
-from .generators import EnvFileGenerator, ServerFileGenerator, VercelFileGenerator
-
-
-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)."
-
-    def add_arguments(self, parser: CommandParser) -> None:
-        parser.add_argument(
-            "-f",
-            "--file",
-            dest="file",
-            choices=[opt.value for opt in FileOption],
-            type=FileOption,
-            required=True,
-            help=f"Specify which file to generate (options: {', '.join(o.value for o in FileOption)}).",
-        )
-        parser.add_argument(
-            "-y",
-            "--force",
-            dest="force",
-            action="store_true",
-            help="Force overwrite without confirmation.",
-        )
-
-    def handle(self, *args: Any, **options: Any) -> None:
-        file_option: FileOption = FileOption(options["file"])
-        force: bool = options["force"]
-
-        generators: dict[FileOption, type[FileGenerator]] = {
-            FileOption.VERCEL: VercelFileGenerator,
-            FileOption.SERVER: ServerFileGenerator,
-            FileOption.PG_SERVICE: PgServiceFileGenerator,
-            FileOption.PGPASS: PgPassFileGenerator,
-            FileOption.SSH_CONFIG: SSHConfigFileGenerator,
-            FileOption.ENV: EnvFileGenerator,
-        }
-
-        generator_class: type[FileGenerator] = generators[file_option]
-        generator = generator_class()
-        generator.create(force=force)

djangx-1.5.5/src/djangx/management/commands/generators/__init__.py

@@ -1 +0,0 @@
-from .file import *  # noqa: F403