hyperflask 0.2.0__tar.gz → 0.2.2__tar.gz

{hyperflask-0.2.0 → hyperflask-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperflask
-Version: 0.2.0
+Version: 0.2.2
 Summary: Full stack web framework
 Author: Maxime Bouroumeau-Fuseau
 Author-email: Maxime Bouroumeau-Fuseau <maxime.bouroumeau@gmail.com>
@@ -10,7 +10,7 @@ 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-debugtoolbar~=0.16
 Requires-Dist: flask-dramatiq~=0.6
 Requires-Dist: flask-file-routes~=0.2
 Requires-Dist: flask-files~=0.2
@@ -22,15 +22,16 @@ 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: gunicorn~=23.0
+Requires-Dist: honcho~=2.0
+Requires-Dist: html-sanitizer~=2.6
 Requires-Dist: htmx-flask~=0.1
-Requires-Dist: jinja2-fragments~=1.3
+Requires-Dist: jinja2-fragments~=1.9
 Requires-Dist: jinja-layout~=0.4
 Requires-Dist: jinja-wtforms~=0.2
-Requires-Dist: periodiq~=0.12
+Requires-Dist: periodiq~=0.13
 Requires-Dist: python-slugify~=8.0.4
+Requires-Dist: redis~=6.4
 Requires-Python: >=3.10
 Project-URL: Repository, https://github.com/hyperflask/hyperflask
 Description-Content-Type: text/markdown

{hyperflask-0.2.0 → hyperflask-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperflask"
-version = "0.2.0"
+version = "0.2.2"
 description = "Full stack web framework"
 authors = [
     {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}
@@ -14,7 +14,7 @@ dependencies = [
     "flask-babel-hyper ~=5.1",
     "flask-collections ~=0.2",
     "flask-configurator ~=0.1",
-    "flask-debugtoolbar ~=0.15",
+    "flask-debugtoolbar ~=0.16",
     "flask-dramatiq ~=0.6",
     "flask-file-routes ~=0.2",
     "flask-files ~=0.2",
@@ -28,17 +28,22 @@ dependencies = [
     "flask-wtf ~=1.2",
     "frozen-flask ~=1.0",
     #"dramatiq-sqlite ~=0.1"
-    "gunicorn ~=22.0",
-    "honcho ~=1.1",
-    "html-sanitizer ~=2.4",
+    "gunicorn ~=23.0",
+    "honcho ~=2.0",
+    "html-sanitizer ~=2.6",
     "htmx-flask ~=0.1",
-    "jinja2-fragments ~=1.3",
+    "jinja2-fragments ~=1.9",
     "jinja-layout ~=0.4",
     "jinja-wtforms ~=0.2",
-    "periodiq ~=0.12",
-    "python-slugify ~=8.0.4"
+    "periodiq ~=0.13",
+    "python-slugify ~=8.0.4",
+    "redis ~=6.4"
 ]
 
+[tool.uv.sources]
+flask-dramatiq = { git = "https://gitlab.com/bersace/flask-dramatiq" }
+periodiq = { git = "https://gitlab.com/bersace/periodiq" }
+
 [project.urls]
 Repository = "https://github.com/hyperflask/hyperflask"
 

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

@@ -7,7 +7,7 @@ from flask_babel import gettext, _, pgettext, _p, ngettext, _n, npgettext, _np,
 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
+from flask_mercure_sse import publish_signal, mercure_publish
 
 # useful exports from 3rd party libs
 from htmx_flask import request, make_response

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

@@ -34,6 +34,7 @@ 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 .model import Model
 from . import page_helpers
 # others
 from jinja_super_macros.registry import FileLoader
@@ -180,6 +181,7 @@ class Hyperflask(Flask):
 
         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
 
     def relative_import_name(self, name):

hyperflask-0.2.2/src/hyperflask/model.py

@@ -0,0 +1,46 @@
+from flask_sqlorm import Model as BaseModel
+from flask import current_app
+from sqlorm.resultset import CompositeResultSet
+from markupsafe import Markup
+import abc
+
+
+class ModelResultSet(CompositeResultSet):
+    def __str__(self):
+        return Markup("".join([str(item) for item in self]))
+
+
+class ModelMercureTopic:
+    def __init__(self, topic=None, topic_per_obj=True):
+        self.topic = topic
+        self.topic_per_obj = topic_per_obj
+
+    def __get__(self, instance, owner):
+        if instance and self.topic_per_obj:
+            if isinstance(self.topic_per_obj, str):
+                id = getattr(instance, self.topic_per_obj)
+            else:
+                id = owner.__mapper__.get_primary_key(instance)
+            return f"{self.topic or owner.__name__}/{id}"
+        return self.topic or owner.__name__
+
+
+class Model(BaseModel, abc.ABC):
+    __resultset_class__ = ModelResultSet
+    __macro__ = None
+    __mercure_sse_topic__ = ModelMercureTopic()
+
+    def __mercure_sse_data__(self):
+        return str(self)
+
+    def __str__(self):
+        if not self.__macro__:
+            return repr(self)
+
+        macro = self.__macro__
+        prop = "obj"
+        if "(" in macro:
+            macro, prop = macro.rstrip(")").rsplit("(")
+
+        props = {prop: self} if prop else {}
+        return Markup(current_app.macros[macro](**props))

{hyperflask-0.2.0 → hyperflask-0.2.2}/src/hyperflask/static/app.css

@@ -29,7 +29,13 @@
 .form-w-full {
   .input,
   .select,
-  .textarea {
+  .textarea,
+  .fieldset,
+  .join {
     width: 100%;
   }
 }
+
+#sidebar > div > .menu {
+  width: 100%;
+}

{hyperflask-0.2.0 → hyperflask-0.2.2}/src/hyperflask/static/app.js

@@ -1,4 +1,5 @@
 import htmx from "htmx.org";
+import 'htmx-ext-sse';
 import "./app.css";
 
 (function() {

{hyperflask-0.2.0 → hyperflask-0.2.2}/src/hyperflask/ui/daisyui/Avatar.html

@@ -1,16 +1,16 @@
-{% macro Avatar(src=None, placeholder=None, placeholder_text_size=None, alt=None, rounded=True, size=12, mask=None, presence=None, indicator=None, indicator_color=None, indicator_position_x=None, indicator_position_y=None) -%}
-    <div class="avatar {% if placeholder %} avatar-placeholder{% endif %} {% if presence == "online" %} avatar-online{% endif %} {% if presence == "offline" %} avatar-offline{% endif %} {% if indicator %} indicator{% endif %}  {{kwargs.pop('class', '')}}" {{ html_attrs(kwargs) }}>
-        
+{% macro Avatar(src=None, placeholder=None, placeholder_text_size="md", alt=None, rounded=True, size=12, mask=None, presence=None, indicator=None, indicator_color=None, indicator_position_x=None, indicator_position_y=None) -%}
+    <div class="avatar {% if placeholder %} avatar-placeholder{% endif %} {% if presence == "online" %} avatar-online{% endif %} {% if presence == "offline" %} avatar-offline{% endif %} {% if indicator %} indicator{% endif %}">
+
         {% if not indicator %}{% else %}<span class="indicator-item badge {% if indicator_color == "primary" %} badge-primary{% endif %} {% if indicator_color == "secondary" %} badge-secondary{% endif %} {% if indicator_color == "accent" %} badge-accent{% endif %} {% if indicator_color == "neutral" %} badge-neutral{% endif %} {% if indicator_color == "success" %} badge-success{% endif %} {% if indicator_color == "warning" %} badge-warning{% endif %} {% if indicator_color == "info" %} badge-info{% endif %} {% if indicator_color == "error" %} badge-error{% endif %} {% if indicator_position_x == "start" %} indicator-start{% endif %} {% if indicator_position_x == "center" %} indicator-center{% endif %} {% if indicator_position_x == "end" %} indicator-end{% endif %} {% if indicator_position_y == "top" %} indicator-top{% endif %} {% if indicator_position_y == "middle" %} indicator-middle{% endif %} {% if indicator_position_y == "bottom" %} indicator-bottom{% endif %}">
         {% if indicator %}{{indicator}}{% else %}
         {% endif %}</span>{% endif %}
-        
-        <div class="{% if placeholder %}bg-neutral text-neutral-content{% endif %} {% if rounded %} .rounded{% endif %} {% if size %} w-{{size}}{% endif %} {% if mask == "squircle" %} mask mask-squircle{% endif %} {% if mask == "heart" %} mask mask-heart{% endif %} {% if mask == "hexagon" %} mask mask-hexagon{% endif %} {% if mask == "hexagon-2" %} mask mask-hexagon-2{% endif %} {% if mask == "decagon" %} mask mask-decagon{% endif %} {% if mask == "pentagon" %} mask mask-pentagon{% endif %} {% if mask == "diamond" %} mask mask-diamond{% endif %} {% if mask == "square" %} mask mask-square{% endif %} {% if mask == "circle" %} mask mask-circle{% endif %} {% if mask == "star" %} mask mask-star{% endif %} {% if mask == "star-2" %} mask mask-star-2{% endif %} {% if mask == "triangle" %} mask mask-triangle{% endif %} {% if mask == "triangle-2" %} mask mask-triangle-2{% endif %} {% if mask == "triangle-3" %} mask mask-triangle-3{% endif %} {% if mask == "triangle-4" %} mask mask-triangle-4{% endif %} {% if mask == "half-1" %} mask mask-half-1{% endif %} {% if mask == "half-2" %} mask mask-half-2{% endif %}">
+
+        <div class="{% if placeholder %}bg-neutral text-neutral-content{% endif %} {% if rounded %} rounded-full{% endif %} {% if size %} w-{{size}}{% endif %} {% if mask == "squircle" %} mask mask-squircle{% endif %} {% if mask == "heart" %} mask mask-heart{% endif %} {% if mask == "hexagon" %} mask mask-hexagon{% endif %} {% if mask == "hexagon-2" %} mask mask-hexagon-2{% endif %} {% if mask == "decagon" %} mask mask-decagon{% endif %} {% if mask == "pentagon" %} mask mask-pentagon{% endif %} {% if mask == "diamond" %} mask mask-diamond{% endif %} {% if mask == "square" %} mask mask-square{% endif %} {% if mask == "circle" %} mask mask-circle{% endif %} {% if mask == "star" %} mask mask-star{% endif %} {% if mask == "star-2" %} mask mask-star-2{% endif %} {% if mask == "triangle" %} mask mask-triangle{% endif %} {% if mask == "triangle-2" %} mask mask-triangle-2{% endif %} {% if mask == "triangle-3" %} mask mask-triangle-3{% endif %} {% if mask == "triangle-4" %} mask mask-triangle-4{% endif %} {% if mask == "half-1" %} mask mask-half-1{% endif %} {% if mask == "half-2" %} mask mask-half-2{% endif %}  {{kwargs.pop('class', '')}}" {{ html_attrs(kwargs) }}>
         {% if placeholder %}<span class="text-{{placeholder_text_size}}">{{placeholder}}</span>{% else %}
-            
+
             <img {% if src %}src="{{src}}"{% endif %} {% if alt %}alt="{{alt}}"{% endif %}>
-            
+
         {% endif %}</div>
-        
+
     </div>
-{%- endmacro %}
+{%- endmacro %}

{hyperflask-0.2.0 → hyperflask-0.2.2}/src/hyperflask/ui/daisyui/Drawer.html

@@ -1,10 +1,10 @@
-{% macro Drawer(id="drawer1", open=False, responsive=None, end=False) -%}
+{% macro Drawer(drawer_id="drawer1", open=False, responsive=None, end=False) -%}
     <div class="drawer {% if open %} drawer-open{% endif %} {% if responsive == "xs" %} xs:drawer-open{% endif %} {% if responsive == "sm" %} sm:drawer-open{% endif %} {% if responsive == "md" %} md:drawer-open{% endif %} {% if responsive == "lg" %} lg:drawer-open{% endif %} {% if responsive == "xl" %} xl:drawer-open{% endif %} {% if end %} drawer-end{% endif %}  {{kwargs.pop('class', '')}}" {{ html_attrs(kwargs) }}>
-        
-        <input type="checkbox" class="drawer-toggle" {% if id %}id="{{id}}"{% endif %}>
-        
+
+        <input type="checkbox" class="drawer-toggle" {% if drawer_id %}id="{{drawer_id}}"{% endif %}>
+
         {{ caller() if caller else "" }}
-        
-        
+
+
     </div>
-{%- endmacro %}
+{%- endmacro %}

{hyperflask-0.2.0 → hyperflask-0.2.2}/src/hyperflask/ui/daisyui/DrawerSide.html

@@ -1,11 +1,11 @@
-{% macro DrawerSide(id="drawer1") -%}
+{% macro DrawerSide(drawer_id="drawer1") -%}
     <div class="drawer-side  {{kwargs.pop('class', '')}}" {{ html_attrs(kwargs) }}>
-        
-        <label aria-label="close sidebar" class="drawer-overlay" {% if id %}for="{{id}}"{% endif %}>
+
+        <label aria-label="close sidebar" class="drawer-overlay" {% if drawer_id %}for="{{drawer_id}}"{% endif %}>
         </label>
-        
+
         {{ caller() if caller else "" }}
-        
-        
+
+
     </div>
-{%- endmacro %}
+{%- endmacro %}

{hyperflask-0.2.0 → hyperflask-0.2.2}/src/hyperflask/ui/forms.html

@@ -25,7 +25,7 @@
 {%- endmacro %}
 
 {% macro FormField(field=None, label=None) -%}
-  <{Label}>{{label or field.label}}</{Label}>
+  {% if label or field.label %}<{Label}>{{label or field.label}}</{Label}>{% endif %}
   {{field if field else caller()}}
 {%- endmacro %}
 

hyperflask-0.2.2/src/hyperflask/ui/layout.html

@@ -0,0 +1,49 @@
+
+{% macro AppUI() -%}
+  {%- set inner = caller() -%}
+  {%- set responsive = kwargs.pop('responsive', 'md') -%}
+  <{Drawer id="app" drawer_id="app-drawer" responsive=responsive **kwargs }>
+    {{inner}}
+  </{}>
+{%- endmacro %}
+
+{% macro Viewport(overflow=True) -%}
+  {%- set inner = caller() -%}
+  <{DrawerContent id="viewport" class=html_class({"overflow-auto": overflow}, "flex flex-col max-h-screen", kwargs.pop('class', '')) **kwargs }>
+    {{inner}}
+  </{}>
+{%- endmacro %}
+
+{% macro Sidebar() -%}
+  {%- set inner = caller() -%}
+  <{DrawerSide id="sidebar" drawer_id="app-drawer" class=html_class("min-w-[250px] bg-base-200", kwargs.pop('class', None)) **kwargs }>
+    <div class="flex flex-col h-full w-full" id="sidebar-content">
+        {{inner}}
+    </div>
+  </{}>
+{%- endmacro %}
+
+{% macro HBox() -%}
+  {%- set inner = caller() -%}
+    <{div class=html_class("flex gap-4 items-start", kwargs.pop('class', None)) **kwargs }>
+      {{ inner }}
+    </{}>
+{%- endmacro %}
+
+{% macro VBox() -%}
+  {%- set inner = caller() -%}
+    <{div class=html_class("flex flex-col gap-4", kwargs.pop('class', None)) **kwargs }>
+      {{ inner }}
+    </{}>
+{%- endmacro %}
+
+{% macro CenterBox() -%}
+  {%- set inner = caller() -%}
+    <{div class=html_class("flex justify-center items-center h-full", kwargs.pop('class', None)) **kwargs }>
+      {{ inner }}
+    </{}>
+{%- endmacro %}
+
+{% macro Spacer() -%}
+    <{div class=html_class("grow", kwargs.pop('class', None)) **kwargs }></{}>
+{%- endmacro %}

hyperflask-0.2.2/src/hyperflask/ui/sse.html

@@ -0,0 +1,6 @@
+
+{% macro MercureStream(topic, private=True, hx_swap="beforeend", type="message") -%}
+<div hx-ext="sse" sse-connect="{{mercure_authentified_hub_url(topic) if private else mercure_hub_url(topic)}}" sse-swap="{{type}}" hx-swap="{{hx_swap}}" {{html_attrs(**kwargs)}}>
+    {{ caller() }}
+</div>
+{%- endmacro %}

hyperflask-0.2.0/src/hyperflask/ui/sse.html

@@ -1,6 +0,0 @@
-
-{% macro MercureStream(topic, private=True, hx_swap="beforeend") -%}
-<div hx-ext="sse" sse-connect="{{mercure_authentified_hub_url(topic) if private else mercure_hub_url(topic)}}" hx-swap="{{hx_swap}}" {{html_attrs(**kwargs)}}>
-    {{ caller() }}
-</div>
-{%- endmacro %}