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

lino/modlib/extjs/views.py

@@ -24,14 +24,11 @@ Summary from <http://en.wikipedia.org/wiki/Restful>:
 import json
 import os
 
-from pathlib import Path
-
 from django import http
-from django.contrib.messages import success
 from django.db import models
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
+from django.core.exceptions import PermissionDenied
 from django.views.generic import View
 from django.views.generic.base import TemplateView
 from django.views.decorators.cache import never_cache
@@ -40,27 +37,24 @@ from django.views.decorators.csrf import ensure_csrf_cookie, csrf_protect
 from django.utils.translation import gettext as _
 from django.utils.encoding import force_str
 from django.utils.html import mark_safe
-from lino.core import auth
 
 from lino.core.signals import pre_ui_delete
 from lino.core.utils import obj2unicode
 
 # from etgen import html as xghtml
-from lino.utils.html import E, tostring
+from lino.utils.html import E, tostring, escape
 from etgen.html import Document
 
 from lino.utils import ucsv
 from lino import logger
 # from lino.utils import dblogger
 from lino.core import constants
-from lino.core import actions
-from lino.core import fields
 from lino.core.fields import choices_for_field
 from lino.core.views import requested_actor, action_request
-from lino.core.views import json_response, json_response_kw
+from lino.core.views import json_response
 from lino.core.views import choices_response
 from lino.core.requests import BaseRequest
-from lino.core.utils import PhantomRow, is_devserver
+from lino.core.utils import is_devserver
 
 MAX_ROW_COUNT = 300
 
@@ -207,7 +201,7 @@ class ActionParamChoices(View):
             raise Exception("Unknown action %r for %s" % (an, actor))
         field = ba.action.get_param_elem(field)
         qs, row2dict = choices_for_field(
-            ba.request(request=request), ba.action, field)
+            ba.create_request(request=request), ba.action, field)
         if field.blank:
             emptyValue = "<br/>"
         else:
@@ -229,7 +223,7 @@ class Choices(View):
         rpt = requested_actor(app_label, rptname)
         emptyValue = None
         if fldname is None:
-            ar = rpt.request(request=request)
+            ar = rpt.create_request(request=request)
             qs = ar.data_iterator
 
             def row2dict(obj, d):
@@ -247,7 +241,7 @@ class Choices(View):
             if field.blank:
                 # logger.info("views.Choices: %r is blank",field)
                 emptyValue = "<br/>"
-            ar = rpt.request(request=request)
+            ar = rpt.create_request(request=request)
             # if str(rpt) == 'comments.CommentsByRFC':
             #     print("20230426", ar.master_instance)
             qs, row2dict = choices_for_field(ar, rpt, field)
@@ -263,7 +257,7 @@ class Restful(View):
     @method_decorator(csrf_protect)
     def post(self, request, app_label=None, actor=None, pk=None):
         rpt = requested_actor(app_label, actor)
-        ar = rpt.request(request=request)
+        ar = rpt.create_request(request=request)
 
         instance = ar.create_instance()
         # store uploaded files.
@@ -284,14 +278,14 @@ class Restful(View):
     @method_decorator(csrf_protect)
     def delete(self, request, app_label=None, actor=None, pk=None):
         rpt = requested_actor(app_label, actor)
-        ar = rpt.request(request=request)
+        ar = rpt.create_request(request=request)
         ar.set_selected_pks(pk)
         return delete_element(ar, ar.selected_rows[0])
 
     def get(self, request, app_label=None, actor=None, pk=None):
         rpt = requested_actor(app_label, actor)
         assert pk is None, 20120814
