plain.dev 0.7.4__tar.gz → 0.7.5__tar.gz

{plain_dev-0.7.4 → plain_dev-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plain.dev
-Version: 0.7.4
+Version: 0.7.5
 Summary: Local development tools for Plain.
 Home-page: https://plainframework.com
 License: BSD-3-Clause
@@ -11,6 +11,7 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: click (>=8.0.0)
 Requires-Dist: debugpy (>=1.6.3,<2.0.0)
 Requires-Dist: gunicorn (>20)

{plain_dev-0.7.4 → plain_dev-0.7.5}/plain/dev/cli.py

@@ -97,8 +97,7 @@ class Dev:
                 storage_path=Path(settings.PLAIN_TEMP_PATH) / "dev" / "certs",
             )
             self.modify_hosts_file()
-            self.set_csrf_trusted_origins()
-            self.set_allowed_hosts()
+            self.set_csrf_and_allowed_hosts()
             self.run_preflight()
 
             # Processes for poncho to run simultaneously
@@ -110,10 +109,12 @@ class Dev:
             # Output the clickable link before starting the manager loop
             url = f"https://{self.domain}:{self.port}/"
             click.secho(
-                f"\nYour application is running at: {click.style(url, fg='green', underline=True)}\n",
+                f"\nYour app will run at: {click.style(url, fg='green', underline=True)}\n",
                 bold=True,
             )
 
+            click.secho("Starting services (Ctrl+C to stop):", italic=True, dim=True)
+
             self.poncho.loop()
 
             return self.poncho.returncode
@@ -156,12 +157,12 @@ class Dev:
 
                 # Entry does not exist; append it using sudo
                 click.secho(
-                    "Modifying /etc/hosts file. You may be prompted for your password.",
+                    "Modifying /etc/hosts file. You may be prompted for your password.\n",
                     bold=True,
                 )
                 cmd = f"echo '{hosts_entry}' | sudo tee -a {hosts_path} >/dev/null"
                 subprocess.run(cmd, shell=True, check=True)
-                click.secho(f"Added {self.domain} to {hosts_path}", bold=True)
+                click.secho(f"Added {self.domain} to {hosts_path}\n", bold=True)
             except PermissionError:
                 click.secho(
                     "Permission denied while accessing hosts file.",
@@ -175,35 +176,28 @@ class Dev:
                 )
                 sys.exit(1)
 
-    def set_csrf_trusted_origins(self):
+    def set_csrf_and_allowed_hosts(self):
         csrf_trusted_origins = json.dumps(
             [
                 f"https://{self.domain}:{self.port}",
             ]
         )
-
-        click.secho(
-            f"Automatically set PLAIN_CSRF_TRUSTED_ORIGINS={click.style(csrf_trusted_origins, underline=True)}",
-            bold=True,
-        )
+        allowed_hosts = json.dumps([self.domain])
 
         # Set environment variables
         self.plain_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
         self.custom_process_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
 
-    def set_allowed_hosts(self):
-        allowed_hosts = json.dumps([self.domain])
+        self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
+        self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
 
         click.secho(
-            f"Automatically set PLAIN_ALLOWED_HOSTS={click.style(allowed_hosts, underline=True)}",
-            bold=True,
+            f"Automatically set PLAIN_ALLOWED_HOSTS={allowed_hosts} PLAIN_CSRF_TRUSTED_ORIGINS={csrf_trusted_origins}",
+            dim=True,
         )
 
-        # Set environment variables
-        self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
-        self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
-
     def run_preflight(self):
+        click.echo()
         if subprocess.run(["plain", "preflight"], env=self.plain_env).returncode:
             click.secho("Preflight check failed!", fg="red")
             sys.exit(1)
@@ -237,6 +231,8 @@ class Dev:
             *reload_extra.split(),
             "--access-logformat",
             "'\"%(r)s\" status=%(s)s length=%(b)s dur=%(M)sms'",
+            "--log-config-json",
+            str(Path(__file__).parent / "gunicorn_logging.json"),
         ]
         gunicorn = " ".join(gunicorn_cmd)
 

plain_dev-0.7.5/plain/dev/gunicorn_logging.json

@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "disable_existing_loggers": false,
+    "root": {
+        "level": "INFO",
+        "handlers": [
+            "console"
+        ]
+    },
+    "loggers": {
+        "gunicorn.error": {
+            "level": "INFO",
+            "handlers": [
+                "error_console"
+            ],
+            "propagate": true,
+            "qualname": "gunicorn.error"
+        },
+        "gunicorn.access": {
+            "level": "INFO",
+            "handlers": [
+                "console"
+            ],
+            "propagate": true,
+            "qualname": "gunicorn.access"
+        }
+    },
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "formatter": "generic",
+            "stream": "ext://sys.stdout"
+        },
+        "error_console": {
+            "class": "logging.StreamHandler",
+            "formatter": "generic",
+            "stream": "ext://sys.stderr"
+        }
+    },
+    "formatters": {
+        "generic": {
+            "format": "[%(process)d] [%(levelname)s] %(message)s",
+            "class": "logging.Formatter"
+        }
+    }
+}

{plain_dev-0.7.4 → plain_dev-0.7.5}/pyproject.toml

@@ -5,7 +5,7 @@ packages = [
     { include = "plain" },
 ]
 
-version = "0.7.4"
+version = "0.7.5"
 description = "Local development tools for Plain."
 authors = ["Dave Gaeddert <dave.gaeddert@dropseed.dev>"]
 license = "BSD-3-Clause"