lino 25.4.0__tar.gz → 25.4.2__tar.gz

{lino-25.4.0 → lino-25.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.4.0
+Version: 25.4.2
 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.0 → lino-25.4.2}/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.0'
+__version__ = '25.4.2'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

{lino-25.4.0 → lino-25.4.2}/lino/api/dd.py

@@ -155,7 +155,7 @@ from lino.utils import IncompleteDate, read_exception
 
 from lino.utils.format_date import fdm, fdl, fdf, fdmy
 from lino.utils.format_date import fds as fds_
-from lino.utils.format_date import ftl, ftf
+from lino.utils.format_date import fdtl, fdtf
 
 
 def fds(d):
@@ -175,14 +175,8 @@ field2kw = settings.SITE.field2kw
 decfmt = settings.SITE.decfmt
 str2kw = settings.SITE.str2kw
 str2dict = settings.SITE.str2dict
-
-
-def today(*args, **kwargs):
-    # make it serializable for Django migrations
-    return settings.SITE.today(*args, **kwargs)
-
-
-# today = settings.SITE.today
+now = settings.SITE.now
+# today = settings.SITE.today  # see below
 strftime = settings.SITE.strftime
 demo_date = settings.SITE.demo_date
 is_abstract_model = settings.SITE.is_abstract_model
@@ -190,7 +184,6 @@ is_installed = settings.SITE.is_installed
 is_hidden_plugin = settings.SITE.is_hidden_plugin
 resolve_plugin = settings.SITE.resolve_plugin
 get_plugin_setting = settings.SITE.get_plugin_setting
-# get_db_overview_rst = settings.SITE.get_db_overview_rst
 add_welcome_handler = settings.SITE.add_welcome_handler
 build_media_url = settings.SITE.build_media_url
 build_site_cache_url = settings.SITE.build_site_cache_url
@@ -203,6 +196,11 @@ plugins = settings.SITE.plugins
 format_currency = settings.SITE.format_currency
 
 
+def today(*args, **kwargs):
+    # make it serializable for Django migrations
+    return settings.SITE.today(*args, **kwargs)
+
+
 get_language = translation.get_language
 
 

{lino-25.4.0 → lino-25.4.2}/lino/core/dbtables.py

@@ -613,7 +613,7 @@ class Table(AbstractTable):
                 qs = qs.filter(**kw)
 
             if ar.exclude:
-                qs = qs.exclude(**ar.exclude)
+                qs = qs.exclude(ar.exclude)
                 # qs = qs.exclude(ar.exclude)
 
             if ar.param_values is not None:
@@ -654,8 +654,7 @@ class Table(AbstractTable):
                     qs = qs.filter(**d)
 
             if self.exclude:
-                qs = qs.exclude(**self.exclude)
-                # TODO: use Q object instead of dict
+                qs = qs.exclude(self.exclude)
 
             if ar.quick_search:
                 qs = self.add_quick_search_filter(qs, ar.quick_search)

{lino-25.4.0 → lino-25.4.2}/lino/core/fields.py

@@ -6,6 +6,8 @@ Defines extended database field classes and utility functions
 related to fields.
 """
 
+#fmt: off
+
 from lino import logger
 import datetime
 from decimal import Decimal
@@ -112,10 +114,10 @@ class PercentageField(models.DecimalField):
         defaults = dict(
             max_length=5,
             max_digits=5,
-            decimal_places=2,
+            decimal_places=0,
         )
         defaults.update(kwargs)
-        super(PercentageField, self).__init__(*args, **defaults)
+        super().__init__(*args, **defaults)
 
 
 class TimeField(models.TimeField):
@@ -818,7 +820,7 @@ def virtualfield(return_type, **kwargs):
 
     def decorator(fn):
         if isinstance(return_type, DummyField):
-            rv = DummyField(fn)
+            rv = DummyField(return_type.get_default())
         else:
             rv = VirtualField(return_type, fn, **kwargs)
         rv.__doc__ = fn.__doc__
@@ -1001,10 +1003,8 @@ class QuantityField(models.CharField):
             if self.overflow_value:
                 return self.overflow_value
             raise ValidationError(
-                "Cannot accept quantity {} " "because max_length is {}".format(
-                    raw_value, self.max_length
-                )
-            )
+                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)
@@ -1111,8 +1111,20 @@ class Dummy(object):
 class DummyField(FakeField):
     """
     Represents a field that doesn't exist in the current configuration
-    but might exist in other configurations. The "value" of a
-    DummyField is always `None`.
+    but might exist in other configurations.
+
+    The "value" of a DummyField is always `None` or any other value to be
+    optionally specified at instantiation.
+
+    .. attribute:: dummy_value
+
+        The value to be returned by this field. Default value is `None`.
+
+    Usage examples:
+
+    - The value of :attr:`lino.modlib.users.User.nickname` is always ``""`` when
+      :data:`lino.modlib.users.with_nickname` is `False`.
+
 
     See e.g. :func:`ForeignKey` and :func:`fields_list`.
     """
@@ -1120,8 +1132,9 @@ class DummyField(FakeField):
     # choices = []
     # primary_key = False
 
-    def __init__(self, *args, **kw):
-        pass
+    def __init__(self, dummy_value=None):
+        super().__init__()
+        self.dummy_value = dummy_value
 
     # def __init__(self, name, *args, **kw):
     #     self.name = name
@@ -1132,10 +1145,10 @@ class DummyField(FakeField):
     def __get__(self, instance, owner):
         if instance is None:
             return self
-        return None
+        return self.dummy_value
 
     def get_default(self):
-        return None
+        return self.dummy_value
 
     def contribute_to_class(self, cls, name):
         self.name = name
@@ -1548,10 +1561,12 @@ def pointer_factory(cls, othermodel, *args, **kw):
 
     """
     if othermodel is None:
-        return DummyField(othermodel, *args, **kw)
+        # return DummyField(othermodel, *args, **kw)
+        return DummyField(None)
     if isinstance(othermodel, str):
         if not settings.SITE.is_installed_model_spec(othermodel):
-            return DummyField(othermodel, *args, **kw)
+            # return DummyField(othermodel, *args, **kw)
+            return DummyField(None)
 
     kw.setdefault("on_delete", models.CASCADE)
     return cls(othermodel, *args, **kw)

{lino-25.4.0 → lino-25.4.2}/lino/core/kernel.py

@@ -41,7 +41,7 @@ from django.db import models
 
 # import lino  # for is_testing
 from lino import logger
-from lino.utils import codetime
+# from lino.utils import codetime
 from lino.utils.html import E
 # from lino.core.utils import format_request
 # from lino.utils import isiterable
@@ -111,22 +111,21 @@ class Kernel(object):
         self.GFK_LIST = []
         # logger.info("20140227 Kernel.__init__() done")
 
-    _code_mtime = None
-    _lino_version = None
-
-    @property
-    def code_mtime(self):
-        if self._code_mtime is None:
-            # packages = [os.environ['DJANGO_SETTINGS_MODULE'], 'lino']
-            # self._code_mtime = codetime(*packages)
-            if self.site.developer_site_cache:
-                self._code_mtime = codetime()
-            else:
-                # On a production server we test only the timestamp of
-                # settings.py file because otherwise the result can differ
-                # depending on which modules have already been imported.
-                self._code_mtime = codetime(settings.SETTINGS_MODULE)
-        return self._code_mtime
+    # _code_mtime = None
+    #
+    # @property
+    # def code_mtime(self):
+    #     if self._code_mtime is None:
+    #         # packages = [os.environ['DJANGO_SETTINGS_MODULE'], 'lino']
+    #         # self._code_mtime = codetime(*packages)
+    #         if self.site.developer_site_cache:
+    #             self._code_mtime = codetime()
+    #         else:
+    #             # On a production server we test only the timestamp of
+    #             # settings.py file because otherwise the result can differ
+    #             # depending on which modules have already been imported.
+    #             self._code_mtime = codetime(settings.SETTINGS_MODULE)
+    #     return self._code_mtime
 
     def kernel_startup(self, site):
         """This is a part of a Lino site startup.  The Django Model
@@ -908,7 +907,7 @@ class Kernel(object):
         self._must_build = True
 
     def make_cache_file(self, fn, write, force=False, verbosity=1):
-        """Make the specified cache file.  This is used internally at server
+        """Make the specified cache file.  This is used internally at site
         startup.
 
         """