-        ar = rpt.request(request=request)
+        ar = rpt.create_request(request=request)
         rh = ar.ah
         rows = [
             rh.store.row2dict(ar, row, rh.store.grid_fields)
@@ -304,7 +298,7 @@ class Restful(View):
     @method_decorator(csrf_protect)
     def put(self, request, app_label=None, actor=None, pk=None):
         rpt = requested_actor(app_label, actor)
-        ar = rpt.request(request=request)
+        ar = rpt.create_request(request=request)
         ar.set_selected_pks(pk)
         elem = ar.selected_rows[0]
         rh = ar.ah
@@ -313,7 +307,7 @@ class Restful(View):
         data = json.loads(data)
         # 20240404 a = rpt.get_url_action(rpt.default_list_action_name)
         a = rpt.default_action
-        ar = rpt.request(request=request, action=a)
+        ar = rpt.create_request(request=request, action=a)
         ar.renderer = settings.SITE.kernel.extjs_renderer
         ar.form2obj_and_save(data, elem, False)
         # Ext.ensible needs grid_fields, not detail_fields
@@ -326,6 +320,10 @@ NOT_FOUND = "%s has no row with primary key %r"
 
 
 class ApiElement(View):
+    """
+    The view that responds to
+    ``r'api/(?P<app_label>\w+)/(?P<actor>\w+)/(?P<pk>[^/]+)$'``.
+    """
 
     @method_decorator(ensure_csrf_cookie)
     def get(self, request, app_label=None, actor=None, pk=None):
@@ -353,48 +351,53 @@ class ApiElement(View):
                               ba.action.default_format)
 
         try:
+            ar = ba.create_request(
+                request=request, renderer=settings.SITE.kernel.default_renderer)
             if pk and pk != "-99999" and pk != "-99998":
-                sr = [pk]
                 if issubclass(rpt.model, models.Model):
                     try:
-                        ar = ba.request(request=request, selected_pks=sr)
-                    # except ObjectDoesNotExist as e:  # 20250212
+                        ar.set_selected_pks(pk)
                     except rpt.model.DoesNotExist:
                         if fmt == constants.URL_FORMAT_JSON:
-                            # rescue_ar: without sr and even request, to render a table request (grid view action) on breadcrumb
-                            rescue_ar = rpt.request(
+                            # rescue_ar: without sr and even request, to render
+                            # a table request (grid view action) on breadcrumb
+                            safe_kw = dict(
+                                user=request.user,
                                 renderer=settings.SITE.kernel.default_renderer)
-                            default_table = rpt.model.get_default_table()
-
+                            rescue_ar = rpt.create_request(**safe_kw)
                             title = tostring(rescue_ar.href_to_request(
                                 rescue_ar, icon_name=None))
-
-                            def get_response():
-                                msg = mark_safe(
-                                    f'Record (pk={pk}) is no longer available on current table.')
-                                datarec = dict(
-                                    success=False, message=msg, title=title)
-                                datarec.update(**vm)
-                                return datarec
-
+                            datarec = dict(alert=False, success=False,
+                                           title=title, **vm)
+                            msg = _("Row {pk} is not visible here.").format(pk=pk)
+                            default_table = rpt.model.get_default_table()
+                            if default_table is rpt:
+                                datarec.update(message=mark_safe(msg))
+                                return json_response(datarec)
+                            ar = default_table.detail_action.create_request(parent=ar)
                             try:
                                 # take default table and try to show the row
-                                ar = default_table.detail_action.request(
-                                    request=request, selected_pks=sr)
+                                ar.set_selected_pks(pk)
                             except default_table.model.DoesNotExist:
-                                return json_response(get_response())
-
-                            url = ar.obj2url(ar.selected_rows[0])
-                            datarec = get_response()
-                            datarec['message'] += mark_safe(
-                                f' Reload in <a href="{url}">{default_table}</a>.')
+                                msg += " " + _("Neither is it visible in {table}.").format(
+                                    table=ar.get_title())
+                                datarec.update(message=mark_safe(msg))
+                                return json_response(datarec)
+
+                            lnk = ar.obj2htmls(ar.selected_rows[0], ar.get_title())
+                            s = escape(_("But you can see it in {}.")).format(lnk)
+                            msg += "<br>" + s
+                            # msg = format_html("{}<br>{}", )
+                            # msg = format_html("{}<br>{}", _("But you can see it in {link}"))
+                            # url = ar.obj2url(dtar.selected_rows[0])
+                            # msg += "<br>" + _('But you can see it in <a href="{url}">{table}</a>.').format(
+                            #     url=url, table=ar.get_title())
+                            datarec.update(message=mark_safe(msg))
                             return json_response(datarec)
-                        # print("20240911", e)
-                        raise http.Http404(
-                            f"Object {sr} does not exist on {rpt}")
+                        raise http.Http404(f"Row {pk} does not exist on {rpt}")
                 else:
-                    ar = ba.request(request=request, selected_pks=sr)
-                # ar = ba.request(request=request, selected_pks=sr)
+                    ar.set_selected_pks(pk)
+                # ar = ba.create_request(request=request, selected_pks=sr)
                 elem = ar.selected_rows[0]
                 # print(
                 #     "20170116 views.ApiElement.get", ba,
@@ -405,7 +408,6 @@ class ApiElement(View):
                 #     raise http.Http404(
                 #         "No permission to see {} {}.".format(rpt, action_name))
             else:
-                ar = ba.request(request=request)
                 elem = None
         except Exception as e:
 

lino/modlib/help/config/makehelp/model.tpl.rst

@@ -8,4 +8,4 @@
 
 {{header(2, str(_("Database fields")))}}
 
-{{doctest.fields_help(model, all=True)}}
+{{dd.fields_help(model, all=True)}}

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

@@ -41,7 +41,7 @@ from lino.core.model import Model
 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 dd
 
 # removed import doctest because it caused "pytest not installed" during
 # makehelp on LF:
@@ -91,7 +91,7 @@ def runcmd(cmd, **kw):
 
 def field_ref(f):
     if isinstance(f.model, Model):
-        return ":ref:`{}.{}`".format(full_model_name(f.model), f.name)
+        return ":ref:`{}.{}`".format(dd.full_model_name(f.model), f.name)
     # parameter field
     return ":ref:`{}.{}`".format(str(f.model), f.name)
 
@@ -136,7 +136,7 @@ def model_referenced_from(model):
     def ddhfmt(ddh):
         return ", ".join(
             [
-                "{}.{}".format(full_model_name(model), fk.name)
+                "{}.{}".format(dd.full_model_name(model), fk.name)
                 for model, fk in ddh.fklist
             ]
         )
@@ -265,7 +265,8 @@ class Command(GeneratingCommand):
             # ~ py2rst=rstgen.py2rst,
             languages=[lng.django_code for lng in settings.SITE.languages],
             get_models=apps.get_models,
-            full_model_name=full_model_name,
+            full_model_name=dd.full_model_name,
+            dd=dd,
             model_overview=self.model_overview,
             actor2par=self.actor2par,
             actors2table=self.actors2table,
@@ -324,7 +325,7 @@ class Command(GeneratingCommand):
             elif issubclass(x, models.Model):
                 if text is None:
                     text = x.__name__
-                return ":doc:`" + text + " <" + full_model_name(x) + ">`"
+                return ":doc:`" + text + " <" + dd.full_model_name(x) + ">`"
         if isinstance(x, BoundAction):
             if text is None:
                 text = x.action_name

lino/modlib/jinja/renderer.py

@@ -82,7 +82,7 @@ class JinjaRenderer(HtmlRenderer):
 
         def as_table(action_spec):
             a = settings.SITE.models.resolve(action_spec)
-            ar = a.request(user=settings.SITE.get_anonymous_user())
+            ar = a.create_request(user=settings.SITE.get_anonymous_user())
             return self.as_table(ar)
 
         def as_table2(ar):
@@ -99,7 +99,7 @@ class JinjaRenderer(HtmlRenderer):
 
         def as_ul(action_spec):
             a = settings.SITE.models.resolve(action_spec)
-            ar = a.request(user=settings.SITE.get_anonymous_user())
+            ar = a.create_request(user=settings.SITE.get_anonymous_user())
             # 20150810
             ar.renderer = self
             # return tostring(E.ul(*[obj.as_paragraph(ar) for obj in ar]))

lino/modlib/linod/management/commands/linod.py

@@ -51,8 +51,11 @@ class Command(BaseCommand):
             # print("20240424 Run Lino daemon without channels")
 
             async def main():
-                u = await settings.SITE.user_model.objects.aget(
-                    username=settings.SITE.plugins.linod.daemon_user)
+                try:
+                    u = await settings.SITE.user_model.objects.aget(
+                        username=settings.SITE.plugins.linod.daemon_user)
+                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))

lino/modlib/memo/__init__.py

@@ -93,7 +93,7 @@ class Plugin(ad.Plugin):
             # kwargs = dict(header_level=3)  #, nosummary=True)
             kwargs = dict()  # , nosummary=True)
             dv = self.site.models.resolve(s)
-            sar = dv.request(parent=ar, limit=dv.preview_limit)
+            sar = dv.create_request(parent=ar, limit=dv.preview_limit)
             rv = ""
             # rv += "20230325 [show {}]".format(dv)
             for e in sar.renderer.table2story(sar, **kwargs):

lino/modlib/publisher/choicelists.py

@@ -149,7 +149,7 @@ class PageFiller(Choice):
     def get_dynamic_story(self, ar, obj, **kwargs):
         txt = ""
         dv = self.data_view
-        sar = dv.request(parent=ar, limit=dv.preview_limit)
+        sar = dv.create_request(parent=ar, limit=dv.preview_limit)
         # print("20231028", dv, list(sar))
         # print("20230409", ar.renderer)
         # rv += "20230325 [show {}]".format(dv)
@@ -159,8 +159,8 @@ class PageFiller(Choice):
 
     def get_dynamic_paragraph(self, ar, obj, **kwargs):
         dv = self.data_view
-        # sar = dv.request(parent=ar, limit=dv.preview_limit)
-        sar = dv.request(parent=ar)
+        # sar = dv.create_request(parent=ar, limit=dv.preview_limit)
+        sar = dv.create_request(parent=ar)
         return " / ".join([sar.obj2htmls(row) for row in sar])
 
 

lino/modlib/publisher/views.py

@@ -37,7 +37,7 @@ class Element(View):
         kw.update(selected_pks=[pk])
 
         try:
-            ar = self.table_class.request(request=request, **kw)
+            ar = self.table_class.create_request(request=request, **kw)
         except ObjectDoesNotExist as e:
             # print("20240911", e)
             return http.HttpResponseNotFound(f"No row #{pk} in {self.table_class} ({e})")
@@ -54,5 +54,5 @@ class Index(View):
         dv = settings.SITE.models.publisher.Pages
         index_node = dv.model.objects.get(ref="index", language=request.LANGUAGE_CODE)
         # print("20231025", index_node)
-        ar = dv.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/search/models.py

@@ -52,7 +52,7 @@ class SiteSearchBase(dd.VirtualTable):
             if t is None:
                 return
             t = cls.get_table_for_role(t, ar.get_user().user_type.role)
-            sar = t.request(parent=ar)
+            sar = t.create_request(parent=ar)
             return obj.as_search_item(sar)
 
     @classmethod
@@ -68,7 +68,7 @@ class SiteSearchBase(dd.VirtualTable):
         if t is None:
             return
         t = cls.get_table_for_role(t, ar.get_user().user_type.role)
-        sar = t.request(parent=ar)
+        sar = t.create_request(parent=ar)
         return t.get_card_title(sar, obj)
 
     @classmethod
@@ -158,7 +158,7 @@ class SiteSearch(SiteSearchBase):
                     t = cls.get_table_for_role(t, user_type.role)
                     if not t.get_view_permission(user_type):
                         continue
-                    sar = t.request(parent=ar, quick_search=ar.quick_search)
+                    sar = t.create_request(parent=ar, quick_search=ar.quick_search)
                     try:
                         for obj in sar:
                             if obj.show_in_site_search:  # don't show calview.HeaderRow
@@ -197,7 +197,7 @@ if settings.SITE.use_elasticsearch and has_elasticsearch:
                 user_type = ar.get_user().user_type
                 query = MultiMatch(query=ar.quick_search)
                 s = search.query(query)
-                s = s[ar.offset : ar.offset + ar.limit]
+                s = s[ar.offset: ar.offset + ar.limit]
                 sq = execute_search(s, save=False)
                 return sq
             return []
@@ -210,7 +210,7 @@ if settings.SITE.use_solr and has_haystack:
     class SolrSiteSearch(SiteSearchBase):
         @classmethod
         def get_rows_from_search_query(cls, sqs, ar):
-            results = sqs[ar.offset : ar.offset + ar.limit]
+            results = sqs[ar.offset: ar.offset + ar.limit]
             for result in results:
                 yield result.model.objects.get(pk=result.pk)
 

lino/modlib/system/choicelists.py

@@ -222,9 +222,9 @@ add("P", _("per weekday"), "per_weekday")  # deprecated
 add("E", _("Relative to Easter"), "easter")
 
 
-
 class DisplayColor(Choice):
     font_color = None
+
     def __init__(self, value, text, names, font_color="white"):
         super().__init__(value, text, names)
         self.font_color = font_color
