lino 24.10.0__py3-none-any.whl → 24.10.1__py3-none-any.whl

lino/__init__.py

@@ -26,7 +26,7 @@ defines no models, some template files, a series of :term:`django-admin commands
 
 """
 
-__version__ = '24.10.0'
+__version__ = '24.10.1'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/api/doctest.py

@@ -7,9 +7,9 @@ A selection of names to be used in tested documents.
 
 import six  # TODO: remove here and then run all doctests
 import logging
-import django
 import sqlparse
-
+from urllib.parse import urlencode
+import django
 django.setup()
 from lino.core.constants import *
 from lino.api.shell import *
@@ -63,12 +63,18 @@ HttpQuery = collections.namedtuple(
 
 def get_json_dict(username, uri, an="detail", **kwargs):
     url = "/api/{0}?fmt=json&an={1}".format(uri, an)
-    for k, v in kwargs.items():
-        url += "&{}={}".format(k, v)
+    if kwargs:
+        url += "&" + urlencode(kwargs, True)
+    # for k, v in kwargs.items():
+    #     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
-    return json.loads(res.content.decode())
+    s = res.content.decode()
+    try:
+        return json.loads(s)
+    except Exception as e:
+        raise Exception(f"GET {url} got non-JSON response:\n{s}") from None
 
 
 def get_json_soup(username, uri, fieldname, **kwargs):

lino/core/__init__.py

@@ -39,7 +39,6 @@ For some modules the documentation has already been migrated to prosa:
     signals
     store
     tables
-    tablerequest
     urls
     userprefs
     user_types

lino/core/actions.py

@@ -33,7 +33,7 @@ from .utils import resolve_model
 from .utils import navinfo
 from .utils import Parametrizable
 from .utils import traverse_ddh_fklist
-from .requests import InstanceAction
+from .utils import InstanceAction
 
 
 def discover_choosers():

lino/core/actors.py

@@ -28,7 +28,6 @@ from lino.core import fields
 from lino.core import actions
 from lino.core import layouts
 from lino.core import constants
-from lino.core.requests import ActionRequest
 from lino.core.boundaction import BoundAction
 from lino.core.exceptions import ChangedAPI
 from lino.core.constants import _handle_attr_name
@@ -163,22 +162,12 @@ class ActorMetaClass(type):
 
         cls = super().__new__(meta, classname, bases, classDict)
 
-        # ~ if not classDict.has_key('label'):
-        # ~ cls.label = ClassProperty(cls.get_actor_label)
-        # ~ meta.label = property(cls.get_actor_label.im_func) # 20130906
-        # ~ if not classDict.has_key('known_values'):
-        # ~ cls.known_values = ClassProperty(cls.get_known_values)
-        # ~ meta.known_values = property(cls.get_known_values.im_func) # 20130906
-        """
-        On 20110822 I thought "A Table always gets the app_label of its model,
-        you cannot set this yourself in a subclass
-        because otherwise it gets complex when inheriting reports from other
-        app_labels."
-        On 20110912 I cancelled change 20110822 because PersonsByOffer
-        should clearly get app_label 'jobs' and not 'contacts'.
-
-        """
-
+        # On 20110822 I thought "A Table always gets the app_label of its model,
+        # you cannot set this yourself in a subclass
+        # because otherwise it gets complex when inheriting reports from other
+        # app_labels."
+        # On 20110912 I cancelled change 20110822 because PersonsByOffer
+        # should clearly get app_label 'jobs' and not 'contacts'.
         if classDict.get("app_label", None) is None:
             # Figure out the app_label by looking one level up.
             # For 'django.contrib.sites.models', this would be 'sites'.
@@ -1794,6 +1783,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         Return an action request on this actor.
         """
         kw.update(actor=self)
+        from lino.core.requests import ActionRequest
         return ActionRequest(*args, **kw)
 
     @classmethod
@@ -1843,11 +1833,16 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         # welfare/docs/specs/weleup/weleup1r.rst
         # kwargs.update(request=ar.request)
         kwargs.update(parent=ar)
-
-        ar = cls.request(master, **kwargs)
-        ar.renderer = settings.SITE.kernel.default_renderer
-        el = ar.table2xhtml()
-        toolbar = ar.plain_toolbar_buttons()
+        kwargs.update(renderer=settings.SITE.kernel.default_renderer)
+        try:
+            ar = cls.request(master_instance=master, **kwargs)
+            el = ar.table2xhtml()
+            toolbar = ar.plain_toolbar_buttons()
+        except Exception as e:
+            msg = f"20241004 Error in {repr(ar)}: {e}"
+            raise Exception(msg) from e
+            logger.warning(msg)
+            return msg
         if len(toolbar):
             el = E.div(el, E.p(*toolbar))
         return el

lino/core/choicelists.py

@@ -368,28 +368,43 @@ class ChoiceList(with_metaclass(ChoiceListMeta, tables.AbstractTable)):
     """A string with the name of a choice to be used as default value for
     fields using this list.
 
+    Usage example in :mod:`lino_xl.lib.clients.models`::
+
+        class ClientStates(dd.Workflow):
+            required_roles = dd.login_required(ContactsStaff)
+            verbose_name_plural = _("Client states")
+            default_value = 'newcomer'
+
+        add = ClientStates.add_item
+        add('10', _("Newcomer"), 'newcomer')
+        add('20', _("Refused"), 'refused')
+        add('30', _("Coached"), 'coached')
+        add('50', _("Former"), 'former')
+
+    And :mod:`lino_avant.lib.avanti.models` overrides it::
+
+        from lino_xl.lib.clients.choicelists import ClientStates
+        ClientStates.default_value = 'coached'
+
     Note that this specifies the *default* default value for *all*
     :class:`ChoiceListField <lino.core.choicelists.ChoiceListField>`
     of this choicelist, including parameter fields.
 
+    The disadvantage is that when somebody *does not* want your default value,
+    then they must explicitly specify `default=''` when defining a field on your
+    choicelist.
+
     You can remove that "default default value" for all tables by
     specifying `default=''`. There are two places where you can
     specify this: (a) on the parameter field itself (which then
     applies to all subtables) or (b) just on one table. For example
     (excerpt from :mod:`lino_avanti.lib.avanti`)::
 
-        from lino_xl.lib.clients.choicelists import ClientStates
-        ClientStates.default_value = 'coached'
-
         parameters = ObservedDateRange(
             ...
             client_state=ClientStates.field(blank=True, default=''))
 
-    Note that the default values of parameter fields of a table that
-    is used as the *models default table* will apply for the choices
-    of pointers to that model. Concrete use case is the choicelist of
-    `cal.Guest.partner` in :ref:`avanti`, which should show only
-    coached clients.  So instead of above code we actually now do::
+    Example for (b)::
 
         class MyClients(My, Clients):
             @classmethod
@@ -398,9 +413,11 @@ class ChoiceList(with_metaclass(ChoiceListMeta, tables.AbstractTable)):
                 kw.update(client_state='')
                 return kw
 
-    The disadvantage is that when somebody *does not* want your default value,
-    then they must explicitly specify `default=''` when defining a field on your
-    choicelist.
+    Note that the default values of parameter fields of a table that
+    is used as the *model's default table* will apply for the choices
+    of pointers to that model. Concrete use case is the choicelist of
+    `cal.Guest.partner` in :ref:`avanti`, which we want to show only
+    coached clients.
 
     """
 

lino/core/dashboard.py

@@ -7,9 +7,13 @@
 
 from lino.api import _
 from lino.core.permissions import Permittable
+from lino.core.requests import ActionRequest
+from lino.core.tables import AbstractTable
+# from lino.core.actions import ShowTable
 from lino.utils.html import E, tostring, assert_safe
 from django.utils.html import mark_safe
 
+
 class DashboardItem(Permittable):
     """Base class for all dashboard items.
 
@@ -51,9 +55,6 @@ class DashboardItem(Permittable):
         This is a helper function for shared use by :class:`ActorItem`
         and :class:`RequestItem`.
         """
-        from lino.core.tables import TableRequest
-        from lino.core.requests import ActionRequest
-
         assert ar.user is sar.user
         # T = sar.actor
         # print("20210112 render_request()", sar.actor, sar)
@@ -72,20 +73,22 @@ class DashboardItem(Permittable):
             yield tostring(E.h2(str(sar.actor.get_title_base(sar)), " ", *elems))
 
         assert sar.renderer is not None
-        if isinstance(sar, TableRequest):
+        if isinstance(sar, ActionRequest):
             # TODO 20220930 until now, dashboard was always acting as if
             # display_mode was DISPLAY_MODE_GRID
-            for e in sar.renderer.table2story(sar, **kwargs):
-                # assert_safe(tostring(e))
-                yield tostring(e)
-        elif isinstance(sar, ActionRequest):
-            # example : courses.StatusReport in dashboard
-            yield sar.renderer.show_story(
-                ar, sar.actor.get_story(None, ar), **kwargs)
-            # for e in sar.renderer.show_story(
-            #     ar, sar.actor.get_story(None, ar), **kwargs):
-            #     # assert_safe(tostring(e))
-            #     yield tostring(e)
+            if issubclass(sar.actor, AbstractTable):
+            # if isinstance(sar.bound_action.action, ShowTable):
+                for e in sar.renderer.table2story(sar, **kwargs):
+                    # assert_safe(tostring(e))
+                    yield tostring(e)
+            else:
+                # example : courses.StatusReport in dashboard
+                yield sar.renderer.show_story(
+                    ar, sar.actor.get_story(None, ar), **kwargs)
+                # for e in sar.renderer.show_story(
+                #     ar, sar.actor.get_story(None, ar), **kwargs):
+                #     # assert_safe(tostring(e))
+                #     yield tostring(e)
         else:
             raise Exception("20240908 Cannot render {}".format(sar))
             yield "Cannot render {}".format(sar)

lino/core/dbtables.py

@@ -28,14 +28,13 @@ from lino.core import actions
 from lino.core.model import Model
 from lino.core import actors
 from lino.core import constants
-from lino.core.tablerequest import TableRequest
 
 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, TableRequest
+from lino.core.tables import AbstractTable
 from lino.core.gfks import ContentType, GenericForeignKey
 
 INVALID_MK = "Invalid master_key '{0}' in {1} : {2}"
@@ -129,9 +128,9 @@ def rc_name(rptclass):
     return rptclass.app_label + "." + rptclass.__name__
 
 
-def has_fk(rr, name):
-    if isinstance(rr, TableRequest):
-        return rr.actor.master_key == name
+def has_fk(ar, name):
+    if isinstance(ar, ActionRequest) and ar.actor is not None:
+        return ar.actor.master_key == name
     return False
 
 
@@ -318,19 +317,24 @@ class Table(AbstractTable):
         # raise Exception("20240929")
         qs = self.get_request_queryset(ar)
         # qs = self.model.get_request_queryset(ar)
+        # str(qs.query)
 
-        return qs.get(pk=pk)
-        # try:
-        #     return qs.get(pk=pk)
-        #     # return self.get_queryset(ar).get(pk=pk)
+        # return qs.get(pk=pk)
+        try:
+            return qs.get(pk=pk)
         # except ValueError:
         #     return None
-        # except self.model.DoesNotExist:
-        #     import sqlparse
-        #     sql = str(qs.query).replace('"', '')
-        #     sql = sqlparse.format(sql, reindent=True, keyword_case='upper')
-        #     raise Exception("20240324 {}, {}".format(ar.param_values, sql))
-        #     return None
+        except self.model.DoesNotExist:
+            # sql = qs.query
+            # import sqlparse
+            # sql = str(sql).replace('"', '')
+            # sql = sqlparse.format(sql, reindent=True, keyword_case='upper')
+            # raise self.model.DoesNotExist(f"No row {pk} in {ar} ({sql})")
+            raise self.model.DoesNotExist(f"No row {pk} in {ar}") from None
+            # from django.core.exceptions import ObjectDoesNotExist
+            # assert isinstance(exc, ObjectDoesNotExist)
+            # raise exc
+            # return None
 
     # @classmethod
     # def disabled_actions(self, ar, obj):  # no longer used since 20170909
@@ -630,6 +634,8 @@ class Table(AbstractTable):
                     elif v is not None:
                         spv[k] = v
                         # print("20240506 {} = {}".format(k, v))
+                        # e.g. in MyTickets 'user' should be an obvious field
+                        # 20241004 caused #5768:
                         ar.known_values[k] = v  # make it an obvious field
 
                 qs = self.model.add_param_filter(qs, **spv)

lino/core/model.py

@@ -33,7 +33,8 @@ from .utils import obj2unicode
 from .utils import class_dict_items
 from .signals import receiver, on_ui_created, pre_ui_delete, pre_ui_save, post_ui_save
 from .workflows import ChangeStateAction
-from .tablerequest import TableRequest, sliced_data_iterator
+from .requests import ActionRequest, sliced_data_iterator
+from .tables import AbstractTable
 
 try:
     import bleach
@@ -633,7 +634,8 @@ class Model(models.Model, fields.TableRow):
 
     @fields.htmlbox()
     def navigation_panel(self, ar):
-        if not isinstance(ar, TableRequest):
+        # if not isinstance(ar, ActionRequest):
+        if ar is None or ar.actor is None or not issubclass(ar.actor, AbstractTable):
             return None
         items = []
         navinfo = ar.actor.get_navinfo(ar, self)

lino/core/renderer.py

@@ -442,7 +442,7 @@ class HtmlRenderer(Renderer):
     def quick_add_buttons(self, ar):
         """Returns a HTML chunk that displays "quick add buttons" for the
         given :class:`action request
