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

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/core/store.py

@@ -343,7 +343,8 @@ class ForeignKeyStoreField(RelatedMixin, ComboStoreField):
 
         relto_model = self.get_rel_to(obj)
         if not relto_model:
-            raise Warning("extract_form_data found no relto_model for %s" % self)
+            raise Warning(
+                "extract_form_data found no relto_model for %s" % self)
             # logger.info("20111209 get_value_text: no relto_model")
             # return
 
@@ -1134,7 +1135,7 @@ class ParameterStore(BaseStore):
         data = getrqdata(request)
         # print(20160329, data)
         # assert 'pv' in data
-        pv = data.getlist(self.url_param)  #'fv', 'pv', post[fn] post[fv][fn]
+        pv = data.getlist(self.url_param)  # 'fv', 'pv', post[fn] post[fv][fn]
 
         # logger.info("20120221 ParameterStore.parse_params(%s) --> %s",self.url_param,pv)
 
@@ -1220,6 +1221,8 @@ class Store(BaseStore):
 
         form = rh.actor.insert_layout
         if form:
+            if isinstance(form, str):
+                raise Exception(f"20250306 insert_layout {repr(rh.actor)}")
             dh = form.get_layout_handle()
             self.collect_fields(self.detail_fields, dh)
 

lino/core/utils.py

@@ -6,6 +6,8 @@ A collection of utilities which require Django settings to be
 importable.
 """
 
+from .exceptions import ChangedAPI
+from lino.utils import IncompleteDate
 import copy
 import sys
 import datetime
@@ -32,8 +34,6 @@ from django.apps import apps
 
 get_models = apps.get_models
 
-from lino.utils import IncompleteDate
-from .exceptions import ChangedAPI
 
 validate_url = URLValidator()
 
@@ -311,6 +311,7 @@ def range_filter(value, f1, f2):
     q2 = Q(**{f2 + "__isnull": True}) | Q(**{f2 + "__gte": value})
     return Q(q1, q2)
 
+
 def inrange_filter(fld, rng, **kw):
     """Assuming a database model with a field named `fld`, return a Q
     object to select the rows having value for `fld` within the given range `rng`.
@@ -343,7 +344,7 @@ def overlap_range_filter(sv, ev, f1, f2, **kw):
     #     raise ValueError(f"{rng} is not a valid range")
     if not ev:
         ev = sv
-    return Q(**{f1+"__lte" : ev, f2+"__gte" : sv})
+    return Q(**{f1+"__lte": ev, f2+"__gte": sv})
 
 
 def babelkw(*args, **kw):
@@ -544,7 +545,8 @@ def resolve_field(name, app_label=None):
     if len(l) == 2:
         model = apps.get_model(app_label, l[0])
         if model is None:
-            raise FieldDoesNotExist("No model named '%s.%s'" % (app_label, l[0]))
+            raise FieldDoesNotExist(
+                "No model named '%s.%s'" % (app_label, l[0]))
         return model._meta.get_field(l[1])
         # fld, remote_model, direct, m2m = model._meta.get_field_by_name(l[1])
         # assert remote_model is None or issubclass(model, remote_model), \
@@ -812,7 +814,8 @@ def error2str(self, e):
                 return str(getattr(de, "verbose_name", name))
 
             return "\n".join(
-                ["%s : %s" % (fieldlabel(k), self.error2str(v)) for k, v in md.items()]
+                ["%s : %s" % (fieldlabel(k), self.error2str(v))
+                 for k, v in md.items()]
             )
         return "\n".join(e.messages)
     return str(e)
