lino 24.11.0__py3-none-any.whl → 25.1.0__py3-none-any.whl

lino/__init__.py

@@ -26,7 +26,7 @@ defines no models, some template files, a series of :term:`django-admin commands
 
 """
 
-__version__ = '24.11.0'
+__version__ = '25.1.0'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/core/actions.py

@@ -87,7 +87,7 @@ def install_layout(cls, k, layout_class, **options):
     - `cls` is the actor (a class object)
 
     - `k` is one of 'grid_layout', 'detail_layout', 'insert_layout',
-      'params_layout', 'card_layout', 'list_layout'
+      'params_layout', 'card_layout'
 
     - `layout_class`
 
@@ -575,7 +575,7 @@ class Action(Parametrizable, Permittable):
 
     def is_window_action(self):
         """Return `True` if this is a "window action" (i.e. which opens a GUI
-        window on the client before executin).
+        window on the client before executing).
 
         """
         return self.opens_a_window or (self.parameters and not self.no_params_window)
@@ -805,9 +805,7 @@ class ShowTable(TableAction):
         return self.label or self.defining_actor.label
 
     def get_window_layout(self, actor):
-        # ~ return self.actor.list_layout
         return None
-        # return actor.card_layout or actor.list_layout  # 20210910
 
     def get_window_size(self, actor):
         return actor.window_size

lino/core/actors.py

@@ -261,6 +261,9 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
 
     _detail_action_class = actions.ShowDetail
 
+    obvious_fields = set()
+    """A set of names of fields that are considered :term:`obvious field`.  """
+
     required_roles = set([SiteUser])
     """See :doc:`/dev/perms`."""
 
@@ -439,12 +442,11 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     detail_layout = None
     insert_layout = None
     card_layout = None
-    list_layout = None
+    list_layout = None  # no longer used
 
     detail_template = None  # deprecated: use insert_layout instead
     insert_template = None  # deprecated: use detail_layout instead
-
-    row_template = "{row}"
+    row_template = None   # "{row}"
 
     help_text = None
     detail_action = None
@@ -722,12 +724,6 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     def on_analyze(self, site):
         pass
 
-    @classmethod
-    def row_as_summary(cls, ar, obj, text=None, **kwargs):
-        if ar is None:
-            return text or str(obj)
-        return obj.as_summary_item(ar, text, **kwargs)
-
     @classmethod
     def do_setup(self):
         pass
@@ -836,7 +832,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
             window_size=(cls.insert_layout_width, "auto"),
         )
         actions.install_layout(cls, "card_layout", layouts.DetailLayout)
-        actions.install_layout(cls, "list_layout", layouts.DetailLayout)
+        # actions.install_layout(cls, "list_layout", layouts.DetailLayout)
 
         cls.extra_layouts = dict()
         for name, main in cls.get_extra_layouts():
@@ -1014,11 +1010,14 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         An example is described in :ref:`avanti.specs.get_request_detail_action`
 
         """
+        if (ba := cls.detail_action) is None:
+            return None
+        if ar is None:
+            return ba
         ut = ar.get_user().user_type
-        ba = cls.detail_action
         if (
-            ar.actor.detail_action is not None
-            and ar.actor
+            ar.actor is not None
+            and ar.actor.detail_action is not None
             and ba.action is ar.actor.detail_action.action
         ):
             # 20210223 When this actor uses the same action, don't return
@@ -1243,7 +1242,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         window on a given row of this actor.
 
         """
-        return str(obj)
+        return obj.as_str(ar)
 
     @classmethod
     def get_card_title(self, ar, obj):
@@ -1256,6 +1255,28 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     ):
         return None
 
+    @classmethod
+    def row_as_summary(cls, ar, obj, text=None, **kwargs):
+        if ar is None:
+            return text or str(obj)
+        return obj.as_summary_item(ar, text, **kwargs)
+
+    @classmethod
+    def row_as_paragraph(cls, ar, row):
+        """Return an HTML string that represents the given row as a single
+        paragraph.
+
+        See :ref:`dev.as_paragraph`.
+        """
+        return row.as_paragraph(ar)
+
+    @classmethod
+    def row_as_page(cls, ar, row, **kwargs):
+        """
+        Return an HTML string that represent the given row as a plain page.
+        """
+        return row.as_page(ar, **kwargs)
+
     @classmethod
     def get_choices_text(self, obj, ar, field):
         """

lino/core/dbtables.py

@@ -209,18 +209,18 @@ class Table(AbstractTable):
     """If True will position the quick search input to the bottom of the header and have it full width.
     Default: False"""
 
-    @classmethod
-    def init_layouts(cls):
-        if cls.model is not None and issubclass(cls.model, Model):
-            if not cls.abstract:
-                for tbl in cls.__mro__:
-                    # print("20210629", tbl)
-                    if "list_layout" in tbl.__dict__:
-                        break
-                    if issubclass(tbl, actors.Actor):
-                        cls.list_layout = "list_item"
-                        break
-        super().init_layouts()
+    # @classmethod
+    # def init_layouts(cls):
+    #     if cls.model is not None and issubclass(cls.model, Model):
+    #         if not cls.abstract:
+    #             for tbl in cls.__mro__:
+    #                 # print("20210629", tbl)
+    #                 if "list_layout" in tbl.__dict__:
+    #                     break
+    #                 if issubclass(tbl, actors.Actor):
+    #                     cls.list_layout = "list_item"
+    #                     break
+    #     super().init_layouts()
 
     @classmethod
     def add_quick_search_filter(cls, qs, search_text):

lino/core/fields.py

@@ -69,10 +69,8 @@ def set_default_verbose_name(f):
     later. These fields don't have a name.
 
     """
-    if f.name is None:
-        if f.verbose_name is None:
-            f.verbose_name = f.remote_field.model._meta.verbose_name
-    elif f.verbose_name == f.name.replace("_", " "):
+    if f.verbose_name is None or (
+        f.name is not None and f.verbose_name == f.name.replace("_", " ")):
         f.verbose_name = f.remote_field.model._meta.verbose_name
 
 
@@ -294,6 +292,7 @@ class FakeField(object):
     wildcard_data_elem = False
     """Whether to consider this field as wildcard data element.
     """
+
     sortable_by = None
     """
     A list of names of real fields to be used for sorting when this
@@ -658,6 +657,7 @@ class VirtualField(FakeField):
             return
         self.return_type.model = VirtualModel(model)
         self.return_type.column = None
+        self.return_type.name = name
 
         # if name == "overview":
         #     print("20181022", self, self.verbose_name)
@@ -811,7 +811,7 @@ class VirtualBooleanField(VirtualField):
 
 def virtualfield(return_type, **kwargs):
     """
-    Decorator to turn a method into a :class:`VirtualField`.
+    Decorator to turn a model method into a :class:`VirtualField`.
     """
 
     def decorator(fn):
@@ -1334,8 +1334,8 @@ class TableRow(object):
                 #         ar.actor, self.__class__, ar.actor.model))
                 dt = self.__class__.get_default_table()
                 if dt is not None:
-                    # a = dt.get_request_detail_action(ar)
-                    a = dt.detail_action
+                    a = dt.get_request_detail_action(ar)
+                    # a = dt.detail_action
         if a is None or ar is None:
             return a
         if a.get_view_permission(ar.get_user().user_type):
@@ -1343,7 +1343,8 @@ class TableRow(object):
             return a
 
     def get_choices_text(self, ar, actor, field):
-        return str(self)
+        return self.as_str(ar)
+        # return str(self)
 
     # @fields.displayfield(_("Description"))
     # @htmlbox(_("Overview"))
@@ -1365,16 +1366,28 @@ class TableRow(object):
         # return [ar.obj2html(self)]
         return [self.as_summary_item(ar)]
 
+    def as_str(self, ar):
+        # must return a str
+        if ar.actor is None:
+            return str(self)
+        elif ar.actor.row_template is None or not isinstance(self, ar.actor.model):
+            return " ".join(self.get_str_words(ar))
+        return ar.actor.row_template.format(row=self)
+
+    def get_str_words(self, ar):
+        # must yield a sequence of str (or Promise)
+        yield str(self)
+
     def as_summary_item(self, ar, text=None, **kwargs):
         # must return an ET element
         if ar is None:
             return text or str(self)
-        if text is None and ar.actor is not None:
-            text = ar.actor.row_template.format(row=self)
-            # raise Exception("20241029")
+        if text is None:
+            text = self.as_str(ar)
         return ar.obj2html(self, text, **kwargs)
 
     def as_paragraph(self, ar, **kwargs):
+        # must return a safe html string
         if ar is None:
             return escape(str(self))
         return tostring(self.as_summary_item(ar, **kwargs))
@@ -1709,12 +1722,10 @@ def choices_for_field(ar, holder, field):
             # same code as for ForeignKey
             def row2dict(obj, d):
                 d[constants.CHOICES_TEXT_FIELD] = holder.get_choices_text(
-                    obj, ar.request, field
-                )
+                    obj, ar, field)
                 d[constants.CHOICES_VALUE_FIELD] = obj.pk
                 return d
         else:  # values are (value, text) tuples
-
             def row2dict(obj, d):
                 d[constants.CHOICES_TEXT_FIELD] = str(obj[1])
                 d[constants.CHOICES_VALUE_FIELD] = obj[0]
@@ -1731,8 +1742,7 @@ def choices_for_field(ar, holder, field):
                 d[constants.CHOICES_VALUE_FIELD] = obj[0]
             else:
                 d[constants.CHOICES_TEXT_FIELD] = holder.get_choices_text(
-                    obj, ar.request, field
-                )
+                    obj, ar, field)
                 d[constants.CHOICES_VALUE_FIELD] = str(obj)
             return d
 
@@ -1756,8 +1766,7 @@ def choices_for_field(ar, holder, field):
 
         def row2dict(obj, d):
             d[constants.CHOICES_TEXT_FIELD] = holder.get_choices_text(
-                obj, ar.request, field
-            )
+                obj, ar, field)
             d[constants.CHOICES_VALUE_FIELD] = obj.pk
             return d
     else:

lino/core/inject.py

@@ -111,15 +111,22 @@ def check_pending_injects(sender, models_list=None, **kw):
     # raise Exception(20150304)
     # called from kernel.analyze_models()
     # ~ logger.info("20130212 check_pending_injects()...")
+    # if PENDING_INJECTS:
+    #     for spec, todos in PENDING_INJECTS.items():
+    #         model = resolve_model(spec, strict=True)
+    #         if todos is not None:
+    #             for func, caller in todos:
+    #                 func(model)
+
     if PENDING_INJECTS:
         msg = ""
-        for spec, funcs in list(PENDING_INJECTS.items()):
+        for spec, funcs in PENDING_INJECTS.items():
             msg += spec + ": "
             msg += ", ".join([fmt(f) for f in funcs])
             # ~ msg += '\n'.join([str(dir(func)) for func in funcs])
             # ~ msg += '\n'.join([str(func.func_code.co_consts) for func in funcs])
             # ~ msg += str(funcs)
-        raise Exception("Oops, there are pending injects: %s" % msg)
+        raise Exception(f"Oops, there are pending injects: {msg}")
         # ~ logger.warning("pending injects: %s", msg)
 
     # ~ logger.info("20131110 no pending injects")

lino/core/kernel.py

@@ -21,8 +21,6 @@ application.
 """
 
 import os
-from os.path import join, dirname
-
 import sys
 import time
 import codecs
@@ -49,6 +47,7 @@ from django.db import models
 from lino import logger
 from lino.utils import codetime
 from lino.utils.html import E
+from lino.core.utils import format_request
 # from lino.utils import isiterable
 from lino.core import layouts
 from lino.core import actors
@@ -166,6 +165,7 @@ class Kernel(object):
 
         def h(signum, frame):
             site.shutdown()
+            sys.exit()
 
         signal.signal(sig, h)
 
@@ -298,8 +298,11 @@ class Kernel(object):
                 # if f.__class__ is models.CharField and f.null:
                 #     msg = "Nullable CharField %s in %s" % (f.name, model)
                 #     raise Exception(msg)
+
                 if isinstance(f, models.ForeignKey):
+                    # f.remote_field.model = resolve_model(f.remote_field.model)
                     if isinstance(f.remote_field.model, str):
+                        # models_list = [f"{m}({m._meta.abstract})".format(m) for m in models_list]
                         raise Exception(
                             "Could not resolve target %r of "
                             "ForeignKey '%s' in %s "
@@ -308,12 +311,10 @@ class Kernel(object):
                         )
 
                     set_default_verbose_name(f)
-                    """
-                    If JobProvider is an MTI child of Company,
-                    then mti.delete_child(JobProvider) must not fail on a
-                    JobProvider being referred only by objects that can refer
-                    to a Company as well.
-                    """
+                    # If JobProvider is an MTI child of Company,
+                    # then mti.delete_child(JobProvider) must not fail on a
+                    # JobProvider being referred only by objects that can refer
+                    # to a Company as well.
                     if not hasattr(f.remote_field.model, "_lino_ddh"):
                         msg = "20150824 {1} (needed by {0}) " "has no _lino_ddh"
                         raise Exception(
@@ -826,7 +827,7 @@ class Kernel(object):
                 A(ar.bound_action.full_name())
                 A(obj2str(ar.master_instance))
                 A(obj2str(ar.selected_rows))
-                # A(format_request(ar.request))
+                A(format_request(ar.request))
                 ar.logger.info("run_action {0}".format(" ".join(flds)))
                 # logger.info("run_action {0}".format(ar))
         # if str(a) != 'grid_put':
@@ -909,8 +910,6 @@ class Kernel(object):
         #     logger.info("STATIC_ROOT does not exist: %s", settings.STATIC_ROOT)
         #     return 0
         fn = self.site.media_root / fn
-        # fn = join(settings.STATIC_ROOT, fn)
-        # fn = join(self.site.site_dir, fn)
         if not force and not self._must_build and fn.exists():
             mtime = os.stat(fn).st_mtime
             if mtime > self.code_mtime:
@@ -930,7 +929,7 @@ class Kernel(object):
         if verbosity > 1:
             logger.info("Building %s ...", fn)
 
-        self.site.makedirs_if_missing(dirname(fn))
+        self.site.makedirs_if_missing(fn.parent)
         f = codecs.open(fn, "w", encoding="utf-8")
         try:
             write(f)

lino/core/model.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2009-2022 Rumma & Ko Ltd
+# Copyright 2009-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """Defines the :class:`Model` class.
 
@@ -20,6 +20,7 @@ from django.db.models.signals import pre_delete
 from django.utils.text import format_lazy
 
 from lino.utils.html import E, forcetext, tostring, join_elems
+from lino.utils.soup import sanitize
 
 from lino.core import fields
 from lino.core import signals
@@ -36,30 +37,20 @@ from .workflows import ChangeStateAction
 from .requests import ActionRequest, sliced_data_iterator
 from .tables import AbstractTable
 
-try:
-    import bleach
-except ImportError:
-    bleach = None
-
 
 class Model(models.Model, fields.TableRow):
+
     class Meta(object):
         abstract = True
 
     allow_cascaded_copy = frozenset()
     allow_cascaded_delete = frozenset()
-
     grid_post = actions.CreateRow()
     submit_insert = actions.SubmitInsert()
-
     allow_merge_action = False
-
     master_data_fields = None
-
     show_in_site_search = True
-
     quick_search_fields = None
-
     quick_search_fields_digit = None
 
     active_fields = frozenset()
@@ -87,10 +78,6 @@ class Model(models.Model, fields.TableRow):
     Internally used by :mod:`lino.modlib.changes`.
     """
 
-    # disable_create_choice = False
-    # """Whether to disable any automatic creation by learning choosers.
-    # """
-
     _lino_tables = []
     _bleached_fields = []
 
@@ -308,8 +295,7 @@ class Model(models.Model, fields.TableRow):
             if isinstance(f, RichTextField):
                 if f.editable and (
                     f.bleached is True
-                    or f.bleached is None
-                    and settings.SITE.textfield_bleached
+                    or f.bleached is None and settings.SITE.textfield_bleached
                 ):
                     bleached_fields.append(f)
         cls._bleached_fields = tuple(bleached_fields)
@@ -428,27 +414,24 @@ class Model(models.Model, fields.TableRow):
             setattr(self, f.name, new)
 
     def fields_to_bleach(self):
-        if bleach:
-            for f in self._bleached_fields:
-                old = getattr(self, f.name)
-                if old is None:
-                    continue
-                # print("20190626", self, f, old)
-                if not old.startswith("<"):
-                    continue
-                try:
-                    new = bleach.clean(
-                        old,
-                        tags=settings.SITE.bleach_allowed_tags,
-                        attributes=settings.SITE.bleach_allowed_attributes,
-                        strip=True,
-                    )
-                except TypeError as e:
-                    logger.warning("Could not bleach %r : %s (%s)", old, e, self)
-                    continue
-                if old != new:
-                    logger.debug("Bleaching %s from %r to %r", f.name, old, new)
-                    yield f, old, new
+        for f in self._bleached_fields:
+            old = getattr(self, f.name)
+            if old is None:
+                continue
+            new = sanitize(old)
+            # try:
+            #     new = bleach.clean(
+            #         new,
+            #         tags=settings.SITE.bleach_allowed_tags,
+            #         attributes=settings.SITE.bleach_allowed_attributes,
+            #         strip=True,
+            #     )
+            # except TypeError as e:
+            #     logger.warning("Could not bleach %r : %s (%s)", old, e, self)
+            #     continue
+            if old != new:
+                logger.debug("Bleaching %s from %r to %r", f.name, old, new)
+                yield f, old, new
 
     updatable_panels = None
 
@@ -959,11 +942,14 @@ LINO_MODEL_ATTRIBS = (
     "hidden_elements",
     "get_simple_parameters",
     "get_request_queryset",
+    "get_request_words",
     "get_title_tags",
     "get_default_table",
     "get_default_table",
     "get_layout_aliases",
     "edge_ngram_field",
+    "as_str",
+    "get_str_words",
     "as_summary_item",
     "as_paragraph",
     "as_page",

lino/core/renderer.py

@@ -197,7 +197,7 @@ class HtmlRenderer(Renderer):
         import rstgen
 
         if display_mode == constants.DISPLAY_MODE_CARDS:
-            layout = ar.actor.card_layout or ar.actor.list_layout
+            layout = ar.actor.card_layout # or ar.actor.list_layout
             lh = layout.get_layout_handle()
         else:
             lh = ar.bound_action.get_layout_handel()
@@ -506,8 +506,7 @@ class HtmlRenderer(Renderer):
 
         """
         if text is None:
-            # text = (force_str(obj),)
-            text = (str(obj),)
+            text = (obj.as_str(ar), )
         elif isinstance(text, str) or iselement(text):
             text = (text,)
         url = self.obj2url(ar, obj)
@@ -1264,7 +1263,7 @@ class JsCacheRenderer(JsRenderer):
             # if res.parameters is not None:
             add(res, self.param_panels, res.params_layout, "%s.ParamsPanel" % res)
             add(res, self.other_panels, res.card_layout, "%s.CardsPanel" % res)
-            add(res, self.other_panels, res.list_layout, "%s.ItemsPanel" % res)
+            # add(res, self.other_panels, res.list_layout, "%s.ItemsPanel" % res)
 
             for ba in res.get_actions():
                 if ba.action.parameters: