lino 25.6.1__py3-none-any.whl → 25.7.1__py3-none-any.whl

lino/modlib/help/__init__.py

@@ -66,10 +66,10 @@ class Plugin(ad.Plugin):
                 # site.install_help_text(ba.action, ba.action.__class__)
                 if a.model is not None:
                     self.htl.install_help_text(
-                        ba.action, a.model, ba.action.action_name
+                        ba, a.model, ba.action.action_name
                     )
-                self.htl.install_help_text(ba.action, a, ba.action.action_name)
-                self.htl.install_help_text(ba.action.__class__)
+                self.htl.install_help_text(ba, a, ba.action.action_name)
+                self.htl.install_help_text(ba.__class__)
                 # htl.install_help_text(
                 #     ba.action, ba.action.__class__,
                 #     attrname=ba.action.action_name)

lino/modlib/help/config/makehelp/conf.tpl.py

@@ -18,9 +18,9 @@ from lino.sphinxcontrib import configure ; configure(globals())
 project = "{{settings.SITE.title}}"
 html_title = "{{settings.SITE.title}}"
 
-{% if settings.SITE.site_config.site_company %}
+{% if settings.SITE.plugins.contacts.site_owner %}
 import datetime
-copyright = "{} {{settings.SITE.site_config.site_company}}".format(
+copyright = "{} {{settings.SITE.plugins.contacts.site_owner}}".format(
     datetime.date.today())
 {% endif %}
 

lino/modlib/help/fixtures/demo2.py

@@ -14,10 +14,15 @@ if dd.get_plugin_setting("help", "use_contacts"):
         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("owner", settings.SITE.plugins.contacts.site_owner)
         yield site_contact("serveradmin", contacts.Company.objects.get(pk=PS+6))
         yield site_contact(
             "hotline",
             contact_person=contacts.Person.objects.get(pk=PS+13),
             **dd.babelkw("remark", _("Mon and Fri from 11:30 to 12:00")),
         )
+
+else:
+
+    def objects():
+        return []

lino/modlib/help/management/commands/makehelp.py

@@ -410,7 +410,10 @@ class Command(GeneratingCommand):
 
     def action2par(self, a):
         if isinstance(a, BoundAction):
-            a = a.action
+            # a = a.action
+            return shortpar(a.action.action_name, a.action.label,
+                            a.get_help_text() or _("See {}.").format(
+                                self.refto(a.action)))
         return shortpar(a.action_name, a.label, self.get_help_text_from_field(a))
 
     def collect_refs(self, cls, role):

lino/modlib/help/models.py

@@ -20,7 +20,10 @@ class OpenHelpWindow(dd.Action):
     # this doesn't look nice. But adding spaces breaks a series of doctests, so
     # I undid that change:
     # button_text = " ? "
-    button_text = "?"
+    # button_text = "?"
+    # button_text = "🛈"
+    button_text = "ⓘ"  # 24d8
+    # button_text = "🯄"  # 1fbc4
     select_rows = False
     help_text = _("Open Help Window")
     show_in_plain = True

lino/modlib/help/utils.py

@@ -79,8 +79,10 @@ class HelpTextsLoader:
             # if m in self.unhelpful_classes:
             #     continue
             k, txt = self.get_help_text_for_class(m, attrname)
-            # if attrname == "update_missing_rates":
-            #     print("20181004 {} {} {}".format(cls, k, txt))
+            # if attrname == "update_guests":
+            #     # if str(cls) == "cal.Events":
+            #     # if k == "lino_xl.lib.cal.Events.update_guests":
+            #     print(f"20250622 {hash(fld)} {cls} {k} {fld.help_text} {txt}")
             if txt is None:
                 if debug:
                     print(
@@ -102,11 +104,15 @@ class HelpTextsLoader:
                             cls, attrname, txt, k, fld
                         )
                     )
-                try:
-                    fld.help_text = txt
-                except AttributeError as e:
-                    raise AttributeError("20240329 {} {}".format(fld, e))
+                fld.help_text = txt
+                # fld._found = True
+                # try:
+                #     fld.help_text = txt
+                # except AttributeError as e:
+                #     raise AttributeError("20240329 {} {}".format(fld, e))
                 fld._lino_help_ref = k  # for makehelp
+                # if attrname == "update_guests":
+                #     print(f"20250622 {fld} {cls} {k} {txt}")
                 return
         if debug:
             print("20170824 {}.{} : no help_text".format(cls, attrname))

lino/modlib/linod/choicelists.py

@@ -1,11 +1,13 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2023-2024 Rumma & Ko Ltd
+# Copyright 2023-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 # See https://dev.lino-framework.org/plugins/linod.html
 
 import logging
 from typing import Callable
-from lino.api import dd, _
+from asgiref.sync import sync_to_async
+from django.conf import settings
+from lino.api import dd, rt, _
 from lino.core.roles import SiteStaff
 
 
@@ -13,14 +15,39 @@ class Procedure(dd.Choice):
     func: Callable
     kwargs: dict
     class_name: str
+    run_after: Callable | None
+    during_initdb: bool
 
-    def __init__(self, func, class_name, **kwargs):
+    def __init__(
+        self, func, class_name=None, run_after=None, during_initdb=True, **kwargs
+    ):
         name = func.__name__
         super().__init__(name, name, name)
         self.func = func
         self.class_name = class_name
+        self.run_after = run_after
+        self.during_initdb = during_initdb
         self.kwargs = kwargs
 
+    async def install_if_needed(self, ar):
+        if self.class_name == "linod.SystemTask":
+            SystemTask = rt.models.linod.SystemTask
+            if not await SystemTask.objects.filter(procedure=self).aexists():
+                await ar.adebug("Create background task for %r", self)
+                # Without a value for start_date and end_date, Django would
+                # dd.today(), which does a database lookup to find
+                # SiteConfig.simulate_today, which would raise a "cannot call
+                # this from an async context" exception.
+                # self.kwargs.update(start_date=None, end_date=None)
+                self.kwargs.setdefault('start_date', await settings.SITE.atoday())
+                # self.kwargs.setdefault('end_date', None)
+                obj = SystemTask(procedure=self, **self.kwargs)
+                # every_unit=proc.every_unit, every=proc.every_value)
+                if obj.every_unit == "secondly":
+                    obj.log_level = "WARNING"
+                await sync_to_async(obj.full_clean)()
+                await obj.asave()
+
     def run(self, ar):
         return self.func(ar)
 
@@ -36,7 +63,33 @@ class Procedures(dd.ChoiceList):
     column_names = "value name text class_name kwargs"
     required_roles = dd.login_required(SiteStaff)
 
-    task_classes = []
+    # task_classes = []
+
+    # @classmethod
+    # def sort_for_runner(cls):
+
+    @classmethod
+    def add_item(cls, *args, **kwargs):
+        rv = super().add_item(*args, **kwargs)
+        newchoices = []
+        collected_funcs = set()
+        todo = cls.choices
+        while len(todo):
+            later = []
+            for p_text in todo:
+                p, text = p_text
+                if p.run_after is None or p.run_after in collected_funcs:
+                    newchoices.append(p_text)
+                    collected_funcs.add(p.name)
+                else:
+                    later.append(p_text)
+            if len(later) == len(todo):
+                # raise Exception(f"No {p.run_after} in {collected_funcs}")
+                newchoices += todo
+                break
+            todo = later
+        cls.choices = newchoices
+        return rv
 
     @classmethod
     def task_classes(cls):

lino/modlib/linod/fixtures/{linod.py → checkdata.py}

@@ -2,7 +2,7 @@
 # Copyright 2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 from asgiref.sync import async_to_sync
