lino 24.11.1__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.1'
+__version__ = '25.1.0'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

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`."""
 
@@ -443,8 +446,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
 
     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
@@ -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/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,13 +1366,24 @@ 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):
@@ -1710,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]
@@ -1732,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
 
@@ -1757,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/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)
 
@@ -827,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':
@@ -910,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:
@@ -931,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.
 
@@ -37,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()
@@ -88,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 = []
 
@@ -956,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

@@ -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)

lino/core/requests.py

@@ -81,6 +81,26 @@ Subject: {subject}
 def noop(ar):
     return ar.success(gettext("Aborted"))
 
+def mi2bp(master_instance, bp):
+    if master_instance is not None:
+        if isinstance(master_instance, (models.Model, TableRow)):
+            bp[constants.URL_PARAM_MASTER_PK] = master_instance.pk
+            if ContentType is not None and isinstance(
+                master_instance, models.Model
+            ):
+                assert not master_instance._meta.abstract
+                mt = ContentType.objects.get_for_model(
+                    master_instance.__class__).pk
+                bp[constants.URL_PARAM_MASTER_TYPE] = mt
+            # else:
+            #     logger.warning("20141205 %s %s",
+            #                    self.master_instance,
+            #                    ContentType)
+        else:  # if self.master is None:
+            # e.g. in accounting.MovementsByMatch the master is a `str`
+            bp[constants.URL_PARAM_MASTER_PK] = master_instance
+            # raise Exception("No master key for {} {!r}".format(
+            #     self.master_instance.__class__, self.master_instance))
 
 class StringLogger(logging.Logger):
     # Instantiated by BaseRequest.capture_logger()
@@ -152,7 +172,7 @@ class ValidActionResponses(object):
 
     no_data_text = None
     title = None
-    """The dynamic title to give to the window or component which shows this response.
+    """The dynamic title to give to the window or component that shows this response.
     TODO: is this still being used?
     """
 
@@ -308,7 +328,7 @@ class BaseRequest:
     action_param_values = None
     param_values = None
     bound_action = None
-    known_values = {}
+    known_values = None
     no_data_text = _("No data to display")
     is_on_main_actor = True
     permalink_uris = False
@@ -317,6 +337,7 @@ class BaseRequest:
     master_instance = None
     request = None
     selected_rows = []
+    obvious_fields = None
     order_by = None
     filter = None
     gridfilters = None,
@@ -336,11 +357,19 @@ class BaseRequest:
         parent=None,
         is_on_main_actor=True,
         permalink_uris=None,
+        known_values=None,
+        obvious_fields=None,
         **kw
     ):
         self.response = dict()
+        self.obvious_fields = set()
+        if obvious_fields is not None:
+            self.obvious_fields |= obvious_fields
         # if str(kw.get('actor', None)) == "cal.EntriesByController":
         # if kw.get('actor', None):
+
+        self.known_values = dict()
+
         if request is not None:
             assert parent is None
             self.request = request
@@ -361,9 +390,11 @@ class BaseRequest:
                         raise Exception("%s : %s is None" % (kw, k))
                 else:
                     kw[k] = getattr(parent, k)
-            kv = kw.setdefault("known_values", {})
-            if parent.actor is self.actor:
-                kv.update(parent.known_values)
+            # kv = kw.setdefault("known_values", {})
+            if parent.actor is not None and parent.actor is self.actor:
+                kw['param_values'] = parent.param_values
+                if parent.known_values is not None:
+                    self.known_values.update(parent.known_values)
             # kw.setdefault('user', parent.user)
             # kw.setdefault('subst_user', parent.subst_user)
             # kw.setdefault('renderer', parent.renderer)
@@ -382,10 +413,27 @@ class BaseRequest:
         self.is_on_main_actor = is_on_main_actor
         self.permalink_uris = permalink_uris
 
+        if known_values is not None:
+            self.known_values.update(known_values)
+
         self.setup(**kw)
 
         # print("20241101", self.__class__.__name__, self.show_urls)
 
+        self.obvious_fields |= set(self.known_values.keys())
+
+        if self.actor is not None:
+
+            for k, v in self.actor.known_values.items():
+                self.known_values.setdefault(k, v)
+
+            self.obvious_fields |= self.actor.obvious_fields
+                # self.obvious_fields.update(obvious_fields.split())
+            # if parent.obvious_fields is not None:
+            if parent is not None and parent.actor is self.actor and parent.obvious_fields:
+                self.obvious_fields |= parent.obvious_fields
+            self.obvious_fields.add(self.actor.master_key)
+
         if self.master is not None and settings.SITE.strict_master_check:
             if self.master_instance is None:
                 raise exceptions.BadRequest(
@@ -414,7 +462,6 @@ class BaseRequest:
         requesting_panel=None,
         renderer=None,
         xcallback_answers=None,
-        known_values={},
         show_urls=None,
         quick_search=None,
         order_by=None,
@@ -1118,14 +1165,17 @@ class BaseRequest:
         an obvious value.
 
         """
-        if name in self.known_values:
-            return True
-        # if self.param_values is not None and name in self.param_values:
+        return name in self.obvious_fields
+        # if name in self.known_values:
         #     return True
-        if self.actor is not None:
-            if self.actor.master_key == name:
-                return True
-        return False
+        # # if self.param_values is not None and name in self.param_values:
+        # #     return True
+        # if self.actor is not None:
+        #     if self.actor.master_key == name:
+        #         return True
+        #     if name in self.actor.obvious_fields:
+        #         return True
+        # return False
 
     def get_user(self):
         """
@@ -1328,10 +1378,8 @@ class BaseRequest:
         return self.renderer.obj2url(self, *args, **kwargs)
 
     def obj2html(self, obj, text=None, **kwargs):
-        """
-        Return a clickable HTML element that points to a detail view of the
-        given database object.
-        """
+        # Return a clickable HTML element that points to a detail view of the
+        # given database object.
         if obj is None:
             return ""
         return self.renderer.obj2html(self, obj, text, **kwargs)
@@ -1690,7 +1738,6 @@ class ActionRequest(BaseRequest):
 
     def setup(
         self,
-        known_values=None,
         param_values=None,
         action_param_values={},
         offset=None,
@@ -1719,12 +1766,7 @@ class ActionRequest(BaseRequest):
         assert self.actor is not None
         request = self.request
 
-        kv = dict()
-        for k, v in self.actor.known_values.items():
-            kv.setdefault(k, v)
-        if known_values:
-            kv.update(known_values)
-        self.known_values = kv
+        self.actor.setup_request(self)
 
         if self.actor.parameters is not None:
             pv = self.actor.param_defaults(self)
@@ -1802,8 +1844,6 @@ class ActionRequest(BaseRequest):
             self.set_action_param_values(**action_param_values)
         self.bound_action.setup_action_request(self)
 
-        self.actor.setup_request(self)
-
         # if str(self.actor) == 'outbox.MyOutbox':
         #     if self.master_instance is None:
         #         raise Exception("20230426 b {}".format(self.master))
@@ -1875,6 +1915,8 @@ class ActionRequest(BaseRequest):
         if target is None:
             target = self.actor
         if self._insert_sar is None:
+            if target.insert_action is None:
+                raise Exception(f"20241212 {target} has no insert_action")
             self._insert_sar = target.insert_action.request_from(self)
         else:
             assert self._insert_sar.actor is target
@@ -2108,26 +2150,7 @@ class ActionRequest(BaseRequest):
             for k, v in self.known_values.items():
                 if self.actor.known_values.get(k, None) != v:
                     bp[k] = v
-        if self.master_instance is not None:
-            if isinstance(self.master_instance, (models.Model, TableRow)):
-                bp[constants.URL_PARAM_MASTER_PK] = self.master_instance.pk
-                if ContentType is not None and isinstance(
-                    self.master_instance, models.Model
-                ):
-                    assert not self.master_instance._meta.abstract
-                    mt = ContentType.objects.get_for_model(
-                        self.master_instance.__class__
-                    ).pk
-                    bp[constants.URL_PARAM_MASTER_TYPE] = mt
-                # else:
-                #     logger.warning("20141205 %s %s",
-                #                    self.master_instance,
-                #                    ContentType)
-            else:  # if self.master is None:
-                # e.g. in accounting.MovementsByMatch the master is a `str`
-                bp[constants.URL_PARAM_MASTER_PK] = self.master_instance
-                # raise Exception("No master key for {} {!r}".format(
-                #     self.master_instance.__class__, self.master_instance))
+        mi2bp(self.master_instance, bp)
         self._status = kw
         return kw
 
@@ -2421,7 +2444,7 @@ class ActionRequest(BaseRequest):
             oh = ar.actor.override_column_headers(ar)
             if oh:
                 for i, e in enumerate(columns):
-                    header = oh.get(e.name, None)
+                    header = oh.get(e, None)
                     if header is not None:
                         headers[i] = header
                 # ~ print 20120507, oh, headers

lino/core/site.py

@@ -2165,7 +2165,7 @@ class Site(object):
     site_prefix = "/"
     """The string to prefix to every URL of the Lino web interface.
 
-    This must *start and end with a *slash*.  Default value is
+    This must *start and end* with a *slash*.  Default value is
     ``'/'``.
 
     This must be set if your project is not being served at the "root"

lino/core/tables.py

@@ -521,22 +521,6 @@ method in order to sort the rows of the queryset.
             return cls.detail_action
         return actions.ShowTable()
 
-    @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_actor_editable(self):
         if self._editable is None:

lino/help_texts.py

@@ -323,8 +323,10 @@ help_texts = {
     'lino.core.model.Model.allow_cascaded_delete' : _("""A set of names of ForeignKey or GenericForeignKey fields of this model that allow for cascaded delete."""),
     'lino.core.model.Model.disabled_fields' : _("""Return a set of field names that should be disabled (i.e. not editable) for this database object."""),
     'lino.core.model.Model.__str__' : _("""Return a translatable text that describes this database row."""),
-    'lino.core.model.Model.as_paragraph' : _("""Return a safe HTML string that represents this database row as a paragraph."""),
+    'lino.core.model.Model.as_str' : _("""Return a translatable text that describes this database row. Unlike __str__() this method gets an action request when it is called, so it knows the context."""),
+    'lino.core.model.Model.get_str_words' : _("""Yield a series of words that describe this database row in plain text."""),
     'lino.core.model.Model.as_summary_item' : _("""Return a HTML element that represents this database row in a data window in display mode “summary”."""),
+    'lino.core.model.Model.as_paragraph' : _("""Return a safe HTML string that represents this database row as a paragraph."""),
     '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."""),
@@ -377,7 +379,7 @@ help_texts = {
     'lino.modlib.linod.SystemTask.log_level' : _("""The logging level to apply when running this task."""),
     'lino.modlib.linod.SystemTask.run' : _("""Performs a routine job."""),
     'lino.modlib.linod.SystemTasks' : _("""The default actor for the SystemTask model."""),
-    'lino.modlib.periods.StoredYear' : _("""The Django model used to store an fiscal year."""),
+    'lino.modlib.periods.StoredYear' : _("""The Django model used to store a fiscal year."""),
     'lino.modlib.periods.StoredPeriod' : _("""The Django model used to store an accounting period."""),
     'lino.modlib.periods.StoredYears' : _("""The fiscal years defined in this database."""),
     'lino.modlib.periods.StoredPeriods' : _("""The accounting periods defined in this database."""),
@@ -689,7 +691,6 @@ help_texts = {
     'lino.modlib.uploads.UploadController.show_uploads' : _("""Opens a data window with the uploaded files associated to this database object."""),
     'lino.modlib.uploads.UploadsByController' : _("""Shows the uploaded files associated to this database object."""),
     'lino.modlib.uploads.Shortcuts' : _("""The list of available upload shortcut fields in this application."""),
-    'lino.modlib.uploads.Previewers' : _("""An abstract choicelist of the previewers that are available on this site."""),
     'lino.modlib.uploads.UploadsFolderChecker' : _("""Find orphaned files in uploads folder."""),
     'lino.modlib.weasyprint.WeasyBuildMethod' : _("""The base class for both build methods."""),
     'lino.modlib.weasyprint.WeasyHtmlBuildMethod' : _("""Renders the input template and returns the unmodified output as plain HTML."""),