hyperflask 0.4.4__tar.gz → 0.5.1__tar.gz

{hyperflask-0.4.4 → hyperflask-0.5.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: hyperflask
-Version: 0.4.4
+Version: 0.5.1
 Summary: Full stack web framework
 Author: Maxime Bouroumeau-Fuseau
 Author-email: Maxime Bouroumeau-Fuseau <maxime.bouroumeau@gmail.com>
 License-Expression: MIT
 Requires-Dist: flask>=3.0.0,<4.0.0
-Requires-Dist: flask-assets-pipeline~=0.7
+Requires-Dist: flask-assets-pipeline~=0.8
 Requires-Dist: flask-babel-hyper~=5.1
 Requires-Dist: flask-collections~=0.3
 Requires-Dist: flask-configurator~=0.1
@@ -32,6 +32,7 @@ Requires-Dist: jinja-wtforms~=0.2
 Requires-Dist: periodiq~=0.13
 Requires-Dist: python-slugify~=8.0.4
 Requires-Dist: watchdog>=6.0.0
+Requires-Dist: pillow>=11.3.0
 Requires-Python: >=3.10
 Project-URL: Repository, https://github.com/hyperflask/hyperflask
 Description-Content-Type: text/markdown

{hyperflask-0.4.4 → hyperflask-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperflask"
-version = "0.4.4"
+version = "0.5.1"
 description = "Full stack web framework"
 authors = [
     {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}
@@ -10,7 +10,7 @@ license = "MIT"
 requires-python = ">=3.10"
 dependencies = [
     "flask>=3.0.0,<4.0.0",
-    "flask-assets-pipeline ~=0.7",
+    "flask-assets-pipeline ~=0.8",
     "flask-babel-hyper ~=5.1",
     "flask-collections ~=0.3",
     "flask-configurator ~=0.1",
@@ -37,6 +37,7 @@ dependencies = [
     "periodiq ~=0.13",
     "python-slugify ~=8.0.4",
     "watchdog>=6.0.0",
+    "pillow>=11.3.0",
 ]
 
 [tool.uv.sources]

{hyperflask-0.4.4 → hyperflask-0.5.1}/src/hyperflask/app.py

@@ -31,6 +31,7 @@ from .utils.markdown import jinja_markdown, MarkdownExtension
 from .utils.html import sanitize_html, nl2br
 from .utils.metadata import metadata_tags
 from .utils.freezer import StaticMode, Freezer, freezer_url_generator
+from .utils.image import image_tag
 from .components import register_components
 from .model import Model, File as SQLFileType, UndefinedDatabase
 from .actors import AppContextMiddleware, discover_broker, make_actor_decorator
@@ -95,7 +96,9 @@ class Hyperflask(Flask):
             "CSP_FRAME_ANCESTORS": True,
             "CSP_FRAME_ANCESTORS_SAFE_ENDPOINTS": [],
             "REFERRER_POLICY": "strict-origin-when-cross-origin",
-            "HSTS_HEADER": False
+            "HSTS_HEADER": False,
+            "IMAGES_DEFAULT_LOADING": "lazy",
+            "IMAGES_DEFAULT_DECODING": "async",
         })
         if config:
             self.config.update(config)
@@ -126,8 +129,13 @@ class Hyperflask(Flask):
         self.jinja_env.add_extension(LayoutExtension)
         self.jinja_env.add_extension(WtformExtension)
         self.jinja_env.add_extension(MarkdownExtension)
-        self.jinja_env.filters.update(markdown=jinja_markdown, sanitize=sanitize_html, nl2br=nl2br)
-        self.jinja_env.globals.update(page_action_url=page_action_url, app=self, csp_nonce=csp_nonce, metadata_tags=metadata_tags)
+        self.jinja_env.filters.update(markdown=jinja_markdown,
+                                      sanitize=sanitize_html,
+                                      nl2br=nl2br)
+        self.jinja_env.globals.update(page_action_url=page_action_url,
+                                      app=self,
+                                      csp_nonce=csp_nonce,
+                                      metadata_tags=metadata_tags)
         self.jinja_env.form_base_cls = Form
         self.jinja_env.default_layout = self.config["LAYOUT"]
         self.forms = self.jinja_env.forms
@@ -197,6 +205,7 @@ class Hyperflask(Flask):
         if hasattr(file_routes, "loader"):
             self.forms.register_from_loader(file_routes.loader, "pages")
         self.macros.create_from_func(htmx_oob, "HtmxOob", receive_caller=True, caller_alias="html")
+        self.macros.create_from_func(image_tag, "Image")
 
         self.components_loader, _ = register_components(self)
         if self.components_loader:

{hyperflask-0.4.4 → hyperflask-0.5.1}/src/hyperflask/cli/runner.py

@@ -12,9 +12,14 @@ from . import reloader # import hacky patch of werkzeug reloader
 
 @click.command("serve")
 @click.option('--gunicorn-opt', multiple=True)
+@click.option("--init-db", is_flag=True)
 @pass_script_info
 @click.pass_context
-def serve_command(ctx, info, host, port, gunicorn_opt, **run_kwargs):
+def serve_command(ctx, info, host, port, gunicorn_opt, init_db, **run_kwargs):
+    if init_db:
+        print("Initializing database...")
+        Popen([sys.argv[0], "db", "init"]).wait()
+
     if os.environ.get("FLASK_DEBUG") == "1":
         ctx.invoke(flask_run_command, host=host, port=port, **run_kwargs)
     else:
@@ -59,6 +64,10 @@ def run_command(processes, host, port, concurrency, extend_procfile, init_db, de
     procfile = None
     config = load_config()
 
+    if not dev and not config.get('SECRET_KEY'):
+        print("Critical: No SECRET_KEY set, cannot run in production mode.")
+        sys.exit(1)
+
     for filename in [f"Procfile.{config['ENV']}", "Procfile"]:
         if os.path.exists(filename):
             with open(filename) as f:
@@ -75,16 +84,6 @@ def run_command(processes, host, port, concurrency, extend_procfile, init_db, de
         _processes["worker"].extend(["-p", "1", "-t", "1"])
     else:
         _processes["mercurehub"] = [sys.executable, "-m", "flask_mercure_sse.server", "--port", "$PORT"]
-        subscriber_secret_key = config.get("MERCURE_SUBSCRIBER_SECRET_KEY", config.get('SECRET_KEY'))
-        if subscriber_secret_key:
-            _processes["mercurehub"].extend(["--subscriber-secret", subscriber_secret_key])
-        else:
-            print("Warning: No MERCURE_SUBSCRIBER_SECRET_KEY or SECRET_KEY set, Mercure subscriber will not be authenticated.")
-        publisher_secret_key = config.get("MERCURE_PUBLISHER_SECRET_KEY", config.get('SECRET_KEY'))
-        if publisher_secret_key:
-            _processes["mercurehub"].extend(["--publisher-secret", publisher_secret_key])
-        else:
-            print("Warning: No MERCURE_PUBLISHER_SECRET_KEY or SECRET_KEY set, cannot publish Mercure messages.")
 
     if procfile and extend_procfile:
         _processes.update(procfile)
@@ -93,13 +92,19 @@ def run_command(processes, host, port, concurrency, extend_procfile, init_db, de
 
     processes = {name: " ".join(_processes[name]) if isinstance(_processes[name], list) else _processes[name]
                  for name in _processes if not processes or name in processes}
+    env = {}
+    if not dev:
+        env = {
+            "MERCURE_SUBSCRIBER_SECRET_KEY": config.get("MERCURE_SUBSCRIBER_SECRET_KEY", config['SECRET_KEY']),
+            "MERCURE_PUBLISHER_SECRET_KEY": config.get("MERCURE_PUBLISHER_SECRET_KEY", config['SECRET_KEY']),
+        }
 
     manager = ProcessManager(Printer(sys.stdout, colour=True))
-
     for p in environ.expand_processes(processes,
                                       concurrency=_parse_concurrency(concurrency),
                                       port=port):
         e = os.environ.copy()
+        e.update(env)
         e.update(p.env)
         manager.add_process(p.name, p.cmd, quiet=p.quiet, env=e)
 

{hyperflask-0.4.4 → hyperflask-0.5.1}/src/hyperflask/components/core.py

@@ -7,7 +7,6 @@ from jinjapy import extract_frontmatter
 from ..utils.freezer import dynamic
 import importlib
 import re
-import os
 
 
 class BaseComponentAdapter:
@@ -71,8 +70,9 @@ class ComponentAdapter(BaseComponentAdapter):
             source, frontmatter = extract_frontmatter(f.read())
             if not self.template:
                 frontmatter = source
+            if not frontmatter:
+                return []
             return [m.upper() for m in http_method_funcs if re.search(rf"^(def\s+{m}\()|{m}\s*=", frontmatter, re.MULTILINE)]
-        return []
 
     def render(self, *args, **kwargs):
         caller = kwargs.pop('caller', None)

{hyperflask-0.4.4 → hyperflask-0.5.1}/src/hyperflask/components/jsx.py

@@ -1,7 +1,7 @@
 from .core import BaseComponentAdapter
 from markupsafe import Markup
 from flask import current_app
-from flask_assets_pipeline import Entrypoint
+from flask_assets_pipeline import BundleEntrypoint
 import json
 import html
 
@@ -13,7 +13,7 @@ class JsxComponentAdapter(BaseComponentAdapter):
             app.assets.state.bundles["@components"] = []
             app.assets.include("@components")
         app.assets.state.bundles["@components"].append(
-            Entrypoint.create(self.template, from_package="jinja"))
+            BundleEntrypoint.create(self.template, from_package="jinja"))
         app.assets.include(self.include_js)
 
     def render(self, caller, *args, **kwargs):

{hyperflask-0.4.4 → hyperflask-0.5.1}/src/hyperflask/components/webcomponent.py

@@ -1,6 +1,6 @@
 from .core import BaseComponentAdapter
 from jinja_super_macros import html_tag
-from flask_assets_pipeline import Entrypoint
+from flask_assets_pipeline import BundleEntrypoint
 from markupsafe import Markup
 import os
 
@@ -17,7 +17,7 @@ class WebComponentAdapter(BaseComponentAdapter):
             app.assets.state.bundles["@components"] = []
             app.assets.include("@components")
         app.assets.state.bundles["@components"].append(
-            Entrypoint.create(os.path.abspath(tpl.filename), self.template))
+            BundleEntrypoint.create(os.path.abspath(tpl.filename), self.template))
 
     def render(self, caller, *args, **kwargs):
         tag_name = self.name.replace("_", "-")

{hyperflask-0.4.4 → hyperflask-0.5.1}/src/hyperflask/layouts/web.html

@@ -5,7 +5,7 @@
         {% block head_metas %}
           {{ metadata_tags(page.get('metadata', {})) }}
         {% endblock %}
-        {% asset_tags nonce=csp_nonce %}
+        {% asset_tags(nonce=csp_nonce) %}
         {% block head_assets %}{% endblock %}
         {%- endblock %}
     </head>

hyperflask-0.5.1/src/hyperflask/utils/image.py

@@ -0,0 +1,26 @@
+from flask import current_app
+from jinja_super_macros import html_tag
+from flask_assets_pipeline import image_attrs
+
+
+def image_tag(src, priority=False, preload=False, placeholder=True, loading=None, decoding=None, **attrs):
+    if not loading:
+        loading = current_app.config["IMAGES_DEFAULT_LOADING"]
+    if not decoding:
+        decoding = current_app.config["IMAGES_DEFAULT_DECODING"]
+    if priority:
+        preload = True
+        attrs.setdefault("fetchpriority", "high")
+    if preload:
+        current_app.assets.include([(src, {"modifier": "preload", "content_type": "image"})])
+        if loading == "lazy":
+            loading = "eager"
+    _attrs = image_attrs(src)
+    if not placeholder and "style" in _attrs:
+        del _attrs["style"]
+    if loading:
+        _attrs["loading"] = loading
+    if decoding:
+        _attrs["decoding"] = decoding
+    _attrs.update(attrs)
+    return html_tag("img", **_attrs)