lino 25.4.2__py3-none-any.whl → 25.4.4__py3-none-any.whl

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.2'
+__version__ = '25.4.4'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/core/kernel.py

@@ -21,6 +21,7 @@ application.
 
 import os
 import sys
+import time
 import codecs
 import atexit
 import signal
@@ -41,7 +42,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,6 +112,32 @@ class Kernel(object):
         self.GFK_LIST = []
         # logger.info("20140227 Kernel.__init__() done")
 
+    # 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.
+
+    _lino_version = None
+
+    def touch_lino_version(self):
+        if is_devserver():
+            self._lino_version = time.time()
+        else:
+            p = self.site.site_dir / "lino_version.txt"
+            p.touch()
+            self._lino_version = p.stat().st_mtime
+
+    @property
+    def lino_version(self):
+        if self._lino_version is None:
+            if is_devserver():
+                self._lino_version = codetime()
+            else:
+                p = self.site.site_dir / "lino_version.txt"
+                if not p.exists():
+                    p.touch()
+                self._lino_version = p.stat().st_mtime
+        return self._lino_version
+
     # _code_mtime = None
     #
     # @property
@@ -118,13 +145,12 @@ class Kernel(object):
     #     if self._code_mtime is None:
     #         # packages = [os.environ['DJANGO_SETTINGS_MODULE'], 'lino']
     #         # self._code_mtime = codetime(*packages)
-    #         if self.site.developer_site_cache:
+    #         # if self.site.developer_site_cache:
+    #         if is_devserver():
     #             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)
+    #             self._code_mtime = self.lino_version
+    #             # self._code_mtime = codetime(settings.SETTINGS_MODULE)
     #     return self._code_mtime
 
     def kernel_startup(self, site):
@@ -919,7 +945,7 @@ class Kernel(object):
         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.site.lino_version:
+            if mtime > self.lino_version:
                 # logger.debug("%s (%s) is up to date.", fn, time.ctime(mtime))
                 return 0
 

lino/core/renderer.py

@@ -124,6 +124,9 @@ class Renderer(object):
     #     if ar is None or a.get_bound_action_permission(ar, obj, None):
     #         return a
 
+    def add_help_text(self, kw, help_text, title, datasource, fieldname):
+        pass
+
     def get_detail_url(self, *args, **kwargs):
         return self.front_end.get_detail_url(*args, **kwargs)
 
@@ -750,9 +753,6 @@ class HtmlRenderer(Renderer):
     def goto_instance(self, ar, obj, **kw):
         pass
 
