imio.smartweb.common 1.2.41__py3-none-any.whl → 1.2.42__py3-none-any.whl

imio/smartweb/common/rest/endpoint.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from collections import Counter
+from DateTime import DateTime
 from imio.smartweb.common.rest.utils import get_json
 from plone import api
 from plone.restapi.search.handler import SearchHandler
@@ -38,6 +39,9 @@ class FindEndpointHandler(SearchHandler):
                 query.get("field_name"),
                 query.get("expected_values"),
             )
+        elif query.get("type_of_request") == "catalog":
+            json_str_query = query.get("json_str_query")
+            results = self.search_from_json(json_str_query)
         else:
             return super().search(query)
         return results
@@ -164,6 +168,73 @@ class FindEndpointHandler(SearchHandler):
             result[label] = {"count": count, "percent": round(percent, 2)}
         return result
 
+    def normalize_catalog_params(self, params):
+        """Recursilvly normalize catalog values :
+        - dicts keys 'query' -> try to convert DateTime
+        - list/tuple -> normalizing recursilvly
+        """
+        if isinstance(params, dict):
+            new = {}
+            for key, value in params.items():
+                # Special case : bloc of catalog criteria -> {'query': '...', 'range': 'min'}
+                if isinstance(value, dict) and "query" in value:
+                    crit = value.copy()
+                    q = crit.get("query")
+
+                    # if string test DateTime
+                    if isinstance(q, str):
+                        try:
+                            crit["query"] = DateTime(q)
+                        except Exception:
+                            # let in string
+                            pass
+
+                    # Normalizing others
+                    for k2, v2 in crit.items():
+                        if k2 != "query":
+                            crit[k2] = self.normalize_catalog_params(v2)
+
+                    new[key] = crit
+
+                else:
+                    new[key] = self.normalize_catalog_params(value)
+            return new
+
+        if isinstance(params, (list, tuple)):
+            return [self.normalize_catalog_params(v) for v in params]
+
+        return params
+
+    def search_from_json(self, json_str):
+        """
+        Docstring for search_from_json
+
+        :param self: Description
+        :param json_str: Description
+        :example1: {"portal_type":"imio.events.Event","effective": {"query":"2025-12-12","range": "min"},"enableAutopublishing":true}
+        """
+        data = json.loads(json_str) or {}
+        attrs = [k for k, v in data.items()]
+        attrs = attrs + ["Title", "getPath"]
+        query_params = self.normalize_catalog_params(data)
+        catalog = api.portal.get_tool("portal_catalog")
+        brains = catalog(**query_params)
+
+        results = []
+        for brain in brains:
+            item = {}
+            for name in attrs:
+                value = getattr(brain, name, None)
+                if value is None:
+                    value = getattr(brain.getObject(), name, None)
+                if callable(value):
+                    value = value()
+                if isinstance(value, DateTime):
+                    value = value.ISO8601()
+                item[name] = value
+            results.append(item)
+        return results
+
 
 class FindEndpoint(Service):
     def reply(self):

{imio_smartweb_common-1.2.41.dist-info → imio_smartweb_common-1.2.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.41
+Version: 1.2.42
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -178,6 +178,13 @@ Changelog
 =========
 
 
+1.2.42 (2025-12-11)
+-------------------
+
+- Add a new type of request in @find endpoint
+  [boulch]
+
+
 1.2.41 (2025-11-28)
 -------------------
 

{imio_smartweb_common-1.2.41.dist-info → imio_smartweb_common-1.2.42.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.common-1.2.41-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.common-1.2.42-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
@@ -82,7 +82,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=QDxyYuhI7ipB-JkFbMsl2OS7Vk-Uc39NwTJ41ZKZVDc,7411
+imio/smartweb/common/rest/endpoint.py,sha256=QhurWC0_FuKef8fvEM3I8hSVCWcizAl5eIhQrNkhvvY,10074
 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
@@ -158,10 +158,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.41.dist-info/licenses/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio_smartweb_common-1.2.41.dist-info/licenses/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio_smartweb_common-1.2.41.dist-info/METADATA,sha256=IMOqMnAl_g9U45WYc8wiW7zmgUB2HErN-ZH4ijXIxmk,19497
-imio_smartweb_common-1.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-imio_smartweb_common-1.2.41.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio_smartweb_common-1.2.41.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio_smartweb_common-1.2.41.dist-info/RECORD,,
+imio_smartweb_common-1.2.42.dist-info/licenses/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio_smartweb_common-1.2.42.dist-info/licenses/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio_smartweb_common-1.2.42.dist-info/METADATA,sha256=s8PcbA3TDG89vfer_qqHIM-DTaFsFIOrLz6hjjDKisw,19597
+imio_smartweb_common-1.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+imio_smartweb_common-1.2.42.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio_smartweb_common-1.2.42.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio_smartweb_common-1.2.42.dist-info/RECORD,,