oplnk-python-utils 1.1.2__tar.gz → 1.1.4__tar.gz

{oplnk_python_utils-1.1.2/oplnk_python_utils.egg-info → oplnk_python_utils-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oplnk-python-utils
-Version: 1.1.2
+Version: 1.1.4
 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.2 → oplnk_python_utils-1.1.4}/oplnk_python_utils/__init__.py

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

{oplnk_python_utils-1.1.2 → oplnk_python_utils-1.1.4}/oplnk_python_utils/query/query_builder.py

@@ -617,12 +617,31 @@ class QueryBuilder:
         try:
             # Build group_id with proper field expressions
             group_id = {}
+            project_fields = {}
+
             for field in distinct_params:
                 try:
                     # Use utility function to build proper aggregation expression
                     field_expression = build_aggregation_field_expression(field)
-                    # Use original field name as key for the result
-                    group_id[field] = field_expression
+
+                    # For MongoDB $group stage, we need to use a safe key name (no dots)
+                    # We'll use the original field name as key, but replace dots with underscores for the group
+                    safe_key = (
+                        field.replace(".", "_").replace("[", "_").replace("]", "_")
+                    )
+                    group_id[safe_key] = field_expression
+
+                    # Build nested structure for the projection to maintain original field structure
+                    parts = field.split(".")
+                    current = project_fields
+                    for i, part in enumerate(parts[:-1]):
+                        if part not in current:
+                            current[part] = {}
+                        current = current[part]
+
+                    # Set the final value
+                    current[parts[-1]] = f"$_id.{safe_key}"
+
                 except ValueError as e:
                     # Log error and skip invalid field
                     print(f"Warning: Skipping invalid field '{field}' in distinct: {e}")
@@ -634,8 +653,9 @@ class QueryBuilder:
             group_stage = {"$group": {"_id": group_id}}
 
             if include_project:
-                replace_root_stage = {"$replaceRoot": {"newRoot": "$_id"}}
-                return [group_stage, replace_root_stage]
+                # Use $project to create the nested structure
+                project_stage = {"$project": project_fields}
+                return [group_stage, project_stage]
             else:
                 return [group_stage]
 

{oplnk_python_utils-1.1.2 → oplnk_python_utils-1.1.4/oplnk_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oplnk-python-utils
-Version: 1.1.2
+Version: 1.1.4
 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.2 → oplnk_python_utils-1.1.4}/setup.py

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