lino 25.4.4__tar.gz → 25.4.5__tar.gz

{lino-25.4.4 → lino-25.4.5}/PKG-INFO

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

{lino-25.4.4 → lino-25.4.5}/lino/__init__.py

@@ -31,7 +31,7 @@ from django import VERSION
 from django.apps import AppConfig
 from django.conf import settings
 import warnings
-__version__ = '25.4.4'
+__version__ = '25.4.5'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

{lino-25.4.4 → lino-25.4.5}/lino/core/fields.py

@@ -163,7 +163,7 @@ class PriceField(models.DecimalField):
     """
     A thin wrapper around Django's `DecimalField
     <https://docs.djangoproject.com/en/5.0/ref/models/fields/#decimalfield>`_
-    which adds default values for `decimal_places`, `max_length` and
+    with price-like default values for `decimal_places`, `max_length` and
     `max_digits`.
     """
 
@@ -656,8 +656,10 @@ class VirtualField(FakeField):
         self.model = model
         self.name = name
         self.attname = name
+        # if getattr(self.return_type, "model", False):
         if hasattr(self.return_type, "model"):
-            # logger.info("20200425 return_type for virtual field %s has a model", self)
+            # logger.info("20200425 return_type for virtual "
+            #     "field %s has a model %s (not %s)", self, self.return_type.model, model)
             return
         self.return_type.model = VirtualModel(model)
         self.return_type.column = None

{lino-25.4.4 → lino-25.4.5}/lino/core/kernel.py

@@ -37,6 +37,7 @@ from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.db.utils import DatabaseError
 from django.db import IntegrityError
+from django.utils.log import DEFAULT_LOGGING
 
 from django.db import models
 
@@ -162,7 +163,9 @@ class Kernel(object):
         # logger.info("20231016 kernel_startup (%s)", site._history_aware_logging)
         # print("20231019 kernel_startup()", site, site._history_aware_logging)
 
-        if site._history_aware_logging:
+        # if site._history_aware_logging:
+        # if not is_devserver():
+        if "file" in DEFAULT_LOGGING['handlers']:
             if len(sys.argv) == 0:
                 process_name = "WSGI"
             else:

{lino-25.4.4 → lino-25.4.5}/lino/core/requests.py

@@ -2031,9 +2031,9 @@ class ActionRequest(BaseRequest):
             if w is None:
                 WARNINGS_LOGGED[e] = True
                 # raise
-                # logger.exception(e)
                 logger.warning(f"Error while executing {repr(self)}: {e}\n"
                                "(Subsequent warnings will be silenced.)")
+                logger.exception(e)
 
         if self._data_iterator is None:
             raise Exception(f"No data iterator for {self}")

{lino-25.4.4 → lino-25.4.5}/lino/core/site.py

@@ -36,12 +36,13 @@ from lino.utils.html import E, tostring
 from lino.core.plugin import Plugin
 from lino.utils import AttrDict, date_offset, i2d, buildurl
 
+
 NO_REMOTE_AUTH = True
 # 20240518 We have only one production site still using remote http
 # authentication, and they will migrate to sessions-based auth with their next
 # upgrade.
 
-ASYNC_LOGGING = False
+# ASYNC_LOGGING = False
 # This is to fix the issue that the "started" and "ended" messages are not logged.
 # But setting this to True causes #4986 (Unable to configure handler 'mail_admins')
 # because since 20230529 we called logging..config.dictConfig() during
@@ -368,14 +369,14 @@ class Site(object):
     csv_params = dict()
 
     # attributes documented in book/docs/opics/loggin.rst:
-    _history_aware_logging = False
+    _history_aware_logging = True
     log_each_action_request = False
+    default_loglevel = "INFO"
     logger_filename = "lino.log"
     logger_format = (
         "%(asctime)s %(levelname)s [%(name)s %(process)d %(thread)d] : %(message)s"
     )
     auto_configure_logger_names = "atelier lino"
