lino 25.6.1__py3-none-any.whl → 25.7.1__py3-none-any.whl

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()

lino/modlib/users/models.py

@@ -11,7 +11,7 @@ from django.conf import settings
 from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
 from django.utils import timezone
 
-from lino.api import dd, rt, _
+from lino.api import dd, rt, _, gettext
 from lino.core import userprefs
 from lino.core.roles import Supervisor
 from lino.core.roles import SiteAdmin
@@ -21,13 +21,13 @@ from lino.mixins import DateRange
 from lino.modlib.about.choicelists import TimeZones, DateFormats
 from lino.modlib.publisher.mixins import Publishable
 from lino.modlib.about.models import About
-from lino.utils.html import E
+from lino.utils.html import tostring, format_html, mark_safe
 
 from .choicelists import UserTypes
 from .mixins import UserAuthored  # , TimezoneHolder
 from .actions import ChangePassword, SignOut, CheckedSubmitInsert
 from .actions import SendWelcomeMail, SignIn, ConnectAccount
-from .actions import SendWelcomeMail, CreateAccount, ResetPassword, VerifyUser, VerifyMe
+from .actions import CreateAccount, ResetPassword, VerifyUser, VerifyMe
 
 from .ui import *
 
@@ -90,9 +90,8 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
     quick_search_fields = "username user_type first_name last_name remarks"
     allow_merge_action = True
 
-    # seems that Django doesn't like nullable username
-    # username = dd.NullCharField(_('Username'), max_length=30, unique=True)
-    username = models.CharField(_("Username"), max_length=30, unique=True)
+    username = models.CharField(
+        _("Username"), max_length=30, unique=True, null=True, blank=True)
     user_type = UserTypes.field(blank=True)
     initials = models.CharField(_("Initials"), max_length=10, blank=True)
     if dd.plugins.users.with_nickname:
@@ -109,7 +108,6 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
     verification_password = models.CharField(max_length=200, blank=True)
     verification_code = models.CharField(max_length=200, blank=True, default="!")
     verification_code_sent_on = models.DateTimeField(null=True, blank=True)
-    verify_me = VerifyMe()
 
     if settings.USE_TZ:
         time_zone = TimeZones.field(default="default")
@@ -129,23 +127,33 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
         )
 
     submit_insert = CheckedSubmitInsert()
+
+    verify_me = VerifyMe()
     send_welcome_email = SendWelcomeMail()
     change_password = ChangePassword()
     # sign_in = SignIn()
     sign_out = SignOut()
 
-    if settings.SITE.default_ui == "lino_react.react":
-        from lino.modlib.users.actions import MySettings
+    if dd.get_plugin_setting("users", "third_party_authentication"):
+        connect_account = ConnectAccount()
 
-        my_settings = MySettings()
+    # if settings.SITE.default_ui == "lino_react.react":
+    #     my_settings = MySettings()
 
     def __str__(self):
         return self.nickname or self.get_full_name()
 
+    @classmethod
+    def get_simple_parameters(cls):
+        for p in super().get_simple_parameters():
+            yield p
+        yield "user_type"
+
     @property
     def is_active(self):
         # if not self.has_usable_password():
-        #     return False
+        if not self.user_type or not self.username:
+            return False
         if self.start_date and self.start_date > dd.today():
             return False
         if self.end_date and self.end_date < dd.today():
@@ -401,6 +409,17 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
     # def get_default_table(cls):
     #     return rt.models.users.MySettings
 
+    def dt_astimezone(self, dt):
+        """
+        Convert datetime to user timezone if time_zone is not None otherwise to default timezone.
+        Used in template notify/summary.eml
+        """
+        default_tz = rt.models.about.TimeZones.default
+        aware_dt = dt.astimezone(default_tz.tzinfo)
+        if self.time_zone:
+            aware_dt = aware_dt.astimezone(self.time_zone.tzinfo)
+        return aware_dt
+
 
 settings.AUTH_USER_MODEL = "users.User"
 
@@ -474,5 +493,26 @@ def setup_memo_commands(sender=None, **kwargs):
     )
 
 
