lino 25.6.0__py3-none-any.whl → 25.7.0__py3-none-any.whl

lino/modlib/periods/models.py

@@ -4,13 +4,14 @@
 
 import datetime
 from django.db import models
+from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from lino.api import dd
-from lino import mixins
 from lino.utils import ONE_DAY
 from lino.mixins.periods import DateRange
-from lino.mixins import Referrable
+from lino.mixins.ref import Referrable
+from lino.mixins.sequenced import Sequenced
 from lino.modlib.system.choicelists import DurationUnits
 from lino.modlib.office.roles import OfficeStaff
 from .choicelists import PeriodTypes, PeriodStates
@@ -97,7 +98,7 @@ class StoredYear(DateRange, Referrable):
         # return self.__class__.get_or_create_from_date(nextyear)
 
 
-class StoredPeriod(DateRange, Referrable):
+class StoredPeriod(DateRange, Referrable, Sequenced):
 
     class Meta:
         ordering = ['ref']
@@ -112,6 +113,47 @@ class StoredPeriod(DateRange, Referrable):
                          null=True, related_name="periods")
     remark = models.CharField(_("Remark"), max_length=250, blank=True)
 
+    @classmethod
+    # get_default_for_date until 20241020
+    def get_or_create_from_date(cls, date, save=True):
+        pt = dd.plugins.periods.period_type
+        month = date.month
+        month_offset = month - dd.plugins.periods.start_month
+        if month_offset < 0:
+            month_offset += 12
+        seqno = int(month_offset / pt.duration) + 1
+        ref = pt.ref_template.format(**locals())
+        ref = StoredYear.get_ref_for_date(date) + YEAR_PERIOD_SEP + ref
+        obj = cls.get_by_ref(ref, None)
+        if obj is None:
+            sd, ed = cls.get_range_for_date(date)
+            obj = cls(ref=ref, start_date=sd, end_date=ed, seqno=seqno)
+            if save:
+                obj.full_clean()
+                obj.save()
+        return obj
+
+    def full_clean(self, *args, **kwargs):
+        if self.start_date is None:
+            self.start_date = dd.today().replace(day=1)
+        if self.year_id is None:
+            self.year = StoredYear.get_or_create_from_date(self.start_date)
+        if not self.state:
+            self.state = self.year.state
+        super().full_clean(*args, **kwargs)
+        pt = dd.plugins.periods.period_type
+        if self.seqno not in pt.seqnos:
+            raise ValidationError(f"seqno must be in {pt.seqnos}")
+
+    def __str__(self):
+        if not self.ref:
+            return dd.obj2str(self)
+            # "{0} {1} (#{0})".format(self.pk, self.year)
+        return self.ref
+
+    def get_siblings(self):
+        return self.__class__.objects.filter(year=self.year)
+
     @classmethod
     def get_simple_parameters(cls):
         yield super().get_simple_parameters()
@@ -170,18 +212,6 @@ class StoredPeriod(DateRange, Referrable):
             kwargs[fieldname + '__in'] = periods
         return kwargs
 
