lino 25.8.3__py3-none-any.whl → 25.9.0__py3-none-any.whl

lino/modlib/comments/ui.py

@@ -2,7 +2,6 @@
 # Copyright 2013-2023 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from lino.modlib.publisher.choicelists import PageFillers
 from django.contrib.humanize.templatetags.humanize import naturaltime
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
@@ -66,18 +65,22 @@ class CommentDetail(dd.DetailLayout):
 
     more = dd.Panel(
         """
-    #body more2
+    more1 more2
     """,
         label=_("More"),
     )
 
-    more2 = """
+    more1 = """
     id user group
     owner_type owner_id
-    created modified
     comment_type
     ReactionsByComment
     """
+    more2 = """
+    created modified
+    memo.MentionsByTarget
+    memo.MentionsByOwner
+    """
 
 
 class Comments(dd.Table):
@@ -314,6 +317,3 @@ class Reactions(dd.Table):
 class ReactionsByComment(Reactions):
     master_key = "comment"
     default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
-
-
-PageFillers.add_item(RecentComments)

lino/modlib/extjs/__init__.py

@@ -28,7 +28,8 @@ from django.utils.translation import gettext_lazy as _
 class Plugin(Plugin):
     """Extends :class:`lino.core.plugin.Plugin`."""
 
-    needs_plugins = ["lino.modlib.bootstrap5"]
+    # needs_plugins = ["lino.modlib.bootstrap5"]
+    needs_plugins = ["lino.modlib.jinja"]
 
     enter_submits_form = False
     """Whether the :kbd:`ENTER` key (or :kbd:`CTRL+ENTER` when in a
@@ -216,9 +217,6 @@ class Plugin(Plugin):
         from django.urls import re_path as url
         from . import views
 
-        # if self.site.developer_site_cache:
-        #     self.renderer.build_site_cache()
-
         rx = "^"
 
         urlpatterns = [

lino/modlib/extjs/config/extjs/index.html

@@ -130,7 +130,7 @@
            {{ ln }}{% endfor -%}
     {%- endfor -%}
     {# Main Lino js code #}
-    {{ javascript(site.build_site_cache_url(*ext_renderer.lino_js_parts())) }}
+    {{ javascript(site.build_media_url(*ext_renderer.lino_js_parts())) }}
     {# javascript(site.buildurl('linolib.js')) #}
     {# ###### OnReady JS code ###### #}
     <script type="text/javascript">

lino/modlib/extjs/ext_renderer.py

@@ -420,10 +420,7 @@ class ExtRenderer(JsCacheRenderer):
                 user = request.subst_user
 
         def getit():
-            if (
-                settings.SITE.developer_site_cache
-                and not settings.SITE.never_build_site_cache
-            ):
+            if settings.SITE.developer_site_cache:
                 self.build_js_cache(False)
 
             # Render template
@@ -1478,9 +1475,6 @@ class ExtRenderer(JsCacheRenderer):
                 )
             yield "LANGUAGE_CHOICES = %s;" % py2js(list(settings.SITE.LANGUAGE_CHOICES))
             yield "MEDIA_URL = %s;" % py2js(settings.SITE.build_media_url())
-            # if settings.SITE.never_build_site_cache:
-            #     yield "GEN_TIMESTAMP = '%s';" % settings.SITE.kernel.lino_version
-            # else:
             yield "GEN_TIMESTAMP = %s;" % py2js(settings.SITE.kernel.lino_version)
 
         return "\n".join(fn())

lino/modlib/extjs/views.py

@@ -597,11 +597,13 @@ class ApiList(View):
 
             if True:
                 kw.update(title=str(ar.get_title()))
+                # kw.update(title=str(ar.get_breadcrumbs()))
             else:
                 # 20190704 work in progress.
                 # add open_in_own_window button after title of slave panel
                 kw.update(
                     title=str(ar.get_title())
+                    # title=str(ar.get_breadcrumbs())
                     + " "
                     + tostring(ar.open_in_own_window_button())
                 )

lino/modlib/help/models.py

@@ -28,17 +28,6 @@ class OpenHelpWindow(dd.Action):
     help_text = _("Open Help Window")
     show_in_plain = True
 
-    # def js_handler(self, actor):
-    #     parts = ['cache', 'help']
-    #     if get_language() != settings.SITE.DEFAULT_LANGUAGE.django_code:
-    #         parts.append(get_language())
-    #     parts.append(str(actor) + ".html")
-    #     url = settings.SITE.build_site_cache_url(*parts)
-    #     # return "let _ = window.open('%s');" % url
-    #     # return "() => window.open('%s')" % url
-    #     return "function (){window.open('%s')}" % url
-    #     # return "window.open('%s')" % url
-
     def run_from_ui(self, ar, **kwargs):
         # print("20210612")
         parts = ["cache", "help"]
@@ -46,7 +35,7 @@ class OpenHelpWindow(dd.Action):
             parts.append(get_language())
         parts.append(str(ar.actor) + ".html")
         # parts.append("index.html")
-        url = settings.SITE.build_site_cache_url(*parts)
+        url = settings.SITE.build_media_url(*parts)
         ar.set_response(success=True)
         ar.success(open_url=url)
 

lino/modlib/linod/mixins.py

@@ -179,10 +179,11 @@ class Runnable(Sequenced, RecurrenceSet):
                 await ar.adebug("Terminated %s with warning %s", self, str(e))
                 self.message = out.getvalue()
             except Exception as e:
+                tb = "".join(traceback.format_exception(e))
                 self.message = out.getvalue()
-                self.message += "\n" + "".join(traceback.format_exception(e))
+                self.message += "\n" + tb
                 self.disabled = True
-                await ar.awarning("Disabled %s after exception %s", self, e)
+                await ar.awarning("Disabled %s after exception:\n%s", self, tb)
                 # ar.warning("Disabled %s after exception %s", astr(self), e)
         # now = await sync_to_async(dd.now)()
         self.last_end_time = timezone.now()

lino/modlib/memo/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2008-2023 Rumma & Ko Ltd
+# Copyright 2008-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """See :doc:`/specs/memo`.
 
@@ -15,6 +15,7 @@ Adds functionality for using memo commands in your text fields.
 # from importlib import import_module
 # from rstgen.utils import py2url_txt
 from lino.api import ad
+from lino.core import constants
 from .parser import Parser, split_name_rest
 from lino.utils.html import tostring
 
@@ -94,20 +95,20 @@ class Plugin(ad.Plugin):
             kwargs = dict()  # , nosummary=True)
             dv = self.site.models.resolve(s)
             sar = dv.create_request(parent=ar, limit=dv.preview_limit)
-            rv = ""
-            # rv += "20230325 [show {}]".format(dv)
-            for e in sar.renderer.table2story(sar, **kwargs):
-                rv += tostring(e)
-            return rv
+            return sar.show(**kwargs)
+            # kwargs.update(display_mode=constants.DISPLAY_MODE_STORY)
+            # return sar.show_story(**kwargs)
+            # rv = ""
+            # # rv += "20230325 [show {}]".format(dv)
+            # for e in sar.renderer.table2story(sar, **kwargs):
+            #     rv += tostring(e)
+            # return rv
 
         self.parser.register_command("show", show2html)
 
         if False:
             # letting website users execute arbitrary code is a security risk
             def eval2html(ar, s, cmdname, mentions, context):
-                from django.conf import settings  # context of exec command
-
-                sar = ar.spawn_request(renderer=settings.SITE.kernel.html_renderer)
                 return eval(compile(s, cmdname, "eval"))
 
             self.parser.register_command("eval", eval2html)

lino/modlib/memo/mixins.py

@@ -1,7 +1,9 @@
 # -*- coding: UTF-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)
 
+# import difflib
+# import sys
 from lxml.html import fragments_fromstring
 import lxml
 
@@ -19,6 +21,7 @@ from lino.core.fields import 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.soup import MORE_MARKER
 from lino.utils.mldbc.fields import BabelTextField
 from lino.modlib.checkdata.choicelists import Checker
 from lino.api import rt, dd, _
@@ -130,6 +133,7 @@ class MemoReferrable(dd.Model):
 
 # class BasePreviewable(MentionGenerator):
 class BasePreviewable(dd.Model):
+
     class Meta:
         abstract = True
 
@@ -138,12 +142,13 @@ class BasePreviewable(dd.Model):
     def get_preview_length(self):
         return settings.SITE.plugins.memo.short_preview_length
 
+  # def after_ui_save(self, ar, watcher):
     def save(self, *args, **kwargs):
         """Updates the preview fields and the list of mentioned objects."""
-        pf = self.previewable_field
         mentions = set()
+        pf = self.previewable_field
         txt = self.get_previewable_text(settings.SITE.DEFAULT_LANGUAGE)
-        short, full = self.parse_previews(txt, None, mentions)
+        short, full = self.parse_previews(txt, None, mentions, True)
         # if "choose one or the other" in short:
         #     raise Exception("20230928 {} {}".format(len(short), short))
         # print("20231023 b", short)
@@ -154,23 +159,30 @@ class BasePreviewable(dd.Model):
                 src = self.get_previewable_text(lng)
                 # src = getattr(self, pf + lng.suffix)
                 with translation.override(lng.django_code):
-                    short, full = self.parse_previews(src, None, mentions)
+                    short, full = self.parse_previews(src, None, mentions, True)
                 setattr(self, pf + "_short_preview" + lng.suffix, short)
                 setattr(self, pf + "_full_preview" + lng.suffix, full)
+
+        # self.save()  # yes this causes a second save()
         super().save(*args, **kwargs)
+        # super().after_ui_save(ar, watcher)
         self.synchronize_mentions(mentions)
 
     def get_previewable_text(self, lng):
         return getattr(self, self.previewable_field + lng.suffix)
 
-    def parse_previews(self, source, ar=None, mentions=None, **context):
+    def parse_previews(
+            self, source, ar=None, mentions=None, save=False, **context):
         context.update(self=self)
         full = settings.SITE.plugins.memo.parser.parse(
-            source, ar=ar, context=context, mentions=mentions
-        )
-        short = truncate_comment(full, self.get_preview_length())
-        if not full.startswith("<"):
-            if settings.SITE.plugins.memo.use_markup:
+            source, ar=ar, mentions=mentions, context=context)
+        short = truncate_comment(
+            full, self.get_preview_length(),
+            ar=ar, save=save, mentions=mentions)
+        if len(chunks := full.split(MORE_MARKER, 1)) == 2:
+            full = " ".join(chunks)
+        if settings.SITE.plugins.memo.use_markup:
+            if not full.startswith("<"):
                 full = markdown.markdown(full, **MARKDOWNCFG)
         return (short, full)
 
@@ -201,7 +213,7 @@ class BasePreviewable(dd.Model):
                 for e in lxml.html.fragments_fromstring(self.body_short_preview):
                     yield e
             except Exception as e:
-                yield "{} [{}]".format(self.body_short_preview, e)
+                yield f"{self.body_short_preview} [{e}]"
 
 
 class Previewable(BasePreviewable):
@@ -218,20 +230,21 @@ class Previewable(BasePreviewable):
 
     def get_body_parsed(self, ar, short=False):
         if ar.renderer is settings.SITE.kernel.editing_front_end.renderer:
-            return self.body_short_preview if short else self.body_full_preview
+            return mark_safe(
+                self.body_short_preview if short else self.body_full_preview)
         # raise Exception("{} is not {}".format(
         #     ar.renderer, settings.SITE.kernel.editing_front_end.renderer))
         src = self.body
-        s, f = self.parse_previews(src, ar, set())
-        return s if short else f
+        s, f = self.parse_previews(src, ar, None, False)
+        return mark_safe(s if short else f)
 
     def as_paragraph(self, ar):
         s = super().as_paragraph(ar)
         # s = format_html("<b>{}</b> : {}", .format(ar.add_detail_link(self, str(self)))
         # s = ar.obj2htmls(self)
         s = format_html(
-            "<b>{}</b> : {}", s, mark_safe(self.body_short_preview) or _("(no preview)")
-        )
+            "<b>{}</b> : {}",
+            s, mark_safe(self.body_short_preview) or _("(no preview)"))
         return s
 
 
@@ -267,13 +280,16 @@ class PreviewableChecker(Checker):
         pf = obj.previewable_field
         # src = getattr(obj, pf+suffix)
         expected_mentions = set()
-        short, full = obj.parse_previews(src, None, expected_mentions)
+        short, full = obj.parse_previews(src, None, expected_mentions, False)
         is_broken = False
-        if (
-            getattr(obj, pf + "_short_preview" + lng.suffix) != short
-            or getattr(obj, pf + "_full_preview" + lng.suffix) != full
-        ):
+        stored_short = getattr(obj, pf + "_short_preview" + lng.suffix)
+        stored_full = getattr(obj, pf + "_full_preview" + lng.suffix)
+        if stored_short != short or stored_full != full:
             yield (True, _("Preview differs from source."))
+            # print(f"20250908 found_full is {stored_full}, to expected: {full}")
+            # # print("20250908 found_full to expected_full:")
+            # sys.stdout.writelines(difflib.unified_diff(
+            #     stored_full.splitlines(), full.splitlines()))
             is_broken = True
         found_mentions = set([obj.target for obj in obj.get_saved_mentions()])
         if expected_mentions != found_mentions:
@@ -284,6 +300,7 @@ class PreviewableChecker(Checker):
             # setattr(obj, pf+'_full_preview'+suffix, full)
             obj.full_clean()
             obj.save()
+            # obj.after_ui_save(ar, None)
         # self.synchronize_mentions(mentions)
 
     def get_checkdata_problems(self, ar, obj, fix=False):

lino/modlib/memo/models.py

@@ -23,7 +23,8 @@ target_label = _("Target")
 
 
 class Mention(Controllable):
-    class Meta(object):
+
+    class Meta:
         app_label = "memo"
         abstract = dd.is_abstract_model(__name__, "Mention")
         verbose_name = _("Mention")
@@ -85,12 +86,14 @@ class Mentions(dd.Table):
     # id comment owner created
     # """
 
-# Not used because when you are on the owner, you can see the mentions in the memo text
-# class MentionsByOwner(Mentions):
-#     label = _("Mentions")
-#     master_key = "owner"
-#     column_names = "target *"
-#     default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
+
+class MentionsByOwner(Mentions):
+    # Not much used because when you are on the owner, you can see the mentions
+    # in the memo text
+    label = _("Mentions")
+    master_key = "owner"
+    column_names = "target *"
+    default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
 
 
 class MentionsByTarget(Mentions):

lino/modlib/memo/parser.py

@@ -19,7 +19,7 @@ from django.conf import settings
 from lino import logger
 
 import re
-import inspect
+import traceback
 from typing import Callable, Any
 
 from bs4 import BeautifulSoup, MarkupResemblesLocatorWarning
@@ -313,6 +313,8 @@ All remaining arguments are used as the text of the link.
             mo.end(),
         )
         # logger.debug(msg)
+        # print(msg, ":")
+        # traceback.print_exc()
         return msg
 
     def parse_suggestions(self, src):

lino/modlib/notify/models.py

@@ -519,13 +519,10 @@ if remove_after:
 #     "You do not have a working installation of the service_identity module: .* Many valid certificate/hostname mappings may be rejected.",
 #     UserWarning)
 
+if dd.get_plugin_setting("linod", "use_channels", False):
 
-@dd.receiver(dd.post_ui_save)
-def notify_panels(sender, instance, ar=None, **kwargs):
-    if (
-        not dd.get_plugin_setting("linod", "use_channels", False)
-        or not instance.updatable_panels
-    ):
-        return
-    data = get_updatables(instance, ar)
-    send_panel_update(data)
+    @dd.receiver(dd.post_ui_save)
+    def notify_panels(sender, instance, ar=None, **kwargs):
+        if instance.updatable_panels:
+            data = get_updatables(instance, ar)
+            send_panel_update(data)

lino/modlib/publisher/__init__.py

@@ -10,7 +10,7 @@ class Plugin(Plugin):
         "lino.modlib.system",  # 'lino.modlib.memo',
         "lino.modlib.linod",
         "lino.modlib.jinja",
-        "lino.modlib.bootstrap5",
+        "lino.modlib.bootstrap5"
     ]
     locations: list[tuple[str, str]] = []
 
@@ -53,8 +53,17 @@ class Plugin(Plugin):
         # Only if this is the primary front end:
         if self.site.kernel.primary_front_end is self:
             # yield url("^(?P<ref>.*)$", views.Index.as_view())
+            Tree = self.site.models.publisher.Tree
+            from django.db.utils import OperationalError, ProgrammingError
+            # language=self.site.DEFAULT_LANGUAGE.django_code
+            try:
+                for t in Tree.objects.filter(ref__isnull=False):
+                    yield url(f"^{t.ref}$", views.Index.as_view(ref=t.ref))
+            except (OperationalError, ProgrammingError):
+                pass
             yield url("^$", views.Index.as_view())
-        # yield url('^login$',views.Login.as_view())
+        yield url('^login$',views.Login.as_view())
+        yield url('^logout$',views.Logout.as_view())
 
     def setup_main_menu(self, site, user_type, m, ar=None):
         mg = self.get_menu_group()
@@ -65,8 +74,4 @@ class Plugin(Plugin):
         mg = self.get_menu_group()
         m = m.add_menu(mg.app_label, mg.verbose_name)
         m.add_action("publisher.SpecialPages")
-
-    def setup_explorer_menu(self, site, user_type, m, ar=None):
-        mg = self.get_menu_group()
-        m = m.add_menu(mg.app_label, mg.verbose_name)
-        m.add_action("publisher.RootPages")
+        m.add_action("publisher.Trees")

