imio.smartweb.common 1.2.37__tar.gz → 1.2.39__tar.gz

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/CHANGES.rst

@@ -2,6 +2,23 @@ Changelog
 =========
 
 
+1.2.39 (2025-11-03)
+-------------------
+
+- Migration to Plone 6.1.3
+  [boulch]
+
+
+1.2.38 (2025-09-10)
+-------------------
+
+- @find : Process None value in a field or ["None", "other value"] for agatha stats
+  [boulch
+
+- Add plone.app.caching include for futur proofing override
+  [jchandelle]
+
+
 1.2.37 (2025-09-03)
 -------------------
 

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.37
+Version: 1.2.39
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -178,6 +178,23 @@ Changelog
 =========
 
 
+1.2.39 (2025-11-03)
+-------------------
+
+- Migration to Plone 6.1.3
+  [boulch]
+
+
+1.2.38 (2025-09-10)
+-------------------
+
+- @find : Process None value in a field or ["None", "other value"] for agatha stats
+  [boulch
+
+- Add plone.app.caching include for futur proofing override
+  [jchandelle]
+
+
 1.2.37 (2025-09-03)
 -------------------
 

imio_smartweb_common-1.2.39/requirements-6.1.txt

@@ -0,0 +1 @@
+-r https://dist.plone.org/release/6.1.3/requirements.txt

imio_smartweb_common-1.2.39/requirements.txt

@@ -0,0 +1 @@
+-r https://dist.plone.org/release/6.1.3/requirements.txt

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.common",
-    version="1.2.37",
+    version="1.2.39",
     description="Common utilities, vocabularies, taxonomies for imio.smartweb & co products",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/src/imio/smartweb/common/caching_overrides.zcml

@@ -3,6 +3,7 @@
     xmlns:cache="http://namespaces.zope.org/cache"
     xmlns:zcml="http://namespaces.zope.org/zcml">
 
+    <include package="plone.app.caching" />
     <include package="z3c.unconfigure" file="meta.zcml" />
 
     <unconfigure>

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/src/imio/smartweb/common/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1033</version>
+  <version>1034</version>
   <dependencies>
     <dependency>profile-plone.restapi:default</dependency>
     <dependency>profile-eea.facetednavigation:default</dependency>

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/src/imio/smartweb/common/profiles/default/registry/tinymce.xml

@@ -53,11 +53,8 @@
       <element>code</element>
       <element>charmap</element>
       <element>fullscreen</element>
-      <element>hr</element>
       <element>lists</element>
       <element>nonbreaking</element>
-      <element>noneditable</element>
-      <element>paste</element>
       <element>searchreplace</element>
       <element>table</element>
       <element>visualblocks</element>
@@ -70,13 +67,7 @@
   <record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
           name="plone.menubar"
   >
-    <value purge="true">
-      <element>edit</element>
-      <element>format</element>
-      <element>insert</element>
-      <element>table</element>
-      <element>view</element>
-    </value>
+    <value purge="true">edit format insert table view</value>
   </record>
 
   <!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/available-menu-items/ -->
@@ -106,8 +97,8 @@
                 "items": ""
             },
             "insert": {
-                "title": "Insert",
-                "items": "hr"
+              "title": "Insert",
+              "items": "hr"
             },
             "table": {
                 "title": "Table",

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/src/imio/smartweb/common/rest/endpoint.py

@@ -25,8 +25,6 @@ class FindEndpointHandler(SearchHandler):
         if not types:
             raise Unauthorized("No types found, you are not allowed to search")
         self._constrain_query_by_path(query)
-        if not query.get("path"):
-            query["path"] = {"query": "/Plone"}
         # query = self._parse_query(query)
         if query.get("type_of_request") == "count_contents_types":
             results = self.count_contents_types(query)
@@ -130,24 +128,40 @@ class FindEndpointHandler(SearchHandler):
         if total == 0:
             return {}
 
-        # Récupération des valeurs réelles dans les objets
+        # Récupération et normalisation des valeurs
         values = []
         for brain in brains:
             obj = brain.getObject()
             value = getattr(obj, field_name, None)
-            if isinstance(value, (list, tuple)):  # cas champ multi-valué
-                values.extend(value)
+            if isinstance(value, (list, tuple)):
+                if not value:
+                    # liste/tuple vide => on compte 1 None
+                    values.append(None)
+                else:
+                    mapped = [
+                        None if (v in ("", "None") or v is None) else v for v in value
+                    ]
+                    # si TOUT est None, on compte 1 None (au lieu d'en ajouter 0)
+                    if all(v is None for v in mapped):
+                        values.append(None)
+                    else:
+                        values.extend(mapped)
             else:
-                values.append(value)
+                v = None if (value in ("", "None") or value is None) else value
+                values.append(v)
         counter = Counter(values)
 
-        # Calcul stats seulement pour expected_values
-        result = {}
+        # Normalisation des valeurs attendues
         expected_values = normalize_query_param(expected_values)
-        for val in expected_values:
-            count = counter.get(val, 0)
+        # On garde les labels originaux pour l'affichage, mais on mappe "None" vers None réel pour le compteur
+        expected_mapping = {v: (None if v == "None" else v) for v in expected_values}
+
+        # Calcul stats
+        result = {}
+        for label, key in expected_mapping.items():
+            count = counter.get(key, 0)
             percent = (count / total) * 100 if total > 0 else 0
-            result[val] = {"count": count, "percent": round(percent, 2)}
+            result[label] = {"count": count, "percent": round(percent, 2)}
         return result
 
 

imio_smartweb_common-1.2.39/src/imio/smartweb/common/tests/test_rest_endpoint.py

@@ -0,0 +1,238 @@
+# -*- coding: utf-8 -*-
+from imio.smartweb.common.rest.endpoint import FindEndpointHandler
+from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+from plone import api
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from plone.namedfile.file import NamedBlobFile, NamedBlobImage
+from unittest.mock import patch
+from zExceptions import Unauthorized
+
+import unittest
+
+
+class TestRestEndpoint(unittest.TestCase):
+    layer = IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.request = self.layer["request"]
+        self.portal = self.layer["portal"]
+
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        # Simule un header d'auth présent dans la requête
+        self.request._orig_env = {"HTTP_AUTHORIZATION": "Bearer TEST"}
+        self.folder = api.content.create(
+            container=self.portal,
+            type="Folder",
+            title="Folder",
+        )
+        self.doc1 = api.content.create(
+            container=self.folder, type="Document", title="Doc 1"
+        )
+        self.doc2 = api.content.create(
+            container=self.folder, type="Document", title="Doc 2"
+        )
+        self.page = api.content.create(
+            container=self.folder, type="Document", title="Doc 3"
+        )
+
+    def test_no_types(self):
+        query = {
+            "type_of_request": "count_contents_types",
+            "portal_type": "Document",
+            "path": {"query": self.portal.absolute_url_path()},
+            "operator": "and",
+        }
+        handler = FindEndpointHandler(self.portal, self.request)
+        self.assertRaises(Unauthorized, handler.search, query)
+
+    # ------------------------------
+    # count_contents_types
+    # ------------------------------
+    @patch("imio.smartweb.common.rest.endpoint.get_json")
+    def test_count_contents_types_operator_and(self, mjson):
+        mjson.return_value = [
+            {
+                "@id": f"https://{self.portal.absolute_url()}/@types/Document",
+                "addable": "false",
+                "id": "Document",
+                "immediately_addable": "false",
+                "title": "Document",
+            }
+        ]
+        handler = FindEndpointHandler(self.portal, self.request)
+        query = {
+            "type_of_request": "count_contents_types",
+            "portal_type": "Document",
+            "path": {"query": self.portal.absolute_url_path()},
+            "operator": "and",
+        }
+        res = handler.search(query)
+        self.assertEqual(res, {"items": [{"portal_type": "Document", "nb_items": 3}]})
+
+        # Test without path in query.
+        # Path is automaticaly set.
+        query = {
+            "type_of_request": "count_contents_types",
+            "portal_type": "Document",
+            "operator": "and",
+        }
+        res = handler.search(query)
+        self.assertEqual(res, {"items": [{"portal_type": "Document", "nb_items": 3}]})
+
+    @patch("imio.smartweb.common.rest.endpoint.get_json")
+    def test_count_contents_types_operator_or_multiple_types(self, mjson):
+        mjson.return_value = [
+            {
+                "@id": f"https://{self.portal.absolute_url()}/@types/Document",
+                "addable": "false",
+                "id": "Document",
+                "immediately_addable": "false",
+                "title": "Document",
+            },
+            {
+                "@id": f"https://{self.portal.absolute_url()}/@types/Folder",
+                "addable": "false",
+                "id": "Folder",
+                "immediately_addable": "false",
+                "title": "Folder",
+            },
+        ]
+        handler = FindEndpointHandler(self.portal, self.request)
+        query = {
+            "type_of_request": "count_contents_types",
+            "portal_type": ["Document", "Folder"],
+            "path": {"query": self.portal.absolute_url_path()},
+            "operator": "and",
+        }
+        res = handler.search(query)
+        self.assertEqual(
+            res, {"items": [{"portal_type": ["Document", "Folder"], "nb_items": 4}]}
+        )
+
+    @patch("imio.smartweb.common.rest.endpoint.get_json")
+    def test_get_max_depth(self, mjson):
+        mjson.return_value = [
+            {
+                "@id": f"https://{self.portal.absolute_url()}/@types/Document",
+                "addable": "false",
+                "id": "Document",
+                "immediately_addable": "false",
+                "title": "Document",
+            }
+        ]
+        handler = FindEndpointHandler(self.portal, self.request)
+        res = handler.search({"type_of_request": "get_max_depth"})
+        self.assertEqual(res["max_depth"], 3)
+
+        paths = {i["path"] for i in res["items"]}
+        self.assertEqual(
+            paths, {"/plone/folder/doc-2", "/plone/folder/doc-3", "/plone/folder/doc-1"}
+        )
+
+        folder2 = api.content.create(
+            container=self.folder,
+            type="Folder",
+            title="Folder 2",
+        )
+
+        api.content.create(
+            container=folder2,
+            type="Document",
+            title="Kamoulox",
+        )
+        handler = FindEndpointHandler(self.portal, self.request)
+        res = handler.search({"type_of_request": "get_max_depth"})
+        self.assertEqual(res["max_depth"], 4)
+
+        paths = {i["path"] for i in res["items"]}
+        self.assertEqual(paths, {"/plone/folder/folder-2/kamoulox"})
+
+    @patch("imio.smartweb.common.rest.endpoint.get_json")
+    def test_check_value_of_field_counts_and_percents(self, mjson):
+        mjson.return_value = [
+            {
+                "@id": f"https://{self.portal.absolute_url()}/@types/Document",
+                "addable": "false",
+                "id": "Document",
+                "immediately_addable": "false",
+                "title": "Document",
+            }
+        ]
+        api.content.create(
+            container=self.folder,
+            type="Document",
+            title="Doc 2",
+        )
+        handler = FindEndpointHandler(self.portal, self.request)
+        q = {
+            "type_of_request": "check_value_of_field",
+            "portal_type": "Document",
+            "field_name": "title",
+            "expected_values": ["Doc 1", "Doc 2", "Doc 3"],
+        }
+        res = handler.search(q)
+        # Number
+        self.assertEqual(res["Doc 1"]["count"], 1)
+        self.assertEqual(res["Doc 2"]["count"], 2)
+        self.assertEqual(res["Doc 3"]["count"], 1)
+
+        # Pourcentages
+        self.assertEqual(res["Doc 1"]["percent"], round(1 / 4 * 100, 2))  # 25%
+        self.assertEqual(res["Doc 2"]["percent"], round(2 / 4 * 100, 2))  # 50%
+        self.assertEqual(res["Doc 3"]["percent"], round(1 / 4 * 100, 2))  # 25%
+
+    @patch("imio.smartweb.common.rest.endpoint.get_json")
+    def test_find_big_files_or_images(self, mjson):
+        mjson.return_value = [
+            {
+                "@id": f"https://{self.portal.absolute_url()}/@types/Image",
+                "addable": "false",
+                "id": "Image",
+                "immediately_addable": "false",
+                "title": "Image",
+            },
+            {
+                "@id": f"https://{self.portal.absolute_url()}/@types/File",
+                "addable": "false",
+                "id": "File",
+                "immediately_addable": "false",
+                "title": "File",
+            },
+        ]
+        api.content.create(
+            container=self.folder,
+            type="File",
+            id="bigfile",
+            title="Big file",
+            file=NamedBlobFile(data=b"x" * 2500000, filename="big.pdf"),  # 2,5 Mo
+        )
+
+        api.content.create(
+            container=self.folder,
+            type="Image",
+            id="smallimage",
+            title="Small image",
+            image=NamedBlobImage(data=b"x" * 100000, filename="small.jpg"),  # 0,1 Mo
+        )
+
+        api.content.create(
+            container=self.folder,
+            type="Image",
+            id="bigimage",
+            title="Big image",
+            image=NamedBlobImage(data=b"x" * 3100000, filename="big.jpg"),  # 3,1 Mo
+        )
+        handler = FindEndpointHandler(self.portal, self.request)
+        q = {
+            "type_of_request": "find_big_files_or_images",
+            "portal_type": ["Image", "File"],
+            "size": 1000000,
+        }
+        res = handler.search(q)
+        # On attend seulement les gros
+        titles = [it["title"] for it in res["items"]]
+        self.assertEqual(set(titles), {"Big file", "Big image"})
+        # Vérifie calcul Mo arrondi (2_500_000 bytes ≈ 2.38 Mo)
+        big_entry = next(i for i in res["items"] if i["title"] == "Big file")
+        self.assertAlmostEqual(big_entry["size"], round(2_500_000 / (1024 * 1024), 2))

imio_smartweb_common-1.2.39/src/imio/smartweb/common/tests/test_rest_utils.py

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_ACCEPTANCE_TESTING
+from imio.smartweb.common.rest.utils import batch_results
+from imio.smartweb.common.rest.utils import get_json
+from imio.smartweb.common.rest.utils import hash_md5
+from unittest.mock import patch
+from unittest.mock import Mock
+
+import json
+import requests
+import unittest
+
+
+class TestRestUtils(unittest.TestCase):
+    layer = IMIO_SMARTWEB_COMMON_ACCEPTANCE_TESTING
+
+    def setUp(self):
+        self.request = self.layer["request"]
+        self.portal = self.layer["portal"]
+        self.portal_url = self.portal.absolute_url()
+        self.url = "https://api.kamoulox.test/endpoint"
+
+    @patch("imio.smartweb.common.rest.utils.requests.get")
+    def test_get_json_success(self, mock_get):
+        payload = {"ok": True, "items": [1, 2]}
+        mock_get.return_value = Mock(status_code=200, text=json.dumps(payload))
+        result = get_json(self.url)
+        self.assertEqual(result, payload)
+        mock_get.assert_called_once()
+        (called_url,) = mock_get.call_args[0]
+        self.assertEqual(called_url, self.url)
+        kwargs = mock_get.call_args.kwargs
+        self.assertEqual(kwargs["timeout"], 5)
+        self.assertEqual(kwargs["headers"]["Accept"], "application/json")
+        self.assertNotIn("Authorization", kwargs["headers"])
+
+    @patch("imio.smartweb.common.rest.utils.requests.get")
+    def test_get_json_non_200_returns_none(self, mock_get):
+        mock_get.return_value = Mock(status_code=404, text="Not found")
+        result = get_json(self.url)
+        self.assertIsNone(result)
+
+    @patch("imio.smartweb.common.rest.utils.logger")
+    @patch("imio.smartweb.common.rest.utils.requests.get")
+    def test_get_json_timeout_returns_none_and_logs(self, mock_get, mock_logger):
+        mock_get.side_effect = requests.exceptions.Timeout()
+        result = get_json(self.url)
+        self.assertIsNone(result)
+        mock_logger.warning.assert_called_once()
+        # check if url is in log
+        self.assertIn(self.url, mock_logger.warning.call_args[0][0])
+
+    @patch("imio.smartweb.common.rest.utils.requests.get")
+    def test_get_json_other_exception_returns_none(self, mock_get):
+        mock_get.side_effect = RuntimeError("kamoulox")
+        result = get_json(self.url)
+        self.assertIsNone(result)
+
+    @patch("imio.smartweb.common.rest.utils.requests.get")
+    def test_get_json_sets_auth_header_when_provided(self, mock_get):
+        mock_get.return_value = Mock(status_code=200, text="{}")
+        auth = "Bearer TOKEN123"
+        _ = get_json(self.url, auth=auth, timeout=10)
+        mock_get.assert_called_once()
+        kwargs = mock_get.call_args.kwargs
+        self.assertEqual(kwargs["timeout"], 10)
+        self.assertEqual(kwargs["headers"]["Authorization"], auth)
+        self.assertEqual(kwargs["headers"]["Accept"], "application/json")
+
+    @patch("imio.smartweb.common.rest.utils.requests.get")
+    def test_get_json_custom_timeout_is_used(self, mock_get):
+        mock_get.return_value = Mock(status_code=200, text="{}")
+        _ = get_json(self.url, timeout=2.5)
+        self.assertEqual(mock_get.call_args.kwargs["timeout"], 2.5)
+
+    def test_batch_results_exact_division(self):
+        data = [1, 2, 3, 4]
+        result = batch_results(data, 2)
+        self.assertEqual(result, [[1, 2], [3, 4]])
+
+    def test_batch_results_not_exact(self):
+        data = [1, 2, 3, 4, 5]
+        result = batch_results(data, 2)
+        self.assertEqual(result, [[1, 2], [3, 4], [5]])
+
+    def test_batch_results_batch_size_larger_than_list(self):
+        data = [1, 2, 3]
+        result = batch_results(data, 10)
+        self.assertEqual(result, [[1, 2, 3]])
+
+    def test_batch_results_empty_iterable(self):
+        data = []
+        result = batch_results(data, 3)
+        self.assertEqual(result, [])
+
+    def test_batch_results_with_generator(self):
+        gen = (i for i in range(5))
+        result = batch_results(gen, 2)
+        self.assertEqual(result, [[0, 1], [2, 3], [4]])
+
+    def test_hash_md5_basic_string(self):
+        result = hash_md5("hello")
+        self.assertEqual(result, "5d41402abc4b2a76b9719d911017c592")
+
+    def test_hash_md5_empty_string(self):
+        result = hash_md5("")
+        self.assertEqual(result, "d41d8cd98f00b204e9800998ecf8427e")
+
+    def test_hash_md5_unicode_string(self):
+        result = hash_md5("éèà")
+        # tu peux vérifier avec hashlib directement
+        import hashlib
+
+        expected = hashlib.md5("éèà".encode()).hexdigest()
+        self.assertEqual(result, expected)

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/src/imio/smartweb/common/upgrades/configure.zcml

@@ -165,6 +165,14 @@
       directory="profiles/1032_to_1033"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1033_to_1034"
+      title="Upgrade common from 1033 to 1034"
+      description="Update configuration from TinyMCE 7.7.0 to be TinyMCE 7.9.1"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/1033_to_1034"
+      />      
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed registry step"
@@ -515,4 +523,15 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      profile="imio.smartweb.common:default"
+      source="1033"
+      destination="1034"
+      >
+    <genericsetup:upgradeDepends
+        title="Update configuration from TinyMCE 7.7.0 to be TinyMCE 7.9.1"
+        import_profile="imio.smartweb.common.upgrades:upgrade_1033_to_1034"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>

imio_smartweb_common-1.2.39/src/imio/smartweb/common/upgrades/profiles/1033_to_1034/registry/tinymce.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+
+  <record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
+          name="plone.plugins"
+  >
+    <value purge="true">
+      <element>code</element>
+      <element>charmap</element>
+      <element>fullscreen</element>
+      <element>lists</element>
+      <element>nonbreaking</element>
+      <element>searchreplace</element>
+      <element>table</element>
+      <element>visualblocks</element>
+      <element>visualchars</element>
+      <element>wordcount</element>
+    </value>
+  </record>
+
+  <!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/menus-configuration-options/#menubar -->
+  <record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
+          name="plone.menubar">
+    <value purge="true">edit format insert table view</value>
+  </record>
+
+  <record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
+        name="plone.menu">
+    <value purge="true">
+    {
+      "file": {
+        "title": "File",
+        "items": ""
+      },
+      "tools": {
+        "title": "Tools",
+        "items": ""
+      },
+      "edit": {
+        "title": "Edit",
+        "items": "undo redo | cut copy paste | searchreplace selectall"
+      },
+      "format": {
+        "title": "Format",
+        "items": ""
+      },
+      "insert": {
+        "title": "Insert",
+        "items": "hr"
+      },      
+      "table": {
+        "title": "Table",
+        "items": "inserttable deletetable | cell row column"
+      },
+      "view": {
+        "title": "View",
+        "items": "visualblocks preview fullscreen"
+      }
+    }
+    </value>
+  </record>
+
+  <!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/available-toolbar-buttons/ -->
+  <record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
+          name="plone.toolbar"
+  >
+    <value>undo redo | styleselect | bold italic superscript | bullist numlist | nonbreaking | plonelink unlink | fullscreen</value>
+  </record>
+
+</registry>

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.39}/src/imio.smartweb.common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.37
+Version: 1.2.39
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -178,6 +178,23 @@ Changelog
 =========
 
 
+1.2.39 (2025-11-03)
+-------------------
+
+- Migration to Plone 6.1.3
+  [boulch]
+
+
+1.2.38 (2025-09-10)
+-------------------
+
+- @find : Process None value in a field or ["None", "other value"] for agatha stats
+  [boulch
+
+- Add plone.app.caching include for futur proofing override
+  [jchandelle]
+
+
 1.2.37 (2025-09-03)
 -------------------