hyperflask 0.4.0__tar.gz → 0.4.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperflask
-Version: 0.4.0
+Version: 0.4.1
 Summary: Full stack web framework
 Author: Maxime Bouroumeau-Fuseau
 Author-email: Maxime Bouroumeau-Fuseau <maxime.bouroumeau@gmail.com>
@@ -15,7 +15,7 @@ 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-mercure-sse~=0.4
 Requires-Dist: flask-sqlorm~=0.3
 Requires-Dist: flask-super-macros~=0.2
 Requires-Dist: flask-suspense~=0.3
@@ -96,7 +96,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 | [Flask-Collections](https://github.com/hyperflask/flask-collections) | Manage collections of static content
 | [Flask-Configurator](https://github.com/hyperflask/flask-configurator) | File based configuration
 | [Flask-DebugToolbar](https://github.com/pallets-eco/flask-debugtoolbar) | Debug Toolbar
-| [Flask-Dramatiq](https://flask-dramatiq.readthedocs.io) | Background tasks powered by [Dramatiq](https://dramatiq.io/) |
 | [Flask-File-Routes](https://github.com/hyperflask/flask-file-routes) | File-based routing with a new file format combining python and jinja template in a single file
 | [Flask-Files](https://github.com/hyperflask/flask-files) | [Fsspec](https://filesystem-spec.readthedocs.io/en/latest/) based files management (upload, storage and image manipulation)
 | [Frozen-Flask](https://github.com/Frozen-Flask/Frozen) | Generate a static website from your Flask app |

{hyperflask-0.4.0 → hyperflask-0.4.1}/README.md

@@ -58,7 +58,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 | [Flask-Collections](https://github.com/hyperflask/flask-collections) | Manage collections of static content
 | [Flask-Configurator](https://github.com/hyperflask/flask-configurator) | File based configuration
 | [Flask-DebugToolbar](https://github.com/pallets-eco/flask-debugtoolbar) | Debug Toolbar
-| [Flask-Dramatiq](https://flask-dramatiq.readthedocs.io) | Background tasks powered by [Dramatiq](https://dramatiq.io/) |
 | [Flask-File-Routes](https://github.com/hyperflask/flask-file-routes) | File-based routing with a new file format combining python and jinja template in a single file
 | [Flask-Files](https://github.com/hyperflask/flask-files) | [Fsspec](https://filesystem-spec.readthedocs.io/en/latest/) based files management (upload, storage and image manipulation)
 | [Frozen-Flask](https://github.com/Frozen-Flask/Frozen) | Generate a static website from your Flask app |

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

@@ -1,6 +1,6 @@
 [project]
 name = "hyperflask"
-version = "0.4.0"
+version = "0.4.1"
 description = "Full stack web framework"
 authors = [
     {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}
@@ -19,7 +19,7 @@ dependencies = [
     "flask-files ~=0.2",
     "flask-geo ~=0.1",
     "flask-mailman-templates ~=0.1",
-    "flask-mercure-sse ~=0.3",
+    "flask-mercure-sse ~=0.4",
     #"flask-observability ~=0.1"
     "flask-sqlorm ~=0.3",
     "flask-super-macros ~=0.2",

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

@@ -1,5 +1,5 @@
 # flask
-from flask import Flask
+from flask import Flask, has_request_context, request
 from jinja2 import ChoiceLoader, FileSystemLoader, PrefixLoader, TemplateNotFound
 from werkzeug.middleware.proxy_fix import ProxyFix
 # hyperflask extensions
@@ -73,6 +73,7 @@ class Hyperflask(Flask):
             "SESSION_COOKIE_SAMESITE": "Lax",
             "SQLORM_URI": database_uri,
             # Hyperflask specific
+            "URL_FOR_SERVER_NAME": None,
             "LAYOUT": "layouts/default.html",
             "ALPINE": False,
             "STATIC_MODE": static_mode,
@@ -113,6 +114,9 @@ class Hyperflask(Flask):
             })
             self.config.setdefault("HSTS_HEADER", "max-age=31556926; includeSubDomains") # 1 year
 
+        if (self.config['URL_FOR_SERVER_NAME'] or self.config.get('SERVER_NAME')) and not self.config.get('MERCURE_HUB_URL') and not self.config.get('MERCURE_PUBLIC_HUB_URL'):
+            self.config['MERCURE_PUBLIC_HUB_URL'] = True
+
         #self.otel = Observability(self)
 
         self.jinja_env.add_extension(LayoutExtension)
@@ -247,6 +251,34 @@ class Hyperflask(Flask):
     def relative_import_name(self, name):
         return f"{self.import_name}.{name}" if self.import_name != "__main__" else name
 
+    @property
+    def base_url(self):
+        scheme = self.config.get('PREFERRED_URL_SCHEME', 'http')
+        if self.config.get('SERVER_NAME'):
+            return f"{scheme}://{self.config['SERVER_NAME']}"
+        if self.config['URL_FOR_SERVER_NAME']:
+            return f"{scheme}://{self.config['URL_FOR_SERVER_NAME']}"
+        if has_request_context():
+            return request.host_url
+        raise RuntimeError("No request context and no SERVER_NAME or URL_FOR_SERVER_NAME configured, cannot determine base_url")
+
+    def url_for(self, *args, **kwargs):
+        _external = kwargs.get("_external", False)
+        _scheme = kwargs.get("_scheme", None)
+        if _external and self.config['URL_FOR_SERVER_NAME']:
+            # we handle the host and scheme ourselves
+            kwargs['_external'] = False
+            kwargs.pop('_scheme', None)
+        else:
+            _external = False
+        url = super().url_for(*args, **kwargs)
+        if not _external:
+            return url
+        if not _scheme:
+            _scheme = self.config.get('PREFERRED_URL_SCHEME', 'http')
+        url = f"{_scheme}://{self.config['URL_FOR_SERVER_NAME']}{url}"
+        return url
+
 
 class HyperModuleView(ModuleView):
     module_globals = dict(ModuleView.module_globals, asset_url=asset_url, static_url=static_url)

{hyperflask-0.4.0 → hyperflask-0.4.1}/src/hyperflask/cli/runner.py

@@ -4,6 +4,7 @@ import os
 import sys
 import multiprocessing
 import gunicorn.app.base
+from subprocess import Popen
 from honcho.manager import Manager as BaseProcessManager
 from ..factory import load_config
 from . import reloader # import hacky patch of werkzeug reloader
@@ -21,8 +22,6 @@ def serve_command(ctx, info, host, port, gunicorn_opt, **run_kwargs):
             'proc_name': 'hyperflask',
             'bind': f'{host}:{port}',
             'workers': 1 + multiprocessing.cpu_count() * 2,
-            'accesslog': '-',
-            'errorlog': '-',
             'max_requests': 1000,
             'max_requests_jitter': 100
         }
@@ -41,8 +40,9 @@ serve_command.params = flask_run_command.params + serve_command.params
 @click.option("--port", "-p", default=5000, help="The port to bind to.")
 @click.option('--concurrency')
 @click.option("--extend-procfile")
+@click.option("--init-db/--no-init-db", is_flag=True, default=None)
 @click.option("--dev", is_flag=True)
-def run_command(processes, host, port, concurrency, extend_procfile, dev):
+def run_command(processes, host, port, concurrency, extend_procfile, init_db, dev):
     from honcho.command import _procfile, _parse_concurrency
     from honcho.printer import Printer
     from honcho import environ
@@ -50,6 +50,10 @@ def run_command(processes, host, port, concurrency, extend_procfile, dev):
     if dev:
         os.environ["FLASK_DEBUG"] = "1"
 
+    if init_db is None and dev or init_db:
+        print("Initializing database...")
+        Popen([sys.argv[0], "db", "init"]).wait()
+
     _processes = None
     config = load_config()
     for filename in [f"Procfile.{config['ENV']}", "Procfile"]:
@@ -69,9 +73,19 @@ def run_command(processes, host, port, concurrency, extend_procfile, dev):
             _processes["worker"].extend(["-p", "1", "-t", "1"])
         else:
             _processes["mercurehub"] = [sys.executable, "-m", "flask_mercure_sse.server"]
+            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.")
 
     processes = {name: " ".join(_processes[name]) if isinstance(_processes[name], list) else _processes[name]
-                 for name in _processes if name in _processes}
+                 for name in _processes if not processes or name in processes}
 
     manager = ProcessManager(Printer(sys.stdout, colour=True))
 
@@ -80,10 +94,9 @@ def run_command(processes, host, port, concurrency, extend_procfile, dev):
                                       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)
 
+    print("Starting Hyperflask processes...")
     manager.loop()
     sys.exit(manager.returncode)
 

{hyperflask-0.4.0 → hyperflask-0.4.1}/src/hyperflask/factory.py

@@ -4,7 +4,7 @@ from importlib.metadata import entry_points
 import logging
 import os
 from .app import Hyperflask
-from .model import init_db_locked
+
 
 app = None
 db = None
@@ -13,9 +13,7 @@ db = None
 def load_config(root_path=None):
     debug = os.environ.get("FLASK_DEBUG") == "1"
     default_env = "development" if debug else "production"
-    config = Config(root_path, defaults={
-        "SQLORM_URI": "sqlite://app.db"
-    })
+    config = Config(root_path)
     config.load("config.yml", default_env)
     if config["ENV"] == "development" and not config.get("SECRET_KEY"):
         logging.getLogger().warn("Missing SECRET_KEY has been automatically set to 'changeme' while in development mode")
@@ -41,8 +39,8 @@ def create_app(root_path=None):
     else:
         import_name = "__main__"
 
-    app = Hyperflask(import_name, root_path=root_path, config=config, static_folder=static_folder,
-                     static_url_path=config.get("STATIC_URL_PATH", "/static"),
+    app = Hyperflask(import_name, root_path=root_path, config_filename=None, config=config,
+                     static_folder=static_folder, static_url_path=config.get("STATIC_URL_PATH", "/static"),
                      migrations_folder=migrations_folder)
 
     db = app.db
@@ -60,7 +58,7 @@ def create_app(root_path=None):
         m = importlib.import_module(module)
         getattr(m, class_name)(app, **config)
 
-    models = try_import(app, "models")
+    try_import(app, "models")
     try_import(app, "routes")
     try_import(app, "actors")
     try_import(app, "tasks")
@@ -69,9 +67,6 @@ def create_app(root_path=None):
     try_import(app, "signals")
     try_import(app, "app")
 
-    if models and app.config.get("INIT_DATABASE", True):
-        init_db_locked(app)
-
     return app