@@ -919,7 +918,8 @@ class Kernel(object):
         fn = self.site.media_root / fn
         if not force and not self._must_build and fn.exists():
             mtime = os.stat(fn).st_mtime
-            if mtime > self.code_mtime:
+            # if mtime > self.code_mtime:
+            if mtime > self.site.lino_version:
                 # logger.debug("%s (%s) is up to date.", fn, time.ctime(mtime))
                 return 0
 

{lino-25.4.0 → lino-25.4.2}/lino/core/requests.py

@@ -829,7 +829,7 @@ class BaseRequest:
             unicode=str,  # backwards-compatibility. In new templates
             # you should prefer `str`.
             pgettext=pgettext,
-            now=timezone.now(),
+            now=dd.now(),
             getattr=getattr,
             restify=restify,
             activate_language=activate,
@@ -1805,6 +1805,8 @@ class ActionRequest(BaseRequest):
         selected_rows=None,
         **kw
     ):
+        if exclude is not None:
+            assert isinstance(exclude, models.Q)
         if title is not None:
             self.title = title
         if offset is not None:
@@ -1908,7 +1910,11 @@ class ActionRequest(BaseRequest):
         #         raise Exception("20230426 b {}".format(self.master))
 
         if issubclass(self.actor, AbstractTable):
-
+            if self.actor.exclude is not None:
+                if not isinstance(self.actor.exclude, models.Q):
+                    raise Exception(
+                        f"{self.actor}.exclude must be a Q object",
+                        f" not {self.actor.exclude}")
             self.exclude = exclude or self.actor.exclude
             self.page_length = self.actor.page_length
 
@@ -2019,8 +2025,7 @@ class ActionRequest(BaseRequest):
             # often and since exception loggers usually send an email to the
             # local system admin, make sure to log each exception only once.
             e = str(e)
-            self.no_data_text = f"{e} (set catch_layout_exceptions to see \
-                details)"
+            self.no_data_text = e + " (set catch_layout_exceptions to see details)"
             self._data_iterator = []
             w = WARNINGS_LOGGED.get(e)
             if w is None:
@@ -2042,8 +2047,18 @@ class ActionRequest(BaseRequest):
                     self._data_iterator, self)
             )
         else:
+            offset = self.offset
+
+            if self.actor.start_at_bottom and offset is None and self.limit is not None:
+                count = self.get_total_count()
+                if not self.actor.no_phantom_row:
+                    count += 1
+                offset = (count // self.limit) * self.limit
+                if (count % self.limit) == 0 and count != 0:
+                    offset -= self.limit
+
             self._sliced_data_iterator = sliced_data_iterator(
-                self._data_iterator, self.offset, self.limit
+                self._data_iterator, offset, self.limit
             )
         # logger.info("20171116 executed : %s", self._sliced_data_iterator)
 
@@ -2069,11 +2084,11 @@ class ActionRequest(BaseRequest):
         assert issubclass(self.actor, AbstractTable)
         self.actor.check_params(self.param_values)
         if self.actor.get_data_rows is not None:
-            l = []
+            lst = []
             for row in self.actor.get_data_rows(self):
                 group = self.actor.group_from_row(row)
-                group.process_row(l, row)
-            return l
+                group.process_row(lst, row)
+            return lst
         # ~ logger.info("20120914 tables.get_data_iterator %s",self)
         # ~ logger.info("20120914 tables.get_data_iterator %s",self.actor)
         # print("20181121 get_data_iterator", self.actor)
@@ -2145,7 +2160,7 @@ class ActionRequest(BaseRequest):
         if self.known_values:
             # kw.update(self.known_values)
             for k, v in self.known_values.items():
-                if not "__" in k:
+                if "__" not in k:
                     kw[k] = v
         obj = self.actor.create_instance(self, **kw)
         return obj

{lino-25.4.0 → lino-25.4.2}/lino/core/site.py

@@ -3,23 +3,8 @@
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 # doctest lino/core/site.py
 
-from lino.core.exceptions import ChangedAPI
-from django.apps import apps
-from lino.utils.html import E, tostring
-from lino import assert_django_code, DJANGO_DEFAULT_LANGUAGE
-# from lino.core import constants
-from lino.core.plugin import Plugin
-from rstgen.confparser import ConfigParser
-from django.utils import translation
-from django.utils.html import mark_safe
-from django.utils.translation import get_language
-from django.utils.translation import gettext_lazy as _
-from django.conf import settings
-import rstgen
-from lino.utils import AttrDict, date_offset, i2d, buildurl
-from lino import logger, __version__
 from importlib.util import find_spec
-from importlib import import_module, reload
+from importlib import import_module
 from pathlib import Path
 import os
 import re
@@ -34,6 +19,22 @@ import logging
 # from pprint import pprint
 from logging.handlers import SocketHandler
 import time
+import rstgen
+from rstgen.confparser import ConfigParser
+from django.apps import apps
+from django.utils import timezone
+from django.utils import translation
+from django.utils.html import mark_safe
+from django.utils.translation import get_language
+from django.utils.translation import gettext_lazy as _
+from django.conf import settings
+from lino import assert_django_code, DJANGO_DEFAULT_LANGUAGE
+from lino import logger, __version__
+from lino.core.exceptions import ChangedAPI
+from lino.utils.html import E, tostring
+# from lino.core import constants
+from lino.core.plugin import Plugin
+from lino.utils import AttrDict, date_offset, i2d, buildurl
 
 NO_REMOTE_AUTH = True
 # 20240518 We have only one production site still using remote http
@@ -558,17 +559,18 @@ class Site(object):
                     break
 
         if self.master_site is None:
-            cache_root = os.environ.get("LINO_CACHE_ROOT", None)
-            if cache_root:
-                # TODO: deprecate
-                cr = Path(cache_root).absolute()
-                if not cr.exists():
-                    msg = "LINO_CACHE_ROOT ({0}) does not exist!".format(cr)
-                    raise Exception(msg)
-                self.site_dir = (cr / self.project_name).resolve()
-                self.setup_cache_directory()
-            else:
-                self.site_dir = self.project_dir
+            # cache_root = os.environ.get("LINO_CACHE_ROOT", None)
+            # if cache_root:
+            #     # TODO: deprecate
+            #     cr = Path(cache_root).absolute()
+            #     if not cr.exists():
+            #         msg = "LINO_CACHE_ROOT ({0}) does not exist!".format(cr)
+            #         raise Exception(msg)
+            #     self.site_dir = (cr / self.project_name).resolve()
+            #     self.setup_cache_directory()
+            # else:
+            #     self.site_dir = self.project_dir
+            self.site_dir = self.project_dir
             db = self.get_database_settings()
             if db is not None:
                 self.django_settings.update(DATABASES=db)
@@ -987,11 +989,12 @@ class Site(object):
         self.update_settings(MEDIA_URL="/media/")
 
         if not "STATIC_ROOT" in self.django_settings:
-            cache_root = os.environ.get("LINO_CACHE_ROOT", None)
-            if cache_root:
-                p = Path(cache_root)
-            else:
-                p = self.site_dir
+            # cache_root = os.environ.get("LINO_CACHE_ROOT", None)
+            # if cache_root:
+            #     p = Path(cache_root)
+            # else:
+            #     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:
             self.update_settings(STATIC_URL="/static/")
@@ -1142,40 +1145,40 @@ class Site(object):
 
         # print(20150331, self.django_settings['FIXTURE_DIRS'])
 
-    def setup_cache_directory(self):
-        stamp = self.site_dir / "lino_cache.txt"
-        this = class2str(self.__class__)
-        if stamp.exists():
-            other = stamp.read_file()
-            if other == this:
-                ok = True
-            else:
-                ok = False
-                for parent in self.__class__.__mro__:
-                    if other == class2str(parent):
-                        ok = True
-                        break
-            if not ok:
-                # Can happen e.g. when `python -m lino.hello` is
-                # called.  in certain conditions.
-                msg = (
-                    "Cannot use {site_dir} for {this} "
-                    "because it is used for {other}. (Settings {settings})"
-                )
-                msg = msg.format(
-                    site_dir=self.site_dir,
-                    this=this,
-                    settings=self.django_settings.get("SETTINGS_MODULE"),
-                    other=other,
-                )
-                if True:
-                    raise Exception(msg)
-                else:
-                    # print(msg)
-                    self.site_dir = None
-        else:
-            self.makedirs_if_missing(self.site_dir)
-            stamp.write_file(this)
+    # def setup_cache_directory(self):
+    #     stamp = self.site_dir / "lino_cache.txt"
+    #     this = class2str(self.__class__)
+    #     if stamp.exists():
+    #         other = stamp.read_file()
+    #         if other == this:
+    #             ok = True
+    #         else:
+    #             ok = False
+    #             for parent in self.__class__.__mro__:
+    #                 if other == class2str(parent):
+    #                     ok = True
+    #                     break
+    #         if not ok:
+    #             # Can happen e.g. when `python -m lino.hello` is
+    #             # called.  in certain conditions.
+    #             msg = (
+    #                 "Cannot use {site_dir} for {this} "
+    #                 "because it is used for {other}. (Settings {settings})"
+    #             )
+    #             msg = msg.format(
+    #                 site_dir=self.site_dir,
+    #                 this=this,
+    #                 settings=self.django_settings.get("SETTINGS_MODULE"),
+    #                 other=other,
+    #             )
+    #             if True:
+    #                 raise Exception(msg)
+    #             else:
+    #                 # print(msg)
+    #                 self.site_dir = None
+    #     else:
+    #         self.makedirs_if_missing(self.site_dir)
+    #         stamp.write_file(this)
 
     def set_user_model(self, spec):
         # if self.user_model is not None:
@@ -1384,6 +1387,11 @@ class Site(object):
             )
         return date_offset(base, *args, **kwargs)
 
