plain 0.47.0__py3-none-any.whl → 0.49.0__py3-none-any.whl

plain/cli/README.md

@@ -30,6 +30,12 @@ Run a Python script in the context of your app.
 
 View the runtime value of a named setting.
 
+### `plain help`
+
+Print help for all available commands and subcommands.
+Each command's help output is prefixed with the full command name for
+readability.
+
 ### `plain shell`
 
 Open a Python shell with the Plain loaded.

plain/cli/core.py

@@ -10,6 +10,7 @@ from .build import build
 from .chores import chores
 from .docs import docs
 from .formatting import PlainContext
+from .help import help_cmd
 from .preflight import preflight_checks
 from .registry import cli_registry
 from .scaffold import create
@@ -34,6 +35,7 @@ plain_cli.add_command(urls)
 plain_cli.add_command(setting)
 plain_cli.add_command(shell)
 plain_cli.add_command(run)
+plain_cli.add_command(help_cmd)
 
 
 class CLIRegistryGroup(click.Group):

plain/cli/help.py

@@ -0,0 +1,27 @@
+import click
+from click.core import MultiCommand
+
+
+@click.command("help")
+@click.pass_context
+def help_cmd(ctx):
+    """Show help for all commands and subcommands."""
+
+    root = ctx.parent.command
+    info_name = ctx.parent.info_name or "plain"
+
+    def print_help(cmd, prog, parent=None):
+        sub_ctx = click.Context(cmd, info_name=prog, parent=parent)
+
+        title = sub_ctx.command_path
+        click.secho(title, fg="green", bold=True)
+        click.secho("-" * len(title), fg="green")
+        click.echo(sub_ctx.get_help())
+
+        if isinstance(cmd, MultiCommand):
+            for name in cmd.list_commands(sub_ctx):
+                click.echo()
+                sub_cmd = cmd.get_command(sub_ctx, name)
+                print_help(sub_cmd, name, sub_ctx)
+
+    print_help(root, info_name)

plain/runtime/README.md

@@ -85,7 +85,7 @@ DATABASES: dict
 # Automatically configure DATABASES if a DATABASE_URL was given in the environment
 if "DATABASE_URL" in environ:
     DATABASES = {
-        "default": database_url.parse(
+        "default": database_url.parse_database_url(
             environ["DATABASE_URL"],
             # Enable persistent connections by default
             conn_max_age=int(environ.get("DATABASE_CONN_MAX_AGE", 600)),

plain/templates/jinja/__init__.py

@@ -1,3 +1,4 @@
+import importlib.util
 from importlib import import_module
 
 from plain.packages import packages_registry
@@ -25,24 +26,21 @@ class JinjaEnvironment(LazyObject):
         self._wrapped = env
 
         for package_config in packages_registry.get_package_configs():
-            # Allow this to fail in case there are import errors inside of their file
+            # Autoload template helpers if the package provides a ``templates`` module
             import_name = f"{package_config.name}.templates"
             if import_name in self._imported_modules:
                 continue
-            try:
-                import_module(import_name)
-                self._imported_modules.add(import_name)
-            except ModuleNotFoundError:
-                pass
+            if importlib.util.find_spec(import_name) is None:
+                continue
+            import_module(import_name)
+            self._imported_modules.add(import_name)
 
-        # Allow this to fail in case there are import errors inside of their file
+        # Autoload template helpers from the local ``app`` package if present
         import_name = "app.templates"
         if import_name not in self._imported_modules:
-            try:
+            if importlib.util.find_spec(import_name) is not None:
                 import_module(import_name)
                 self._imported_modules.add(import_name)
-            except ModuleNotFoundError:
-                pass
 
 
 environment = JinjaEnvironment()

plain/views/templates.py

@@ -1,5 +1,6 @@
 from plain.csrf.middleware import get_token
 from plain.exceptions import ImproperlyConfigured
+from plain.http import Response
 from plain.runtime import settings
 from plain.templates import Template, TemplateFileMissing
 from plain.utils.functional import lazy
@@ -69,5 +70,5 @@ class TemplateView(View):
     def render_template(self) -> str:
         return self.get_template().render(self.get_template_context())
 
-    def get(self):
-        return self.render_template()
+    def get(self) -> Response:
+        return Response(self.render_template())

{plain-0.47.0.dist-info → plain-0.49.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.47.0
+Version: 0.49.0
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain-0.47.0.dist-info → plain-0.49.0.dist-info}/RECORD

@@ -17,13 +17,14 @@ plain/assets/views.py,sha256=T_0Qh6v9qBerEBYbhToigwOzsij-x1z_R-1zETQcIh0,9447
 plain/chores/README.md,sha256=Da8Nw8ZF7PlAE_iVb0AqJGbLOu0F6HC0cj1K451KBak,1946
 plain/chores/__init__.py,sha256=r9TXtQCH-VbvfnIJ5F8FxgQC35GRWFOfmMZN3q9niLg,67
 plain/chores/registry.py,sha256=V3WjuekRI22LFvJbqSkUXQtiOtuE2ZK8gKV1TRvxRUI,1866
-plain/cli/README.md,sha256=ompPcgzY2Fdpm579ITmCpFIaZIsiXYbfD61mqkq312M,1860
+plain/cli/README.md,sha256=nkcpS_mWPZ6JbnlKh4fq-b7AlmItAQsT78XAqRlwqNg,2017
 plain/cli/__init__.py,sha256=6w9T7K2WrPwh6DcaMb2oNt_CWU6Bc57nUTO2Bt1p38Y,63
 plain/cli/build.py,sha256=dKUYBNegvb6QNckR7XZ7CJJtINwZcmDvbUdv2dWwjf8,3226
 plain/cli/chores.py,sha256=xXSSFvr8T5jWfLWqe6E8YVMw1BkQxyOHHVuY0x9RH0A,2412
-plain/cli/core.py,sha256=sy5otyN5jNOHkcy1EXISB7iMr1itp0rzmBSnEXYGe2k,2866
+plain/cli/core.py,sha256=h8gjeBYQzYTzpmeDMAJTdVDOEoNCNcvnxml-KIsiRPo,2925
 plain/cli/docs.py,sha256=2CpTv5k-TNWf593tPiglvUVXWBGdfPmbGf8vl5AfJwU,8995
 plain/cli/formatting.py,sha256=1hZH13y1qwHcU2K2_Na388nw9uvoeQH8LrWL-O9h8Yc,2207
+plain/cli/help.py,sha256=otRSGxOJ5V8JMjpdZ8XYqUbdlYdJvxOMzQroLOWw-l0,801
 plain/cli/preflight.py,sha256=NKyYjcoDjigzfJIDhf7A7degYadaUI05Bw7U9OQ73vs,4170
 plain/cli/print.py,sha256=XraUYrgODOJquIiEv78wSCYGRBplHXtXSS9QtFG5hqY,217
 plain/cli/registry.py,sha256=yKVMSDjW8g10nlV9sPXFGJQmhC_U-k4J4kM7N2OQVLA,1467
@@ -81,7 +82,7 @@ plain/preflight/messages.py,sha256=B6VyXzu7HTJHaPVK4G1L_1HVHG87CT7JPtcDk8QYSeE,2
 plain/preflight/registry.py,sha256=wHLq6LSMkKunkxElBmNwzMzQx3tc6OGYeKyOOi0tuyQ,2333
 plain/preflight/security.py,sha256=oxUZBp2M0bpBfUoLYepIxoex2Y90nyjlrL8XU8UTHYY,2438
 plain/preflight/urls.py,sha256=cQ-WnFa_5oztpKdtwhuIGb7pXEml__bHsjs1SWO2YNI,1468
-plain/runtime/README.md,sha256=S_FIOmSq8LkVQHh9Xm6s3EJWKTVdlSr5A_bNXgh02X8,4740
+plain/runtime/README.md,sha256=yPcrJKnFEqkrb0KlhLZi2VInV-LCl6ENOZs7mOHlhi0,4753
 plain/runtime/__init__.py,sha256=8GtvKROf3HUCtneDYXTbEioPcCtwnV76dP57n2PnjuE,2343
 plain/runtime/global_settings.py,sha256=MpJ6vtBMO2EYALaKXrtgcGoxLh9Y549zwwErC5D5K7I,5343
 plain/runtime/user_settings.py,sha256=OzMiEkE6ZQ50nxd1WIqirXPiNuMAQULklYHEzgzLWgA,11027
@@ -93,7 +94,7 @@ plain/signals/dispatch/license.txt,sha256=o9EhDhsC4Q5HbmD-IfNGVTEkXtNE33r5rIt3ll
 plain/templates/README.md,sha256=G43IdTRJX6mfxsExUTQf9QAwPeHLsDgY7PvKXdx4l6g,2432
 plain/templates/__init__.py,sha256=bX76FakE9T7mfK3N0deN85HlwHNQpeigytSC9Z8LcOs,451
 plain/templates/core.py,sha256=iw58EAmyyv8N5HDA-Sq4-fLgz_qx8v8WJfurgR116jw,625
-plain/templates/jinja/__init__.py,sha256=qBESSL8XfwdxtwujjR5mZvk4VddlMn1-jOsSxGQy0oE,2768
+plain/templates/jinja/__init__.py,sha256=xvYif0feMYR9pWjN0czthq2dk3qI4D5UQjgj9yp4dNA,2776
 plain/templates/jinja/environments.py,sha256=9plifzvQj--aTN1cCpJ2WdzQxZJpzB8S_4hghgQRQT0,2064
 plain/templates/jinja/extensions.py,sha256=AEmmmHDbdRW8fhjYDzq9eSSNbp9WHsXenD8tPthjc0s,1351
 plain/templates/jinja/filters.py,sha256=t_u8BkWtEpJFLbLywONxWKrenSzOvDJhfOLwlZiXHDU,968
@@ -114,7 +115,6 @@ plain/urls/utils.py,sha256=lKxTX_A3XJpIH7FjlNYju108stY6-8Sw2uVdiSsxOKQ,1249
 plain/utils/README.md,sha256=hRRkcg4CxMX-zz8d4Bn6V2uJr_VKgTLurc1jY7QlEx8,198
 plain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/utils/cache.py,sha256=iuvOTIfI1s857iVOAPNLK5lkzlrl0fIiBYaiUXWQu40,5303
-plain/utils/connection.py,sha256=KF57CXt4tVO0EXMRwvIQX0eSruvpNQwGkK4_YGT9nXo,2488
 plain/utils/crypto.py,sha256=zFDydnaqNMGYFHUc-CAn8f93685a17BhGusAcITH1lI,2662
 plain/utils/datastructures.py,sha256=g4UYTbxIb_n8F9JWMP4dHPwUz71591fHreGATPO4qEc,10240
 plain/utils/dateparse.py,sha256=u9_tF85YteXSjW9KQzNg_pcCEFDZS3EGorCddcWU0vE,5351
@@ -145,9 +145,9 @@ plain/views/exceptions.py,sha256=b4euI49ZUKS9O8AGAcFfiDpstzkRAuuj_uYQXzWNHME,138
 plain/views/forms.py,sha256=ESZOXuo6IeYixp1RZvPb94KplkowRiwO2eGJCM6zJI0,2400
 plain/views/objects.py,sha256=GGbcfg_9fPZ-PiaBwIHG2e__8GfWDR7JQtQ15wTyiHg,5970
 plain/views/redirect.py,sha256=daq2cQIkdDF78bt43sjuZxRAyJm_t_SKw6tyPmiXPIc,1985
-plain/views/templates.py,sha256=SU1fO9gVMp-gEQHYeFplxvmgeMyrLgT8MJ12WNVmQC8,2085
-plain-0.47.0.dist-info/METADATA,sha256=1pZQsM230re8YuNsP-4sMkVswn-9OrSRzm0A7QxhVA8,4297
-plain-0.47.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.47.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
-plain-0.47.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.47.0.dist-info/RECORD,,
+plain/views/templates.py,sha256=ivkI7LU7BXDQ0d4Geab96Is4-Cp03KbIntXRT1J8e6I,2139
+plain-0.49.0.dist-info/METADATA,sha256=h5KgVsVtWFjd4CveudNI0w7_TsFeroqviAiWssBGNwE,4297
+plain-0.49.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.49.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
+plain-0.49.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.49.0.dist-info/RECORD,,

plain/utils/connection.py

@@ -1,84 +0,0 @@
-from functools import cached_property
-from threading import local
-
-from plain.runtime import settings as plain_settings
-
-
-class ConnectionProxy:
-    """Proxy for accessing a connection object's attributes."""
-
-    def __init__(self, connections, alias):
-        self.__dict__["_connections"] = connections
-        self.__dict__["_alias"] = alias
-
-    def __getattr__(self, item):
-        return getattr(self._connections[self._alias], item)
-
-    def __setattr__(self, name, value):
-        return setattr(self._connections[self._alias], name, value)
-
-    def __delattr__(self, name):
-        return delattr(self._connections[self._alias], name)
-
-    def __contains__(self, key):
-        return key in self._connections[self._alias]
-
-    def __eq__(self, other):
-        return self._connections[self._alias] == other
-
-
-class ConnectionDoesNotExist(Exception):
-    pass
-
-
-class BaseConnectionHandler:
-    settings_name = None
-    exception_class = ConnectionDoesNotExist
-
-    def __init__(self, settings=None):
-        self._settings = settings
-        self._connections = local()
-
-    @cached_property
-    def settings(self):
-        self._settings = self.configure_settings(self._settings)
-        return self._settings
-
-    def configure_settings(self, settings):
-        if settings is None:
-            settings = getattr(plain_settings, self.settings_name)
-        return settings
-
-    def create_connection(self, alias):
-        raise NotImplementedError("Subclasses must implement create_connection().")
-
-    def __getitem__(self, alias):
-        try:
-            return getattr(self._connections, alias)
-        except AttributeError:
-            if alias not in self.settings:
-                raise self.exception_class(f"The connection '{alias}' doesn't exist.")
-        conn = self.create_connection(alias)
-        setattr(self._connections, alias, conn)
-        return conn
-
-    def __setitem__(self, key, value):
-        setattr(self._connections, key, value)
-
-    def __delitem__(self, key):
-        delattr(self._connections, key)
-
-    def __iter__(self):
-        return iter(self.settings)
-
-    def all(self, initialized_only=False):
-        return [
-            self[alias]
-            for alias in self
-            # If initialized_only is True, return only initialized connections.
-            if not initialized_only or hasattr(self._connections, alias)
-        ]
-
-    def close_all(self):
-        for conn in self.all(initialized_only=True):
-            conn.close()