lino 25.3.2__py3-none-any.whl → 25.3.4__py3-none-any.whl

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.4'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

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/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