-from lino.api import rt
+from lino.api import dd, rt
 from lino.modlib.linod.mixins import start_task_runner
 
 # import logging
@@ -12,19 +12,9 @@ from lino.modlib.linod.mixins import start_task_runner
 #         if l.name == name:
 #             return l
 
-def objects():
-    raise Exception("""
-
-    This fixture isn't used at the moment.  I wrote it because I thought it
-    would be nice to run the system task runner automatically when ``pm prep``
-    in order to cover the sync_ibanity system task. But (1) this would require
-    me to integrate also the ``checkdata`` and ``checksummaries`` fixtures into
-    it (otherwise they would run again as a system task) and (2) we don't want
-    to start `sync_ibanity` automatically on GitLab because it can't work
-    without credentials.
 
-        """)
-    ar = rt.login("robin")
+def objects():
+    ar = rt.login(dd.plugins.users.demo_username)
     # logger.setLevel(logging.DEBUG)
     # getHandlerByName('console').setLevel(logging.DEBUG)
     # ar.debug("Coucou")

lino/modlib/linod/management/commands/linod.py

@@ -2,7 +2,6 @@
 # Copyright 2022-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-# import time
 import asyncio
 from django.conf import settings
 from django.core.management import BaseCommand, call_command
@@ -17,18 +16,6 @@ if dd.plugins.linod.use_channels:
 
 
 class Command(BaseCommand):
-    def add_arguments(self, parser):
-        parser.add_argument(
-            "--force",
-            help="Force starts the runworker process even if a log_socket_file exists."
-            " Use only in production server.",
-            action="store_true",
-            default=False,
-        )
-        # parser.add_argument("--skip-system-tasks",
-        #                     help="Skips the system tasks coroutine",
-        #                     action="store_true",
-        #                     default=False)
 
     def handle(self, *args, **options):
 

lino/modlib/linod/mixins.py

@@ -217,6 +217,11 @@ async def start_task_runner(ar=None, max_count=None):
     # ar.info("Start task runner using %s...", ar.logger)
     # await sync_to_async(tasks.setup)()
     # print("20240109", ar.logger.handlers)
+
+    # Procedures.sort_for_runner()
+    for proc in Procedures.get_list_items():
+        await proc.install_if_needed(ar)
+
     count = 0
     while True:
         await ar.adebug("Start next task runner loop.")
@@ -241,6 +246,9 @@ async def start_task_runner(ar=None, max_count=None):
         for self in tasks:
             # print("20240424d")
             # raise Warning("20231230")
+            if max_count is not None and not self.procedure.during_initdb:
+                # print(f"20250621 skip {self} during initdb")
+                continue
             if self.last_end_time is None and self.last_start_time is not None:
                 run_duration = now - self.last_start_time
                 if run_duration > timedelta(hours=2):

lino/modlib/linod/models.py

@@ -1,13 +1,12 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2023-2024 Rumma & Ko Ltd
+# Copyright 2023-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 # See https://dev.lino-framework.org/plugins/linod.html
 
-from lino.api import dd, rt, _
+from lino.api import dd, _
 from lino.core.roles import SiteStaff
 from lino import logger
-from lino.mixins import Sequenced
-from lino.modlib.checkdata.choicelists import Checker
+# from lino.modlib.checkdata.choicelists import Checker
 from .choicelists import Procedures, LogLevels
 
 # if dd.plugins.linod.use_channels:
@@ -47,29 +46,29 @@ class SystemTasks(dd.Table):
     """
 
 
-class SystemTaskChecker(Checker):
-    """
-    Checks for procedures that do not yet have a background task.
-    """
-
-    verbose_name = _("Check for missing system tasks")
-    model = None
-
-    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:
-                    msg = _("No {} for {}").format(
-                        SystemTask._meta.verbose_name, proc)
-                    yield (True, msg)
-                    if fix:
-                        logger.debug("Create background task for %r", proc)
-                        jr = SystemTask(procedure=proc, **proc.kwargs)
-                        # every_unit=proc.every_unit, every=proc.every_value)
-                        if jr.every_unit == "secondly":
-                            jr.log_level = "WARNING"
-                        jr.full_clean()
-                        jr.save()
-
-
-SystemTaskChecker.activate()
+# class SystemTaskChecker(Checker):
+#     """
+#     Checks for procedures that do not yet have a background task.
+#     """
+#
+#     verbose_name = _("Check for missing system tasks")
+#     model = None
+#
+#     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:
+#                     msg = _("No {} for {}").format(
+#                         SystemTask._meta.verbose_name, proc)
+#                     yield (True, msg)
+#                     if fix:
+#                         logger.debug("Create background task for %r", proc)
+#                         jr = SystemTask(procedure=proc, **proc.kwargs)
+#                         # every_unit=proc.every_unit, every=proc.every_value)
+#                         if jr.every_unit == "secondly":
+#                             jr.log_level = "WARNING"
+#                         jr.full_clean()
+#                         jr.save()
+#
+#
+# SystemTaskChecker.activate()

lino/modlib/memo/__init__.py

@@ -68,13 +68,13 @@ class Plugin(ad.Plugin):
     def on_plugins_loaded(self, site):
         self.parser = Parser()
 
-        def url2html(ar, s, cmdname, mentions, context):
-            url, text = split_name_rest(s)
-            if text is None:
-                text = url
-            return '<a href="%s" target="_blank">%s</a>' % (url, text)
-
-        self.parser.register_command("url", url2html)
+        # def url2html(ar, s, cmdname, mentions, context):
+        #     url, text = split_name_rest(s)
+        #     if text is None:
+        #         text = url
+        #     return '<a href="%s" target="_blank">%s</a>' % (url, text)
+        #
+        # self.parser.register_command("url", url2html)
 
         # 20240920 I disabled the "py" memo command because I don't know anybody
         # who used it (except myself a few times for testing it) and because it

lino/modlib/memo/management/commands/removeurls.py

@@ -0,0 +1,67 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2025 Rumma & Ko Ltd
+# License: GNU Affero General Public License v3 (see file COPYING for details)
+"""
+Convert [url] memo commands in the text fields of this database into <a href>
+tags.
+"""
+
+from click import confirm
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from lino.core.utils import full_model_name as fmn
+from lino.modlib.memo.parser import Parser, split_name_rest
+from lino.api import dd, rt
+
+parser = Parser()
+
+
+def url2html(ar, s, cmdname, mentions, context):
+    url, text = split_name_rest(s)
+    if text is None:
+        text = url
+    return '<a href="%s" target="_blank">%s</a>' % (url, text)
+
+
+parser.register_command("url", url2html)
+
+
+class Command(BaseCommand):
+    help = __doc__
+
+    def add_arguments(self, parser):
+        super().add_arguments(parser)
+        (
+            parser.add_argument(
+                "-b", "--batch", "--noinput",
+                action="store_false",
+                dest="interactive",
+                default=True,
+                help="Do not prompt for input of any kind.",
+            ),
+        )
+
+    def handle(self, *args, **options):
+
+        batch = not options.get("interactive")
+
+        settings.SITE.startup()
+
+        for m in rt.models_by_base(dd.Model):
+            if len(m._bleached_fields) == 0:
+                continue
+            print(f"Search for [url] memo commands in {fmn(m)}...")
+            for obj in m.objects.all():
+                for f in m._bleached_fields:
+                    if getattr(f, "format") != "plain":
+                        old = getattr(obj, f.name)
+                        if old is None:
+                            continue
+                        new = parser.parse(old)
+                        if new != old:
+                            print(f"- {obj} {f} :")
+                            print(f"- {old} -> {new}")
+                            if batch or confirm("Update this ?", default=True):
+                                setattr(obj, f.name, new)
+                                obj.full_clean()
+                                obj.save()

