imio.smartweb.common 1.2.37__py3-none-any.whl → 1.2.38__py3-none-any.whl

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/rest/endpoint.py

@@ -130,24 +130,41 @@ 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.37.dist-info → imio_smartweb_common-1.2.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.37
+Version: 1.2.38
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -178,6 +178,16 @@ Changelog
 =========
 
 
+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.dist-info → imio_smartweb_common-1.2.38.dist-info}/RECORD

@@ -1,9 +1,9 @@
-imio.smartweb.common-1.2.37-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.common-1.2.38-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
 imio/smartweb/common/__init__.py,sha256=Na9XBfEQUMrm2c5jbqQgwWeg40ih0aXVG1vT8NeAjMQ,2709
 imio/smartweb/common/adapters.py,sha256=dG4MALuHPQI6lTeNvs5p4vVOxHoBBYaWN6g8J96KxzQ,1507
 imio/smartweb/common/adapters.zcml,sha256=VO3luZDtRL9FIIEghxPrqpx8paZF3m6MGEy-8kF1sOQ,437
 imio/smartweb/common/caching.py,sha256=aN7gX9rT63fnmUuZnx82Mbu3ghjJUeOiLvLEp9OiFm4,895
-imio/smartweb/common/caching_overrides.zcml,sha256=ysa5DgVGzO1Fp22d9Wg-vNyLlqfRR77WBV-7L6j0Hpo,526
+imio/smartweb/common/caching_overrides.zcml,sha256=rpyKruOfuhAWfhtDVS9X54ibmNTZ9FmueH5Jz8aBf0w,570
 imio/smartweb/common/config.py,sha256=imgOo0_BBIbXGFNvBnhPReLOSY4JqIOH_QCAl0j0XGI,435
 imio/smartweb/common/configure.zcml,sha256=Ypqlo27RCC_w48QaQ0xucQRDjIBs9VpdtoJSjionK6Y,1128
 imio/smartweb/common/contact_utils.py,sha256=Pr-Nhz9MRnfirZ7RbmF5JZw9fX4gWa0dWkvJlQBiDKY,11341
@@ -76,7 +76,7 @@ imio/smartweb/common/profiles/testing/types/Folder.xml,sha256=RPxIPgViAK0GGGTPKb
 imio/smartweb/common/profiles/uninstall/browserlayer.xml,sha256=glaCGlITwc36-1Fi2z0VCbLcoQ5GddkAhuW-SGYeZy8,130
 imio/smartweb/common/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/rest/configure.zcml,sha256=eT5gr-PcfMRxQzMME7T3nzz2Y0BVI4r9HyKHIccQC2s,575
-imio/smartweb/common/rest/endpoint.py,sha256=hgQsZW8VV9kOiupnSJfSTcXEecv2iAn76KSum5ysjnY,6712
+imio/smartweb/common/rest/endpoint.py,sha256=6HUaGF4KgC7p0-0XSVGgUAP7WG8at1052l_zCjIkquE,7494
 imio/smartweb/common/rest/odwb.py,sha256=zRZxowUaE76xlW_blc92vRCzToUpnzw3O5mxFXaeScU,2249
 imio/smartweb/common/rest/search_filters.py,sha256=upZAZ6h50qiSXo0q22lUgNlcmX5elFtrIQs_jFBl1-s,3832
 imio/smartweb/common/rest/utils.py,sha256=9zc5ge_DmVuexxN09c3U6QAITAI1s2hc0m6eZuylSxM,1269
@@ -148,10 +148,10 @@ imio/smartweb/common/viewlets/skip_to_content.py,sha256=wm22NUf8Qh5uzz8p4vkLCdFN
 imio/smartweb/common/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/widgets/select.py,sha256=5sV0UIgwu4AvwpgVmJeSZwUWz7OPD9VxYMowfmjcfbA,1313
 imio/smartweb/common/widgets/templates/ajaxselect_display.pt,sha256=v8TT2Xc19er6SUGWabgNfIdrayFYIjxyLK9H_XkIG3M,1209
-imio_smartweb_common-1.2.37.dist-info/licenses/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio_smartweb_common-1.2.37.dist-info/licenses/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio_smartweb_common-1.2.37.dist-info/METADATA,sha256=kCY4-SImXYTNlaTQ8SA2iHzNOjaM2B8-wSxhJz_Q-ts,18813
-imio_smartweb_common-1.2.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-imio_smartweb_common-1.2.37.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio_smartweb_common-1.2.37.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio_smartweb_common-1.2.37.dist-info/RECORD,,
+imio_smartweb_common-1.2.38.dist-info/licenses/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio_smartweb_common-1.2.38.dist-info/licenses/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio_smartweb_common-1.2.38.dist-info/METADATA,sha256=fdTxjcsoQJD07U_hYF5HBvcyhNXJWkTHaKJfkIvycLI,19026
+imio_smartweb_common-1.2.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+imio_smartweb_common-1.2.38.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio_smartweb_common-1.2.38.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio_smartweb_common-1.2.38.dist-info/RECORD,,