hyperflask 0.3.0__tar.gz → 0.3.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperflask
-Version: 0.3.0
+Version: 0.3.1
 Summary: Full stack web framework
 Author: Maxime Bouroumeau-Fuseau
 Author-email: Maxime Bouroumeau-Fuseau <maxime.bouroumeau@gmail.com>
@@ -26,7 +26,7 @@ Requires-Dist: gunicorn~=23.0
 Requires-Dist: honcho~=2.0
 Requires-Dist: html-sanitizer~=2.6
 Requires-Dist: htmx-flask~=0.1
-Requires-Dist: jinja-layout~=0.4
+Requires-Dist: jinja-layout~=0.5
 Requires-Dist: jinja-wtforms~=0.2
 Requires-Dist: periodiq~=0.13
 Requires-Dist: python-slugify~=8.0.4

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

@@ -1,6 +1,6 @@
 [project]
 name = "hyperflask"
-version = "0.3.0"
+version = "0.3.1"
 description = "Full stack web framework"
 authors = [
     {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}
@@ -32,7 +32,7 @@ dependencies = [
     "honcho ~=2.0",
     "html-sanitizer ~=2.6",
     "htmx-flask ~=0.1",
-    "jinja-layout ~=0.4",
+    "jinja-layout ~=0.5",
     "jinja-wtforms ~=0.2",
     "periodiq ~=0.13",
     "python-slugify ~=8.0.4",

{hyperflask-0.3.0 → hyperflask-0.3.1}/src/hyperflask/cli.py

@@ -7,6 +7,7 @@ import sys
 import multiprocessing
 import gunicorn.app.base
 from .factory import load_config, create_app
+from .security import generate_csp_policy
 
 
 def _create_app():
@@ -22,20 +23,26 @@ cli.add_command(shell_command)
 cli.add_command(routes_command)
 
 
-@click.command("freeze")
+@cli.command("init")
+def init_command():
+    pass
+
+
+@cli.command("freeze")
 def freeze_command():
     current_app.freezer.freeze()
 
-cli.add_command(freeze_command)
-
 
-@click.command("build")
+@cli.command("build")
 @click.pass_context
 def build_command(ctx):
     ctx.invoke(assets_cli.build)
     ctx.invoke(freeze_command)
 
-cli.add_command(build_command)
+
+@cli.command("csp-header")
+def csp_header_command():
+    click.echo(generate_csp_policy())
 
 
 @click.command("serve")
@@ -130,13 +137,6 @@ dev_command.params = list(run_command.params)
 cli.add_command(dev_command)
 
 
-@click.command("init")
-def init_command():
-    pass
-
-cli.add_command(init_command)
-
-
 def main():
     cli.main()
 

{hyperflask-0.3.0 → hyperflask-0.3.1}/src/hyperflask/factory.py

@@ -1,10 +1,10 @@
-from .app import Hyperflask
 from flask_configurator import Config
 import importlib
 from importlib.metadata import entry_points
 import logging
 import os
-
+from .app import Hyperflask
+from .model import init_db_locked
 
 app = None
 db = None
@@ -69,7 +69,7 @@ def create_app(root_path=None):
     try_import(app, "app")
 
     if models and app.config.get("INIT_DATABASE", True):
-        db.init_db()
+        init_db_locked(app)
 
     return app
 

{hyperflask-0.3.0 → hyperflask-0.3.1}/src/hyperflask/model.py

@@ -5,6 +5,8 @@ from sqlorm.resultset import CompositeResultSet
 from sqlorm import SQLType
 from markupsafe import Markup
 import abc
+import os
+import fcntl
 
 
 File = SQLType("text", save_file, File.from_uri)
@@ -49,3 +51,19 @@ class Model(BaseModel, abc.ABC):
 
         props = {prop: self} if prop else {}
         return Markup(current_app.macros[macro](**props))
+
+
+def init_db_locked(app):
+    # this is required because multiple app process will start at the same time using the runner
+    lockfile = os.path.join(app.root_path, ".initdblock")
+    if os.path.exists(lockfile):
+        return False
+    with open(lockfile, "w") as f:
+        fcntl.flock(f.fileno(), fcntl.LOCK_EX)
+        f.write("lock\n")
+        fcntl.flock(f.fileno(), fcntl.LOCK_UN)
+    try:
+        app.db.init_db()
+    finally:
+        os.remove(lockfile)
+    return True