@@ -247,12 +247,14 @@ class DisplayColors(ChoiceList):
         # text = escape(bc.text)
         # txt = f"""<span style="background-color:{bc.name};color:{bc.font_color}">{text}</span>"""
         # txt = mark_safe(txt)
-        sample = f"""<span style="padding:3pt;background-color:{bc.name};color:{bc.font_color}">(sample)</span>"""
+        sample = f"""<span style="padding:3pt;background-color:{
+            bc.name};color:{bc.font_color}">(sample)</span>"""
         sample = mark_safe(sample)
         txt = format_html("{} {}", bc.text, sample)
         # raise Exception(f"20250118 {txt.__class__}")
         return txt
 
+
 add = DisplayColors.add_item
 # cssColors = 'White Silver Gray Black Red Maroon Yellow Olive Lime Green Aqua Teal Blue Navy Fuchsia Purple'
 # cssColors = 'white silver gray black red maroon yellow olive lime green aqua teal blue navy fuchsia purple'
@@ -275,7 +277,7 @@ add("220",  _("Orange"), "orange", "white")
 add("230",  _("Yellow"), "yellow", "black")
 add("240",   _("Green"), "green",  "white")
 add("250",    _("Blue"), "blue",   "white")
-add("260", _("Magenta"), "magenta","white")
+add("260", _("Magenta"), "magenta", "white")
 add("270",  _("Violet"), "violet", "white")
 
 # Other colors
@@ -291,6 +293,7 @@ add("342",  _("DarkGreen"), "darkgreen",  "white")
 add("343",  _("PaleGreen"), "palegreen",  "black")
 add("344", _("Chartreuse"), "chartreuse", "black")
 add("345",       _("Lime"), "lime",       "black")
+add("346",       _("Teal"), "teal",       "white")
 add("350",    _("Fuchsia"), "fuchsia",    "white")
 add("351",       _("Cyan"), "cyan",       "black")
 add("361",     _("Purple"), "purple",     "white")

lino/modlib/tinymce/views.py

@@ -29,7 +29,7 @@ class Templates(View):
     ):
         if request.method == "GET":
             rpt = requested_actor(app_label, actor)
-            ar = rpt.request(request=request)
+            ar = rpt.create_request(request=request)
             elem = rpt.get_row_by_pk(ar, pk)
             if elem is None:
                 raise http.Http404("%s %s does not exist." % (rpt, pk))

lino/modlib/uploads/models.py

@@ -485,7 +485,7 @@ def on_sanitize(soup, save=False, ar=None):
             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)
+                sar = upload.get_default_table().create_request(parent=ar)
                 upload.save_new_instance(sar)
                 tag.replace_with(f'[file {upload.pk}]')
 

lino/modlib/users/ui.py

@@ -3,6 +3,7 @@
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 # Documentation: :doc:`/specs/users` and :doc:`/dev/users`
 
+from lino.core.site import has_socialauth
 from datetime import datetime
 from textwrap import wrap
 from importlib import import_module
@@ -134,7 +135,7 @@ class UsersOverview(Users):
             pv.update(password=dd.plugins.users.demo_password)
         btn = rt.models.about.About.get_action_by_name("sign_in")
         # print btn.get_row_permission(ar, None, None)