-    @classmethod
-    def get_ref_for_date(cls, date):
-        pt = dd.plugins.periods.period_type
-        month = date.month
-        month_offset = month - dd.plugins.periods.start_month
-        if month_offset < 0:
-            month_offset += 12
-        period = int(month_offset / pt.duration) + 1
-        # periods_per_year = int(12 / p.duration)
-        # period = (month_offset % (periods_per_year-1)) + 1
-        return pt.ref_template.format(**locals())
-
     @classmethod
     def get_range_for_date(cls, date):
         """
@@ -205,32 +235,6 @@ class StoredPeriod(DateRange, Referrable):
         ed = DurationUnits.months.add_duration(sd, pt.duration) - ONE_DAY
         return (sd, ed)
 
-    @classmethod
-    def get_or_create_from_date(cls, date):  # get_default_for_date until 20241020
-        ref = date2ref(date)
-        obj = cls.get_by_ref(ref, None)
-        if obj is None:
-            sd, ed = cls.get_range_for_date(date)
-            obj = cls(ref=ref, start_date=sd, end_date=ed)
-            obj.full_clean()
-            obj.save()
-        return obj
-
-    def full_clean(self, *args, **kwargs):
-        if self.start_date is None:
-            self.start_date = dd.today().replace(day=1)
-        if not self.year_id:
-            self.year = StoredYear.get_or_create_from_date(self.start_date)
-        if not self.state:
-            self.state = self.year.state
-        super().full_clean(*args, **kwargs)
-
-    def __str__(self):
-        if not self.ref:
-            return dd.obj2str(self)
-            # "{0} {1} (#{0})".format(self.pk, self.year)
-        return self.ref
-
     # def get_str_words(self, ar):
     #     # if ar.is_obvious_field("year"):
     #     if self.year.covers_date(dd.today()):
@@ -251,10 +255,6 @@ class StoredPeriod(DateRange, Referrable):
 StoredPeriod.set_widget_options('ref', width=6)
 
 
-def date2ref(d):
-    return StoredYear.get_ref_for_date(d) + YEAR_PERIOD_SEP + StoredPeriod.get_ref_for_date(d)
-
-
 class StoredYears(dd.Table):
     model = 'periods.StoredYear'
     required_roles = dd.login_required(OfficeStaff)

lino/modlib/summaries/fixtures/checksummaries.py

@@ -1,13 +1,15 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2017-2018 Luc Saffre
+# Copyright 2017-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """Runs the :manage:`checksummaries` management command.
 
 """
 
 from django.core.management import call_command
+from lino.api import dd
 
 
 def objects():
-    call_command("checksummaries")
+    if not dd.is_installed("linod"):
+        call_command("checksummaries")
     return []

lino/modlib/system/models.py

@@ -78,7 +78,7 @@ class SiteConfig(dd.Model):
     This is Lino's equivalent of Django's :setting:`SITE_ID` setting.
     Lino applications don't need ``django.contrib.sites`` (`The
     "sites" framework
-    <https://docs.djangoproject.com/en/5.0/ref/contrib/sites/>`_)
+    <https://docs.djangoproject.com/en/5.2/ref/contrib/sites/>`_)
     because an analog functionality is provided by
     :mod:`lino.modlib.system`.
     """
@@ -94,14 +94,6 @@ class SiteConfig(dd.Model):
     simulate_today = models.DateField(
         _("Simulated date"), blank=True, null=True)
 
-    site_company = dd.ForeignKey(
-        "contacts.Company",
-        blank=True,
-        null=True,
-        verbose_name=_("Site owner"),
-        related_name="site_company_sites",
-    )
-
     _site_config = None
 
     @classmethod
@@ -144,7 +136,7 @@ class SiteConfig(dd.Model):
                 # said "SiteConfig 1 does not exist"
                 # cannot save the instance here because the db table possibly doesn't yet exit.
                 # ~ self._site_config.save()
-            cls._site_config.on_startup()
+            # cls._site_config.on_startup()
         return cls._site_config
 
     def __str__(self):
@@ -171,14 +163,16 @@ class SiteConfig(dd.Model):
     #             kw[fld.attname] = getattr(other, fld.attname)
     #     self.update(**kw)
 
-    def on_startup(self):
-        # if not self.site_company:
-        #     raise Exception("20230423")
-        if self.site_company:
-            # print("20230423", self.site_company)
-            settings.SITE.copyright_name = str(self.site_company)
-            if self.site_company.url:
-                settings.SITE.copyright_url = self.site_company.url
+    # def on_startup(self):
+    #     # if not self.site_company:
+    #     #     raise Exception("20230423")
+    #     # if self.site_company:
+    #     site = settings.SITE
+    #     if (owner := site.get_plugin_setting('contacts', 'site_owner')) is not None:
+    #         # print("20230423", self.site_company)
+    #         site.copyright_name = str(owner)
+    #         if owner.url:
+    #             site.copyright_url = owner.url
 
     # def full_clean(self, *args, **kw):
     #     super().full_clean(*args, **kw)
@@ -207,6 +201,11 @@ class SiteConfig(dd.Model):
         super().save(*args, **kw)
         # settings.SITE.clear_site_config()
 
+    @property
+    def site_company(self):
+        # Backwards compatibility after 20250617
+        return settings.SITE.plugins.contacts.site_owner
+
 
 def my_handler(sender, **kw):
     # print("20180502 {} my_handler calls clear_site_config()".format(

lino/modlib/uploads/fixtures/demo.py

@@ -2,15 +2,14 @@
 # Copyright 2015-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-import os
 from lino.api import dd, rt
-from lino.modlib.uploads.mixins import make_uploaded_file
 
 try:
     from lino_book import DEMO_DATA
 except ImportError:
     DEMO_DATA = None
 
+
 def walk(p):
     # print("20230331", p)
     for c in sorted(p.iterdir()):
@@ -20,8 +19,15 @@ def walk(p):
         else:
             yield c
 
+
 def objects():
-    
+
+    what = "removed" if dd.plugins.uploads.remove_orphaned_files else "collected"
+    orphan = dd.plugins.uploads.uploads_root / "orphan.txt"
+    orphan.parent.mkdir(parents=True, exist_ok=True)
+    orphan.write_text(f"This file will get {what} by uploads.UploadsFolderChecker")
+    dd.logger.info(f"Wrote {orphan}")
+
     if DEMO_DATA is None:
         # logger.info("No demo data because lino_book is not installed")
         return

lino/modlib/uploads/mixins.py

@@ -192,8 +192,11 @@ class UploadBase(Commentable, GalleryViewable):
         dd.logger.info("Wrote uploaded file %s", ff.path)
 
     def get_gallery_item(self, ar):
-        mf = self.get_media_file()
-        return dict(image_src=mf.get_image_url())
+        if (mf := self.get_media_file()) is not None:
+            url = mf.get_image_url()
+        else:
+            url = "20250703"
+        return dict(image_src=url)
 
     def full_clean(self, *args, **kw):
         super().full_clean(*args, **kw)

lino/modlib/uploads/models.py

@@ -2,7 +2,6 @@
 # Copyright 2008-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from .ui import *
 import os
 from os.path import join, exists
 from pathlib import Path
@@ -13,7 +12,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.text import format_lazy
 from django.utils.html import format_html, mark_safe
-from django.utils.translation import pgettext_lazy as pgettext
+# from django.utils.translation import pgettext_lazy as pgettext
 
 from rstgen.sphinxconf.sigal_image import parse_image_spec
 # from rstgen.sphinxconf.sigal_image import Standard, Thumb, Tiny, Wide, Solo, Duo, Trio
@@ -22,10 +21,8 @@ from rstgen.sphinxconf.sigal_image import parse_image_spec
 from lino.utils.html import E, join_elems
 from lino.api import dd, rt, _
 from lino.modlib.gfks.mixins import Controllable
-from lino.modlib.users.mixins import UserAuthored, My
+from lino.modlib.users.mixins import UserAuthored
 
-# from lino.modlib.office.roles import OfficeUser, OfficeStaff, OfficeOperator
-from lino.modlib.office.roles import OfficeStaff
 from lino.mixins import Referrable
 from lino.utils.soup import register_sanitizer
 from lino.utils.mldbc.mixins import BabelNamed
@@ -33,11 +30,12 @@ from lino.modlib.checkdata.choicelists import Checker
 from lino.modlib.publisher.mixins import Publishable
 
 from .actions import CameraStream
-from .choicelists import Shortcuts, UploadAreas, add_shortcut
+from .choicelists import Shortcuts, UploadAreas
 from .mixins import UploadBase, base64_to_image
 from .utils import previewer, UploadMediaFile
 
 from . import VOLUMES_ROOT
+from .ui import *
 
 
 class Volume(Referrable):
@@ -328,9 +326,16 @@ class UploadsFolderChecker(Checker):
                 msg = format_lazy(
                     _("File {} has no upload entry."), rel_filename)
                 # print(msg)
-                yield (dd.plugins.uploads.remove_orphaned_files, msg)
-                if fix and dd.plugins.uploads.remove_orphaned_files:
-                    filename.unlink()
+                yield (True, msg)
+                if fix:
+                    if dd.plugins.uploads.remove_orphaned_files:
+                        filename.unlink()
+                    else:
+                        obj = Upload(
+                            file=rel_filename, user=ar.get_user(),
+                            description=f"Found on {dd.today()} by {self}")
+                        obj.full_clean()
+                        obj.save()
             # else:
             #     print("{} has {} entries.".format(filename, n))
             # elif n > 1:
@@ -487,6 +492,7 @@ def on_sanitize(soup, save=False, ar=None):
                 upload = rt.models.uploads.Upload(file=file, user=ar.get_user())
                 sar = upload.get_default_table().create_request(parent=ar)
                 upload.save_new_instance(sar)
+                rt.models.checkdata.fix_instance(ar, upload)
                 tag.replace_with(f'[file {upload.pk}]')
 
 

lino/modlib/uploads/utils.py

@@ -93,6 +93,9 @@ class FilePreviewer(Previewer):
         if needs_update(src, dst):
             yield (True, format_lazy(_("Must build thumbnail for {}"), mf.url))
             if fix:
+                dst.parent.mkdir(parents=True, exist_ok=True)
+                # Make parent dir also for pdf previews. See #6181 (Issues after
+                # uploading two PDFs to froinde)
                 if src.suffix.lower() == ".pdf":
                     doc = pymupdf.open(src)
                     page = doc.load_page(0)
@@ -101,9 +104,9 @@ class FilePreviewer(Previewer):
                     return
                 with Image.open(src) as im:
                     im.thumbnail((self.max_width, self.max_width))
-                    dst.parent.mkdir(parents=True, exist_ok=True)
                     im.save(dst)
 
+
 if with_thumbnails:
     previewer = FilePreviewer("thumbs", 720)
 else:

lino/modlib/users/__init__.py

@@ -5,6 +5,7 @@
 
 
 from lino.api import ad, _
+from lino import logger
 
 
 class Plugin(ad.Plugin):
@@ -22,6 +23,15 @@ class Plugin(ad.Plugin):
     # partner_model = 'contacts.Person'
     partner_model = "contacts.Partner"
     demo_password = "1234"
+    demo_username = None
+
+    def on_init(self):
+        super().on_init()
+        self.site.set_user_model("users.User")
+        from lino.core.site import has_socialauth
+
+        if has_socialauth and self.third_party_authentication:
+            self.needs_plugins.append("social_django")
 
     def pre_site_startup(self, site):
         super().pre_site_startup(site)
@@ -31,26 +41,27 @@ class Plugin(ad.Plugin):
         #         return
         self.partner_model = site.models.resolve(self.partner_model)
 
-    # def unused_on_plugins_loaded(self, site):
-    #     if self.allow_online_registration:
-    #         # If you use gmail smtp to send email.
-    #         # See: https://support.google.com/mail/answer/7126229?visit_id=1-636656345878819046-1400238651&rd=1#cantsignin&zippy=%2Ci-cant-sign-in-to-my-email-client
-    #         # For this setup you will have to allow less secure app access from
-    #         # your google accounts settings: https://myaccount.google.com/lesssecureapps
-    #         site.update_settings(
-    #             EMAIL_HOST='smtp.gmail.com',
-    #             EMAIL_PORT=587,  # For TLS | use 465 for SSL
-    #             EMAIL_HOST_USER='username@gmail.com',
-    #             EMAIL_HOST_PASSWORD='*********',
-    #             EMAIL_USE_TLS=True)
+    def post_site_startup(self, site):
+        super().post_site_startup(site)
+        if self.demo_username is None:
+            if (kw := self.get_root_user_fields(site.DEFAULT_LANGUAGE)):
+                self.demo_username = kw['username']
 
-    def on_init(self):
-        super().on_init()
-        self.site.set_user_model("users.User")
-        from lino.core.site import has_socialauth
+    _demo_user = None  # the cached User object
 
-        if has_socialauth and self.third_party_authentication:
-            self.needs_plugins.append("social_django")
+    def get_demo_user(self, checker, obj):
+        if self.demo_username is None:
+            return None
+        if self._demo_user is None:
+            User = self.site.models.users.User
+            try:
+                self._demo_user = User.objects.get(
+                    username=self.demo_username)
+            except User.DoesNotExist:
+                msg = "Invalid username '{0}' in `demo_username` "
+                msg = msg.format(self.demo_username)
+                raise Exception(msg)
+        return self._demo_user
 
     def get_requirements(self, site):
         yield "social-auth-app-django"
@@ -86,3 +97,33 @@ class Plugin(ad.Plugin):
 
     def get_quicklinks(self):
         yield "users.Me"
+
+    def get_root_user_fields(self, lang, **kw):
+        # ~ kw.update(user_type='900') # UserTypes.admin)
+        # ~ print 20130219, UserTypes.items()
+        kw.update(user_type=self.site.models.users.UserTypes.admin)
+        kw.update(email=self.site.demo_email)  # 'root@example.com'
+        lang = lang.django_code
+        kw.update(language=lang)
+        lang = lang[:2]
+        if lang == "en":
+            kw.update(first_name="Robin", last_name="Rood")
+        elif lang == "de":
+            kw.update(first_name="Rolf", last_name="Rompen")
+        elif lang == "fr":
+            kw.update(first_name="Romain", last_name="Raffault")
+        elif lang == "et":
+            kw.update(first_name="Rando", last_name="Roosi")
+        elif lang == "pt":
+            kw.update(first_name="Ronaldo", last_name="Rosa")
+        elif lang == "es":
+            kw.update(first_name="Rodrigo", last_name="Rosalez")
+        elif lang == "nl":
+            kw.update(first_name="Rik", last_name="Rozenbos")
+        elif lang == "bn":
+            kw.update(first_name="Roby", last_name="Raza")
+        else:
+            logger.warning("No demo user for language %r.", lang)
+            return None
+        kw.update(username=kw.get("first_name").lower())
+        return kw

lino/modlib/users/actions.py

@@ -237,21 +237,21 @@ class VerifyMe(VerifyUser):
         self.doit(ar, user, **kwargs)
 
 
-if settings.SITE.default_ui == "lino_react.react":
-
-    class MySettings(dd.Action):
-        label = _("My settings")
-        select_rows = False
-        show_in_toolbar = False
-        # http_method = "POST"
-        default_format = None
-
-        def run_from_ui(self, ar, **kw):
-            # assert len(ar.selected_rows) == 1
-            # user = ar.selected_rows[0]
-            # raise PermissionError("20210811")
-            user = ar.get_user()
-            ar.goto_instance(user)
+# if settings.SITE.default_ui == "lino_react.react":
+#
+#     class MySettings(dd.Action):
+#         label = _("My settings")
+#         select_rows = False
+#         show_in_toolbar = False
+#         # http_method = "POST"
+#         default_format = None
+#
+#         def run_from_ui(self, ar, **kw):
+#             # assert len(ar.selected_rows) == 1
+#             # user = ar.selected_rows[0]
+#             # raise PermissionError("20210811")
+#             user = ar.get_user()
+#             ar.goto_instance(user)
 
 
 class SendWelcomeMail(dd.Action):