-if dd.get_plugin_setting("users", "third_party_authentication"):
-    Me.connect_account = ConnectAccount()
+def welcome_messages(ar):
+    me = ar.get_user()
+    if not me.is_verified():
+        # sar = rt.models.users.Me.create_request(parent=ar)
+        sar = ar
+        if me.email:
+            # verify_me =
+            msg = format_html(
+                _("Your email address ({email}) is not verified, "
+                  "please check your mailbox and {verify} or {resend}."),
+                email=me.email,
+                verify=tostring(sar.instance_action_button(
+                    me.verify_me, _("verify now"))),
+                resend=tostring(sar.instance_action_button(
+                    me.send_welcome_email, _("re-send our welcome email"))))
+        else:
+            msg = format_html(
+                _("You have no email address, please {edit}."),
+                edit=tostring(sar.obj2html(me, _("edit your user settings"))))
+        yield mark_safe(msg)
+
+
+dd.add_welcome_handler(welcome_messages)

lino/modlib/users/ui.py

@@ -10,20 +10,21 @@ from importlib import import_module
 from lino.utils.html import E, tostring
 
 from django.contrib.humanize.templatetags.humanize import naturaltime
-from django.utils import timezone
+# from django.utils import timezone
 from django.utils.html import mark_safe
 from django.conf import settings
 from django.db import models
+from django.db.models import Q
 
 from lino.api import dd, rt, _
 from lino.core import actions
-from lino.core import constants
 from lino.core.roles import SiteAdmin, SiteUser, UserRole
 from lino.core.utils import djangoname
 from lino.core.auth import SESSION_KEY
 
 from .choicelists import UserTypes
-from .actions import SendWelcomeMail, SignInWithSocialAuth
+# from .actions import SendWelcomeMail
+# from .actions import SendWelcomeMail, SignInWithSocialAuth
 
 
 def mywrap(t, ls=80):
@@ -31,6 +32,16 @@ def mywrap(t, ls=80):
     return "\n".join(wrap(t, ls))
 
 