lino/modlib/publisher/choicelists.py

@@ -87,65 +87,7 @@ add("20", _("Ready"), "ready", is_public=False)
 add("30", _("Public"), "published", is_public=True)
 add("40", _("Removed"), "removed", is_public=False)
 
-# class EntryStates(dd.Workflow):
-#     # verbose_name_plural = _("Enrolment states")
-#     required_roles = dd.login_required(dd.SiteAdmin)
-#     is_public = models.BooleanField(_("Public"), default=False)
-#
-#     @classmethod
-#     def get_column_names(self, ar):
-#         return "value name text button_text is_public"
-#
-# add = EntryStates.add_item
-# add('10', _("Draft"), 'draft', is_public=False)
-# add('20', _("Ready"), 'ready', is_public=False)
-# add('30', _("Public"), 'published', is_public=True)
-# add('40', _("Cancelled"), 'cancelled', is_public=False)
-
-
-class PageFiller(Choice):
-    data_view = None
-
-    def __init__(self, data_view=None, **request_params):
-        if data_view is not None:
-            self.data_view = data_view
-        self.request_params = request_params
-        super().__init__(str(self.data_view))
-
-    def create_request(self, ar, obj, **kwargs):
-        kwargs.update(self.request_params, parent=ar)
-        return self.data_view.create_request(**kwargs)
-
-    def get_dynamic_story(self, ar, obj, **kwargs):
-        txt = ""
-        sar = self.create_request(ar, obj, limit=self.data_view.preview_limit)
-        # print("20231028", dv, list(sar))
-        # print("20230409", ar.renderer)
-        # rv += "20230325 [show {}]".format(dv)
-        for e in sar.renderer.table2story(sar, **kwargs):
-            txt += tostring(e)
-        return txt
-
-    def get_dynamic_paragraph(self, ar, obj, **kwargs):
-        # dv = self.data_view
-        # sar = dv.create_request(parent=ar, limit=dv.preview_limit)
-        sar = self.create_request(ar, obj)
-        return " / ".join([sar.obj2htmls(row) for row in sar])
-
-
-class PageFillers(ChoiceList):
-    verbose_name = _("Page filler")
-    verbose_name_plural = _("Page fillers")
-    item_class = PageFiller
-    max_length = 50
-    column_names = "value name text data_view *"
-
-    @dd.virtualfield(models.CharField(_("Data table")))
-    def data_view(cls, choice, ar):
-        return choice.data_view
-
-
-# class SpecialPage(PointingChoice):
+
 class SpecialPage(dd.Choice):
     # pointing_field_name = 'publisher.Page.special_page'
     # show_values = True
@@ -153,7 +95,8 @@ class SpecialPage(dd.Choice):
     def __init__(self, name, text=None, parent=None, **kwargs):
         self.parent_value = parent
         self._default_values = dict()
-        for k in ("ref", "title", "filler", "body"):
+        # for k in ("ref", "title", "filler", "body"):
+        for k in ("ref", "title", "body"):
             if k in kwargs:
                 self._default_values[k] = kwargs.pop(k)
         super().__init__(name, text, name, **kwargs)
@@ -167,8 +110,8 @@ class SpecialPage(dd.Choice):
     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 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:
@@ -183,7 +126,8 @@ class SpecialPage(dd.Choice):
         # 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)
+        return rt.models.publisher.Page.objects.get(
+            special_page=self, language=language)
 
 
 class SpecialPages(dd.ChoiceList):
@@ -206,7 +150,8 @@ class SpecialPages(dd.ChoiceList):
         Page = rt.models.publisher.Page
         for lng in settings.SITE.languages:
             try:
-                page = Page.objects.get(special_page=choice, language=lng.django_code)
+                page = Page.objects.get(
+                    special_page=choice, language=lng.django_code)
                 lst.append(ar.obj2html(page, lng.name))
             except Page.DoesNotExist:
                 page = _("(create)")