-    def add_help_text(self, kw, help_text, title, datasource, fieldname):
-        pass
-
 
 class TextRenderer(HtmlRenderer):
     """

lino/core/site.py

@@ -559,21 +559,13 @@ 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
             self.site_dir = self.project_dir
-            db = self.get_database_settings()
-            if db is not None:
-                self.django_settings.update(DATABASES=db)
+            self.django_settings.update(DATABASES={
+                "default": {
+                    "ENGINE": "django.db.backends.sqlite3",
+                    "NAME": str(self.site_dir / "default.db")
+                }
+            })
         else:
             self.site_dir = self.master_site.site_dir
             self._history_aware_logging = self.master_site._history_aware_logging
@@ -721,15 +713,6 @@ class Site(object):
         # import yaml
         # print("20231019", yaml.dump(d))
 
-    def get_database_settings(self):
-        if self.site_dir is None:
-            pass  # raise Exception("20160516 No site_dir")
-        else:
-            dbname = self.site_dir / "default.db"
-            return {
-                "default": {"ENGINE": "django.db.backends.sqlite3", "NAME": str(dbname)}
-            }
-
     def get_anonymous_user(self):
         # The code below works even when users is not installed
         from lino.modlib.users.choicelists import UserTypes
@@ -1829,6 +1812,7 @@ class Site(object):
         self.install_settings()
 
     def is_imported_partner(self, obj):
+        # Deprecated.
         # ~ return obj.id is not None and (obj.id < 200000 or obj.id > 299999)
         return False
         # ~ return obj.id is not None and (obj.id > 10 and obj.id < 21)
@@ -2012,17 +1996,6 @@ 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
@@ -2032,8 +2005,9 @@ class Site(object):
         #     self.is_prepared = True
         # settings_file = self.django_settings.get("__file__")
         # Path(settings_file).touch()
-        p = self.site_dir / "lino_version.txt"
-        p.touch()
+        # p = self.site_dir / "lino_version.txt"
+        # p.touch()
+        self.kernel.touch_lino_version()
 
         if later:
             # print("20230823 later")

lino/help_texts.py

@@ -11,8 +11,8 @@ help_texts = {
     'lino.mixins.Modified' : _("""Adds a a timestamp field that holds the last modification time of every individual database object."""),
     'lino.mixins.Modified.modified' : _("""The time when this database object was last modified."""),
     'lino.mixins.Modified.auto_touch' : _("""Whether to touch objects automatically when saving them."""),
-    'lino.mixins.Created' : _("""Adds a timestamp field which holds the creation time of every individual database object."""),
-    'lino.mixins.Created.created' : _("""The time when this object was created."""),
+    'lino.mixins.Created' : _("""Adds a timestamp field that holds the creation time of every individual database row."""),
+    'lino.mixins.Created.created' : _("""The time when this database row was created."""),
     'lino.mixins.CreatedModified' : _("""Adds two timestamp fields created and modified."""),
     'lino.mixins.ProjectRelated' : _("""Mixin for models that are related to a “project”, i.e. to an object of the type given by your lino.core.site.Site.project_model."""),
     'lino.mixins.ProjectRelated.project' : _("""Pointer to the project to which this object is related."""),
@@ -646,7 +646,7 @@ help_texts = {
     'lino.modlib.system.SiteConfig.simulate_today' : _("""A constant user-defined date to be substituted as current system date."""),
     'lino.modlib.system.SiteConfig.site_company' : _("""The site operator, i.e. the legal person that operates this Lino site."""),
     'lino.modlib.system.SiteConfig.hide_events_before' : _("""If this is not empty, any calendar events before that date are being hidden in certain places."""),
-    'lino.modlib.system.SiteConfigManager' : _("""Always return the cached instance which holds the one and only database instance."""),
+    'lino.modlib.system.SiteConfigManager' : _("""Returns the cached instance, which holds the one and only database instance."""),
     'lino.modlib.system.Lockable' : _("""Mixin to add row-level edit locking to any model."""),
     'lino.modlib.system.BuildSiteCache' : _("""Rebuild the site cache. This action is available on About."""),
     'lino.modlib.system.SiteConfigs' : _("""The table used to present the SiteConfig row in a Detail form."""),

lino/management/commands/demotest.py

@@ -68,34 +68,32 @@ class TestCase(DemoTestCase):
 
         # For this test we reduce max_blacklist_time because we are going to
         # simulate a hacker who patiently waits:
-        ipdict.max_blacklist_time = timedelta(seconds=1)
+        ipdict.max_blacklist_time = timedelta(seconds=4)
 
         self.assertEqual(ipdict.ip_records, {})
 
-        def login(pwd):
+        def login(pwd, expected):
             d = self.login("robin", pwd)
-            return d.message
+            if d.message != expected:
+                self.fail(f"Expected {expected} but got {d.message} ({d})")
 
-        self.assertEqual(login("bad"), "Failed to sign in as robin.")
+        login("bad", "Failed to sign in as robin.")
         rec = ipdict.ip_records["127.0.0.1"]
         self.assertEqual(rec.login_failures, 1)
-        self.assertEqual(login("bad"), "Failed to sign in as robin.")
+        login("bad", "Failed to sign in as robin.")
         self.assertEqual(rec.login_failures, 2)
-        self.assertEqual(login("bad"), "Failed to sign in as robin.")
+        login("bad", "Failed to sign in as robin.")
         self.assertEqual(rec.login_failures, 3)
-        self.assertEqual(login("bad"), "Failed to sign in as robin.")
+        login("bad", "Failed to sign in as robin.")
         self.assertEqual(rec.login_failures, 4)
-        self.assertEqual(
-            login("bad"), "Too many authentication failures from 127.0.0.1"
-        )
+        login("bad", "Too many authentication failures from 127.0.0.1")
 
         # login_failures doesn't continue to increase when the ip is blacklisted:
         self.assertEqual(rec.login_failures, 4)
 
         # Even with the right password you cannot unlock a blacklisted ip
-        self.assertEqual(
-            login(dd.plugins.users.demo_password), "Too many authentication failures from 127.0.0.1"
-        )
+        login(dd.plugins.users.demo_password,
+              "Too many authentication failures from 127.0.0.1")
 
         # After max_blacklist_time, the IP gets removed from the blacklist, but
         # every new failure will now blacklist it again, the
@@ -103,24 +101,20 @@ class TestCase(DemoTestCase):
 
         # time.sleep(1.5)
         time.sleep(5)
-        self.assertEqual(login("bad"), "Failed to sign in as robin.")
+        login("bad", "Failed to sign in as robin.")
         self.assertEqual(rec.login_failures, 5)
-        self.assertEqual(
-            login("bad"), "Too many authentication failures from 127.0.0.1"
-        )
+        login("bad", "Too many authentication failures from 127.0.0.1")
         self.assertEqual(rec.login_failures, 5)
 
-        time.sleep(1.5)
-        self.assertEqual(
-            login(dd.plugins.users.demo_password),
-            "Now signed in as Robin Rood")
+        time.sleep(5)
+        login(dd.plugins.users.demo_password, "Now signed in as Robin Rood")
 
         # Once you manage to authenticate, your ip address gets removed from the
         # blacklist, i.e. when you log out and in for some reason, you get again
         # max_failed_auth_per_ip attempts
 
         self.assertEqual(ipdict.ip_records, {})
-        self.assertEqual(login("bad"), "Failed to sign in as robin.")
+        login("bad", "Failed to sign in as robin.")
         rec = ipdict.ip_records["127.0.0.1"]
         self.assertEqual(rec.login_failures, 1)
 

lino/mixins/__init__.py

@@ -121,14 +121,14 @@ class Modified(model.Model):
 
 class Created(model.Model):
     """