-    log_sock_path = None
 
     # appy_params = dict(ooPort=8100)
     appy_params = dict(
@@ -597,31 +598,36 @@ class Site(object):
         self.startup_time = datetime.datetime.now()
 
     def setup_logging(self):
-        # documented in book/docs/opics/loggin.rst
+        # documented in book/docs/topics/logging.rst
 
-        if not self.auto_configure_logger_names:
+        if self.auto_configure_logger_names is None:
             return
 
-        if len(logging.root.handlers) > 0:
-            # Logging has been configured by something else. This can happen
-            # when Site is instantiated a second time. Or accidentaly (e.g. when you call logging.basicConfig() in the settings.py), Or when some testing
-            # environment runs multiple doctests in a same process.  We don't
-            # care, we restart configuration from scratch.
-
-            for handler in logging.root.handlers[:]:
-                logging.root.removeHandler(handler)
+        # if len(logging.root.handlers) > 0:
+        #
+        #     # Logging has been configured by something else. This can happen
+        #     # when Site is instantiated a second time. Or accidentaly (e.g. when
+        #     # you call logging.basicConfig() in the settings.py), Or when some
+        #     # testing environment runs multiple doctests in a same process.  We
+        #     # don't care, we restart configuration from scratch.
+        #
+        #     for handler in logging.root.handlers[:]:
+        #         logging.root.removeHandler(handler)
 
         from django.utils.log import DEFAULT_LOGGING
 
         d = DEFAULT_LOGGING
 
-        if d.get("logger_ok", False):
-            # raise Exception("20231017")
-            return
+        # if d.get("logger_ok", False):
+        #     # raise Exception("20231017")
+        #     return
 
-        level = os.environ.get("LINO_LOGLEVEL", "INFO").upper()
+        level = os.environ.get("LINO_LOGLEVEL", self.default_loglevel).upper()
         file_level = os.environ.get("LINO_FILE_LOGLEVEL", level).upper()
-        min_level = min(*[getattr(logging, k) for k in (level, file_level)])
+        sql_level = os.environ.get("LINO_SQL_LOGLEVEL", level).upper()
+
+        min_level = min(*[getattr(logging, k) for k in (
+            level, file_level, sql_level)])
 
         # print("20231017 level is", level)
 
@@ -642,22 +648,13 @@ class Site(object):
 
         # when Site is instantiated several times, we keep the existing file handler
         # print("20231016", self.logger_filename, handlers.keys())
-        if self.logger_filename and "file" not in handlers:
+        if "file" not in handlers:
             logdir = self.site_dir / "log"
             if logdir.is_dir():
                 self._history_aware_logging = True
                 log_file_path = logdir / self.logger_filename
                 # print("20231019 logging", file_level, "to", log_file_path)
-                self.log_sock_path = logdir / (self.logger_filename + ".sock")
-                if self.log_sock_path.exists():
-                    # print("20231019 log via socket server")
-                    handlers["file"] = {
-                        "class": "lino.core.site.LinoSocketHandler",
-                        "host": str(self.log_sock_path),
-                        "port": None,
-                        "level": file_level,
-                    }
-                else:
+                if True:
                     # print("20231019 log directly to file")
                     formatters = d.setdefault("formatters", {})
                     formatters.setdefault(
@@ -671,6 +668,15 @@ class Site(object):
                         "encoding": "UTF-8",
                         "formatter": "verbose",
                     }
+            else:
+                try:
+                    from systemd.journal import JournalHandler
+                    handlers["file"] = {
+                        "class": "systemd.journal.JournalHandler",
+                        "SYSLOG_IDENTIFIER": str(self.project_name),
+                    }
+                except ImportError:
+                    pass
 
         # when a file handler exists, we have the loggers use it even if this
         # instance didn't create it:
@@ -681,9 +687,10 @@ class Site(object):
             # if name not in d['loggers']:
             d["loggers"][name] = loggercfg
 
-        dblogger = d["loggers"].setdefault("django.db.backends", {})
-        dblogger["level"] = os.environ.get("LINO_SQL_LOGLEVEL", "WARNING")
-        dblogger["handlers"] = loggercfg["handlers"]
+        if sql_level != level:
+            dblogger = d["loggers"].setdefault("django.db.backends", {})
+            dblogger["level"] = sql_level
+            dblogger["handlers"] = loggercfg["handlers"]
 
         # # https://code.djangoproject.com/ticket/30554
         # logger = d['loggers'].setdefault('django.utils.autoreload', {})
@@ -694,19 +701,19 @@ class Site(object):
         #         if item not in ['linod', 'root']:
         #             d['loggers'][item]['propagate'] = True
 
-        if ASYNC_LOGGING:
-            config = d.copy()
-
-            try:
-                logging.config.dictConfig(config)
-                # logging.config.dictConfig(d)
-            finally:
-                d.clear()
-                d["logger_ok"] = True
-                d["version"] = 1
-                d["disable_existing_loggers"] = False
-        else:
-            d["logger_ok"] = True
+        # if ASYNC_LOGGING:
+        #     config = d.copy()
+        #
+        #     try:
+        #         logging.config.dictConfig(config)
+        #         # logging.config.dictConfig(d)
+        #     finally:
+        #         d.clear()
+        #         # d["logger_ok"] = True
+        #         d["version"] = 1
+        #         d["disable_existing_loggers"] = False
+        # else:
+        #     d["logger_ok"] = True
         # self.update_settings(LOGGING=d)
         # pprint(d)
         # print("20161126 Site %s " % d['loggers'].keys())

{lino-25.4.4 → lino-25.4.5}/lino/core/utils.py

@@ -37,6 +37,9 @@ get_models = apps.get_models
 
 validate_url = URLValidator()
 
+DEVSERVER_COMMANDS = {
+    "runserver", "testserver", "test", "demotest", "makescreenshots", "shell"}
+
 
 def djangoname(o):
     return o.__module__.split(".")[-2] + "." + o.__name__
@@ -144,6 +147,8 @@ def is_devserver():
 
     """
     # ~ print 20130315, sys.argv[1]
+    if settings.DEBUG:
+        return True  # doctest under pytest
     if sys.argv[0].startswith("-"):
         return True  # doctest under pytest
     if len(sys.argv) <= 1:
@@ -153,9 +158,9 @@ def is_devserver():
     # if sys.argv[0].endswith("doctest.py") or sys.argv[0].endswith("doctest_utf8.py"):
     if sys.argv[0].endswith("doctest.py") or sys.argv[0].endswith("pytest"):
         return True
-    if sys.argv[1] in ("runserver", "testserver", "test", "makescreenshots", "shell"):
+    if sys.argv[1] in DEVSERVER_COMMANDS:
         return True
-    # print(sys.argv[1])
+    # print(sys.argv)
     return False
 
 

{lino-25.4.4 → lino-25.4.5}/lino/help_texts.py

@@ -182,8 +182,6 @@ help_texts = {
     'lino.utils.IncompleteDate' : _("""Naive representation of a potentially incomplete gregorian date."""),
     'lino.utils.IncompleteDate.parse' : _("""Parse the given string and return an IncompleteDate object."""),
     'lino.utils.IncompleteDate.get_age' : _("""Return age in years as integer."""),
-    'lino.utils.SumCollector' : _("""A dictionary of sums to be collected using an arbitrary key."""),
-    'lino.utils.SumCollector.collect' : _("""Add the given value to the sum at the given key k."""),
     'lino.utils.MissingRow' : _("""Represents a database row that is expected to exist but doesn’t."""),
     'lino.utils.addressable.Addressable' : _("""General mixin (not only for Django models) to encapsulate the generating of “traditional” (“snail”) mail addresses."""),
     'lino.utils.addressable.Addressable.address_person_lines' : _("""Yield one or more text lines, one for each line of the person part."""),

{lino-25.4.4 → lino-25.4.5}/lino/mixins/registrable.py

@@ -1,18 +1,18 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2010-2020 Rumma & Ko Ltd
+# Copyright 2010-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
 This defines the :class:`Registable` model mixin.
 """
 
 from django.db import models
-from django.utils.translation import gettext_lazy as _
+# from django.utils.translation import gettext_lazy as _
 
+from lino import logger
 from lino.core import model
-from lino.core.actions import Action
+# from lino.core.actions import Action
 from lino.core.workflows import ChangeStateAction
 from lino.core.exceptions import ChangedAPI
-
 from lino.core.workflows import State
 
 
@@ -180,6 +180,7 @@ class Registrable(model.Model):
         state_field = self.workflow_state_field
         target_state = state_field.choicelist.draft
         self.set_workflow_state(ar, state_field, target_state)
+        logger.warning("%s deregisters %s", ar.get_user(), self)
 
     # no longer needed after 20170826
     # @classmethod

{lino-25.4.4 → lino-25.4.5}/lino/modlib/jinja/mixins.py

@@ -11,6 +11,7 @@ from django.conf import settings
 from django.utils.html import mark_safe, escape
 
 from lino.api import dd, _
+from lino.utils.sums import myround
 from lino.utils.xml import validate_xml
 from lino.utils.media import MediaFile
 
@@ -51,6 +52,7 @@ class XMLMaker(dd.Model):
         context = self.get_printable_context(ar)
         context.update(xml_element=xml_element)
         context.update(base64=base64)
+        context.update(myround=myround)
         xml = tpl.render(**context)
         # parts = [
         #     dd.plugins.accounting.xml_media_dir,

{lino-25.4.4 → lino-25.4.5}/lino/modlib/linod/management/commands/linod.py

@@ -3,13 +3,11 @@
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 # import time
-import os
 import asyncio
-
 from django.conf import settings
 from django.core.management import BaseCommand, call_command
-from lino.api import dd, rt
-from lino.modlib.linod.mixins import start_log_server, start_task_runner
+from lino.api import dd
+from lino.modlib.linod.mixins import start_task_runner
 from lino.core.requests import BaseRequest
 
 if dd.plugins.linod.use_channels:
@@ -33,19 +31,6 @@ class Command(BaseCommand):
         #                     default=False)
 
     def handle(self, *args, **options):
-        log_sock_path = settings.SITE.log_sock_path
-
-        if log_sock_path and log_sock_path.exists():
-            if options.get("force"):
-                log_sock_path.unlink()
-            else:
-                raise Exception(
-                    f"log socket already exists: {log_sock_path}\n"
-                    "It's probable that a worker process is already running. "
-                    "Try: 'ps awx | grep linod' OR 'sudo supervisorctl status | grep worker'\n"
-                    "Or the last instance of the worker process did not finish properly. "
-                    "In that case remove the file and run this command again."
-                )
 
         if not dd.plugins.linod.use_channels:
             # print("20240424 Run Lino daemon without channels")
@@ -57,8 +42,8 @@ class Command(BaseCommand):
                 except settings.SITE.user_model.DoesNotExist:
                     u = None
                 ar = BaseRequest(user=u)
-                # ar = rt.login(dd.plugins.linod.daemon_user)
-                await asyncio.gather(start_log_server(), start_task_runner(ar))
+                # await asyncio.gather(start_log_server(), start_task_runner(ar))
+                await start_task_runner(ar)
                 # t1 = asyncio.create_task(settings.SITE.start_log_server())
                 # t2 = asyncio.create_task(start_task_runner(ar))
                 # await t1
@@ -84,7 +69,7 @@ class Command(BaseCommand):
             async def initiate_linod():
                 layer = get_channel_layer()
                 # if log_sock_path is not None:
-                await layer.send(CHANNEL_NAME, {"type": "log.server"})
+                # await layer.send(CHANNEL_NAME, {"type": "log.server"})
                 # await asyncio.sleep(1)
                 await layer.send(CHANNEL_NAME, {"type": "run.background.tasks"})
 

{lino-25.4.4 → lino-25.4.5}/lino/modlib/linod/mixins.py

@@ -291,42 +291,3 @@ async def start_task_runner(ar=None, max_count=None):
             continue
         await ar.adebug("Let task runner sleep for %s seconds.", to_sleep)
         await asyncio.sleep(to_sleep)
-
-
-class LogReceiver(asyncio.Protocol):
-    # def connection_made(self, transport):
-    #     print("20231019 connection_made", transport)
-
-    def data_received(self, data: bytes):
-        data = pickle.loads(
-            data[4:]
-        )  # first four bytes gives the size of the rest of the data
-        record = logging.makeLogRecord(data)
-        # print("20231019 data_received", record)
-        # 20231019 server_logger.handle(record)
-        logger.handle(record)
-
-
-async def start_log_server():
-    # 'log.server' in linod.py
-    site = settings.SITE
-    log_sock_path = site.log_sock_path
-    if log_sock_path is None:
-        logger.info(
-            "No log server because there is no directory %s.", site.site_dir / "log"
-        )
-        return
-    if log_sock_path.exists():
-        raise Exception("Cannot start log server when socket file exists.")
-    logger.info("Log server starts listening on %s", log_sock_path)
-
-    def remove_sock_file():
-        logger.info("Remove socket file %s", site.log_sock_path)
-        site.log_sock_path.unlink(missing_ok=True)
-
-    site.register_shutdown_task(remove_sock_file)
-    loop = asyncio.get_running_loop()
-    server = await loop.create_unix_server(LogReceiver, log_sock_path)
-    # await server.serve_forever()
-    async with server:
-        await server.serve_forever()

{lino-25.4.4 → lino-25.4.5}/lino/modlib/publisher/config/publisher/page.pub.html

@@ -6,6 +6,12 @@
     {% if isinstance(obj, rt.models.publisher.Page) -%}
     {{obj.get_prev_link(ar)}} | {{obj.get_next_link(ar)}} |
     {% endif -%}
+    {% if dd.is_installed('react') %}
+        {% set ar_react = obj.get_default_table().request(parent=ar, permalink_uris=True, renderer=dd.plugins.react.renderer) %}
+        {% if ar_react.obj2url(obj) %}
+        {{ tostring(ar_react.obj2html(obj, text='Edit')) }} |
+        {% endif %}
+    {% endif %}
     {% if ar.request and ar.request.path != '/' -%}
         <a href="{{ar.get_home_url()}}">{{_("Home")}}</a>
     {% else -%}

lino-25.4.5/lino/modlib/publisher/fixtures/synodalworld.py

@@ -0,0 +1,30 @@
+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():
+    image = rt.models.uploads.Upload.objects.first()
+    print('='*80)
+    print(image)
+    def iterate(iterable):
+        try:
+            for obj in iterable:
+                yield iterate(obj)
+        except TypeError:
+            if (obj := iterable).title == 'Mission':
+                obj.main_image = image
+            yield obj
+    for obj in rt.models.publisher.make_demo_pages(home_children):
+        yield iterate(obj)
+

{lino-25.4.4 → lino-25.4.5}/lino/modlib/publisher/models.py

@@ -9,10 +9,13 @@ 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
 
+try:
+    from lorem import get_paragraph
+except ImportError:
+    lorem = None
 
 # from django.utils.translation import get_language
 from django.utils.html import mark_safe
@@ -160,16 +163,6 @@ 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)
@@ -182,9 +175,20 @@ class Page(
 
         # if display_mode in ("detail", "story"):
         if display_mode == "detail":
-            if hlevel == 1 and not dd.plugins.memo.use_markup:
+            if hlevel == 1 and not dd.plugins.memo.use_markup and self.ref != 'index':
                 yield self.toc_html(ar)
 
+            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>
+                """
+
             # yield self.body_full_preview
             yield self.get_body_parsed(ar, short=False)
 

{lino-25.4.4 → lino-25.4.5}/lino/utils/__init__.py

@@ -63,7 +63,6 @@ import traceback
 from dateutil.relativedelta import relativedelta
 import re
 from decimal import Decimal
-from collections import OrderedDict
 from urllib.parse import urlencode
 
 # import locale
@@ -76,6 +75,7 @@ from etgen.utils import join_elems
 
 from lino.utils.cycler import Cycler
 from lino.utils.code import codefiles, codetime
+from .sums import SumCollector
 
 from rstgen.utils import confirm, i2d, i2t
 
@@ -609,61 +609,6 @@ def puts(s):
     print(s)
 
 
-class SumCollector(object):
-    """A dictionary of sums to be collected using an arbitrary key.
-
-    This is also included in the default context used by the Jinja
-    renderer (:mod:`lino.modlib.jinja`) when rendering templates,
-    which makes it a more complete solution for a problem asked also
-    elsewhere, e.g. on `Stackoverflow
-    <https://stackoverflow.com/questions/7537439/how-to-increment-a-variable-on-a-for-loop-in-jinja-template>`__.
-
-    See examples in :doc:`/topics/utils`.
-
-    """
-
-    def __init__(self):
-        self._sums = OrderedDict()
-
-    def collect(self, k, value):
-        """Add the given value to the sum at the given key k."""
-        if value is None:
-            return
-        if k in self._sums:
-            # print("20230614 a", k, "=", self._sums[k], "+", value)
-            self._sums[k] += value
-        else:
-            # print("20230614 b", k, "=", value)
-            self._sums[k] = value
-
-    def __getattr__(self, k):
-        return self._sums.get(k)
-
-    def __getitem__(self, k):
-        return self._sums.get(k)
-
-    def total(self):
-        return sum(self._sums.values())
-
-    def items(self, *args, **kwargs):
-        return self._sums.items(*args, **kwargs)
-
-    def keys(self, *args, **kwargs):
-        return self._sums.keys(*args, **kwargs)
-
-    def values(self, *args, **kwargs):
-        return self._sums.values(*args, **kwargs)
-
-    def __len__(self):
-        return self._sums.__len__()
-
-    def __str__(self):
-        return str(self._sums)
-
-    def __repr__(self):
-        return repr(self._sums)
-
-
 class SimpleSingleton(object):
     _instance = None