Add plain server command, replace gunicorn

Author: davegaeddert

plain-dev/plain/dev/core.py

@@ -167,7 +167,7 @@ def run(self) -> int:
         # another thread checking db stuff...
         self.console_status.start()
 
-        self.add_gunicorn()
+        self.add_server()
         self.add_entrypoints()
         self.add_pyproject_run()
 
@@ -271,18 +271,16 @@ def run_preflight(self) -> None:
             click.secho("Preflight check failed!", fg="red")
             sys.exit(1)
 
-    def add_gunicorn(self) -> None:
-        # Watch .env files for reload
-        extra_watch_files = []
-        for f in os.listdir(APP_PATH.parent):
-            if f.startswith(".env"):
-                # Needs to be absolute or "./" for inotify to work on Linux...
-                # https://github.com/dropseed/plain/issues/26
-                extra_watch_files.append(str(Path(APP_PATH.parent) / f))
-
-        reload_extra = " ".join(f"--reload-extra-file {f}" for f in extra_watch_files)
-        gunicorn_cmd = [
-            "gunicorn",
+    def add_server(self) -> None:
+        """Add the Plain HTTP server process."""
+        # Build the server command using plain's internal server
+        # Note: We can't use reload here because watchfiles is handled at a higher level
+        # The server command will use gunicorn's built-in reload capability
+        server_cmd = [
+            sys.executable,
+            "-m",
+            "plain",
+            "server",
             "--bind",
             f"{self.hostname}:{self.port}",
             "--certfile",
@@ -291,25 +289,37 @@ def add_gunicorn(self) -> None:
             str(self.ssl_key_path),
             "--threads",
             "4",
-            "--reload",
-            "plain.wsgi:app",
             "--timeout",
             "60",
             "--log-level",
             self.log_level or "info",
-            "--access-logfile",
-            "-",
-            "--error-logfile",
-            "-",
-            *reload_extra.split(),
-            "--access-logformat",
-            "'\"%(r)s\" status=%(s)s length=%(b)s time=%(M)sms'",
-            "--log-config-json",
-            str(Path(__file__).parent / "gunicorn_logging.json"),
+            "--reload",  # Enable auto-reload for development
         ]
-        gunicorn = " ".join(gunicorn_cmd)
 
-        self.poncho.add_process("plain", gunicorn, env=self.plain_env)
+        # Watch .env files for reload
+        extra_watch_files = []
+        for f in os.listdir(APP_PATH.parent):
+            if f.startswith(".env"):
+                # Needs to be absolute or "./" for inotify to work on Linux...
+                # https://github.com/dropseed/plain/issues/26
+                extra_watch_files.append(str(Path(APP_PATH.parent) / f))
+
+        # Add extra watch files
+        for watch_file in extra_watch_files:
+            server_cmd.extend(["--reload-extra-file", watch_file])
+
+        # Add logging configuration
+        server_cmd.extend(
+            [
+                "--log-format",
+                "'[%(levelname)s] %(message)s'",
+                "--access-log-format",
+                "'\"%(r)s\" status=%(s)s length=%(b)s time=%(M)sms'",
+            ]
+        )
+
+        server = " ".join(server_cmd)
+        self.poncho.add_process("plain", server, env=self.plain_env)
 
     def add_entrypoints(self) -> None:
         for entry_point in entry_points().select(group=ENTRYPOINT_GROUP):

plain-dev/pyproject.toml

@@ -10,7 +10,6 @@ dependencies = [
     "plain<1.0.0",
     "click>=8.0.0",
     "python-dotenv~=1.0.0",
-    "gunicorn>20",
     "requests>=2.0.0",
     "rich",
     "inotify",

plain/plain/cli/runtime.py

@@ -4,8 +4,13 @@
 This module provides decorators and utilities for CLI commands.
 """
 
+from collections.abc import Callable
+from typing import TypeVar
 
-def without_runtime_setup(f):
+F = TypeVar("F", bound=Callable)
+
+
+def without_runtime_setup(f: F) -> F:
     """
     Decorator to mark commands that don't need plain.runtime.setup().
 
@@ -19,5 +24,5 @@ def without_runtime_setup(f):
         def server(**options):
             ...
     """
-    f.without_runtime_setup = True
+    f.without_runtime_setup = True  # type: ignore[attr-defined]  # dynamic attribute for decorator
     return f

plain/plain/cli/server.py

@@ -0,0 +1,142 @@
+import click
+
+from plain.cli.runtime import without_runtime_setup
+
+
+@without_runtime_setup
+@click.command()
+@click.option(
+    "--bind",
+    "-b",
+    multiple=True,
+    default=["127.0.0.1:8000"],
+    help="Address to bind to (HOST:PORT, can be used multiple times)",
+)
+@click.option(
+    "--threads",
+    type=int,
+    default=1,
+    help="Number of threads per worker",
+    show_default=True,
+)
+@click.option(
+    "--workers",
+    "-w",
+    type=int,
+    default=1,
+    help="Number of worker processes",
+    show_default=True,
+)
+@click.option(
+    "--timeout",
+    "-t",
+    type=int,
+    default=30,
+    help="Worker timeout in seconds",
+    show_default=True,
+)
+@click.option(
+    "--certfile",
+    type=click.Path(exists=True),
+    help="SSL certificate file",
+)
+@click.option(
+    "--keyfile",
+    type=click.Path(exists=True),
+    help="SSL key file",
+)
+@click.option(
+    "--log-level",
+    default="info",
+    type=click.Choice(["debug", "info", "warning", "error", "critical"]),
+    help="Logging level",
+    show_default=True,
+)
+@click.option(
+    "--reload",
+    is_flag=True,
+    help="Restart workers when code changes (dev only)",
+)
+@click.option(
+    "--reload-extra-file",
+    multiple=True,
+    type=click.Path(exists=True),
+    help="Additional files to watch for reload (can be used multiple times)",
+)
+@click.option(
+    "--access-log",
+    default="-",
+    help="Access log file (use '-' for stdout)",
+    show_default=True,
+)
+@click.option(
+    "--error-log",
+    default="-",
+    help="Error log file (use '-' for stderr)",
+    show_default=True,
+)
+@click.option(
+    "--log-format",
+    default="%(asctime)s [%(process)d] [%(levelname)s] %(message)s",
+    help="Log format string (applies to both error and access logs)",
+    show_default=True,
+)
+@click.option(
+    "--access-log-format",
+    help="Access log format string (HTTP request details)",
+    default='%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"',
+    show_default=True,
+)
+@click.option(
+    "--max-requests",
+    type=int,
+    default=0,
+    help="Max requests before worker restart (0=disabled)",
+    show_default=True,
+)
+@click.option(
+    "--pidfile",
+    type=click.Path(),
+    help="PID file path",
+)
+def server(
+    bind: tuple[str, ...],
+    threads: int,
+    workers: int,
+    timeout: int,
+    certfile: str | None,
+    keyfile: str | None,
+    log_level: str,
+    reload: bool,
+    reload_extra_file: tuple[str, ...],
+    access_log: str,
+    error_log: str,
+    log_format: str,
+    access_log_format: str,
+    max_requests: int,
+    pidfile: str | None,
+) -> None:
+    """
+    Run a production-ready WSGI server.
+    """
+    from plain.server import ServerApplication
+    from plain.server.config import Config
+
+    cfg = Config(
+        bind=list(bind),
+        threads=threads,
+        workers=workers,
+        timeout=timeout,
+        max_requests=max_requests,
+        reload=reload,
+        reload_extra_files=list(reload_extra_file) if reload_extra_file else [],
+        pidfile=pidfile,
+        certfile=certfile,
+        keyfile=keyfile,
+        loglevel=log_level,
+        accesslog=access_log,
+        errorlog=error_log,
+        log_format=log_format,
+        access_log_format=access_log_format,
+    )
+    ServerApplication(cfg=cfg).run()