-    Adds a timestamp field which holds the creation time of every
-    individual database object.
+    Adds a timestamp field that holds the creation time of every
+    individual :term:`database row`.
 
     .. attribute:: created
 
-        The time when this object was created.
+        The time when this :term:`database row` was created.
 
-        Does nut use Django's `auto_now` and `auto_now_add` features
+        Does not use Django's `auto_now` and `auto_now_add` features
         because their deserialization would be problematic.
     """
 
@@ -142,7 +142,7 @@ class Created(model.Model):
         return naturaltime(self.created)
 
     def save(self, *args, **kwargs):
-        if self.created is None and not settings.SITE.loading_from_dump:
+        if self.created is None:  # and not settings.SITE.loading_from_dump:
             self.created = settings.SITE.now()
         super().save(*args, **kwargs)
 

lino/mixins/dupable.py

@@ -39,6 +39,7 @@ from lino.core.actions import SubmitInsert
 from lino.utils import join_elems
 from lino.utils.html import E, tostring, mark_safe
 from lino.core import constants
+from lino.modlib.checkdata.choicelists import Checker
 
 
 class CheckedSubmitInsert(SubmitInsert):
@@ -242,9 +243,6 @@ class Dupable(dd.Model):
         return qs[:limit]
 
 
-from lino.modlib.checkdata.choicelists import Checker
-
-
 class DupableChecker(Checker):
     """Checks for the following repairable problem:
 
@@ -255,7 +253,7 @@ class DupableChecker(Checker):
     verbose_name = _("Check for missing phonetic words")
     model = Dupable
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         msg = obj.update_dupable_words(fix)
         if msg:
             yield (True, msg)

lino/mixins/registrable.py

@@ -119,8 +119,11 @@ class Registrable(model.Model):
 
     def disabled_fields(self, ar):
         if not self.state.is_editable:
