plain.dev 0.29.1__py3-none-any.whl → 0.30.0__py3-none-any.whl

plain/dev/cli.py

@@ -18,7 +18,7 @@ from rich.console import Console
 from rich.text import Text
 
 from plain.cli import register_cli
-from plain.runtime import APP_PATH, settings
+from plain.runtime import APP_PATH, PLAIN_TEMP_PATH
 
 from .mkcert import MkcertManager
 from .poncho.manager import Manager as PonchoManager
@@ -145,14 +145,13 @@ class Dev:
         self.plain_env = {
             "PYTHONUNBUFFERED": "true",
             "PLAIN_DEV": "true",
+            **os.environ,
         }
 
         if log_level:
             self.plain_env["PLAIN_LOG_LEVEL"] = log_level.upper()
             self.plain_env["APP_LOG_LEVEL"] = log_level.upper()
 
-        self.plain_env.update(os.environ)
-
         self.custom_process_env = {
             **self.plain_env,
             "PORT": str(self.port),
@@ -197,12 +196,12 @@ class Dev:
         mkcert_manager.setup_mkcert(install_path=Path.home() / ".plain" / "dev")
         self.ssl_cert_path, self.ssl_key_path = mkcert_manager.generate_certs(
             domain=self.hostname,
-            storage_path=Path(settings.PLAIN_TEMP_PATH) / "dev" / "certs",
+            storage_path=Path(PLAIN_TEMP_PATH) / "dev" / "certs",
         )
 
         self.symlink_plain_src()
         self.modify_hosts_file()
-        self.set_csrf_and_allowed_hosts()
+        self.set_allowed_hosts()
         self.run_preflight()
 
         # If we start services ourselves, we should manage the pidfile
@@ -280,10 +279,10 @@ class Dev:
         plain_path = Path(
             importlib.util.find_spec("plain.runtime").origin
         ).parent.parent
-        if not settings.PLAIN_TEMP_PATH.exists():
-            settings.PLAIN_TEMP_PATH.mkdir()
+        if not PLAIN_TEMP_PATH.exists():
+            PLAIN_TEMP_PATH.mkdir()
 
-        symlink_path = settings.PLAIN_TEMP_PATH / "src"
+        symlink_path = PLAIN_TEMP_PATH / "src"
 
         # The symlink is broken
         if symlink_path.is_symlink() and not symlink_path.exists():
@@ -355,22 +354,13 @@ class Dev:
                 )
                 sys.exit(1)
 
-    def set_csrf_and_allowed_hosts(self):
-        if "PLAIN_CSRF_TRUSTED_ORIGINS" not in os.environ:
-            csrf_trusted_origins = json.dumps(
-                [
-                    self.url,
-                ]
-            )
-            self.plain_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-            self.custom_process_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-            click.secho(
-                f"Automatically set PLAIN_CSRF_TRUSTED_ORIGINS={csrf_trusted_origins}",
-                dim=True,
-            )
-
+    def set_allowed_hosts(self):
         if "PLAIN_ALLOWED_HOSTS" not in os.environ:
-            allowed_hosts = json.dumps([self.hostname])
+            hostnames = [self.hostname]
+            if self.tunnel_url:
+                # Add the tunnel URL to the allowed hosts
+                hostnames.append(self.tunnel_url.split("://")[1])
+            allowed_hosts = json.dumps(hostnames)
             self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
             self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
             click.secho(

plain/dev/gunicorn_logging.json

@@ -1,46 +1,40 @@
 {
-    "version": 1,
-    "disable_existing_loggers": false,
-    "root": {
-        "level": "INFO",
-        "handlers": [
-            "console"
-        ]
+  "version": 1,
+  "disable_existing_loggers": false,
+  "root": {
+    "level": "INFO",
+    "handlers": ["console"]
+  },
+  "loggers": {
+    "gunicorn.error": {
+      "level": "INFO",
+      "handlers": ["error_console"],
+      "propagate": false,
+      "qualname": "gunicorn.error"
     },
-    "loggers": {
-        "gunicorn.error": {
-            "level": "INFO",
-            "handlers": [
-                "error_console"
-            ],
-            "propagate": false,
-            "qualname": "gunicorn.error"
-        },
-        "gunicorn.access": {
-            "level": "INFO",
-            "handlers": [
-                "console"
-            ],
-            "propagate": false,
-            "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"
-        }
+    "gunicorn.access": {
+      "level": "INFO",
+      "handlers": ["console"],
+      "propagate": false,
+      "qualname": "gunicorn.access"
+    }
+  },
+  "handlers": {
+    "console": {
+      "class": "logging.StreamHandler",
+      "formatter": "generic",
+      "stream": "ext://sys.stdout"
     },
-    "formatters": {
-        "generic": {
-            "format": "[%(process)d] [%(levelname)s] %(message)s",
-            "class": "logging.Formatter"
-        }
+    "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/requests.py

@@ -6,7 +6,7 @@ import traceback
 
 import requests
 
-from plain.runtime import settings
+from plain.runtime import PLAIN_TEMP_PATH, settings
 from plain.signals import got_request_exception
 
 
@@ -18,7 +18,7 @@ class RequestLog:
 
     @staticmethod
     def storage_path():
-        return str(settings.PLAIN_TEMP_PATH / "dev" / "requestlog")
+        return str(PLAIN_TEMP_PATH / "dev" / "requestlog")
 
     @classmethod
     def replay_request(cls, name):

plain/dev/services.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 import click
 
-from plain.runtime import APP_PATH, settings
+from plain.runtime import APP_PATH, PLAIN_TEMP_PATH
 
 from .poncho.manager import Manager as PonchoManager
 from .utils import has_pyproject_toml
@@ -15,7 +15,7 @@ from .utils import has_pyproject_toml
 
 class ServicesPid:
     def __init__(self):
-        self.pidfile = settings.PLAIN_TEMP_PATH / "dev" / "services.pid"
+        self.pidfile = PLAIN_TEMP_PATH / "dev" / "services.pid"
 
     def write(self):
         pid = os.getpid()

{plain_dev-0.29.1.dist-info → plain_dev-0.30.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.dev
-Version: 0.29.1
+Version: 0.30.0
 Summary: Local development tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_dev-0.29.1.dist-info → plain_dev-0.30.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 plain/dev/README.md,sha256=EQJ9lF-JQ9KQWJZ_j6CD3jbRquOLgDRlIPbgT7A2gG4,3658
 plain/dev/__init__.py,sha256=nRX1B0Br8gmqhJLqo5Z9PqzReDahBtbmwH6C-7hzuls,103
-plain/dev/cli.py,sha256=5rh-CSVmdcfBM6RrSD1SCUB0lYEb94NOmAd8LXicZr0,15678
+plain/dev/cli.py,sha256=UVYMrU2glf8z9rkEbxr1QleY1l1Z6Gqm8lDBWC5vv6o,15295
 plain/dev/debug.py,sha256=Ka84K8zUdF0kMYNyqiLYDrdzU1jU8LSOkts3hcw_Gok,1005
 plain/dev/default_settings.py,sha256=uXWYORWP_aRDwXIFXdu5kHyiBFUZzARIJdhPeFaX35c,75
 plain/dev/entrypoints.py,sha256=diqNwA6eydUMtoO7p_rH-DtSYsw5-GBmjFe1Z5bHagc,579
-plain/dev/gunicorn_logging.json,sha256=yU23jzs5G4YGdDWBNiyAc3KypR4HirR6afIkD7w6DhU,1113
+plain/dev/gunicorn_logging.json,sha256=3H6b6bQf_KdY61gzypvI0ly_Jduy-Uhqs2ra9ttzGJQ,867
 plain/dev/mkcert.py,sha256=fm1U_UTGPREso6ZaP79WqEvd9uvA4lYWFo6fKhNglMM,3911
 plain/dev/pdb.py,sha256=4ru3rlIIyuYVXteyI7v42i4MmdBIjpJP0IJemBpf83A,3742
-plain/dev/requests.py,sha256=NH-_FYolAUbh2-m0x9hTdK6AS7HLo6cGETTpp6R-Wto,6857
-plain/dev/services.py,sha256=bfIXEVsot20cDbyIeRJ9xAiTTVxowHrLAiZM2aOMXDU,2845
+plain/dev/requests.py,sha256=OLpauU0FoaJA2IG6YD_KS323jKM5l6RX0HiXQvqpH-E,6865
+plain/dev/services.py,sha256=0MfPLoffItypUg_1PkX-juigR-abSS42nFHFZ5Eag-k,2843
 plain/dev/urls.py,sha256=6fyl-DvxDgKjUjpyhuLN8m6GisB8L-eH4rhYH_eRmGA,188
 plain/dev/utils.py,sha256=4wMzpvj1Is_c0QxhsTu34_P9wAYlzw4glNPfVtZr_0A,123
 plain/dev/views.py,sha256=yCZ_YmkJGCb3YYgElhzAPrA9V0X3lkiLD1-Ht1HjV7A,1131
@@ -24,8 +24,8 @@ plain/dev/poncho/process.py,sha256=JJOKy-C6vMCg7-6JMCtu6C649h7HmOBSJqDP_hnX49I,2
 plain/dev/precommit/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
 plain/dev/precommit/cli.py,sha256=KVHcG3Y_JZJNu3_MLIrO5s6yMYQfAArIU5L0hNWZUjg,3441
 plain/dev/templates/dev/requests.html,sha256=kQKJZq5L77juuL_t8UjcAehEU61U4RXNnKaAET-wAm8,7627
-plain_dev-0.29.1.dist-info/METADATA,sha256=xKFUKIWICvxJCwQwdok-X13y8-_lP2CORyE9HBjRFbo,4163
-plain_dev-0.29.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_dev-0.29.1.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
-plain_dev-0.29.1.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
-plain_dev-0.29.1.dist-info/RECORD,,
+plain_dev-0.30.0.dist-info/METADATA,sha256=3xVJFToL4VLYRv-NIG-vx2dLHYIS155pacrl9oHxphI,4163
+plain_dev-0.30.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_dev-0.30.0.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
+plain_dev-0.30.0.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
+plain_dev-0.30.0.dist-info/RECORD,,