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

lino/__init__.py

@@ -26,7 +26,12 @@ defines no models, some template files, a series of :term:`django-admin commands
 
 """
 
-__version__ = '25.3.1'
+from django.utils.translation import gettext_lazy as _
+from django import VERSION
+from django.apps import AppConfig
+from django.conf import settings
+import warnings
+__version__ = '25.3.3'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 
@@ -60,7 +65,6 @@ elif sys.version_info[0] == 2 and sys.version_info[1] > 6:
 else:
     PYAFTER26 = False
 
-import warnings
 
 warnings.filterwarnings(
     "error",
@@ -92,8 +96,6 @@ warnings.filterwarnings(
 # TODO: get everything to work even when ResourceWarning gives an error
 # warnings.filterwarnings("error", category=ResourceWarning)
 
-from django.conf import settings
-from django.apps import AppConfig
 
 # def setup_project(settings_module):
 #     os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
@@ -110,8 +112,6 @@ def assert_django_code(django_code):
         )
 
 
-from django import VERSION
-
 AFTER17 = True
 AFTER18 = True
 DJANGO2 = True
@@ -197,4 +197,3 @@ class AppConfig(AppConfig):
 default_app_config = "lino.AppConfig"
 
 # deprecated use, only for backwards compat:
-from django.utils.translation import gettext_lazy as _

lino/api/dd.py

@@ -10,6 +10,7 @@ from lino.modlib.system.choicelists import Genders, PeriodEvents, YesNo
 from lino.utils.mldbc.fields import BabelCharField, LanguageField
 from lino.utils.mldbc.fields import BabelTextField
 from lino.utils.format_date import fdl as dtosl
+from lino.utils.fieldutils import get_fields, fields_help
 from lino import logger
 
 # import logging ; logger = logging.getLogger(__name__)

lino/api/doctest.py

@@ -14,15 +14,15 @@ tested document. It includes
 
 """
 
+from lino.utils.fieldutils import get_fields, fields_help
 from lino.core.boundaction import BoundAction
 from lino.core.tables import AbstractTable
 from lino.core.actions import Action
 from django.db.models import Model
-from lino.core.layouts import BaseLayout
-from lino.core.actions import register_params
 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
@@ -92,7 +92,8 @@ def get_json_dict(username, uri, an="detail", **kwargs):
     #     url += "&{}={}".format(k, v)
     test_client.force_login(rt.login(username).user)
     res = test_client.get(url, REMOTE_USER=username)
-    assert res.status_code == 200
+    if res.status_code != 200:
+        raise Exception(f"GET {url} got status code {res.status_code}")
     s = res.content.decode()
     try:
         return json.loads(s)
@@ -318,71 +319,6 @@ def show_workflow(actions, all=False, language=None):
     return doit()
 
 
-def get_fields(model, fieldnames=None, columns=None):
-    if isinstance(model, BoundAction):
-        get_field = model.action.parameters.get
-        if fieldnames is None:
-            fieldnames = model.action.params_layout
-    elif isinstance(model, Action):
-        get_field = model.parameters.get
-        if fieldnames is None:
-            fieldnames = model.params_layout.main
-    elif issubclass(model, Model):
-        get_field = model._meta.get_field
-        # get_field = model.get_data_elem
-        if fieldnames is None:
-            fieldnames = [f.name for f in model._meta.get_fields()]
-    elif issubclass(model, AbstractTable):
-        if columns:
-            get_field = model.get_data_elem
-            if fieldnames is None:
-                fieldnames = model.column_names
-                # get_handle().grid_layout.main.columns
-        else:
-            get_field = model.parameters.get
-            if fieldnames is None:
-                if not isinstance(model.params_layout, BaseLayout):
-                    register_params(model)
-                fieldnames = model.params_layout.main
-    if fieldnames is None:
-        return
-    if isinstance(fieldnames, str):
-        fieldnames = fieldnames.split()
-    for n in fieldnames:
-        yield get_field(n)
-
-
-def fields_help(model, fieldnames=None, columns=False, all=None):
-    """
-    Print an overview description of the specified fields of the
-    specified model.
-
-    If model is an action or table, print the parameter fields of that
-    action or table.
-
-    If model is a table and you want the columns instead of the
-    parameter fields, then specify `columns=True`.
-
-    By default this shows only fields that have a help text.  If you
-    specify `all=True`, then also fields that have no help text will
-    be shown.
-    """
-    if all is None:
-        all = fieldnames is not None
-
-    cells = []
-    # cols = ["Internal name", "Verbose name", "Help text"]
-    for fld in get_fields(model, fieldnames, columns):
-        if fld is not None and hasattr(fld, "verbose_name"):
-            ht = fld.help_text or ""
-            if ht or all:
-                cells.append([fld.name, fld.verbose_name, unindent(ht)])
-
-    # return table(cols, cells).strip()
-    items = ["{} ({}) : {}".format(row[1], row[0], row[2]) for row in cells]
-    return rstgen.ul(items).strip()
-
-
 def show_fields(*args, **kwargs):
     print(fields_help(*args, **kwargs))
 

lino/api/rt.py

@@ -1,6 +1,8 @@
 # Copyright 2014-2018 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
+from lino.core.utils import login, show, shows
+from lino.core.exceptions import ChangedAPI
 from django.conf import settings
 
 from lino.core.utils import models_by_base
@@ -9,7 +11,6 @@ models = settings.SITE.models
 """
 """
 
-from lino.core.exceptions import ChangedAPI
 # actors = modules = ChangedAPI(
 #     "Replace rt.modules and rt.actors by rt.models")
 
@@ -32,9 +33,6 @@ def get_template(*args, **kw):
     return settings.SITE.plugins.jinja.renderer.jinja_env.get_template(*args, **kw)
 
 
-from lino.core.utils import login, show, shows
-
-
 # def send_email(*args, **kw):
 #     "Shortcut to :meth:`lino.core.site.Site.send_email`."
 #     return settings.SITE.send_email(*args, **kw)

lino/core/actors.py

@@ -8,11 +8,8 @@ See :doc:`/dev/actors`.
 
 """
 
-from lino import logger
-
 import copy
-import traceback
-import html
+import warnings
 from types import GeneratorType
 from inspect import getmro
 
@@ -22,6 +19,7 @@ from django.utils.translation import gettext_lazy as _
 from django.utils.html import format_html, mark_safe, SafeString
 from django.core.exceptions import BadRequest
 
+from lino import logger
 from lino.utils import isiterable
 from lino.utils import MissingRow
 from lino.core import fields
@@ -38,8 +36,7 @@ from lino.core.utils import qs2summary
 from lino.core.utils import ParameterPanel
 from lino.core.utils import navinfo, dbfield2params_field
 from lino.utils import curry, AttrDict, is_string
-
-from lino.utils.html import E, forcetext, tostring, Grouper, SAFE_EMPTY
+from lino.utils.html import E, tostring, Grouper, SAFE_EMPTY
 # from lino.utils.html import assert_safe
 
 from .roles import SiteUser
@@ -656,7 +653,6 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
                 try:
                     settings.SITE.kernel.setup_handle(h, ar)
                 except Exception as e:
-                    # traceback.print_exc()
                     logger.warning(
                         "%s setup_handle failed with %s (change actors.py to see more)",
                         self,
@@ -1841,7 +1837,17 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         return kw
 
     @classmethod
-    def request(cls, master_instance=None, **kwargs):
+    def request(cls, *args, **kwargs):
+        """
+        Old name for :meth:`create_request`. Still does the same but with a
+        deprecation warning.
+        """
+        warnings.warn(
+            "Please call create_request() instead of request()", DeprecationWarning)
+        return cls.create_request(*args, **kwargs)
+
+    @classmethod
+    def create_request(cls, master_instance=None, **kwargs):
         """Return a new :class:`ActionRequest
         <lino.core.requests.ActionRequest>` on this actor.
 
@@ -1867,7 +1873,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
 
     @classmethod
     def to_html(self, **kw):
-        return tostring(self.request(**kw).table2xhtml())
+        return tostring(self.create_request(**kw).table2xhtml())
 
     @classmethod
     def get_screenshot_requests(self, language):
@@ -1896,7 +1902,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         kwargs.update(parent=ar)
         kwargs.update(renderer=settings.SITE.kernel.default_renderer)
         try:
-            ar = cls.request(master_instance=master, **kwargs)
+            ar = cls.create_request(master_instance=master, **kwargs)
             el = cls.table_as_html(ar)
         except Exception as e:
             msg = f"20241004 Error in {repr(ar)}: {e}"
@@ -1911,8 +1917,8 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     @classmethod
     def get_table_as_list(cls, obj, ar):
         # raise Exception("20240316")
-        sar = cls.request(parent=ar, master_instance=obj,
-                          is_on_main_actor=False)
+        sar = cls.create_request(parent=ar, master_instance=obj,
+                                 is_on_main_actor=False)
         grp = Grouper(sar)
         html_text = grp.begin()
         for i, obj in enumerate(sar.data_iterator):
@@ -1946,8 +1952,8 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
 
     @classmethod
     def get_table_story(cls, obj, ar):
-        sar = cls.request(parent=ar, master_instance=obj,
-                          is_on_main_actor=False)
+        sar = cls.create_request(parent=ar, master_instance=obj,
+                                 is_on_main_actor=False)
         html = SAFE_EMPTY
         for i, obj in enumerate(sar.data_iterator):
             if i == cls.preview_limit:
@@ -1973,8 +1979,8 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         """
         if ar is None:
             return ''
-        sar = cls.request(parent=ar, master_instance=obj,
-                          is_on_main_actor=False)
+        sar = cls.create_request(parent=ar, master_instance=obj,
+                                 is_on_main_actor=False)
         return cls.get_table_summary(sar)
 
     @classmethod

lino/core/boundaction.py

@@ -1,16 +1,17 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2009-2020 Rumma & Ko Ltd
+# Copyright 2009-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
 .. autosummary::
 
 """
 
-from lino import logger
 import os
+import warnings
 
 from django.conf import settings
 
+from lino import logger
 from lino.utils import curry
 # from .actions import Action
 
@@ -21,7 +22,7 @@ from lino.core.permissions import (
 
 
 class BoundAction(object):
-    """An Action that is bound to an Actor.  If an Actor has subclasses,
+    """An action that is bound to an actor.  If an actor has subclasses,
     each subclass "inherits" its actions.
 
     """
@@ -94,15 +95,24 @@ class BoundAction(object):
     def full_name(self):
         return self.action.full_name(self.actor)
 
-    def request(self, *args, **kw):
-        # print("20170116 BoundAction.request()", args, kw)
+    def create_request(self, *args, **kw):
+        # print("20170116 BoundAction.create_request()", args, kw)
         kw.update(action=self)
-        return self.actor.request(*args, **kw)
+        return self.actor.create_request(*args, **kw)
+
+    def request(self, *args, **kwargs):
+        """
+        Old name for :meth:`create_request`. Still does the same but with a
+        deprecation warning.
+        """
+        warnings.warn(
+            "Please call create_request() instead of request()", DeprecationWarning)
+        return self.create_request(*args, **kwargs)
 
     def request_from(self, ar, *args, **kw):
         """Create a request of this action from parent request `ar`."""
         kw.update(parent=ar)
-        return self.request(*args, **kw)
+        return self.create_request(*args, **kw)
 
     def run_from_session(self, ses, **kw):
         ar = self.request_from(ses, **kw)

lino/core/dashboard.py

@@ -5,8 +5,8 @@
 
 """
 
-from django.conf import settings
-from lino.api import _
+# from django.conf import settings
+# from lino.api import _
 from lino.core.permissions import Permittable
 from lino.core.requests import ActionRequest
 from lino.core.tables import AbstractTable
@@ -78,7 +78,7 @@ class DashboardItem(Permittable):
             # TODO 20220930 until now, dashboard was always acting as if
             # display_mode was DISPLAY_MODE_GRID
             if issubclass(sar.actor, AbstractTable):
-            # if isinstance(sar.bound_action.action, ShowTable):
+                # if isinstance(sar.bound_action.action, ShowTable):
                 for e in sar.renderer.table2story(sar, **kwargs):
                     # assert_safe(tostring(e))
                     yield tostring(e)
@@ -149,7 +149,8 @@ class ActorItem(DashboardItem):
         # from lino.core.tables import AbstractTable
         T = self.actor
         # if isinstance(T, AbstractTable):
-        sar = T.request(limit=T.preview_limit, parent=ar)  #, renderer=settings.SITE.kernel.default_renderer)
+        # , renderer=settings.SITE.kernel.default_renderer)
+        sar = T.create_request(limit=T.preview_limit, parent=ar)
         # sar = ar.spawn(T, limit=T.preview_limit)
         # sar = ar.spawn_request(actor=T, limit=T.preview_limit)
         # raise Exception("20230331 {}".format(ar.subst_user))

lino/core/dbtables.py

@@ -4,6 +4,17 @@
 This defines the :class:`Table` class.
 """
 
+from lino.core.gfks import ContentType, GenericForeignKey
+from lino.core.tables import AbstractTable
+from lino.core.utils import resolve_model, get_field, UnresolvedModel
+from .utils import models_by_base
+from lino.core.choicelists import ChoiceListField
+from lino.core import constants
+from lino.core import actors
+from lino.core.model import Model
+from lino.core import actions
+from lino.core import fields
+from lino.utils.html import tostring, assert_safe
 from lino import logger
 
 import datetime
@@ -21,21 +32,9 @@ from django.apps import apps
 
 get_models = apps.get_models
 
-from lino.utils.html import tostring, assert_safe
 
-from lino.core import fields
-from lino.core import actions
-from lino.core.model import Model
-from lino.core import actors
-from lino.core import constants
-
-from lino.core.choicelists import ChoiceListField
-from .utils import models_by_base
 # from .fields import get_data_elem_from_model
 
-from lino.core.utils import resolve_model, get_field, UnresolvedModel
-from lino.core.tables import AbstractTable
-from lino.core.gfks import ContentType, GenericForeignKey
 
 INVALID_MK = "Invalid master_key '{0}' in {1} : {2}"
 
@@ -260,10 +259,10 @@ class Table(AbstractTable):
                 profiles2user[u.user_type] = u
         for user in list(profiles2user.values()):
             # if user.profile.name != 'admin': return
-            # yield self.default_action.request(user=user)
+            # yield self.default_action.create_request(user=user)
             # and self.default_action is not self.detail_action:
             if self.detail_action:
-                yield self.detail_action.request(user=user)
+                yield self.detail_action.create_request(user=user)
 
     # @classmethod
     # def elem_get_printable_target_stem(cls,elem):
@@ -589,7 +588,7 @@ class Table(AbstractTable):
         if self.delete_action is None:
             return "No delete_action"
         if not self.get_row_permission(
-            obj, ar, self.get_row_state(obj), self.delete_action):
+                obj, ar, self.get_row_state(obj), self.delete_action):
             # print "20130222 ar is %r" % ar
             # logger.info("20130225 dbtables.disable_delete no permission")
             return _("You have no permission to delete this row.")
@@ -601,7 +600,7 @@ class Table(AbstractTable):
 
         # raise Exception("20240321 get_request_queryset", self)
         # if not isinstance(ar, TableRequest):
-        #     ar = self.request(parent=ar)
+        #     ar = self.create_request(parent=ar)
 
         def apply(qs):
             # print("20160329 {}".format(qs.query))

lino/core/fields.py

@@ -1663,7 +1663,7 @@ def make_remote_field(model, name):
                         #         fld.related_model, rkw))
                         reltarget = fld.related_model(**rkw)
                         reltarget.save_new_instance(
-                            fld.related_model.get_default_table().request()
+                            fld.related_model.get_default_table().create_request()
                         )
 
                     setattr(target, fld.name, reltarget)
@@ -1774,8 +1774,8 @@ def choices_for_field(ar, holder, field):
     if isinstance(field, models.ForeignKey):
         m = field.remote_field.model
         t = m.get_default_table()
-        # qs = t.request(request=ar.request).data_iterator
-        qs = t.request(parent=ar).data_iterator
+        # qs = t.create_request(request=ar.request).data_iterator
+        qs = t.create_request(parent=ar).data_iterator
 
         # logger.info('20120710 choices_view(FK) %s --> %s', t, qs.query)
 

lino/core/menus.py

@@ -160,7 +160,7 @@ class MenuItem(object):
     #     return False
 
     def openui5Render(self):
-        ar = self.bound_action.request(**self.params)
+        ar = self.bound_action.create_request(**self.params)
         js = settings.SITE.kernel.default_renderer.request_handler(ar)
         return js
 

lino/core/model.py

@@ -604,7 +604,7 @@ class Model(models.Model, fields.TableRow):
         database query and show this value as the search result.
 
         """
-        ar = self.__class__.get_default_table().request()
+        ar = self.__class__.get_default_table().create_request()
         return self.as_search_item(ar)
 
     # def summary_row(self, ar, **kw):

lino/core/renderer.py

@@ -197,7 +197,7 @@ class HtmlRenderer(Renderer):
         import rstgen
 
         if display_mode == constants.DISPLAY_MODE_CARDS:
-            layout = ar.actor.card_layout # or ar.actor.list_layout
+            layout = ar.actor.card_layout  # or ar.actor.list_layout
             lh = layout.get_layout_handle()
         else:
             lh = ar.bound_action.get_layout_handel()
@@ -320,13 +320,12 @@ class HtmlRenderer(Renderer):
         Return a string of Javascript code that would open a detail window
         on the given database object.
         """
-        status.update(record_id=obj.pk)
-
         if ba is None:
             ba = obj.get_detail_action(ar)
         # ba = obj.__class__.get_default_table().detail_action
-        # print(20180831, ba.get_view_permission(ar.get_user().user_type))
         if ba is not None:
+            # print(f"20250319 instance_handler {ba} {status} {self.action_call}")
+            status.update(record_id=obj.pk)
             return self.action_call(ar, ba, status)
 
     def href_to(self, ar, obj, text=None):
@@ -641,7 +640,7 @@ class HtmlRenderer(Renderer):
                     # 20200501 elems.append(item)
                     elems.append(tostring(item))
                 elif isinstance(item, type) and issubclass(item, Actor):
-                    ar = item.default_action.request(parent=ar)
+                    ar = item.default_action.create_request(parent=ar)
                     # 20200501 elems.extend(self.table2story(ar, **kwargs))
                     elems += [tostring(e) for e in self.table2story(ar, **kwargs)]
                 elif isinstance(item, ActionRequest):
@@ -649,12 +648,12 @@ class HtmlRenderer(Renderer):
                     if issubclass(item.actor, AbstractTable):
                         # 20200501 elems.extend(self.table2story(item, **kwargs))
                         elems += [tostring(e)
-                            for e in self.table2story(item, **kwargs)]
+                                  for e in self.table2story(item, **kwargs)]
                     else:
                         # example : courses.StatusReport in dashboard
                         # 20200501 elems.append(self.show_story(ar, item.actor.get_story(None, ar), **kwargs))
                         elems += [tostring(e)
-                            for e in self.show_story(
+                                  for e in self.show_story(
                                 ar, item.actor.get_story(None, ar), **kwargs)]
                 elif isinstance(item, DashboardItem):
                     elems.extend(item.render(ar, **kwargs))
@@ -707,7 +706,7 @@ class HtmlRenderer(Renderer):
         if not isinstance(mnu, Menu):
             assert isinstance(mnu, MenuItem)
             if mnu.bound_action:
-                sar = mnu.bound_action.actor.request(
+                sar = mnu.bound_action.actor.create_request(
                     action=mnu.bound_action,
                     user=ar.user,
                     subst_user=ar.subst_user,
@@ -812,7 +811,7 @@ class TextRenderer(HtmlRenderer):
         header_links=None,
         nosummary=False,
         stripped=True,
-        show_links=False, # added 20241031
+        show_links=False,  # added 20241031
         display_mode=None,
         **kwargs
     ):
@@ -938,7 +937,7 @@ class TextRenderer(HtmlRenderer):
                 if iselement(item):
                     print(to_rst(item, stripped))
                 elif isinstance(item, type) and issubclass(item, Actor):
-                    ar = item.default_action.request(parent=ar)
+                    ar = item.default_action.create_request(parent=ar)
                     self.show_table(ar, stripped=stripped, **kwargs)
                 elif isinstance(item, DashboardItem):
                     self.show_story(ar, item.get_story(ar), stripped, **kwargs)
@@ -1029,7 +1028,7 @@ class JsRenderer(HtmlRenderer):
         """Instruct the client to display a detail window on the given
         record.
         """
-        # print("20201230a goto_instance", ar.actor, detail_action)
+        # print("20250319 goto_instance", ar.get_user(), obj, detail_action, js)
         js = self.instance_handler(ar, obj, detail_action)
         kw.update(eval_js=js)
         ar.set_response(**kw)

lino/core/requests.py

@@ -783,14 +783,14 @@ class BaseRequest:
             spec.setup_from(self)
         elif isinstance(spec, BoundAction):
             kw.update(parent=self)
-            spec = spec.request(**kw)
+            spec = spec.create_request(**kw)
         else:
             kw.update(parent=self)
             ba = resolve_action(spec)
-            spec = ba.request(**kw)
+            spec = ba.create_request(**kw)
             # from lino.core.menus import create_item
             # mi = create_item(spec)
-            # spec = mi.bound_action.request(**kw)
+            # spec = mi.bound_action.create_request(**kw)
         return spec
 
     def get_printable_context(self, **kw):
@@ -1011,10 +1011,14 @@ class BaseRequest:
     #     # deprecated?
     #     self.append_message('warning', msg, *args, **kw)
 
-    debug = lambda self, *args, **kwargs: self.logger.debug(*args, **kwargs)
-    info = lambda self, *args, **kwargs: self.logger.info(*args, **kwargs)
-    warning = lambda self, * \
-        args, **kwargs: self.logger.warning(*args, **kwargs)
+    def debug(self, *args, **kwargs):
+        return self.logger.debug(*args, **kwargs)
+
+    def info(self, *args, **kwargs):
+        return self.logger.info(*args, **kwargs)
+
+    def warning(self, *args, **kwargs):
+        return self.logger.warning(*args, **kwargs)
 
     async def adebug(self, *args, **kwargs):
         return await self.alogger.debug(*args, **kwargs)