@@ -1067,7 +1070,8 @@ class InstanceAction:
         """
         if len(args) and isinstance(args[0], BaseRequest):
             raise ChangedAPI("20181004")
-        ar = self.bound_action.request(renderer=settings.SITE.kernel.text_renderer)
+        ar = self.bound_action.request(
+            renderer=settings.SITE.kernel.text_renderer)
         self.run_from_code(ar, *args, **kwargs)
         return ar.response
 
@@ -1114,7 +1118,6 @@ class PhantomRow(VirtualRow):
         return str(self._ar.get_action_title())
 
 
-
 def login(username=None, **kwargs):
     """Return a basic :term:`action request` with the specified user signed in.
     """
@@ -1131,10 +1134,12 @@ def login(username=None, **kwargs):
     # import lino.core.urls  # hack: trigger ui instantiation
     return BaseRequest(**kwargs)
 
+
 def show(*args, **kwargs):
     """Print the specified data table to stdout."""
     return login().show(*args, **kwargs)
 
+
 def shows(*args, **kwargs):
     """Return the output of :func:`show`."""
     return capture_output(show, *args, **kwargs)

lino/help_texts.py

@@ -171,10 +171,6 @@ help_texts = {
     'lino.modlib.tinymce.Plugin.window_buttons2' : _("""The second row of toolbar buttons when editing in own window."""),
     'lino.modlib.tinymce.Plugin.window_buttons3' : _("""The third row of toolbar buttons when editing in own window."""),
     'lino.modlib.tinymce.Plugin.media_name' : _("""Lino currently includes three versions of TinyMCE, but for production sites we still use the eldest version 3.4.8."""),
-    'lino.modlib.uploads.Plugin' : _("""See /dev/plugins."""),
-    'lino.modlib.uploads.Plugin.remove_orphaned_files' : _("""Whether checkdata –fix should automatically delete orphaned files in the uploads folder."""),
-    'lino.modlib.uploads.Plugin.with_thumbnails' : _("""Whether to use PIL, the Python Imaging Library."""),
-    'lino.modlib.uploads.Plugin.with_volumes' : _("""Whether to use library files (volumes)."""),
     'lino.modlib.weasyprint.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.weasyprint.Plugin.header_height' : _("""Height of header in mm. Set to None if you want no header."""),
     'lino.modlib.weasyprint.Plugin.footer_height' : _("""Height of footer in mm. Set to None if you want no header."""),
@@ -262,8 +258,7 @@ help_texts = {
     'lino.utils.jsgen.Component.walk' : _("""Walk over this component and its children."""),
     'lino.utils.jsgen.VisibleComponent' : _("""A visible component"""),
     'lino.utils.jsgen.VisibleComponent.install_permission_handler' : _("""Define the allow_read handler used by get_view_permission(). This must be done only once, but after having configured debug_permissions and required_roles."""),
-    'lino.utils.media.MediaFile' : _("""Represents a file on the server below MEDIA_ROOT with two properties name and url."""),
-    'lino.utils.media.MediaFile.get_url' : _("""return the url that points to file on the server"""),
+    'lino.utils.media.MediaFile' : _("""Represents a file on the server below MEDIA_ROOT with two properties path and url."""),
     'lino.utils.mldbc.fields.BabelCharField' : _("""Define a variable number of CharField database fields, one for each language of your lino.core.site.Site.languages. See mldbc."""),
     'lino.utils.mldbc.fields.BabelTextField' : _("""Used for the clones of the master field, one for each non-default language. See mldbc."""),
     'lino.utils.mldbc.fields.LanguageField' : _("""A field that lets the user select a language from the available lino.core.site.Site.languages."""),
@@ -379,7 +374,7 @@ help_texts = {
     'lino.modlib.linod.SystemTask.disabled' : _("""Tells whether the task should be ignored."""),
     'lino.modlib.linod.SystemTask.log_level' : _("""The logging level to apply when running this task."""),
     'lino.modlib.linod.SystemTask.run' : _("""Performs a routine job."""),
-    'lino.modlib.linod.SystemTasks' : _("""The default actor for the SystemTask model."""),
+    'lino.modlib.linod.SystemTasks' : _("""The default table for the SystemTask model."""),
     'lino.modlib.linod.Runnable' : _("""Model mixin used by SystemTask and other models."""),
     'lino.modlib.linod.Runnable.procedure' : _("""The background procedure to run in this task."""),
     'lino.modlib.periods.StoredYear' : _("""The Django model used to store a fiscal year."""),
@@ -690,7 +685,7 @@ help_texts = {
     'lino.modlib.uploads.AllUploads' : _("""Shows all upload files on this Lino site."""),
     'lino.modlib.uploads.AreaUploads' : _("""Mixin for tables of upload files where the upload area is known."""),
     'lino.modlib.uploads.MyUploads' : _("""Shows my uploads (i.e. those whose author is the requesting user)."""),
-    'lino.modlib.uploads.UploadBase' : _("""Abstract base class of Upload. This was named lino.mixins.uploadable.Uploadable until 20210217. It encapsulates some really basic functionality. Its usage is deprecated. If you were inheriting from lino.mixins.Uploadable, you should convert that model to point to an Upload instead."""),
+    'lino.modlib.uploads.UploadBase' : _("""Abstract base class of Upload encapsulating some really basic functionality."""),
     'lino.modlib.uploads.UploadType' : _("""Django model representing an upload type."""),
     'lino.modlib.uploads.UploadType.shortcut' : _("""Optional pointer to a virtual upload shortcut field. If this is not empty, then the given shortcut field will manage uploads of this type. See also Shortcuts."""),
     'lino.modlib.uploads.UploadTypes' : _("""The table with all existing upload types."""),

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/mixins/duplicable.py

@@ -29,7 +29,7 @@ class Duplicate(actions.Action):
     sort_index = 11
     show_in_workflow = False
     # readonly = False  # like ShowInsert. See docs/blog/2012/0726
-    callable_from = "td"
+    callable_from = "t"
 
     # required_roles = set([Expert])
 
@@ -42,7 +42,7 @@ class Duplicate(actions.Action):
                 return False
             # if not user_type.has_required_roles([Expert]):
             #     return False
-        return super(Duplicate, self).get_view_permission(user_type)
+        return super().get_view_permission(user_type)
 
     def run_from_code(self, ar, **known_values):
         obj = ar.selected_rows[0]
@@ -97,7 +97,8 @@ class Duplicate(actions.Action):
             kw = dict()
             # kw.update(refresh=True)
             kw.update(
-                message=_("Duplicated %(old)s to %(new)s.") % dict(old=obj, new=new)
+                message=_("Duplicated %(old)s to %(new)s.") % dict(
+                    old=obj, new=new)
             )
             # ~ kw.update(new_status=dict(record_id=new.pk))
             ar2.success(**kw)
@@ -108,7 +109,8 @@ class Duplicate(actions.Action):
 
         obj = ar.selected_rows[0]
         ar.confirm(
-            ok, _("This will create a copy of {}.").format(obj), _("Are you sure?")
+            ok, _("This will create a copy of {}.").format(
+                obj), _("Are you sure?")
         )
 
 

lino/mixins/sequenced.py

@@ -33,7 +33,7 @@ class MoveByN(actions.Action):
     This action is available on any :class:`Sequenced` object as
     :attr:`Sequenced.move_by_n`.
 
-    It is currently only used by React to allow for drag and drop reording.
+    It is currently only used by React to allow for drag and drop reordering.
 
     """
 
