lino 25.3.0__py3-none-any.whl → 25.3.1__py3-none-any.whl

lino/__init__.py

@@ -26,7 +26,7 @@ defines no models, some template files, a series of :term:`django-admin commands
 
 """
 
-__version__ = '25.3.0'
+__version__ = '25.3.1'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/api/doctest.py

@@ -14,6 +14,38 @@ tested document. It includes
 
 """
 
+from lino.core.boundaction import BoundAction
+from lino.core.tables import AbstractTable
+from lino.core.actions import Action
+from django.db.models import Model
+from lino.core.layouts import BaseLayout
+from lino.core.actions import register_params
+from lino.core.actions import ShowTable
+from lino.core.menus import Menu
+from lino.utils.html import html2text
+from lino.core.utils import full_model_name, get_models
+from lino.utils.diag import visible_for
+from lino.sphinxcontrib.actordoc import menuselection_text
+from lino import logger
+from lino.core.menus import find_menu_item
+from lino.core import constants
+from lino.core import actors, kernel
+from lino.utils.sql import sql_summary
+from lino.utils import diag
+from lino.utils.diag import analyzer
+from lino.utils.html import E, tostring, to_rst
+from lino.utils import i2d
+from lino.utils import AttrDict
+from rstgen.utils import unindent, rmu, sixprint
+from rstgen import attrtable
+import rstgen
+import pytest
+from django.db import connection, reset_queries as reset_sql_queries
+from django.test import Client
+from django.utils.encoding import force_str
+from django.utils import translation
+from lino.api.shell import *
+from lino.core.constants import *
 import os
 import sys
 import datetime
@@ -31,39 +63,11 @@ from urllib.parse import urlencode
 import django
 django.setup()
 
-from lino.core.constants import *
-from lino.api.shell import *
-from django.utils import translation
-from django.utils.encoding import force_str
-from django.test import Client
-from django.db import connection, reset_queries as reset_sql_queries
 
-import pytest
 # from rstgen import table, ul
-import rstgen
-from rstgen import attrtable
-from rstgen.utils import unindent, rmu, sixprint
 
-from lino.utils import AttrDict
-from lino.utils import i2d
-from lino.utils.html import E, tostring, to_rst
-from lino.utils.diag import analyzer
-from lino.utils import diag
-from lino.utils.sql import sql_summary
-from lino.core import actors, kernel
-from lino.core import constants
-from lino.core.menus import find_menu_item
-from lino import logger
-from lino.sphinxcontrib.actordoc import menuselection_text
-from lino.utils.diag import visible_for
-from lino.core.utils import full_model_name, get_models
 
 # from lino.core.utils import PseudoRequest
-from lino.utils.html import html2text
-from lino.core.menus import Menu
-from lino.core.actions import ShowTable
-from lino.core.actions import register_params
-from lino.core.layouts import BaseLayout
 
 test_client = Client()
 """An instance of :class:`django.test.Client`.
@@ -275,12 +279,6 @@ def show_choices(username, url, show_count=False):
         print("{} rows".format(result["count"]))
 
 
-from django.db.models import Model
-from lino.core.actions import Action
-from lino.core.tables import AbstractTable
-from lino.core.boundaction import BoundAction
-
-
 def show_workflow(actions, all=False, language=None):
     """
     Show the given actions as a table.  Usage example in
@@ -768,7 +766,6 @@ def walk_store_fields(only_detail_fields=False):
                 yield a, sf
 
 
-# settings.SITE.kernel.check_virgin()
 def set_log_level(level):
     logger.setLevel(level)
     for handler in logger.handlers:
@@ -800,6 +797,7 @@ def show_change_watchers():
             )
     print(rstgen.table(headers, rows, max_width=40))
 
+
 def show_display_modes():
     """
     Show the availble display modes per actor.
@@ -813,7 +811,7 @@ def show_display_modes():
             rows.append(
                 [str(a)] + [
                     ("x" if dm in a.extra_display_modes else "")
-                        for dm in dml]
+                    for dm in dml]
             )
     print(rstgen.table(headers, rows))
 

lino/core/inject.py

@@ -132,9 +132,9 @@ def check_pending_injects(sender, models_list=None, **kw):
     # ~ logger.info("20131110 no pending injects")
     """
     20130106
-    now we loop a last time over each model and fill it's _meta._field_cache
-    otherwise if some application module used inject_field() on a model which
-    has subclasses, then the new field would not be seen by subclasses
+    now we loop a last time over each model and fill its _meta._field_cache
+    otherwise if some plugin used inject_field() on a model that
+    has subclasses, the new field would not be seen by subclasses
     """
     for model in models_list:
         model._meta._expire_cache()
@@ -225,7 +225,8 @@ def update_model(model_spec, **actions):
     def todo(model):
         for k, v in actions.items():
             if not hasattr(model, k):
-                raise Exception("%s has no attribute %s to update." % (model, k))
+                raise Exception(
+                    "%s has no attribute %s to update." % (model, k))
             setattr(model, k, v)
 
     if isinstance(model_spec, models.Model):
@@ -389,8 +390,8 @@ def inject_quick_add_buttons(model, name, target):
     inject_field(
         model,
         name,
-        fields.VirtualField(fields.DisplayField(tm._meta.verbose_name_plural), fn),
-    )
+        fields.VirtualField(fields.DisplayField(
+            tm._meta.verbose_name_plural), fn))
 
 
 # def django_patch():

lino/core/kernel.py

@@ -26,7 +26,6 @@ import atexit
 import signal
 import threading
 from importlib import import_module
-import json
 
 # from django.apps import AppConfig
 from django.apps import apps
@@ -953,51 +952,6 @@ class Kernel(object):
     # def setup_static_link(self, urlpatterns, short_name,
     #                       attr_name=None, source=None):
 
-    def mark_virgin(self):
-        dbhash = self.get_dbhash()
-        fn = self.site.site_dir / "dbhash.json"
-        with fn.open("w") as fp:
-            json.dump(dbhash, fp)
-
-    def check_virgin(self):
-        new = self.get_dbhash()
-        fn = self.site.site_dir / "dbhash.json"
-        if not fn.exists():
-            raise Exception(
-                "No `dbhash.json` in {} " "(did you run `django-admin prep`?)".format(
-                    self.site.site_dir
-                )
-            )
-        with fn.open("r") as fp:
-            old = json.load(fp)
-
-        # noi1r has noi1e as master_site, but the react front end removes the
-        # tinymce plugin, i.e. noi1r doesn't care about
-        # tinymce.TextFieldTemplate model.
-
-        diffs = {}
-        for k, v in new.items():
-            oldv = old.get(k, None)
-            if oldv != v:
-                diffs[k] = (oldv, v)
-        # diff = set(old.items()) ^ set(new.items())
-        if diffs:
-            # db = self.site.django_settings.get('SETTINGS_MODULE')
-            db = self.site.site_dir
-            raise Exception("Database {} isn't virgin: {}".format(db, diffs))
-
-        # logger.info("Database certified as virgin")
-
-    def get_dbhash(self):
-        # TODO: we currently check only the number of rows per model. That's
-        # very naive.
-        rv = dict()
-        for m in get_models(include_auto_created=True):
-            k = fmn(m)
-            if k != "sessions.Session":
-                rv[k] = m.objects.count()
-        return rv
-
 
 def site_startup(self):
     """This is being imported and called from

lino/core/model.py

@@ -534,6 +534,7 @@ class Model(models.Model, fields.TableRow):
         """
         watcher = ChangeWatcher(row)
         # assert hasattr(row, state_field.attname)
+        row.before_ui_save(ar, watcher)  # added 20250312 for #5976
         old = getattr(row, state_field.attname)
         target_state.choicelist.before_state_change(row, ar, old, target_state)
         row.before_state_change(ar, old, target_state)
@@ -680,21 +681,22 @@ class Model(models.Model, fields.TableRow):
 
         df = actor.get_disabled_fields(obj, ar)
         # print(20170909, df)
-        for ba in actor.get_actions():
-            assert ba.actor == actor  # 20170102
-            if ba.action.show_in_workflow:
-                # if actor.model.__name__ == 'Vote':
-                #     if ba.action.__class__.__name__ == 'MarkVoteAssigned':
-                #         print(20170115, actor, ar.get_user())
-                if ba.action.action_name not in df:
-                    if actor.get_row_permission(obj, ar, state, ba):
-                        if show and isinstance(ba.action, ChangeStateAction):
-                            show_state()
-                            sep = " \u2192 "  # "→"
-                            show = False
-                        l.append(sep)
-                        l.append(ar.action_button(ba, obj))
-                        sep = " "
+        if 'workflow_buttons' not in df:
+            for ba in actor.get_actions():
+                assert ba.actor == actor  # 20170102
+                if ba.action.show_in_workflow:
+                    # if actor.model.__name__ == 'Vote':
+                    #     if ba.action.__class__.__name__ == 'MarkVoteAssigned':
+                    #         print(20170115, actor, ar.get_user())
+                    if ba.action.action_name not in df:
+                        if actor.get_row_permission(obj, ar, state, ba):
+                            if show and isinstance(ba.action, ChangeStateAction):
+                                show_state()
+                                sep = " \u2192 "  # "→"
+                                show = False
+                            l.append(sep)
+                            l.append(ar.action_button(ba, obj))
+                            sep = " "
         if state and show:
             show_state()
         return E.span(*l)

lino/core/plugin.py

@@ -1,10 +1,9 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2008-2024 Rumma & Ko Ltd
+# Copyright 2008-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-import os
 import inspect
-from os.path import exists, join, dirname, isdir, abspath
+from os.path import join, dirname, isdir, abspath
 from collections.abc import Iterable
 from urllib.parse import urlencode
 from lino.core.exceptions import ChangedAPI
@@ -56,7 +55,8 @@ class Plugin:
 
     def hide(self):
         if self.site._startup_done:
-            raise Exception("Tried to deactivate plugin {} after startup".format(self))
+            raise Exception(
+                "Tried to deactivate plugin {} after startup".format(self))
         self.hidden = True
 
     def configure(self, **kw):

lino/core/site.py

@@ -3,17 +3,37 @@
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 # doctest lino/core/site.py
 
+import json
+from lino.core.exceptions import ChangedAPI
+from lino.core.utils import get_models, is_logserver
+from lino.utils.html import E, tostring
+from lino import assert_django_code, DJANGO_DEFAULT_LANGUAGE
+# from lino.core import constants
+from lino.core.plugin import Plugin
+from lino.core.utils import full_model_name as fmn
+from rstgen.confparser import ConfigParser
+from django.utils import translation
+from django.utils.html import mark_safe
+from django.utils.translation import get_language
+from django.utils.translation import gettext_lazy as _
+from django.conf import settings
+import rstgen
+from lino.utils import AttrDict, date_offset, i2d, buildurl
+from lino import logger, __version__
+from importlib.util import find_spec
+from importlib import import_module, reload
+from pathlib import Path
 import os
 import re
 import sys
-from os.path import normpath, dirname, join, isdir, relpath, exists, abspath
+from os.path import dirname, join, isdir, relpath, exists
 import inspect
 import datetime
 import warnings
 import collections
 import locale
 import logging
-from pprint import pprint
+# from pprint import pprint
 from logging.handlers import SocketHandler
 import time
 
@@ -30,34 +50,12 @@ ASYNC_LOGGING = False
 # activated, accesses settings.DEFAULT_EXCEPTION_REPORTER, which fails at this
 # moment because the settings aren't yet loaded.
 
-from pathlib import Path
-from importlib import import_module, reload
-from importlib.util import find_spec
-
-from lino import logger, __version__
-from lino.utils import AttrDict, date_offset, i2d, buildurl
-import rstgen
-
-from django.conf import settings
-from django.utils.translation import gettext_lazy as _
-from django.utils.translation import get_language
-from django.utils.html import mark_safe
-from django.db.utils import DatabaseError
-from django.utils import translation
 
 has_socialauth = find_spec("social_django") is not None
 has_elasticsearch = find_spec("elasticsearch_django") is not None
 has_haystack = find_spec("haystack") is not None
 
-from rstgen.confparser import ConfigParser
-from lino.core.plugin import Plugin
-from lino.core import constants
-
-from lino import assert_django_code, DJANGO_DEFAULT_LANGUAGE
-from lino.utils.html import E, join_elems, tostring
-from lino.core.utils import get_models, is_logserver
 
-from lino.core.exceptions import ChangedAPI
 # from .roles import SiteUser
 
 
@@ -88,14 +86,14 @@ def to_locale(language):
     p = language.find("-")
     if p >= 0:
         # Get correct locale for sr-latn
-        if len(language[p + 1 :]) > 2:
+        if len(language[p + 1:]) > 2:
             return (
                 language[:p].lower()
                 + "_"
                 + language[p + 1].upper()
-                + language[p + 2 :].lower()
+                + language[p + 2:].lower()
             )
-        return language[:p].lower() + "_" + language[p + 1 :].upper()
+        return language[:p].lower() + "_" + language[p + 1:].upper()
     return language.lower()
 
 
@@ -103,7 +101,8 @@ def class2str(cl):
     return cl.__module__ + "." + cl.__name__
 
 
-gettext_noop = lambda s: s
+def gettext_noop(s): return s
+
 
 PLUGIN_CONFIGS = {}
 
@@ -718,7 +717,6 @@ class Site(object):
         else:
             d["logger_ok"] = True
         # self.update_settings(LOGGING=d)
-        # from pprint import pprint
         # pprint(d)
         # print("20161126 Site %s " % d['loggers'].keys())
         # import yaml
@@ -1796,6 +1794,61 @@ class Site(object):
         # ~ return v
         # ~ return getattr(obj,attrname,*args)
 
+    def mark_virgin(self):
+        """
+        Mark the database as virgin. This is called by :manage:`prep`.
+        """
+        dbhash = self.get_dbhash()
+        fn = self.site_dir / "dbhash.json"
+        with fn.open("w") as fp:
+            json.dump(dbhash, fp)
+        # self.site.logger.info("Wrote %s", fn)
+
+    def check_virgin(self):
+        """
+        Verify whether the database is virgin. Print the differences if there
+        are any.
+        """
+        new = self.get_dbhash()
+        db = self.site_dir
+        fn = db / "dbhash.json"
+        if not fn.exists():
+            raise Exception(
+                f"No `dbhash.json` in {db} (did you run `django-admin prep`?)")
+        with fn.open("r") as fp:
+            old = json.load(fp)
+
+        # noi1r has noi1e as master_site, but the react front end removes the
+        # tinymce plugin, i.e. noi1r doesn't care about
+        # tinymce.TextFieldTemplate model.
+
+        ok = True
+        for k, v in new.items():
+            v = set(v)
+            oldv = set(old.get(k, None))
+            if oldv != v:
+                if ok:
+                    print(f"Database {db} isn't virgin:")
+                    ok = False
+                diffs = []
+                if (added := len(oldv-v)):
+                    diffs.append(f"{added} rows added")
+                if (removed := len(v-oldv)):
+                    diffs.append(f"{removed} rows removed")
+                print(f"- {k}: {', '.join(diffs)}")
+
+    def get_dbhash(self):
+        """
+        Return a dictionary with a hash value of the current database content.
+        """
+        rv = dict()
+        for m in get_models(include_auto_created=True):
+            k = fmn(m)
+            if k != "sessions.Session":
+                # rv[k] = m.objects.count()
+                rv[k] = list(m.objects.values_list('pk', flat=True))
+        return rv
+
     def diagnostic_report_rst(self, *args):
         """Returns a string with a diagnostic report about this
         site. :manage:`diag` is a command-line shortcut to this.
@@ -1992,7 +2045,8 @@ class Site(object):
         ):
             yield "social_django.middleware.SocialAuthExceptionMiddleware"
 
-        if False:  # removed 20240921, see #5755 (Should we remove AjaxExceptionResponse?)
+        # removed 20240921, see #5755 (Should we remove AjaxExceptionResponse?)
+        if False:
             yield "lino.utils.ajax.AjaxExceptionResponse"
 
         if self.use_security_features:

lino/management/commands/prep.py

@@ -66,4 +66,4 @@ class Command(BaseCommand):
             kwargs["removemedia"] = True
         call_command("initdb", *args, **kwargs)
 
-        settings.SITE.kernel.mark_virgin()
+        settings.SITE.mark_virgin()

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

@@ -42,7 +42,10 @@ from lino.core.utils import model_class_path
 from lino.modlib.help.utils import HelpTextsLoader, simplify_name
 from lino.modlib.gfks.fields import GenericForeignKey
 from lino.api.dd import full_model_name
-from lino.api import doctest
+
+# removed import doctest because it caused "pytest not installed" during
+# makehelp on LF:
+# from lino.api import doctest
 
 use_dirhtml = False
 
@@ -255,7 +258,7 @@ class Command(GeneratingCommand):
             settings=settings,
             actors=actors,
             # actors_list=[a for a in actors.actors_list if not a.abstract],
-            doctest=doctest,
+            # doctest=doctest,
             translation=translation,
             use_dirhtml=use_dirhtml,
             include_useless=include_useless,

lino/modlib/jinja/mixins.py

@@ -55,8 +55,8 @@ class XMLMaker(dd.Model):
         if self.xml_validator_file:
             # print("20250218 {xml[:100]}")
             # doc = etree.fromstring(xml.encode("utf-8"))
-            ar.logger.info("Validate %s against %s ...",
-                           xmlfile.path.name, self.xml_validator_file)
+            # ar.logger.info("Validate %s against %s ...",
+            #                xmlfile.path.name, self.xml_validator_file)
             if True:
                 validate_xml(xmlfile.path, self.xml_validator_file)
             else:

lino/modlib/linod/mixins.py

@@ -132,6 +132,9 @@ class Runnable(Sequenced, RecurrenceSet):
                 await ar.adebug("Successfully terminated %s", self)
                 # ar.info("Successfully terminated %s", astr(self))
                 self.message = out.getvalue()
+            except Warning as e:
+                await ar.adebug("Terminated %s with warning %s", self, str(e))
+                self.message = out.getvalue()
             except Exception as e:
                 self.message = out.getvalue()
                 self.message += "\n" + "".join(traceback.format_exception(e))

lino/modlib/printing/mixins.py

@@ -183,6 +183,9 @@ class CachedPrintable(Duplicable, Printable):
     def get_target_url(self):
         return self.build_method.get_target_url(self.do_print, self)
 
+    def get_target_file(self):
+        return self.build_method.get_target_file(self.do_print, self)
+
     def get_cache_mtime(self):
         """Return the modification time (a `datetime`) of the generated cache
         file, or `None` if no such file exists.

lino/modlib/uploads/models.py

@@ -481,12 +481,13 @@ def on_sanitize(soup, save=False, ar=None):
     # raise Exception(f"20250301")
     for tag in soup.find_all():
         tag_name = tag.name.lower()
-        if tag_name == "img" and tag['src'].startswith("data:image") and ar is not None and save:
-            file = base64_to_image(tag['src'])
-            upload = rt.models.uploads.Upload(file=file, user=ar.get_user())
-            sar = upload.get_default_table().request(parent=ar)
-            upload.save_new_instance(sar)
-            tag.replace_with(f'[file {upload.pk}]')
+        if tag_name == "img" and ar is not None and save:
+            if (src := tag.get('src')) and src.startswith("data:image"):
+                file = base64_to_image(src)
+                upload = rt.models.uploads.Upload(file=file, user=ar.get_user())
+                sar = upload.get_default_table().request(parent=ar)
+                upload.save_new_instance(sar)
+                tag.replace_with(f'[file {upload.pk}]')
 
 
 register_sanitizer(on_sanitize)

{lino-25.3.0.dist-info → lino-25.3.1.dist-info}/METADATA

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