-            return self._registrable_fields
-        return super(Registrable, self).disabled_fields(ar)
+            # return self._registrable_fields
+            # Copy _registrable_fields otherwise _registrable_fields get
+            # modified as more disabled fields are added to the set.
+            return self._registrable_fields.copy()
+        return super().disabled_fields(ar)
 
     def get_row_permission(self, ar, state, ba):
         """Only rows in an editable state may be edited.

lino/modlib/about/models.py

@@ -119,8 +119,8 @@ class About(EmptyTable):
         packages = set(["django"])
 
         items.append(
-            E.li(gettext("Server timestamp"), " : ", E.b(dtfmt(site.lino_version)))
-        )
+            E.li(gettext("Server timestamp"), " : ",
+                 E.b(dtfmt(site.kernel.lino_version))))
 
         for p in site.installed_plugins:
             packages.add(p.app_name.split(".")[0])

lino/modlib/checkdata/choicelists.py

@@ -64,8 +64,8 @@ class Checker(dd.Choice):
         ar.logger.info(msg.format(len(todo), len(done), cls.self))
 
     @classmethod
-    def check_instance(cls, *args, **kwargs):
-        return cls.self.get_checkdata_problems(*args, **kwargs)
+    def check_instance(cls, ar, *args, **kwargs):
+        return cls.self.get_checkdata_problems(ar, *args, **kwargs)
 
     def get_checkable_models(self):
         if self.model is None:
@@ -92,7 +92,7 @@ class Checker(dd.Choice):
 
         done = []
         todo = []
-        for fixable, msg in self.get_checkdata_problems(obj, fix):
+        for fixable, msg in self.get_checkdata_problems(ar, obj, fix):
             if fixable:
                 # attn: do not yet translate
                 # msg = string_concat(u"(\u2605) ", msg)
@@ -126,7 +126,7 @@ class Checker(dd.Choice):
                     prb.save()
         return (todo, done)
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         return []
 
     def get_responsible_user(self, obj):

lino/modlib/checkdata/models.py

@@ -21,6 +21,9 @@ from lino.api import dd, rt, _
 from .choicelists import Checker, Checkers
 from .roles import CheckdataUser
 
+MAX_LENGTH = 250
+MORE = " (...)"
+
 
 class CheckerAction(dd.Action):
     fix_them = False
@@ -150,7 +153,7 @@ class Message(Controllable, UserAuthored):
     checker = Checkers.field(verbose_name=_("Checker"))
     # severity = Severities.field()
     # feedback = Feedbacks.field(blank=True)
-    message = models.CharField(_("Message text"), max_length=250)
+    message = models.CharField(_("Message text"), max_length=MAX_LENGTH)
     # fixable = models.BooleanField(_("Fixable"), default=False)
 
     update_problem = UpdateMessage()
@@ -166,6 +169,11 @@ class Message(Controllable, UserAuthored):
     def __str__(self):
         return self.message
 
+    def full_clean(self):
+        if len(self.message) > MAX_LENGTH:
+            self.message = self.message[:MAX_LENGTH - len(MORE)] + MORE
+        super().full_clean()
+
     @classmethod
     def get_simple_parameters(cls):
         for p in super(Message, cls).get_simple_parameters():
@@ -301,9 +309,9 @@ def get_checkers_for(model):
     return checkers
 
 
-def check_instance(obj, **kwargs):
+def check_instance(ar, obj, **kwargs):
     for chk in get_checkers_for(obj.__class__):
-        for fixable, msg in chk.check_instance(obj, **kwargs):
+        for fixable, msg in chk.check_instance(ar, obj, **kwargs):
             if fixable:
                 msg = f"(\u2605) {msg}"
             print(msg)

lino/modlib/comments/fixtures/demo2.py

@@ -42,12 +42,16 @@ BODIES.items.insert(0, "")
 
 
 def objects():
+
     Comment = rt.models.comments.Comment
     User = rt.models.users.User
     Comment.auto_touch = False
     # use_linod = settings.SITE.use_linod
     # settings.SITE.use_linod = False
 
+    # avoid channels.exceptions.ChannelFull:
+    settings.SITE.loading_from_dump = True
+
     MENTIONED = Cycler()
     for model in rt.models_by_base(Commentable):
         if model.memo_command is not None:

lino/modlib/comments/models.py

@@ -429,7 +429,7 @@ class CommentChecker(Checker):
     model = Comment
     msg_missing = _("Missing owner in reply to comment.")
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         if obj.reply_to_id and not obj.owner_id and obj.reply_to.owner_id:
             yield (True, self.msg_missing)
             if fix:

lino/modlib/dupable/mixins.py

@@ -13,6 +13,7 @@ from lino.api import dd, rt, _
 from lino.core.actions import SubmitInsert
 from lino.core.gfks import gfk2lookup
 from lino.core.gfks import ContentType
+from lino.modlib.checkdata.choicelists import Checker
 
 
 class CheckedSubmitInsert(SubmitInsert):
@@ -154,9 +155,6 @@ class Dupable(dd.Model):
         return qs[:limit]
 
 
-from lino.modlib.checkdata.choicelists import Checker
-
-
 class DupableChecker(Checker):
     """Checks for the following repairable problem:
 
@@ -167,7 +165,7 @@ class DupableChecker(Checker):
     verbose_name = _("Check for missing phonetic words")
     model = Dupable
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         msg = obj.update_dupable_words(fix)
         if msg:
             yield (True, msg)
