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

lino/modlib/linod/routing.py

@@ -1,67 +1,70 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2022 Rumma & Ko Ltd
+# Copyright 2022-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from django.urls import re_path
+from django.conf import settings
 from django.core.asgi import get_asgi_application
-from django.utils.functional import LazyObject
 
-from channels.middleware import BaseMiddleware
-from channels.db import database_sync_to_async
-from channels.sessions import SessionMiddlewareStack
-from channels.routing import ProtocolTypeRouter, URLRouter, ChannelNameRouter
+if settings.SITE.plugins.linod.use_channels:
 
-from lino.core.auth import get_user
-from lino.modlib.notify.consumers import ClientConsumer
+    from django.urls import re_path
+    from django.utils.functional import LazyObject
+    from channels.middleware import BaseMiddleware
+    from channels.db import database_sync_to_async
+    from channels.sessions import SessionMiddlewareStack
+    from channels.routing import ProtocolTypeRouter, URLRouter, ChannelNameRouter
 
-from .utils import CHANNEL_NAME
-from .consumers import LinodConsumer
+    from lino.core.auth import get_user
+    from lino.modlib.notify.consumers import ClientConsumer
 
+    from .utils import CHANNEL_NAME
+    from .consumers import LinodConsumer
 
-class UserLazyObject(LazyObject):
-    """
-    Throw a more useful error message when scope['user'] is accessed before it's resolved
-    """
+    class UserLazyObject(LazyObject):
+        """
+        Throw a more useful error message when scope['user'] is accessed before it's resolved
+        """
 
-    def _setup(self):
-        raise ValueError("Accessing scope user before it is ready.")
+        def _setup(self):
+            raise ValueError("Accessing scope user before it is ready.")
 
+    async def _get_user(scope):
+        class Wrapper:
+            def __init__(self, session):
+                self.session = session
 
-async def _get_user(scope):
-    class Wrapper:
-        def __init__(self, session):
-            self.session = session
+        r = Wrapper(scope["session"])
+        return await database_sync_to_async(get_user)(r)
 
-    r = Wrapper(scope["session"])
-    return await database_sync_to_async(get_user)(r)
+    class AuthMiddleware(BaseMiddleware):
+        def populate_scope(self, scope):
+            # Make sure we have a session
+            if "session" not in scope:
+                raise ValueError("AuthMiddleware cannot find session in scope.")
+            # Add it to the scope if it's not there already
+            if "user" not in scope:
+                scope["user"] = UserLazyObject()
 
+        async def resolve_scope(self, scope):
+            scope["user"]._wrapped = await _get_user(scope)
 
-class AuthMiddleware(BaseMiddleware):
-    def populate_scope(self, scope):
-        # Make sure we have a session
-        if "session" not in scope:
-            raise ValueError("AuthMiddleware cannot find session in scope.")
-        # Add it to the scope if it's not there already
-        if "user" not in scope:
-            scope["user"] = UserLazyObject()
+        async def __call__(self, scope, receive=None, send=None):
+            self.populate_scope(scope)
+            await self.resolve_scope(scope)
+            return await self.inner(scope, receive, send)
 
-    async def resolve_scope(self, scope):
-        scope["user"]._wrapped = await _get_user(scope)
+    routes = [re_path(r"^WS/$", ClientConsumer.as_asgi())]
 
-    async def __call__(self, scope, receive=None, send=None):
-        self.populate_scope(scope)
-        await self.resolve_scope(scope)
-        return await self.inner(scope, receive, send)
+    protocol_mapping = dict(
+        websocket=SessionMiddlewareStack(AuthMiddleware(URLRouter(routes))),
+        channel=ChannelNameRouter({CHANNEL_NAME: LinodConsumer.as_asgi()}),
+        http=get_asgi_application(),
+    )
 
+    application = ProtocolTypeRouter(protocol_mapping)
 
-routes = [re_path(r"^WS/$", ClientConsumer.as_asgi())]
+    # raise Exception("20240424")
 
-protocol_mapping = dict(
-    websocket=SessionMiddlewareStack(AuthMiddleware(URLRouter(routes))),
-    channel=ChannelNameRouter({CHANNEL_NAME: LinodConsumer.as_asgi()}),
-    http=get_asgi_application(),
-)
+else:
 
-application = ProtocolTypeRouter(protocol_mapping)
-
-# raise Exception("20240424")
+    application = get_asgi_application()

lino/modlib/memo/mixins.py

@@ -3,7 +3,6 @@
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 from lxml.html import fragments_fromstring
-from lino.utils.html import E, tostring, mark_safe
 import lxml
 
 try:
@@ -19,6 +18,7 @@ from django.utils.html import format_html
 from lino.core.gfks import gfk2lookup
 from lino.core.model import Model
 from lino.core.fields import fields_list, RichTextField, PreviewTextField
+from lino.utils.html import E, tostring, mark_safe
 from lino.utils.restify import restify
 from lino.utils.soup import truncate_comment
 from lino.utils.mldbc.fields import BabelTextField
@@ -33,6 +33,7 @@ def django_truncate_comment(html_str):
         settings.SITE.plugins.memo.short_preview_length, html=True
     )
 
+
 MARKDOWNCFG = dict(
     extensions=["toc"], extension_configs=dict(toc=dict(toc_depth=3, permalink=True))
 )
@@ -293,7 +294,7 @@ class PreviewableChecker(Checker):
             obj.save()
         # self.synchronize_mentions(mentions)
 
-    def get_checkdata_problems(self, obj, fix=False):
+    def get_checkdata_problems(self, ar, obj, fix=False):
         for x in self._get_checkdata_problems(settings.SITE.DEFAULT_LANGUAGE, obj, fix):
             yield x
         if isinstance(obj, BabelPreviewable):

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,7 +1,8 @@
-# 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"
@@ -11,13 +12,13 @@ def get_updatables(instance, ar=None):
     data = {
         "actorIDs": instance.updatable_panels,
         "pk": instance.pk,
-        "model": f"{instance._meta.app_label}.{instance.__class__.__name__}",
+        "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"{mi._meta.app_label}.{mi.__class__.__name__}")
+        data.update(mk=mi.pk, master_model=f"{fmn(mi)}")
     return 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/choicelists.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2020-2022 Rumma & Ko Ltd
+# Copyright 2020-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import os
@@ -8,7 +8,7 @@ from copy import copy
 from django.db import models
 from django.conf import settings
 from django.utils import translation
-from django.utils.text import format_lazy
+# from django.utils.text import format_lazy
 
 from lino.api import dd, rt, _
 from lino.utils.html import E, tostring, join_elems
@@ -181,19 +181,40 @@ class SpecialPage(dd.Choice):
     # pointing_field_name = 'publisher.Page.special_page'
     # show_values = True
 
-    def __init__(self, *args, **kwargs):
-        self.default_values = dict()
-        for k in ("ref", "title"):
+    def __init__(self, name, text=None, parent=None, **kwargs):
+        self.parent_value = parent
+        self._default_values = dict()
+        for k in ("ref", "title", "filler", "body"):
             if k in kwargs:
-                self.default_values[k] = kwargs.pop(k)
-        super().__init__(*args, **kwargs)
-        if not "title" in self.default_values:
-            self.default_values["title"] = self.text
-
-    def create_object(self, **kwargs):
-        kwargs.update(self.default_values)
-        kwargs.update(special_page=self)
-        return self.pointing_field.model(**kwargs)
+                self._default_values[k] = kwargs.pop(k)
+        super().__init__(name, text, name, **kwargs)
+        # if (filler := self.default_values.get('filler', None)):
+        #     if "title" not in self.default_values:
+        #         self.default_values["title"] = filler.data_view.get_actor_label()
+        # else:
+        #     if "title" not in self.default_values:
+        #         self.default_values["title"] = self.text
+
+    def on_page_created(self, obj):
+        for k, v in self._default_values.items():
+            setattr(obj, k, v)
+        if obj.filler and not obj.title:
+            obj.title = obj.filler.data_view.get_actor_label()
+        if not obj.title:
+            obj.title = self.text or "20250422"
+        if self.parent_value:
+            psp = self.choicelist.get_by_value(self.parent_value)
+            obj.parent = psp.get_object()
+
+    # def get_object(self, ar):
+    def get_object(self):
+        language = translation.get_language()
+        # if len(settings.SITE.languages) == 1:
+        #     language = translation.get_language()
+        # else:
+        #     language = ar.request.LANGUAGE_CODE
+        # return rt.models.publisher.Page.objects.get(ref=self.defaul_values['ref'], language=language)
+        return rt.models.publisher.Page.objects.get(special_page=self, language=language)
 
 
 class SpecialPages(dd.ChoiceList):
@@ -227,9 +248,9 @@ class SpecialPages(dd.ChoiceList):
 
 add = SpecialPages.add_item
 
-add("100", _("Home"), "home", ref="index", body=_("Welcome to our great website."))
-add("200", _("Terms and conditions"), "terms")
-add("300", _("Privacy policy"), "privacy")
-add("400", _("Cookie settings"), "cookies")
-add("500", _("Copyright"), "copyright")
-add("600", _("About us"), "about")
+add("home", _("Home"), ref="index", body=_("Welcome to our great website."))
+add("terms", _("Terms and conditions"))
+add("privacy", _("Privacy policy"))
+add("cookies", _("Cookie settings"))
+add("copyright", _("Copyright"))
+add("about", _("About us"))

lino/modlib/publisher/config/publisher/page.pub.html

@@ -32,6 +32,30 @@
 </div>
 {% endblock %}
 
+{% block navbar %}
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container-fluid">
+      {% set index_node, home_children = obj.home_and_children(ar) %}
+      <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar-collapsible-content" aria-expanded="false">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="{{ar.get_home_url()}}">{{ index_node.title }}</a>
+      </div>
+      <div class="collapse navbar-collapse" id="bs-navbar-collapsible-content">
+          <ul class="nav navbar-nav">
+              {% for child in home_children %}
+              <li>{{tostring(ar.obj2html(child))}}</li>
+              {% endfor %}
+          </ul>
+      </div>
+   </div>
+</nav>
+{% endblock %}
+
 {% block content %}
 <div class="row-fluid">
   {% for chunk in obj.as_page(ar) %}

lino/modlib/publisher/fixtures/demo2.py

@@ -0,0 +1,12 @@
+from asgiref.sync import async_to_sync
+from django.conf import settings
+from lino.modlib.linod.choicelists import Procedures
+from lino.api import rt
+
+
+def objects():
+    yield None
+    ar = rt.login("robin")
+    if True:  # settings.SITE.use_linod:
+        Procedures.update_publisher_pages.run(ar)
+        # async_to_sync(Procedures.update_publisher_pages.run)(ar)

lino/modlib/publisher/fixtures/std.py

@@ -18,10 +18,11 @@ def objects():
             with translation.override(lng.django_code):
                 kwargs = dict(language=lng.django_code, special_page=sp)
                 kwargs.update(publishing_state="published")
-                kwargs.update(sp.default_values)
+                # kwargs.update(sp.default_values)
                 if lng.suffix:
                     kwargs.update(translated_from=translated_from)
                 obj = Page(**kwargs)
+                sp.on_page_created(obj)
                 yield obj
                 if not lng.suffix:
                     translated_from = obj

lino/modlib/publisher/fixtures/synodalworld.py

@@ -0,0 +1,17 @@
+from lino.api import rt, _
+
+home_children = [
+    (_("Mission"), None, []),
+    (_("Maxim"), None, []),
+    (_("Propaganda"), None, []),
+    (_("About us"), None, [
+        (_("Team"), None, []),
+        (_("History"), None, []),
+        (_("Contact"), None, []),
+        (_("Terms & conditions"), None, []),
+    ]),
+]
+
+
+def objects():
+    return rt.models.publisher.make_demo_pages(home_children)

lino/modlib/publisher/mixins.py

@@ -7,6 +7,7 @@ from lino.utils.html import tostring
 from lino.api import dd, rt, _
 
 from django import http
+from django.db import models
 from django.conf import settings
 from django.utils.translation import get_language
 from lino.core.renderer import add_user_language
@@ -124,6 +125,11 @@ class Publishable(Printable):
     #     # context = dict(obj=self, request=request, language=get_language())
     #     return template.render(**context)
 
+    def home_and_children(self, ar):
+        home = rt.models.publisher.SpecialPages.home.get_object()
+        return home, rt.models.publisher.Page.objects.filter(parent=home)
+        # return dv.model.objects.filter(models.Q(parent=index_node) | models.Q(ref='index'), language=language)
+
     def get_publisher_response(self, ar):
         if not self.is_public():
             return http.HttpResponseNotFound(
@@ -147,6 +153,7 @@ class PublishableContent(Publishable):
     language = dd.LanguageField()
     publishing_state = PublishingStates.field(default="draft")
     filler = PageFillers.field(blank=True, null=True)
+    main_image = dd.ForeignKey('uploads.Upload', blank=True, null=True, verbose_name=_("Main image"))
 
     def get_print_language(self):
         return self.language

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,
@@ -105,6 +108,17 @@ class Page(
     # def as_story_item(self, ar, **kwargs):
     #     return "".join(self.as_page(ar, **kwargs))
 
+    def as_paragraph(self, ar):
+        title = E.b(escape(self.title))
+        url = ar.obj2url(self)
+        if url is not None:
+            title = E.a(title, href=url, style="text-decoration: none; color: black;")
+        body = self.get_body_parsed(ar, short=True)
+        if body:
+            body = " - " + body
+        item = E.li(title, body)
+        return tostring(item)
+
     def toc_html(self, ar, max_depth=1):
         def li(obj):
             # return "<li>{}</li>".format(obj.memo2html(ar, str(obj)))
@@ -131,7 +145,7 @@ class Page(
         else:
             title = "<b>{}</b> — ".format(escape(self.title))
             title += self.get_body_parsed(ar, short=True)
-            title = "<li>{}</i>".format(title)
+            title = "<li>{}</li>".format(title)
         # edit_url = ar.renderer.obj2url(ar, self)
         # url = self.publisher_url(ar)
         # print("20231029", ar.renderer)
@@ -146,6 +160,16 @@ class Page(
 
         # if not self.is_public():
         #     return
+        if hlevel == 1 and self.main_image:
+            yield f"""
+            <div class="row">
+                <div class="center-block">
+                    <a href="#" class="thumbnail">
+                        <img src="{self.main_image.get_media_file().get_image_url()}">
+                    </a>
+                </div>
+            </div>
+            """
 
         if display_mode in ("detail",):
             info = self.get_node_info(ar)
@@ -401,3 +425,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
+    child_node_depth main_image
     #page_type filler
-    language
+    publishing_state special_page
     publisher.TranslationsByPage
     """
 
@@ -147,7 +147,7 @@ class Pages(dd.Table):
     ref
     #page_type filler
     """
-    default_display_modes = {None: constants.DISPLAY_MODE_STORY}
+    default_display_modes = {None: constants.DISPLAY_MODE_LIST}
 
 
 class PagesByParent(Pages):

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