djangx 1.5.5__tar.gz → 1.5.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: djangx
-Version: 1.5.5
+Version: 1.5.7
 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.7}/pyproject.toml

@@ -13,7 +13,7 @@ djx = "djangx.management.cli:main"
 
 [project]
 name = "djangx"
-version = "1.5.5"
+version = "1.5.7"
 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.7}/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.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.5 → 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.5 → 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.5/src/djangx/management/commands/generators/file.py → djangx-1.5.7/src/djangx/management/commands/generate.py

@@ -2,12 +2,19 @@ import builtins
 import pathlib
 from typing import Any, Optional, cast
 
-from christianwhocodes.generators import FileGenerator
+from christianwhocodes.generators import (
+    FileGenerator,
+    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
+from ..enums import FileOption
 
 
-class ServerFileGenerator(FileGenerator):
+class _ServerFileGenerator(FileGenerator):
     f"""
     Generator for ASGI / WSGI configuration in api/server.py file.
     
@@ -27,7 +34,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 +66,7 @@ class VercelFileGenerator(FileGenerator):
         return "\n".join(lines) + "\n"
 
 
-class EnvFileGenerator(FileGenerator):
+class _EnvFileGenerator(FileGenerator):
     """
     Generator for environment configuration file (.env.example).
 
@@ -214,4 +221,40 @@ class EnvFileGenerator(FileGenerator):
                 return str(value)
 
 
-__all__: list[str] = ["EnvFileGenerator", "ServerFileGenerator", "VercelFileGenerator"]
+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)