@@ -263,16 +263,16 @@ class SendWelcomeMail(dd.Action):
         show_in_toolbar = False
         show_in_workflow = True
     button_text = "\u2709"  # ✉
+    select_rows = True
+    # required_roles = dd.login_required()
 
     # required_roles = dd.login_required(SiteAdmin)
 
     def get_action_permission(self, ar, obj, state):
-        if not obj.email:
-            return False
         user = ar.get_user()
-        if user != obj:
-            if not user.user_type.has_required_roles([SiteAdmin]):
-                return False
+        if user != obj and not user.user_type.has_required_roles([SiteAdmin]):
+            # print(f"20250712 {user} != {obj}")
+            return False
         return super().get_action_permission(ar, obj, state)
 
     def run_from_ui(self, ar, **kw):
@@ -284,6 +284,10 @@ class SendWelcomeMail(dd.Action):
             obj.full_clean()
             obj.save()
 
+        if not obj.email:
+            ar.error(_("Cannot verify without email address"), alert=True)
+            return
+
         recipients = ["{} <{}>".format(obj.get_full_name(), obj.email)]
 
         def ok(ar):

lino/modlib/users/fixtures/demo_users.py

@@ -2,41 +2,8 @@
 # Copyright 2010-2020 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from lino import logger
-
 from django.conf import settings
-from lino.modlib.users.choicelists import UserTypes
-
-
-def root_user(lang, **kw):
-    # ~ kw.update(user_type='900') # UserTypes.admin)
-    # ~ print 20130219, UserTypes.items()
-    kw.update(user_type=UserTypes.admin)
-    kw.update(email=settings.SITE.demo_email)  # 'root@example.com'
-    lang = lang.django_code
-    kw.update(language=lang)
-    lang = lang[:2]
-    if lang == "en":
-        kw.update(first_name="Robin", last_name="Rood")
-    elif lang == "de":
-        kw.update(first_name="Rolf", last_name="Rompen")
-    elif lang == "fr":
-        kw.update(first_name="Romain", last_name="Raffault")
-    elif lang == "et":
-        kw.update(first_name="Rando", last_name="Roosi")
-    elif lang == "pt":
-        kw.update(first_name="Ronaldo", last_name="Rosa")
-    elif lang == "es":
-        kw.update(first_name="Rodrigo", last_name="Rosalez")
-    elif lang == "nl":
-        kw.update(first_name="Rik", last_name="Rozenbos")
-    elif lang == "bn":
-        kw.update(first_name="Roby", last_name="Raza")
-    else:
-        logger.warning("No demo user for language %r.", lang)
-        return None
-    kw.update(username=kw.get("first_name").lower())
-    return kw
+from lino.api import dd
 
 
 def objects():
@@ -48,7 +15,7 @@ def objects():
     for lang in SITE.languages:
         if (SITE.hidden_languages is None
                 or lang.django_code not in SITE.hidden_languages):
-            kw = root_user(lang)
+            kw = dd.plugins.users.get_root_user_fields(lang)
             if kw:
                 u = User(**kw)
                 if SITE.is_demo_site:

lino/modlib/users/mixins.py

@@ -237,8 +237,8 @@ class UserPlan(UserAuthored):
         abstract = True
 
     today = models.DateField(_("Today"), default=dd.today)
-    # 20240621 today is no longer readonly because it doesn't get set
-    # automatically
+    # 20240621 today is no longer readonly because the user may want to continue
+    # a plan they started yesterday
 
     update_plan = UpdatePlan()
     start_plan = StartPlan()
@@ -263,8 +263,7 @@ class UserPlan(UserAuthored):
         else:
             if num > 1:
                 dd.logger.warning(
-                    "Got {} {} for {}".format(num, cls._meta.verbose_name_plural, user)
-                )
+                    f"Got {num} {cls._meta.verbose_name_plural} for {user}")
                 qs.delete()
             plan = cls(user=user, **options)
         plan.full_clean()