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

lino/core/site.py

@@ -3,14 +3,12 @@
 # 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 django.apps import apps
 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
@@ -657,7 +655,6 @@ class Site(object):
                 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 is_logserver() or not self.log_sock_path.exists():
                 if self.log_sock_path.exists():
                     # print("20231019 log via socket server")
                     handlers["file"] = {
@@ -1348,10 +1345,8 @@ class Site(object):
             setattr(obj, name, resolve_model(spec, strict=msg))
 
     def on_each_app(self, methname, *args):
-        from django.apps import apps
-
-        apps = [a.models_module for a in apps.get_app_configs()]
-        for mod in apps:
+        modules = [a.models_module for a in apps.get_app_configs()]
+        for mod in modules:
             meth = getattr(mod, methname, None)
             if meth is not None:
                 if False:  # 20150925 once we will do it for good...
@@ -1470,7 +1465,7 @@ class Site(object):
     def setup_actions(self):
         from lino.core.merge import MergeAction
 
-        for m in get_models():
+        for m in apps.get_models():
             if m.allow_merge_action:
                 m.define_action(merge_row=MergeAction(m))
 
@@ -1794,61 +1789,6 @@ 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.
@@ -1998,18 +1938,9 @@ class Site(object):
         return self._sorted_plugins
 
     def setup_menu(self, user_type, main, ar=None):
-        # from django.apps import apps
-        # apps = [a.models_module for a in apps.get_app_configs()]
-
         for k, label in self.top_level_menus:
             methname = "setup_{0}_menu".format(k)
 
-            #             for mod in apps:
-            #                 if hasattr(mod, methname):
-            #                     msg = "{0} still has a function {1}(). \
-            # Please convert to Plugin method".format(mod, methname)
-            #                     raise ChangedAPI(msg)
-
             if label is None:
                 menu = main
             else:
@@ -2074,6 +2005,9 @@ class Site(object):
         return mark_safe(s)
 
     def build_site_cache(self, force=False, later=False, verbosity=1):
+        from lino.modlib.users.utils import with_user_profile
+        from lino.modlib.users.choicelists import UserTypes
+        # from django.utils import translation
         # if not self.is_prepared:
         #     self.prepare_layouts()
         #     self.is_prepared = True
@@ -2108,9 +2042,8 @@ class Site(object):
 
             self.makedirs_if_missing(self.media_root / "webdav")
 
-        from lino.modlib.users.utils import with_user_profile
-        from lino.modlib.users.choicelists import UserTypes
-        # from django.utils import translation
+        if verbosity > 0:
+            self.logger.info("Build site cache in %s.", self.media_root)
 
         started = time.time()
         count = 0

lino/core/tables.py

@@ -637,9 +637,9 @@ method in order to sort the rows of the queryset.
             ba = self.get_action_by_name(an)
         # ~ print ba
         if pk is None:
-            ar = self.request(action=ba)
+            ar = self.create_request(action=ba)
         else:
-            ar = self.request(action=ba, selected_pks=[pk])
+            ar = self.create_request(action=ba, selected_pks=[pk])
 
         ba.action.run_from_ui(ar)
         kw = ar.response

lino/core/utils.py

@@ -17,7 +17,7 @@ from django.utils.html import format_html, mark_safe, SafeString
 from django.db import models
 from django.db.models import Q
 from django.core.exceptions import FieldDoesNotExist
-from django.utils.functional import lazy
+# from django.utils.functional import lazy
 from importlib import import_module
 from django.utils.translation import gettext as _
 from django.conf import settings
@@ -1046,7 +1046,7 @@ class InstanceAction:
         """
         kwargs.update(selected_rows=[self.instance])
         kwargs.update(parent=ses)
-        ar = self.bound_action.request(**kwargs)
+        ar = self.bound_action.create_request(**kwargs)
         return ar
 
     def run_from_session(self, ses, **kwargs):
@@ -1070,7 +1070,7 @@ class InstanceAction:
         """
         if len(args) and isinstance(args[0], BaseRequest):
             raise ChangedAPI("20181004")
-        ar = self.bound_action.request(
+        ar = self.bound_action.create_request(
             renderer=settings.SITE.kernel.text_renderer)
         self.run_from_code(ar, *args, **kwargs)
         return ar.response

lino/core/views.py

@@ -100,7 +100,7 @@ def action_request(app_label, actor, request, rqdata, is_list, **kw):
             # internationalized because some error handling code
             # may want to write it to a plain ascii stream.
     kw.update(renderer=settings.SITE.kernel.default_renderer)
-    ar = rpt.request(request=request, action=a, rqdata=rqdata, **kw)
+    ar = rpt.create_request(request=request, action=a, rqdata=rqdata, **kw)
     # print("20210403b", a.action.__class__, rqdata)
     return ar
 
@@ -137,7 +137,7 @@ def choices_response(actor, request, qs, row2dict, emptyValue, field=None):
         count = qs.count()
 
         if offset:
-            qs = qs[int(offset) :]
+            qs = qs[int(offset):]
             # ~ kw.update(offset=int(offset))
 
         if limit:
@@ -155,7 +155,7 @@ def choices_response(actor, request, qs, row2dict, emptyValue, field=None):
                 row for row in rows if txt in row[constants.CHOICES_TEXT_FIELD].lower()
             ]
         count = len(rows)
-        rows = rows[int(offset) :] if offset else rows
+        rows = rows[int(offset):] if offset else rows
         rows = rows[: int(limit)] if limit else rows
 
     if wt == constants.WINDOW_TYPE_PARAMS and field and field.blank:

lino/help_texts.py

@@ -139,6 +139,7 @@ help_texts = {
     'lino.modlib.extjs.ext_renderer.ExtRenderer.goto_instance' : _("""See JsRenderer.goto_instance(), but when this is called while the detail window is already open (only on another record), then we don’t want to redirect to another page because that would take more time."""),
     'lino.modlib.extjs.views.AdminIndex' : _("""Similar to PlainIndex"""),
     'lino.modlib.extjs.views.Restful' : _("""Used to collaborate with a restful Ext.data.Store."""),
+    'lino.modlib.extjs.views.ApiElement' : _("""The view that responds to r'api/(?P<app_label>\w+)/(?P<actor>\w+)/(?P<pk>[^/]+)$'."""),
     'lino.modlib.gfks.Plugin' : _("""Base class for this plugin."""),
     'lino.modlib.importfilters.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.jinja.Plugin' : _("""See /dev/plugins."""),

lino/management/commands/buildsite.py

@@ -0,0 +1,67 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2009-2023 Rumma & Ko Ltd.
+# License: GNU Affero General Public License v3 (see file COPYING for details)
+
+from click import confirm
+from django.core.management.base import BaseCommand, CommandError
+from django.core.management import call_command
+from django.conf import settings
+from lino import logger
+
+
+class Command(BaseCommand):
+    """Build the site cache files and optionally run collectstatic for this Lino site."""
+
+    def add_arguments(self, parser):
+        super().add_arguments(parser)
+        parser.add_argument(
+            "-b", "--batch", "--noinput",
+            action="store_false",
+            dest="interactive",
+            default=True,
+            help="Do not prompt for input of any kind.",
+        ),
+        parser.add_argument(
+            "-c", "--collectstatic",
+            action="store_true",
+            dest="collectstatic",
+            default=False,
+            help="Also run collectstatic.",
+        ),
+
+    def handle(self, *args, **options):
+        interactive = options.get("interactive")
+        verbosity = options.get("verbosity")
+        project_dir = settings.SITE.project_dir
+        collectstatic = options.get("collectstatic")
+
+        options = dict(interactive=False, verbosity=verbosity)
+
+        if interactive:
+            msg = "Build everything for ({})".format(project_dir)
+            msg += ".\nAre you sure?"
+            if not confirm(msg, default=True):
+                raise CommandError("User abort.")
+
+        # the following log message was useful on Travis 20150104
+        if verbosity > 0:
+            logger.info("`buildsite` started on %s.", project_dir)
+
+        # pth = project_dir / "settings.py"
+        # if pth.exists():
+        #     pth.touch()
+
+        if collectstatic:
+            call_command("collectstatic", **options)
+
+        settings.SITE.build_site_cache(force=True, verbosity=verbosity)
+
+        # if settings.SITE.is_installed("help"):
+        #     call_command("makehelp", verbosity=verbosity)
+
+        # for p in settings.SITE.installed_plugins:
+        #     p.on_buildsite(settings.SITE, verbosity=verbosity)
+
+        # settings.SITE.clear_site_config()
+
+        logger.info("`buildsite` finished on %s.", project_dir)

lino/management/commands/dump2py.py

@@ -2,6 +2,10 @@
 # Copyright 2013-2023 by Rumma & Ko Ltd.
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
+from lino.utils.mldbc.fields import BabelCharField, BabelTextField
+from lino.core.choicelists import ChoiceListField
+from lino.core.utils import sorted_models_list, full_model_name
+from lino.utils import puts
 from io import open
 from lino import logger
 
@@ -20,12 +24,6 @@ from datetime import timezone
 
 utc = timezone.utc
 
-from lino.utils import puts
-from lino.core.utils import sorted_models_list, full_model_name
-from lino.core.choicelists import ChoiceListField
-
-from lino.utils.mldbc.fields import BabelCharField, BabelTextField
-
 
 def is_pointer_to_contenttype(f):
     if not settings.SITE.is_installed("contenttypes"):
@@ -402,7 +400,7 @@ def main(args):
 if __name__ == '__main__':
     import argparse
     parser = argparse.ArgumentParser(description='Restore the data.')
-    parser.add_argument('--noinput', dest='interactive',
+    parser.add_argument('-b', '--noinput', '--batch', dest='interactive',
         action='store_false', default=True,
         help="Don't ask for confirmation before flushing the database.")
     parser.add_argument('--quick', dest='quick',

lino/management/commands/initdb.py

@@ -1,7 +1,16 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2009-2023 Rumma & Ko Ltd.
+# Copyright 2009-2025 Rumma & Ko Ltd.
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
+from click import confirm
+from lino.api import dd
+from django.db import models
+from django.db import connections, transaction, DEFAULT_DB_ALIAS
+from django.core.management.color import no_style
+from django.db.utils import IntegrityError, OperationalError
+from django.core.management.base import BaseCommand, CommandError
+from django.core.management import call_command
+from django.conf import settings
 import os
 import shutil
 from pathlib import Path
@@ -22,20 +31,9 @@ warnings.filterwarnings(
     "django.core.management.commands.loaddata",
 )
 
-from django.conf import settings
-from django.core.management import call_command
-from django.core.management.base import BaseCommand, CommandError
-from django.db.utils import IntegrityError, OperationalError
-from django.db.migrations.exceptions import CircularDependencyError
-from django.core.management.color import no_style
 
 # ~ from django.core.management.sql import sql_reset
-from django.db import connections, transaction, DEFAULT_DB_ALIAS
-from django.db import models
-
-from lino.api import dd
 
-from rstgen.utils import confirm
 
 USE_SQLDELETE = True
 
@@ -198,8 +196,8 @@ class Command(BaseCommand):
             msg = "We are going to flush your database ({})".format(dbname)
             if removemedia:
                 msg += "\nAND REMOVE ALL FILES BELOW {}".format(mroot)
-            msg += ".\nAre you sure (y/n) ?"
-            if not confirm(msg):
+            msg += ".\nAre you sure?"
+            if not confirm(msg, default=True):
                 raise CommandError("User abort.")
 
         # mroot = Path(settings.MEDIA_ROOT)

lino/management/commands/install.py

@@ -4,7 +4,7 @@
 
 import sys
 import subprocess
-from rstgen.utils import confirm
+from click import confirm
 from django.core.management.base import BaseCommand
 from django.conf import settings
 
@@ -54,5 +54,5 @@ class Command(BaseCommand):
             return
         # cmd = "pip install --upgrade --trusted-host svn.forge.pallavi.be {}".format(' '.join(reqs))
         cmd = sys.executable + " -m pip install --upgrade pip {}".format(" ".join(reqs))
-        if not options["interactive"] or confirm("{} (y/n) ?".format(cmd)):
+        if not options["interactive"] or confirm("{} ?".format(cmd), default=True):
             runcmd(cmd)

lino/management/commands/prep.py

@@ -1,15 +1,11 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2013-2023 Rumma & Ko Ltd
+# Copyright 2013-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from pathlib import Path
 from django.core.management import call_command
 from django.core.management.base import BaseCommand, CommandError
 from django.conf import settings
-from django.db import DEFAULT_DB_ALIAS
-from rstgen.utils import confirm
-# from lino.management.commands.initdb import Command as BaseCommand
-# from lino.management.commands.initdb import CommandError
+from lino.utils import dbhash
 
 
 class Command(BaseCommand):
@@ -66,4 +62,4 @@ class Command(BaseCommand):
             kwargs["removemedia"] = True
         call_command("initdb", *args, **kwargs)
 
-        settings.SITE.mark_virgin()
+        dbhash.mark_virgin()

lino/mixins/sequenced.py

@@ -524,7 +524,7 @@ class Hierarchical(Duplicable):
                         et.append(ar.goto_pk(c.id, get_text(c)))
                 i -= 1
             if child == self:
-                sar = ar.actor.request(
+                sar = ar.actor.create_request(
                     parent=ar, master_instance=self, is_on_main_actor=False
                 )
                 # sar = ar.spawn_request(master_instance=self, is_on_main_actor=False)

lino/modlib/comments/models.py

@@ -257,7 +257,7 @@ class Comment(
             return format_html("<p>{}</p>", s)
 
         htmls = storypar(self.as_paragraph(ar))
-        for child in RepliesByComment.request(master_instance=self, parent=ar):
+        for child in RepliesByComment.create_request(master_instance=self, parent=ar):
             htmls += storypar(child.as_story_item(ar, indent=indent + 1))
         # if self.replies_to_this.count():
         #     # s += "<p>{}</p>".format("Replies:")

lino/modlib/comments/ui.py

@@ -129,7 +129,7 @@ class Comments(dd.Table):
         pv = dict(user=user, start_date=sd, end_date=ed,
                   observed_event=CommentEvents.created)
         # pv = dict(start_date=sd, end_date=ed, observed_event=CommentEvents.created)
-        return cls.request(user=user, param_values=pv)
+        return cls.create_request(user=user, param_values=pv)
 
     # @classmethod
     # def get_card_title(cls, ar, obj):
@@ -302,7 +302,7 @@ class RepliesByComment(CommentsByX):
 
 
 def comments_by_owner(obj):
-    return CommentsByRFC.request(master_instance=obj)
+    return CommentsByRFC.create_request(master_instance=obj)
 
 
 class Reactions(dd.Table):

lino/modlib/extjs/ext_renderer.py

@@ -136,7 +136,7 @@ class ExtRenderer(JsCacheRenderer):
                 return self.handler_item(v, js, None)
             elif v.bound_action is not None:
                 if v.params:
-                    ar = v.bound_action.request(**v.params)
+                    ar = v.bound_action.create_request(**v.params)
                     js = self.request_handler(ar)
                     # print("20230513", js)
                 else:
@@ -265,7 +265,7 @@ class ExtRenderer(JsCacheRenderer):
 
         """
         if ar is None:
-            sar = ba.request(**request_kwargs)
+            sar = ba.create_request(**request_kwargs)
         else:
             sar = ar.spawn(ba, **request_kwargs)
         return self.ar2js(sar, obj, **status)