+def format_timestamp(dt):
+    if dt is None:
+        return ""
+    return "{} {} ({})".format(
+        dt.strftime(settings.SITE.date_format_strftime),
+        dt.strftime(settings.SITE.time_format_strftime),
+        naturaltime(dt),
+    )
+
+
 class UserDetail(dd.DetailLayout):
     box1 = """
     username user_type:20
@@ -83,9 +94,11 @@ class Users(dd.Table):
     abstract = True
     required_roles = dd.login_required(SiteAdmin)
 
-    parameters = dict(user_type=UserTypes.field(blank=True))
+    parameters = dict(show_active=dd.YesNo.field(_("Active"), blank=True))
+
+    params_layout = "user_type show_active start_date end_date"
 
-    simple_parameters = ["user_type"]
+    # simple_parameters = ["user_type"]
 
     # ~ column_names = 'username first_name last_name is_active is_staff is_expert is_superuser *'
     column_names = "username user_type first_name last_name *"
@@ -112,7 +125,18 @@ class Users(dd.Table):
 
 
 class AllUsers(Users):
-    send_welcome_email = SendWelcomeMail()
+    # send_welcome_email = SendWelcomeMail()
+
+    @classmethod
+    def get_request_queryset(cls, ar, **filter):
+        qs = super().get_request_queryset(ar, **filter)
+        if (pv := ar.param_values) is None:
+            return qs
+        if pv.show_active == dd.YesNo.no:
+            qs = qs.filter(Q(username__isnull=True) | Q(user_type=''))
+        elif pv.show_active == dd.YesNo.yes:
+            qs = qs.exclude(Q(username__isnull=True) | Q(user_type=''))
+        return qs
 
 
 class UsersOverview(Users):
@@ -282,16 +306,6 @@ class UserRoles(dd.VirtualTable):
         cls.column_names = "name:20 " + " ".join(names)
 
 
-def format_timestamp(dt):
-    if dt is None:
-        return ""
-    return "{} {} ({})".format(
-        dt.strftime(settings.SITE.date_format_strftime),
-        dt.strftime(settings.SITE.time_format_strftime),
-        naturaltime(dt),
-    )
-
-
 class KillSession(actions.Action):
     label = _("Kill")
     custom_handler = True

lino/modlib/users/utils.py

@@ -1,7 +1,9 @@
-# Copyright 2011-2024 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import threading
+from django.conf import settings
+from lino.utils import camelize
 
 user_profile_rlock = threading.RLock()
 _for_user_profile = None
@@ -50,9 +52,6 @@ class UserTypeContext(object):
 
 # set_for_user_profile = set_user_profile
 
-from lino.utils import camelize
-from lino.api import rt
-
 
 def create_user(username, user_type=None, with_person=False, **kw):
     # with_person was used in noi1e demo
@@ -66,7 +65,7 @@ def create_user(username, user_type=None, with_person=False, **kw):
         kw.update(username=username, user_type=user_type)
         kw.update(first_name=first_name)
         # kw.update(partner=person)
-        return rt.models.users.User(**kw)
+        return settings.SITE.models.users.User(**kw)
     else:
         # return dd.plugins.skills.supplier_model(first_name=first_name)
-        return rt.models.contacts.Person(first_name=first_name)
+        return settings.SITE.models.contacts.Person(first_name=first_name)

lino/projects/std/settings.py

@@ -60,7 +60,7 @@ EMAIL_HOST = "mail.example.com"
 DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:"}}
 
 # Django wants system admins to define their own `SECRET_KEY
-# <https://docs.djangoproject.com/en/5.0/ref/settings/#secret-key>`__
+# <https://docs.djangoproject.com/en/5.2/ref/settings/#secret-key>`__
 # setting.  Hint: as long as you're on a development server you just
 # put some non-empty string and that's okay.
 

lino/sphinxcontrib/logo/templates/footer.html

@@ -1,5 +1,6 @@
 <footer role="contentinfo">
 {%- include 'copyright.html' %}
+<a class="reference external" href="https://www.saffre-rumma.net/team/">Contact</a>.
 {%- include 'last-updated.html' %}
 {%- include 'sphinx.html' %}
 {%- include 'show-source.html' %}

lino/utils/ajax.py

@@ -56,7 +56,7 @@ class AjaxExceptionResponse(MiddlewareMixin):
     # at all.
 
     def process_exception(self, request, exception):
-        # if request.is_ajax():  # See https://docs.djangoproject.com/en/5.0/releases/3.1/
+        # if request.is_ajax():  # See https://docs.djangoproject.com/en/5.2/releases/3.1/
         if request.headers.get("x-requested-with") == "XMLHttpRequest":
             (exc_type, exc_info, tb) = sys.exc_info()
             # response to client:

lino/utils/cycler.py

@@ -37,6 +37,7 @@ class Cycler(object):
         else:
             self.items = args
         self.current = 0
+        self.loop_no = 1
 
     def pop(self):
         if len(self.items) == 0:
@@ -45,6 +46,7 @@ class Cycler(object):
         self.current += 1
         if self.current >= len(self.items):
             self.current = 0
+            self.loop_no += 1
         if isinstance(item, Cycler):
             return item.pop()
         return item
@@ -52,6 +54,9 @@ class Cycler(object):
     def __len__(self):
         return len(self.items)
 
+    def __repr__(self):
+        return f"Cycler({self.current} of {len(self.items)} in loop {self.loop_no})"
+
     def reset(self):
         self.current = 0
 

lino/utils/dbhash.py

@@ -8,14 +8,9 @@ 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"
 HASH_FILE = settings.SITE.site_dir / "dbhash.json"
 
 
@@ -36,7 +31,7 @@ def compute_dbhash():
     return rv
 
 
-def mark_virgin():
+def mark_virgin(**kwargs):
     """
     Mark the database as virgin. This is called by :manage:`prep`.
     """
@@ -87,11 +82,11 @@ def check_virgin(restore=True, verbose=True):
                 can_restore = False
             if verbose:
                 print(f"- {k}: {', '.join(diffs)}")
-    if len(must_delete) == 0 or not restore:
+    if can_restore and len(must_delete) == 0 or not restore:
         return
     if not can_restore:
-        raise Exception(
-            "Cannot restore database because some rows have been deleted")
+        print("Cannot restore database because some rows have been deleted")
+        return
     must_delete = list(must_delete.items())
     if verbose:
         print(f"Tidy up {len(must_delete)} rows from database: {must_delete}.")

lino/utils/dpy.py

@@ -374,7 +374,7 @@ class DpyDeserializer(LoaderBase):
     See e.g. :ticket:`1029`.  We consider it an odd behaviour of
     Django to search for fixtures also in the current directory (and
     not, as `documented
-    <https://docs.djangoproject.com/en/5.0/howto/initial-data/#where-django-finds-fixture-files>`__,
+    <https://docs.djangoproject.com/en/5.2/howto/initial-data/#where-django-finds-fixture-files>`__,
     in the `fixtures` subdirs of plugins and the optional
     :setting:`FIXTURE_DIRS`).
 
@@ -443,7 +443,7 @@ def Deserializer(fp, **options):
     This is done by setting ``SERIALIZATION_MODULES={"py": "lino.utils.dpy"}``.
 
     See `SERIALIZATION_MODULES
-    <https://docs.djangoproject.com/en/5.0/ref/settings/#serialization-modules>`__.
+    <https://docs.djangoproject.com/en/5.2/ref/settings/#serialization-modules>`__.
 
     """
     d = DpyDeserializer()

