WuttaWeb 0.26.0__tar.gz → 0.27.1__tar.gz

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/CHANGELOG.md

@@ -5,6 +5,40 @@ All notable changes to wuttaweb will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v0.27.1 (2026-01-03)
+
+### Fix
+
+- add separate def for middle buttons on App Info page
+- expose version history for site admin in default setup
+- only show execution panel if batch view supports it
+- remove the  Users field for create/edit Person
+- only show "create row" button if batch view supports it
+- show proper batch status text, from enum
+- use wutta hint from model, for master view title
+- accept dict instead of true enum, for `Grid.set_enum()`
+- improve FK handling in generated model class code
+- use custom UUID type when generating model class code for FK
+- fix spacing style when viewing object with row grid
+- grant access to alembic, tables, master view admin for new apps
+
+## v0.27.0 (2025-12-31)
+
+### Feat
+
+- add wizard for generating new master view code
+- add basic MasterView to show all registered master views
+- add MasterView registry/discovery mechanism
+
+### Fix
+
+- show db backend (dialect name) on App Info page
+- prevent whitespace wrap for tool panel header
+- render datetimes with tooltip showing time delta from now
+- fallback to default continuum plugin logic, when no request
+- flush session when creating new object via MasterView
+- fix page title for Alembic Dashboard
+
 ## v0.26.0 (2025-12-28)
 
 ### Feat

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WuttaWeb
-Version: 0.26.0
+Version: 0.27.1
 Summary: Web App for Wutta Framework
 Project-URL: Homepage, https://wuttaproject.org/
 Project-URL: Repository, https://forgejo.wuttaproject.org/wutta/wuttaweb
@@ -40,7 +40,7 @@ Requires-Dist: pyramid>=2
 Requires-Dist: sqlalchemy-utils
 Requires-Dist: waitress
 Requires-Dist: webhelpers2
-Requires-Dist: wuttjamaican[db]>=0.28.0
+Requires-Dist: wuttjamaican[db]>=0.28.1
 Requires-Dist: zope-sqlalchemy>=1.5
 Provides-Extra: continuum
 Requires-Dist: wutta-continuum>=0.3.0; extra == 'continuum'
@@ -53,6 +53,7 @@ Requires-Dist: pylint; extra == 'tests'
 Requires-Dist: pytest; extra == 'tests'
 Requires-Dist: pytest-cov; extra == 'tests'
 Requires-Dist: tox; extra == 'tests'
+Requires-Dist: webtest; extra == 'tests'
 Description-Content-Type: text/markdown
 
 

wuttaweb-0.27.1/docs/api/wuttaweb.views.views.rst

@@ -0,0 +1,6 @@
+
+``wuttaweb.views.views``
+========================
+
+.. automodule:: wuttaweb.views.views
+   :members:

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/docs/index.rst

@@ -74,6 +74,7 @@ the narrative docs are pretty scant.  That will eventually change.
    api/wuttaweb.views.tables
    api/wuttaweb.views.upgrades
    api/wuttaweb.views.users
+   api/wuttaweb.views.views
 
 
 Indices and tables

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "WuttaWeb"
-version = "0.26.0"
+version = "0.27.1"
 description = "Web App for Wutta Framework"
 readme = "README.md"
 authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}]
@@ -45,7 +45,7 @@ dependencies = [
         "SQLAlchemy-Utils",
         "waitress",
         "WebHelpers2",
-        "WuttJamaican[db]>=0.28.0",
+        "WuttJamaican[db]>=0.28.1",
         "zope.sqlalchemy>=1.5",
 ]
 
@@ -53,7 +53,7 @@ dependencies = [
 [project.optional-dependencies]
 continuum = ["Wutta-Continuum>=0.3.0"]
 docs = ["Sphinx", "furo", "sphinxcontrib-programoutput"]
-tests = ["pylint", "pytest", "pytest-cov", "tox"]
+tests = ["pylint", "pytest", "pytest-cov", "tox", "WebTest"]
 
 
 [project.entry-points."fanstatic.libraries"]

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/app.py

@@ -164,6 +164,11 @@ def make_pyramid_config(settings):
     )
     pyramid_config.add_directive("add_wutta_permission", "wuttaweb.auth.add_permission")
 
+    # add some more config magic
+    pyramid_config.add_directive(
+        "add_wutta_master_view", "wuttaweb.conf.add_master_view"
+    )
+
     return pyramid_config
 
 

wuttaweb-0.27.1/src/wuttaweb/code-templates/new-master-view.mako