lino/modlib/memo/mixins.py

@@ -12,7 +12,6 @@ except ImportError:
 
 from django.conf import settings
 from django.utils import translation
-from django.utils.text import Truncator
 from django.utils.html import format_html
 
 from lino.core.gfks import gfk2lookup
@@ -25,13 +24,6 @@ from lino.modlib.checkdata.choicelists import Checker
 from lino.api import rt, dd, _
 
 
-def django_truncate_comment(html_str):
-    # works, but we don't use it because (...)
-    return Truncator(html_str).chars(
-        settings.SITE.plugins.memo.short_preview_length, html=True
-    )
-
-
 MARKDOWNCFG = dict(
     extensions=["toc"], extension_configs=dict(toc=dict(toc_depth=3, permalink=True))
 )
@@ -178,7 +170,7 @@ class BasePreviewable(dd.Model):
         )
         short = truncate_comment(full, self.get_preview_length())
         if not full.startswith("<"):
-            if dd.get_plugin_setting("memo", "use_markup"):
+            if settings.SITE.plugins.memo.use_markup:
                 full = markdown.markdown(full, **MARKDOWNCFG)
         return (short, full)
 

lino/modlib/memo/parser.py

@@ -102,7 +102,7 @@ class Suggester:
         return (
             r"javascript:window.App.runAction({"
             + f"'actorId': '{self.formatter(da.actor)}', "
-            + "'an': 'detail', "
+            + f"'action_full_name': '{da.action.full_name()}', "
             + "'rp': null, "
             + r"'status': {"
             + f"'record_id': {self.formatter(obj.pk)}"

lino/modlib/notify/config/notify/summary.eml

@@ -1,7 +1,9 @@
 <html><head><base href="{{settings.SITE.server_url}}" target="_blank"></head><body>
 {% if len(messages) == 1 %}
 {% set msg = messages[0] %}
-({{fds(msg.created.date())}} {{msg.created.time().strftime('%H:%M')}})
+
+{% set created = user.dt_astimezone(msg.created) %}
+({{ created.strftime("%d/%m/%Y %H:%M %Z") }})
 {#{ar.parse_memo(msg.body)}#}
 {{msg.body}}
 {% else %}
@@ -9,7 +11,8 @@
 {{_("You have {} unseen notifications").format(len(messages))}}
 {% for msg in messages %}
 <div>
-<H3>{{fds(msg.created.date())}} {{msg.created.time().strftime('%H:%M')}}</H3>
+{% set created = user.dt_astimezone(msg.created) %}
+<H3>{{ created.strftime("%d/%m/%Y %H:%M %Z") }}</H3>
 {#{ar.parse_memo(msg.body)}#}
 {{msg.body}}
 </div>

lino/modlib/notify/fixtures/demo2.py

@@ -25,13 +25,12 @@ def objects():
     mt = rt.models.notify.MessageTypes.system
 
     rt.models.notify.Message.emit_broadcast_notification(
-        "The database has been initialized.", message_type=mt, created=now
-    )
-    # return []
+        "The database has been initialized.", message_type=mt,
+        created=now, sent=now)
     for u in rt.models.users.User.objects.exclude(first_name="").order_by('username'):
         with translation.override(u.language):
-            yield rt.models.notify.Message.create_message(
+            rt.models.notify.Message.create_message(
                 u, subject=_("Welcome on board, {}.").format(u.first_name),
-                mail_mode=u.mail_mode, created=now, message_type=mt,
-                sent=now)
+                mail_mode=u.mail_mode, created=now, message_type=mt, sent=now)
             # print("20240710", u, u.language)
+    return []

lino/modlib/notify/models.py

@@ -5,7 +5,7 @@
 # import json
 from io import StringIO
 from lxml import etree
-from datetime import timedelta
+from datetime import timedelta, UTC
 
 from django.db import models
 from django.conf import settings
@@ -156,14 +156,13 @@ class Message(UserAuthored, Controllable, Created):
             body=msg,
             subject="Broadcast message",
             message_type=message_type,
-            **msgdata,
-        )
+            **msgdata)
 
     @classmethod
     def emit_notification(cls, ar, owner, message_type, msg_func, recipients, **kwargs):
         # kwargs can be used to set `reply_to`
         # ATM the action_url is computed using the permissions of the sending
-        # user. That's maybe not exactly what we want (the url should depend on
+        # user. That might not be exactly what we want (the url should depend on
         # the recipient). But until now we cannot imagine any case where this
         # would become important.
         push_options = {}
@@ -176,8 +175,7 @@ class Message(UserAuthored, Controllable, Created):
                 if ba is not None:
                     push_options.update(
                         action_url=ar.renderer.get_detail_url(
-                            ar, ba.actor, owner.pk)
-                    )
+                            ar, ba.actor, owner.pk))
                 # push_options.update(action_url=ar.renderer.obj2url(ar, owner))
             me = ar.get_user()
         others = set()
@@ -229,8 +227,7 @@ class Message(UserAuthored, Controllable, Created):
             subject=settings.SITE.title,
             # body=settings.SITE.plugins.memo.parser.parse(obj.body),
             body=html2text(obj.body),
-            created=obj.created,
-        )
+            created=obj.created)
         send_notification(user, **push_options)
 
     mark_all_seen = MarkAllSeen()
@@ -246,8 +243,10 @@ class Message(UserAuthored, Controllable, Created):
         qs = qs.exclude(user__email="")
         qs = qs.filter(mail_mode=mm).order_by("user")
         if qs.count() == 0:
+            # print("20250621 No email notifications to send for %s.", mm)
             ar.logger.debug("No email notifications to send for %s.", mm)
             return
+        # print("20250621 Some email notifications to send for %s.", mm, qs)
         mail_users = settings.SITE.user_model.get_active_users().exclude(email="")
         # from lino.core.renderer import MailRenderer
         # ar = rt.login(renderer=MailRenderer())
@@ -468,13 +467,13 @@ class MyMessages(My, Messages):
 #         h)
 
 
-@schedule_often(every=10)
+@schedule_often(every=10, during_initdb=False)
 def send_pending_emails_often(ar):
     # print("20231021 send_pending_emails_often()", ar.logger)
     rt.models.notify.Message.send_summary_emails(ar, MailModes.often)
 
 
-@schedule_daily()
+@schedule_daily(during_initdb=False)
 def send_pending_emails_daily(ar):
     rt.models.notify.Message.send_summary_emails(ar, MailModes.daily)
 

lino/modlib/periods/__init__.py

@@ -16,16 +16,19 @@ class Plugin(ad.Plugin):
     fix_y2k = False
     short_ref = False
 
-    def setup_config_menu(self, site, user_type, m, ar=None):
-        p = self.get_menu_group()
-        m = m.add_menu(p.app_label, p.verbose_name)
-        m.add_action("periods.StoredYears")
-        m.add_action("periods.StoredPeriods")
+    def pre_site_startup(self, site):
+        if isinstance(self.period_type, str):
+            self.period_type = site.models.periods.PeriodTypes.get_by_name(
+                self.period_type)
+        super().pre_site_startup(site)
 
     def before_analyze(self):
         if self.fix_y2k and self.start_month != 1:
             raise Exception("When fix_y2k is set, start_month must be 1")
-        if isinstance(self.period_type, str):
-            self.period_type = self.site.models.periods.PeriodTypes.get_by_name(
-                self.period_type)
         super().before_analyze()
+
+    def setup_config_menu(self, site, user_type, m, ar=None):
+        p = self.get_menu_group()
+        m = m.add_menu(p.app_label, p.verbose_name)
+        m.add_action("periods.StoredYears")
+        m.add_action("periods.StoredPeriods")