+    def now(self, *args, **kwargs):
+        t = self.today()
+        now = timezone.now()
+        return now.replace(year=t.year, month=t.month, day=t.day)
+
     def welcome_text(self):
         return "This is %s using %s." % (self.site_version(), self.using_text())
 
@@ -2004,6 +2012,17 @@ class Site(object):
         s = self.plugins.jinja.render_from_ar(ar, "admin_main.html", **context)
         return mark_safe(s)
 
+    _lino_version = None
+
+    @property
+    def lino_version(self):
+        p = self.site_dir / "lino_version.txt"
+        if self._lino_version is None:
+            if not p.exists():
+                p.touch()
+            self._lino_version = p.stat().st_mtime
+        return self._lino_version
+
     def build_site_cache(self, force=False, later=False, verbosity=1):
         from lino.modlib.users.utils import with_user_profile
         from lino.modlib.users.choicelists import UserTypes
@@ -2011,10 +2030,12 @@ class Site(object):
         # if not self.is_prepared:
         #     self.prepare_layouts()
         #     self.is_prepared = True
+        # settings_file = self.django_settings.get("__file__")
+        # Path(settings_file).touch()
+        p = self.site_dir / "lino_version.txt"
+        p.touch()
 
         if later:
-            settings_file = self.django_settings.get("__file__")
-            Path(settings_file).touch()
             # print("20230823 later")
             return
 
@@ -2067,6 +2088,18 @@ class Site(object):
                 time.time() - started,
             )
 
