nlbone 0.8.3__tar.gz → 0.8.4__tar.gz

{nlbone-0.8.3 → nlbone-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.8.3
+Version: 0.8.4
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT

{nlbone-0.8.3 → nlbone-0.8.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nlbone"
-version = "0.8.3"
+version = "0.8.4"
 description = "Backbone package for interfaces and infrastructure in Python projects"
 readme = "README.md"
 requires-python = ">=3.10"

{nlbone-0.8.3 → nlbone-0.8.4}/src/nlbone/interfaces/api/pagination/offset_base.py

@@ -1,6 +1,7 @@
 import json
+import re
 from math import ceil
-from typing import Any, List, Optional
+from typing import Any, List, Optional, Dict, Union
 
 from fastapi import Query
 
@@ -53,36 +54,58 @@ class PaginateRequest:
         return result
 
     @staticmethod
-    def _parse_filters(filters: str) -> dict[str, Any]:
+    def _parse_filters(filters: str) -> Dict[str, Any]:
         if not filters:
             return {}
-        # JSON object or array
-        try:
-            if filters.strip().startswith(("{", "[")):
-                data = json.loads(filters)
+
+        stripped_filters = filters.strip()
+
+        if stripped_filters.startswith(("{", "[")):
+            try:
+                data = json.loads(stripped_filters)
                 return dict(data) if isinstance(data, dict) else {"$": data}
-        except Exception:
-            pass
+            except (json.JSONDecodeError, TypeError):
+                pass
+
+        pattern = re.compile(r"(?P<key>[^:,]+):\s*(?P<value>\[.*?\]|[^,]+)")
+        filters_dict: Dict[str, Any] = {}
+
+        for match in pattern.finditer(stripped_filters):
+            key = match.group("key").strip().strip("'\"")
+            value_raw = match.group("value").strip()
+
+            filters_dict[key] = PaginateRequest._process_value(value_raw)
 
-        # CSV key:value pairs
-        filters_dict: dict[str, Any] = {}
-        for part in filters.split(","):
-            part = part.strip()
-            if not part or ":" not in part:
-                continue
-            key, value = part.split(":", 1)
-            key = key.strip().strip("'\"")
-            value_raw = value.strip().strip("'\"")
-            # cast common primitives
-            if value_raw.isdigit():
-                value_cast: Any = int(value_raw)
-            elif value_raw.lower() in {"true", "false"}:
-                value_cast = value_raw.lower() == "true"
-            else:
-                value_cast = value_raw
-            filters_dict[key] = value_cast
         return filters_dict
 
+    @staticmethod
+    def _process_value(value: str) -> Any:
+        if value.startswith("[") and value.endswith("]"):
+            content = value[1:-1]
+            if not content.strip():
+                return []
+            return [PaginateRequest._cast_primitive(item.strip()) for item in content.split(",")]
+
+        return PaginateRequest._cast_primitive(value)
+
+    @staticmethod
+    def _cast_primitive(value: str) -> Union[int, float, bool, str]:
+        clean_value = value.strip("'\"")
+        lower_value = clean_value.lower()
+
+        if lower_value == "true":
+            return True
+        if lower_value == "false":
+            return False
+
+        if clean_value.isdigit():
+            return int(clean_value)
+
+        try:
+            return float(clean_value)
+        except ValueError:
+            return clean_value
+
     def remove_deleted(self, deleted_at_field: str = "deleted_at"):
         self.filters = self.filters | {"deleted_at": None}