plain 0.12.1__py3-none-any.whl → 0.13.1__py3-none-any.whl

plain/cli/cli.py

@@ -446,8 +446,6 @@ class PlainCommandCollection(click.CommandCollection):
         sources = []
 
         try:
-            # Setup has to run before the installed packages CLI work
-            # and it also does the .env file loading right now...
             plain.runtime.setup()
 
             sources = [
@@ -457,6 +455,7 @@ class PlainCommandCollection(click.CommandCollection):
                 plain_cli,
             ]
         except plain.runtime.AppPathNotFound:
+            # Allow some commands to work regardless of being in a valid app
             click.secho(
                 "Plain `app` directory not found. Some commands may be missing.",
                 fg="yellow",
@@ -468,19 +467,16 @@ class PlainCommandCollection(click.CommandCollection):
                 plain_cli,
             ]
         except ImproperlyConfigured as e:
+            # Show what was configured incorrectly and exit
             click.secho(
                 str(e),
                 fg="red",
                 err=True,
             )
 
-            # None of these require the app to be setup
-            sources = [
-                EntryPointGroup(),
-                AppCLIGroup(),
-                plain_cli,
-            ]
+            exit(1)
         except Exception as e:
+            # Show the exception and exit
             print("---")
             print(traceback.format_exc())
             print("---")
@@ -491,12 +487,7 @@ class PlainCommandCollection(click.CommandCollection):
                 err=True,
             )
 
-            # None of these require the app to be setup
-            sources = [
-                EntryPointGroup(),
-                AppCLIGroup(),
-                plain_cli,
-            ]
+            exit(1)
 
         super().__init__(*args, **kwargs)
 

plain/debug.py

@@ -6,20 +6,22 @@ from plain.http import Response
 from plain.views.exceptions import ResponseException
 
 
-def dd(obj):
+def dd(*objs):
     """
     Dump and die.
 
     Dump the object and raise a ResponseException with the dump as the response content.
     """
-    dump_str = pformat(obj)
+    dump_strs = [
+        Markup("<pre><code>") + escape(pformat(obj)) + Markup("</code></pre>")
+        for obj in objs
+    ]
+    combined_dump_str = Markup("\n\n").join(dump_strs)
 
-    print(f"Dumping object:\n{dump_str}")
+    print(f"Dumping objects:\n{combined_dump_str}")
 
     response = Response()
     response.status_code = 500
-    response.content = (
-        Markup("<pre><code>") + escape(dump_str) + Markup("</code></pre>")
-    )
+    response.content = combined_dump_str
     response.content_type = "text/html"
     raise ResponseException(response)

plain/runtime/global_settings.py

@@ -167,5 +167,4 @@ SILENCED_PREFLIGHT_CHECKS = []
 # Templates #
 #############
 
-JINJA_LOADER = "jinja2.loaders.FileSystemLoader"
-JINJA_ENVIRONMENT = "plain.templates.jinja.defaults.create_default_environment"
+TEMPLATES_JINJA_ENVIRONMENT = "plain.templates.jinja.DefaultEnvironment"

plain/templates/__init__.py

@@ -1,6 +1,17 @@
 from .core import Template, TemplateFileMissing
+from .jinja import (
+    register_template_extension,
+    register_template_filter,
+    register_template_global,
+)
 
 __all__ = [
     "Template",
     "TemplateFileMissing",
+    # Technically these are jinja-specific,
+    # but expected to be used pretty frequently so
+    # the shorter import is handy.
+    "register_template_extension",
+    "register_template_filter",
+    "register_template_global",
 ]

plain/templates/jinja/README.md

@@ -105,25 +105,11 @@ TODO - example middleware, `|localtime` filter
 
 ## Settings
 
-Most Jinja customization happens in `jinja.py` at the root of your app or in `INSTALLED_PACKAGES`.
+Most Jinja customization happens in `templates.py` at the root of your app or in `INSTALLED_PACKAGES`.
 But if you need to further customize the environment,
-you can define your own callable which will be used to create the Jinja environment.
+you can define your own class via `TEMPLATES_JINJA_ENVIRONMENT`.
 
-```python
-# app/settings.py
-JINJA_ENVIRONMENT = "myjinja.create_environment"
-```
-
-```python
-# app/myjinja.py
-from jinja2 import Environment
-
-
-def create_environment():
-    return Environment(
-        # ...
-    )
-```
+TODO
 
 ## HTML Components
 

plain/templates/jinja/__init__.py

@@ -1,22 +1,88 @@
+from importlib import import_module
+
+from plain.packages import packages
 from plain.runtime import settings
 from plain.utils.functional import LazyObject
-from plain.utils.module_loading import import_string
+from plain.utils.module_loading import import_string, module_has_submodule
 
-from .defaults import create_default_environment, get_template_dirs
+from .environments import DefaultEnvironment, get_template_dirs
 
 
 class JinjaEnvironment(LazyObject):
+    def __init__(self, *args, **kwargs):
+        self.__dict__["_imported_modules"] = set()
+        super().__init__(*args, **kwargs)
+
     def _setup(self):
-        environment_setting = settings.JINJA_ENVIRONMENT
+        environment_setting = settings.TEMPLATES_JINJA_ENVIRONMENT
 
         if isinstance(environment_setting, str):
-            environment = import_string(environment_setting)()
+            env = import_string(environment_setting)()
         else:
-            environment = environment_setting()
+            env = environment_setting()
+
+        # We have to set _wrapped before we trigger the autoloading of "register" commands
+        self._wrapped = env
+
+        def _maybe_import_module(name):
+            if name not in self._imported_modules:
+                import_module(name)
+                self._imported_modules.add(name)
+
+        for package_config in packages.get_package_configs():
+            if module_has_submodule(package_config.module, "templates"):
+                # Allow this to fail in case there are import errors inside of their file
+                _maybe_import_module(f"{package_config.name}.templates")
 
-        self._wrapped = environment
+        app = import_module("app")
+        if module_has_submodule(app, "templates"):
+            # Allow this to fail in case there are import errors inside of their file
+            _maybe_import_module("app.templates")
 
 
 environment = JinjaEnvironment()
 
-__all__ = ["environment", "create_default_environment", "get_template_dirs"]
+
+def register_template_extension(extension_class):
+    environment.add_extension(extension_class)
+    return extension_class
+
+
+def register_template_global(value, name=None):
+    """
+    Adds a global to the Jinja environment.
+
+    Can be used as a decorator on a function:
+
+            @register_template_global
+            def my_global():
+                return "Hello, world!"
+
+    Or as a function:
+
+            register_template_global("Hello, world!", name="my_global")
+    """
+    if callable(value):
+        environment.globals[name or value.__name__] = value
+    elif name:
+        environment.globals[name] = value
+    else:
+        raise ValueError("name must be provided if value is not callable")
+
+    return value
+
+
+def register_template_filter(func, name=None):
+    """Adds a filter to the Jinja environment."""
+    environment.filters[name or func.__name__] = func
+    return func
+
+
+__all__ = [
+    "environment",
+    "DefaultEnvironment",
+    "get_template_dirs",
+    "register_template_extension",
+    "register_template_filter",
+    "register_template_global",
+]

plain/templates/jinja/environments.py

@@ -0,0 +1,63 @@
+import functools
+from pathlib import Path
+
+from jinja2 import Environment, StrictUndefined
+from jinja2.loaders import FileSystemLoader
+
+from plain.packages import packages
+from plain.runtime import settings
+
+from .filters import default_filters
+from .globals import default_globals
+
+
+def finalize_callable_error(obj):
+    """Prevent direct rendering of a callable (likely just forgotten ()) by raising a TypeError"""
+    if callable(obj):
+        raise TypeError(f"{obj} is callable, did you forget parentheses?")
+
+    # TODO find a way to prevent <object representation> from being rendered
+    # if obj.__class__.__str__ is object.__str__:
+    #     raise TypeError(f"{obj} does not have a __str__ method")
+
+    return obj
+
+
+def get_template_dirs():
+    jinja_templates = Path(__file__).parent / "templates"
+    app_templates = settings.path.parent / "templates"
+    return (jinja_templates, app_templates) + _get_app_template_dirs()
+
+
+@functools.lru_cache
+def _get_app_template_dirs():
+    """
+    Return an iterable of paths of directories to load app templates from.
+
+    dirname is the name of the subdirectory containing templates inside
+    installed applications.
+    """
+    dirname = "templates"
+    template_dirs = [
+        Path(package_config.path) / dirname
+        for package_config in packages.get_package_configs()
+        if package_config.path and (Path(package_config.path) / dirname).is_dir()
+    ]
+    # Immutable return value because it will be cached and shared by callers.
+    return tuple(template_dirs)
+
+
+class DefaultEnvironment(Environment):
+    def __init__(self):
+        super().__init__(
+            loader=FileSystemLoader(get_template_dirs()),
+            autoescape=True,
+            auto_reload=settings.DEBUG,
+            undefined=StrictUndefined,
+            finalize=finalize_callable_error,
+            extensions=["jinja2.ext.loopcontrols", "jinja2.ext.debug"],
+        )
+
+        # Load the top-level defaults
+        self.globals.update(default_globals)
+        self.filters.update(default_filters)

