lino 25.3.2__tar.gz → 25.3.3__tar.gz

{lino-25.3.2 → lino-25.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.3.2
+Version: 25.3.3
 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.3.2 → lino-25.3.3}/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.3.2'
+__version__ = '25.3.3'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

{lino-25.3.2 → lino-25.3.3}/lino/api/doctest.py

@@ -22,6 +22,7 @@ from django.db.models import Model
 from lino.core.actions import ShowTable
 from lino.core.menus import Menu
 from lino.utils.html import html2text
+from lino.utils import dbhash
 from lino.core.utils import full_model_name, get_models
 from lino.utils.diag import visible_for
 from lino.sphinxcontrib.actordoc import menuselection_text

{lino-25.3.2 → lino-25.3.3}/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-25.3.2 → lino-25.3.3}/lino/management/commands/buildsite.py

@@ -10,22 +10,32 @@ from lino import logger
 
 
 class Command(BaseCommand):
-    """Run install, buildcache, collectstatic and makehelp after pull."""
+    """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(
-            "--noinput",
+            "-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)
@@ -37,21 +47,21 @@ class Command(BaseCommand):
         if verbosity > 0:
             logger.info("`buildsite` started on %s.", project_dir)
 
-        pth = project_dir / "settings.py"
-        if pth.exists():
-            pth.touch()
+        # pth = project_dir / "settings.py"
+        # if pth.exists():
+        #     pth.touch()
 
-        options = dict(interactive=False, verbosity=verbosity)
+        if collectstatic:
+            call_command("collectstatic", **options)
+
+        settings.SITE.build_site_cache(force=True, verbosity=verbosity)
 
-        call_command("install", **options)
-        call_command("collectstatic", **options)
-        call_command("buildcache", verbosity=verbosity)
-        if settings.SITE.is_installed("help"):
-            call_command("makehelp", 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()
+        # settings.SITE.clear_site_config()
 
         logger.info("`buildsite` finished on %s.", project_dir)

{lino-25.3.2 → lino-25.3.3}/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-25.3.2 → lino-25.3.3}/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-25.3.2 → lino-25.3.3}/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-25.3.2 → lino-25.3.3}/lino/utils/__init__.py

@@ -18,6 +18,7 @@ function for general use. It has also many subpackages and submodules.
     dataserializer
     dbfreader
     dblogger
+    dbhash
     diag
     djangotest
     dpy

lino-25.3.3/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.")