lino 25.4.1__py3-none-any.whl → 25.4.3__py3-none-any.whl

lino/modlib/notify/api.py

@@ -15,6 +15,8 @@ LIVE_PANEL_UPDATE = "PANEL_UPDATE"
 
 NOTIFICATION_TYPES = [NOTIFICATION, CHAT, LIVE_PANEL_UPDATE]
 
+DONT_CATCH = True
+
 
 # def send_panel_update(actorIDs: list[str], pk: int):
 def send_panel_update(data):
@@ -27,16 +29,24 @@ def send_panel_update(data):
     from channels.layers import get_channel_layer
     from asgiref.sync import async_to_sync
 
+    if settings.SITE.loading_from_dump:
+        return
+
     channel_layer = get_channel_layer()
 
     data.update(type=LIVE_PANEL_UPDATE)
 
-    try:
+    if DONT_CATCH:
         async_to_sync(channel_layer.send)(
             CHANNEL_NAME, {"type": "send.panel.update", "text": json.dumps(data)}
         )
-    except Exception as e:
-        logger.exception(e)
+    else:
+        try:
+            async_to_sync(channel_layer.send)(
+                CHANNEL_NAME, {"type": "send.panel.update", "text": json.dumps(data)}
+            )
+        except Exception as e:
+            logger.exception(e)
 
 
 def send_notification(
@@ -54,11 +64,9 @@ def send_notification(
     OK button of their desktop notification.
 
     """
-    if user is None:
+    if user is None or settings.SITE.loading_from_dump:
         return
 
-    created = created.strftime("%a %d %b %Y %H:%M")
-
     if dd.get_plugin_setting("linod", "use_channels"):
         # importing channels at module level would cause certain things to fail
         # when channels isn't installed, e.g. `manage.py prep` in `lino_book.projects.workflows`.
@@ -73,7 +81,7 @@ def send_notification(
             subject=subject,
             id=primary_key,
             body=body,
-            created=created,
+            created=created.strftime("%a %d %b %Y %H:%M"),
             action_url=action_url,
         )
 
@@ -86,6 +94,7 @@ def send_notification(
                 },
             )  # data
         except Exception as e:
+            raise  # 20250415
             logger.exception(e)
 
         if dd.plugins.notify.use_push_api:
@@ -95,7 +104,7 @@ def send_notification(
                 body=body,
                 action_title=action_title,
             )
-            try:
+            if DONT_CATCH:
                 async_to_sync(channel_layer.send)(
                     CHANNEL_NAME,
                     {
@@ -104,9 +113,19 @@ def send_notification(
                         "user_id": user.id if user is not None else None,
                     },
                 )
-            except (
-                ChannelFull
-            ) as e:  # happens on older Pythons and can cause many tracebacks
-                # logger.exception(e)
-                # logger.warning(str(e))
-                pass
+            else:
+                try:
+                    async_to_sync(channel_layer.send)(
+                        CHANNEL_NAME,
+                        {
+                            "type": "send.push",
+                            "data": data,
+                            "user_id": user.id if user is not None else None,
+                        },
+                    )
+                except (
+                    ChannelFull
+                ) as e:  # happens on older Pythons and can cause many tracebacks
+                    # logger.exception(e)
+                    # logger.warning(str(e))
+                    pass

lino/modlib/notify/mixins.py

@@ -1,12 +1,27 @@
-# Copyright 2016-2024 Rumma & Ko Ltd
+# Copyright 2016-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 from lino.utils.html import E, tostring, format_html, mark_safe
+from lino.core.utils import full_model_name as fmn
 from lino.api import dd, rt, _
 
 # PUBLIC_GROUP = "all_users_channel"
 
 
+def get_updatables(instance, ar=None):
+    data = {
+        "actorIDs": instance.updatable_panels,
+        "pk": instance.pk,
+        "model": f"{fmn(instance)}",
+        "mk": None, "master_model": None
+    }
+    if ar is None:
+        return data
+    if mi := ar.master_instance:
+        data.update(mk=mi.pk, master_model=f"{fmn(mi)}")
+    return data
+
+
 class ChangeNotifier(dd.Model):
 
     class Meta:

lino/modlib/notify/models.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2024 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 # import json
@@ -9,7 +9,6 @@ from datetime import timedelta
 
 from django.db import models
 from django.conf import settings
-from django.utils import timezone
 from django.utils import translation
 
 from lino import logger
@@ -25,6 +24,7 @@ from lino.modlib.users.mixins import UserAuthored, My
 from lino.modlib.linod.choicelists import schedule_daily, schedule_often
 from lino.modlib.office.roles import OfficeUser
 
+from .mixins import get_updatables
 from .choicelists import MessageTypes, MailModes
 from .api import send_notification, NOTIFICATION, send_panel_update
 
@@ -57,7 +57,7 @@ class MarkAllSeen(dd.Action):
             user=ar.get_user(), seen__isnull=True
         )
         for obj in qs:
-            obj.seen = timezone.now()
+            obj.seen = dd.now()
             obj.save()
         ar.success(
             eval_js='window.top.document.querySelectorAll(".'
@@ -81,7 +81,7 @@ class MarkSeen(dd.Action):
 
     def run_from_ui(self, ar):
         for obj in ar.selected_rows:
-            obj.seen = timezone.now()
+            obj.seen = dd.now()
             obj.save()
         ar.success(refresh_all=True)
 
@@ -297,9 +297,9 @@ class Message(UserAuthored, Controllable, Created):
                 # dd.logger.info("20240902 %s", sender)
                 ar.send_email(subject, sender, body, [user.email])
                 for msg in messages:
-                    msg.sent = timezone.now()
+                    msg.sent = dd.now()
                     if dd.plugins.notify.mark_seen_when_sent:
-                        msg.seen = timezone.now()
+                        msg.seen = dd.now()
                     msg.save()
 
     # def send_browser_message_for_all_users(self, user):
@@ -500,7 +500,7 @@ if remove_after:
     def clear_seen_messages(ar):
         Message = rt.models.notify.Message
         qs = Message.objects.filter(
-            created__lt=timezone.now() - timedelta(days=remove_after)
+            created__lt=dd.now() - timedelta(days=remove_after)
         )
         what = "notification messages older than {} days".format(remove_after)
         if dd.plugins.notify.keep_unseen:
@@ -522,26 +522,11 @@ if remove_after:
 
 
 @dd.receiver(dd.post_ui_save)
-def notify_panels(sender, instance, ar, **kwargs):
+def notify_panels(sender, instance, ar=None, **kwargs):
     if (
         not dd.get_plugin_setting("linod", "use_channels", False)
-        or not (ups := instance.updatable_panels)
-        or not hasattr(ar, "rqdata")
+        or not instance.updatable_panels
     ):
         return
-    data = {
-        "actorIDs": ups,
-        "pk": instance.pk,
-        "model": f"{instance._meta.app_label}.{instance.__class__.__name__}",
-    }
-    data.update(
-        **(
-            {
-                "mk": (mi := ar.master_instance).pk,
-                "master_model": f"{mi._meta.app_label}.{mi.__class__.__name__}",
-            }
-            if ar.master_instance
-            else {"mk": None, "master_model": None}
-        )
-    )
+    data = get_updatables(instance, ar)
     send_panel_update(data)

lino/modlib/printing/mixins.py

@@ -260,7 +260,7 @@ class CachedPrintableChecker(Checker):
     model = CachedPrintable
     verbose_name = _("Check for missing target files")
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         if obj.build_time is not None:
             t = obj.get_cache_mtime()
             if t is None:

lino/modlib/publisher/models.py

@@ -2,12 +2,6 @@
 # Copyright 2012-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from .ui import *
-from lino.api import rt, dd
-
-from .choicelists import PublishingStates, PageFillers, SpecialPages
-from .mixins import Publishable
-
 from html import escape
 from django.db import models
 from django.http import HttpResponseRedirect
@@ -15,6 +9,11 @@ from django.conf import settings
 from django.utils import translation
 from django.utils.translation import pgettext_lazy
 
+from lorem import get_paragraph
+from django.utils import translation
+from django.conf import settings
+
+
 # from django.utils.translation import get_language
 from django.utils.html import mark_safe
 
@@ -38,6 +37,10 @@ from lino.mixins.polymorphic import Polymorphic
 from lino_xl.lib.topics.mixins import Taggable
 # from .utils import render_node
 
+from lino.api import rt, dd
+from .choicelists import PublishingStates, PageFillers, SpecialPages
+from .mixins import Publishable
+from .ui import *
 
 # class Node(Referrable, Hierarchical, Sequenced, Previewable, Publishable, Commentable):
 # Polymorphic,
@@ -401,3 +404,49 @@ def update_publisher_pages(ar):
         prev = obj
         count += 1
     ar.logger.info("%d pages have been updated.", count)
+
+
+def make_demo_pages(pages_desc):
+    # Translation = rt.models.pages.Translation
+    # for lc in settings.SITE.LANGUAGE_CHOICES:
+    #     language = lc[0]
+    #     kwargs = dict(language=language, ref='index')
+    #     with translation.override(language):
+
+    parent_nodes = []
+    for lng in settings.SITE.languages:
+        counter = {None: 0}
+        # count = 0
+        home_page = Page.objects.get(
+            special_page=SpecialPages.home, language=lng.django_code)
+
+        with translation.override(lng.django_code):
+
+            def make_pages(pages, parent=None):
+                for page in pages:
+                    if len(page) != 3:
+                        raise Exception(f"Oops {page}")
+                    title, body, children = page
+                    kwargs = dict(title=title)
+                    if body is None:
+                        kwargs.update(body=get_paragraph())
+                    else:
+                        kwargs.update(body=body)
+                    if parent is None:
+                        # kwargs.update(ref='index')
+                        continue  # home page is created by SpecialPages
+                    if lng.suffix:
+                        kwargs.update(
+                            translated_from=parent_nodes[counter[None]])
+                    kwargs.update(language=lng.django_code)
+                    if dd.is_installed("publisher"):
+                        kwargs.update(publishing_state='published')
+                    obj = Page(parent=parent, **kwargs)
+                    yield obj
+                    if not lng.suffix:
+                        parent_nodes.append(obj)
+                    counter[None] += 1
+                    # print("20230324", title, kwargs)
+                    yield make_pages(children, obj)
+
+            yield make_pages(pages_desc, parent=home_page)

lino/modlib/publisher/ui.py

@@ -92,7 +92,7 @@ else:
 
 
 class PageDetail(dd.DetailLayout):
-    main = "first_panel general more"
+    main = "general first_panel more"
 
     first_panel = dd.Panel(
         """
@@ -129,11 +129,11 @@ class PageDetail(dd.DetailLayout):
     # """
 
     right_panel = """
-    ref
+    ref language
     parent seqno
     child_node_depth
     #page_type filler
-    language
+    publishing_state special_page
     publisher.TranslationsByPage
     """
 

lino/modlib/publisher/views.py

@@ -5,6 +5,7 @@
 from django.conf import settings
 from django import http
 from django.views.generic import View
+from django.utils import translation
 
 from lino.api import dd
 from lino.core import auth
@@ -52,7 +53,13 @@ class Index(View):
     def get(self, request, pk=1):
         rnd = settings.SITE.plugins.publisher.renderer
         dv = settings.SITE.models.publisher.Pages
-        index_node = dv.model.objects.get(ref="index", language=request.LANGUAGE_CODE)
+        if len(settings.SITE.languages) == 1:
+            # language = settings.SITE.languages[0].django_code
+            language = translation.get_language()
+        else:
+            language = request.LANGUAGE_CODE
+        index_node = dv.model.objects.get(ref="index", language=language)
         # print("20231025", index_node)
-        ar = dv.create_request(request=request, renderer=rnd, selected_rows=[index_node])
+        ar = dv.create_request(request=request, renderer=rnd,
+                               selected_rows=[index_node])
         return index_node.get_publisher_response(ar)

lino/modlib/system/models.py

@@ -326,7 +326,7 @@ class BleachChecker(Checker):
             if len(m._bleached_fields):
                 yield m
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         t = tuple(obj.fields_to_bleach(save=False))
         if len(t):
             fldnames = ", ".join([f.name for f, old, new in t])

lino/modlib/uploads/mixins.py

@@ -72,7 +72,7 @@ def make_uploaded_file(filename, src=None, upload_date=None):
 def base64_to_image(imgstring):
     type, file = imgstring.split(";base64,")
     imgdata = base64.b64decode(file)
-    return make_captured_image(imgdata, timezone.now(), ext=f".{type.split('/')[1]}")
+    return make_captured_image(imgdata, dd.now(), ext=f".{type.split('/')[1]}")
 
 
 def make_captured_image(imgdata, upload_date=None, filename=None, ext='.jpg'):

lino/modlib/uploads/models.py

@@ -285,7 +285,7 @@ class UploadChecker(Checker):
     verbose_name = _("Check metadata of upload files")
     model = "uploads.Upload"
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         if obj.file:
             if not exists(join(settings.MEDIA_ROOT, obj.file.name)):
                 yield (
@@ -311,7 +311,7 @@ UploadChecker.activate()
 class UploadsFolderChecker(Checker):
     verbose_name = _("Find orphaned files in uploads folder")
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         assert obj is None  # this is an unbound checker
         Upload = rt.models.uploads.Upload
         pth = dd.plugins.uploads.uploads_root

lino/modlib/users/actions.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2024 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import datetime
@@ -9,7 +9,6 @@ from lino.utils.html import E, tostring
 from django.db import models
 from django.conf import settings
 from django.http import HttpResponse
-from django.utils import timezone
 from django.utils.translation import gettext
 from django.contrib.auth.password_validation import validate_password
 from django.core.exceptions import ValidationError
@@ -115,7 +114,6 @@ class CreateAccount(dd.Action):
         obj.full_clean()
         obj.save()
 
-
         ar.selected_rows = [obj]
         recipients = ["{} <{}>".format(obj.get_full_name(), obj.email)]
         send_welcome_email(ar, obj, recipients)
@@ -452,7 +450,7 @@ class SignOut(dd.Action):
 def validate_sessions_limit(request):
     if dd.plugins.users.active_sessions_limit == -1:
         return
-    qs = rt.models.sessions.Session.objects.filter(expire_date__gt=timezone.now())
+    qs = rt.models.sessions.Session.objects.filter(expire_date__gt=dd.now())
     if request.session.session_key:
         qs = qs.exclude(session_key=request.session.session_key)
     if qs.count() >= dd.plugins.users.active_sessions_limit:

lino/modlib/users/models.py

@@ -1,7 +1,9 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2023 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
+import random
+import string
 from datetime import timedelta
 from django.db import models
 from django.db.models import Q
@@ -9,15 +11,17 @@ from django.conf import settings
 from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
 from django.utils import timezone
 
-from lino.utils.html import E
 from lino.api import dd, rt, _
 from lino.core import userprefs
-
-# from lino.core.fields import NullCharField
+from lino.core.roles import Supervisor
 from lino.core.roles import SiteAdmin
-
+# from lino.core.fields import NullCharField
 from lino.mixins import CreatedModified, Contactable
 from lino.mixins import DateRange
+from lino.modlib.about.choicelists import TimeZones, DateFormats
+from lino.modlib.publisher.mixins import Publishable
+from lino.modlib.about.models import About
+from lino.utils.html import E
 
 from .choicelists import UserTypes
 from .mixins import UserAuthored  # , TimezoneHolder
@@ -25,14 +29,8 @@ from .actions import ChangePassword, SignOut, CheckedSubmitInsert
 from .actions import SendWelcomeMail, SignIn, ConnectAccount
 from .actions import SendWelcomeMail, CreateAccount, ResetPassword, VerifyUser, VerifyMe
 
-# from .actions import SignIn
-from lino.modlib.about.choicelists import TimeZones, DateFormats
-from lino.modlib.publisher.mixins import Publishable
+from .ui import *
 
-from lino.core.roles import Supervisor
-
-import random
-import string
 
 if multi_ledger := dd.is_installed("ledgers"):
     from lino_xl.lib.ledgers.actions import SubscribeToLedger
@@ -100,7 +98,7 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
     if dd.plugins.users.with_nickname:
         nickname = models.CharField(_("Nickname"), max_length=50, blank=True)
     else:
-        nickname = dd.DummyField()
+        nickname = dd.DummyField("")
     first_name = models.CharField(_("First name"), max_length=30, blank=True)
     last_name = models.CharField(_("Last name"), max_length=30, blank=True)
     remarks = models.TextField(_("Remarks"), blank=True)  # ,null=True)
@@ -156,7 +154,7 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
 
     def must_verify(self):
         self.verification_code = id_generator(12)
-        self.verification_code_sent_on = timezone.now()
+        self.verification_code_sent_on = dd.now()
 
     def is_verified(self):
         return not self.verification_code
@@ -170,7 +168,7 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
         return (
             self.verification_code_sent_on
             + timedelta(minutes=dd.plugins.users.verification_code_expires)
-            < timezone.now()
+            < dd.now()
         )
 
     def get_as_user(self):
@@ -451,8 +449,6 @@ class Permission(dd.Model):
         abstract = True
 
 
-from lino.modlib.about.models import About
-
 About.sign_in = SignIn()
 About.reset_password = ResetPassword()
 About.verify_user = VerifyUser()
@@ -478,7 +474,5 @@ def setup_memo_commands(sender=None, **kwargs):
     )
 
 
-from .ui import *
-
 if dd.get_plugin_setting("users", "third_party_authentication"):
     Me.connect_account = ConnectAccount()

lino/modlib/users/ui.py

@@ -118,7 +118,7 @@ class AllUsers(Users):
 class UsersOverview(Users):
     required_roles = set([])
     column_names = "username user_type language"
-    exclude = dict(user_type="")
+    exclude = models.Q(user_type="")
     # abstract = not settings.SITE.is_demo_site
     detail_layout = None
 

lino/sphinxcontrib/logo/templates/part-of-synodalsoft.html

@@ -5,7 +5,6 @@ This website is part of the Synodalsoft project:
 <a class="reference external" href="https://using.lino-framework.org">User Guide</a> |
 <a class="reference external" href="https://hosting.lino-framework.org">Hosting Guide</a> |
 <a class="reference external" href="https://dev.lino-framework.org">Developer Guide</a> |
-<a class="reference external" href="https://community.lino-framework.org">Community Guide</a> |
 <a class="reference external" href="https://luc.lino-framework.org">Luc’s blog</a>
 </p><p>
 <a href="https://www.synodalsoft.net">

lino/utils/format_date.py

@@ -109,13 +109,18 @@ def day_and_weekday(d):
     # return d.strftime("%a%d")
 
 
-def ftl(t):
-    # "format time long"
+def fts(t):
+    # "format time short"
+    return t.strftime(settings.SITE.time_format_strftime)
+
+
+def fdtl(t):
+    # "format datetime long"
     return "{} {}".format(
         t.strftime(settings.SITE.date_format_strftime),
         t.strftime(settings.SITE.time_format_strftime))
 
 
-def ftf(t):
-    # "format time full"
-    return "{} ({})".format(ftl(t), naturaltime(t))
+def fdtf(t):
+    # "format datetime full"
+    return "{} ({})".format(fdtl(t), naturaltime(t))

lino/utils/media.py

@@ -1,14 +1,12 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2013-2021 Rumma & Ko Ltd
+# Copyright 2013-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """Defines the :class:`MediaFile` class.
 """
 
-from os.path import join
 from pathlib import Path
-
 from django.conf import settings
-from lino.core.utils import is_devserver
+# from lino.core.utils import is_devserver
 
 # davlink = settings.SITE.plugins.get('davlink', None)
 # has_davlink = davlink is not None and settings.SITE.use_java
@@ -24,7 +22,19 @@ class MediaFile(object):
     :attr:`webdav_root <lino.core.site.Site.webdav_root>`,
     :attr:`webdav_protocol <lino.core.site.Site.webdav_protocol>`
     and
-    :attr:`webdav_url <lino.core.site.Site.webdav_url>`
+    :attr:`webdav_url <lino.core.site.Site.webdav_url>`.
+
+    .. attribute:: path
+
+        A :class:`pathlib.Path` naming the file on the server's file system.
+
+    .. attribute:: url
+
+        The URL to use for getting this file from a web client.
+
+    Used by :meth:`lino.modlib.jinja.XMLMaker.get_xml_file`,
+    :attr:`lino.core.tables.AbstractTable.export_excel` and others.
+
     """
 
     def __init__(self, editable, *parts):
@@ -37,7 +47,7 @@ class MediaFile(object):
             # webdav server and a protocol handler.
             # if is_devserver():
             if False:
-                url = "file://" + join(settings.SITE.webdav_root, *parts)
+                url = "file://" + settings.SITE.webdav_root + "/".join(parts)
             else:
                 url = settings.SITE.webdav_url + "/".join(parts)
                 if settings.SITE.webdav_protocol:
@@ -48,31 +58,6 @@ class MediaFile(object):
         self.url = url
         self.path = path
 
-    # @property
-    # def path(self):
-    #     "Return the full filename on the server as a Path object."
-
-    # @property
-    # def name(self):
-    #     "return the filename on the server"
-    #     if self.editable and (has_davlink or settings.SITE.webdav_protocol):
-    #         return join(settings.SITE.webdav_root, *self.parts)
-    #     return join(settings.MEDIA_ROOT, *self.parts)
-
-    # def get_url(self, request):
-    #     "return the url that points to file on the server"
-    #     if self.editable and request is not None:
-    #         if is_devserver():
-    #             url = "file://" + join(settings.SITE.webdav_root, *self.parts)
-    #         else:
-    #             url = settings.SITE.webdav_url + "/".join(self.parts)
-    #             url = request.build_absolute_uri(url)
-    #         if settings.SITE.webdav_protocol:
-    #             url = settings.SITE.webdav_protocol + "://" + url
-    #         return url
-    #
-    #     return settings.SITE.build_media_url(*self.parts)
-
 
 class TmpMediaFile(MediaFile):
     def __init__(self, ar, fmt):

{lino-25.4.1.dist-info → lino-25.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.4.1
+Version: 25.4.3
 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