{plain-0.12.1.dist-info → plain-0.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plain
-Version: 0.12.1
+Version: 0.13.1
 Summary: A web framework for building products with Python.
 Author: Dave Gaeddert
 Author-email: dave.gaeddert@dropseed.dev

{plain-0.12.1.dist-info → plain-0.13.1.dist-info}/RECORD

@@ -9,7 +9,7 @@ plain/assets/urls.py,sha256=ZTIoM1Zq35JaXZ3wFhXhfGa7VoITDNlH9i5RS0R5xow,933
 plain/assets/views.py,sha256=dhjIpMu0GDR_VGbXM90_6RnC84C2C4bFv1RxDVklGBk,9173
 plain/cli/README.md,sha256=xjr1K-sIMTi5OWxdxL--O7aoo16Pd1xdawIZtz6BL7Q,2464
 plain/cli/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/cli/cli.py,sha256=Ns6Yi3fhrvvBsE-HrhqtaFoLiegni7d61ypj-MrLjss,14834
+plain/cli/cli.py,sha256=o3h6ZQLvxytNwuzTUjRg-TbNw6_FrTBgbmYxjBt6CuI,14543
 plain/cli/formatting.py,sha256=1hZH13y1qwHcU2K2_Na388nw9uvoeQH8LrWL-O9h8Yc,2207
 plain/cli/packages.py,sha256=69VH1bIi1-5N5l2jlBcR5EP0pt-v16sPar9arO3gCSE,2052
 plain/cli/print.py,sha256=XraUYrgODOJquIiEv78wSCYGRBplHXtXSS9QtFG5hqY,217
@@ -17,7 +17,7 @@ plain/cli/startup.py,sha256=PJYA-tNWGia-QbTlT0e5HvC8C7yDSq8wkAkIxgfKkvw,680
 plain/csrf/README.md,sha256=RXMWMtHmzf30gVVNOfj0kD4xlSqFIPgJh-n7dIciaEM,163
 plain/csrf/middleware.py,sha256=MlDQ55B4eRXySbzauFNs8gKhgQy32yWspBfPI0a3PzA,17775
 plain/csrf/views.py,sha256=YDgT451X16iUdCxpQ6rcHIy7nD0u7DAvCQl5-Mx5i9Y,219
-plain/debug.py,sha256=fdrWy4RNQOuXo80_jgwthCkMZKjjaF9lDj3Kqln_gJk,604
+plain/debug.py,sha256=NxiWJHB4Gi5JfJ4cnxzl-PZ6IgpSnUxg7a_dTQNq_lQ,705
 plain/exceptions.py,sha256=tDS6l0epe_L9IlxpEdT2k2hWgEoAu8YBNIumNCtJ-WY,6333
 plain/forms/README.md,sha256=fglB9MmHiEgfGGdZmcRstNl6eYaFljrElu2mzapK52M,377
 plain/forms/__init__.py,sha256=UxqPwB8CiYPCQdHmUc59jadqaXqDmXBH8y4bt9vTPms,226
@@ -69,7 +69,7 @@ plain/preflight/security.py,sha256=sNpv5AHobPcaO48cOUGRNe2EjusTducjY8vyShR8EhI,2
 plain/preflight/urls.py,sha256=O4PQ_v205VA2872fQlhPfxaihDDRCsVp0ZVKQ92aX4k,3019
 plain/runtime/README.md,sha256=Q8VVO7JRGuYrDxzuYL6ptoilhclbecxKzpRXKgbWGkU,2061
 plain/runtime/__init__.py,sha256=DH8TwKTGJhjviOy4yh_d051v8YGaAWMlFBPhK8ZuC9g,1499
-plain/runtime/global_settings.py,sha256=_FaHDQjtLDoRCTv1-2EEA8GZWCiCVPJHIm_O7OxwrsU,5554
+plain/runtime/global_settings.py,sha256=-tr_nUT7iwZpvQlCI6AmJsLRoakBYGp2O2ZsCXgye9U,5498
 plain/runtime/user_settings.py,sha256=-1xXUggueuOF3YlgnLfeyG55CUvR3azOGWr2UkTOmfs,11259
 plain/signals/README.md,sha256=cd3tKEgH-xc88CUWyDxl4-qv-HBXx8VT32BXVwA5azA,230
 plain/signals/__init__.py,sha256=eAs0kLqptuP6I31dWXeAqRNji3svplpAV4Ez6ktjwXM,131
@@ -78,11 +78,11 @@ plain/signals/dispatch/dispatcher.py,sha256=VxSlqn9PCOTghPPJLOqZPs6FNQZfV2BJpMfF
 plain/signals/dispatch/license.txt,sha256=o9EhDhsC4Q5HbmD-IfNGVTEkXtNE33r5rIt3lleJ8gc,1727
 plain/signing.py,sha256=V6A6PTDYWekuwtQRI1iFD8dud5OHPZTv4EkeoZEHoXo,8737
 plain/templates/README.md,sha256=VfA2HmrklG5weE1md85q9g84cWnMBEiXAynKzM7S1Sk,464
-plain/templates/__init__.py,sha256=Jh1jit55UR4dRpklQ6qAN2ixzYZBVoDi0AOdfD4Nh4E,106
+plain/templates/__init__.py,sha256=bX76FakE9T7mfK3N0deN85HlwHNQpeigytSC9Z8LcOs,451
 plain/templates/core.py,sha256=iw58EAmyyv8N5HDA-Sq4-fLgz_qx8v8WJfurgR116jw,625
-plain/templates/jinja/README.md,sha256=2i0HUQmNnqKlbHWzWqFdKl0WaqNOy1CEUY_hCHQDZis,7223
-plain/templates/jinja/__init__.py,sha256=1VAyXRHf2hDPniZfnKhiMWsOp4Gkg0Ss1xmAbuvZvbU,645
-plain/templates/jinja/defaults.py,sha256=AhGxp8X4UNC6CRD0XygQDV3ZeIs4KH2NaCjPtlgFeL0,3770
+plain/templates/jinja/README.md,sha256=ft4781b4IAVI6fsIdAHIpOigdsZ6wGg06LK7BHxoj-g,6996
+plain/templates/jinja/__init__.py,sha256=jGjtygVB5Bwknpd3u_pBSrtUSGlFkYo6MDo0E3IWVrs,2653
+plain/templates/jinja/environments.py,sha256=T5e8rjVteN3-6IWCXNRsvPgMe0OVvTkX-r6_Q9gxhv8,2046
 plain/templates/jinja/extensions.py,sha256=AEmmmHDbdRW8fhjYDzq9eSSNbp9WHsXenD8tPthjc0s,1351
 plain/templates/jinja/filters.py,sha256=3KJKKbxcv9dLzUDWPcaa88k3NU2m1GG3iMIgFhzXrBA,860
 plain/templates/jinja/globals.py,sha256=qhvQuikkRkOTpHSW5FwdsvoViJNlRgHq3-O7ZyeajsE,669
@@ -139,8 +139,8 @@ plain/views/objects.py,sha256=9QBYyb8PgkRirXCQ8-Pms4_yMzP37dfeL30hWRYmtZg,7909
 plain/views/redirect.py,sha256=KLnlktzK6ZNMTlaEiZpMKQMEP5zeTgGLJ9BIkIJfwBo,1733
 plain/views/templates.py,sha256=nF9CcdhhjAyp3LB0RrSYnBaHpHzMfPSw719RCdcXk7o,2007
 plain/wsgi.py,sha256=R6k5FiAElvGDApEbMPTT0MPqSD7n2e2Az5chQqJZU0I,236
-plain-0.12.1.dist-info/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.12.1.dist-info/METADATA,sha256=6Ez1vBmCnx5-YB6_u6-4WGCmSxqRPFWJ7B8NlKqCYKw,2722
-plain-0.12.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-plain-0.12.1.dist-info/entry_points.txt,sha256=7O1RZTmMasKYB73bfqQcTwIhsXo7RjEIKv2WbtTtOIM,39
-plain-0.12.1.dist-info/RECORD,,
+plain-0.13.1.dist-info/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.13.1.dist-info/METADATA,sha256=YwduCEEt6PAHfsEylk-zaY-ThC2V_T01w6zPm0R13UQ,2722
+plain-0.13.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+plain-0.13.1.dist-info/entry_points.txt,sha256=7O1RZTmMasKYB73bfqQcTwIhsXo7RjEIKv2WbtTtOIM,39
+plain-0.13.1.dist-info/RECORD,,

plain/templates/jinja/defaults.py

@@ -1,119 +0,0 @@
-import functools
-from importlib import import_module
-from pathlib import Path
-
-from jinja2 import Environment, StrictUndefined
-
-from plain.packages import packages
-from plain.runtime import settings
-from plain.utils.module_loading import import_string, module_has_submodule
-
-from .filters import default_filters
-from .globals import default_globals
-
-
-@functools.lru_cache
-def _get_app_template_dirs():
-    """
-    Return an iterable of paths of directories to load app templates from.
-
-    dirname is the name of the subdirectory containing templates inside
-    installed applications.
-    """
-    dirname = "templates"
-    template_dirs = [
-        Path(package_config.path) / dirname
-        for package_config in packages.get_package_configs()
-        if package_config.path and (Path(package_config.path) / dirname).is_dir()
-    ]
-    # Immutable return value because it will be cached and shared by callers.
-    return tuple(template_dirs)
-
-
-def _get_installed_extensions() -> tuple[list, dict, dict]:
-    """Automatically load extensions, globals, filters from INSTALLED_PACKAGES jinja module and root jinja module"""
-    extensions = []
-    globals = {}
-    filters = {}
-
-    for package_config in packages.get_package_configs():
-        if module_has_submodule(package_config.module, "jinja"):
-            module = import_module(f"{package_config.name}.jinja")
-        else:
-            continue
-
-        if hasattr(module, "extensions"):
-            extensions.extend(module.extensions)
-
-        if hasattr(module, "globals"):
-            globals.update(module.globals)
-
-        if hasattr(module, "filters"):
-            filters.update(module.filters)
-
-    try:
-        import jinja
-
-        if hasattr(jinja, "extensions"):
-            extensions.extend(jinja.extensions)
-
-        if hasattr(jinja, "globals"):
-            globals.update(jinja.globals)
-
-        if hasattr(jinja, "filters"):
-            filters.update(jinja.filters)
-    except ImportError:
-        pass
-
-    return extensions, globals, filters
-
-
-def finalize_callable_error(obj):
-    """Prevent direct rendering of a callable (likely just forgotten ()) by raising a TypeError"""
-    if callable(obj):
-        raise TypeError(f"{obj} is callable, did you forget parentheses?")
-
-    # TODO find a way to prevent <object representation> from being rendered
-    # if obj.__class__.__str__ is object.__str__:
-    #     raise TypeError(f"{obj} does not have a __str__ method")
-
-    return obj
-
-
-def get_template_dirs():
-    jinja_templates = Path(__file__).parent / "templates"
-    app_templates = settings.path.parent / "templates"
-    return (jinja_templates, app_templates) + _get_app_template_dirs()
-
-
-def create_default_environment(include_packages=True, **environment_kwargs):
-    """
-    This default jinja environment, also used by the error rendering and internal views so
-    customization needs to happen by using this function, not settings that hook in internally.
-    """
-    loader = import_string(settings.JINJA_LOADER)(get_template_dirs())
-    kwargs = {
-        "loader": loader,
-        "autoescape": True,
-        "auto_reload": settings.DEBUG,
-        "undefined": StrictUndefined,
-        "finalize": finalize_callable_error,
-        "extensions": ["jinja2.ext.loopcontrols", "jinja2.ext.debug"],
-    }
-    kwargs.update(**environment_kwargs)
-    env = Environment(**kwargs)
-
-    # Load the top-level defaults
-    env.globals.update(default_globals)
-    env.filters.update(default_filters)
-
-    if include_packages:
-        app_extensions, app_globals, app_filters = _get_installed_extensions()
-
-        for extension in app_extensions:
-            env.add_extension(extension)
-
-        env.globals.update(app_globals)
-        env.filters.update(app_filters)
-
-    return env