-        <lino.core.dbtables.TableRequest>`: a button :guilabel:`[New]`
+        <lino.core.request.ActionRequest>`: a button :guilabel:`[New]`
         followed possibly (if the request has rows) by a
         :guilabel:`[Show last]` and a :guilabel:`[Show all]` button.
 
@@ -629,7 +629,7 @@ class HtmlRenderer(Renderer):
 
         """
         from lino.core.actors import Actor
-        from lino.core.tables import TableRequest
+        from lino.core.tables import AbstractTable
         from lino.core.requests import ActionRequest
         # print(f"20240908 show_story {ar}")
 
@@ -646,19 +646,18 @@ class HtmlRenderer(Renderer):
                     ar = item.default_action.request(parent=ar)
                     # 20200501 elems.extend(self.table2story(ar, **kwargs))
                     elems += [tostring(e) for e in self.table2story(ar, **kwargs)]
-                elif isinstance(item, TableRequest):
-                    # print(f"20240908 TableRequest {item}")
-                    assert item.renderer is not None
-                    # 20200501 elems.extend(self.table2story(item, **kwargs))
-                    elems += [tostring(e)
-                        for e in self.table2story(item, **kwargs)]
                 elif isinstance(item, ActionRequest):
-                    # example : courses.StatusReport in dashboard
                     assert item.renderer is not None
-                    # 20200501 elems.append(self.show_story(ar, item.actor.get_story(None, ar), **kwargs))
-                    elems += [tostring(e)
-                        for e in self.show_story(
-                            ar, item.actor.get_story(None, ar), **kwargs)]
+                    if issubclass(item.actor, AbstractTable):
+                        # 20200501 elems.extend(self.table2story(item, **kwargs))
+                        elems += [tostring(e)
+                            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(
+                                ar, item.actor.get_story(None, ar), **kwargs)]
                 elif isinstance(item, DashboardItem):
                     elems.extend(item.render(ar, **kwargs))
                     # elems += [tostring(e) for e in item.render(ar, **kwargs)]
@@ -932,7 +931,7 @@ class TextRenderer(HtmlRenderer):
     def show_story(self, ar, story, stripped=True, **kwargs):
         """Render the given story as reStructuredText to stdout."""
         from lino.core.actors import Actor
-        from lino.core.tables import TableRequest
+        from lino.core.tables import AbstractTable
         from lino.core.requests import ActionRequest
 
         try:
@@ -944,13 +943,14 @@ class TextRenderer(HtmlRenderer):
                     self.show_table(ar, stripped=stripped, **kwargs)
                 elif isinstance(item, DashboardItem):
                     self.show_story(ar, item.get_story(ar), stripped, **kwargs)
-                elif isinstance(item, TableRequest):
-                    self.show_table(item, stripped=stripped, **kwargs)
-                    # print(item.table2rst(*args, **kwargs))
                 elif isinstance(item, ActionRequest):
-                    # example : courses.StatusReport in dashboard
                     assert item.renderer is not None
-                    self.show_story(ar, item.actor.get_story(None, ar), **kwargs)
+                    if issubclass(item.actor, AbstractTable):
+                        self.show_table(item, stripped=stripped, **kwargs)
+                        # print(item.table2rst(*args, **kwargs))
+                    else:
+                        # example : courses.StatusReport in dashboard
+                        self.show_story(ar, item.actor.get_story(None, ar), **kwargs)
                 elif isiterable(item):
                     self.show_story(ar, item, stripped, **kwargs)
                     # for i in self.show_story(ar, item, *args, **kwargs):