@@ -0,0 +1,116 @@
+## -*- coding: utf-8; mode: python; -*-
+# -*- coding: utf-8; -*-
+"""
+Master view for ${model_title_plural}
+"""
+
+% if model_option == "model_class":
+from ${model_module} import ${model_name}
+% endif
+
+from wuttaweb.views import MasterView
+
+
+class ${class_name}(MasterView):
+    """
+    Master view for ${model_title_plural}
+    """
+    % if model_option == "model_class":
+    model_class = ${model_name}
+    % else:
+    model_name = "${model_name}"
+    % endif
+    model_title = "${model_title}"
+    model_title_plural = "${model_title_plural}"
+
+    route_prefix = "${route_prefix}"
+    % if permission_prefix != route_prefix:
+    permission_prefix = "${permission_prefix}"
+    % endif
+    url_prefix = "${url_prefix}"
+    % if template_prefix != url_prefix:
+    template_prefix = "${template_prefix}"
+    % endif
+
+    % if not listable:
+    listable = False
+    % endif
+    creatable = ${creatable}
+    % if not viewable:
+    viewable = ${viewable}
+    % endif
+    editable = ${editable}
+    deletable = ${deletable}
+
+    % if listable and model_option == "model_name":
+    filterable = False
+    sort_on_backend = False
+    paginate_on_backend = False
+    % endif
+
+    % if grid_columns:
+    grid_columns = [
+        % for field in grid_columns:
+        "${field}",
+        % endfor
+    ]
+    % elif model_option == "model_name":
+    # TODO: must specify grid columns before the list view will work:
+    # grid_columns = [
+    #     "foo",
+    #     "bar",
+    # ]
+    % endif
+
+    % if form_fields:
+    form_fields = [
+        % for field in form_fields:
+        "${field}",
+        % endfor
+    ]
+    % elif model_option == "model_name":
+    # TODO: must specify form fields before create/view/edit/delete will work:
+    # form_fields = [
+    #     "foo",
+    #     "bar",
+    # ]
+    % endif
+
+    % if listable and model_option == "model_name":
+    def get_grid_data(self, columns=None, session=None):
+        data = []
+
+        # TODO: you should return whatever data is needed for the grid.
+        # it is expected to be a list of dicts, with keys corresponding
+        # to grid columns.
+        # 
+        #     data = [
+        #         {"foo": 1, "bar": "abc"},
+        #         {"foo": 2, "bar": "def"},
+        #     ]
+
+        return data
+    % endif
+
+    % if listable:
+    def configure_grid(self, grid):
+        g = grid
+        super().configure_grid(g)
+
+        # TODO: tweak grid however you need here
+        #
+        #     g.set_label("foo", "FOO")
+        #     g.set_link("foo")
+        #     g.set_renderer("foo", self.render_special_field)
+    % endif
+
+
+def defaults(config, **kwargs):
+    base = globals()
+
+    ${class_name} = kwargs.get('${class_name}', base['${class_name}'])
+    ${class_name}.defaults(config)
+
+
+def includeme(config):
+    defaults(config)

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/code-templates/new-table.mako

@@ -15,16 +15,6 @@ class ${model_name}(model.Base):
     ${description}
     """
     __tablename__ = "${table_name}"
-    % if any([c["data_type"]["type"] == "_fk_uuid_" for c in columns]):
-    __table_args__ = (
-        % for column in columns:
-        % if column["data_type"]["type"] == "_fk_uuid_":
-        sa.ForeignKeyConstraint(["${column['name']}"], ["${column['data_type']['reference']}.uuid"],
-                                name="${table_name}_fk_${column['data_type']['reference']}"),
-        % endif
-        % endfor
-    )
-    % endif
     % if versioned:
     % if all([c["versioned"] for c in columns]):
     __versioned__ = {}
@@ -48,17 +38,23 @@ class ${model_name}(model.Base):
 
     % if column["name"] == "uuid":
     uuid = model.uuid_column()
-    % else:
-    ${column["name"]} = sa.Column(${column["formatted_data_type"]}, nullable=${column["nullable"]}, doc="""
-    ${column["description"] or ""}
-    """)
-    % if column["data_type"]["type"] == "_fk_uuid_" and column["relationship"]:
+    % elif column["data_type"]["type"] == "_fk_uuid_":
+    ${column["name"]} = model.uuid_fk_column("${column['data_type']['reference']}.uuid",
+                                nullable=${column["nullable"]})
+    % if column["relationship"]:
     ${column["relationship"]["name"]} = orm.relationship(
         "${column['relationship']['reference_model']}",
         doc="""
         ${column["description"] or ""}
         """)
     % endif
+    % else:
+    ${column["name"]} = sa.Column(
+        ${column["formatted_data_type"]},
+        nullable=${column["nullable"]},
+        doc="""
+        ${column["description"] or ""}
+        """)
     % endif
     % endfor
 

wuttaweb-0.27.1/src/wuttaweb/conf.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8; -*-
+################################################################################
+#
+#  wuttaweb -- Web App for Wutta Framework
+#  Copyright © 2024-2025 Lance Edgar
+#
+#  This file is part of Wutta Framework.
+#
+#  Wutta Framework is free software: you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation, either version 3 of the License, or (at your option) any
+#  later version.
+#
+#  Wutta Framework is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  Wutta Framework.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+"""
+Config Extension
+"""
+
+from wuttjamaican.conf import WuttaConfigExtension
+
+
+class WuttaWebConfigExtension(WuttaConfigExtension):
+    """
+    Config extension for WuttaWeb.
+
+    This sets the default plugin used for SQLAlchemy-Continuum, to
+    :class:`~wuttaweb.db.continuum.WuttaWebContinuumPlugin`.  Which is
+    only relevant if Wutta-Continuum is installed and enabled.  For
+    more info see :doc:`wutta-continuum:index`.
+    """
+
+    key = "wuttaweb"
+
+    def configure(self, config):  # pylint: disable=empty-docstring
+        """ """
+        config.setdefault(
+            "wutta_continuum.wutta_plugin_spec",
+            "wuttaweb.db.continuum:WuttaWebContinuumPlugin",
+        )
+
+
+def add_master_view(config, master):
+    """
+    Pyramid directive to add the given ``MasterView`` subclass to the
+    app's registry.
+
+    This allows the app to dynamically present certain options for
+    admin features etc.
+
+    This is normally called automatically for all master views, within
+    the :meth:`~wuttaweb.views.master.MasterView.defaults()` method.
+
+    Should you need to call this yourself, do not call it directly but
+    instead make a similar call via the Pyramid config object::
+
+       pyramid_config.add_wutta_master_view(PoserWidgetView)
+
+    :param config: Reference to the Pyramid config object.
+
+    :param master: Reference to a
+       :class:`~wuttaweb.views.master.MasterView` subclass.
+
+    This function is involved in app startup; once that phase is
+    complete you can inspect the master views like so::
+
+       master_views = request.registry.settings["wuttaweb_master_views"]
+
+       # find master views for given model class
+       user_views = master_views.get(model.User, [])
+
+       # some master views are registered by model name instead (if no class)
+       email_views = master_views.get("email_setting", [])
+    """
+    key = master.get_model_class() or master.get_model_name()
+
+    def action():
+        master_views = config.get_settings().get("wuttaweb_master_views", {})
+        master_views.setdefault(key, []).append(master)
+        config.add_settings({"wuttaweb_master_views": master_views})
+
+    config.action(None, action)

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/db/continuum.py

@@ -48,11 +48,15 @@ else:
             request = get_current_request()
             if request:
                 return request.client_addr
-            return None
+
+            # nb. no request presumably means running as cli
+            return super().get_remote_addr(uow, session)
 
         def get_user_id(self, uow, session):  # pylint: disable=empty-docstring
             """ """
             request = get_current_request()
-            if request and request.user:
-                return request.user.uuid
-            return None
+            if request:
+                return request.user.uuid if request.user else None
+
+            # nb. no request presumably means running as cli
+            return super().get_user_id(uow, session)

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/forms/widgets.py

@@ -274,7 +274,7 @@ class WuttaDateTimeWidget(DateTimeInputWidget):
             if not cstruct:
                 return ""
             dt = datetime.datetime.fromisoformat(cstruct)
-            return self.app.render_datetime(dt)
+            return self.app.render_datetime(dt, html=True)
 
         return super().serialize(field, cstruct, **kw)
 

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/grids/base.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024-2026 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -30,6 +30,12 @@ import logging
 import warnings
 from collections import namedtuple, OrderedDict
 
+try:
+    from enum import EnumType
+except ImportError:  # pragma: no cover
+    # nb. python < 3.11
+    from enum import EnumMeta as EnumType
+
 import sqlalchemy as sa
 from sqlalchemy import orm
 
@@ -763,7 +769,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes,too-many-public-meth
 
         :param key: Name of column.
 
-        :param enum: Instance of :class:`python:enum.Enum`.
+        :param enum: Instance of :class:`python:enum.Enum`, or a dict.
         """
         self.enums[key] = enum
         self.set_renderer(key, self.render_enum, enum=enum)
@@ -2041,7 +2047,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes,too-many-public-meth
             grid.set_renderer('foo', 'datetime')
         """
         dt = getattr(obj, key)
-        return self.app.render_datetime(dt)
+        return self.app.render_datetime(dt, html=True)
 
     def render_enum(self, obj, key, value, enum=None):
         """
@@ -2050,7 +2056,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes,too-many-public-meth
         See also :meth:`set_enum()`.
 
         :param enum: Enum class for the field.  This should be an
-           instance of :class:`~python:enum.Enum`.
+           instance of :class:`~python:enum.Enum` or else a dict.
 
         To use this feature for your grid::
 
@@ -2061,12 +2067,26 @@ class Grid:  # pylint: disable=too-many-instance-attributes,too-many-public-meth
                TWO = 2
                THREE = 3
 
-           grid.set_enum('my_enum_field', MyEnum)
+           grid.set_enum("my_enum_field", MyEnum)
+
+        Or, perhaps more common::
+
+           myenum = {
+              1: "ONE",
+              2: "TWO",
+              3: "THREE",
+           }
+
+           grid.set_enum("my_enum_field", myenum)
         """
         if enum:
-            raw_value = obj[key]
-            if raw_value:
-                return raw_value.value
+
+            if isinstance(enum, EnumType):
+                if raw_value := obj[key]:
+                    return raw_value.value
+
+            if isinstance(enum, dict):
+                return enum.get(value, value)
 
         return value
 

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/templates/alembic/dashboard.mako

@@ -1,6 +1,10 @@
 ## -*- coding: utf-8; -*-
 <%inherit file="/page.mako" />
 
+<%def name="title()">Alembic Dashboard</%def>
+
+<%def name="content_title()"></%def>
+
 <%def name="page_content()">
   <div style="display: flex; gap: 5rem; align-items: start;">
 

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/templates/appinfo/index.mako

@@ -19,6 +19,9 @@
         <b-field horizontal label="Node Title">
           <span>${app.get_node_title()}</span>
         </b-field>
+        <b-field horizontal label="DB Backend">
+          <span>${config.appdb_engine.dialect.name}</span>
+        </b-field>
         <b-field horizontal label="Time Zone">
           <span>${app.get_timezone_name()}</span>
         </b-field>
@@ -33,23 +36,7 @@
   </nav>
 
   <div class="buttons">
-
-    % if request.has_perm("app_tables.list"):
-        <wutta-button type="is-primary"
-                      tag="a" href="${url('app_tables')}"
-                      icon-left="table"
-                      label="App Tables"
-                      once />
-    % endif
-
-    % if request.has_perm("alembic.dashboard"):
-        <wutta-button type="is-primary"
-                      tag="a" href="${url('alembic.dashboard')}"
-                      icon-left="forward"
-                      label="Alembic Dashboard"
-                      once />
-    % endif
-
+    ${self.middle_buttons()}
   </div>
 
   <nav class="panel">
@@ -112,6 +99,32 @@
 
 </%def>
 
+<%def name="middle_buttons()">
+  % if request.has_perm("master_views.list"):
+      <wutta-button type="is-primary"
+                    tag="a" href="${url('master_views')}"
+                    icon-left="eye"
+                    label="Master Views"
+                    once />
+  % endif
+
+  % if request.has_perm("app_tables.list"):
+      <wutta-button type="is-primary"
+                    tag="a" href="${url('app_tables')}"
+                    icon-left="table"
+                    label="App Tables"
+                    once />
+  % endif
+
+  % if request.has_perm("alembic.dashboard"):
+      <wutta-button type="is-primary"
+                    tag="a" href="${url('alembic.dashboard')}"
+                    icon-left="forward"
+                    label="Alembic Dashboard"
+                    once />
+  % endif
+</%def>
+
 <%def name="modify_vue_vars()">
   ${parent.modify_vue_vars()}
   <script>
@@ -124,6 +137,3 @@
 
   </script>
 </%def>
-
-
-${parent.body()}

{wuttaweb-0.26.0 → wuttaweb-0.27.1}/src/wuttaweb/templates/base.mako

@@ -212,6 +212,10 @@
         padding: 1rem;
     }
 
+    .tool-panels-wrapper .panel-heading {
+        white-space: nowrap;
+    }
+
   </style>
 </%def>