-        btn = btn.request(
+        btn = btn.create_request(
             action_param_values=pv, renderer=settings.SITE.kernel.default_renderer
         )
         btn = btn.ar2button(label=self.username)
@@ -212,8 +213,6 @@ class AuthoritiesTaken(Authorities):
     auto_fit_column_widths = True
 
 
-from lino.core.site import has_socialauth
-
 if has_socialauth and dd.get_plugin_setting("users", "third_party_authentication"):
     import social_django
 

lino/utils/__init__.py

@@ -18,9 +18,11 @@ function for general use. It has also many subpackages and submodules.
     dataserializer
     dbfreader
     dblogger
+    dbhash
     diag
     djangotest
     dpy
+    fieldutils
     html
     html2odf
     html2xhtml
@@ -78,6 +80,7 @@ from rstgen.utils import confirm, i2d, i2t
 
 DATE_TO_DIR_TPL = "%Y/%m"
 
+
 def read_exception(excinfo):
     # TODO: why not use traceback.format_exc(excinfo) intead of this?
     f = StringIO()
@@ -353,7 +356,7 @@ def hex2str(value):
         raise Exception("hex2str got value %r" % value)
     r = ""
     for i in range(old_div(len(value), 2)):
-        s = value[i * 2 : i * 2 + 2]
+        s = value[i * 2: i * 2 + 2]
         h = int(s, 16)
         r += chr(h)
     return r
@@ -364,6 +367,7 @@ curry = lambda func, *args, **kw: lambda *p, **n: func(
     *args + p, **dict(list(kw.items()) + list(n.items()))
 )
 
+
 def capture_output(func, *args, **kwargs):
     s = StringIO()
     with redirect_stdout(s):

lino/utils/dbhash.py

@@ -0,0 +1,112 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2009-2025 Rumma & Ko Ltd
+# License: GNU Affero General Public License v3 (see file COPYING for details)
+
+"""
+Utilities around a "database hash".
+See :doc:`/utils/dbhash`.
+"""
+
+import json
+from importlib import import_module
+from pathlib import Path
+from django.conf import settings
+from django.apps import apps
+from django.db.models.deletion import ProtectedError
+
+mod = import_module(settings.SETTINGS_MODULE)
+HASH_FILE = Path(mod.__file__).parent / "dbhash.json"
+
+
+def fmn(m):
+    return f"{m._meta.app_label}.{m._meta.object_name}"
+
+
+def compute_dbhash():
+    """
+    Return a dictionary with a hash value of the current database content.
+    """
+    rv = dict()
+    for m in apps.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 mark_virgin():
+    """
+    Mark the database as virgin. This is called by :manage:`prep`.
+    """
+    dbhash = compute_dbhash()
+    with HASH_FILE.open("w") as fp:
+        json.dump(dbhash, fp)
+
+
+def load_dbhash():
+    """
+    Load the dbhash that was saved in :xfile:`dbhash.json`
+    """
+    if not HASH_FILE.exists():
+        raise Exception(
+            f"No file {HASH_FILE} (did you run `django-admin prep`?)")
+    with HASH_FILE.open("r") as fp:
+        return json.load(fp)
+
+
+def check_virgin(restore=True, verbose=True):
+    """
+    Verify whether the database is virgin. Print the differences if there
+    are any.
+    """
+    new = compute_dbhash()
+    old = load_dbhash()
+
+    first_diff = True
+    can_restore = True
+    must_delete = {}
+    for k, v in new.items():
+        v = set(v)
+        oldv = set(old.get(k, None))
+        if oldv != v:
+            if first_diff:
+                if verbose:
+                    print(f"Database {HASH_FILE.parent} isn't virgin:")
+                first_diff = False
+            diffs = []
+            added = v - oldv
+            if len(added):
+                diffs.append(f"{len(added)} rows added")
+                must_delete[apps.get_model(k)] = added
+                # for pk in added:
+                #     must_delete.append(m.objects.get(pk=pk))
+            if (removed := len(oldv-v)):
+                diffs.append(f"{removed} rows deleted")
+                can_restore = False
+            if verbose:
+                print(f"- {k}: {', '.join(diffs)}")
+    if len(must_delete) == 0 or not restore:
+        return
+    if not can_restore:
+        raise Exception(
+            "Cannot restore database because some rows have been deleted")
+    # print(f"Tidy up {len(must_delete)} rows from database")
+    # It can happen that some rows refer to each other with a protected fk
+    # We call bulk delete() to avoid Lino deleting the items of an invoice
+    must_delete = list(must_delete.items())
+    while len(must_delete):
+        todo = []
+        hope = False
+        for m, added in must_delete:
+            try:
+                m.objects.filter(pk__in=added).delete()
+                # obj.delete()
+                hope = True
+            except Exception:
+                todo.append((m, added))
+        if not hope:
+            raise Exception(f"Failed to delete {todo}")
+        must_delete = todo
+    if verbose:
+        print("Database has been restored.")

lino/utils/diag.py

@@ -443,7 +443,7 @@ def py2rst(self, doctestfmt=False, fmt=None):
     from lino.core.store import get_atomizer
 
     if isinstance(self, models.Model) and fmt is None:
-        ar = self.get_default_table().request()
+        ar = self.get_default_table().create_request()
 
         def fmt(e):
             s = elem_label(e)