+    _top_link_generator = []
+
+    def get_top_links(self, ar):
+        messages = []
+        for l in self._top_link_generator:
+            for msg in l(ar):
+                messages.append(msg)
+        return tostring(E.div(*messages))
+
+    def add_top_link_generator(self, func):
+        self._top_link_generator.append(func)
+
     def get_welcome_messages(self, ar):
         for h in self._welcome_handlers:
             for msg in h(ar):

{lino-25.4.0 → lino-25.4.2}/lino/core/tables.py

@@ -1,12 +1,10 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2009-2024 Rumma & Ko Ltd
+# Copyright 2009-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """Defines the classes :class:`AbstractTable` and
 :class:`VirtualTable`.
 
 """
-from lino import logger
-from future.utils import with_metaclass
 
 import os
 import yaml
@@ -15,8 +13,9 @@ from django.db import models
 from django.db.utils import OperationalError, ProgrammingError
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
-from django.core.exceptions import BadRequest
+# from django.core.exceptions import BadRequest
 
+from lino import logger
 from lino.core import actors
 from lino.core import actions
 from lino.core import fields
@@ -191,17 +190,15 @@ class AbstractTable(actors.Actor):
     will not pop-in.
     """
 
-    # start_at_bottom = False
-    # """Set this to `True` if you want your table to *start at the
-    # bottom*.  Unlike reverse ordering, the rows remain in their
-    # natural order, but when we open a grid on this table, we want it
-    # to start on the last page.
-    #
-    # Use cases would be :class:`lino_xl.lib.trading.InvoicesByJournal` and
-    # :class:`lino_xl.lib.accounting.InvoicesByJournal` but the result is not yet
-    # satisfying.
-    #
-    # """
+    start_at_bottom = False
+    """Set this to `True` if you want your table to *start at the
+    bottom*.  Unlike reverse ordering, the rows remain in their
+    natural order, but when we open a grid on this table, we want it
+    to start on the last page.
+
+    Use cases are in :class:`lino_xl.lib.trading.InvoicesByJournal` and
+    :class:`lino_xl.lib.accounting.InvoicesByJournal`.
+    """
 
     group_by = None
     """
@@ -397,21 +394,20 @@ method in order to sort the rows of the queryset.
     """
 
     filter = None
-    """If specified, this must be a `models.Q` object (not a dict of
-    (fieldname -> value) pairs) which will be passed to Django's
-    `filter
+    """
+    If specified, this must be a :class:`django.db.models.Q` object that will be
+    passed to Django's `filter
     <https://docs.djangoproject.com/en/5.0/ref/models/querysets/#filter>`__
     method.
 
-    Note that if you allow a user to insert rows into a filtered
-    table, you should make sure that new records satisfy your filter
-    condition, otherwise you can get surprising behaviour if the user
-    creates a new row.
+    If you allow a user to insert rows into a filtered table, you should make
+    sure that new records satisfy your filter condition, otherwise you can get
+    surprising behaviour if the user creates a new row.
 
-    If your filter consists of simple static values on some known
-    field, then you might prefer to use
-    :attr:`known_values  <lino.core.actors.Actor.known_values>`
-    instead because this will add automatic behaviour.
+    If your filter consists of simple static values on some known field, then
+    you might prefer to use :attr:`known_values
+    <lino.core.actors.Actor.known_values>` instead because this will add
+    automatic behaviour.
 
     One advantage of :attr:`filter` over
     :attr:`known_values  <lino.core.actors.Actor.known_values>`
@@ -421,11 +417,13 @@ method in order to sort the rows of the queryset.
     """
 
     exclude = None
-    """If specified, this must be dict which will be passed to Django's
-    `exclude
+    """
+    If specified, this must be a :class:`django.db.models.Q` object that will be
+    passed to Django's `exclude
     <https://docs.djangoproject.com/en/5.0/ref/models/querysets/#exclude>`__
-    method on the queryset.
+    method.
 
+    This is the logical opposite of :attr:`filter`.
     """
 
     extra = None