hyperflask 0.1.5__tar.gz → 0.2.0__tar.gz

hyperflask-0.1.5/README.md → hyperflask-0.2.0/PKG-INFO

@@ -1,20 +1,51 @@
+Metadata-Version: 2.4
+Name: hyperflask
+Version: 0.2.0
+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.6
+Requires-Dist: flask-babel-hyper~=5.1
+Requires-Dist: flask-collections~=0.2
+Requires-Dist: flask-configurator~=0.1
+Requires-Dist: flask-debugtoolbar~=0.15
+Requires-Dist: flask-dramatiq~=0.6
+Requires-Dist: flask-file-routes~=0.2
+Requires-Dist: flask-files~=0.2
+Requires-Dist: flask-geo~=0.1
+Requires-Dist: flask-mailman-templates~=0.1
+Requires-Dist: flask-mercure-sse~=0.2
+Requires-Dist: flask-sqlorm~=0.2
+Requires-Dist: flask-super-macros~=0.1
+Requires-Dist: flask-talisman~=1.1
+Requires-Dist: flask-wtf~=1.2
+Requires-Dist: frozen-flask~=1.0
+Requires-Dist: gunicorn~=22.0
+Requires-Dist: honcho~=1.1
+Requires-Dist: html-sanitizer~=2.4
+Requires-Dist: htmx-flask~=0.1
+Requires-Dist: jinja2-fragments~=1.3
+Requires-Dist: jinja-layout~=0.4
+Requires-Dist: jinja-wtforms~=0.2
+Requires-Dist: periodiq~=0.12
+Requires-Dist: python-slugify~=8.0.4
+Requires-Python: >=3.10
+Project-URL: Repository, https://github.com/hyperflask/hyperflask
+Description-Content-Type: text/markdown
+
 <div><img src="https://raw.githubusercontent.com/hyperflask/hyperflask/main/assets/banner.svg" width="100%"></div>
 <hr>
 <div align="center">
 
 **Full stack Python web framework to build websites and web apps with as little boilerplate as possible**
 
-**⚠️ This is a work in progress project which is not functionnal yet ⚠️**
-
-![Project Status](https://img.shields.io/badge/status-prototype-red) ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/hyperflask/hyperflask/python.yml?branch=main)
-
 [hyperflask.dev](https://hyperflask.dev) • [Get started](https://hyperflask.dev/getting-started) • [Docs](https://hyperflask.dev/guides) • [Example apps](https://github.com/hyperflask/examples)
 
 </div>
 
-A [Flask](https://flask.palletsprojects.com)-based (very) opiniated Python web framework where all the tech choices have been made. Hyperflask combines multiple Flask extensions and frontend libraries into a seamless experience.
-
-**This project is part of the [Hyperflask Stack](https://hyperflask.dev).**
+A [Flask](https://flask.palletsprojects.com)-based (very) opiniated full-stack web framework where all the tech choices have been made. Hyperflask combines multiple Flask extensions and frontend libraries into a seamless experience.
 
 Features and technologies:
 
@@ -24,52 +55,32 @@ Features and technologies:
  - SQL focused ORM with [sqlorm](https://github.com/hyperflask/sqlorm), optimized for [sqlite](https://www.sqlite.org/)
  - Modern asset pipeline using [esbuild](https://esbuild.github.io/) and [tailwindcss](https://tailwindcss.com/)
  - Deep integration with [htmx](https://htmx.org/)
- - Easily create reusable backend and frontend components, compatible with [Storybook](https://storybook.js.org)f
- - Build frontend components using Web Components, [Alpine.js](https://alpinejs.dev/), [Stimulus](https://stimulus.hotwired.dev/) and more. Mix technologies at will.
+ - Easily create reusable backend and frontend components
+ - Build frontend components using Web Components, [Alpine.js](https://alpinejs.dev/), [React](https://react.dev) and more. Mix technologies at will.
  - Component library based on [daisyUI](https://daisyui.com/) with icons from [Bootstrap Icons](https://icons.getbootstrap.com/)
- - Seamless reactivity between frontend and backend
  - Authentication and user management with social logins and MFA
  - Static content collections to easily create blogs and manage static content
  - File management with built-in image manipulation and S3 integration
  - Template based emails with [mjml](https://mjml.io) support
- - Background tasks using [dramatiq](https://dramatiq.io/)
+ - Background tasks using [dramatiq](https://dramatiq.io/) with sqlite as the default broker
  - Push support for realtime pages using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events)
  - I18n using [gettext](https://www.gnu.org/software/gettext/)
- - Easily create REST APIs and automatically generate documentation
  - Static, hybrid or dynamic modes for content serving
- - Observable with [OpenTelemetry](https://opentelemetry.io/)
 
 [Hyperflask-Start](https://github.com/hyperflask/hyperflask-start) should be used to create new projects:
 
  - Dev environment based on [Development Containers](https://containers.dev/)
  - Optimized for VScode with breakpoint debugging for frontend and backend
  - [Mailpit](https://github.com/axllent/mailpit) for email testing
- - Deployments using [Hyperflask-Deploy](https://github.com/hyperflask/hyperflask-deploy)
+ - Deployments using [docker-web-deploy](https://github.com/hyperflask/docker-web-deploy)
 
 ## Project status
 
 **Hyperflask is being actively developed and is not yet ready to be used.**
 
-Checkout the list of all the projects developed as part of the Hyperflask Stack and their current development status on the [Hyperflask Github organization homepage](https://github.com/hyperflask).
-
-Status overview:
+Checkout the list of all the projects developed as part of the Hyperflask stack and their current development status on the [Hyperflask Github organization homepage](https://github.com/hyperflask).
 
-| Feature | Status |
-| --- | --- |
-| Core experience (start project, dev, deploy) | 🚧 |
-| File based routing with mix code page format | ✅ |
-| ORM | ✅ |
-| Assets pipeline | ✅ |
-| Component system + component library | 🚧 (component system almost done, need to create macros for daisyui) |
-| SSE push | ✅ |
-| Collections | 🚧 (finalizing) |
-| Upload files | 🚧 (missing S3 improvements) |
-| Emails | 🚧 |
-| User management and auth | 🚧 |
-| Static site generation | ❌ |
-| I18n | 🚧 (finalizing) |
-| PWA | ❌ |
-| Runner | ✅ |
+[Project status and roadmap](https://hyperflask.dev/roadmap)
 
 ## Flask extensions
 
@@ -79,7 +90,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 
 | Name | Description |
 | --- | --- |
-| [Flask-Apispec-Hyper](https://github.com/hyperflask/flask-apispec-hyper) | [Flask-Apispec](https://github.com/jmcarp/flask-apispec) fork with updates and fixes
 | [Flask-Assets-Pipeline](https://github.com/hyperflask/flask-assets-pipeline) | Modern asset pipeline using [esbuild](https://esbuild.github.io/)
 | [Flask-Babel-Hyper](https://github.com/hyperflask/flask-babel-hyper) | [Flask-Babel](https://github.com/python-babel/flask-babel) fork with additional utilities
 | [Flask-Collections](https://github.com/hyperflask/flask-collections) | Manage collections of static content
@@ -95,7 +105,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 | [Flask-Mailman](https://github.com/waynerv/flask-mailman) | Send emails |
 | [Flask-Mailman-Templates](https://github.com/hyperflask/flask-mailman-templates) | Email templates for [Flask-Mailman](https://github.com/waynerv/flask-mailman)
 | [Flask-Mercure-SSE](https://github.com/hyperflask/flask-mercure-sse) | Push events via server-sent events using the [Mercure](https://mercure.rocks) protocol
-| [Flask-Observability](https://github.com/hyperflask/flask-observability) | Observable Flask apps with [OpenTelemetry](https://opentelemetry.io/), logging and more
 | [Flask-SQLORM](https://github.com/hyperflask/flask-sqlorm) | Flask integration of [sqlorm](https://github.com/hyperflask/sqlorm)
 | [Flask-Super-Macros](https://github.com/hyperflask/flask-super-macros) | Better macro management for Jinja
 | [Flask-Talisman](https://github.com/wntrblm/flask-talisman) | HTTP security headers for Flask

hyperflask-0.1.5/PKG-INFO → hyperflask-0.2.0/README.md

@@ -1,64 +1,14 @@
-Metadata-Version: 2.1
-Name: hyperflask
-Version: 0.1.5
-Summary: Full stack web framework
-Home-page: https://github.com/hyperflask/hyperflask
-License: MIT
-Author: Maxime Bouroumeau-Fuseau
-Author-email: maxime.bouroumeau@gmail.com
-Requires-Python: >=3.10,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: flask (>=3.0,<4.0)
-Requires-Dist: flask-apispec-hyper (>=0.12,<0.13)
-Requires-Dist: flask-assets-pipeline (>=0.1,<0.2)
-Requires-Dist: flask-babel-hyper (>=5.0,<6.0)
-Requires-Dist: flask-collections (>=0.1,<0.2)
-Requires-Dist: flask-configurator (>=0.1,<0.2)
-Requires-Dist: flask-debugtoolbar (>=0.15,<0.16)
-Requires-Dist: flask-dramatiq (>=0.6,<0.7)
-Requires-Dist: flask-file-routes (>=0.1,<0.2)
-Requires-Dist: flask-files (>=0.1,<0.2)
-Requires-Dist: flask-geo (>=0.1,<0.2)
-Requires-Dist: flask-mailman-templates (>=0.1,<0.2)
-Requires-Dist: flask-mercure-sse (>=0.1,<0.2)
-Requires-Dist: flask-sqlorm (>=0.1,<0.2)
-Requires-Dist: flask-super-macros (>=0.1,<0.2)
-Requires-Dist: flask-talisman (>=1.1,<2.0)
-Requires-Dist: flask-wtf (>=1.2,<2.0)
-Requires-Dist: frozen-flask (>=1.0,<2.0)
-Requires-Dist: gunicorn (>=22.0,<23.0)
-Requires-Dist: honcho (>=1.1,<2.0)
-Requires-Dist: htmx-flask (>=0.1,<0.2)
-Requires-Dist: jinja-layout (>=0.4,<0.5)
-Requires-Dist: jinja-wtforms (>=0.1,<0.2)
-Requires-Dist: jinja2-fragments (>=1.3,<2.0)
-Requires-Dist: periodiq (>=0.12,<0.13)
-Requires-Dist: python-slugify (>=8.0.4,<9.0.0)
-Requires-Dist: redis (>=5.0,<6.0)
-Project-URL: Repository, https://github.com/hyperflask/hyperflask
-Description-Content-Type: text/markdown
-
 <div><img src="https://raw.githubusercontent.com/hyperflask/hyperflask/main/assets/banner.svg" width="100%"></div>
 <hr>
 <div align="center">
 
 **Full stack Python web framework to build websites and web apps with as little boilerplate as possible**
 
-**⚠️ This is a work in progress project which is not functionnal yet ⚠️**
-
-![Project Status](https://img.shields.io/badge/status-prototype-red) ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/hyperflask/hyperflask/python.yml?branch=main)
-
 [hyperflask.dev](https://hyperflask.dev) • [Get started](https://hyperflask.dev/getting-started) • [Docs](https://hyperflask.dev/guides) • [Example apps](https://github.com/hyperflask/examples)
 
 </div>
 
-A [Flask](https://flask.palletsprojects.com)-based (very) opiniated Python web framework where all the tech choices have been made. Hyperflask combines multiple Flask extensions and frontend libraries into a seamless experience.
-
-**This project is part of the [Hyperflask Stack](https://hyperflask.dev).**
+A [Flask](https://flask.palletsprojects.com)-based (very) opiniated full-stack web framework where all the tech choices have been made. Hyperflask combines multiple Flask extensions and frontend libraries into a seamless experience.
 
 Features and technologies:
 
@@ -68,52 +18,32 @@ Features and technologies:
  - SQL focused ORM with [sqlorm](https://github.com/hyperflask/sqlorm), optimized for [sqlite](https://www.sqlite.org/)
  - Modern asset pipeline using [esbuild](https://esbuild.github.io/) and [tailwindcss](https://tailwindcss.com/)
  - Deep integration with [htmx](https://htmx.org/)
- - Easily create reusable backend and frontend components, compatible with [Storybook](https://storybook.js.org)f
- - Build frontend components using Web Components, [Alpine.js](https://alpinejs.dev/), [Stimulus](https://stimulus.hotwired.dev/) and more. Mix technologies at will.
+ - Easily create reusable backend and frontend components
+ - Build frontend components using Web Components, [Alpine.js](https://alpinejs.dev/), [React](https://react.dev) and more. Mix technologies at will.
  - Component library based on [daisyUI](https://daisyui.com/) with icons from [Bootstrap Icons](https://icons.getbootstrap.com/)
- - Seamless reactivity between frontend and backend
  - Authentication and user management with social logins and MFA
  - Static content collections to easily create blogs and manage static content
  - File management with built-in image manipulation and S3 integration
  - Template based emails with [mjml](https://mjml.io) support
- - Background tasks using [dramatiq](https://dramatiq.io/)
+ - Background tasks using [dramatiq](https://dramatiq.io/) with sqlite as the default broker
  - Push support for realtime pages using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events)
  - I18n using [gettext](https://www.gnu.org/software/gettext/)
- - Easily create REST APIs and automatically generate documentation
  - Static, hybrid or dynamic modes for content serving
- - Observable with [OpenTelemetry](https://opentelemetry.io/)
 
 [Hyperflask-Start](https://github.com/hyperflask/hyperflask-start) should be used to create new projects:
 
  - Dev environment based on [Development Containers](https://containers.dev/)
  - Optimized for VScode with breakpoint debugging for frontend and backend
  - [Mailpit](https://github.com/axllent/mailpit) for email testing
- - Deployments using [Hyperflask-Deploy](https://github.com/hyperflask/hyperflask-deploy)
+ - Deployments using [docker-web-deploy](https://github.com/hyperflask/docker-web-deploy)
 
 ## Project status
 
 **Hyperflask is being actively developed and is not yet ready to be used.**
 
-Checkout the list of all the projects developed as part of the Hyperflask Stack and their current development status on the [Hyperflask Github organization homepage](https://github.com/hyperflask).
+Checkout the list of all the projects developed as part of the Hyperflask stack and their current development status on the [Hyperflask Github organization homepage](https://github.com/hyperflask).
 
-Status overview:
-
-| Feature | Status |
-| --- | --- |
-| Core experience (start project, dev, deploy) | 🚧 |
-| File based routing with mix code page format | ✅ |
-| ORM | ✅ |
-| Assets pipeline | ✅ |
-| Component system + component library | 🚧 (component system almost done, need to create macros for daisyui) |
-| SSE push | ✅ |
-| Collections | 🚧 (finalizing) |
-| Upload files | 🚧 (missing S3 improvements) |
-| Emails | 🚧 |
-| User management and auth | 🚧 |
-| Static site generation | ❌ |
-| I18n | 🚧 (finalizing) |
-| PWA | ❌ |
-| Runner | ✅ |
+[Project status and roadmap](https://hyperflask.dev/roadmap)
 
 ## Flask extensions
 
@@ -123,7 +53,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 
 | Name | Description |
 | --- | --- |
-| [Flask-Apispec-Hyper](https://github.com/hyperflask/flask-apispec-hyper) | [Flask-Apispec](https://github.com/jmcarp/flask-apispec) fork with updates and fixes
 | [Flask-Assets-Pipeline](https://github.com/hyperflask/flask-assets-pipeline) | Modern asset pipeline using [esbuild](https://esbuild.github.io/)
 | [Flask-Babel-Hyper](https://github.com/hyperflask/flask-babel-hyper) | [Flask-Babel](https://github.com/python-babel/flask-babel) fork with additional utilities
 | [Flask-Collections](https://github.com/hyperflask/flask-collections) | Manage collections of static content
@@ -139,7 +68,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 | [Flask-Mailman](https://github.com/waynerv/flask-mailman) | Send emails |
 | [Flask-Mailman-Templates](https://github.com/hyperflask/flask-mailman-templates) | Email templates for [Flask-Mailman](https://github.com/waynerv/flask-mailman)
 | [Flask-Mercure-SSE](https://github.com/hyperflask/flask-mercure-sse) | Push events via server-sent events using the [Mercure](https://mercure.rocks) protocol
-| [Flask-Observability](https://github.com/hyperflask/flask-observability) | Observable Flask apps with [OpenTelemetry](https://opentelemetry.io/), logging and more
 | [Flask-SQLORM](https://github.com/hyperflask/flask-sqlorm) | Flask integration of [sqlorm](https://github.com/hyperflask/sqlorm)
 | [Flask-Super-Macros](https://github.com/hyperflask/flask-super-macros) | Better macro management for Jinja
 | [Flask-Talisman](https://github.com/wntrblm/flask-talisman) | HTTP security headers for Flask
@@ -153,4 +81,3 @@ A good part of these extensions is developed as part of the Hyperflask project.
 4. Create a pages directory: `mkdir pages`
 5. Create your index page: `echo "hello world" > pages/index.html`
 6. Start a development server using `hyperflask dev`
-

hyperflask-0.2.0/pyproject.toml

@@ -0,0 +1,60 @@
+[project]
+name = "hyperflask"
+version = "0.2.0"
+description = "Full stack web framework"
+authors = [
+    {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}
+]
+readme = "README.md"
+license = "MIT"
+requires-python = ">=3.10"
+dependencies = [
+    "flask>=3.0.0,<4.0.0",
+    "flask-assets-pipeline ~=0.6",
+    "flask-babel-hyper ~=5.1",
+    "flask-collections ~=0.2",
+    "flask-configurator ~=0.1",
+    "flask-debugtoolbar ~=0.15",
+    "flask-dramatiq ~=0.6",
+    "flask-file-routes ~=0.2",
+    "flask-files ~=0.2",
+    "flask-geo ~=0.1",
+    "flask-mailman-templates ~=0.1",
+    "flask-mercure-sse ~=0.2",
+    #"flask-observability ~=0.1"
+    "flask-sqlorm ~=0.2",
+    "flask-super-macros ~=0.1",
+    "flask-talisman ~=1.1",
+    "flask-wtf ~=1.2",
+    "frozen-flask ~=1.0",
+    #"dramatiq-sqlite ~=0.1"
+    "gunicorn ~=22.0",
+    "honcho ~=1.1",
+    "html-sanitizer ~=2.4",
+    "htmx-flask ~=0.1",
+    "jinja2-fragments ~=1.3",
+    "jinja-layout ~=0.4",
+    "jinja-wtforms ~=0.2",
+    "periodiq ~=0.12",
+    "python-slugify ~=8.0.4"
+]
+
+[project.urls]
+Repository = "https://github.com/hyperflask/hyperflask"
+
+[project.scripts]
+hyperflask = "hyperflask.cli:main"
+
+[dependency-groups]
+dev = [
+    "pytest>=8.4.1",
+    "pytest-cov>=6.2.1",
+    "ruff>=0.12.4",
+]
+
+[tool.ruff]
+line-length = 100
+
+[build-system]
+requires = ["uv_build>=0.8.11,<0.9.0"]
+build-backend = "uv_build"

{hyperflask-0.1.5 → hyperflask-0.2.0/src}/hyperflask/__init__.py

@@ -1,15 +1,16 @@
 from flask import *
-from .app import Hyperflask, db
+from .app import Hyperflask
 from .utils.htmx import htmx_redirect, htmx_oob
 
 # useful exports from hyperflask managed extensions
-from flask_babel import _, _p, _n, _np, lazy_gettext
+from flask_babel import gettext, _, pgettext, _p, ngettext, _n, npgettext, _np, lazy_gettext, _lazy
 from flask_file_routes import page
 from flask_files import save_file, validate_file
 from flask_mailman_templates import send_mail
+from flask_mercure_sse import publish_signal
 
 # useful exports from 3rd party libs
 from htmx_flask import request, make_response
 from jinja2_fragments.flask import render_block
-from flask_apispec import use_args, use_kwargs, marshal_with
 from slugify import slugify
+from blinker import signal

{hyperflask-0.1.5 → hyperflask-0.2.0/src}/hyperflask/app.py

@@ -29,7 +29,11 @@ from flask_debugtoolbar import DebugToolbarExtension
 from .forms import Form
 from .utils.page_actions import page_action_url
 from .utils.htmx import htmx_oob
-from .components import register_components
+from .utils.markdown import jinja_markdown, MarkdownExtension
+from .utils.html import sanitize_html, nl2br
+from .utils.models import File as SQLFileType
+from .components import discover_components, register_components
+from .components.jsx import ReactAdapter
 from . import page_helpers
 # others
 from jinja_super_macros.registry import FileLoader
@@ -39,14 +43,11 @@ from periodiq import PeriodiqMiddleware
 import os
 
 
-db = FlaskSQLORM()
-
-
-map_jinja_call_node_to_func(_)
-map_jinja_call_node_to_func(_p)
-map_jinja_call_node_to_func(_n)
-map_jinja_call_node_to_func(_np)
-map_jinja_call_node_to_func(lazy_gettext)
+map_jinja_call_node_to_func(_, "_")
+map_jinja_call_node_to_func(_p, "_p")
+map_jinja_call_node_to_func(_n, "_n")
+map_jinja_call_node_to_func(_np, "_np")
+map_jinja_call_node_to_func(lazy_gettext, "lazy_gettext")
 
 
 class Hyperflask(Flask):
@@ -54,10 +55,11 @@ class Hyperflask(Flask):
 
     def __init__(self, *args, static_mode="hybrid", instrument=False, layouts_folder="layouts", partials_folder="partials",
                  emails_folder="emails", forms_folder="forms", assets_folder="assets", pages_folder="pages", migrations_folder="migrations",
-                 config=None, config_filename="config.yml", **kwargs):
+                 config=None, config_filename="config.yml", database_uri="sqlite://:memory:", proxy_fix=True, **kwargs):
 
         super().__init__(*args, **kwargs)
-        self.wsgi_app = ProxyFix(self.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1)
+        if proxy_fix:
+            self.wsgi_app = ProxyFix(self.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1)
 
         self.config.update({
             "FREEZER_DESTINATION": os.path.join(self.root_path, "_site"),
@@ -66,12 +68,14 @@ class Hyperflask(Flask):
             "OTEL_INSTRUMENT": instrument,
             "DRAMATIQ_BROKER": "dramatiq.brokers.redis:RedisBroker",
             "DEBUG_TB_INTERCEPT_REDIRECTS": False,
-            "PAGES_MARKDOWN_OPTIONS": {"extensions": ["fenced_code", "nl2br", "attr_list", "admonition", "codehilite"]},
             # Hyperflask specific
-            "LAYOUT": "layout.html",
+            "LAYOUT": "layouts/default.html",
             "STATIC_MODE": static_mode,
             "ASSETS_INCLUDE_HTMX": True,
-            "HTMX_BOOST_SITE": False
+            "HTMX_EXT": ["hf-modal"],
+            "HTMX_BOOST_SITE": False,
+            "MARKDOWN_OPTIONS": {"extensions": ["fenced_code", "nl2br", "attr_list", "admonition", "codehilite"]},
+            "MARKDOWN_SANITIZER_CONFIG": {}
         })
         if config:
             self.config.update(config)
@@ -80,10 +84,16 @@ class Hyperflask(Flask):
         if self.debug:
             self.config.setdefault("MAIL_BACKEND", "console")
 
+        self.config["PAGES_MARKDOWN_OPTIONS"] = self.config["MARKDOWN_OPTIONS"]
+        self.config["COLLECTIONS_MARKDOWN_OPTIONS"] = self.config["MARKDOWN_OPTIONS"]
+        self.config["MAIL_TEMPLATES_MARKDOWN_OPTIONS"] = self.config["MARKDOWN_OPTIONS"]
+
         #self.otel = Observability(self)
 
         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.form_base_cls = Form
         self.jinja_env.default_layout = self.config["LAYOUT"]
         self.forms = self.jinja_env.forms
@@ -91,11 +101,10 @@ class Hyperflask(Flask):
         self.jinja_env.loader = ChoiceLoader([self.jinja_env.loader])
         if layouts_folder and os.path.exists(os.path.join(self.root_path, layouts_folder)):
             layout_loader = FileSystemLoader(os.path.join(self.root_path, layouts_folder))
-            self.jinja_env.loader.loaders.append(layout_loader)
             self.jinja_env.loader.loaders.append(PrefixLoader({os.path.basename(layouts_folder): layout_loader}))
         self.jinja_env.loader.loaders.extend([
-            FileLoader(os.path.join(os.path.dirname(__file__), "layouts/web.html"), "layout.html"),
-            FileLoader(os.path.join(os.path.dirname(__file__), "layouts/web.html"), "hyperflask_layout.html"),
+            FileLoader(os.path.join(os.path.dirname(__file__), "layouts/web.html"), "layouts/default.html"),
+            FileLoader(os.path.join(os.path.dirname(__file__), "layouts/web.html"), "layouts/base.html"),
             PrefixLoader({"ui": FileSystemLoader(os.path.join(os.path.dirname(__file__), "ui"))})
         ])
 
@@ -110,16 +119,19 @@ class Hyperflask(Flask):
         self.actor = self.dramatiq.actor
 
         SuperMacros(self)
-        Babel(self)
+        self.components = self.macros # alias
+        Babel(self, extract_locale_from_request="locale")
         Geolocation(self)
         Files(self)
         MailTemplates(self, template_folder=emails_folder)
         file_routes = FileRoutes(self, pages_folder=pages_folder, partials_folder=partials_folder)
         self.page_helper = file_routes.page_helper
         self.collections = Collections(self)
-        MercureSSE(self)
+        self.sse = MercureSSE(self)
 
-        self.assets = AssetsPipeline(self, assets_folder=assets_folder, inline=True, include_inline_on_demand=False)
+        self.assets = AssetsPipeline(self, assets_folder=assets_folder, inline=True, include_inline_on_demand=False,
+                                     inline_template_exts=[".html", ".jpy"], tailwind_expand_env_vars=True,
+                                     tailwind_sources=[os.path.join(os.path.dirname(__file__), "ui")])
         self.assets.state.watch_template_folders.extend([
             os.path.join(self.root_path, "pages"),
             os.path.join(self.root_path, "macros"),
@@ -130,24 +142,15 @@ class Hyperflask(Flask):
             "assets": self.assets.state.assets_folder,
             "@hyperflask": os.path.abspath(os.path.join(os.path.dirname(__file__), "static"))
         })
-        self.assets.state.tailwind_suggested_content.extend(filter(bool, [
-            os.path.join(os.path.dirname(__file__), "ui") + "/**/*.html",
-            os.path.join(self.root_path, pages_folder) + "/**/*.html" if pages_folder else None,
-            os.path.join(self.root_path, pages_folder) + "/**/*.jpy" if pages_folder else None,
-            os.path.join(self.root_path, partials_folder) + "/**/*.html" if partials_folder else None,
-            os.path.join(self.root_path, partials_folder) + "/**/*.jpy" if partials_folder else None,
-            os.path.join(self.root_path, layouts_folder) + "/**/*.html" if layouts_folder else None,
-            os.path.join(self.root_path, "components") + "/**/*.html",
-            os.path.join(self.root_path, "components") + "/**/*.jpy",
-        ]))
         self.assets.state.copy_files_from_node_modules.update({
             "bootstrap-icons/font": "bootstrap-icons"
         })
         self.assets.bundle(
-            {"@hyperflask": ["app.js", "app.css"],
+            {"@hyperflask": ["app.js"],
              "@hyperflask/reactive": ["reactive.js"],
              "@hyperflask/alpine": ["alpine.js"]},
-            assets_folder=os.path.join(os.path.dirname(__file__), "static")
+            from_package="hyperflask",
+            assets_folder="static"
         )
         self.assets.include("@hyperflask", 0)
 
@@ -155,14 +158,17 @@ class Hyperflask(Flask):
         self.extensions['mail_templates'].jinja_env.default_layout = "layout.mjml"
         self.extensions['mail_templates'].loaders.extend([
             FileLoader(os.path.join(os.path.dirname(__file__), 'layouts/email.mjml'), 'layout.mjml'),
-            FileLoader(os.path.join(os.path.dirname(__file__), 'layouts/email.mjml'), 'hyperflask_layout.mjml')
+            FileLoader(os.path.join(os.path.dirname(__file__), 'layouts/email.mjml'), 'base_layout.mjml')
         ])
 
         self.macros.register_from_directory(os.path.join(os.path.dirname(__file__), "ui"))
         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")
-        register_components(self)
+
+        self.components_loader, _ = register_components(self)
+        if self.components_loader:
+            self.forms.register_from_loader(self.components_loader)
 
         if forms_folder and os.path.isdir(os.path.join(self.root_path, forms_folder)):
             for macro in self.macros.create_from_directory(os.path.join(self.root_path, forms_folder)):
@@ -173,7 +179,11 @@ class Hyperflask(Flask):
         self.collections.register_freezer_generator(self.freezer)
 
         SQLTemplate.eval_globals.update(app=self)
-        db.init_app(self, migrations_folder=migrations_folder)
+        self.db = FlaskSQLORM(self, database_uri=database_uri, migrations_folder=migrations_folder)
+        self.db.File = SQLFileType
+
+    def relative_import_name(self, name):
+        return f"{self.import_name}.{name}" if self.import_name != "__main__" else name
 
 
 def static(func):

{hyperflask-0.1.5 → hyperflask-0.2.0/src}/hyperflask/cli.py

@@ -14,7 +14,6 @@ def _create_app():
     try:
         return info.load_app()
     except NoAppException:
-        raise
         return create_app()
 
 

{hyperflask-0.1.5 → hyperflask-0.2.0/src}/hyperflask/components/__init__.py

@@ -7,21 +7,21 @@ from importlib.metadata import entry_points
 from .core import ComponentAdapter
 from .alpine import AlpineAdapter
 from .webcomponent import WebComponentAdapter
+from .jsx import ReactAdapter
 
 
-def register_components(app, path=None, package_name=None):
+def discover_components(app, path=None, package_name=None):
     if not path:
         path = os.path.join(app.root_path, "components")
         if not os.path.exists(path):
-            return
+            return None, []
     if not package_name:
-        package_name = "components"
-        if app.import_name != "__main__":
-            package_name = f"{app.import_name}.{package_name}"
+        package_name = app.relative_import_name("components")
+
 
-    url_prefix = "/__components/"
     adapters = list(list_available_adapters())
     force_adapters = app.config.get("COMPONENT_ADAPTERS", {})
+    components = []
 
     loader = jinjapy.register_package(package_name, path, env=app.jinja_env)
     for module_name, template in loader.list_files(module_with_package=False):
@@ -42,13 +42,22 @@ def register_components(app, path=None, package_name=None):
         if adapter_class:
             name = os.path.basename(template).split(".")[0].replace("-", "_")
             adapter = adapter_class(name, f"{package_name}.{module_name}" if module_name else None, template)
-            adapter.register(app, url_prefix)
-            app.macros.create_from_func(adapter.render, name, receive_caller=True)
+            components.append(adapter)
+
+    return loader, components
+
+
+def register_components(app, path=None, package_name=None, url_prefix="/__components/"):
+    loader, adapters = discover_components(app, path, package_name)
+    for adapter in adapters:
+        adapter.register(app, url_prefix)
+    return loader, adapters
 
 
 def list_available_adapters():
     yield AlpineAdapter
     yield WebComponentAdapter
+    yield ReactAdapter
     for entry in entry_points(group="hyperflask.component_adapters"):
         yield entry.load()
     yield ComponentAdapter

hyperflask-0.2.0/src/hyperflask/components/alpine.py

@@ -0,0 +1,14 @@
+from .core import ComponentAdapter
+
+
+class AlpineAdapter(ComponentAdapter):
+    @classmethod
+    def matches(cls, app, module_name, template):
+        if not ComponentAdapter.matches(app, module_name, template):
+            return False
+        tpl = app.jinja_env.loader.get_source(app.jinja_env, template)[0]
+        return any(tag in tpl for tag in ["x-data", "x-init"])
+
+    def register(self, app, url_prefix):
+        app.assets.include("@hyperflask/alpine")
+        return super().register(app, url_prefix)