@@ -180,7 +178,7 @@ class SimilarObjectsChecker(Checker):
     model = Dupable
     verbose_name = _("Check for similar objects")
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         lst = list(obj.find_similar_instances(1))
         if len(lst):
             msg = _("Similar clients: {clients}").format(

lino/modlib/extjs/ext_renderer.py

@@ -1481,7 +1481,7 @@ class ExtRenderer(JsCacheRenderer):
             # if settings.SITE.never_build_site_cache:
             #     yield "GEN_TIMESTAMP = '%s';" % settings.SITE.kernel.lino_version
             # else:
-            yield "GEN_TIMESTAMP = %s;" % py2js(settings.SITE.lino_version)
+            yield "GEN_TIMESTAMP = %s;" % py2js(settings.SITE.kernel.lino_version)
 
         return "\n".join(fn())
 

lino/modlib/extjs/views.py

@@ -138,7 +138,7 @@ def test_version_mismatch(request):
     if os.environ.get("PYCHARM_HOSTED", False):
         return {}
     lv = request.GET.get(constants.URL_PARAM_LINO_VERSION)
-    if lv is None or float(lv) == settings.SITE.lino_version:
+    if lv is None or float(lv) == settings.SITE.kernel.lino_version:
         return {}
     # print("20201217", lv, settings.SITE.kernel.code_mtime)
     cache.clear()

lino/modlib/help/fixtures/demo2.py

@@ -8,15 +8,16 @@ from lino.api import dd, rt, _
 if dd.get_plugin_setting("help", "use_contacts"):
 
     from lino.api.shell import help, contacts
+    from lino_xl.lib.contacts.models import PARTNER_NUMBERS_START_AT as PS
 
     def site_contact(type, company=None, **kwargs):
         return help.SiteContact(site_contact_type=type, company=company, **kwargs)
 
     def objects():
         yield site_contact("owner", settings.SITE.site_config.site_company)
-        yield site_contact("serveradmin", contacts.Company.objects.get(pk=106))
+        yield site_contact("serveradmin", contacts.Company.objects.get(pk=PS+6))
         yield site_contact(
             "hotline",
-            contact_person=contacts.Person.objects.get(pk=113),
+            contact_person=contacts.Person.objects.get(pk=PS+13),
             **dd.babelkw("remark", _("Mon and Fri from 11:30 to 12:00")),
         )

lino/modlib/jinja/mixins.py

@@ -8,10 +8,9 @@ from pathlib import Path
 from lxml import etree
 
 from django.conf import settings
-from django.utils import translation
 from django.utils.html import mark_safe, escape
 
-from lino.api import dd
+from lino.api import dd, _
 from lino.utils.xml import validate_xml
 from lino.utils.media import MediaFile
 
@@ -31,12 +30,20 @@ class XMLMaker(dd.Model):
     xml_file_template = None
     # xml_file_name = None
 
+    _xmlfile = None
+
+    @property
+    def xmlfile(self):
+        if self._xmlfile is None:
+            self._xmlfile = MediaFile(False, *self.get_xml_file_parts())
+        return self._xmlfile
+
     def get_xml_file_parts(self):
         yield 'xml'
         yield self.get_printable_target_stem() + ".xml"
 
     def get_xml_file(self):
-        return MediaFile(False, *self.get_xml_file_parts())
+        return self.xmlfile
 
     def make_xml_file(self, ar):
         renderer = settings.SITE.plugins.jinja.renderer
@@ -48,9 +55,9 @@ class XMLMaker(dd.Model):
         # parts = [
         #     dd.plugins.accounting.xml_media_dir,
         #     self.xml_file_name.format(self=self)]
-        xmlfile = self.get_xml_file()
+        xmlfile = self.xmlfile
         # xmlfile = Path(settings.MEDIA_ROOT, *parts)
-        ar.logger.info("Make %s from %s ...", xmlfile.path, self)
+        ar.logger.debug("Make %s from %s ...", xmlfile.path, self)
         xmlfile.path.parent.mkdir(exist_ok=True, parents=True)
         xmlfile.path.write_text(xml)
         # xmlfile.write_text(etree.tostring(xml))
@@ -74,3 +81,9 @@ class XMLMaker(dd.Model):
         # return mark_safe(f"""<a href="{url}">{url}</a>""")
         # return (xmlfile, url)
         return xmlfile
+
+    @dd.displayfield(_("XML file"))
+    def xml_file(self, ar):
+        mf = self.xmlfile
+        href = settings.SITE.media_root / mf.url
+        return mark_safe(f"<a href=\"{href}\" target=\"blank\">{mf.path.name}</a>")

lino/modlib/linod/models.py

@@ -55,7 +55,7 @@ class SystemTaskChecker(Checker):
     verbose_name = _("Check for missing system tasks")
     model = None
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         for proc in Procedures.get_list_items():
             if proc.class_name == "linod.SystemTask":
                 if SystemTask.objects.filter(procedure=proc).count() == 0: