plain.dev 0.27.1__py3-none-any.whl → 0.29.0__py3-none-any.whl

plain/dev/cli.py

@@ -1,11 +1,11 @@
 import importlib
 import json
+import multiprocessing
 import os
 import platform
 import signal
 import subprocess
 import sys
-import threading
 import time
 import tomllib
 from importlib.metadata import entry_points
@@ -223,21 +223,16 @@ class Dev:
         # If plain.models is installed (common) then we
         # will do a couple extra things before starting all of the app-related
         # processes (this way they don't all have to db-wait or anything)
+        process = None
         if find_spec("plain.models") is not None:
             # Use a custom signal to tell the main thread to add
             # the app processes once the db is ready
             signal.signal(signal.SIGUSR1, self.start_app)
 
-            def _thread(env):
-                subprocess.run(["plain", "models", "db-wait"], env=env, check=True)
-                subprocess.run(["plain", "migrate", "--backup"], env=env, check=True)
-                # preflight with db?
-                os.kill(os.getpid(), signal.SIGUSR1)
-
-            thread = threading.Thread(
-                target=_thread, daemon=True, args=(self.plain_env,)
+            process = multiprocessing.Process(
+                target=_process_task, args=(self.plain_env,)
             )
-            thread.start()
+            process.start()
         else:
             # Start the app processes immediately
             self.start_app(None, None)
@@ -253,6 +248,14 @@ class Dev:
             if services_pid:
                 services_pid.rm()
 
+            # Make sure the process is terminated if it is still running
+            if process and process.is_alive():
+                os.killpg(os.getpgid(process.pid), signal.SIGTERM)
+                process.join(timeout=3)
+                if process.is_alive():
+                    os.killpg(os.getpgid(process.pid), signal.SIGKILL)
+                    process.join()
+
         return self.poncho.returncode
 
     def start_app(self, signum, frame):
@@ -349,24 +352,26 @@ class Dev:
                 sys.exit(1)
 
     def set_csrf_and_allowed_hosts(self):
-        csrf_trusted_origins = json.dumps(
-            [
-                self.url,
-            ]
-        )
-        allowed_hosts = json.dumps([self.hostname])
-
-        # Set environment variables
-        self.plain_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-        self.custom_process_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-
-        self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
-        self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
+        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,
+            )
 
-        click.secho(
-            f"Automatically set PLAIN_ALLOWED_HOSTS={allowed_hosts} PLAIN_CSRF_TRUSTED_ORIGINS={csrf_trusted_origins}",
-            dim=True,
-        )
+        if "PLAIN_ALLOWED_HOSTS" not in os.environ:
+            allowed_hosts = json.dumps([self.hostname])
+            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={allowed_hosts}", dim=True
+            )
 
     def run_preflight(self):
         click.echo()
@@ -439,3 +444,16 @@ class Dev:
                 **data.get("env", {}),
             }
             self.poncho.add_process(name, data["cmd"], env=env)
+
+
+def _process_task(env):
+    # Make this process the leader of a new group which can be killed together if it doesn't finish
+    os.setsid()
+
+    subprocess.run(["plain", "models", "db-wait"], env=env, check=True)
+    subprocess.run(["plain", "migrate", "--backup"], env=env, check=True)
+
+    # preflight with db?
+
+    # Send SIGUSR1 to the parent process so the parent's handler is invoked
+    os.kill(os.getppid(), signal.SIGUSR1)

plain/dev/contribute/cli.py

@@ -8,7 +8,7 @@ from plain.cli import register_cli
 
 
 @register_cli("contrib")
-@click.command("contribute")
+@click.command("contribute", hidden=True)
 @click.option("--repo", default="../plain", help="Path to the plain repo")
 @click.option(
     "--reset", is_flag=True, help="Undo any changes to pyproject.toml and uv.lock"

plain/dev/requests.py

@@ -137,10 +137,10 @@ class RequestLog:
             "method": request.method,
             "path": request.path,
             "full_path": request.get_full_path(),
-            "querydict": request.POST.dict()
+            "querydict": request.data.dict()
             if request.method == "POST"
-            else request.GET.dict(),
-            "cookies": request.COOKIES,
+            else request.query_params.dict(),
+            "cookies": request.cookies,
             # files?
             "absolute_uri": request.build_absolute_uri(),
             "body": request.body.decode("utf-8"),
@@ -192,7 +192,7 @@ def should_capture_request(request):
 
     # This could be an attribute set on request or response
     # or something more dynamic
-    if "querystats" in request.GET:
+    if "querystats" in request.query_params:
         return False
 
     return True

plain/dev/views.py

@@ -11,10 +11,12 @@ class RequestsView(TemplateView):
         ctx = super().get_template_context()
         requestlogs = RequestLog.load_json_logs()
 
-        if self.request.GET.get("log"):
+        if self.request.query_params.get("log"):
             try:
                 requestlog = [
-                    x for x in requestlogs if x.get("name") == self.request.GET["log"]
+                    x
+                    for x in requestlogs
+                    if x.get("name") == self.request.query_params["log"]
                 ][0]
             except IndexError:
                 requestlog = None
@@ -29,9 +31,9 @@ class RequestsView(TemplateView):
         return ctx
 
     def post(self):
-        if self.request.POST.get("action") == "clear":
+        if self.request.data.get("action") == "clear":
             RequestLog.clear()
             return ResponseRedirect(self.request.path)
         else:
-            RequestLog.replay_request(self.request.POST["log"])
+            RequestLog.replay_request(self.request.data["log"])
             return ResponseRedirect(".")

{plain_dev-0.27.1.dist-info → plain_dev-0.29.0.dist-info}/METADATA

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

{plain_dev-0.27.1.dist-info → plain_dev-0.29.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 plain/dev/README.md,sha256=EQJ9lF-JQ9KQWJZ_j6CD3jbRquOLgDRlIPbgT7A2gG4,3658
 plain/dev/__init__.py,sha256=nRX1B0Br8gmqhJLqo5Z9PqzReDahBtbmwH6C-7hzuls,103
-plain/dev/cli.py,sha256=z6xDeU1hcu3dTI55H7MllKZBQz4fnAO_Y-VoIKPLO7M,14843
+plain/dev/cli.py,sha256=lyiIJveVedrO1MDwTlV-C-UYzMHR48q7MWEUODEQMUc,15605
 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/mkcert.py,sha256=fm1U_UTGPREso6ZaP79WqEvd9uvA4lYWFo6fKhNglMM,3911
 plain/dev/pdb.py,sha256=4ru3rlIIyuYVXteyI7v42i4MmdBIjpJP0IJemBpf83A,3742
-plain/dev/requests.py,sha256=D1NX0qC8ADtf_zwsGMTp9aiE6Sh9QmoxFJCU_V8Wers,6839
+plain/dev/requests.py,sha256=NH-_FYolAUbh2-m0x9hTdK6AS7HLo6cGETTpp6R-Wto,6857
 plain/dev/services.py,sha256=bfIXEVsot20cDbyIeRJ9xAiTTVxowHrLAiZM2aOMXDU,2845
 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=r2Ivk7OXytpRhXq4DZpsb7FXNP9vzmEE3D5kLajYG4w,1073
+plain/dev/views.py,sha256=yCZ_YmkJGCb3YYgElhzAPrA9V0X3lkiLD1-Ht1HjV7A,1131
 plain/dev/contribute/README.md,sha256=v9Ympugu2wvDEe_045WJnF1dmC4ZH7v_Bnxkpfaf_rM,329
 plain/dev/contribute/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/contribute/cli.py,sha256=jSfocR754VGMzcnb62zJA2lxxjry1Bdzupbsm3McgdY,3084
+plain/dev/contribute/cli.py,sha256=YirzF4YCQoFhWS-JgQHNxqJIX9BY_m9lb3_ZdrI7sn4,3097
 plain/dev/poncho/__init__.py,sha256=MDOk2rhhoR3V-I-rg6tMHFeX60vTGJuQ14RI-_N6tQY,97
 plain/dev/poncho/color.py,sha256=Dk77inPR9qNc9vCaZOGk8W9skXfRgoUlxp_E6mhPNns,610
 plain/dev/poncho/compat.py,sha256=l66WZLR7kRpO8P8DI5-aUsbNlohPaXEurQ5xXESQYDs,1276
@@ -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.27.1.dist-info/METADATA,sha256=CgZpO23_EYRFL2OX0AC8glbya4WORC1kPaduysWuq-c,4163
-plain_dev-0.27.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_dev-0.27.1.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
-plain_dev-0.27.1.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
-plain_dev-0.27.1.dist-info/RECORD,,
+plain_dev-0.29.0.dist-info/METADATA,sha256=I1CaEkxMtbFGR_dFf0JTMwbNNmw-2cafYs5-11CINC4,4163
+plain_dev-0.29.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_dev-0.29.0.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
+plain_dev-0.29.0.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
+plain_dev-0.29.0.dist-info/RECORD,,