lino 25.4.5__tar.gz → 25.5.0__tar.gz

{lino-25.4.5 → lino-25.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.4.5
+Version: 25.5.0
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino

{lino-25.4.5 → lino-25.5.0}/lino/__init__.py

@@ -31,7 +31,7 @@ from django import VERSION
 from django.apps import AppConfig
 from django.conf import settings
 import warnings
-__version__ = '25.4.5'
+__version__ = '25.5.0'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

{lino-25.4.5 → lino-25.5.0}/lino/api/doctest.py

@@ -524,6 +524,20 @@ def show_choicelists():
     print(rstgen.table(headers, rows))
 
 
+def show_parent_layouts():
+    """
+    Show all actors having a parent layout.
+    """
+    headers = ["name", "parent layout"]
+    rows = []
+    for a in actors.actors_list:
+        if issubclass(a, AbstractTable) and a.parent_layout:
+            parent = a.parent_layout._datasource
+            row = [str(a), str(parent)]  # , parent.__module__]
+            rows.append(row)
+    print(rstgen.table(headers, rows))
+
+
 def show_permissions(*args):
     print(visible_for(*args))
 

{lino-25.4.5 → lino-25.5.0}/lino/core/elems.py

@@ -5,8 +5,6 @@
 
 """
 
-from lino.utils.jsgen import VisibleComponent
-import types
 import decimal
 from lxml.html import fromstring
 from lxml import etree
@@ -15,7 +13,7 @@ from django.db import models
 from django.utils.translation import gettext as _
 from django.utils.functional import Promise
 from django.utils.text import format_lazy
-from django.utils.html import SafeString, escape
+from django.utils.html import SafeString
 from django.conf import settings
 from django.db.models.fields.related import (
     ReverseOneToOneDescriptor as SingleRelatedObjectDescriptor,
@@ -40,16 +38,15 @@ from lino.core.gfks import GenericRelation, GenericRel
 from lino.core import choicelists
 from lino.modlib.bootstrap3.views import table2html
 
-from lino.utils.html import E, py2html, tostring
-from lino.utils.html import html2text
+from lino.utils.jsgen import VisibleComponent
+from lino.utils.html import E, tostring, forcetext, html2text
 from lino.utils.ranges import constrain
 from lino.utils import jsgen
 from lino.utils import mti
 from lino.utils.jsgen import py2js, js_code
-from lino.utils.html2xhtml import html2xhtml
+# from lino.utils.html2xhtml import html2xhtml
 from lino.utils import join_elems
 from lino.core.actors import qs2summary
-from lino.core.store import get_atomizer
 
 from lino.core.layouts import (
     FormLayout,
@@ -66,7 +63,6 @@ from lino.utils.format_date import fds
 from lino.modlib.users.utils import get_user_profile
 
 # from etgen import etree
-from lino.utils.html import E, forcetext
 from etgen.html2rst import html2rst
 
 EXT_CHAR_WIDTH = 9
@@ -2756,6 +2752,7 @@ def get_summary_element(lh, de, name, **kw):
 def create_layout_element(lh, name, **kw):
     """
     Create a layout element from the named data element.
+    `lh` is the layout handle of the actor who is the datasource of the data element.
     """
 
     if True:  # settings.SITE.catch_layout_exceptions:
@@ -2850,6 +2847,8 @@ def create_layout_element(lh, name, **kw):
         # The data element refers to a slave table. Slave tables make
         # no sense in an insert window because the master does not yet
         # exist.
+        de.attach_to_parent_layout(lh.layout)
+
         if settings.SITE.is_hidden_plugin(de.app_label):
             return None
 
@@ -2858,8 +2857,8 @@ def create_layout_element(lh, name, **kw):
 
         # print("20240317", de, lh)
         if isinstance(lh.layout, FormLayout):
-            # When a table is specified in the layout of a DetailWindow, then it
-            # will be rendered as a :term:`slave panel`. The panel will have a
+            # When a table is specified in the layout of a detail window, then it
+            # is rendered as a :term:`slave panel`. The panel will have a
             # tool button to "open that table in its own window". The display
             # mode of that summary is defined by the `default_display_modes` of
             # the table.
@@ -2884,7 +2883,7 @@ def create_layout_element(lh, name, **kw):
 
             if (
                 len(de.default_display_modes) > 1
-                and lh.ui.renderer.front_end.media_name == "react"
+                and lh.ui.media_name == "react"
             ):
                 # print(f"20240928 {de} in {lh} gets SlaveContainer")
                 return SlaveContainer(lh, name, de, **kw)

{lino-25.4.5 → lino-25.5.0}/lino/core/fields.py

@@ -167,9 +167,17 @@ class PriceField(models.DecimalField):
     `max_digits`.
     """
 
+    # def __init__(self, verbose_name=None, max_digits=10, **kwargs):
+    #     defaults = dict(
+    #         max_length=max_digits,
+    #         max_digits=max_digits,
+    #         decimal_places=2,
+    #     )
+    #     defaults.update(kwargs)
+    #     super().__init__(verbose_name, **defaults)
+
     def __init__(self, verbose_name=None, max_digits=10, **kwargs):
         defaults = dict(
-            max_length=max_digits,
             max_digits=max_digits,
             decimal_places=2,
         )
@@ -947,7 +955,7 @@ class QuantityField(models.CharField):
     """
 
     description = _("Quantity (Decimal or Duration)")
-    overflow_value = None
+    # overflow_value = None
 
     def __init__(self, *args, **kw):
         kw.setdefault("max_length", settings.SITE.quantity_max_length)
@@ -974,16 +982,18 @@ class QuantityField(models.CharField):
         I'd add "Any value allowed for this field when instantiating a model."
 
         """
-        if value:
+        if isinstance(value, quantities.Quantity):
+            return value
+        elif isinstance(value, Decimal):
+            return quantities.Quantity(value)
+        elif isinstance(value, str):
+            return quantities.parse(value)
+        elif value:
             # try:
-            if isinstance(value, str):
-                return quantities.parse(value)
             return quantities.Quantity(value)
             # except Exception as e:
             #     raise ValidationError(
             #         "Invalid value {} for {} : {}".format(value, self, e))
-        elif isinstance(value, Decimal):
-            return quantities.Quantity(value)
         return None
 
     def from_db_value(self, value, expression, connection, context=None):
@@ -1001,14 +1011,18 @@ class QuantityField(models.CharField):
         return str(value)  # if value is None else ''
 
     def clean(self, raw_value, obj):
-        if len(str(raw_value)) > self.max_length:
-            if self.overflow_value:
-                return self.overflow_value
-            raise ValidationError(
-                f"Cannot accept quantity {raw_value} "
-                + f"because max_length is {self.max_length}")
-            # print("20230129 Can't store {}={} in {}".format(self.name, raw_value, obj))
-            # return -1
+        # if isinstance(raw_value, quantities.Quantity):
+        raw_value = self.to_python(raw_value)
+        if raw_value is not None:
+            raw_value = raw_value.limit_length(self.max_length, ValidationError)
+        # if len(str(raw_value)) > self.max_length:
+        #     if self.overflow_value:
+        #         return self.overflow_value
+        #     raise ValidationError(
+        #         f"Cannot accept quantity {raw_value} "
+        #         + f"because max_length is {self.max_length}")
+        #     # print("20230129 Can't store {}={} in {}".format(self.name, raw_value, obj))
+        #     # return -1
         return super().clean(raw_value, obj)
 
 
@@ -1326,6 +1340,14 @@ class TableRow(object):
     def disable_create(self, ar):
         return None
 
+    def before_ui_save(self, ar, cw):
+        # Needed for polls.AnswerRemarkField
+        pass
+
+    def get_master_data(self, ar, master_instance=None):
+        # Needed for polls.AnswerRemarkField
+        return
+
     def get_detail_action(self, ar):
         """
         Return the (bound) detail action to use for showing this database row in

{lino-25.4.5 → lino-25.5.0}/lino/core/layouts.py

@@ -99,7 +99,7 @@ class LayoutHandle(object):
         assert isinstance(layout, BaseLayout)
         assert isinstance(ui, Plugin)
         self.layout = layout
-        self.ui = ui
+        self.ui = ui  # TODO: rename ui to front_end
         self.hidden_elements = layout.hidden_elements
         self._data_elems = []
         self._names = {}
@@ -299,7 +299,7 @@ class LayoutHandle(object):
             else:
                 e.hidden = True
 
-        self.ui.setup_layout_element(e)
+        # self.ui.setup_layout_element(e)
         self.layout.setup_element(self, e)
         self._names[name] = e
         return e

{lino-25.4.5 → lino-25.5.0}/lino/core/model.py

@@ -7,7 +7,7 @@ See :doc:`/dev/models`, :doc:`/dev/delete`, :doc:`/dev/disable`,
 :doc:`/dev/hide`, :doc:`/dev/format`
 
 """
-
+# from bs4 import BeautifulSoup
 from lino import logger
 import copy
 
@@ -25,6 +25,7 @@ from lino.utils.soup import sanitize
 from lino.core import fields
 from lino.core import signals
 from lino.core import actions
+from lino.core import inject
 
 from .fields import make_remote_field, RichTextField, displayfield
 from .utils import error2str
@@ -331,9 +332,9 @@ class Model(models.Model, fields.TableRow):
     @classmethod
     def lookup_or_create(model, lookup_field, value, **known_values):
         """
-        Look up whether there is a model instance having
-        `lookup_field` with value `value`
-        (and optionally other `known_values` matching exactly).
+
+        Look up whether there is a row having value `value` for field
+        `lookup_field` (and optionally other `known_values` matching exactly).
 
         If it doesn't exist, create it and emit an
         :attr:`auto_create <lino.core.signals.auto_create>` signal.
@@ -425,7 +426,12 @@ class Model(models.Model, fields.TableRow):
             old = getattr(self, f.name)
             if old is None:
                 continue
-            new = sanitize(old, **kwargs)
+
+            if getattr(f, "format") == "plain":
+                # assert BeautifulSoup(old, "html.parser").find() is None
+                new = old
+            else:
+                new = sanitize(old, **kwargs)
             # try:
             #     new = bleach.clean(
             #         new,
@@ -819,6 +825,10 @@ class Model(models.Model, fields.TableRow):
 
         setattr(model, vfield_name, pick_choice)
 
+    @classmethod
+    def update_field(cls, *args, **kwargs):
+        inject.update_field(cls, *args, **kwargs)
+
     @classmethod
     def django2lino(cls, model):
         """

{lino-25.4.5 → lino-25.5.0}/lino/core/plugin.py

@@ -223,8 +223,8 @@ class Plugin:
     def get_dashboard_items(self, user):
         return []
 
-    def setup_layout_element(self, el):
-        pass
+    # def setup_layout_element(self, el):
+    #     pass
 
     def get_detail_url(self, ar, actor, pk, *args, **kw):
         from lino.core.renderer import TextRenderer

{lino-25.4.5 → lino-25.5.0}/lino/core/site.py

@@ -139,7 +139,6 @@ class Site(object):
     quantity_max_length = 6
     # upload_to_tpl = "uploads/%Y/%m"
     auto_fit_column_widths = True
-    # locale = 'en_GB.utf-8'
     site_locale = None
     confdirs = None
     kernel = None
@@ -978,7 +977,7 @@ class Site(object):
         self.update_settings(ROOT_URLCONF=self.root_urlconf)
         self.update_settings(MEDIA_URL="/media/")
 
-        if not "STATIC_ROOT" in self.django_settings:
+        if "STATIC_ROOT" not in self.django_settings:
             # cache_root = os.environ.get("LINO_CACHE_ROOT", None)
             # if cache_root:
             #     p = Path(cache_root)
@@ -986,10 +985,10 @@ class Site(object):
             #     p = self.site_dir
             p = self.site_dir
             self.update_settings(STATIC_ROOT=str(p / "static_root"))
-        if not "STATIC_URL" in self.django_settings:
+        if "STATIC_URL" not in self.django_settings:
             self.update_settings(STATIC_URL="/static/")
 
-        if not "USE_TZ" in self.django_settings:
+        if "USE_TZ" not in self.django_settings:
             # django.utils.deprecation.RemovedInDjango50Warning: The default
             # value of USE_TZ will change from False to True in Django 5.0. Set
             # USE_TZ to False in your project settings if you want to keep the
@@ -1235,11 +1234,13 @@ class Site(object):
         from lino.core.kernel import site_startup
 
         site_startup(self)
-        if self.site_locale:
-            try:
-                locale.setlocale(locale.LC_ALL, self.site_locale)
-            except locale.Error as e:
-                self.logger.warning("%s : %s", self.site_locale, e)
+
+        if self.site_locale is None:
+            self.site_locale = '.'.join(locale.getlocale())
+        try:
+            locale.setlocale(locale.LC_ALL, self.site_locale)
+        except locale.Error as e:
+            self.logger.warning("%s : %s", self.site_locale, e)
         self.clear_site_config()
 
     def register_shutdown_task(self, task):
@@ -2257,10 +2258,7 @@ class Site(object):
         return moneyfmt(v, places=places, **kw)
 
     def format_currency(self, *args, **kwargs):
-        res = locale.currency(*args, **kwargs)
-        # if six.PY2:
-        #     res = res.decode(locale.nl_langinfo(locale.CODESET))
-        return res
+        return locale.currency(*args, **kwargs)
 
     LOOKUP_OP = "__iexact"
 

{lino-25.4.5 → lino-25.5.0}/lino/core/store.py

@@ -447,7 +447,7 @@ class PreviewTextStoreField(StoreField):
 class VirtStoreField(StoreField):
     def __init__(self, vf, delegate, name):
         self.vf = vf
-        StoreField.__init__(self, vf.return_type, name)
+        super().__init__(vf.return_type, name)
         self.as_js = delegate.as_js
         self.column_names = delegate.column_names
         self.list_values_count = delegate.list_values_count

{lino-25.4.5 → lino-25.5.0}/lino/core/tables.py

@@ -323,6 +323,12 @@ class AbstractTable(actors.Actor):
     See :ref:`dg.table.default_display_modes`.
     """
 
+    parent_layout = None
+
+    @classmethod
+    def attach_to_parent_layout(cls, parent):
+        cls.parent_layout = parent
+
     @classmethod
     # def get_display_mode(cls, available_width=None):
     def get_display_mode(cls):
@@ -532,7 +538,7 @@ method in order to sort the rows of the queryset.
     @classmethod
     def get_column_names(self, ar):
         """Dynamic tables can subclass this method and return a value for
-        :attr:`column_names` which depends on the request.
+        :attr:`column_names` that depends on the request.
 
         """
         # if settings.SITE.mobile_view:

{lino-25.4.5 → lino-25.5.0}/lino/core/utils.py

@@ -6,19 +6,19 @@ A collection of utilities which require Django settings to be
 importable.
 """
 
-from .exceptions import ChangedAPI
 from lino.utils import IncompleteDate
 import copy
 import sys
 import datetime
 # import yaml
-
+from importlib import import_module
 from django.utils.html import format_html, mark_safe, SafeString
 from django.db import models
 from django.db.models import Q
 from django.core.exceptions import FieldDoesNotExist
 # from django.utils.functional import lazy
-from importlib import import_module
+from django.core.validators import validate_email, ValidationError, URLValidator
+from django.apps import apps
 from django.utils.translation import gettext as _
 from django.conf import settings
 from django.core import exceptions
@@ -28,9 +28,7 @@ from lino.utils.html import E, assert_safe, tostring
 from lino.utils import capture_output
 from lino.utils.ranges import isrange
 
-from django.core.validators import validate_email, ValidationError, URLValidator
-
-from django.apps import apps
+from .exceptions import ChangedAPI
 
 get_models = apps.get_models
 
@@ -642,23 +640,6 @@ def navinfo(qs, elem, limit=None):
     )
 
 
-# class Handle(object):
-#     """Base class for :class:`lino.core.tables.TableHandle`,
-#     :class:`lino.core.frames.FrameHandle` etc.
-
-#     The "handle" of an actor is responsible for expanding layouts into
-#     sets of (renderer-specific) widgets (called "elements"). This
-#     operation is done once per actor per renderer.
-
-#     """
-#     # def __init__(self):
-#     #     self.ui = settings.SITE.kernel.default_ui
-
-#     def setup(self, ar):
-#         settings.SITE.kernel.setup_handle(self, ar)
-#         # self.ui.setup_handle(self, ar)
-
-
 class Parametrizable(object):
     """
     Base class for both Actors and Actions.  See :doc:`/dev/parameters`.

{lino-25.4.5 → lino-25.5.0}/lino/help_texts.py

@@ -320,6 +320,11 @@ help_texts = {
     'lino.core.model.Model.set_widget_options' : _("""Set default values for the widget options of a given element."""),
     'lino.core.model.Model.get_overview_elems' : _("""Return a list of HTML elements to be shown in overview field."""),
     'lino.core.model.Model.merge_row' : _("""Merge this object into another object of same class."""),
+    'lino.utils.quantities.Quantity' : _("""The base class for all quantities."""),
+    'lino.utils.quantities.Quantity.limit_length' : _("""Reduce the number of decimal places so that the value fits into a field of the specified max_length, if possible. This will round the value (reducing precision) if needed."""),
+    'lino.utils.quantities.Duration' : _("""The class to represent a duration."""),
+    'lino.utils.quantities.Percentage' : _("""The class to represent a percentage."""),
+    'lino.utils.quantities.Fraction' : _("""The class to represent a fraction. (Not yet implemented)"""),
     'lino.core.model.Model.get_request_queryset' : _("""Return the Django queryset to be used by action request ar for any data table on this model."""),
     'lino.core.model.Model.before_ui_save' : _("""A hook for adding custom code to be executed each time an instance of this model gets updated via the user interface and before the changes are written to the database."""),
     'lino.core.model.Model.after_ui_save' : _("""Like before_ui_save(), but is called after the changes are written to the database."""),
@@ -709,4 +714,5 @@ help_texts = {
     'lino.core.model.Model.create_FOO_choice' : _("""For every field named “FOO” for which a chooser exists, if the model also has a method called “create_FOO_choice”, then this chooser will be a learning chooser. That is, users can enter text into the combobox, and Lino will create a new database object from it."""),
     'lino.core.model.Model.get_choices_text' : _("""Return the text to be displayed when an instance of this model is being used as a choice in a combobox of a ForeignKey field pointing to this model. request is the web request, actor is the requesting actor."""),
     'lino.core.model.Model.disable_delete' : _("""Decide whether this database object may be deleted. Return None when there is no veto against deleting this database row, otherwise a translatable message that explains to the user why they can’t delete this row."""),
+    'lino.core.model.Model.update_field' : _("""Shortcut to call lino.core.inject.update_field() for usage during lino.core.site.Site.do_site_startup() in a settings.py or similar place."""),
 }

{lino-25.4.5 → lino-25.5.0}/lino/modlib/help/models.py

@@ -6,7 +6,6 @@ from django.utils.translation import get_language
 from lino.core.actors import Actor
 from lino.api import dd, _
 from lino.modlib.memo.mixins import MemoReferrable
-from lino_xl.lib.contacts.mixins import ContactRelated
 
 use_contacts = dd.get_plugin_setting("help", "use_contacts")
 make_help_pages = dd.get_plugin_setting("help", "make_help_pages")
@@ -61,6 +60,8 @@ if make_help_pages:
 
 if use_contacts:
 
+    from lino_xl.lib.contacts.mixins import ContactRelated
+
     class SiteContactTypes(dd.ChoiceList):
         verbose_name = _("Site contact type")
         verbose_name_plural = _("Site contact types")

{lino-25.4.5 → lino-25.5.0}/lino/modlib/notify/fixtures/demo2.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2018 Rumma & Ko Ltd
+# Copyright 2016-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """Emit a broadcast notification "The database has been initialized."
 
@@ -14,7 +14,12 @@ from django.utils.timezone import make_aware
 
 
 def objects():
-    now = datetime.datetime.combine(dd.today(), i2t(548))
+
+    # The messages are dated one day before today() because
+    # book/docs/specs/notify.rst has a code snippet that failed when pm prep had
+    # been run before 5:48am
+
+    now = datetime.datetime.combine(dd.today(-1), i2t(548))
     if settings.USE_TZ:
         now = make_aware(now)
     mt = rt.models.notify.MessageTypes.system

{lino-25.4.5 → lino-25.5.0}/lino/modlib/publisher/fixtures/synodalworld.py

@@ -15,8 +15,6 @@ home_children = [
 
 def objects():
     image = rt.models.uploads.Upload.objects.first()
-    print('='*80)
-    print(image)
     def iterate(iterable):
         try:
             for obj in iterable:

{lino-25.4.5 → lino-25.5.0}/lino/utils/quantities.py

@@ -1,10 +1,10 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2012-2021 Rumma & Ko Ltd
+# Copyright 2012-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """See :doc:`/dev/quantities`."""
 
 import datetime
-from decimal import Decimal
+from decimal import Decimal, ROUND_HALF_UP, InvalidOperation
 
 DEC2HOUR = Decimal(1) / Decimal(60)
 
@@ -19,13 +19,26 @@ class Quantity(Decimal):
         # if isinstance(value, str):
         #     value = Decimal(value)
         self = Decimal.__new__(cls, value, context)
+        # try:
+        #     self = Decimal.__new__(cls, value, context)
+        # except InvalidOperation as e:
+        #     raise Exception(f"Failed to parse {repr(value)}: {e}")
         self._text = str(value)
         return self
 
     def __str__(self):
-        # return "{}%".format(self * 100)
         return self._text
 
+    def limit_length(self, max_length, excl=Exception):
+        rv = self
+        while len(rv) > max_length:
+            if (pos := rv._text.find(".")) == -1:
+                raise excl(f"Cannot reduce length of {self} to {max_length}")
+            places = len(rv) - pos - 2  # one decimal place less than before
+            q = Decimal(10) ** -places
+            rv = self.__class__(self.quantize(q, rounding=ROUND_HALF_UP))
+        return rv
+
     def __format__(self, format_spec):
         if format_spec:
             return format(self._text, format_spec)
@@ -191,6 +204,9 @@ class Duration(Quantity):
 
     __rmul__ = __mul__
 
+    # def limit_length(self, max_length):
+    #     raise Exception("Cannot limit the length of a duration")
+
 
 def convert_from(value, context=None):
     if isinstance(value, str):
@@ -220,6 +236,8 @@ def parse(s):
 
 
 def parse_decimal(s):
+    if not s:
+        return None
     if "." in s and "," in s:
         raise ValueError("Invalid decimal value %r" % s)
     s = s.replace(",", ".")