lino/utils/format_date.py

@@ -42,9 +42,10 @@ def fdmy(d):
 
 
 def format_date(d, format="medium"):
-    """Return the given date `d` formatted with `Babel's date formatting
-    <https://babel.pocoo.org/en/latest/dates.html>`_ and
-    using Django's current language.
+    """Return a str expressing the given date `d`
+    using
+    `Babel's date formatting <https://babel.pocoo.org/en/latest/dates.html>`_
+    and Django's current language.
 
     """
     if not d:

lino/utils/html.py

@@ -16,6 +16,7 @@ from django.utils.html import SafeString, mark_safe, escape, format_html
 
 SAFE_EMPTY = mark_safe("")
 
+
 def html2text(html, **kwargs):
     """
     Convert the given HTML-formatted text into equivalent Markdown-structured
@@ -25,6 +26,8 @@ def html2text(html, **kwargs):
 
     text_maker = HTML2Text()
     text_maker.unicode_snob = True
+    # text_maker.table_start = True
+    text_maker.pad_tables = True
     for k, v in kwargs.items():
         setattr(text_maker, k, v)
     return text_maker.handle(html)
@@ -76,26 +79,31 @@ class Grouper:
 
     def __init__(self, ar):
         self.ar = ar
-        if ar.actor.group_by is None: return
+        if ar.actor.group_by is None:
+            return
         self.last_values = [None for f in ar.actor.group_by]
 
     def begin(self):
-        if self.ar.actor.group_by is None: return SAFE_EMPTY
+        if self.ar.actor.group_by is None:
+            return SAFE_EMPTY
         return SAFE_EMPTY
 
     def stop(self):
-        if self.ar.actor.group_by is None: return SAFE_EMPTY
+        if self.ar.actor.group_by is None:
+            return SAFE_EMPTY
         return SAFE_EMPTY
 
     def before_row(self, obj):
-        if self.ar.actor.group_by is None: return SAFE_EMPTY
+        if self.ar.actor.group_by is None:
+            return SAFE_EMPTY
         self.current_values = [f(obj) for f in self.ar.actor.group_by]
         if self.current_values == self.last_values:
             return SAFE_EMPTY
         return self.ar.actor.before_group_change(self, obj)
 
     def after_row(self, obj):
-        if self.ar.actor.group_by is None: return SAFE_EMPTY
+        if self.ar.actor.group_by is None:
+            return SAFE_EMPTY
         if self.current_values == self.last_values:
             return SAFE_EMPTY
         self.last_values = self.current_values

lino/utils/jsgen.py

@@ -430,7 +430,8 @@ def py2js(v, compact=True):
         # raise Exception("Please call the function yourself")
         return "\n".join([ln for ln in v()])
     if isinstance(v, MissingRow):
-        raise Exception("Cannot render {}".format(v))
+        return json.dumps(repr(v))
+        # raise Exception("Cannot render {}".format(v))
     if isinstance(v, js_code):
         return str(v.s)  # v.s might be a unicode
     if v is None:
@@ -494,7 +495,7 @@ def py2js(v, compact=True):
         return repr(v)
     # return json.encoder.encode_basestring(v)
     # print repr(v)
-    # https://docs.djangoproject.com/en/5.0/topics/serialization/
+    # https://docs.djangoproject.com/en/5.2/topics/serialization/
     # if not isinstance(v, (str,unicode)):
     # raise Exception("20120121 %r is of type %s" % (v,type(v)))
     return json.dumps(v, sort_keys=True, indent=4, separators=(",", ": "))

lino/utils/quantities.py

@@ -5,6 +5,7 @@
 
 import datetime
 from decimal import Decimal, ROUND_HALF_UP, InvalidOperation
+from lino.utils.sums import myround
 
 DEC2HOUR = Decimal(1) / Decimal(60)
 
@@ -29,6 +30,13 @@ class Quantity(Decimal):
     def __str__(self):
         return self._text
 
+    def as_decimal(self, places=None):
+        rv = Decimal(self)
+        if places is not None:
+            q = Decimal(10) ** -places
+            rv = rv.quantize(q, rounding=ROUND_HALF_UP)
+        return rv
+
     def limit_length(self, max_length, excl=Exception):
         rv = self
         while len(rv) > max_length: