oplnk-python-utils 1.1.8__tar.gz → 1.1.9__tar.gz

{oplnk_python_utils-1.1.8/oplnk_python_utils.egg-info → oplnk_python_utils-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oplnk-python-utils
-Version: 1.1.8
+Version: 1.1.9
 Summary: Reusable utilities for caching, data manipulation, parsing, and MongoDB query building
 Home-page: https://github.com/openlinkspa/oplnk-python-utils
 Author: OpenLink SpA

{oplnk_python_utils-1.1.8 → oplnk_python_utils-1.1.9}/oplnk_python_utils/__init__.py

@@ -7,7 +7,7 @@ from . import core
 from . import cache
 from . import query
 
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 __author__ = "OpenLink SpA"
 
 __all__ = ["core", "cache", "query", "reports", "__version__"]

{oplnk_python_utils-1.1.8 → oplnk_python_utils-1.1.9}/oplnk_python_utils/query/query_builder.py

@@ -1020,15 +1020,47 @@ class QueryBuilder:
 
         if "filters" in query:
             if not pipeline:
-                lookup_filters = {
-                    field: value
-                    for field, value in query["filters"].items()
-                    if list(value.keys())[0][0] != "$"
-                }
-
-                if list(lookup_filters.keys()):
+                # Extract potential relation field names from filters, supporting
+                # logical operators ($or/$and) and dot-notation (e.g., "company.name").
+                def extract_relation_candidates(filters_dict):
+                    relation_names = set()
+
+                    def walk(node):
+                        if isinstance(node, dict):
+                            for k, v in node.items():
+                                if k in ("$or", "$and"):
+                                    # Value can be a list of conditions or a nested dict
+                                    if isinstance(v, list):
+                                        for item in v:
+                                            walk(item)
+                                    else:
+                                        walk(v)
+                                else:
+                                    # Field key: take root before dot and strip _id/_ids
+                                    if (
+                                        isinstance(k, str)
+                                        and k
+                                        and not k.startswith("$")
+                                    ):
+                                        root = k.split(".")[0]
+                                        root = re.sub(r"(_ids|_id)$", "", root)
+                                        if root:
+                                            relation_names.add(root)
+                                    # Continue walking nested structures like
+                                    # {"company": {"name": {"$containsi": "x"}}}
+                                    walk(v)
+                        elif isinstance(node, list):
+                            for item in node:
+                                walk(item)
+                        # Primitives are ignored
+
+                    walk(filters_dict)
+                    return list(relation_names)
+
+                relation_candidates = extract_relation_candidates(query["filters"])
+                if relation_candidates:
                     populate_from_filters = self.get_count_lookup_relations(
-                        list(lookup_filters.keys())
+                        relation_candidates
                     )
                     pipeline.extend(populate_from_filters)
 

{oplnk_python_utils-1.1.8 → oplnk_python_utils-1.1.9/oplnk_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oplnk-python-utils
-Version: 1.1.8
+Version: 1.1.9
 Summary: Reusable utilities for caching, data manipulation, parsing, and MongoDB query building
 Home-page: https://github.com/openlinkspa/oplnk-python-utils
 Author: OpenLink SpA

{oplnk_python_utils-1.1.8 → oplnk_python_utils-1.1.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="oplnk-python-utils",
-    version="1.1.8",
+    version="1.1.9",
     author="OpenLink SpA",
     author_email="contacto@openlink.cl",
     description="Reusable utilities for caching, data manipulation, parsing, and MongoDB query building",