hyperflask 0.3.1__tar.gz → 0.4.0__tar.gz

{hyperflask-0.3.1 → hyperflask-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperflask
-Version: 0.3.1
+Version: 0.4.0
 Summary: Full stack web framework
 Author: Maxime Bouroumeau-Fuseau
 Author-email: Maxime Bouroumeau-Fuseau <maxime.bouroumeau@gmail.com>
@@ -11,17 +11,18 @@ Requires-Dist: flask-babel-hyper~=5.1
 Requires-Dist: flask-collections~=0.2
 Requires-Dist: flask-configurator~=0.1
 Requires-Dist: flask-debugtoolbar~=0.16
-Requires-Dist: flask-dramatiq~=0.6
 Requires-Dist: flask-file-routes~=0.3
 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.3
 Requires-Dist: flask-sqlorm~=0.3
-Requires-Dist: flask-super-macros~=0.1
-Requires-Dist: flask-suspense~=0.1
+Requires-Dist: flask-super-macros~=0.2
+Requires-Dist: flask-suspense~=0.3
 Requires-Dist: flask-wtf~=1.2
 Requires-Dist: frozen-flask~=1.0
+Requires-Dist: dramatiq>=1.18.0
+Requires-Dist: dramatiq-sqlite~=0.1
 Requires-Dist: gunicorn~=23.0
 Requires-Dist: honcho~=2.0
 Requires-Dist: html-sanitizer~=2.6
@@ -30,7 +31,7 @@ Requires-Dist: jinja-layout~=0.5
 Requires-Dist: jinja-wtforms~=0.2
 Requires-Dist: periodiq~=0.13
 Requires-Dist: python-slugify~=8.0.4
-Requires-Dist: redis~=6.4
+Requires-Dist: watchdog>=6.0.0
 Requires-Python: >=3.10
 Project-URL: Repository, https://github.com/hyperflask/hyperflask
 Description-Content-Type: text/markdown

{hyperflask-0.3.1 → hyperflask-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperflask"
-version = "0.3.1"
+version = "0.4.0"
 description = "Full stack web framework"
 authors = [
     {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}
@@ -15,7 +15,6 @@ dependencies = [
     "flask-collections ~=0.2",
     "flask-configurator ~=0.1",
     "flask-debugtoolbar ~=0.16",
-    "flask-dramatiq ~=0.6",
     "flask-file-routes ~=0.3",
     "flask-files ~=0.2",
     "flask-geo ~=0.1",
@@ -23,11 +22,12 @@ dependencies = [
     "flask-mercure-sse ~=0.3",
     #"flask-observability ~=0.1"
     "flask-sqlorm ~=0.3",
-    "flask-super-macros ~=0.1",
-    "flask-suspense ~=0.1",
+    "flask-super-macros ~=0.2",
+    "flask-suspense ~=0.3",
     "flask-wtf ~=1.2",
     "frozen-flask ~=1.0",
-    #"dramatiq-sqlite ~=0.1"
+    "dramatiq>=1.18.0",
+    "dramatiq-sqlite ~=0.1",
     "gunicorn ~=23.0",
     "honcho ~=2.0",
     "html-sanitizer ~=2.6",
@@ -36,11 +36,10 @@ dependencies = [
     "jinja-wtforms ~=0.2",
     "periodiq ~=0.13",
     "python-slugify ~=8.0.4",
-    "redis ~=6.4",
+    "watchdog>=6.0.0",
 ]
 
 [tool.uv.sources]
-flask-dramatiq = { git = "https://gitlab.com/bersace/flask-dramatiq" }
 periodiq = { git = "https://gitlab.com/bersace/periodiq" }
 
 [project.urls]

{hyperflask-0.3.1 → hyperflask-0.4.0}/src/hyperflask/__init__.py

@@ -10,8 +10,10 @@ from flask_files import save_file, validate_file
 from flask_mailman_templates import send_mail
 from flask_mercure_sse import publish_signal, mercure_publish
 from flask_suspense import render_template, stream_template, defer
+from flask_assets_pipeline import asset_url, static_url
 
 # useful exports from 3rd party libs
 from htmx_flask import request, make_response
 from slugify import slugify
 from blinker import signal
+from periodiq import cron

hyperflask-0.4.0/src/hyperflask/actors.py

@@ -0,0 +1,82 @@
+from threading import local
+from dramatiq import Middleware, actor
+import importlib
+
+
+DRAMATIQ_BROKERS = {
+    "amqp": "dramatiq.brokers.rabbitmq:RabbitmqBroker",
+    "redis": "dramatiq.brokers.redis:RedisBroker",
+    "sqlite": "dramatiq_sqlite:SQLiteBroker",
+}
+
+
+def discover_broker(broker_cls=None, broker_url=None):
+    if not broker_url and broker_cls and "://" in broker_cls:
+        broker_url = broker_cls
+        broker_cls = None
+    if not broker_cls and broker_url:
+        if "://" not in broker_url:
+            broker_name = "sqlite"
+        else:
+            broker_name, broker_url = broker_url.split("://", 1)
+        if broker_name not in DRAMATIQ_BROKERS:
+            raise ValueError(f"Unknown dramatiq broker '{broker_name}'")
+        broker_cls = DRAMATIQ_BROKERS[broker_name]
+    if isinstance(broker_cls, str):
+        module_name, cls_name = broker_cls.split(":")
+        module = importlib.import_module(module_name)
+        broker_cls = getattr(module, cls_name)
+    return broker_cls, broker_url
+
+
+def make_actor_decorator(app):
+    def actor_decorator(**kw):
+        def decorator(fn):
+            if getattr(app, 'dramatiq_broker', None):
+                kw['broker'] = app.dramatiq_broker
+                return actor(**kw)(fn)
+            return UndefinedBrokerActor(fn)
+        return decorator
+    return actor_decorator
+
+
+class AppContextMiddleware(Middleware):
+    # Setup Flask app for actor. Borrowed from
+    # https://github.com/Bogdanp/flask_dramatiq_example.
+
+    state = local()
+
+    def __init__(self, app):
+        self.app = app
+
+    def before_process_message(self, broker, message):
+        context = self.app.app_context()
+        context.push()
+
+        self.state.context = context
+
+    def after_process_message(
+            self, broker, message, *, result=None, exception=None):
+        try:
+            context = self.state.context
+            context.pop(exception)
+            del self.state.context
+        except AttributeError:
+            pass
+
+    after_skip_message = after_process_message
+
+
+class UndefinedBrokerActor:
+    def __init__(self, fn):
+        self.fn = fn
+        self.__name__ = fn.__name__
+
+    def __call__(self, *args, **kwargs):
+        return self.fn(*args, **kwargs)
+
+    def send(self, *args, **kwargs):
+        raise RuntimeError("No broker defined for Dramatiq actors.")
+
+    def send_with_options(self, *args, **kwargs):
+        raise RuntimeError("No broker defined for Dramatiq actors.")

{hyperflask-0.3.1 → hyperflask-0.4.0}/src/hyperflask/app.py

@@ -5,7 +5,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix
 # hyperflask extensions
 from jinja_layout import LayoutExtension
 from jinja_wtforms import WtformExtension
-from flask_assets_pipeline import AssetsPipeline
+from flask_assets_pipeline import AssetsPipeline, asset_url, static_url
 from flask_super_macros import SuperMacros
 from flask_collections import Collections
 from flask_file_routes import FileRoutes, ModuleView, page
@@ -16,14 +16,13 @@ from flask_files import Files
 from flask_sqlorm import FlaskSQLORM
 from flask_mercure_sse import MercureSSE
 from flask_mailman_templates import MailTemplates
-from flask_suspense import Suspense, render_template, suspense_before_render_template, suspense_before_render_blocks
+from flask_suspense import Suspense, render_template, suspense_before_render_template, suspense_before_render_macros
 #from flask_observability import Observability
 # 3rd party extensions
 from flask_wtf.csrf import CSRFProtect
 from flask_frozen import Freezer
 from htmx_flask import Htmx
 from flask_mailman import Mail
-from flask_dramatiq import Dramatiq
 from flask_debugtoolbar import DebugToolbarExtension
 # from hyperflask
 from .forms import Form
@@ -31,8 +30,10 @@ from .utils.page_actions import page_action_url
 from .utils.htmx import htmx_oob, respond_with_flash_messages
 from .utils.markdown import jinja_markdown, MarkdownExtension
 from .utils.html import sanitize_html, nl2br
+from .utils.metadata import metadata_tags
 from .components import register_components
-from .model import Model, File as SQLFileType
+from .model import Model, File as SQLFileType, UndefinedDatabase
+from .actors import AppContextMiddleware, discover_broker, make_actor_decorator
 from .security import respond_with_security_headers, csp_nonce
 from . import page_helpers
 # others
@@ -40,6 +41,7 @@ from jinja_super_macros.registry import FileLoader
 from jinja_wtforms.extractor import map_jinja_call_node_to_func
 from sqlorm.sql_template import SQLTemplate
 from periodiq import PeriodiqMiddleware
+import dramatiq
 import os
 
 
@@ -55,7 +57,7 @@ class Hyperflask(Flask):
 
     def __init__(self, *args, static_mode="hybrid", instrument=False, layouts_folder="layouts",
                  emails_folder="emails", forms_folder="forms", assets_folder="assets", pages_folder="pages", migrations_folder="migrations",
-                 config=None, config_filename="config.yml", database_uri="sqlite://:memory:", proxy_fix=True, **kwargs):
+                 config=None, config_filename="config.yml", database_uri=None, proxy_fix=True, **kwargs):
 
         super().__init__(*args, **kwargs)
         if proxy_fix:
@@ -66,10 +68,10 @@ class Hyperflask(Flask):
             "FREEZER_STATIC_IGNORE": [],
             "WTF_CSRF_CHECK_DEFAULT": False,
             "OTEL_INSTRUMENT": instrument,
-            "DRAMATIQ_BROKER": "dramatiq.brokers.redis:RedisBroker",
             "DEBUG_TB_INTERCEPT_REDIRECTS": False,
             "SESSION_COOKIE_HTTPONLY": True,
             "SESSION_COOKIE_SAMESITE": "Lax",
+            "SQLORM_URI": database_uri,
             # Hyperflask specific
             "LAYOUT": "layouts/default.html",
             "ALPINE": False,
@@ -117,7 +119,7 @@ class Hyperflask(Flask):
         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)
+        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
@@ -133,14 +135,11 @@ class Hyperflask(Flask):
         ])
 
         DebugToolbarExtension(self)
-        self.freezer = Freezer(self)
+        self.freezer = Freezer(self, with_no_argument_rules=False)
+        self.freezer.register_generator(lambda: freezer_url_generator(self))
         self.csrf = CSRFProtect(self)
-        #self.talisman = Talisman(self)
         Htmx(self)
         Mail(self)
-        self.dramatiq = Dramatiq(self)
-        self.dramatiq.broker.add_middleware(PeriodiqMiddleware())
-        self.actor = self.dramatiq.actor
 
         SuperMacros(self)
         self.components = self.macros # alias
@@ -205,10 +204,20 @@ class Hyperflask(Flask):
 
         self.collections.register_freezer_generator(self.freezer)
 
-        SQLTemplate.eval_globals.update(app=self)
-        self.db = FlaskSQLORM(self, database_uri=database_uri, migrations_folder=migrations_folder)
-        self.db.Model = Model
-        self.db.File = SQLFileType
+        if self.config.get('SQLORM_URI'):
+            SQLTemplate.eval_globals.update(app=self)
+            self.db = FlaskSQLORM(self, migrations_folder=migrations_folder)
+            self.db.Model = Model
+            self.db.File = SQLFileType
+        else:
+            self.db = UndefinedDatabase()
+
+        broker_cls, broker_url = discover_broker(self.config.get('DRAMATIQ_BROKER'), self.config.get('DRAMATIQ_BROKER_URL'))
+        if broker_cls:
+            self.dramatiq_broker = broker_cls(url=broker_url)
+            self.dramatiq_broker.add_middleware(AppContextMiddleware(self))
+            self.dramatiq_broker.add_middleware(PeriodiqMiddleware())
+        self.actor = make_actor_decorator(self)
 
         Suspense(self, nonce_getter="csp_nonce()")
 
@@ -216,9 +225,10 @@ class Hyperflask(Flask):
         def on_suspense_before_render_template(sender, **kwargs):
             csp_nonce() # we will need a nonce but the first call will be after the template started rendering
 
-        @suspense_before_render_blocks.connect_via(self, weak=False)
-        def on_suspense_before_render_blocks(sender, **kwargs):
-            return f'<script nonce="{csp_nonce()}">htmx.bootstrap()</script>'
+        @suspense_before_render_macros.connect_via(self, weak=False)
+        def on_suspense_before_render_macros(sender, **kwargs):
+            return ""
+            return f'<script nonce="{csp_nonce()}">htmx.bootstrap()</script>' # waiting on PR 3441
 
         @self.errorhandler(404)
         def not_found(error):
@@ -239,6 +249,8 @@ class Hyperflask(Flask):
 
 
 class HyperModuleView(ModuleView):
+    module_globals = dict(ModuleView.module_globals, asset_url=asset_url, static_url=static_url)
+
     def _render_template(self):
         return render_template(page.template)
 
@@ -251,3 +263,11 @@ def dynamic(func=None, static_template=None):
     def decorator(func):
         pass
     return decorator(func) if func else decorator
+
+
+def freezer_url_generator(app):
+    """URL generator for URL rules that take no arguments."""
+    for rule in app.url_map.iter_rules():
+        if not rule.arguments and 'GET' in rule.methods and not rule.endpoint.startswith('mercure'):
+            app.logger.info(rule.endpoint)
+            yield rule.endpoint, {}

hyperflask-0.4.0/src/hyperflask/cli/__init__.py

@@ -0,0 +1,53 @@
+from flask import current_app
+from flask.cli import FlaskGroup, shell_command, routes_command, ScriptInfo, NoAppException
+from flask_assets_pipeline import cli as assets_cli
+import click
+from ..factory import create_app
+from ..security import generate_csp_policy
+from .runner import serve_command, run_command, dev_command
+from .worker import worker_command, scheduler_command
+
+
+def _create_app():
+    info = ScriptInfo()
+    try:
+        return info.load_app()
+    except NoAppException:
+        return create_app()
+
+
+cli = FlaskGroup(name='kantree', help='Kantree', add_default_commands=False, create_app=_create_app)
+cli.add_command(shell_command)
+cli.add_command(routes_command)
+cli.add_command(serve_command)
+cli.add_command(run_command)
+cli.add_command(dev_command)
+cli.add_command(worker_command)
+cli.add_command(scheduler_command)
+
+
+@cli.command("init")
+def init_command():
+    pass
+
+
+@cli.command("freeze")
+def freeze_command():
+    current_app.freezer.freeze()
+
+
+@cli.command("build")
+@click.pass_context
+def build_command(ctx):
+    ctx.invoke(assets_cli.build)
+    ctx.invoke(freeze_command)
+
+
+@cli.command("csp-header")
+def csp_header_command():
+    click.echo(generate_csp_policy())
+
+
+
+def main():
+    cli.main()

hyperflask-0.4.0/src/hyperflask/cli/reloader.py

@@ -0,0 +1,24 @@
+from werkzeug._reloader import WatchdogReloaderLoop, reloader_loops
+import os.path
+
+
+# watchdog is a dependency of hyperflask so it would always be selected as the reloader
+class WatchdogWithExtraFilesPatternsReloaderLoop(WatchdogReloaderLoop):
+    def __init__(self, *args, extra_files=None, **kwargs):
+        # VERY HACKY SOLUTION !
+        # in werkzeug reloader, it is not possible to add patterns as extra_files
+        # to circumvent this and avoid copy/pasting big chunk of code, we patch os.path.abspath
+        # which is used to process the list of extra_files in the __init__
+        extra_files = list(extra_files) if extra_files else []
+        extra_files.append("*.jpy")
+        abspath = os.path.abspath
+        def patched_abspath(path):
+            if path.startswith("*."):
+                return path
+            return abspath(path)
+        os.path.abspath = patched_abspath
+        super().__init__(*args, extra_files=extra_files, **kwargs)
+        os.path.abspath = abspath
+
+
+reloader_loops["auto"] = WatchdogWithExtraFilesPatternsReloaderLoop

hyperflask-0.3.1/src/hyperflask/cli.py → hyperflask-0.4.0/src/hyperflask/cli/runner.py

@@ -1,48 +1,12 @@
-from flask import current_app
-from flask.cli import FlaskGroup, shell_command, routes_command, _debug_option, pass_script_info, run_command as flask_run_command, ScriptInfo, NoAppException
-from flask_assets_pipeline import cli as assets_cli
+from flask.cli import _debug_option, pass_script_info, run_command as flask_run_command
 import click
 import os
 import sys
 import multiprocessing
 import gunicorn.app.base
-from .factory import load_config, create_app
-from .security import generate_csp_policy
-
-
-def _create_app():
-    info = ScriptInfo()
-    try:
-        return info.load_app()
-    except NoAppException:
-        return create_app()
-
-
-cli = FlaskGroup(name='kantree', help='Kantree', add_default_commands=False, create_app=_create_app)
-cli.add_command(shell_command)
-cli.add_command(routes_command)
-
-
-@cli.command("init")
-def init_command():
-    pass
-
-
-@cli.command("freeze")
-def freeze_command():
-    current_app.freezer.freeze()
-
-
-@cli.command("build")
-@click.pass_context
-def build_command(ctx):
-    ctx.invoke(assets_cli.build)
-    ctx.invoke(freeze_command)
-
-
-@cli.command("csp-header")
-def csp_header_command():
-    click.echo(generate_csp_policy())
+from honcho.manager import Manager as BaseProcessManager
+from ..factory import load_config
+from . import reloader # import hacky patch of werkzeug reloader
 
 
 @click.command("serve")
@@ -69,7 +33,6 @@ def serve_command(ctx, info, host, port, gunicorn_opt, **run_kwargs):
 
 
 serve_command.params = flask_run_command.params + serve_command.params
-cli.add_command(serve_command)
 
 
 @click.command("run")
@@ -81,7 +44,6 @@ cli.add_command(serve_command)
 @click.option("--dev", is_flag=True)
 def run_command(processes, host, port, concurrency, extend_procfile, dev):
     from honcho.command import _procfile, _parse_concurrency
-    from honcho.manager import Manager
     from honcho.printer import Printer
     from honcho import environ
 
@@ -99,24 +61,27 @@ def run_command(processes, host, port, concurrency, extend_procfile, dev):
             _processes = {}
         _processes.update({
             "web": [sys.argv[0], "serve", "--host", host, "--port", "$PORT"],
-            # "worker": [sys.argv[0], "worker"],
-            # "scheduler": [sys.argv[0], "periodiq"]
+            "worker": [sys.argv[0], "worker"],
+            "scheduler": [sys.argv[0], "scheduler"]
         })
         if dev:
             _processes["assets"] = [sys.argv[0], "assets", "dev"]
+            _processes["worker"].extend(["-p", "1", "-t", "1"])
         else:
             _processes["mercurehub"] = [sys.executable, "-m", "flask_mercure_sse.server"]
 
     processes = {name: " ".join(_processes[name]) if isinstance(_processes[name], list) else _processes[name]
                  for name in _processes if name in _processes}
 
-    manager = Manager(Printer(sys.stdout, colour=True))
+    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(p.env)
+        if p.name != "scheduler":
+            e["FLASK_SKIP_DB_INIT"] = "0"
         manager.add_process(p.name, p.cmd, quiet=p.quiet, env=e)
 
     manager.loop()
@@ -124,7 +89,6 @@ def run_command(processes, host, port, concurrency, extend_procfile, dev):
 
 
 run_command.params.insert(0, _debug_option)
-cli.add_command(run_command)
 
 
 @click.command("dev")
@@ -134,11 +98,15 @@ def dev_command(ctx, **kwargs):
 
 
 dev_command.params = list(run_command.params)
-cli.add_command(dev_command)
 
 
-def main():
-    cli.main()
+class ProcessManager(BaseProcessManager):
+    # This override prevents the manager to stop if the worker and scheduler exit because dramatiq is unused
+    def _any_stopped(self):
+        def has_exited_because_dramatiq_unavailable(name, p):
+            return name.split('.')[0] in ('scheduler', 'worker') and p.get('returncode') == 10
+        return any(not has_exited_because_dramatiq_unavailable(name, p) and p.get('returncode') is not None
+                   for name, p in self._processes.items())
 
 
 class GunicornServer(gunicorn.app.base.BaseApplication):

hyperflask-0.4.0/src/hyperflask/cli/worker.py

@@ -0,0 +1,90 @@
+import click
+import sys
+from flask import current_app
+from flask.cli import with_appcontext
+import periodiq
+from dramatiq import set_broker
+from dramatiq.cli import (
+    CPUS,
+    main as dramatiq_worker,
+    make_argument_parser as dramatiq_argument_parser,
+)
+
+
+@click.command("worker")
+@click.option('-v', '--verbose', is_flag=True)
+@click.option('-p', '--processes', default=CPUS,
+              metavar='PROCESSES', show_default=True,
+              help="the number of worker processes to run")
+@click.option('-t', '--threads', default=8,
+              metavar='THREADS', show_default=True,
+              help="the number of worker threads per process")
+@click.option('-Q', '--queues', type=str, default=None,
+              metavar='QUEUES', show_default=True,
+              help="listen to a subset of queues, comma separated")
+@with_appcontext
+def worker_command(verbose, processes, threads, queues):
+    """Run dramatiq workers.
+    """
+    check_dramatiq_availability()
+
+    parser = dramatiq_argument_parser()
+
+    command = [
+        "--processes", str(processes),
+        "--threads", str(threads),
+        # This module does not have broker local. Thus dramatiq fallbacks to
+        # global broker.
+        __name__,
+    ]
+    if verbose:
+        command += ["-v"]
+    if current_app.config['DEBUG']:
+        command += ["--watch", current_app.root_path]
+
+    queues = queues.split(",") if queues else []
+    if queues:
+        command += ["--queues"] + queues
+
+    args = parser.parse_args(command)
+    dramatiq_worker(args)
+
+
+@click.command("scheduler")
+@click.option('-v', '--verbose', is_flag=True)
+@with_appcontext
+def scheduler_command(verbose):
+    """Run periodiq scheduler.
+    """
+    check_dramatiq_availability()
+
+    periodic_actors = [
+        a for a in current_app.dramatiq_broker.actors.values()
+        if 'periodic' in a.options
+    ]
+    if not periodic_actors:
+        click.echo("No scheduled Dramatiq actors found.")
+        sys.exit(10)
+
+    command = [
+        # This module does not have broker local. Thus dramatiq fallbacks to
+        # global broker.
+        __name__,
+    ]
+
+    if verbose:
+        command += ["-v"]
+
+    parser = periodiq.make_argument_parser()
+    args = parser.parse_args(command)
+    periodiq.main(args)
+
+
+def check_dramatiq_availability():
+    if not getattr(current_app, 'dramatiq_broker', None):
+        click.echo("Dramatiq broker is not configured.")
+        sys.exit(10)
+    if not current_app.dramatiq_broker.actors:
+        click.echo("No Dramatiq actors found.")
+        sys.exit(10)
+    set_broker(current_app.dramatiq_broker)

{hyperflask-0.3.1 → hyperflask-0.4.0}/src/hyperflask/components/__init__.py

@@ -25,9 +25,10 @@ def discover_components(app, path=None, package_name=None):
 
     loader = jinjapy.register_package(package_name, path, env=app.jinja_env)
     for module_name, template in loader.list_files(module_with_package=False):
+        filename = template or (loader.prefix + module_name.replace(".", os.sep) + ".py")
         adapter_class = None
         for pattern, adapter_import_path in force_adapters.items():
-            if re.match(pattern, template):
+            if re.match(pattern, filename):
                 adapter_module, adapter_classname = adapter_import_path.split(":")
                 adapter_class = getattr(importlib.import_module(adapter_module), adapter_classname)
                 break
@@ -40,8 +41,8 @@ def discover_components(app, path=None, package_name=None):
             if not matches:
                 continue
         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)
+            name = (os.path.basename(template).split(".")[0] if template else module_name.split('.')[-1]).replace("-", "_")
+            adapter = adapter_class(name, f"{package_name}.{module_name}" if module_name else None, template, filename)
             components.append(adapter)
 
     return loader, components

{hyperflask-0.3.1 → hyperflask-0.4.0}/src/hyperflask/components/alpine.py

@@ -4,7 +4,7 @@ from .core import ComponentAdapter
 class AlpineAdapter(ComponentAdapter):
     @classmethod
     def matches(cls, app, module_name, template):
-        if not ComponentAdapter.matches(app, module_name, template):
+        if not template or 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"])