@@ -80,9 +80,11 @@ class MoveUp(actions.Action):
     # label = _("Up")
     # label = "\u2191" thin arrow up
     # label = "\u25b2" # triangular arrow up
-    label = "\u25B2"  # ▲ Black up-pointing triangle
-    # label = "↑"  #
+    label = _("Move up")
+    # button_text = "\u25B2"  # ▲ Black up-pointing triangle
+    button_text = "↑"
     custom_handler = True
+    callable_from = "t"
     # icon_name = 'arrow_up'
     # ~ icon_file = 'arrow_up.png'
     readonly = False
@@ -92,9 +94,12 @@ class MoveUp(actions.Action):
             return False
         if not super().get_action_permission(ar, obj, state):
             return False
+        # if ar.order_by is None or "seqno" not in ar.order_by:
+        #     return False
         if ar.get_total_count() == 0:
             return False
         if ar.data_iterator[0] == obj:
+            # print(f"20250305 first of {ar.data_iterator}")
             return False
         # print("20161128", obj.seqno, ar.data_iterator.count())
         return True
@@ -119,14 +124,16 @@ class MoveDown(actions.Action):
 
     """
 
+    label = _("Move down")
     # label = _("Down")
-    label = "↓"
+    button_text = "↓"
     # label = "\u25bc" # triangular arrow down
     # label = "\u2193"
-    label = "\u25BC"  # ▼ Black down-pointing triangle
+    # button_text = "\u25BC"  # ▼ Black down-pointing triangle
     # icon_name = 'arrow_down'
     custom_handler = True
     # ~ icon_file = 'arrow_down.png'
+    callable_from = "t"
     readonly = False
 
     def get_action_permission(self, ar, obj, state):
@@ -134,10 +141,13 @@ class MoveDown(actions.Action):
             return False
         if not super().get_action_permission(ar, obj, state):
             return False
+        # if ar.order_by is None or "seqno" not in ar.order_by:
+        #     return False
         n = ar.get_total_count()
         if n == 0:
             return False
         if ar.data_iterator[n - 1] == obj:
+            # print(f"20250305 last of {ar.data_iterator}")
             return False
         # ~ if obj.__class__.__name__=='Entry' and obj.seqno == 25:
         # ~ print 20130706, ar.data_iterator.count(), ar.data_iterator
@@ -315,7 +325,8 @@ class Sequenced(Duplicable):
 
             seq_no += 1
 
-        ar.success(message=_("Renumbered {} of {} siblings.").format(n, qs.count()))
+        ar.success(
+            message=_("Renumbered {} of {} siblings.").format(n, qs.count()))
         ar.set_response(refresh_all=True)
 
     @fields.displayfield(_("Move"))

lino/modlib/__init__.py

@@ -67,7 +67,5 @@ Enterprise Resources
     languages
     office
     smtpd
-    uploads
-
 
 """

lino/modlib/changes/models.py

@@ -64,7 +64,8 @@ class Change(UserAuthored):
         related_name="changes_by_object",
     )
     object_id = GenericForeignKeyIdField(object_type, blank=True, null=True)
-    object = GenericForeignKey("object_type", "object_id", verbose_name=_("Object"))
+    object = GenericForeignKey(
+        "object_type", "object_id", verbose_name=_("Object"))
 
     master_type = dd.ForeignKey(
         "contenttypes.ContentType",
@@ -74,9 +75,11 @@ class Change(UserAuthored):
         related_name="changes_by_master",
     )
     master_id = GenericForeignKeyIdField(master_type, blank=True, null=True)
-    master = GenericForeignKey("master_type", "master_id", verbose_name=_("Master"))
+    master = GenericForeignKey(
+        "master_type", "master_id", verbose_name=_("Master"))
 
-    diff = dd.RichTextField(_("Changes"), format="plain", blank=True, editable=False)
+    diff = dd.RichTextField(_("Changes"), format="plain",
+                            blank=True, editable=False)
     changed_fields = dd.CharField(_("Fields"), max_length=250, blank=True)
 
     def __str__(self):
@@ -129,7 +132,8 @@ class Changes(dd.Table):
             if pv.change_type:
                 qs = qs.filter(type=pv.change_type)
             if pv.date:
-                qs = qs.filter(time__range=(pv.date, pv.date + datetime.timedelta(1)))
+                qs = qs.filter(time__range=(
+                    pv.date, pv.date + datetime.timedelta(1)))
             # if settings.SITE.user_model and ar.param_values.user:
             #     qs = qs.filter(user=ar.param_values.user)
             if pv.object_type:
@@ -167,7 +171,9 @@ def log_change(type, request, master, obj, msg="", changed_fields=""):
 remove_after = dd.plugins.changes.remove_after
 if remove_after:
 
-    @dd.schedule_daily()
+    from lino.modlib.linod.choicelists import schedule_daily
+
+    @schedule_daily()
     def delete_older_changes(ar):
         days = datetime.timedelta(days=remove_after)
         # django.core.exceptions.FieldError: Cannot resolve keyword 'time_lt' into field. Choices are: changed_fields, diff, id, list_item, master, master_id, master_type, master_type_id, name_column, navigation_panel, object, object_id, object_type, object_type_id, overview, time, type, user, user_id, workflow_buttons
@@ -206,7 +212,8 @@ def on_update(sender=None, watcher=None, request=None, **kw):
         changes = []
         for k, old, new in watcher.get_updates(cs.ignored_fields):
             changed_fields += k + " "
-            changes.append("%s : %s --> %s" % (k, dd.obj2str(old), dd.obj2str(new)))
+            changes.append("%s : %s --> %s" %
+                           (k, dd.obj2str(old), dd.obj2str(new)))
         if len(changes) == 0:
             msg = "(no changes)"
         elif len(changes) == 1:
@@ -229,7 +236,8 @@ def on_delete(sender=None, request=None, **kw):
     master = get_master(sender)
     if master is None:
         return
-    log_change(ChangeTypes.delete, request, master, sender, dd.obj2str(sender, True))
+    log_change(ChangeTypes.delete, request, master,
+               sender, dd.obj2str(sender, True))
 
 
 @receiver(on_ui_created)
@@ -238,7 +246,8 @@ def on_ui_created(sender=None, request=None, **kw):
     master = get_master(sender)
     if master is None:
         return
-    log_change(ChangeTypes.create, request, master, sender, dd.obj2str(sender, True))
+    log_change(ChangeTypes.create, request, master,
+               sender, dd.obj2str(sender, True))
 
 
 @receiver(pre_add_child)
@@ -247,7 +256,8 @@ def on_add_child(sender=None, request=None, child=None, **kw):
     if master is None:
         return
     log_change(
-        ChangeTypes.add_child, request, master, sender, dd.full_model_name(child)
+        ChangeTypes.add_child, request, master, sender, dd.full_model_name(
+            child)
     )
 
 
@@ -257,7 +267,8 @@ def on_remove_child(sender=None, request=None, child=None, **kw):
     if master is None:
         return
     log_change(
-        ChangeTypes.remove_child, request, master, sender, dd.full_model_name(child)
+        ChangeTypes.remove_child, request, master, sender, dd.full_model_name(
+            child)
     )